From 51dfb248933e5fac12fee1be8471bb08f9554428 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 17 Aug 2023 12:46:12 +0200 Subject: Adding upstream version 1.42.1. Signed-off-by: Daniel Baumann --- contrib/debian/control | 2 +- contrib/debian/netdata-plugin-apps.postinst | 5 ++++- contrib/debian/netdata-plugin-debugfs.postinst | 5 ++++- contrib/debian/netdata-plugin-go.postinst | 5 ++++- contrib/debian/netdata-plugin-perf.postinst | 8 ++++++++ contrib/debian/netdata-plugin-slabinfo.postinst | 5 ++++- contrib/debian/netdata-plugin-systemd-journal.postinst | 5 ++++- 7 files changed, 29 insertions(+), 6 deletions(-) (limited to 'contrib') diff --git a/contrib/debian/control b/contrib/debian/control index e2b0ca140..262a93a6c 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -17,6 +17,7 @@ Build-Depends: debhelper (>= 9.20160709), libsnappy-dev, libprotobuf-dev, libprotoc-dev, + libsystemd-dev, cmake, autogen, autoconf, @@ -196,7 +197,6 @@ Architecture: any Depends: ${shlibs:Depends}, netdata (= ${source:Version}) Pre-Depends: libcap2-bin, adduser -Build-Depends: libsystemd-dev Conflicts: netdata (<< ${source:Version}) Description: The systemd-journal collector for the Netdata Agent This plugin allows the Netdata Agent to present logs from the systemd diff --git a/contrib/debian/netdata-plugin-apps.postinst b/contrib/debian/netdata-plugin-apps.postinst index 04f914538..f2e52a4b3 100644 --- a/contrib/debian/netdata-plugin-apps.postinst +++ b/contrib/debian/netdata-plugin-apps.postinst @@ -5,7 +5,10 @@ set -e case "$1" in configure|reconfigure) chown root:netdata /usr/libexec/netdata/plugins.d/apps.plugin - setcap "cap_dac_read_search=eip cap_sys_ptrace=eip" /usr/libexec/netdata/plugins.d/apps.plugin + chmod 0750 /usr/libexec/netdata/plugins.d/apps.plugin + if ! setcap "cap_dac_read_search=eip cap_sys_ptrace=eip" /usr/libexec/netdata/plugins.d/apps.plugin; then + chmod -f 4750 /usr/libexec/netdata/plugins.d/apps.plugin + fi ;; esac diff --git a/contrib/debian/netdata-plugin-debugfs.postinst b/contrib/debian/netdata-plugin-debugfs.postinst index 75d08fd17..4519dabd3 100644 --- a/contrib/debian/netdata-plugin-debugfs.postinst +++ b/contrib/debian/netdata-plugin-debugfs.postinst @@ -5,7 +5,10 @@ set -e case "$1" in configure|reconfigure) chown root:netdata /usr/libexec/netdata/plugins.d/debugfs.plugin - setcap "cap_dac_read_search=eip" /usr/libexec/netdata/plugins.d/debugfs.plugin + chmod 0750 /usr/libexec/netdata/plugins.d/debugfs.plugin + if ! setcap "cap_dac_read_search=eip" /usr/libexec/netdata/plugins.d/debugfs.plugin; then + chmod -f 4750 /usr/libexec/netdata/plugins.d/debugfs.plugin + fi ;; esac diff --git a/contrib/debian/netdata-plugin-go.postinst b/contrib/debian/netdata-plugin-go.postinst index 9cfce16f6..70d67aaa1 100644 --- a/contrib/debian/netdata-plugin-go.postinst +++ b/contrib/debian/netdata-plugin-go.postinst @@ -5,7 +5,10 @@ set -e case "$1" in configure|reconfigure) chown root:netdata /usr/libexec/netdata/plugins.d/go.d.plugin - setcap "cap_net_admin=eip cap_net_raw=eip" /usr/libexec/netdata/plugins.d/go.d.plugin + chmod 0750 /usr/libexec/netdata/plugins.d/go.d.plugin + if ! setcap "cap_net_admin=eip cap_net_raw=eip" /usr/libexec/netdata/plugins.d/go.d.plugin; then + chmod -f 4750 /usr/libexec/netdata/plugins.d/go.d.plugin + fi ;; esac diff --git a/contrib/debian/netdata-plugin-perf.postinst b/contrib/debian/netdata-plugin-perf.postinst index 5250275cc..76905878e 100644 --- a/contrib/debian/netdata-plugin-perf.postinst +++ b/contrib/debian/netdata-plugin-perf.postinst @@ -5,10 +5,18 @@ set -e case "$1" in configure|reconfigure) chown root:netdata /usr/libexec/netdata/plugins.d/perf.plugin + chmod 0750 /usr/libexec/netdata/plugins.d/perf.plugin + if capsh --supports=cap_perfmon 2>/dev/null; then setcap cap_perfmon+ep /usr/libexec/netdata/plugins.d/perf.plugin + ret="$?" else setcap cap_sys_admin+ep /usr/libexec/netdata/plugins.d/perf.plugin + ret="$?" + fi + + if [ "${ret}" -ne 0 ]; then + chmod -f 4750 /usr/libexec/netdata/plugins.d/perf.plugin fi ;; esac diff --git a/contrib/debian/netdata-plugin-slabinfo.postinst b/contrib/debian/netdata-plugin-slabinfo.postinst index b697e724e..b4aa87bae 100644 --- a/contrib/debian/netdata-plugin-slabinfo.postinst +++ b/contrib/debian/netdata-plugin-slabinfo.postinst @@ -5,7 +5,10 @@ set -e case "$1" in configure|reconfigure) chown root:netdata /usr/libexec/netdata/plugins.d/slabinfo.plugin - setcap "cap_dac_read_search=eip" /usr/libexec/netdata/plugins.d/slabinfo.plugin + chmod 0750 /usr/libexec/netdata/plugins.d/slabinfo.plugin + if ! setcap "cap_dac_read_search=eip" /usr/libexec/netdata/plugins.d/slabinfo.plugin; then + chmod -f 4750 /usr/libexec/netdata/plugins.d/slabinfo.plugin + fi ;; esac diff --git a/contrib/debian/netdata-plugin-systemd-journal.postinst b/contrib/debian/netdata-plugin-systemd-journal.postinst index d2f71970f..b5e56f758 100644 --- a/contrib/debian/netdata-plugin-systemd-journal.postinst +++ b/contrib/debian/netdata-plugin-systemd-journal.postinst @@ -5,7 +5,10 @@ set -e case "$1" in configure|reconfigure) chown root:netdata /usr/libexec/netdata/plugins.d/systemd-journal.plugin - setcap "cap_dac_read_search=eip" /usr/libexec/netdata/plugins.d/systemd-journal.plugin + chmod 0750 /usr/libexec/netdata/plugins.d/systemd-journal.plugin + if ! setcap "cap_dac_read_search=eip" /usr/libexec/netdata/plugins.d/systemd-journal.plugin; then + chmod -f 4750 /usr/libexec/netdata/plugins.d/systemd-journal.plugin + fi ;; esac -- cgit v1.2.3