prevent adding swap charts if there is no swap in the system; fixes #889
Costa Tsaousis (ktsaou) committed
Sep 4, 2016 at 14:38 UTC
873d90b247ca7780d1df6be16a3c76a2de69be21
1 file changed
+5
-3
src/proc_meminfo.c
+5
-3
@@ -9,14 +9,14 @@ int do_proc_meminfo(int update_every, unsigned long long dt) {
9
static int do_ram = -1, do_swap = -1, do_hwcorrupt = -1, do_committed = -1, do_writeback = -1, do_kernel = -1, do_slab = -1;
10
11
if(do_ram == -1) do_ram = config_get_boolean("plugin:proc:/proc/meminfo", "system ram", 1);
12
- if(do_swap == -1) do_swap = config_get_boolean("plugin:proc:/proc/meminfo", "system swap", 1);
12
+ if(do_swap == -1) do_swap = config_get_boolean_ondemand("plugin:proc:/proc/meminfo", "system swap", CONFIG_ONDEMAND_ONDEMAND);
13
if(do_hwcorrupt == -1) do_hwcorrupt = config_get_boolean_ondemand("plugin:proc:/proc/meminfo", "hardware corrupted ECC", CONFIG_ONDEMAND_ONDEMAND);
14
if(do_committed == -1) do_committed = config_get_boolean("plugin:proc:/proc/meminfo", "committed memory", 1);
15
if(do_writeback == -1) do_writeback = config_get_boolean("plugin:proc:/proc/meminfo", "writeback memory", 1);
16
if(do_kernel == -1) do_kernel = config_get_boolean("plugin:proc:/proc/meminfo", "kernel memory", 1);
17
if(do_slab == -1) do_slab = config_get_boolean("plugin:proc:/proc/meminfo", "slab memory", 1);
18
19
- if(dt) {};
19
+ (void)dt;
20
21
if(!ff) {
22
char filename[FILENAME_MAX + 1];
@@ -123,7 +123,9 @@ int do_proc_meminfo(int update_every, unsigned long long dt) {
123
124
unsigned long long SwapUsed = SwapTotal - SwapFree;
125
126
- if(do_swap) {
126
+ if(SwapTotal || SwapUsed || SwapFree || do_swap == CONFIG_ONDEMAND_YES) {
127
+ do_swap = CONFIG_ONDEMAND_YES;
128
+
129
st = rrdset_find("system.swap");
130
if(!st) {
131
st = rrdset_create("system", "swap", NULL, "swap", NULL, "System Swap", "MB", 201, update_every, RRDSET_TYPE_STACKED);