From 00151562145df50cc65e9902d52d5fa77f89fe50 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 9 Jun 2022 06:52:47 +0200 Subject: Merging upstream version 1.35.0. Signed-off-by: Daniel Baumann --- .../scenarios/aclk-testing/agent_netdata.conf | 26 ---------------------- build_external/scenarios/gaps_lo/mostly_off.conf | 1 - 2 files changed, 27 deletions(-) (limited to 'build_external/scenarios') diff --git a/build_external/scenarios/aclk-testing/agent_netdata.conf b/build_external/scenarios/aclk-testing/agent_netdata.conf index 7a2803c21..0d3627de6 100644 --- a/build_external/scenarios/aclk-testing/agent_netdata.conf +++ b/build_external/scenarios/aclk-testing/agent_netdata.conf @@ -18,28 +18,12 @@ # hostname = b073e16793c4 # history = 3996 # update every = 1 - # config directory = /etc/netdata - # stock config directory = /usr/lib/netdata/conf.d - # log directory = /var/log/netdata - # web files directory = /usr/share/netdata/web - # cache directory = /var/cache/netdata - # lib directory = /var/lib/netdata - # home directory = /var/cache/netdata - # plugins directory = "/usr/libexec/netdata/plugins.d" "/etc/netdata/custom-plugins.d" # memory mode = dbengine # page cache size = 32 # dbengine disk space = 256 # host access prefix = # memory deduplication (ksm) = yes - # TZ environment variable = :/etc/localtime # timezone = Etc/UTC - # debug flags = 0x0000000000000000 - # debug log = /var/log/netdata/debug.log - # error log = /var/log/netdata/error.log - # access log = /var/log/netdata/access.log - # facility log = daemon - # errors flood protection period = 1200 - # errors to trigger flood protection = 200 # run as user = netdata # OOM score = 1000 # process scheduling policy = idle @@ -84,8 +68,6 @@ # web server max sockets = 262144 [plugins] - # PATH environment variable = /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin - # PYTHONPATH environment variable = # checks = no # proc = yes # diskspace = yes @@ -96,7 +78,6 @@ # check for new plugins every = 60 # slabinfo = no # go.d = yes - # node.d = yes # apps = yes # charts.d = yes # fping = yes @@ -111,8 +92,6 @@ # default repeat critical = never # in memory max health log entries = 1000 # script to execute on alarm = /usr/libexec/netdata/plugins.d/alarm-notify.sh - # stock health configuration directory = /usr/lib/netdata/conf.d/health.d - # health configuration directory = /etc/netdata/health.d # rotate log every lines = 2000 # run at least every seconds = 10 # postpone alarms during hibernation for seconds = 60 @@ -202,7 +181,6 @@ # path to /sys/fs/cgroup/devices = /sys/fs/cgroup/devices # max cgroups to allow = 1000 # max cgroups depth to monitor = 0 - # enable new cgroups detected at run time = yes # enable by default cgroups matching = !*/init.scope !/system.slice/run-*.scope *.scope /machine.slice/*.service !*/vcpu* !*/emulator !*.mount !*.partition !*.service !*.socket !*.slice !*.swap !*.user !/ !/docker !/libvirt !/lxc !/lxc/*/* !/lxc.monitor !/lxc.pivot !/lxc.payload !/machine !/qemu !/system !/systemd !/user * # search for cgroups in subpaths matching = !*/init.scope !*-qemu !*.libvirt-qemu !/init.scope !/system !/systemd !/user !/user.slice !/lxc/*/* !/lxc.monitor !/lxc.payload/*/* * # script to get cgroup names = /usr/libexec/netdata/plugins.d/cgroup-name.sh @@ -265,10 +243,6 @@ # update every = 1 # command options = -[plugin:node.d] - # update every = 1 - # command options = - [plugin:apps] # update every = 1 # command options = diff --git a/build_external/scenarios/gaps_lo/mostly_off.conf b/build_external/scenarios/gaps_lo/mostly_off.conf index 2ac395a9b..079fef063 100644 --- a/build_external/scenarios/gaps_lo/mostly_off.conf +++ b/build_external/scenarios/gaps_lo/mostly_off.conf @@ -28,7 +28,6 @@ errors flood protection period = 0 fping = no python.d = no charts.d = no - node.d = no nfacct = no cups = no freeipmi = no -- cgit v1.2.3