fix setting go.d.plugin capabilities (#14525)
Ilya Mashchenko committed
Feb 16, 2023 at 17:14 UTC
91b3c4296fb2ec1f0546624cd327e8cc61e58034
2 files changed
+9
-3
netdata-installer.sh
+6
-3
@@ -1434,9 +1434,6 @@ install_go() {
1434
run chown "root:${NETDATA_GROUP}" "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/go.d.plugin"
1435
fi
1436
run chmod 0750 "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/go.d.plugin"
1437
- if command -v setcap 1>/dev/null 2>&1; then
1438
- run setcap "cap_net_admin+epi cap_net_raw=eip" "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/go.d.plugin"
1439
- fi
1437
rm -rf "${tmp}"
1438
1439
[ -n "${GITHUB_ACTIONS}" ] && echo "::endgroup::"
@@ -1444,6 +1441,12 @@ install_go() {
1441
1442
install_go
1443
1444
+if [ -f "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/go.d.plugin" ]; then
1445
+ if command -v setcap 1>/dev/null 2>&1; then
1446
+ run setcap "cap_net_admin+epi cap_net_raw=eip" "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/go.d.plugin"
1447
+ fi
1448
+fi
1449
+
1450
should_install_ebpf() {
1451
if [ "${NETDATA_DISABLE_EBPF:=0}" -eq 1 ]; then
1452
run_failed "eBPF has been explicitly disabled, it will not be available in this install."
packaging/docker/Dockerfile
+3
@@ -106,6 +106,9 @@ RUN chown -R root:root \
106
if [ -f /usr/libexec/netdata/plugins.d/freeipmi.plugin ]; then \
107
chmod 4755 /usr/libexec/netdata/plugins.d/freeipmi.plugin; \
108
fi && \
109
+ if [ -f /usr/libexec/netdata/plugins.d/go.d.plugin ] && command -v setcap 1>/dev/null 2>&1; then \
110
+ setcap "cap_net_raw=eip" /usr/libexec/netdata/plugins.d/go.d.plugin 2>/dev/null; \
111
+ fi && \
112
# Group write permissions due to: https://github.com/netdata/netdata/pull/6543
113
find /var/lib/netdata /var/cache/netdata -type d -exec chmod 0770 {} \; && \
114
find /var/lib/netdata /var/cache/netdata -type f -exec chmod 0660 {} \; && \