diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-11-28 04:53:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-11-28 04:53:29 +0000 |
commit | 17c93e2be4ad7b3af0cd6878bdd5d8a4a3e6da99 (patch) | |
tree | 3e0c96613972e8bb4afdeeb97a034806363ddfa9 /collectors/proc.plugin/plugin_proc.c | |
parent | Releasing debian version 1.18.1-1. (diff) | |
download | netdata-17c93e2be4ad7b3af0cd6878bdd5d8a4a3e6da99.tar.xz netdata-17c93e2be4ad7b3af0cd6878bdd5d8a4a3e6da99.zip |
Merging upstream version 1.19.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'collectors/proc.plugin/plugin_proc.c')
-rw-r--r-- | collectors/proc.plugin/plugin_proc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/collectors/proc.plugin/plugin_proc.c b/collectors/proc.plugin/plugin_proc.c index 62e974cfd..fcb1babcf 100644 --- a/collectors/proc.plugin/plugin_proc.c +++ b/collectors/proc.plugin/plugin_proc.c @@ -32,6 +32,7 @@ static struct proc_module { { .name = "/sys/block/zram", .dim = "zram", .func = do_sys_block_zram }, { .name = "/sys/devices/system/edac/mc", .dim = "ecc", .func = do_proc_sys_devices_system_edac_mc }, { .name = "/sys/devices/system/node", .dim = "numa", .func = do_proc_sys_devices_system_node }, + { .name = "/proc/pagetypeinfo", .dim = "pagetypeinfo", .func = do_proc_pagetypeinfo }, // network metrics { .name = "/proc/net/dev", .dim = "netdev", .func = do_proc_net_dev }, @@ -84,14 +85,16 @@ static void proc_main_cleanup(void *ptr) { void *proc_main(void *ptr) { netdata_thread_cleanup_push(proc_main_cleanup, ptr); - int vdo_cpu_netdata = config_get_boolean("plugin:proc", "netdata server resources", 1); + int vdo_cpu_netdata = config_get_boolean("plugin:proc", "netdata server resources", CONFIG_BOOLEAN_YES); + + config_get_boolean("plugin:proc", "/proc/pagetypeinfo", CONFIG_BOOLEAN_NO); // check the enabled status for each module int i; for(i = 0 ; proc_modules[i].name ;i++) { struct proc_module *pm = &proc_modules[i]; - pm->enabled = config_get_boolean("plugin:proc", pm->name, 1); + pm->enabled = config_get_boolean("plugin:proc", pm->name, CONFIG_BOOLEAN_YES); pm->duration = 0ULL; pm->rd = NULL; } |