!28 Upgrade to version 1.42.1

From: @chen-jan 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-09-05 01:56:49 +00:00 committed by Gitee
commit 2bb598d593
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
14 changed files with 691 additions and 659 deletions

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

31
README-packager.md Normal file
View File

@ -0,0 +1,31 @@
# 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)
* Fedora
````
sudo dnf install python3-mysql
````
* Epel
````
yum install MySQL-python
````
Create netdata mysql user
````
CREATE USER 'netdata'@'localhost';
GRANT USAGE on *.* to 'netdata'@'localhost';
FLUSH PRIVILEGES;
````

BIN
config.tar.gz Normal file

Binary file not shown.

Binary file not shown.

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

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

View File

@ -0,0 +1,426 @@
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-07-19 21:45:35.983657826 +0200
+++ b/claim/netdata-claim.sh.in 2023-07-22 10:40:10.426293646 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
# netdata
# real-time performance and health monitoring, done right!
# (C) 2023 Netdata Inc.
diff -rup a/collectors/cgroups.plugin/cgroup-name.sh b/collectors/cgroups.plugin/cgroup-name.sh
--- a/collectors/cgroups.plugin/cgroup-name.sh 2023-07-19 21:45:35.987657802 +0200
+++ b/collectors/cgroups.plugin/cgroup-name.sh 2023-07-22 10:40:10.447293883 +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-07-19 21:45:35.987657802 +0200
+++ b/collectors/cgroups.plugin/cgroup-network-helper.sh 2023-07-22 10:40:10.449293905 +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-07-19 21:45:35.987657802 +0200
+++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2023-07-22 10:40:10.432293714 +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-07-19 21:46:28.419213057 +0200
+++ b/collectors/charts.d.plugin/charts.d.plugin 2023-07-22 10:40:10.429293680 +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-07-19 21:45:35.987657802 +0200
+++ b/collectors/charts.d.plugin/charts.d.plugin.in 2023-07-22 10:40:10.435293748 +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-07-19 21:46:28.611211423 +0200
+++ b/collectors/ioping.plugin/ioping.plugin 2023-07-22 10:40:10.437293770 +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-07-19 21:45:36.003657704 +0200
+++ b/collectors/ioping.plugin/ioping.plugin.in 2023-07-22 10:40:10.439293793 +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-07-19 21:46:28.887209073 +0200
+++ b/collectors/python.d.plugin/python.d.plugin 2023-07-22 10:40:10.441293815 +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-07-19 21:45:36.023657583 +0200
+++ b/collectors/python.d.plugin/python.d.plugin.in 2023-07-22 10:40:10.444293849 +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-07-19 21:45:36.027657558 +0200
+++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2023-07-22 10:40:10.690296620 +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-07-19 21:46:29.387204817 +0200
+++ b/collectors/tc.plugin/tc-qos-helper.sh 2023-07-22 10:40:10.453293950 +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-07-19 21:45:36.035657510 +0200
+++ b/collectors/tc.plugin/tc-qos-helper.sh.in 2023-07-22 10:40:10.451293928 +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-07-19 21:45:36.035657510 +0200
+++ b/contrib/debian/install_go.sh 2023-07-22 10:40:10.456293984 +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-07-19 21:45:36.039657485 +0200
+++ b/contrib/rhel/build-netdata-rpm.sh 2023-07-22 10:40:10.458294007 +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-07-19 21:45:36.039657485 +0200
+++ b/coverity-scan.sh 2023-07-22 10:40:10.460294029 +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-07-19 21:45:36.039657485 +0200
+++ b/cppcheck.sh 2023-07-22 10:40:10.462294052 +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-07-19 21:46:29.427204477 +0200
+++ b/daemon/anonymous-statistics.sh 2023-07-22 10:40:10.501294491 +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-07-19 21:45:36.039657485 +0200
+++ b/daemon/anonymous-statistics.sh.in 2023-07-22 10:40:10.496294435 +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-07-19 21:46:29.435204409 +0200
+++ b/daemon/get-kubernetes-labels.sh 2023-07-22 10:40:10.467294108 +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-07-19 21:45:36.039657485 +0200
+++ b/daemon/get-kubernetes-labels.sh.in 2023-07-22 10:40:10.465294085 +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-07-19 21:45:36.043657461 +0200
+++ b/daemon/system-info.sh 2023-07-22 10:40:10.499294469 +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-07-19 21:45:36.119656999 +0200
+++ b/diagrams/build.sh 2023-07-22 10:40:10.469294131 +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-07-19 21:45:36.139656877 +0200
+++ b/exporting/nc-exporting.sh 2023-07-22 10:40:10.471294153 +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-07-19 21:45:36.147656828 +0200
+++ b/health/notifications/alarm-email.sh 2023-07-22 10:40:10.477294221 +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-07-19 21:46:30.059199097 +0200
+++ b/health/notifications/alarm-notify.sh 2023-07-22 10:40:10.474294187 +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-07-19 21:45:36.147656828 +0200
+++ b/health/notifications/alarm-notify.sh.in 2023-07-22 10:40:10.479294243 +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-07-19 21:45:36.147656828 +0200
+++ b/health/notifications/alarm-test.sh 2023-07-22 10:40:10.483294288 +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-07-19 21:45:48.807528720 +0200
+++ b/ml/dlib/dlib/external/pybind11/tools/mkdoc.py 2023-07-22 10:40:10.701296744 +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-07-19 21:45:48.903527474 +0200
+++ b/ml/dlib/dlib/travis/build-and-test.sh 2023-07-22 10:40:10.485294311 +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-07-19 21:45:48.967526642 +0200
+++ b/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2023-07-22 10:40:10.695296677 +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-07-19 21:45:36.175656658 +0200
+++ b/packaging/check-kernel-config.sh 2023-07-22 10:40:10.487294333 +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-07-19 21:45:36.183656609 +0200
+++ b/system/edit-config 2023-07-22 10:40:10.507294559 +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-07-19 21:45:36.187656585 +0200
+++ b/system/install-service.sh.in 2023-07-22 10:40:10.504294525 +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-07-19 21:45:36.187656585 +0200
+++ b/system/lsb/init.d/netdata.in 2023-07-22 10:40:10.489294356 +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-07-19 21:46:28.215214793 +0200
+++ b/tests/health_mgmtapi/health-cmdapi-test.sh 2023-07-22 10:40:10.492294390 +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-07-19 21:45:36.187656585 +0200
+++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in 2023-07-22 10:40:10.494294412 +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/web/server/h2o/libh2o/deps/brotli/python/bro.py b/web/server/h2o/libh2o/deps/brotli/python/bro.py
--- a/web/server/h2o/libh2o/deps/brotli/python/bro.py 2023-07-19 21:45:49.811515680 +0200
+++ b/web/server/h2o/libh2o/deps/brotli/python/bro.py 2023-07-22 10:40:10.721296970 +0200
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
"""bro %s -- compression/decompression utility using the Brotli algorithm."""
from __future__ import print_function
diff -rup a/web/server/h2o/libh2o/deps/brotli/python/tests/compatibility_test.py b/web/server/h2o/libh2o/deps/brotli/python/tests/compatibility_test.py
--- a/web/server/h2o/libh2o/deps/brotli/python/tests/compatibility_test.py 2023-07-19 21:45:49.811515680 +0200
+++ b/web/server/h2o/libh2o/deps/brotli/python/tests/compatibility_test.py 2023-07-22 10:40:10.725297015 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
from __future__ import print_function
import glob
import sys
diff -rup a/web/server/h2o/libh2o/deps/brotli/python/tests/custom_dictionary_test.py b/web/server/h2o/libh2o/deps/brotli/python/tests/custom_dictionary_test.py
--- a/web/server/h2o/libh2o/deps/brotli/python/tests/custom_dictionary_test.py 2023-07-19 21:45:49.811515680 +0200
+++ b/web/server/h2o/libh2o/deps/brotli/python/tests/custom_dictionary_test.py 2023-07-22 10:40:10.731297082 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
from __future__ import print_function
import sys
import os
diff -rup a/web/server/h2o/libh2o/deps/brotli/python/tests/roundtrip_test.py b/web/server/h2o/libh2o/deps/brotli/python/tests/roundtrip_test.py
--- a/web/server/h2o/libh2o/deps/brotli/python/tests/roundtrip_test.py 2023-07-19 21:45:49.811515680 +0200
+++ b/web/server/h2o/libh2o/deps/brotli/python/tests/roundtrip_test.py 2023-07-22 10:40:10.728297049 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
from __future__ import print_function
import sys
import os
diff -rup a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_arm.py b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_arm.py
--- a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_arm.py 2023-07-19 21:45:49.943513966 +0200
+++ b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_arm.py 2023-07-22 10:40:10.708296823 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
import sys
diff -rup a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr_extra.py b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr_extra.py
--- a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr_extra.py 2023-07-19 21:45:49.943513966 +0200
+++ b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr_extra.py 2023-07-22 10:40:10.704296778 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
import sys
diff -rup a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr.py b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr.py
--- a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr.py 2023-07-19 21:45:49.943513966 +0200
+++ b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr.py 2023-07-22 10:40:10.715296902 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
import sys
diff -rup a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_arm.py b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_arm.py
--- a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_arm.py 2023-07-19 21:45:49.943513966 +0200
+++ b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_arm.py 2023-07-22 10:40:10.711296857 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
import sys
diff -rup a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_avr.py b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_avr.py
--- a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_avr.py 2023-07-19 21:45:49.943513966 +0200
+++ b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_avr.py 2023-07-22 10:40:10.718296936 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
import sys
diff -rup a/web/server/h2o/libh2o/misc/mkhufftbl.py b/web/server/h2o/libh2o/misc/mkhufftbl.py
--- a/web/server/h2o/libh2o/misc/mkhufftbl.py 2023-07-19 21:45:50.095511991 +0200
+++ b/web/server/h2o/libh2o/misc/mkhufftbl.py 2023-07-22 10:40:10.734297116 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
# The MIT License

104
netdata-install-go-plugins.sh Executable file
View File

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

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 \

BIN
netdata-v1.42.1.tar.gz Normal file

Binary file not shown.

View File

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

5
netdata.profile Normal file
View File

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

View File

@ -1,25 +1,54 @@
%bcond_without systemd
#We use some plugins which need suid
%global _hardened_build 1
%global plugin_go_ver 0.54.1
%global __os_install_post %{nil}
%global netdata_conf_stock %{_prefix}/lib/%{name}
# Build release candidate
%global upver 1.16.0
%global upver 1.42.1
Name: netdata
Version: 1.16.0
Release: 4
Version: 1.42.1
Release: 1
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}/archive/v%{upver}%{?rcver:-%{rcver}}/%{name}-v%{upver}%{?rcver:-%{rcver}}.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
# Remove embedded font
Patch10: netdata-remove-fonts-1.12.0.patch
Patch11: Fix-missing-extern-in-some-global-variables.patch
Source4: netdata.profile
Source5: README-packager.md
Source20: https://github.com/netdata/go.d.plugin/releases/download/v%{plugin_go_ver}/config.tar.gz
Source21: netdata-install-go-plugins.sh
Patch0: netdata-fix-shebang-1.41.0.patch
BuildRequires: zlib-devel git autoconf automake pkgconfig libuuid-devel freeipmi-devel httpd
BuildRequires: cppcheck gcc tinyxml2
BuildRequires: libuv-devel
BuildRequires: Judy-devel
BuildRequires: lz4-devel
BuildRequires: openssl-devel
BuildRequires: libmnl-devel
BuildRequires: make
BuildRequires: libcurl-devel
BuildRequires: systemd
BuildRequires: openssl-devel
BuildRequires: libpfm-devel
BuildRequires: libyaml-devel
BuildRequires: autogen
BuildRequires: snappy-devel
BuildRequires: protobuf-devel
BuildRequires: protobuf-c-devel
BuildRequires: findutils
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: json-c-devel
BuildRequires: libcap-devel
BuildRequires: libcmocka-devel
BuildRequires: cups-devel >= 1.7
BuildRequires: python3
Requires: nodejs
%if %{with systemd}
BuildRequires: systemd
@ -57,13 +86,10 @@ License: GPLv3
freeipmi plugin for netdata
%prep
%setup -qn %{name}-%{upver}%{?rcver:-%{rcver}}
%setup -qn %{name}-v%{upver}%{?rcver:-%{rcver}}
%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
@ -75,35 +101,64 @@ autoreconf -ivf
--with-zlib --with-math --with-user=netdata
%make_build
mkdir conf.d
tar -xf %{SOURCE20} -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
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
%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}%{_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
mv %{buildroot}%{_libdir}/%{name}/conf.d %{buildroot}%{_sysconfdir}/%{name}/
install -Dp -m 0644 system/logrotate/netdata %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
mkdir -p %{buildroot}%{netdata_conf_stock}/conf.d
mv %{buildroot}%{_libdir}/%{name}/conf.d/* %{buildroot}%{netdata_conf_stock}/conf.d/
sed -i -e '/^script_dir/s;=.*;="\$\{NETDATA_USER_CONFIG_DIR:-%{_sysconfdir}/netdata\}";' \
%{buildroot}%{_sysconfdir}/%{name}/edit-config
# Scripts must not be in /etc
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 useless hidden dir
rm -rf %{buildroot}%{_libdir}/%{name}/system
rm -rf %{buildroot}%{_datadir}/%{name}/web/.well-known
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 %{SOURCE21} %{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
rm -f %{buildroot}%{_sysconfdir}/%{name}/netdata-updater.conf
%check
./cppcheck.sh
make tests
%pre
getent group netdata > /dev/null || groupadd -r netdata
@ -173,9 +228,11 @@ 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}
%{_sbindir}/%{name}-claim.sh
%{_sbindir}/%{name}cli
%{_libexecdir}/%{name}
%if %{with systemd}
%{_unitdir}/%{name}.service
@ -189,28 +246,32 @@ fi
%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
%{_datadir}/%{name}/go.d.checksums
%files freeipmi
%doc README.md
@ -218,6 +279,9 @@ fi
%attr(4755,root,root) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin
%changelog
* Thu Aug 24 2023 chenchen <chen_aka_jan@163.com> - 1.42.1-1
- Upgrade to version 1.42.1
* Tue Jun 21 2022 Chenyx <chenyixiong3@huawei.com> - 1.16.0-4
- License compliance rectification

View File

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