webfutureiorepo · pull · Jan 16, 2025 · Jan 16, 2025 · Jan 16, 2025 · Jan 16, 2025
diff --git a/packaging/installer/functions.sh b/packaging/installer/functions.sh
@@ -636,13 +636,22 @@ issystemd() {
 }
 
 get_systemd_service_dir() {
-  if [ -w "/lib/systemd/system" ]; then
-    echo "/lib/systemd/system"
-  elif [ -w "/usr/lib/systemd/system" ]; then
-    echo "/usr/lib/systemd/system"
-  elif [ -w "/etc/systemd/system" ]; then
-    echo "/etc/systemd/system"
+  unit_paths="$(systemctl show -p UnitPath | cut -f 2- -d '=' | tr ' ' '\n')"
+
+  if [ -n "${unit_paths}" ]; then
+    lib_paths="$(echo "${unit_paths}" | grep -vE '^/(run|etc)' | awk '{line[NR] = $0} END {for (i = NR; i > 0; i--) print line[i]}')"
+    etc_paths="$(echo "${unit_paths}" | grep -E '^/etc' | grep -vE '(attached|control)$')"
+  else
+    lib_paths="/usr/lib/systemd/system /lib/systemd/system /usr/local/lib/systemd/system"
+    etc_paths="/etc/systemd/system"
   fi
+
+  for path in ${lib_paths} ${etc_paths}; do
+    if [ -d "${path}" ] && [ -w "${path}" ]; then
+      echo "${path}"
+      return 0
+    fi
+  done
 }
 
 run_install_service_script() {

diff --git a/packaging/installer/netdata-uninstaller.sh b/packaging/installer/netdata-uninstaller.sh
@@ -731,27 +731,45 @@ if [ "$(uname -s)" = "Darwin" ]; then
 fi
 
 #### REMOVE NETDATA FILES
+
+# Handle updater files first so that it doesn’t try to run while we
+# are uninstalling things.
+if [ -x "${NETDATA_PREFIX}/usr/libexec/netdata-updater.sh" ]; then
+  "${NETDATA_PREFIX}/usr/libexec/netdata-updater.sh" --disable-auto-updates
+else
+  rm_file /etc/periodic/daily/netdata-updater
+  rm_file /etc/cron.daily/netdata-updater
+  rm_file /etc/cron.d/netdata-updater
+  rm_file /etc/cron.d/netdata-updater-daily
+fi
+
+if issystemd; then
+  for unit in netdata.service netdata-updater.timer; do
+    systemctl disable "${unit}"
+    systemctl stop "${unit}"
+  done
+
+  for unit in netdata.service netdata-updater.service netdata-updater.timer; do
+    unit_path="$(systemctl show -p FragmentPath "${unit}" | cut -f 2- -d '=')"
+    override_paths="$(systemctl show -p DropInPaths "${unit}" | cut -f 2- -d '=')"
+    for path in "${unit_path}" ${override_paths} ; do
+      rm_file "${path}"
+    done
+  done
+
+  rm_file /usr/lib/systemd/[email protected]/netdata.conf
+  rm_file /lib/systemd/[email protected]/netdata.conf
+  rm_dir /usr/lib/systemd/[email protected]/
+  rm_file /usr/lib/systemd/system-preset/50-netdata.preset
+  rm_file /lib/systemd/system-preset/50-netdata.preset
+
+  systemctl daemon-reload
+fi
+
 rm_file /etc/logrotate.d/netdata
-rm_file /usr/lib/systemd/[email protected]/netdata.conf
-rm_file /etc/systemd/system/netdata.service
-rm_file /lib/systemd/system/netdata.service
-rm_file /usr/lib/systemd/system/netdata.service
-rm_file /etc/systemd/system/netdata-updater.service
-rm_file /lib/systemd/system/netdata-updater.service
-rm_file /usr/lib/systemd/system/netdata-updater.service
-rm_file /etc/systemd/system/netdata-updater.timer
-rm_file /lib/systemd/system/netdata-updater.timer
-rm_file /usr/lib/systemd/system/netdata-updater.timer
-rm_file /usr/lib/systemd/system-preset/50-netdata.preset
-rm_file /lib/systemd/system-preset/50-netdata.preset
 rm_file /etc/init.d/netdata
-rm_file /etc/periodic/daily/netdata-updater
-rm_file /etc/cron.daily/netdata-updater
-rm_file /etc/cron.d/netdata-updater
-rm_file /etc/cron.d/netdata-updater-daily
 rm_file /Library/LaunchDaemons/com.github.netdata.plist
 
-
 if [ -n "${NETDATA_PREFIX}" ] && [ -d "${NETDATA_PREFIX}" ] && [ "netdata" = "$(basename "$NETDATA_PREFIX")" ] ; then
   rm_dir "${NETDATA_PREFIX}"
 else
@@ -768,7 +786,6 @@ else
   rm_dir "${NETDATA_PREFIX}/var/cache/netdata"
   rm_dir "${NETDATA_PREFIX}/var/log/netdata"
   rm_dir "${NETDATA_PREFIX}/etc/netdata"
-  rm_dir /usr/lib/systemd/[email protected]/
 fi
 
 if [ -n "${tmpdir}" ]; then

diff --git a/packaging/installer/netdata-updater.sh b/packaging/installer/netdata-updater.sh
@@ -172,6 +172,14 @@ issystemd() {
   return 1
 }
 
+systemd_unit_exists() {
+  if systemctl list-unit-files "${1}" 2>&1 | tail -n 1 | grep -qv '^0 '; then
+    return 0
+  else
+    return 1
+  fi
+}
+
 # shellcheck disable=SC2009
 running_under_anacron() {
     pid="${1:-$$}"
@@ -307,11 +315,17 @@ enable_netdata_updater() {
   case "${updater_type}" in
     "systemd")
       if issystemd; then
-        systemctl enable netdata-updater.timer
-
-        info "Auto-updating has been ENABLED using a systemd timer unit.\n"
-        info "If the update process fails, the failure will be logged to the systemd journal just like a regular service failure."
-        info "Successful updates should produce empty logs."
+        if systemd_unit_exists netdata-updater.timer; then
+          systemctl enable netdata-updater.timer
+          systemctl start netdata-updater.timer
+
+          info "Auto-updating has been ENABLED using a systemd timer unit.\n"
+          info "If the update process fails, the failure will be logged to the systemd journal just like a regular service failure."
+          info "Successful updates should produce empty logs."
+        else
+          error "Systemd-based auto-update scheduling requested, but the required timer unit does not exist. Auto-updates have NOT been enabled."
+          return 1
+        fi
       else
         error "Systemd-based auto-update scheduling requested, but this does not appear to be a systemd system. Auto-updates have NOT been enabled."
         return 1
@@ -351,8 +365,9 @@ enable_netdata_updater() {
 }
 
 disable_netdata_updater() {
-  if issystemd && ( systemctl list-units --full -all | grep -Fq "netdata-updater.timer" ) ; then
+  if issystemd && systemd_unit_exists "netdata-updater.timer" ; then
     systemctl disable netdata-updater.timer
+    systemctl stop netdata-updater.timer
   fi
 
   if [ -d /etc/cron.daily ]; then
@@ -387,7 +402,7 @@ auto_update_status() {
   enabled=""
 
   if issystemd; then
-    if systemctl list-units --full -all | grep -Fq "netdata-updater.timer"; then
+    if systemd_unit_exists "netdata-updater.timer"; then
       if systemctl is-enabled netdata-updater.timer; then
         info "Auto-updates using a systemd timer unit are ENABLED"
         enabled="systemd"

diff --git a/packaging/windows/package-windows.sh b/packaging/windows/package-windows.sh
@@ -29,7 +29,7 @@ fi
 
 ${GITHUB_ACTIONS+echo "::group::Licenses"}
 if [ ! -f "/gpl-3.0.txt" ]; then
-    curl -o /gpl-3.0.txt "https://www.gnu.org/licenses/gpl-3.0.txt"
+    cp "${repo_root}/LICENSE" /gpl-3.0.txt
 fi
 
 if [ ! -f "/cloud.txt" ]; then

diff --git a/src/web/api/functions/functions.c b/src/web/api/functions/functions.c
@@ -8,7 +8,7 @@ void global_functions_add(void) {
     rrd_function_add_inline(
         localhost,
         NULL,
-        "streaming",
+        "netdata-streaming",
         10,
         RRDFUNCTIONS_PRIORITY_DEFAULT + 1,
         RRDFUNCTIONS_VERSION_DEFAULT,
@@ -22,7 +22,7 @@ void global_functions_add(void) {
         NULL,
         "netdata-api-calls",
         10,
-        RRDFUNCTIONS_PRIORITY_DEFAULT + 2,
+        RRDFUNCTIONS_PRIORITY_DEFAULT + 1,
         RRDFUNCTIONS_VERSION_DEFAULT,
         RRDFUNCTIONS_PROGRESS_HELP,
         "top",
@@ -44,9 +44,9 @@ void global_functions_add(void) {
     rrd_function_add_inline(
         localhost,
         NULL,
-        "metrics-cardinality",
+        "netdata-metrics-cardinality",
         10,
-        RRDFUNCTIONS_PRIORITY_DEFAULT,
+        RRDFUNCTIONS_PRIORITY_DEFAULT + 1,
         RRDFUNCTIONS_VERSION_DEFAULT,
         RRDFUNCTIONS_METRICS_CARDINALITY_HELP,
         "top",

diff --git a/system/install-service.sh.in b/system/install-service.sh.in
@@ -229,16 +229,27 @@ check_systemd() {
 }
 
 get_systemd_service_dir() {
-  if [ -w "/lib/systemd/system" ]; then
-    echo "/lib/systemd/system"
-  elif [ -w "/usr/lib/systemd/system" ]; then
-    echo "/usr/lib/systemd/system"
-  elif [ -w "/etc/systemd/system" ]; then
-    echo "/etc/systemd/system"
+  set +e
+  unit_paths="$(systemctl show -p UnitPath | cut -f 2- -d '=' | tr ' ' '\n')"
+  set -e
+
+  if [ -n "${unit_paths}" ]; then
+    lib_paths="$(echo "${unit_paths}" | grep -vE '^/(run|etc)' | awk '{line[NR] = $0} END {for (i = NR; i > 0; i--) print line[i]}')"
+    etc_paths="$(echo "${unit_paths}" | grep -E '^/etc' | grep -vE '(attached|control)$')"
   else
-    error "Unable to detect systemd service directory."
-    exit 4
+    lib_paths="/usr/lib/systemd/system /lib/systemd/system /usr/local/lib/systemd/system"
+    etc_paths="/etc/systemd/system"
   fi
+
+  for path in ${lib_paths} ${etc_paths}; do
+    if [ -d "${path}" ] && [ -w "${path}" ]; then
+      echo "${path}"
+      return 0
+    fi
+  done
+
+  error "Unable to detect usable systemd service directory."
+  exit 4
 }
 
 install_systemd_service() {