summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-04-14 18:12:14 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-04-14 18:12:14 +0000
commitbb50acdcb8073654ea667b8c0272e335bd43f844 (patch)
tree1e00c8a29871426f8182658928dcb62e42d57ce8 /system
parentReleasing debian version 1.33.1-1. (diff)
downloadnetdata-bb50acdcb8073654ea667b8c0272e335bd43f844.tar.xz
netdata-bb50acdcb8073654ea667b8c0272e335bd43f844.zip
Merging upstream version 1.34.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'system')
-rw-r--r--system/netdata.conf10
-rw-r--r--system/netdata.service.in12
-rw-r--r--system/netdata.service.v235.in10
3 files changed, 6 insertions, 26 deletions
diff --git a/system/netdata.conf b/system/netdata.conf
index 6341fcaf6..3fb6ebffc 100644
--- a/system/netdata.conf
+++ b/system/netdata.conf
@@ -16,13 +16,3 @@
# the default database size - 1 hour
history = 3600
- # some defaults to run netdata with least priority
- process scheduling policy = idle
- OOM score = 1000
-
-[web]
- web files owner = root
- web files group = netdata
-
- # by default do not expose the netdata port
- bind to = localhost
diff --git a/system/netdata.service.in b/system/netdata.service.in
index 291f4490b..1683a0a09 100644
--- a/system/netdata.service.in
+++ b/system/netdata.service.in
@@ -26,22 +26,16 @@ TimeoutStopSec=150
Restart=on-failure
RestartSec=30
-# The minimum netdata Out-Of-Memory (OOM) score.
-# netdata (via [global].OOM score in netdata.conf) can only increase the value set here.
-# To decrease it, set the minimum here and set the same or a higher value in netdata.conf.
-# Valid values: -1000 (never kill netdata) to 1000 (always kill netdata).
-OOMScoreAdjust=1000
-
# Valid policies: other (the system default) | batch | idle | fifo | rr
# To give netdata the max priority, set CPUSchedulingPolicy=rr and CPUSchedulingPriority=99
-CPUSchedulingPolicy=idle
+CPUSchedulingPolicy=batch
# This sets the scheduling priority (for policies: rr and fifo).
# Priority gets values 1 (lowest) to 99 (highest).
#CPUSchedulingPriority=1
# For scheduling policy 'other' and 'batch', this sets the lowest niceness of netdata (-20 highest to 19 lowest).
-#Nice=0
+Nice=0
# Capabilities
# is required for freeipmi and slabinfo plugins
@@ -64,6 +58,8 @@ CapabilityBoundingSet=CAP_NET_RAW
CapabilityBoundingSet=CAP_SYS_CHROOT
# is required for nfacct plugin (bandwidth accounting)
CapabilityBoundingSet=CAP_NET_ADMIN
+# is required for plugins that use sudo
+CapabilityBoundingSet=CAP_SETGID CAP_SETUID
# Sandboxing
ProtectSystem=full
diff --git a/system/netdata.service.v235.in b/system/netdata.service.v235.in
index 664c583f3..dfdf88b69 100644
--- a/system/netdata.service.v235.in
+++ b/system/netdata.service.v235.in
@@ -27,22 +27,16 @@ TimeoutStopSec=150
Restart=on-failure
RestartSec=30
-# The minimum netdata Out-Of-Memory (OOM) score.
-# netdata (via [global].OOM score in netdata.conf) can only increase the value set here.
-# To decrease it, set the minimum here and set the same or a higher value in netdata.conf.
-# Valid values: -1000 (never kill netdata) to 1000 (always kill netdata).
-OOMScoreAdjust=1000
-
# Valid policies: other (the system default) | batch | idle | fifo | rr
# To give netdata the max priority, set CPUSchedulingPolicy=rr and CPUSchedulingPriority=99
-CPUSchedulingPolicy=idle
+CPUSchedulingPolicy=batch
# This sets the scheduling priority (for policies: rr and fifo).
# Priority gets values 1 (lowest) to 99 (highest).
#CPUSchedulingPriority=1
# For scheduling policy 'other' and 'batch', this sets the lowest niceness of netdata (-20 highest to 19 lowest).
-#Nice=0
+Nice=0
[Install]
WantedBy=multi-user.target