!34 [sync] PR-32: recover check number printing and trim dbengine test frequency

From: @openeuler-sync-bot Reviewed-by: @dillon_chen Signed-off-by: @dillon_chen
recover check number printing and trim dbengine test frequency
2024-01-08 04:27:44 +00:00 · 2024-01-08 09:55:05 +08:00 · 2024-01-02 04:26:33 +00:00 · 2023-12-29 16:28:21 +08:00 · 2023-05-24 10:10:13 +00:00 · 2023-05-24 15:10:27 +08:00
16 changed files with 870 additions and 741 deletions
--- a/Fix-missing-extern-in-some-global-variables.patch
+++ b/Fix-missing-extern-in-some-global-variables.patch
@ -1,125 +0,0 @@
-From c65f57af0714558294c1ad1b9568077720fb282b Mon Sep 17 00:00:00 2001
-From: Thiago Marques <thiagoftsm@gmail.com>
-Date: Tue, 28 Jan 2020 13:59:20 +0000
-Subject: [PATCH] missing_extern: Fix missing
-
-Fix few externs that were missing in global variables
-
---
- daemon/common.c            | 2 +-
- daemon/common.h            | 2 +-
- health/health.c            | 1 +
- health/health.h            | 2 +-
- libnetdata/health/health.c | 4 +++-
- libnetdata/health/health.h | 2 +-
- web/api/web_api_v1.c       | 2 ++
- web/api/web_api_v1.h       | 2 +-
- 8 files changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/daemon/common.c b/daemon/common.c
-index e28f6cf..67497a4 100644
--- a/daemon/common.c
-+++ b/daemon/common.c
-@@ -13,4 +13,4 @@ char *netdata_configured_varlib_dir          = VARLIB_DIR;
- char *netdata_configured_home_dir            = CACHE_DIR;
- char *netdata_configured_host_prefix         = NULL;
- char *netdata_configured_timezone            = NULL;
-
-+int netdata_ready;
-diff --git a/daemon/common.h b/daemon/common.h
-index a15ddb8..d02c0d9 100644
--- a/daemon/common.h
-+++ b/daemon/common.h
-@@ -80,6 +80,6 @@ extern char *netdata_configured_host_prefix;
- extern char *netdata_configured_timezone;
- extern int netdata_anonymous_statistics_enabled;
- 
-int netdata_ready;
-+extern int netdata_ready;
- 
- #endif /* NETDATA_COMMON_H */
-diff --git a/health/health.c b/health/health.c
-index 55bd728..559da63 100644
--- a/health/health.c
-+++ b/health/health.c
-@@ -9,6 +9,7 @@ struct health_cmdapi_thread_status {
- };
- 
- unsigned int default_health_enabled = 1;
-+char *silencers_filename;
- 
- // ----------------------------------------------------------------------------
- // health initialization
-diff --git a/health/health.h b/health/health.h
-index 6920d12..d116da2 100644
--- a/health/health.h
-+++ b/health/health.h
-@@ -50,7 +50,7 @@ extern unsigned int default_health_enabled;
- 
- #define HEALTH_SILENCERS_MAX_FILE_LEN 10000
- 
-char *silencers_filename;
-+extern char *silencers_filename;
- 
- extern void health_init(void);
- extern void *health_main(void *ptr);
-diff --git a/libnetdata/health/health.c b/libnetdata/health/health.c
-index b93de8b..40c4e3d 100644
--- a/libnetdata/health/health.c
-+++ b/libnetdata/health/health.c
-@@ -1,5 +1,7 @@
- #include "health.h"
- 
-+SILENCERS *silencers;
-+
- /**
-  * Create Silencer
-  *
-@@ -167,4 +169,4 @@ int health_initialize_global_silencers() {
-     silencers->silencers=NULL;
- 
-     return 0;
-}
-\ No newline at end of file
-+}
-diff --git a/libnetdata/health/health.h b/libnetdata/health/health.h
-index a3dc077..f7580ed 100644
--- a/libnetdata/health/health.h
-+++ b/libnetdata/health/health.h
-@@ -44,7 +44,7 @@ typedef struct silencers {
-     SILENCER *silencers;
- } SILENCERS;
- 
-SILENCERS *silencers;
-+extern SILENCERS *silencers;
- 
- extern SILENCER *create_silencer(void);
- extern int health_silencers_json_read_callback(JSON_ENTRY *e);
-diff --git a/web/api/web_api_v1.c b/web/api/web_api_v1.c
-index 7c0d728..d5c0d04 100644
--- a/web/api/web_api_v1.c
-+++ b/web/api/web_api_v1.c
-@@ -2,6 +2,8 @@
- 
- #include "web_api_v1.h"
- 
-+char *api_secret;
-+
- static struct {
-     const char *name;
-     uint32_t hash;
-diff --git a/web/api/web_api_v1.h b/web/api/web_api_v1.h
-index 70b7817..e9f0401 100644
--- a/web/api/web_api_v1.h
-+++ b/web/api/web_api_v1.h
-@@ -26,6 +26,6 @@ extern int web_client_api_request_v1(RRDHOST *host, struct web_client *w, char *
- extern void web_client_api_v1_init(void);
- extern void web_client_api_v1_management_init(void);
- 
-char *api_secret;
-+extern char *api_secret;
- 
- #endif //NETDATA_WEB_API_V1_H
-- 
-2.30.0
-
--- a/README-packager.md
+++ b/README-packager.md
@ -0,0 +1,25 @@
+# netdata
+
+Netdata is the fastest way to visualize metrics. It is a resource efficient, highly optimized system for collecting and visualizing any type of realtime time-series data, from CPU usage, disk activity, SQL queries, API calls, web site visitors, etc.
+
+netdata tries to visualize the truth of now, in its greatest detail, so that you can get insights of what is happening now and what just happened, on your systems and applications.
+
+## Plugins
+
+### Activate mysql plugin
+
+Be sure to have python library for mysql MySQLdb (faster) or PyMySQL (slower)
+
+* openEuler
+
+    ````
+    sudo dnf install python3-mysql
+    ````
+
+Create netdata mysql user
+
+````
+CREATE USER 'netdata'@'localhost';
+GRANT USAGE on *.* to 'netdata'@'localhost';
+FLUSH PRIVILEGES;
+````
--- a/config.tar.gz
+++ b/config.tar.gz
--- a/netdata-1.16.0.tar.gz
+++ b/netdata-1.16.0.tar.gz
--- a/netdata-fix-python2-not-compatible-with-python3.patch
+++ b/netdata-fix-python2-not-compatible-with-python3.patch
@ -1,30 +0,0 @@
-From 6c8901a24505bbf3595c9a7e65117e63242e7ac7 Mon Sep 17 00:00:00 2001
-From: bzg1107 <preloyalwhite@163.com>
-Date: Thu, 19 Aug 2021 10:38:45 +0800
-Subject: [PATCH] netdata fix python2 not compatible with python3
-
---
- collectors/python.d.plugin/python_modules/pyyaml3/__init__.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/collectors/python.d.plugin/python_modules/pyyaml3/__init__.py b/collectors/python.d.plugin/python_modules/pyyaml3/__init__.py
-index a884b33..0094c3f 100644
--- a/collectors/python.d.plugin/python_modules/pyyaml3/__init__.py
-+++ b/collectors/python.d.plugin/python_modules/pyyaml3/__init__.py
-@@ -282,11 +282,12 @@ class YAMLObjectMetaclass(type):
-             cls.yaml_loader.add_constructor(cls.yaml_tag, cls.from_yaml)
-             cls.yaml_dumper.add_representer(cls, cls.to_yaml)
- 
-class YAMLObject(metaclass=YAMLObjectMetaclass):
-+class YAMLObject(object):
-     """
-     An object that can dump itself to a YAML stream
-     and load itself from a YAML stream.
-     """
-+    __metaclass__ = YAMLObjectMetaclass
- 
-     __slots__ = ()  # no direct instantiation, so allow immutable subclasses
- 
-- 
-2.27.0
-
--- a/netdata-fix-shebang-1.16.0.patch
+++ b/netdata-fix-shebang-1.16.0.patch
@ -1,444 +0,0 @@
-Fix shebang according to
-https://docs.fedoraproject.org/en-US/packaging-guidelines/#_shebang_lines
-
-diff -rup a/backends/nc-backend.sh b/backends/nc-backend.sh
--- a/backends/nc-backend.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/backends/nc-backend.sh	2019-07-09 12:14:38.544596979 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- 
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
-diff -rup a/collectors/cgroups.plugin/cgroup-name.sh.in b/collectors/cgroups.plugin/cgroup-name.sh.in
--- a/collectors/cgroups.plugin/cgroup-name.sh.in	2019-07-08 13:52:29.000000000 +0200
-+++ b/collectors/cgroups.plugin/cgroup-name.sh.in	2019-07-09 12:14:38.560597055 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- #shellcheck disable=SC2001
- 
- # netdata
-diff -rup a/collectors/cgroups.plugin/cgroup-network-helper.sh b/collectors/cgroups.plugin/cgroup-network-helper.sh
--- a/collectors/cgroups.plugin/cgroup-network-helper.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/collectors/cgroups.plugin/cgroup-network-helper.sh	2019-07-09 12:14:38.559597050 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # shellcheck disable=SC1117
- 
- # cgroup-network-helper.sh
-diff -rup a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh
--- a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh	2019-07-09 12:14:38.552597017 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- # shellcheck disable=SC2181
-diff -rup a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.plugin/charts.d.plugin.in
--- a/collectors/charts.d.plugin/charts.d.plugin.in	2019-07-08 13:52:29.000000000 +0200
-+++ b/collectors/charts.d.plugin/charts.d.plugin.in	2019-07-09 12:14:38.554597026 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- # netdata
-diff -rup a/collectors/fping.plugin/fping.plugin.in b/collectors/fping.plugin/fping.plugin.in
--- a/collectors/fping.plugin/fping.plugin.in	2019-07-08 13:52:29.000000000 +0200
-+++ b/collectors/fping.plugin/fping.plugin.in	2019-07-09 12:14:38.546596989 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- # netdata
-diff -rup a/collectors/ioping.plugin/ioping.plugin.in b/collectors/ioping.plugin/ioping.plugin.in
--- a/collectors/ioping.plugin/ioping.plugin.in	2019-07-08 13:52:29.000000000 +0200
-+++ b/collectors/ioping.plugin/ioping.plugin.in	2019-07-09 12:14:38.550597008 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- # netdata
-diff -rup a/collectors/node.d.plugin/node.d.plugin.in b/collectors/node.d.plugin/node.d.plugin.in
--- a/collectors/node.d.plugin/node.d.plugin.in	2019-07-08 13:52:29.000000000 +0200
-+++ b/collectors/node.d.plugin/node.d.plugin.in	2019-07-09 12:14:38.562597064 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- ':' //; exec "$(command -v nodejs || command -v node || echo "ERROR node IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@"
- 
- // shebang hack from:
-diff -rup a/collectors/python.d.plugin/python.d.plugin.in b/collectors/python.d.plugin/python.d.plugin.in
--- a/collectors/python.d.plugin/python.d.plugin.in	2019-07-08 13:52:29.000000000 +0200
-+++ b/collectors/python.d.plugin/python.d.plugin.in	2019-07-09 12:14:38.557597040 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- '''':;
- if [[ "$OSTYPE" == "darwin"* ]]; then
-     export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
-diff -rup a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py
--- a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py	2019-07-08 13:52:29.000000000 +0200
-+++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py	2019-07-09 12:14:38.652597487 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#
- # -*- coding: utf-8 -*-
- #
- # client.py - Somewhat higher-level GUI_RPC API for BOINC core client
-diff -rup a/collectors/tc.plugin/tc-qos-helper.sh.in b/collectors/tc.plugin/tc-qos-helper.sh.in
--- a/collectors/tc.plugin/tc-qos-helper.sh.in	2019-07-08 13:52:29.000000000 +0200
-+++ b/collectors/tc.plugin/tc-qos-helper.sh.in	2019-07-09 12:14:38.548596998 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- 
- # netdata
- # real-time performance and health monitoring, done right!
-diff -rup a/contrib/rhel/build-netdata-rpm.sh b/contrib/rhel/build-netdata-rpm.sh
--- a/contrib/rhel/build-netdata-rpm.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/contrib/rhel/build-netdata-rpm.sh	2019-07-09 12:14:38.564597073 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- 
- # docker run -it --rm centos:6.9 /bin/sh
- # yum -y install rpm-build redhat-rpm-config yum-utils autoconf automake curl gcc git libmnl-devel libuuid-devel make pkgconfig zlib-devel
-diff -rup a/contrib/sles11/alarm-notify-basic.bash3.sh b/contrib/sles11/alarm-notify-basic.bash3.sh
--- a/contrib/sles11/alarm-notify-basic.bash3.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/contrib/sles11/alarm-notify-basic.bash3.sh	2019-07-09 12:14:38.566597083 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- 
- # basic version of netdata notifier to work with bash3
- # only mail and syslog destinations are supported, one recipient each
-diff -rup a/coverity-install.sh b/coverity-install.sh
--- a/coverity-install.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/coverity-install.sh	2019-07-09 12:14:38.567597088 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # Coverity installation script
- #
- # Copyright: SPDX-License-Identifier: GPL-3.0-or-later
-diff -rup a/coverity-scan.sh b/coverity-scan.sh
--- a/coverity-scan.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/coverity-scan.sh	2019-07-09 12:14:38.569597097 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # Coverity scan script
- #
- # To run this script you need to provide API token. This can be done either by:
-diff -rup a/cppcheck.sh b/cppcheck.sh
--- a/cppcheck.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/cppcheck.sh	2019-07-09 12:14:38.571597106 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- 
- # echo >>/tmp/cppcheck.log "cppcheck ${*}"
- 
-diff -rup a/daemon/anonymous-statistics.sh.in b/daemon/anonymous-statistics.sh.in
--- a/daemon/anonymous-statistics.sh.in	2019-07-08 13:52:29.000000000 +0200
-+++ b/daemon/anonymous-statistics.sh.in	2019-07-09 12:14:38.619597332 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
-+#!/usr/bin/sh
- 
- # Valid actions:
- 
-diff -rup a/daemon/system-info.sh b/daemon/system-info.sh
--- a/daemon/system-info.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/daemon/system-info.sh	2019-07-09 12:14:38.621597341 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
-+#!/usr/bin/sh
- 
- # -------------------------------------------------------------------------------------------------
- # detect the kernel
-diff -rup a/diagrams/build.sh b/diagrams/build.sh
--- a/diagrams/build.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/diagrams/build.sh	2019-07-09 12:14:38.572597111 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- path=$(dirname "$0")
-diff -rup a/health/notifications/alarm-email.sh b/health/notifications/alarm-email.sh
--- a/health/notifications/alarm-email.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/health/notifications/alarm-email.sh	2019-07-09 12:14:38.575597125 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- # OBSOLETE - REPLACED WITH
-diff -rup a/health/notifications/alarm-notify.sh.in b/health/notifications/alarm-notify.sh.in
--- a/health/notifications/alarm-notify.sh.in	2019-07-08 13:52:29.000000000 +0200
-+++ b/health/notifications/alarm-notify.sh.in	2019-07-09 12:14:38.579597144 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- #shellcheck source=/dev/null disable=SC2086,SC2154
- 
- # netdata
-diff -rup a/health/notifications/alarm-test.sh b/health/notifications/alarm-test.sh
--- a/health/notifications/alarm-test.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/health/notifications/alarm-test.sh	2019-07-09 12:14:38.574597120 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- 
- # netdata
- # real-time performance and health monitoring, done right!
-diff -rup a/netdata-installer.sh b/netdata-installer.sh
--- a/netdata-installer.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/netdata-installer.sh	2019-07-09 12:14:38.582597158 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- # shellcheck disable=SC2046,SC2086,SC2166
- 
-diff -rup a/packaging/docker/build.sh b/packaging/docker/build.sh
--- a/packaging/docker/build.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/docker/build.sh	2019-07-09 12:14:38.594597214 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- #
- #
- # Copyright: SPDX-License-Identifier: GPL-3.0-or-later
-diff -rup a/packaging/docker/check_login.sh b/packaging/docker/check_login.sh
--- a/packaging/docker/check_login.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/docker/check_login.sh	2019-07-09 12:14:38.595597219 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- #
- # This is a credential checker script, to help get early input on docker credentials status
- # If these are wrong, then build/publish has no point running
-diff -rup a/packaging/docker/publish.sh b/packaging/docker/publish.sh
--- a/packaging/docker/publish.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/docker/publish.sh	2019-07-09 12:14:38.592597205 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- #
- # Cross-arch docker publish helper script
- # Needs docker in version >18.02 due to usage of manifests
-diff -rup a/packaging/docker/run.sh b/packaging/docker/run.sh
--- a/packaging/docker/run.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/docker/run.sh	2019-07-09 12:14:38.591597200 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- #
- # Entry point script for netdata
- #
-diff -rup a/packaging/installer/kickstart.sh b/packaging/installer/kickstart.sh
--- a/packaging/installer/kickstart.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/installer/kickstart.sh	2019-07-09 12:14:38.625597360 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
-+#!/usr/bin/sh
- # SPDX-License-Identifier: GPL-3.0-or-later
- #
- # Run me with:
-diff -rup a/packaging/installer/kickstart-static64.sh b/packaging/installer/kickstart-static64.sh
--- a/packaging/installer/kickstart-static64.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/installer/kickstart-static64.sh	2019-07-09 12:14:38.623597350 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
-+#!/usr/bin/sh
- # SPDX-License-Identifier: GPL-3.0-or-later
- # shellcheck disable=SC1117,SC2039,SC2059,SC2086
- 
-diff -rup a/packaging/installer/netdata-uninstaller.sh b/packaging/installer/netdata-uninstaller.sh
--- a/packaging/installer/netdata-uninstaller.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/installer/netdata-uninstaller.sh	2019-07-09 12:14:38.587597181 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- #shellcheck disable=SC2181
- #
- # This is the netdata uninstaller script
-diff -rup a/packaging/installer/netdata-updater.sh b/packaging/installer/netdata-updater.sh
--- a/packaging/installer/netdata-updater.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/installer/netdata-updater.sh	2019-07-09 12:14:38.584597167 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- #shellcheck disable=SC2164
- 
- # this script will uninstall netdata
-diff -rup a/packaging/makeself/build.sh b/packaging/makeself/build.sh
--- a/packaging/makeself/build.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/makeself/build.sh	2019-07-09 12:14:38.626597365 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
-+#!/usr/bin/sh
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- # -----------------------------------------------------------------------------
-diff -rup a/packaging/makeself/build-x86_64-static.sh b/packaging/makeself/build-x86_64-static.sh
--- a/packaging/makeself/build-x86_64-static.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/makeself/build-x86_64-static.sh	2019-07-09 12:14:38.597597228 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- . $(dirname "$0")/../installer/functions.sh || exit 1
-diff -rup a/packaging/makeself/functions.sh b/packaging/makeself/functions.sh
--- a/packaging/makeself/functions.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/makeself/functions.sh	2019-07-09 12:14:38.614597308 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- # -----------------------------------------------------------------------------
-diff -rup a/packaging/makeself/install-alpine-packages.sh b/packaging/makeself/install-alpine-packages.sh
--- a/packaging/makeself/install-alpine-packages.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/makeself/install-alpine-packages.sh	2019-07-09 12:14:38.628597374 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
-+#!/usr/bin/sh
- #
- # Installation script for the alpine host
- # to prepare the static binary
-diff -rup a/packaging/makeself/install-or-update.sh b/packaging/makeself/install-or-update.sh
--- a/packaging/makeself/install-or-update.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/makeself/install-or-update.sh	2019-07-09 12:14:38.612597299 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- . $(dirname "${0}")/functions.sh
-diff -rup a/packaging/makeself/jobs/10-prepare-destination.install.sh b/packaging/makeself/jobs/10-prepare-destination.install.sh
--- a/packaging/makeself/jobs/10-prepare-destination.install.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/makeself/jobs/10-prepare-destination.install.sh	2019-07-09 12:14:38.600597243 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- . $(dirname "${0}")/../functions.sh "${@}" || exit 1
-diff -rup a/packaging/makeself/jobs/50-bash-4.4.18.install.sh b/packaging/makeself/jobs/50-bash-4.4.18.install.sh
--- a/packaging/makeself/jobs/50-bash-4.4.18.install.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/makeself/jobs/50-bash-4.4.18.install.sh	2019-07-09 12:14:38.610597290 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- . $(dirname "${0}")/../functions.sh "${@}" || exit 1
-diff -rup a/packaging/makeself/jobs/50-curl-7.60.0.install.sh b/packaging/makeself/jobs/50-curl-7.60.0.install.sh
--- a/packaging/makeself/jobs/50-curl-7.60.0.install.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/makeself/jobs/50-curl-7.60.0.install.sh	2019-07-09 12:14:38.605597266 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- . $(dirname "${0}")/../functions.sh "${@}" || exit 1
-diff -rup a/packaging/makeself/jobs/50-fping-4.2.install.sh b/packaging/makeself/jobs/50-fping-4.2.install.sh
--- a/packaging/makeself/jobs/50-fping-4.2.install.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/makeself/jobs/50-fping-4.2.install.sh	2019-07-09 12:14:38.607597276 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- . $(dirname "${0}")/../functions.sh "${@}" || exit 1
-diff -rup a/packaging/makeself/jobs/50-ioping-1.1.install.sh b/packaging/makeself/jobs/50-ioping-1.1.install.sh
--- a/packaging/makeself/jobs/50-ioping-1.1.install.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/makeself/jobs/50-ioping-1.1.install.sh	2019-07-09 12:14:38.602597252 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- . $(dirname "${0}")/../functions.sh "${@}" || exit 1
-diff -rup a/packaging/makeself/jobs/70-netdata-git.install.sh b/packaging/makeself/jobs/70-netdata-git.install.sh
--- a/packaging/makeself/jobs/70-netdata-git.install.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/makeself/jobs/70-netdata-git.install.sh	2019-07-09 12:14:38.608597280 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- . ${NETDATA_MAKESELF_PATH}/functions.sh "${@}" || exit 1
-diff -rup a/packaging/makeself/jobs/99-makeself.install.sh b/packaging/makeself/jobs/99-makeself.install.sh
--- a/packaging/makeself/jobs/99-makeself.install.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/makeself/jobs/99-makeself.install.sh	2019-07-09 12:14:38.603597257 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- . $(dirname "${0}")/../functions.sh "${@}" || exit 1
-diff -rup a/packaging/makeself/run-all-jobs.sh b/packaging/makeself/run-all-jobs.sh
--- a/packaging/makeself/run-all-jobs.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/makeself/run-all-jobs.sh	2019-07-09 12:14:38.598597233 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # SPDX-License-Identifier: GPL-3.0-or-later
- 
- LC_ALL=C
-diff -rup a/packaging/manual_nightly_deployment.sh b/packaging/manual_nightly_deployment.sh
--- a/packaging/manual_nightly_deployment.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/packaging/manual_nightly_deployment.sh	2019-07-09 12:14:38.589597191 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- #
- # This tool allows netdata team to manually deploy nightlies
- # It emulates the nightly operations required for a new version to be published for our users
-diff -rup a/system/edit-config.in b/system/edit-config.in
--- a/system/edit-config.in	2019-07-08 13:52:29.000000000 +0200
-+++ b/system/edit-config.in	2019-07-09 12:14:38.630597383 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
-+#!/usr/bin/sh
- 
- [ -f /etc/profile ] && . /etc/profile
- 
-diff -rup a/system/netdata-lsb.in b/system/netdata-lsb.in
--- a/system/netdata-lsb.in	2019-07-08 13:52:29.000000000 +0200
-+++ b/system/netdata-lsb.in	2019-07-09 12:14:38.615597313 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- #
- # Netdata LSB start script
- #
-diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh.in b/tests/health_mgmtapi/health-cmdapi-test.sh.in
--- a/tests/health_mgmtapi/health-cmdapi-test.sh.in	2019-07-08 13:52:29.000000000 +0200
-+++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in	2019-07-09 12:14:38.617597322 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-+#!/usr/bin/bash
- # shellcheck disable=SC1117,SC2034,SC2059,SC2086,SC2181
- 
- NETDATA_VARLIB_DIR="@varlibdir_POST@"
-diff -rup a/tests/updater_checks.sh b/tests/updater_checks.sh
--- a/tests/updater_checks.sh	2019-07-08 13:52:29.000000000 +0200
-+++ b/tests/updater_checks.sh	2019-07-09 12:14:38.632597393 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
-+#!/usr/bin/sh
- #
- # Wrapper script that installs the required dependencies
- # for the BATS script to run successfully
--- a/netdata-fix-shebang-1.39.0.patch
+++ b/netdata-fix-shebang-1.39.0.patch
@ -0,0 +1,336 @@
+Fix shebang according to
+https://docs.fedoraproject.org/en-US/packaging-guidelines/#_shebang_lines
+
+diff -rup a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in
+--- a/claim/netdata-claim.sh.in	2023-05-08 14:52:30.397594409 +0200
+++ b/claim/netdata-claim.sh.in	2023-05-14 11:12:13.229357763 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ # netdata
+ # real-time performance and health monitoring, done right!
+ # (C) 2017 Costa Tsaousis <costa@tsaousis.gr>
+diff -rup a/collectors/cgroups.plugin/cgroup-name.sh b/collectors/cgroups.plugin/cgroup-name.sh
+--- a/collectors/cgroups.plugin/cgroup-name.sh	2023-05-08 14:52:30.397594409 +0200
+++ b/collectors/cgroups.plugin/cgroup-name.sh	2023-05-14 11:12:13.253357925 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ #shellcheck disable=SC2001
+ 
+ # netdata
+diff -rup a/collectors/cgroups.plugin/cgroup-network-helper.sh b/collectors/cgroups.plugin/cgroup-network-helper.sh
+--- a/collectors/cgroups.plugin/cgroup-network-helper.sh	2023-05-08 14:52:30.397594409 +0200
+++ b/collectors/cgroups.plugin/cgroup-network-helper.sh	2023-05-14 11:12:13.251357912 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ # shellcheck disable=SC1117
+ 
+ # cgroup-network-helper.sh
+diff -rup a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh
+--- a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh	2023-05-08 14:52:30.401594370 +0200
+++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh	2023-05-14 11:12:13.242357851 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
+ # shellcheck disable=SC2181
+diff -rup a/collectors/charts.d.plugin/charts.d.plugin b/collectors/charts.d.plugin/charts.d.plugin
+--- a/collectors/charts.d.plugin/charts.d.plugin	2023-05-08 14:53:14.493122687 +0200
+++ b/collectors/charts.d.plugin/charts.d.plugin	2023-05-14 11:12:13.240357837 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
+ # netdata
+diff -rup a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.plugin/charts.d.plugin.in
+--- a/collectors/charts.d.plugin/charts.d.plugin.in	2023-05-08 14:52:30.401594370 +0200
+++ b/collectors/charts.d.plugin/charts.d.plugin.in	2023-05-14 11:12:13.237357817 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
+ # netdata
+diff -rup a/collectors/ioping.plugin/ioping.plugin b/collectors/ioping.plugin/ioping.plugin
+--- a/collectors/ioping.plugin/ioping.plugin	2023-05-08 14:53:14.653120991 +0200
+++ b/collectors/ioping.plugin/ioping.plugin	2023-05-14 11:12:13.245357872 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
+ # netdata
+diff -rup a/collectors/ioping.plugin/ioping.plugin.in b/collectors/ioping.plugin/ioping.plugin.in
+--- a/collectors/ioping.plugin/ioping.plugin.in	2023-05-08 14:52:30.409594292 +0200
+++ b/collectors/ioping.plugin/ioping.plugin.in	2023-05-14 11:12:13.247357885 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
+ # netdata
+diff -rup a/collectors/python.d.plugin/python.d.plugin b/collectors/python.d.plugin/python.d.plugin
+--- a/collectors/python.d.plugin/python.d.plugin	2023-05-08 14:53:14.929118066 +0200
+++ b/collectors/python.d.plugin/python.d.plugin	2023-05-14 11:12:13.259357966 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ '''':;
+ pybinary=$(which python3 || which python || which python2)
+ filtered=()
+diff -rup a/collectors/python.d.plugin/python.d.plugin.in b/collectors/python.d.plugin/python.d.plugin.in
+--- a/collectors/python.d.plugin/python.d.plugin.in	2023-05-08 14:52:30.429594097 +0200
+++ b/collectors/python.d.plugin/python.d.plugin.in	2023-05-14 11:12:13.256357946 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ '''':;
+ pybinary=$(which python3 || which python || which python2)
+ filtered=()
+diff -rup a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py
+--- a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py	2023-05-08 14:52:30.433594058 +0200
+++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py	2023-05-14 11:12:13.437359174 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#
+ # -*- coding: utf-8 -*-
+ #
+ # client.py - Somewhat higher-level GUI_RPC API for BOINC core client
+diff -rup a/collectors/tc.plugin/tc-qos-helper.sh b/collectors/tc.plugin/tc-qos-helper.sh
+--- a/collectors/tc.plugin/tc-qos-helper.sh	2023-05-08 14:53:15.429112767 +0200
+++ b/collectors/tc.plugin/tc-qos-helper.sh	2023-05-14 11:12:13.232357783 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ 
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff -rup a/collectors/tc.plugin/tc-qos-helper.sh.in b/collectors/tc.plugin/tc-qos-helper.sh.in
+--- a/collectors/tc.plugin/tc-qos-helper.sh.in	2023-05-08 14:52:30.441593980 +0200
+++ b/collectors/tc.plugin/tc-qos-helper.sh.in	2023-05-14 11:12:13.234357797 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ 
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff -rup a/contrib/debian/install_go.sh b/contrib/debian/install_go.sh
+--- a/contrib/debian/install_go.sh	2023-05-08 14:52:30.441593980 +0200
+++ b/contrib/debian/install_go.sh	2023-05-14 11:12:13.261357980 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ 
+ GO_PACKAGE_VERSION="$1"
+ LIB_DIR="$2"
+diff -rup a/contrib/rhel/build-netdata-rpm.sh b/contrib/rhel/build-netdata-rpm.sh
+--- a/contrib/rhel/build-netdata-rpm.sh	2023-05-08 14:52:30.441593980 +0200
+++ b/contrib/rhel/build-netdata-rpm.sh	2023-05-14 11:12:13.264358000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ 
+ # docker run -it --rm centos:6.9 /bin/sh
+ # yum -y install rpm-build redhat-rpm-config yum-utils autoconf automake curl gcc git libmnl-devel libuuid-devel make pkgconfig zlib-devel
+diff -rup a/coverity-scan.sh b/coverity-scan.sh
+--- a/coverity-scan.sh	2023-05-08 14:52:30.441593980 +0200
+++ b/coverity-scan.sh	2023-05-14 11:12:13.266358014 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ #
+ # Coverity scan script
+ #
+diff -rup a/cppcheck.sh b/cppcheck.sh
+--- a/cppcheck.sh	2023-05-08 14:52:30.441593980 +0200
+++ b/cppcheck.sh	2023-05-14 11:12:13.269358034 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ 
+ # echo >>/tmp/cppcheck.log "cppcheck ${*}"
+ 
+diff -rup a/daemon/anonymous-statistics.sh b/daemon/anonymous-statistics.sh
+--- a/daemon/anonymous-statistics.sh	2023-05-08 14:53:15.469112343 +0200
+++ b/daemon/anonymous-statistics.sh	2023-05-14 11:12:13.309358305 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env sh
+#!/usr/bin/sh
+ 
+ # Valid actions:
+ 
+diff -rup a/daemon/anonymous-statistics.sh.in b/daemon/anonymous-statistics.sh.in
+--- a/daemon/anonymous-statistics.sh.in	2023-05-08 14:52:30.445593941 +0200
+++ b/daemon/anonymous-statistics.sh.in	2023-05-14 11:12:13.312358326 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env sh
+#!/usr/bin/sh
+ 
+ # Valid actions:
+ 
+diff -rup a/daemon/get-kubernetes-labels.sh b/daemon/get-kubernetes-labels.sh
+--- a/daemon/get-kubernetes-labels.sh	2023-05-08 14:53:15.473112301 +0200
+++ b/daemon/get-kubernetes-labels.sh	2023-05-14 11:12:13.275358075 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ me="$(basename "${0}")"
+ 
+ # Checks if netdata is running in a kubernetes pod and fetches:
+diff -rup a/daemon/get-kubernetes-labels.sh.in b/daemon/get-kubernetes-labels.sh.in
+--- a/daemon/get-kubernetes-labels.sh.in	2023-05-08 14:52:30.445593941 +0200
+++ b/daemon/get-kubernetes-labels.sh.in	2023-05-14 11:12:13.272358054 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ me="$(basename "${0}")"
+ 
+ # Checks if netdata is running in a kubernetes pod and fetches:
+diff -rup a/daemon/system-info.sh b/daemon/system-info.sh
+--- a/daemon/system-info.sh	2023-05-08 14:52:30.445593941 +0200
+++ b/daemon/system-info.sh	2023-05-14 11:12:13.307358292 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env sh
+#!/usr/bin/sh
+ 
+ # -------------------------------------------------------------------------------------------------
+ # detect the kernel
+diff -rup a/diagrams/build.sh b/diagrams/build.sh
+--- a/diagrams/build.sh	2023-05-08 14:52:30.505593355 +0200
+++ b/diagrams/build.sh	2023-05-14 11:12:13.277358089 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
+ path=$(dirname "$0")
+diff -rup a/exporting/nc-exporting.sh b/exporting/nc-exporting.sh
+--- a/exporting/nc-exporting.sh	2023-05-08 14:52:30.525593160 +0200
+++ b/exporting/nc-exporting.sh	2023-05-14 11:12:13.279358102 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ 
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
+diff -rup a/health/notifications/alarm-email.sh b/health/notifications/alarm-email.sh
+--- a/health/notifications/alarm-email.sh	2023-05-08 14:52:30.529593121 +0200
+++ b/health/notifications/alarm-email.sh	2023-05-14 11:12:13.282358122 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
+ # OBSOLETE - REPLACED WITH
+diff -rup a/health/notifications/alarm-notify.sh b/health/notifications/alarm-notify.sh
+--- a/health/notifications/alarm-notify.sh	2023-05-08 14:53:16.097105688 +0200
+++ b/health/notifications/alarm-notify.sh	2023-05-14 11:12:13.291358183 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ #shellcheck source=/dev/null disable=SC2086,SC2154
+ 
+ # netdata
+diff -rup a/health/notifications/alarm-notify.sh.in b/health/notifications/alarm-notify.sh.in
+--- a/health/notifications/alarm-notify.sh.in	2023-05-08 14:52:30.533593082 +0200
+++ b/health/notifications/alarm-notify.sh.in	2023-05-14 11:12:13.285358143 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ #shellcheck source=/dev/null disable=SC2086,SC2154
+ 
+ # netdata
+diff -rup a/health/notifications/alarm-test.sh b/health/notifications/alarm-test.sh
+--- a/health/notifications/alarm-test.sh	2023-05-08 14:52:30.533593082 +0200
+++ b/health/notifications/alarm-test.sh	2023-05-14 11:12:13.288358163 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ 
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff -rup a/ml/dlib/dlib/external/pybind11/tools/mkdoc.py b/ml/dlib/dlib/external/pybind11/tools/mkdoc.py
+--- a/ml/dlib/dlib/external/pybind11/tools/mkdoc.py	2023-05-08 14:52:40.109496786 +0200
+++ b/ml/dlib/dlib/external/pybind11/tools/mkdoc.py	2023-05-14 11:12:13.441359201 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python3
+#!/usr/bin/python33
+ #
+ #  Syntax: mkdoc.py [-I<path> ..] [.. a list of header files ..]
+ #
+diff -rup a/ml/dlib/dlib/travis/build-and-test.sh b/ml/dlib/dlib/travis/build-and-test.sh
+--- a/ml/dlib/dlib/travis/build-and-test.sh	2023-05-08 14:52:40.201495797 +0200
+++ b/ml/dlib/dlib/travis/build-and-test.sh	2023-05-14 11:12:13.294358204 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ # Exit if anything fails.
+ set -eux
+ 
+diff -rup a/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py b/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py
+--- a/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py	2023-05-08 14:52:40.265495109 +0200
+++ b/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py	2023-05-14 11:12:13.444359221 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python3
+ 
+ # This script takes the dlib lenet model trained by the
+ # examples/dnn_introduction_ex.cpp example program and runs it using caffe. 
+diff -rup a/packaging/check-kernel-config.sh b/packaging/check-kernel-config.sh
+--- a/packaging/check-kernel-config.sh	2023-05-08 14:52:30.557592848 +0200
+++ b/packaging/check-kernel-config.sh	2023-05-14 11:12:13.297358224 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ 
+ get_kernel_version() {
+   r="$(uname -r | cut -f 1 -d '-')"
+diff -rup a/system/edit-config b/system/edit-config
+--- a/system/edit-config	2023-05-08 14:52:30.565592770 +0200
+++ b/system/edit-config	2023-05-14 11:12:13.316358353 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env sh
+#!/usr/bin/sh
+ 
+ # shellcheck disable=SC1091
+ [ -f /etc/profile ] && . /etc/profile
+diff -rup a/system/install-service.sh.in b/system/install-service.sh.in
+--- a/system/install-service.sh.in	2023-05-08 14:52:30.565592770 +0200
+++ b/system/install-service.sh.in	2023-05-14 11:12:13.318358367 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env sh
+#!/usr/bin/sh
+ 
+ # SPDX-License-Identifier: GPL-3.0-or-later
+ 
+diff -rup a/system/lsb/init.d/netdata.in b/system/lsb/init.d/netdata.in
+--- a/system/lsb/init.d/netdata.in	2023-05-08 14:52:30.565592770 +0200
+++ b/system/lsb/init.d/netdata.in	2023-05-14 11:12:13.299358238 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ #
+ # Netdata LSB start script
+ #
+diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh b/tests/health_mgmtapi/health-cmdapi-test.sh
+--- a/tests/health_mgmtapi/health-cmdapi-test.sh	2023-05-08 14:53:14.297124764 +0200
+++ b/tests/health_mgmtapi/health-cmdapi-test.sh	2023-05-14 11:12:13.304358271 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ # shellcheck disable=SC1117,SC2034,SC2059,SC2086,SC2181
+ 
+ NETDATA_VARLIB_DIR="/var/lib/netdata"
+diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh.in b/tests/health_mgmtapi/health-cmdapi-test.sh.in
+--- a/tests/health_mgmtapi/health-cmdapi-test.sh.in	2023-05-08 14:52:30.569592731 +0200
+++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in	2023-05-14 11:12:13.301358251 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
+#!/usr/bin/bash
+ # shellcheck disable=SC1117,SC2034,SC2059,SC2086,SC2181
+ 
+ NETDATA_VARLIB_DIR="@varlibdir_POST@"
--- a/netdata-install-go-plugins.sh
+++ b/netdata-install-go-plugins.sh
@ -0,0 +1,104 @@
+#!/bin/bash
+
+GO_PACKAGE_VERSION="v@PLUGIN_GO_VERSION@"
+CHECKSUM_FILE="@DATADIR@/netdata/go.d.checksums"
+LIBEXEC_PATH="@LIBEXEC@/netdata"
+
+safe_sha256sum() {
+	# Within the context of the installer, we only use -c option that is common between the two commands
+	# We will have to reconsider if we start non-common options
+	if command -v sha256sum >/dev/null 2>&1; then
+		sha256sum $@
+	elif command -v shasum >/dev/null 2>&1; then
+		shasum -a 256 $@
+	else
+		fatal "I could not find a suitable checksum binary to use"
+	fi
+}
+
+download_go() {
+	url="${1}"
+	dest="${2}"
+
+	if command -v curl >/dev/null 2>&1; then
+		curl -sSL --connect-timeout 10 --retry 3 "${url}" > "${dest}"
+	elif command -v wget >/dev/null 2>&1; then
+		wget -T 15 -O - "${url}" > "${dest}"
+	else
+		echo >&2
+		echo >&2 "Downloading go.d plugin from '${url}' failed because of missing mandatory packages."
+		echo >&2 "Either add packages or disable it by issuing '--disable-go' in the installer"
+		echo >&2
+		exit 1
+	fi
+}
+
+install_go() {
+	# When updating this value, ensure correct checksums in packaging/go.d.checksums
+	ARCH_MAP=(
+		'i386::386'
+		'i686::386'
+		'x86_64::amd64'
+		'aarch64::arm64'
+		'armv64::arm64'
+		'armv6l::arm'
+		'armv7l::arm'
+		'armv5tel::arm'
+	)
+
+	if [ -z "${NETDATA_DISABLE_GO+x}" ]; then
+		echo >&2 "Install go.d.plugin"
+		ARCH=$(uname -m)
+		OS=$(uname -s | tr '[:upper:]' '[:lower:]')
+
+		for index in "${ARCH_MAP[@]}" ; do
+			KEY="${index%%::*}"
+			VALUE="${index##*::}"
+			if [ "$KEY" = "$ARCH" ]; then
+				ARCH="${VALUE}"
+				break
+			fi
+		done
+		tmp=$(mktemp -d /tmp/netdata-go-XXXXXX)
+		GO_PACKAGE_BASENAME="go.d.plugin-${GO_PACKAGE_VERSION}.${OS}-${ARCH}.tar.gz"
+		download_go "https://github.com/netdata/go.d.plugin/releases/download/${GO_PACKAGE_VERSION}/${GO_PACKAGE_BASENAME}" "${tmp}/${GO_PACKAGE_BASENAME}"
+		# Include in RPM
+		#download_go "https://github.com/netdata/go.d.plugin/releases/download/${GO_PACKAGE_VERSION}/config.tar.gz" "${tmp}/config.tar.gz"
+
+		#if [ ! -f "${tmp}/${GO_PACKAGE_BASENAME}" ] || [ ! -f "${tmp}/config.tar.gz" ] || [ ! -s "${tmp}/config.tar.gz" ] || [ ! -s "${tmp}/${GO_PACKAGE_BASENAME}" ]; then
+		if [ ! -f "${tmp}/${GO_PACKAGE_BASENAME}" ] || [ ! -s "${tmp}/${GO_PACKAGE_BASENAME}" ]; then
+			echo >&2 "Either check the error or consider disabling it by issuing '--disable-go' in the installer"
+			echo >&2
+			return 1
+		fi
+
+		grep "${GO_PACKAGE_BASENAME}\$" "${CHECKSUM_FILE}" > "${tmp}/sha256sums.txt" 2>/dev/null
+		#grep "config.tar.gz" "${CHECKSUM_FILE}" >> "${tmp}/sha256sums.txt" 2>/dev/null
+
+		# Checksum validation
+		if ! (cd "${tmp}" && safe_sha256sum -c "sha256sums.txt"); then
+
+			echo >&2 "go.d plugin checksum validation failure."
+			echo >&2 "Either check the error or consider disabling it by issuing '--disable-go' in the installer"
+			echo >&2
+
+			echo "go.d.plugin package files checksum validation failed."
+			exit 1
+		fi
+
+		# Install files
+		#tar -xf "${tmp}/config.tar.gz" -C "${NETDATA_CONF_STOCK}/conf.d/"
+		tar xf "${tmp}/${GO_PACKAGE_BASENAME}"
+		install -m 0750 -p "${GO_PACKAGE_BASENAME/\.tar\.gz/}" ${LIBEXEC_PATH}/plugins.d/go.d.plugin
+		setcap 'cap_net_admin=eip cap_net_raw=eip' ${LIBEXEC_PATH}/plugins.d/go.d.plugin
+		rm -rf "${tmp}"
+	fi
+	return 0
+}
+
+if [ ${UID} -ne 0 ]
+then
+  echo "This script must be run by root, please use sudo"
+  exit 1
+fi
+install_go
--- a/netdata-remove-fonts-1.12.0.patch
+++ b/netdata-remove-fonts-1.12.0.patch
@ -1,19 +0,0 @@
-diff -rup a/web/gui/Makefile.am b/web/gui/Makefile.am
--- a/web/gui/Makefile.am	2019-02-06 10:17:04.000000000 +0100
-+++ b/web/gui/Makefile.am	2019-02-18 22:31:55.058655622 +0100
-@@ -104,15 +104,6 @@ dist_webcss_DATA = \
- 	css/c3-0.4.18.min.css \
- 	$(NULL)
- 
-webfontsdir=$(webdir)/fonts
-dist_webfonts_DATA = \
-	fonts/glyphicons-halflings-regular.eot \
-	fonts/glyphicons-halflings-regular.svg \
-	fonts/glyphicons-halflings-regular.ttf \
-	fonts/glyphicons-halflings-regular.woff \
-	fonts/glyphicons-halflings-regular.woff2 \
-	$(NULL)
-
- webimagesdir=$(webdir)/images
- dist_webimages_DATA = \
- 	images/netdata-logomark.svg \
--- a/netdata-remove-fonts-1.38.0.patch
+++ b/netdata-remove-fonts-1.38.0.patch
@ -0,0 +1,40 @@
+diff -rup a/web/gui/dashboard/Makefile.am b/web/gui/dashboard/Makefile.am
+--- a/web/gui/dashboard/Makefile.am	2023-02-06 15:18:31.201561714 +0100
+++ b/web/gui/dashboard/Makefile.am	2023-02-07 08:59:30.617627390 +0100
+@@ -171,36 +171,3 @@ dist_webstaticjs_DATA = \
+     $(srcdir)/static/js/runtime-main.08abed8f.js \
+     $(srcdir)/static/js/runtime-main.08abed8f.js.map \
+     $(NULL)
+-
+-webstaticmediadir=$(webdir)/static/media
+-dist_webstaticmedia_DATA = \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-100.245539db.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-100.9a582f3a.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-100italic.1ea7c5d2.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-100italic.3c34cf08.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-200.67524c36.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-200.bf72c841.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-200italic.52df2560.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-200italic.bbc2d552.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-300.10bb6a0a.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-300.9e1c48af.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-300italic.c76f2ab5.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-300italic.d3566d5b.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-400.263d6267.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-400.a2c56f94.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-400italic.272f8611.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-400italic.89a93a1b.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-500.0866c244.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-500.f6d5c5d5.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-500italic.ccd41bd1.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-500italic.ffd12d59.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-600.337b1651.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-600.7852d4dc.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-600italic.17e5379f.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-600italic.6f4ba6aa.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-700.b8809d61.woff \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-700.c9983d3d.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-700italic.02954bee.woff2 \
+-    $(srcdir)/static/media/ibm-plex-sans-latin-700italic.72e9af40.woff \
+-    $(srcdir)/static/media/material-icons.0509ab09.woff2 \
+-    $(NULL)
--- a/netdata-v1.39.1.tar.gz
+++ b/netdata-v1.39.1.tar.gz
--- a/netdata.conf
+++ b/netdata.conf
@ -1,6 +1,10 @@
 # netdata configuration
 #
-# You can download the latest version of this file, using:
+# You can get the latest version of this file, using:
+#
+#  netdatacli dumpconfig > /etc/netdata/netdata.conf
+#
+# You can also download it using:
 #
 #  wget -O /etc/netdata/netdata.conf http://localhost:19999/netdata.conf
 # or
@ -10,14 +14,25 @@
 # The value shown in the commented settings, is the default value.
 #

-# global netdata configuration
 [global]
-	stock config directory = /etc/netdata/conf.d
+    run as user = netdata
+
+    # default storage size - increase for longer data retention
+    page cache size = 32
+    dbengine multihost disk space = 256
+
+    # some defaults to run netdata with least priority
+    process scheduling policy = idle
+    OOM score = 1000
+    
+    stock config directory = /usr/lib/netdata/conf.d
  
 [web]
-	web files owner = root
-	web files group = root
-	bind to = localhost
+    web files owner = root
+    web files group = netdata
+    
+    # by default do not expose the netdata port
+    bind to = localhost

 [health]
-	stock health configuration directory = /etc/netdata/conf.d/health.d
+    stock health configuration directory = /usr/lib/netdata/conf.d/health.d
--- a/netdata.profile
+++ b/netdata.profile
@ -0,0 +1,5 @@
+# env vars for netdata
+export NETDATA_STOCK_CONFIG_DIR="@STOCK_CONFIG_DIR@/conf.d"
+export NETDATA_USER_CONFIG_DIR="/etc/netdata"
+export NETDATA_VARLIB_DIR="/var/lib/netdata"
+export NETDATA_CACHE_DIR="/var/cache/netdata"
--- a/netdata.spec
+++ b/netdata.spec
@ -1,33 +1,88 @@
-%bcond_without systemd
-#We use some plugins which need suid
+%bcond_with netfilteracct
+
+%bcond_without cups
 %global  _hardened_build 1
 # Build release candidate
-%global upver        1.16.0
+	
+%global plugin_go_ver 0.52.2
+ 
+%global netdata_conf_stock %{_prefix}/lib/%{name}
+
 Name:                netdata
-Version:             %{upver}%{?rcver:~%{rcver}}
+Version:             1.39.1
 Release:             3
 Summary:             Real-time performance monitoring
 License:             GPLv3 and GPLv3+ and ASL 2.0 and CC-BY-4.0 and MIT and WTFPL
 URL:                 https://github.com/%{name}/%{name}/
-Source0:             https://github.com/%{name}/%{name}/archive/v%{upver}%{?rcver:-%{rcver}}/%{name}-%{upver}%{?rcver:-%{rcver}}.tar.gz
+Source0:             https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-v%{version}.tar.gz
 Source1:             netdata.tmpfiles.conf
 Source2:             netdata.init
 Source3:             netdata.conf
-Patch0:              netdata-fix-shebang-1.16.0.patch
-Patch1:		     netdata-fix-python2-not-compatible-with-python3.patch
+Source4:             netdata.profile
+Source5:             README-packager.md
+Source6:             https://github.com/netdata/go.d.plugin/releases/download/v%{plugin_go_ver}/config.tar.gz
+Source7:             netdata-install-go-plugins.sh
+Patch0:              netdata-fix-shebang-1.39.0.patch
 # Remove embedded font
-Patch10:             netdata-remove-fonts-1.12.0.patch
-Patch11:             Fix-missing-extern-in-some-global-variables.patch
-BuildRequires:       zlib-devel git autoconf automake pkgconfig libuuid-devel freeipmi-devel httpd
-BuildRequires:       cppcheck gcc tinyxml2
-Requires:            nodejs glyphicons-halflings-fonts
-%if %{with systemd}
+Patch10:             netdata-remove-fonts-1.38.0.patch
+Patch11:             trim-dbengine-test-frequency.patch
+
+BuildRequires:       zlib-devel
+BuildRequires:       git
+BuildRequires:       autoconf
+BuildRequires:       autoconf-archive
+BuildRequires:       automake
+BuildRequires:       pkgconfig
+BuildRequires:       libuuid-devel
+BuildRequires:       freeipmi-devel
+BuildRequires:       httpd
+BuildRequires:       gcc
+BuildRequires:       libuv-devel
+BuildRequires:       Judy-devel
+BuildRequires:       lz4-devel
+BuildRequires:       openssl-devel
+BuildRequires:       libmnl-devel
+BuildRequires:       make
+BuildRequires:       libcurl-devel
 BuildRequires:       systemd
-%{?systemd_requires}
-%else
-Requires:            initscripts /sbin/service /sbin/chkconfig
+BuildRequires:       openssl-devel
+BuildRequires:       libpfm-devel
+BuildRequires:       libyaml-devel
+BuildRequires:       autogen
+
+# Prometheus
+BuildRequires:       snappy-devel
+BuildRequires:       protobuf-devel
+BuildRequires:       protobuf-c-devel
+BuildRequires:       findutils
+
+# Cloud client
+BuildRequires:       cmake
+BuildRequires:       gcc-c++
+BuildRequires:       json-c-devel
+BuildRequires:       libcap-devel
+
+# For tests
+BuildRequires:       libcmocka-devel
+
+%if %{with cups}
+BuildRequires:       cups-devel >= 1.7
 %endif
-Requires:            %{name}-data = %{version}-%{release} %{name}-conf = %{version}-%{release}
+%if %{with netfilteracct}
+BuildRequires:       libnetfilter_acct-devel
+%endif
+BuildRequires:       python3
+
+
+Requires:            nodejs
+Requires:            curl
+Requires:            nc
+Requires:            snappy
+Requires:            protobuf-c
+Requires:            protobuf
+Requires:            logrotate
+Requires:            %{name}-data = %{version}-%{release}
+Requires:            %{name}-conf = %{version}-%{release}
 %description
 netdata is the fastest way to visualize metrics. It is a resource
 efficient, highly optimized system for collecting and visualizing any
@ -40,12 +95,16 @@ happened, on your systems and applications.
 %package data
 BuildArch:           noarch
 Summary:             Data files for netdata
+Requires:            /usr/sbin/useradd
+Requires:            /usr/sbin/groupadd
+Requires:            /usr/bin/systemctl
 %description data
 Data files for netdata

 %package conf
 BuildArch:           noarch
 Summary:             Configuration files for netdata
+Requires:            logrotate
 %description conf
 Configuration files for netdata

@ -57,172 +116,185 @@ License:             GPLv3
 freeipmi plugin for netdata

 %prep
-%setup -qn %{name}-%{upver}%{?rcver:-%{rcver}}
+%setup -qn %{name}-v%{version}
 %patch0 -p1
-%patch1 -p1
 # Remove embedded font(added in requires)
 %patch10 -p1
 %patch11 -p1
-rm -rf web/fonts
+rm -rf web/fonts web/gui/dashboard/static/media
+cp %{SOURCE5} .

 %build
 autoreconf -ivf
 %configure \
-    --prefix=%{_prefix} \
-    --sysconfdir=%{_sysconfdir} \
-    --localstatedir=%{_localstatedir} \
    --enable-plugin-freeipmi \
-    --with-zlib --with-math --with-user=netdata
+%if %{with netfilteracct}
+    --enable-plugin-nfacct \
+%endif
+%if %{with cups}
+    --enable-plugin-cups \
+%endif
+    --with-zlib \
+    --with-math \
+    --with-user=netdata
+    
 %make_build

+# Integrate go plugins
+mkdir conf.d
+tar -xf %{SOURCE6} -C conf.d/
+ 
+
 %install
 %make_install
 find %{buildroot} -name '.keep' -delete
 # Unit file
-%if %{with systemd}
 mkdir -p %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_tmpfilesdir}
-install -Dp -m 0644 system/netdata.service %{buildroot}%{_unitdir}/%{name}.service
-install -p -m 0644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf
-%else
-# Init script
-mkdir -p %{buildroot}%{_initrddir}
-install -p -Dp -m 0755 %{SOURCE2} %{buildroot}%{_initrddir}/%{name}
-%endif
-mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
+install -Dp -m 0644 system/systemd/netdata.service %{buildroot}%{_unitdir}/%{name}.service
+install -p -m 0644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+install -Dp -m 0644 system/logrotate/netdata %{buildroot}%{_sysconfdir}/logrotate.d/netdata
+
+mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}
+mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
+mkdir -p %{buildroot}%{_localstatedir}/cache/%{name}
+
 install -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/
-install -p -m 0644 system/netdata.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-# Conf files must be in /etc, dixit FHS
-mv %{buildroot}%{_libdir}/%{name}/conf.d %{buildroot}%{_sysconfdir}/%{name}/
-# Scripts must not be in /etc
+mkdir -p %{buildroot}%{netdata_conf_stock}/conf.d
+mv %{buildroot}%{_libdir}/%{name}/conf.d/* %{buildroot}%{netdata_conf_stock}/conf.d/
+sed -i -e '/NETDATA_STOCK_CONFIG_DIR/ s/lib64/lib/' %{buildroot}%{_sysconfdir}/%{name}/edit-config
+sed -i -e '/^script_dir/s;=.*;="\$\{NETDATA_USER_CONFIG_DIR:-%{_sysconfdir}/netdata\}";' \
+    %{buildroot}%{_sysconfdir}/%{name}/edit-config
+
+# Scripts must not be in /etc, /usr/libexec is a better place
 mv %{buildroot}%{_sysconfdir}/%{name}/edit-config %{buildroot}%{_libexecdir}/%{name}/edit-config
 # Fix EOL
 sed -i -e 's/\r//' %{buildroot}%{_datadir}/%{name}/web/lib/tableExport-1.6.0.min.js
+# Delete system dir with init scripts or unit files
+rm -rf %{buildroot}%{_libdir}/%{name}/system
 # Delete useless hidden dir
 rm -rf %{buildroot}%{_datadir}/%{name}/web/.well-known
+# Delete useless file (ubuntu)
+rm -f %{buildroot}%{_sysconfdir}/%{name}/conf.d/ebpf.d/ebpf_kernel_reject_list.txt
+
+for dir in charts.d health.d python.d statsd.d ; do
+  mkdir -p %{buildroot}%{_sysconfdir}/%{name}/${dir}
+done
+
+mkdir -p %{buildroot}%{_sysconfdir}/profile.d
+install -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/netdata.sh
+sed -i -e '/NETDATA_STOCK_CONFIG_DIR/s;@STOCK_CONFIG_DIR@;%{netdata_conf_stock};' %{buildroot}%{_sysconfdir}/profile.d/netdata.sh
+
+# Integrate go plugins
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}/go.d
+install -p conf.d/go.d.conf %{buildroot}%{netdata_conf_stock}/conf.d/go.d.conf
+cp -rp conf.d/go.d %{buildroot}%{netdata_conf_stock}/conf.d/go.d
+install -p -m 0644 packaging/go.d.checksums %{buildroot}%{_datadir}/%{name}/go.d.checksums
+install -p -m 0750 %{SOURCE7} %{buildroot}%{_sbindir}/netdata-install-go-plugins.sh
+sed -i \
+    -e 's;@PLUGIN_GO_VERSION@;%{plugin_go_ver};' \
+    -e 's;@DATADIR@;%{_datadir};' \
+    -e 's;@LIBEXEC@;%{_libexecdir};' \
+    %{buildroot}%{_sbindir}/netdata-install-go-plugins.sh

 %check
-./cppcheck.sh
+make tests

-%pre
+%pre data
 getent group netdata > /dev/null || groupadd -r netdata
 getent passwd netdata > /dev/null || useradd -r -g netdata -c "NetData User" -s /sbin/nologin -d /var/log/%{name} netdata

 %post
-%if 0%{?systemd_post:1}
+sed -i -e '/web files group/ s/root/netdata/' /etc/netdata/netdata.conf ||:
+sed -i -e '/stock config directory/ s;/etc/netdata/conf.d;/usr/lib/netdata/conf.d;' /etc/netdata/netdata.conf ||:
+sed -i -e '/stock health configuration directory/ s;/etc/netdata/conf.d/health.d;/usr/lib/netdata/conf.d/health.d;' /etc/netdata/netdata.conf ||:
 %systemd_post %{name}.service
-%else
-if [ $1 = 1 ]; then
-    # Initial installation
-%if %{with systemd}
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-%else
-    /sbin/chkconfig --add %{name}
-%endif
-fi
-%endif
-echo "The current config file can be downloaded with the following command"
-echo "curl -o /etc/netdata/netdata.conf http://localhost:19999/netdata.conf"
+echo "Netdata config should be edited with %{_libexecdir}/%{name}/edit-config"
+echo "Netdata go plugin can be easily installed with %{_sbindir}/netdata-install-go-plugins.sh script"

 %preun
-%if 0%{?systemd_preun:1}
 %systemd_preun %{name}.service
-%else
-if [ "$1" = 0 ] ; then
-    # Package removal, not upgrade
-%if %{with systemd}
-    /bin/systemctl --no-reload disable %{name}.service >/dev/null 2>&1 || :
-    /bin/systemctl stop %{name}.service >/dev/null 2>&1 || :
-%else
-    /sbin/service %{name} stop > /dev/null 2>&1
-    /sbin/chkconfig --del %{name}
-%endif
-fi
-exit 0
-%endif

 %postun
-%if 0%{?systemd_postun_with_restart:1}
 %systemd_postun_with_restart %{name}.service
-%else
-%if %{with systemd}
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ]; then
-# Package upgrade, not uninstall
-    /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
-fi
-%else
-if [ "$1" -ge 1 ]; then
-    /sbin/service %{name} restart > /dev/null 2>&1
-fi
-exit 0
-%endif
-%endif
-%triggerun -- netdata
-%if %{with systemd}
-if [ -f /etc/rc.d/init.d/%{name} ]; then
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply netdata
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save %{name} >/dev/null 2>&1 ||:
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del %{name} >/dev/null 2>&1 || :
-/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
-fi
-%endif

 %files
-%doc README.md CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTORS.md HISTORICAL_CHANGELOG.md
+%doc README.md CHANGELOG.md README-packager.md
 %license LICENSE REDISTRIBUTED.md
 %{_sbindir}/%{name}
-%{_libexecdir}/%{name}
-%if %{with systemd}
+%{_sbindir}/%{name}-claim.sh
+%{_sbindir}/%{name}cli
+%{_libexecdir}/%{name}/*
 %{_unitdir}/%{name}.service
 %{_tmpfilesdir}/%{name}.conf
-%else
-%attr(0755,root,root) %{_initrddir}/%{name}
+%caps(cap_dac_read_search,cap_sys_ptrace=ep) %attr(0750,root,netdata) %{_libexecdir}/%{name}/plugins.d/apps.plugin
+%caps(cap_setuid=ep) %attr(4750,root,netdata) %{_libexecdir}/%{name}/plugins.d/cgroup-network
+%attr(0750,root,netdata) %{_libexecdir}/%{name}/plugins.d/cgroup-network-helper.sh
+%caps(cap_setuid=ep) %attr(4750,root,netdata) %{_libexecdir}/%{name}/plugins.d/perf.plugin
+%caps(cap_setuid=ep) %attr(4750,root,netdata) %{_libexecdir}/%{name}/plugins.d/slabinfo.plugin
+%if %{with cups}
+%attr(0750,root,netdata) %{_libexecdir}/%{name}/plugins.d/cups.plugin
 %endif
-%attr(4755,root,root) %{_libexecdir}/%{name}/plugins.d/apps.plugin
+%exclude %{_libexecdir}/%{name}/edit-config
 %exclude %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin
 %attr(0755, netdata, netdata) %{_localstatedir}/lib/%{name}
 %attr(0755, netdata, netdata) %dir %{_localstatedir}/cache/%{name}
 %attr(0755, netdata, netdata) %dir %{_localstatedir}/log/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%attr(0750,root,netdata)%{_sbindir}/netdata-install-go-plugins.sh

 %files conf
 %doc README.md
 %license LICENSE REDISTRIBUTED.md
 %dir %{_sysconfdir}/%{name}
-%dir %{_sysconfdir}/%{name}/conf.d
-%dir %{_sysconfdir}/%{name}/conf.d/charts.d
-%dir %{_sysconfdir}/%{name}/conf.d/health.d
-%dir %{_sysconfdir}/%{name}/conf.d/python.d
-%dir %{_sysconfdir}/%{name}/conf.d/statsd.d
+%dir %{_sysconfdir}/%{name}/charts.d
+%dir %{_sysconfdir}/%{name}/health.d
+%dir %{_sysconfdir}/%{name}/python.d
+%dir %{_sysconfdir}/%{name}/statsd.d
+%dir %{_sysconfdir}/%{name}/go.d
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
-%config(noreplace) %{_sysconfdir}/%{name}/conf.d/*.conf
-%config(noreplace) %{_sysconfdir}/%{name}/conf.d/charts.d/*.conf
-%config(noreplace) %{_sysconfdir}/%{name}/conf.d/health.d/*.conf
-%config(noreplace) %{_sysconfdir}/%{name}/conf.d/python.d/*.conf
-%config(noreplace) %{_sysconfdir}/%{name}/conf.d/statsd.d/*.conf
+%dir %{netdata_conf_stock}/conf.d
+%{netdata_conf_stock}/conf.d/*
+%config %{_sysconfdir}/logrotate.d/netdata
+%config %{_sysconfdir}/profile.d/netdata.sh
+%dir %{_libexecdir}/%{name}
+%{_libexecdir}/%{name}/edit-config
+%{_sysconfdir}/netdata/.install-type

 %files data
 %doc README.md
 %license LICENSE REDISTRIBUTED.md
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/web
+%attr(-, root, netdata) %{_datadir}/%{name}/web
+%{_datadir}/%{name}/go.d.checksums

 %files freeipmi
 %doc README.md
 %license LICENSE REDISTRIBUTED.md
-%attr(4755,root,root) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin
+%caps(cap_setuid=ep) %attr(4750,root,netdata) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin

 %changelog
-* Thu Aug 19 2021 baizhonggui <baizhonggui@huawei.com> - 1.16.0 - 3
+* Thu Jan 04 2024 Ge Wang <wang__ge@126.com> - 1.39.1-3
+- recover check number printing and trim dbengine test frequency
+ 
+* Thu Sep 28 2023 xu_ping <707078654@qq.com> - 1.39.1-2
+- fix testcase failed.
+
+* Tue May 23 2023 liyanan <thistleslyn@163.com> - 1.39.1-1
+- update to 1.39.1
+
+* Mon Jan 30 2023 wangkai <wangkai385@h-partners.com> - 1.37.1-1
+- Upgrade to version 1.37.1 for fix CVE-2023-22496,CVE-2023-22497
+
+* Thu Sep 30 2021 xuping <xuping33@huawei.com> - 1.16.0-4
+- remove install requires glyphicons-halfings-fonts
+
+* Thu Aug 19 2021 baizhonggui <baizhonggui@huawei.com> - 1.16.0-3
 - Fix python2 and python3 syntax is incompatible

-* Wed Aug 04 2021 sunguoshuai <sunguoshuai@huawei.com> - 1.16.0 - 2
+* Wed Aug 04 2021 sunguoshuai <sunguoshuai@huawei.com> - 1.16.0-2
 - Fix missing extern in some global variables

-* Thu Jun 24 2021 baizhonggui <baizhonggui@huawei.com> - 1.16.0 - 1
+* Thu Jun 24 2021 baizhonggui <baizhonggui@huawei.com> - 1.16.0-1
 - package init
--- a/netdata.tmpfiles.conf
+++ b/netdata.tmpfiles.conf
@ -1 +1 @@
-D /var/run/netdata 0775 netdata netdata -
+D /run/netdata 0775 netdata netdata -
--- a/trim-dbengine-test-frequency.patch
+++ b/trim-dbengine-test-frequency.patch
@ -0,0 +1,150 @@
+From 3f935f49aee0ad81255a5f0d18648fd414ccea48 Mon Sep 17 00:00:00 2001
+From: wang--ge <wang__ge@126.com>
+Date: Thu, 4 Jan 2024 09:50:15 +0800
+Subject: [PATCH] trim dbengine test frequency
+
+---
+ daemon/unit_test.c   | 99 +-------------------------------------------
+ libnetdata/inlined.h |  2 +
+ 2 files changed, 4 insertions(+), 97 deletions(-)
+
+diff --git a/daemon/unit_test.c b/daemon/unit_test.c
+index fa3fa84..b4e93c6 100644
+--- a/daemon/unit_test.c
+++ b/daemon/unit_test.c
+@@ -2139,102 +2139,7 @@ int test_dbengine(void)
+ 
+     errors += test_dbengine_check_metrics(st, rd, current_region, time_start[current_region]);
+ 
+-    current_region = 1; //this is the second region of data
+-    update_every = REGION_UPDATE_EVERY[current_region]; // set data collection frequency to 3 seconds
+-    // Align pages for frequency change
+-    for (i = 0 ; i < CHARTS ; ++i) {
+-        st[i]->update_every = update_every;
+-        for (j = 0; j < DIMS; ++j) {
+-            rrdeng_store_metric_flush_current_page((rd[i][j])->tiers[0].db_collection_handle);
+-        }
+-    }
+-
+-    time_start[current_region] = time_end[current_region - 1] + update_every;
+-    if (0 != time_start[current_region] % update_every) // align to update_every
+-        time_start[current_region] += update_every - time_start[current_region] % update_every;
+-    time_end[current_region] = test_dbengine_create_metrics(st,rd, current_region, time_start[current_region]);
+-
+-    errors += test_dbengine_check_metrics(st, rd, current_region, time_start[current_region]);
+-
+-    current_region = 2; //this is the third region of data
+-    update_every = REGION_UPDATE_EVERY[current_region]; // set data collection frequency to 1 seconds
+-    // Align pages for frequency change
+-    for (i = 0 ; i < CHARTS ; ++i) {
+-        st[i]->update_every = update_every;
+-        for (j = 0; j < DIMS; ++j) {
+-            rrdeng_store_metric_flush_current_page((rd[i][j])->tiers[0].db_collection_handle);
+-        }
+-    }
+-
+-    time_start[current_region] = time_end[current_region - 1] + update_every;
+-    if (0 != time_start[current_region] % update_every) // align to update_every
+-        time_start[current_region] += update_every - time_start[current_region] % update_every;
+-    time_end[current_region] = test_dbengine_create_metrics(st,rd, current_region, time_start[current_region]);
+-
+-    errors += test_dbengine_check_metrics(st, rd, current_region, time_start[current_region]);
+-
+-    for (current_region = 0 ; current_region < REGIONS ; ++current_region) {
+-        errors += test_dbengine_check_rrdr(st, rd, current_region, time_start[current_region], time_end[current_region]);
+-    }
+-
+-    current_region = 1;
+-    update_every = REGION_UPDATE_EVERY[current_region]; // use the maximum update_every = 3
+-    long points = (time_end[REGIONS - 1] - time_start[0]) / update_every; // cover all time regions with RRDR
+-    long point_offset = (time_start[current_region] - time_start[0]) / update_every;
+-    for (i = 0 ; i < CHARTS ; ++i) {
+-        ONEWAYALLOC *owa = onewayalloc_create(0);
+-        RRDR *r = rrd2rrdr_legacy(owa, st[i], points, time_start[0] + update_every,
+-                                  time_end[REGIONS - 1], RRDR_GROUPING_AVERAGE, 0,
+-                                  RRDR_OPTION_NATURAL_POINTS, NULL, NULL, 0, 0,
+-                                  QUERY_SOURCE_UNITTEST, STORAGE_PRIORITY_NORMAL);
+-
+-        if (!r) {
+-            fprintf(stderr, "    DB-engine unittest %s: empty RRDR ### E R R O R ###\n", rrdset_name(st[i]));
+-            ++errors;
+-        } else {
+-            long c;
+-
+-            assert(r->internal.qt->request.st == st[i]);
+-            // test current region values only, since they must be left unchanged
+-            for (c = point_offset ; c < (long)(point_offset + rrdr_rows(r) / REGIONS / 2) ; ++c) {
+-                RRDDIM *d;
+-                time_t time_now = time_start[current_region] + (c - point_offset + 2) * update_every;
+-                time_t time_retrieved = r->t[c];
+-
+-                // for each dimension
+-                rrddim_foreach_read(d, r->internal.qt->request.st) {
+-                    if(unlikely(d_dfe.counter >= r->d)) break; // d_counter is provided by the dictionary dfe
+-
+-                    j = (int)d_dfe.counter;
+-
+-                    NETDATA_DOUBLE *cn = &r->v[ c * r->d ];
+-                    NETDATA_DOUBLE value = cn[j];
+-                    assert(rd[i][j] == d);
+-
+-                    collected_number last = i * DIMS * REGION_POINTS[current_region] + j * REGION_POINTS[current_region] + c - point_offset + 1;
+-                    NETDATA_DOUBLE expected = unpack_storage_number(pack_storage_number((NETDATA_DOUBLE)last, SN_DEFAULT_FLAGS));
+-
+-                    uint8_t same = (roundndd(value) == roundndd(expected)) ? 1 : 0;
+-                    if(!same) {
+-                        if(!value_errors)
+-                            fprintf(stderr, "    DB-engine unittest %s/%s: at %lu secs, expecting value " NETDATA_DOUBLE_FORMAT
+-                                ", RRDR found " NETDATA_DOUBLE_FORMAT ", ### E R R O R ###\n",
+-                                    rrdset_name(st[i]), rrddim_name(rd[i][j]), (unsigned long)time_now, expected, value);
+-                        value_errors++;
+-                    }
+-                    if(time_retrieved != time_now) {
+-                        if(!time_errors)
+-                            fprintf(stderr, "    DB-engine unittest %s/%s: at %lu secs, found RRDR timestamp %lu ### E R R O R ###\n",
+-                                    rrdset_name(st[i]), rrddim_name(rd[i][j]), (unsigned long)time_now, (unsigned long)time_retrieved);
+-                        time_errors++;
+-                    }
+-                }
+-                rrddim_foreach_done(d);
+-            }
+-            rrdr_free(owa, r);
+-        }
+-        onewayalloc_destroy(owa);
+-    }
+    errors += test_dbengine_check_rrdr(st, rd, current_region, time_start[current_region], time_end[current_region]);
+ 
+     rrd_wrlock();
+     rrdeng_prepare_exit((struct rrdengine_instance *)host->db[0].instance);
+@@ -2242,7 +2147,7 @@ int test_dbengine(void)
+     rrdeng_exit((struct rrdengine_instance *)host->db[0].instance);
+     rrd_unlock();
+ 
+-    return errors + value_errors + time_errors;
+    return errors;
+ }
+ 
+ struct dbengine_chart_thread {
+diff --git a/libnetdata/inlined.h b/libnetdata/inlined.h
+index 2697b9a..906b0dd 100644
+--- a/libnetdata/inlined.h
+++ b/libnetdata/inlined.h
+@@ -236,6 +236,7 @@ static inline uint64_t str2uint64_base64(const char *src, char **endptr) {
+     return num;
+ }
+ 
+static NETDATA_DOUBLE str2ndd_parse_double_decimal_digits_internal(const char *src, int *digits) __attribute__((optimize(0)));
+ static inline NETDATA_DOUBLE str2ndd_parse_double_decimal_digits_internal(const char *src, int *digits) {
+     const char *s = src;
+     NETDATA_DOUBLE n = 0.0;
+@@ -257,6 +258,7 @@ static inline NETDATA_DOUBLE str2ndd_parse_double_decimal_digits_internal(const
+     return n;
+ }
+ 
+static NETDATA_DOUBLE str2ndd(const char *src, char **endptr) __attribute__((optimize(0)));
+ static inline NETDATA_DOUBLE str2ndd(const char *src, char **endptr) {
+     const char *s = src;
+ 
+-- 
+2.33.0
+
Author	SHA1	Message	Date
openeuler-ci-bot	3ca70a8bc4	!34 [sync] PR-32: recover check number printing and trim dbengine test frequency From: @openeuler-sync-bot Reviewed-by: @dillon_chen Signed-off-by: @dillon_chen	2024-01-08 04:27:44 +00:00
wang--ge	ace768bb54	recover check number printing and trim dbengine test frequency (cherry picked from commit e46746527d33a2e4f8f1dc74bf7a653bd9ebc5b8)	2024-01-08 09:55:05 +08:00
openeuler-ci-bot	8a21434ef7	!31 [sync] PR-29: skip test for openeuler system From: @openeuler-sync-bot Reviewed-by: @dillon_chen Signed-off-by: @dillon_chen	2024-01-02 04:26:33 +00:00
cherry530	11000772b5	skip test Signed-off-by: cherry530 <707078654@qq.com> (cherry picked from commit c6b57743d64878197704b231fdebab1fd3c2ef47)	2023-12-29 16:28:21 +08:00
openeuler-ci-bot	7460d35232	!26 [sync] PR-22: update to 1.39.1 From: @openeuler-sync-bot Reviewed-by: @caodongxia Signed-off-by: @caodongxia	2023-05-24 10:10:13 +00:00
lyn1001	73f7867120	update to 1.39.0 (cherry picked from commit 797bc86a2b419bdde63e2fa88afd43e6d48af334)	2023-05-24 15:10:27 +08:00
openeuler-ci-bot	e81d41f761	!21 [sync] PR-19: 升级到1.37.1版本修复CVE-2023-22496,CVE-2023-22497 From: @openeuler-sync-bot Reviewed-by: @caodongxia Signed-off-by: @caodongxia	2023-01-30 11:40:11 +00:00
wk333	744e7a9eea	Upgrade to version 1.37.1 (cherry picked from commit 22ef97f3aa9e83d11878c437dcccb8970660b891)	2023-01-30 19:23:24 +08:00
openeuler-ci-bot	a4fa25cbcc	!10 [sync] PR-7: netdata安装失败 Merge pull request !10 from openeuler-sync-bot/sync-pr7-openEuler-20.03-LTS-SP2-to-openEuler-20.03-LTS-SP3	2022-02-07 03:05:32 +00:00
cherry530	ad21531a2c	remove install requires glyphicons-halfings-fonts Signed-off-by: cherry530 <xuping33@huawei.com> (cherry picked from commit a4119357d83830c53a6f977447a4aacf67e59974)	2022-01-29 15:34:30 +08:00