packages/netdata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to version 1.37.1

Browse Source
This commit is contained in:
wk333 2023-01-30 14:29:42 +08:00
parent cdece74796
commit 14a608225d
13 changed files with 593 additions and 725 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
Fix-missing-extern-in-some-global-variables.patch
View File

@ -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

25
README-packager.md Normal file
View File

@ -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;
````

BIN
netdata-1.16.0.tar.gz
View File

Binary file not shown.

25
netdata-fix-python2-not-compatible-with-python3.patch
View File

@ -1,25 +0,0 @@
From 913bc3e605a85dae532394f1010f640175367ab4 Mon Sep 17 00:00:00 2001
From: baizg1107 <preloyalwhite@163.com>
Date: Tue, 22 Jun 2021 19:25:16 +0800
Subject: [PATCH] netdata fix python2 not compatible with python3
---
collectors/python.d.plugin/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am
index ad72cfa..3686040 100644
--- a/collectors/python.d.plugin/Makefile.am
+++ b/collectors/python.d.plugin/Makefile.am
@@ -138,7 +138,7 @@ dist_third_party_DATA = \
python_modules/third_party/monotonic.py \
$(NULL)
-pythonyaml2dir=$(pythonmodulesdir)/pyyaml2
+pythonyaml2dir=$(pythonmodulesdir)/pyyaml3
dist_pythonyaml2_DATA = \
python_modules/pyyaml2/__init__.py \
python_modules/pyyaml2/composer.py \
--
2.27.0

444
netdata-fix-shebang-1.16.0.patch
View File

@ -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

363
netdata-fix-shebang-1.37.0.patch Normal file
View File

@ -0,0 +1,363 @@
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 2022-11-30 13:36:48.322052491 +0100
+++ b/claim/netdata-claim.sh.in 2022-12-02 19:09:02.003143386 +0100
@@ -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 2022-11-30 13:36:48.322052491 +0100
+++ b/collectors/cgroups.plugin/cgroup-name.sh 2022-12-02 19:09:02.006143400 +0100
@@ -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 2022-11-30 13:36:48.322052491 +0100
+++ b/collectors/cgroups.plugin/cgroup-network-helper.sh 2022-12-02 19:09:02.008143410 +0100
@@ -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 2022-11-30 13:36:48.322052491 +0100
+++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2022-12-02 19:09:02.015143442 +0100
@@ -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 2022-11-30 13:37:39.815580278 +0100
+++ b/collectors/charts.d.plugin/charts.d.plugin 2022-12-02 19:09:02.013143433 +0100
@@ -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 2022-11-30 13:36:48.322052491 +0100
+++ b/collectors/charts.d.plugin/charts.d.plugin.in 2022-12-02 19:09:02.010143419 +0100
@@ -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 b/collectors/fping.plugin/fping.plugin
--- a/collectors/fping.plugin/fping.plugin 2022-11-30 13:37:39.927583599 +0100
+++ b/collectors/fping.plugin/fping.plugin 2022-12-02 19:09:02.033143526 +0100
@@ -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 2022-11-30 13:36:48.330052728 +0100
+++ b/collectors/fping.plugin/fping.plugin.in 2022-12-02 19:09:02.031143516 +0100
@@ -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 2022-11-30 13:37:39.955584429 +0100
+++ b/collectors/ioping.plugin/ioping.plugin 2022-12-02 19:09:02.021143470 +0100
@@ -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 2022-11-30 13:36:48.330052728 +0100
+++ b/collectors/ioping.plugin/ioping.plugin.in 2022-12-02 19:09:02.024143484 +0100
@@ -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 2022-11-30 13:37:40.139589884 +0100
+++ b/collectors/python.d.plugin/python.d.plugin 2022-12-02 19:09:02.019143461 +0100
@@ -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 2022-11-30 13:36:48.346053202 +0100
+++ b/collectors/python.d.plugin/python.d.plugin.in 2022-12-02 19:09:02.017143451 +0100
@@ -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 2022-11-30 13:36:48.346053202 +0100
+++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2022-12-02 19:09:02.179144203 +0100
@@ -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 2022-11-30 13:37:40.511600912 +0100
+++ b/collectors/tc.plugin/tc-qos-helper.sh 2022-12-02 19:09:02.027143498 +0100
@@ -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 2022-11-30 13:36:48.354053440 +0100
+++ b/collectors/tc.plugin/tc-qos-helper.sh.in 2022-12-02 19:09:02.029143507 +0100
@@ -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 2022-11-30 13:36:48.354053440 +0100
+++ b/contrib/debian/install_go.sh 2022-12-02 19:09:02.035143535 +0100
@@ -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 2022-11-30 13:36:48.354053440 +0100
+++ b/contrib/rhel/build-netdata-rpm.sh 2022-12-02 19:09:02.037143544 +0100
@@ -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 2022-11-30 13:36:48.354053440 +0100
+++ b/coverity-scan.sh 2022-12-02 19:09:02.039143553 +0100
@@ -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 2022-11-30 13:36:48.354053440 +0100
+++ b/cppcheck.sh 2022-12-02 19:09:02.041143563 +0100
@@ -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 2022-11-30 13:37:40.539601742 +0100
+++ b/daemon/anonymous-statistics.sh 2022-12-02 19:09:02.076143725 +0100
@@ -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 2022-11-30 13:36:48.358053558 +0100
+++ b/daemon/anonymous-statistics.sh.in 2022-12-02 19:09:02.073143711 +0100
@@ -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 2022-11-30 13:37:40.543601861 +0100
+++ b/daemon/get-kubernetes-labels.sh 2022-12-02 19:09:02.043143572 +0100
@@ -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 2022-11-30 13:36:48.358053558 +0100
+++ b/daemon/get-kubernetes-labels.sh.in 2022-12-02 19:09:02.045143581 +0100
@@ -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 2022-11-30 13:36:48.358053558 +0100
+++ b/daemon/system-info.sh 2022-12-02 19:09:02.071143702 +0100
@@ -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 2022-11-30 13:36:48.398054744 +0100
+++ b/diagrams/build.sh 2022-12-02 19:09:02.047143591 +0100
@@ -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 2022-11-30 13:36:48.410055100 +0100
+++ b/exporting/nc-exporting.sh 2022-12-02 19:09:02.049143600 +0100
@@ -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 2022-11-30 13:36:48.414055219 +0100
+++ b/health/notifications/alarm-email.sh 2022-12-02 19:09:02.059143646 +0100
@@ -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 2022-11-30 13:37:40.939613600 +0100
+++ b/health/notifications/alarm-notify.sh 2022-12-02 19:09:02.055143628 +0100
@@ -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 2022-11-30 13:36:48.414055219 +0100
+++ b/health/notifications/alarm-notify.sh.in 2022-12-02 19:09:02.052143614 +0100
@@ -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 2022-11-30 13:36:48.414055219 +0100
+++ b/health/notifications/alarm-test.sh 2022-12-02 19:09:02.057143637 +0100
@@ -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 2022-11-30 13:36:56.678300242 +0100
+++ b/ml/dlib/dlib/external/pybind11/tools/mkdoc.py 2022-12-02 19:09:02.182144217 +0100
@@ -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 2022-11-30 13:36:56.750302376 +0100
+++ b/ml/dlib/dlib/travis/build-and-test.sh 2022-12-02 19:09:02.061143656 +0100
@@ -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 2022-11-30 13:36:56.798303799 +0100
+++ b/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2022-12-02 19:09:02.185144231 +0100
@@ -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 2022-11-30 13:36:48.434055812 +0100
+++ b/packaging/check-kernel-config.sh 2022-12-02 19:09:02.063143665 +0100
@@ -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 2022-11-30 13:37:39.643575179 +0100
+++ b/system/edit-config 2022-12-02 19:09:02.080143744 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/sh
[ -f /etc/profile ] && . /etc/profile
diff -rup a/system/edit-config.in b/system/edit-config.in
--- a/system/edit-config.in 2022-11-30 13:36:48.442056049 +0100
+++ b/system/edit-config.in 2022-12-02 19:09:02.082143753 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/sh
[ -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 2022-11-30 13:36:48.442056049 +0100
+++ b/system/install-service.sh.in 2022-12-02 19:09:02.078143735 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/sh
# SPDX-License-Identifier: GPL-3.0-or-later
diff -rup a/system/netdata-lsb.in b/system/netdata-lsb.in
--- a/system/netdata-lsb.in 2022-11-30 13:36:48.442056049 +0100
+++ b/system/netdata-lsb.in 2022-12-02 19:09:02.065143674 +0100
@@ -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 2022-11-30 13:37:39.683576365 +0100
+++ b/tests/health_mgmtapi/health-cmdapi-test.sh 2022-12-02 19:09:02.069143693 +0100
@@ -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 2022-11-30 13:36:48.442056049 +0100
+++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in 2022-12-02 19:09:02.067143683 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
# shellcheck disable=SC1117,SC2034,SC2059,SC2086,SC2181
NETDATA_VARLIB_DIR="@varlibdir_POST@"

19
netdata-remove-fonts-1.12.0.patch
View File

@ -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 \

40
netdata-remove-fonts-1.37.0.patch Normal file
View File

@ -0,0 +1,40 @@
diff -rup a/web/gui/dashboard/Makefile.am b/web/gui/dashboard/Makefile.am
--- a/web/gui/dashboard/Makefile.am 2022-11-30 13:36:48.450056286 +0100
+++ b/web/gui/dashboard/Makefile.am 2022-12-02 19:12:46.215183637 +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)

BIN
netdata-v1.37.1.tar.gz Normal file
View File

Binary file not shown.

23
netdata.conf
View File

@ -12,12 +12,23 @@
# global netdata configuration
[global]
stock config directory = /etc/netdata/conf.d
run as user = netdata
# the default database size - 1 hour
history = 3600
# some defaults to run netdata with least priority
process scheduling policy = idle
OOM score = 1000
stock config directory = /etc/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 = /etc/netdata/conf.d/health.d

5
netdata.profile Normal file
View File

@ -0,0 +1,5 @@
# env vars for netdata
export NETDATA_STOCK_CONFIG_DIR="/etc/netdata/conf.d"
export NETDATA_USER_CONFIG_DIR="/etc/netdata"
export NETDATA_VARLIB_DIR="/var/lib/netdata"
export NETDATA_CACHE_DIR="/var/cache/netdata"

247
netdata.spec
View File

@ -1,33 +1,79 @@
%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
Name: netdata
Version: %{upver}%{?rcver:~%{rcver}}
Release: 3
Version: 1.37.1
Release: 1
Summary: Real-time performance monitoring
License: GPLv3 and GPLv3+ and ASL 2.0 and CC-BY and MIT and WTFPL
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
Patch0: netdata-fix-shebang-1.37.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
%if %{with systemd}
Patch10: netdata-remove-fonts-1.37.0.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: 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 +86,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,133 +107,105 @@ 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
%install
%make_install
find %{buildroot} -name '.keep' -delete
# Unit file
%if %{with systemd}
mkdir -p %{buildroot}%{_unitdir}
mkdir -p %{buildroot}%{_tmpfilesdir}
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
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
install -Dp -m 0644 system/netdata.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/netdata
mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}
mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
mkdir -p %{buildroot}%{_localstatedir}/cache/%{name}
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
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
# Conf files must be in /etc, dixit FHS and it's better in a noarch pkg
mv %{buildroot}%{_libdir}/%{name}/conf.d %{buildroot}%{_sysconfdir}/%{name}/
# Scripts must not be in /etc
# 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
%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 ||:
%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 "Config should be edited with %{_libexecdir}/%{name}/edit-config"
%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}
@ -194,35 +216,50 @@ fi
%doc README.md
%license LICENSE REDISTRIBUTED.md
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/charts.d
%dir %{_sysconfdir}/%{name}/health.d
%dir %{_sysconfdir}/%{name}/python.d
%dir %{_sysconfdir}/%{name}/statsd.d
%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}/conf.d/ebpf.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
%config %{_sysconfdir}/%{name}/conf.d/*.conf
%config %{_sysconfdir}/%{name}/conf.d/charts.d/*.conf
%config %{_sysconfdir}/%{name}/conf.d/health.d/*.conf
%config %{_sysconfdir}/%{name}/conf.d/python.d/*.conf
%config %{_sysconfdir}/%{name}/conf.d/statsd.d/*.conf
%config %{_sysconfdir}/%{name}/conf.d/ebpf.d/*.conf
%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
%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
* Sat Jan 29 2022 caodongxia <caodongxia@huawei.com> - 1.16.0 - 3
* 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
* Sat Jan 29 2022 caodongxia <caodongxia@huawei.com> - 1.16.0-3
- remove install requires glyphicons-halfings-fonts
* 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

2
netdata.tmpfiles.conf
View File

@ -1 +1 @@
D /var/run/netdata 0775 netdata netdata -
D /run/netdata 0775 netdata netdata -