The package rpms/netdata.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/netdata.git/commit/?id=da8df3048514d... https://src.fedoraproject.org/cgit/rpms/netdata.git/commit/?id=65fa8eb3bb5e0....
Change: -%ifarch x86_64 +%ifarch x86_64
Thanks.
Full change: ============
commit 48dc81dfc8371692fe620208c1d430908ddb8249 Author: Didier Fabert didier.fabert@gmail.com Date: Tue May 3 17:19:27 2022 +0200
Revert stock config files to /etc/netdata, part2
diff --git a/netdata.profile b/netdata.profile new file mode 100644 index 0000000..0673b29 --- /dev/null +++ b/netdata.profile @@ -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"
commit da8df3048514de25d253a572ef4b05f2906ff1b9 Author: Didier Fabert didier.fabert@gmail.com Date: Tue May 3 17:12:54 2022 +0200
Revert stock config files to /etc/netdata
diff --git a/netdata.spec b/netdata.spec index 5aa13e5..31434e3 100644 --- a/netdata.spec +++ b/netdata.spec @@ -41,7 +41,6 @@ ExcludeArch: s390x # Last python 2 support (el7 only) %global protobuf_cpp_ver 3.17.3
-%global stock_conf_path %{_prefix}/lib/%{name}
Name: netdata Version: %{upver}%{?rcver:~%{rcver}} @@ -54,6 +53,7 @@ Source0: https://github.com/netdata/netdata/releases/download/v%%7Bupver%7D%%7B Source1: netdata.tmpfiles.conf Source2: netdata.init Source3: netdata.conf +Source4: netdata.profile Source5: README-packager.md # Only for el7 Source10: https://github.com/protocolbuffers/protobuf/releases/download/v%%7Bprotobuf_... @@ -212,7 +212,7 @@ autoreconf -ivf --with-zlib \ --with-math \ --with-user=netdata - + %make_build
%install @@ -233,18 +233,10 @@ 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} -# it's better to put stock config file in a noarch pkg (like systemd) -%ifarch x86_64 -mkdir -p %{buildroot}%{stock_conf_path}/conf.d -mv %{buildroot}%{_libdir}/%{name}/conf.d/* %{buildroot}%{stock_conf_path}/conf.d -%endif - +# 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, /usr/libexec is a better place mv %{buildroot}%{_sysconfdir}/%{name}/edit-config %{buildroot}%{_libexecdir}/%{name}/edit-config -# Force stock config file to a noarch path (like systemd) -%ifarch x86_64 -sed -i -e '/NETDATA_STOCK_CONFIG_DIR/ s/lib64/lib/' %{buildroot}%{_libexecdir}/%{name}/edit-config -%endif # Fix EOL sed -i -e 's/\r//' %{buildroot}%{_datadir}/%{name}/web/lib/tableExport-1.6.0.min.js # Delete useless hidden dir @@ -256,6 +248,9 @@ 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 make tests
@@ -265,9 +260,6 @@ getent passwd netdata > /dev/null || useradd -r -g netdata -c "NetData User" -s
%post sed -i -e '/web files group/ s/root/netdata/' /etc/netdata/netdata.conf ||: -sed -i -e '/stock config directory/ s;/etc/netdata/conf.d;/usr/lib/netdata/conf.d;' /etc/netdata/netdata.conf ||: -sed -i -e '/stock health configuration directory/ s;/etc/netdata/conf.d/health.d;/usr/lib/netdata/conf.d/health.d;' /etc/netdata/netdata.conf ||: -rm -f %{_sysconfdir}/profile.d/netdata.sh ||: %systemd_post %{name}.service echo "The current config file can be downloaded with the following command" echo "curl -o /etc/netdata/netdata.conf http://localhost:19999/netdata.conf" @@ -311,13 +303,24 @@ echo "Config should be edited with %{_libexecdir}/%{name}/edit-config" %dir %{_sysconfdir}/%{name}/health.d %dir %{_sysconfdir}/%{name}/python.d %dir %{_sysconfdir}/%{name}/statsd.d -%dir %{stock_conf_path} -%{_sysconfdir}/%{name}/.install-type -%{stock_conf_path}/conf.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}/logrotate.d/netdata +%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
commit 65fa8eb3bb5e041cabbc0bd92500778f477fa7d1 Author: Didier Fabert didier.fabert@gmail.com Date: Sat Apr 30 20:36:40 2022 +0200
Update to upstream release 1.34.1
diff --git a/.gitignore b/.gitignore index f4986bc..484a2d9 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ /netdata-1.32.0.tar.gz /netdata-1.32.1.tar.gz /netdata-v1.33.1.tar.gz +/netdata-v1.34.1.tar.gz +/protobuf-cpp-3.17.3.tar.gz diff --git a/netdata-fix-shebang-1.33.1.patch b/netdata-fix-shebang-1.34.1.patch similarity index 55% rename from netdata-fix-shebang-1.33.1.patch rename to netdata-fix-shebang-1.34.1.patch index a9310e9..131f028 100644 --- a/netdata-fix-shebang-1.33.1.patch +++ b/netdata-fix-shebang-1.34.1.patch @@ -1,18 +1,9 @@ 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 2022-02-14 18:01:12.144767227 +0100 -+++ b/backends/nc-backend.sh 2022-02-17 19:42:53.167055475 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # SPDX-License-Identifier: GPL-3.0-or-later - diff -rup a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in ---- a/claim/netdata-claim.sh.in 2022-02-14 18:01:12.148767260 +0100 -+++ b/claim/netdata-claim.sh.in 2022-02-17 19:42:53.168055480 +0100 +--- a/claim/netdata-claim.sh.in 2022-03-29 16:20:22.481318701 +0200 ++++ b/claim/netdata-claim.sh.in 2022-04-19 16:32:30.926492999 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -20,8 +11,8 @@ diff -rup a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in # 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-02-14 18:02:10.045550210 +0100 -+++ b/collectors/cgroups.plugin/cgroup-name.sh 2022-02-17 19:42:53.185055570 +0100 +--- a/collectors/cgroups.plugin/cgroup-name.sh 2022-04-18 15:12:44.868420791 +0200 ++++ b/collectors/cgroups.plugin/cgroup-name.sh 2022-04-19 16:32:30.938493060 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -29,8 +20,8 @@ diff -rup a/collectors/cgroups.plugin/cgroup-name.sh b/collectors/cgroups.plugin
# netdata 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 2022-02-14 18:01:12.152767292 +0100 -+++ b/collectors/cgroups.plugin/cgroup-name.sh.in 2022-02-17 19:42:53.187055580 +0100 +--- a/collectors/cgroups.plugin/cgroup-name.sh.in 2022-03-15 13:47:55.102775668 +0100 ++++ b/collectors/cgroups.plugin/cgroup-name.sh.in 2022-04-19 16:32:30.940493071 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -38,8 +29,8 @@ diff -rup a/collectors/cgroups.plugin/cgroup-name.sh.in b/collectors/cgroups.plu
# 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-02-14 18:01:12.152767292 +0100 -+++ b/collectors/cgroups.plugin/cgroup-network-helper.sh 2022-02-17 19:42:53.183055560 +0100 +--- a/collectors/cgroups.plugin/cgroup-network-helper.sh 2022-03-15 13:47:55.102775668 +0100 ++++ b/collectors/cgroups.plugin/cgroup-network-helper.sh 2022-04-19 16:32:30.936493050 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -47,8 +38,8 @@ diff -rup a/collectors/cgroups.plugin/cgroup-network-helper.sh b/collectors/cgro
# 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-02-14 18:01:12.152767292 +0100 -+++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2022-02-17 19:42:53.175055517 +0100 +--- a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2021-04-30 16:00:34.262142660 +0200 ++++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2022-04-19 16:32:30.933493035 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -56,8 +47,8 @@ diff -rup a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh b/collectors/ch
# 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-02-14 18:02:10.093550803 +0100 -+++ b/collectors/charts.d.plugin/charts.d.plugin 2022-02-17 19:42:53.173055507 +0100 +--- a/collectors/charts.d.plugin/charts.d.plugin 2022-04-18 15:12:45.228420886 +0200 ++++ b/collectors/charts.d.plugin/charts.d.plugin 2022-04-19 16:32:30.931493025 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -65,8 +56,8 @@ diff -rup a/collectors/charts.d.plugin/charts.d.plugin b/collectors/charts.d.plu
# 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-02-14 18:01:12.156767325 +0100 -+++ b/collectors/charts.d.plugin/charts.d.plugin.in 2022-02-17 19:42:53.180055543 +0100 +--- a/collectors/charts.d.plugin/charts.d.plugin.in 2022-03-16 12:31:30.172663376 +0100 ++++ b/collectors/charts.d.plugin/charts.d.plugin.in 2022-04-19 16:32:30.935493045 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -74,8 +65,8 @@ diff -rup a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.
# netdata diff -rup a/collectors/fping.plugin/fping.plugin b/collectors/fping.plugin/fping.plugin ---- a/collectors/fping.plugin/fping.plugin 2022-02-14 18:02:10.305553425 +0100 -+++ b/collectors/fping.plugin/fping.plugin 2022-02-17 19:42:53.197055633 +0100 +--- a/collectors/fping.plugin/fping.plugin 2022-04-18 15:12:46.991754684 +0200 ++++ b/collectors/fping.plugin/fping.plugin 2022-04-19 16:32:30.949493117 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -83,8 +74,8 @@ diff -rup a/collectors/fping.plugin/fping.plugin b/collectors/fping.plugin/fping
# 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-02-14 18:01:12.160767358 +0100 -+++ b/collectors/fping.plugin/fping.plugin.in 2022-02-17 19:42:53.199055644 +0100 +--- a/collectors/fping.plugin/fping.plugin.in 2022-03-15 13:47:55.109442345 +0100 ++++ b/collectors/fping.plugin/fping.plugin.in 2022-04-19 16:32:30.951493127 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -92,8 +83,8 @@ diff -rup a/collectors/fping.plugin/fping.plugin.in b/collectors/fping.plugin/fp
# netdata diff -rup a/collectors/ioping.plugin/ioping.plugin b/collectors/ioping.plugin/ioping.plugin ---- a/collectors/ioping.plugin/ioping.plugin 2022-02-14 18:02:10.349553970 +0100 -+++ b/collectors/ioping.plugin/ioping.plugin 2022-02-17 19:42:53.203055665 +0100 +--- a/collectors/ioping.plugin/ioping.plugin 2022-04-18 15:12:47.498421484 +0200 ++++ b/collectors/ioping.plugin/ioping.plugin 2022-04-19 16:32:30.954493142 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -101,8 +92,8 @@ diff -rup a/collectors/ioping.plugin/ioping.plugin b/collectors/ioping.plugin/io
# 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-02-14 18:01:12.164767390 +0100 -+++ b/collectors/ioping.plugin/ioping.plugin.in 2022-02-17 19:42:53.201055654 +0100 +--- a/collectors/ioping.plugin/ioping.plugin.in 2022-03-29 16:20:22.484652037 +0200 ++++ b/collectors/ioping.plugin/ioping.plugin.in 2022-04-19 16:32:30.952493132 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -110,8 +101,8 @@ diff -rup a/collectors/ioping.plugin/ioping.plugin.in b/collectors/ioping.plugin
# netdata diff -rup a/collectors/node.d.plugin/node.d.plugin b/collectors/node.d.plugin/node.d.plugin ---- a/collectors/node.d.plugin/node.d.plugin 2022-02-14 18:02:10.621557334 +0100 -+++ b/collectors/node.d.plugin/node.d.plugin 2022-02-17 19:42:53.189055591 +0100 +--- a/collectors/node.d.plugin/node.d.plugin 2022-04-18 15:12:50.708422331 +0200 ++++ b/collectors/node.d.plugin/node.d.plugin 2022-04-19 16:32:30.941493076 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -119,8 +110,8 @@ diff -rup a/collectors/node.d.plugin/node.d.plugin b/collectors/node.d.plugin/no
// shebang hack from: 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 2022-02-14 18:01:12.164767390 +0100 -+++ b/collectors/node.d.plugin/node.d.plugin.in 2022-02-17 19:42:53.190055596 +0100 +--- a/collectors/node.d.plugin/node.d.plugin.in 2021-04-30 16:00:34.268809326 +0200 ++++ b/collectors/node.d.plugin/node.d.plugin.in 2022-04-19 16:32:30.943493086 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -128,8 +119,8 @@ diff -rup a/collectors/node.d.plugin/node.d.plugin.in b/collectors/node.d.plugin
// shebang hack from: 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-02-14 18:02:10.737558769 +0100 -+++ b/collectors/python.d.plugin/python.d.plugin 2022-02-17 19:42:53.194055617 +0100 +--- a/collectors/python.d.plugin/python.d.plugin 2022-04-18 15:12:51.665089250 +0200 ++++ b/collectors/python.d.plugin/python.d.plugin 2022-04-19 16:32:30.947493106 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -137,8 +128,8 @@ diff -rup a/collectors/python.d.plugin/python.d.plugin b/collectors/python.d.plu 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-02-14 18:01:12.188767586 +0100 -+++ b/collectors/python.d.plugin/python.d.plugin.in 2022-02-17 19:42:53.192055607 +0100 +--- a/collectors/python.d.plugin/python.d.plugin.in 2022-03-15 13:47:55.122775699 +0100 ++++ b/collectors/python.d.plugin/python.d.plugin.in 2022-04-19 16:32:30.945493096 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -146,8 +137,8 @@ diff -rup a/collectors/python.d.plugin/python.d.plugin.in b/collectors/python.d. 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-02-14 18:01:12.192767618 +0100 -+++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2022-02-17 19:42:53.329056329 +0100 +--- a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2021-04-30 16:00:34.295475990 +0200 ++++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2022-04-19 16:32:31.073493750 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +# @@ -155,8 +146,8 @@ diff -rup a/collectors/python.d.plugin/python_modules/third_party/boinc_client.p # # 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-02-14 18:02:11.425567092 +0100 -+++ b/collectors/tc.plugin/tc-qos-helper.sh 2022-02-17 19:42:53.171055496 +0100 +--- a/collectors/tc.plugin/tc-qos-helper.sh 2022-04-18 15:12:58.161757637 +0200 ++++ b/collectors/tc.plugin/tc-qos-helper.sh 2022-04-19 16:32:30.930493020 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -164,8 +155,8 @@ diff -rup a/collectors/tc.plugin/tc-qos-helper.sh b/collectors/tc.plugin/tc-qos- # 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-02-14 18:01:12.200767684 +0100 -+++ b/collectors/tc.plugin/tc-qos-helper.sh.in 2022-02-17 19:42:53.170055491 +0100 +--- a/collectors/tc.plugin/tc-qos-helper.sh.in 2022-03-15 13:47:55.126109038 +0100 ++++ b/collectors/tc.plugin/tc-qos-helper.sh.in 2022-04-19 16:32:30.928493009 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -173,8 +164,8 @@ diff -rup a/collectors/tc.plugin/tc-qos-helper.sh.in b/collectors/tc.plugin/tc-q # 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-02-14 18:01:12.200767684 +0100 -+++ b/contrib/debian/install_go.sh 2022-02-17 19:42:53.206055680 +0100 +--- a/contrib/debian/install_go.sh 2022-03-15 13:47:55.126109038 +0100 ++++ b/contrib/debian/install_go.sh 2022-04-19 16:32:30.957493158 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -182,26 +173,17 @@ diff -rup a/contrib/debian/install_go.sh b/contrib/debian/install_go.sh 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-02-14 18:01:12.200767684 +0100 -+++ b/contrib/rhel/build-netdata-rpm.sh 2022-02-17 19:42:53.204055670 +0100 +--- a/contrib/rhel/build-netdata-rpm.sh 2022-03-15 13:47:55.126109038 +0100 ++++ b/contrib/rhel/build-netdata-rpm.sh 2022-04-19 16:32:30.956493152 +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 2022-02-14 18:01:12.200767684 +0100 -+++ b/contrib/sles11/alarm-notify-basic.bash3.sh 2022-02-17 19:42:53.207055686 +0100 -@@ -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-scan.sh b/coverity-scan.sh ---- a/coverity-scan.sh 2022-02-14 18:01:12.200767684 +0100 -+++ b/coverity-scan.sh 2022-02-17 19:42:53.210055702 +0100 +--- a/coverity-scan.sh 2022-04-07 16:00:35.708114383 +0200 ++++ b/coverity-scan.sh 2022-04-19 16:32:30.959493168 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -209,8 +191,8 @@ diff -rup a/coverity-scan.sh b/coverity-scan.sh # Coverity scan script # diff -rup a/cppcheck.sh b/cppcheck.sh ---- a/cppcheck.sh 2022-02-14 18:01:12.200767684 +0100 -+++ b/cppcheck.sh 2022-02-17 19:42:53.212055712 +0100 +--- a/cppcheck.sh 2018-11-02 16:10:18.078559041 +0100 ++++ b/cppcheck.sh 2022-04-19 16:32:30.961493178 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -218,8 +200,8 @@ diff -rup a/cppcheck.sh b/cppcheck.sh # echo >>/tmp/cppcheck.log "cppcheck ${*}"
diff -rup a/daemon/anonymous-statistics.sh b/daemon/anonymous-statistics.sh ---- a/daemon/anonymous-statistics.sh 2022-02-14 18:02:11.469567624 +0100 -+++ b/daemon/anonymous-statistics.sh 2022-02-17 19:42:53.242055870 +0100 +--- a/daemon/anonymous-statistics.sh 2022-04-18 15:12:58.645091098 +0200 ++++ b/daemon/anonymous-statistics.sh 2022-04-19 16:32:30.989493321 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -227,8 +209,8 @@ diff -rup a/daemon/anonymous-statistics.sh b/daemon/anonymous-statistics.sh # Valid actions:
diff -rup a/daemon/anonymous-statistics.sh.in b/daemon/anonymous-statistics.sh.in ---- a/daemon/anonymous-statistics.sh.in 2022-02-14 18:01:12.204767716 +0100 -+++ b/daemon/anonymous-statistics.sh.in 2022-02-17 19:42:53.241055865 +0100 +--- a/daemon/anonymous-statistics.sh.in 2022-03-15 13:47:55.126109038 +0100 ++++ b/daemon/anonymous-statistics.sh.in 2022-04-19 16:32:30.987493311 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -236,26 +218,26 @@ diff -rup a/daemon/anonymous-statistics.sh.in b/daemon/anonymous-statistics.sh.i # Valid actions:
diff -rup a/daemon/get-kubernetes-labels.sh b/daemon/get-kubernetes-labels.sh ---- a/daemon/get-kubernetes-labels.sh 2022-02-14 18:02:11.473567673 +0100 -+++ b/daemon/get-kubernetes-labels.sh 2022-02-17 19:42:53.216055733 +0100 +--- a/daemon/get-kubernetes-labels.sh 2022-04-18 15:12:58.698424445 +0200 ++++ b/daemon/get-kubernetes-labels.sh 2022-04-19 16:32:30.964493193 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash
- # Checks if netdata is running in a kubernetes pod and fetches that pod's labels - + # Checks if netdata is running in a kubernetes pod and fetches: + # - pod's labels diff -rup a/daemon/get-kubernetes-labels.sh.in b/daemon/get-kubernetes-labels.sh.in ---- a/daemon/get-kubernetes-labels.sh.in 2022-02-14 18:01:12.204767716 +0100 -+++ b/daemon/get-kubernetes-labels.sh.in 2022-02-17 19:42:53.214055723 +0100 +--- a/daemon/get-kubernetes-labels.sh.in 2022-04-11 14:27:01.935438827 +0200 ++++ b/daemon/get-kubernetes-labels.sh.in 2022-04-19 16:32:30.962493183 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash
- # Checks if netdata is running in a kubernetes pod and fetches that pod's labels - + # Checks if netdata is running in a kubernetes pod and fetches: + # - pod's labels diff -rup a/daemon/system-info.sh b/daemon/system-info.sh ---- a/daemon/system-info.sh 2022-02-14 18:01:12.204767716 +0100 -+++ b/daemon/system-info.sh 2022-02-17 19:42:53.239055855 +0100 +--- a/daemon/system-info.sh 2022-04-07 16:00:43.864785538 +0200 ++++ b/daemon/system-info.sh 2022-04-19 16:32:30.986493306 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -263,8 +245,8 @@ diff -rup a/daemon/system-info.sh b/daemon/system-info.sh # ------------------------------------------------------------------------------------------------- # detect the kernel diff -rup a/diagrams/build.sh b/diagrams/build.sh ---- a/diagrams/build.sh 2022-02-14 18:01:12.260768173 +0100 -+++ b/diagrams/build.sh 2022-02-17 19:42:53.217055738 +0100 +--- a/diagrams/build.sh 2018-10-16 15:11:47.573219719 +0200 ++++ b/diagrams/build.sh 2022-04-19 16:32:30.966493204 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -272,8 +254,8 @@ diff -rup a/diagrams/build.sh b/diagrams/build.sh
path=$(dirname "$0") diff -rup a/exporting/nc-exporting.sh b/exporting/nc-exporting.sh ---- a/exporting/nc-exporting.sh 2022-02-14 18:01:12.272768270 +0100 -+++ b/exporting/nc-exporting.sh 2022-02-17 19:42:53.219055749 +0100 +--- a/exporting/nc-exporting.sh 2022-03-29 16:20:22.497985377 +0200 ++++ b/exporting/nc-exporting.sh 2022-04-19 16:32:30.968493214 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -281,8 +263,8 @@ diff -rup a/exporting/nc-exporting.sh b/exporting/nc-exporting.sh # 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-02-14 18:01:12.276768303 +0100 -+++ b/health/notifications/alarm-email.sh 2022-02-17 19:42:53.220055754 +0100 +--- a/health/notifications/alarm-email.sh 2021-04-30 16:00:34.352142649 +0200 ++++ b/health/notifications/alarm-email.sh 2022-04-19 16:32:30.969493219 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -290,8 +272,8 @@ diff -rup a/health/notifications/alarm-email.sh b/health/notifications/alarm-ema
# OBSOLETE - REPLACED WITH diff -rup a/health/notifications/alarm-notify.sh b/health/notifications/alarm-notify.sh ---- a/health/notifications/alarm-notify.sh 2022-02-14 18:02:12.081575024 +0100 -+++ b/health/notifications/alarm-notify.sh 2022-02-17 19:42:53.222055765 +0100 +--- a/health/notifications/alarm-notify.sh 2022-04-18 15:13:05.155092827 +0200 ++++ b/health/notifications/alarm-notify.sh 2022-04-19 16:32:30.972493234 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -299,8 +281,8 @@ diff -rup a/health/notifications/alarm-notify.sh b/health/notifications/alarm-no
# 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-02-14 18:01:12.280768336 +0100 -+++ b/health/notifications/alarm-notify.sh.in 2022-02-17 19:42:53.224055775 +0100 +--- a/health/notifications/alarm-notify.sh.in 2022-03-15 13:47:55.189442468 +0100 ++++ b/health/notifications/alarm-notify.sh.in 2022-04-19 16:32:30.974493244 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -308,8 +290,8 @@ diff -rup a/health/notifications/alarm-notify.sh.in b/health/notifications/alarm
# netdata diff -rup a/health/notifications/alarm-test.sh b/health/notifications/alarm-test.sh ---- a/health/notifications/alarm-test.sh 2022-02-14 18:01:12.280768336 +0100 -+++ b/health/notifications/alarm-test.sh 2022-02-17 19:42:53.226055786 +0100 +--- a/health/notifications/alarm-test.sh 2021-04-30 16:00:34.352142649 +0200 ++++ b/health/notifications/alarm-test.sh 2022-04-19 16:32:30.975493250 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -317,8 +299,8 @@ diff -rup a/health/notifications/alarm-test.sh b/health/notifications/alarm-test # netdata # real-time performance and health monitoring, done right! diff -rup a/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py b/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py ---- a/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py 2022-02-14 18:01:30.753067208 +0100 -+++ b/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py 2022-02-17 19:42:53.332056344 +0100 +--- a/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py 2021-10-27 14:02:02.010887170 +0200 ++++ b/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py 2022-04-19 16:32:31.075493761 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python33 @@ -326,8 +308,8 @@ diff -rup a/ml/kmeans/dlib/dlib/external/pybind11/tools/mkdoc.py b/ml/kmeans/dli # Syntax: mkdoc.py [-I<path> ..] [.. a list of header files ..] # diff -rup a/ml/kmeans/dlib/dlib/travis/build-and-test.sh b/ml/kmeans/dlib/dlib/travis/build-and-test.sh ---- a/ml/kmeans/dlib/dlib/travis/build-and-test.sh 2022-02-14 18:01:30.845068308 +0100 -+++ b/ml/kmeans/dlib/dlib/travis/build-and-test.sh 2022-02-17 19:42:53.229055802 +0100 +--- a/ml/kmeans/dlib/dlib/travis/build-and-test.sh 2021-10-27 14:02:02.070887180 +0200 ++++ b/ml/kmeans/dlib/dlib/travis/build-and-test.sh 2022-04-19 16:32:30.977493260 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -335,8 +317,8 @@ diff -rup a/ml/kmeans/dlib/dlib/travis/build-and-test.sh b/ml/kmeans/dlib/dlib/t set -eux
diff -rup a/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py b/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py ---- a/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2022-02-14 18:01:30.905069026 +0100 -+++ b/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2022-02-17 19:42:53.334056355 +0100 +--- a/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2021-10-27 14:02:02.120887187 +0200 ++++ b/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2022-04-19 16:32:31.078493776 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 @@ -344,26 +326,17 @@ diff -rup a/ml/kmeans/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model # 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-02-14 18:01:12.292768433 +0100 -+++ b/packaging/check-kernel-config.sh 2022-02-17 19:42:53.232055817 +0100 +--- a/packaging/check-kernel-config.sh 2022-03-14 13:51:04.198273428 +0100 ++++ b/packaging/check-kernel-config.sh 2022-04-19 16:32:30.979493270 +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/packaging/installer/netdata-uninstaller.sh b/packaging/installer/netdata-uninstaller.sh ---- a/packaging/installer/netdata-uninstaller.sh 2022-02-14 18:01:12.292768433 +0100 -+++ b/packaging/installer/netdata-uninstaller.sh 2022-02-17 19:42:53.230055807 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # - # This is the netdata uninstaller script - # diff -rup a/system/edit-config b/system/edit-config ---- a/system/edit-config 2022-02-14 18:02:09.541543976 +0100 -+++ b/system/edit-config 2022-02-17 19:42:53.244055881 +0100 +--- a/system/edit-config 2022-04-18 15:12:42.781753576 +0200 ++++ b/system/edit-config 2022-04-19 16:32:30.991493331 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -371,8 +344,8 @@ diff -rup a/system/edit-config b/system/edit-config [ -f /etc/profile ] && . /etc/profile
diff -rup a/system/edit-config.in b/system/edit-config.in ---- a/system/edit-config.in 2022-02-14 18:01:12.300768498 +0100 -+++ b/system/edit-config.in 2022-02-17 19:42:53.246055891 +0100 +--- a/system/edit-config.in 2022-02-25 16:31:16.975943768 +0100 ++++ b/system/edit-config.in 2022-04-19 16:32:30.992493336 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/sh @@ -380,8 +353,8 @@ diff -rup a/system/edit-config.in b/system/edit-config.in [ -f /etc/profile ] && . /etc/profile
diff -rup a/system/netdata-lsb.in b/system/netdata-lsb.in ---- a/system/netdata-lsb.in 2022-02-14 18:01:12.300768498 +0100 -+++ b/system/netdata-lsb.in 2022-02-17 19:42:53.234055828 +0100 +--- a/system/netdata-lsb.in 2022-02-25 16:31:16.975943768 +0100 ++++ b/system/netdata-lsb.in 2022-04-19 16:32:30.980493275 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -389,8 +362,8 @@ diff -rup a/system/netdata-lsb.in b/system/netdata-lsb.in # 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-02-14 18:02:09.601544718 +0100 -+++ b/tests/health_mgmtapi/health-cmdapi-test.sh 2022-02-17 19:42:53.236055839 +0100 +--- a/tests/health_mgmtapi/health-cmdapi-test.sh 2022-04-18 15:12:42.991753631 +0200 ++++ b/tests/health_mgmtapi/health-cmdapi-test.sh 2022-04-19 16:32:30.982493285 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash @@ -398,8 +371,8 @@ diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh b/tests/health_mgmtapi/he
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-02-14 18:01:12.300768498 +0100 -+++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in 2022-02-17 19:42:53.237055844 +0100 +--- a/tests/health_mgmtapi/health-cmdapi-test.sh.in 2022-02-25 16:31:16.979277102 +0100 ++++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in 2022-04-19 16:32:30.984493296 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash diff --git a/netdata-remove-fonts-1.33.1.patch b/netdata-remove-fonts-1.34.1.patch similarity index 89% rename from netdata-remove-fonts-1.33.1.patch rename to netdata-remove-fonts-1.34.1.patch index 5fc0c07..2b20739 100644 --- a/netdata-remove-fonts-1.33.1.patch +++ b/netdata-remove-fonts-1.34.1.patch @@ -1,9 +1,9 @@ diff -rup a/web/gui/dashboard/Makefile.am b/web/gui/dashboard/Makefile.am ---- a/web/gui/dashboard/Makefile.am 2022-02-14 17:58:30.000000000 +0100 -+++ b/web/gui/dashboard/Makefile.am 2022-02-16 19:17:22.648816557 +0100 +--- a/web/gui/dashboard/Makefile.am 2022-04-14 13:22:42.927570498 +0200 ++++ b/web/gui/dashboard/Makefile.am 2022-04-19 22:57:25.589407143 +0200 @@ -163,36 +163,3 @@ dist_webstaticjs_DATA = \ - static/js/runtime-main.ec4d2459.js \ - static/js/runtime-main.ec4d2459.js.map \ + static/js/runtime-main.b352aa47.js \ + static/js/runtime-main.b352aa47.js.map \ $(NULL) - -webstaticmediadir=$(webdir)/static/media diff --git a/netdata.profile b/netdata.profile deleted file mode 100644 index 0673b29..0000000 --- a/netdata.profile +++ /dev/null @@ -1,5 +0,0 @@ -# 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" diff --git a/netdata.spec b/netdata.spec index bf78f37..5aa13e5 100644 --- a/netdata.spec +++ b/netdata.spec @@ -17,6 +17,13 @@ ExcludeArch: s390x %bcond_without cups %endif
+# Because protobuf is too old in el7 +%if 0%{?rhel} && 0%{?rhel} == 7 +%bcond_without bundled_protobuf +%else +%bcond_with bundled_protobuf +%endif + %if 0%{?rhel} && 0%{?rhel} <= 7 # This is temporary and should eventually be resolved. This bypasses # the default rhel __os_install_post which throws a python compile @@ -28,12 +35,17 @@ ExcludeArch: s390x %global _hardened_build 1
# Build release candidate -%global upver 1.33.1 +%global upver 1.34.1 #global rcver rc0
+# Last python 2 support (el7 only) +%global protobuf_cpp_ver 3.17.3 + +%global stock_conf_path %{_prefix}/lib/%{name} + Name: netdata Version: %{upver}%{?rcver:~%{rcver}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Real-time performance monitoring # For a breakdown of the licensing, see LICENSE-REDISTRIBUTED.md License: GPLv3 and GPLv3+ and ASL 2.0 and CC-BY and MIT and WTFPL @@ -42,12 +54,13 @@ Source0: https://github.com/netdata/netdata/releases/download/v%%7Bupver%7D%%7B Source1: netdata.tmpfiles.conf Source2: netdata.init Source3: netdata.conf -Source4: netdata.profile Source5: README-packager.md -Patch0: netdata-fix-shebang-1.33.1.patch +# Only for el7 +Source10: https://github.com/protocolbuffers/protobuf/releases/download/v%%7Bprotobuf_... +Patch0: netdata-fix-shebang-1.34.1.patch %if 0%{?fedora} # Remove embedded font -Patch10: netdata-remove-fonts-1.33.1.patch +Patch10: netdata-remove-fonts-1.34.1.patch %endif
BuildRequires: zlib-devel @@ -104,6 +117,7 @@ BuildRequires: python3 BuildRequires: python2 %endif
+ Requires: nodejs Requires: curl Requires: nc @@ -162,8 +176,27 @@ freeipmi plugin for netdata rm -rf web/fonts web/gui/dashboard/static/media %endif cp %{SOURCE5} . +### BEGIN netdata cloud +%if %{with bundled_protobuf} +mkdir -p externaldeps/protobuf +tar -xzf %{SOURCE10} -C externaldeps/protobuf +%endif +### END netdata cloud
%build +### BEGIN netdata cloud +%if %{with bundled_protobuf} +pushd externaldeps/protobuf/protobuf-%{protobuf_cpp_ver} +%configure \ + --disable-shared \ + --without-zlib \ + --disable-dependency-tracking \ + --with-pic +CFLAGS="${CFLAGS} -fPIC" %make_build +popd +cp -a externaldeps/protobuf/protobuf-%{protobuf_cpp_ver}/src externaldeps/protobuf +%endif +### END netdata cloud autoreconf -ivf %configure \ --enable-plugin-freeipmi \ @@ -172,11 +205,14 @@ autoreconf -ivf %endif %if %{with cups} --enable-plugin-cups \ +%endif +%if %{with bundled_protobuf} + --with-bundled-protobuf \ %endif --with-zlib \ --with-math \ --with-user=netdata - + %make_build
%install @@ -197,10 +233,18 @@ 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 and it's better in a noarch pkg -mv %{buildroot}%{_libdir}/%{name}/conf.d %{buildroot}%{_sysconfdir}/%{name}/ -# Scripts must not be in /etc +# it's better to put stock config file in a noarch pkg (like systemd) +%ifarch x86_64 +mkdir -p %{buildroot}%{stock_conf_path}/conf.d +mv %{buildroot}%{_libdir}/%{name}/conf.d/* %{buildroot}%{stock_conf_path}/conf.d +%endif + +# Scripts must not be in /etc, /usr/libexec is a better place mv %{buildroot}%{_sysconfdir}/%{name}/edit-config %{buildroot}%{_libexecdir}/%{name}/edit-config +# Force stock config file to a noarch path (like systemd) +%ifarch x86_64 +sed -i -e '/NETDATA_STOCK_CONFIG_DIR/ s/lib64/lib/' %{buildroot}%{_libexecdir}/%{name}/edit-config +%endif # Fix EOL sed -i -e 's/\r//' %{buildroot}%{_datadir}/%{name}/web/lib/tableExport-1.6.0.min.js # Delete useless hidden dir @@ -212,10 +256,6 @@ 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 -rm -f %{buildroot}%{_sysconfdir}/netdata/.install-type - %check make tests
@@ -225,6 +265,9 @@ getent passwd netdata > /dev/null || useradd -r -g netdata -c "NetData User" -s
%post sed -i -e '/web files group/ s/root/netdata/' /etc/netdata/netdata.conf ||: +sed -i -e '/stock config directory/ s;/etc/netdata/conf.d;/usr/lib/netdata/conf.d;' /etc/netdata/netdata.conf ||: +sed -i -e '/stock health configuration directory/ s;/etc/netdata/conf.d/health.d;/usr/lib/netdata/conf.d/health.d;' /etc/netdata/netdata.conf ||: +rm -f %{_sysconfdir}/profile.d/netdata.sh ||: %systemd_post %{name}.service echo "The current config file can be downloaded with the following command" echo "curl -o /etc/netdata/netdata.conf http://localhost:19999/netdata.conf" @@ -268,21 +311,11 @@ echo "Config should be edited with %{_libexecdir}/%{name}/edit-config" %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 %{_sysconfdir}/%{name}/%{name}.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 %{stock_conf_path} +%{_sysconfdir}/%{name}/.install-type +%{stock_conf_path}/conf.d/* +%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/netdata %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/edit-config
@@ -299,6 +332,11 @@ echo "Config should be edited with %{_libexecdir}/%{name}/edit-config" %caps(cap_setuid=ep) %attr(4750,root,netdata) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin
%changelog +* Sat Apr 30 2022 Didier Fabert didier.fabert@gmail.com 1.34.1-1 +- Update from upstream +- Move stock config files in /usr/lib/netdata/conf.d +- Use embedded protobuf-cpp for el7 + * Sun Feb 20 2022 Didier Fabert didier.fabert@gmail.com 1.33.1-2 - Fix el9 buildreq condition for autogen
diff --git a/sources b/sources index 36b7805..87c918f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (netdata-v1.33.1.tar.gz) = f6586426bd0fe1ac3d903ec279b27177b1d232f5ca1fc28b01f052a5f2f57846d2d6369c9d5a1872fb97e31f86f1f7a11c600beda590447f9ca30c93e7ac262c +SHA512 (netdata-v1.34.1.tar.gz) = 777b0f4efa0b64dd150a097cb2ec1c3155506ada9c1e5289b6acda5e34c9262f796795608b52e70c9310a5cbda03c0568e1391c6861c7f3ea84aa9ca84ed9a0c +SHA512 (protobuf-cpp-3.17.3.tar.gz) = efad397f5cdda6639d5e9980fe6eeadc1ef768bf1d96b1e528a1d7ba1d81ceb49e22cbd78d9b4ab3518236055140568342ff138204b4a47234fb2957a89d2db8