diff options
| author | Ilya Mashchenko <ilya@netdata.cloud> | 2022-05-16 14:21:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-16 14:21:35 +0300 |
| commit | 4b6bcb2f0eb06b6e2618c7ec401e8fe5b6a4f06a (patch) | |
| tree | b6d69083c85ad8674c479ada123ff2542bdc8956 | |
| parent | 48f3bb0d170c7e1e91cb1149ad8e8c814dcca514 (diff) | |
chore(cgroups.plugin): remove "enable new cgroups detected at run time" config option (#12906)
| -rw-r--r-- | build_external/scenarios/aclk-testing/agent_netdata.conf | 1 | ||||
| -rw-r--r-- | collectors/cgroups.plugin/sys_fs_cgroup.c | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/build_external/scenarios/aclk-testing/agent_netdata.conf b/build_external/scenarios/aclk-testing/agent_netdata.conf index f1ce2b249e..eb0d4b6177 100644 --- a/build_external/scenarios/aclk-testing/agent_netdata.conf +++ b/build_external/scenarios/aclk-testing/agent_netdata.conf @@ -201,7 +201,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
diff --git a/collectors/cgroups.plugin/sys_fs_cgroup.c b/collectors/cgroups.plugin/sys_fs_cgroup.c index 5f585f56bc..40dafc2686 100644 --- a/collectors/cgroups.plugin/sys_fs_cgroup.c +++ b/collectors/cgroups.plugin/sys_fs_cgroup.c @@ -64,8 +64,6 @@ static int cgroup_unified_exist = CONFIG_BOOLEAN_AUTO; static int cgroup_search_in_devices = 1; -static int cgroup_enable_new_cgroups_detected_at_runtime = 1; - static int cgroup_check_for_new_every = 10; static int cgroup_update_every = 1; static int cgroup_containers_chart_priority = NETDATA_CHART_PRIO_CGROUPS_CONTAINERS; @@ -437,8 +435,6 @@ void read_cgroup_plugin_configuration() { cgroup_root_max = (int)config_get_number("plugin:cgroups", "max cgroups to allow", cgroup_root_max); cgroup_max_depth = (int)config_get_number("plugin:cgroups", "max cgroups depth to monitor", cgroup_max_depth); - cgroup_enable_new_cgroups_detected_at_runtime = config_get_boolean("plugin:cgroups", "enable new cgroups detected at run time", cgroup_enable_new_cgroups_detected_at_runtime); - enabled_cgroup_paths = simple_pattern_create( config_get("plugin:cgroups", "enable by default cgroups matching", // ---------------------------------------------------------------- @@ -898,9 +894,6 @@ struct discovery_thread { // --------------------------------------------------------------------------------------------- static inline int matches_enabled_cgroup_paths(char *id) { - if (!cgroup_enable_new_cgroups_detected_at_runtime) { - return 0; - } return simple_pattern_matches(enabled_cgroup_paths, id); } |