activated dist space usage options
Costa Tsaousis (ktsaou) committed
Nov 5, 2016 at 02:19 UTC
63062c79ee3d48fa1751d8d32547a937437c09e7
1 file changed
+7
-16
src/proc_diskstats.c
+7
-16
@@ -83,19 +83,16 @@ static inline void do_disk_space_stats(struct disk *d, const char *mount_point,
83
char var_name[4096 + 1];
84
snprintfz(var_name, 4096, "plugin:proc:/proc/diskstats:%s", mount_point);
85
86
- int def_space = CONFIG_ONDEMAND_ONDEMAND;
86
+ int def_space = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "space usage for all disks", CONFIG_ONDEMAND_ONDEMAND);
87
+ int def_inodes = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "inodes usage for all disks", CONFIG_ONDEMAND_ONDEMAND);
88
88
- if(unlikely(strncmp(mount_point, "/run/user/", 10) == 0))
89
+ if(unlikely(strncmp(mount_point, "/run/user/", 10) == 0)) {
90
def_space = CONFIG_ONDEMAND_NO;
91
+ def_inodes = CONFIG_ONDEMAND_NO;
92
+ }
93
91
- // check the user configuration (this will also show our 'on demand' decision)
92
- def_space = config_get_boolean_ondemand(var_name, "enable space metrics", def_space);
93
-
94
- int ddo_space = def_space,
95
- ddo_inodes = def_space;
96
-
97
- do_space = config_get_boolean_ondemand(var_name, "space usage", ddo_space);
98
- do_inodes = config_get_boolean_ondemand(var_name, "inodes usage", ddo_inodes);
94
+ do_space = config_get_boolean_ondemand(var_name, "space usage", def_space);
95
+ do_inodes = config_get_boolean_ondemand(var_name, "inodes usage", def_inodes);
96
}
97
98
if(do_space == CONFIG_ONDEMAND_NO && do_inodes == CONFIG_ONDEMAND_NO)
@@ -346,7 +343,6 @@ int do_proc_diskstats(int update_every, unsigned long long dt) {
343
global_enable_performance_for_partitions = CONFIG_ONDEMAND_NO,
344
global_enable_performance_for_mountpoints = CONFIG_ONDEMAND_NO,
345
global_enable_performance_for_virtual_mountpoints = CONFIG_ONDEMAND_ONDEMAND,
349
- global_enable_space_for_mountpoints = CONFIG_ONDEMAND_ONDEMAND,
346
global_do_io = CONFIG_ONDEMAND_ONDEMAND,
347
global_do_ops = CONFIG_ONDEMAND_ONDEMAND,
348
global_do_mops = CONFIG_ONDEMAND_ONDEMAND,
@@ -354,8 +350,6 @@ int do_proc_diskstats(int update_every, unsigned long long dt) {
350
global_do_qops = CONFIG_ONDEMAND_ONDEMAND,
351
global_do_util = CONFIG_ONDEMAND_ONDEMAND,
352
global_do_backlog = CONFIG_ONDEMAND_ONDEMAND,
357
- global_do_space = CONFIG_ONDEMAND_ONDEMAND,
358
- global_do_inodes = CONFIG_ONDEMAND_ONDEMAND,
353
globals_initialized = 0;
354
355
if(unlikely(!globals_initialized)) {
@@ -366,7 +360,6 @@ int do_proc_diskstats(int update_every, unsigned long long dt) {
360
global_enable_performance_for_partitions = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "performance metrics for partitions", global_enable_performance_for_partitions);
361
global_enable_performance_for_mountpoints = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "performance metrics for mounted filesystems", global_enable_performance_for_mountpoints);
362
global_enable_performance_for_virtual_mountpoints = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "performance metrics for mounted virtual disks", global_enable_performance_for_virtual_mountpoints);
369
- global_enable_space_for_mountpoints = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "space metrics for mounted filesystems", global_enable_space_for_mountpoints);
363
364
global_do_io = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "bandwidth for all disks", global_do_io);
365
global_do_ops = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "operations for all disks", global_do_ops);
@@ -375,8 +368,6 @@ int do_proc_diskstats(int update_every, unsigned long long dt) {
368
global_do_qops = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "queued operations for all disks", global_do_qops);
369
global_do_util = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "utilization percentage for all disks", global_do_util);
370
global_do_backlog = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "backlog for all disks", global_do_backlog);
378
- global_do_space = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "space usage for all disks", global_do_space);
379
- global_do_inodes = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "inodes usage for all disks", global_do_inodes);
371
372
globals_initialized = 1;
373
}