do not report swap I/O if there has never been swap activity in the system; fixes #889
Costa Tsaousis (ktsaou) committed
Sep 4, 2016 at 14:39 UTC
d676b55a162fabcebf462e831dee772fe3d6585e
1 file changed
+7
-5
src/proc_vmstat.c
+7
-5
@@ -193,11 +193,11 @@ int do_proc_vmstat(int update_every, unsigned long long dt) {
193
// hash_unevictable_pgs_stranded = simple_hash("unevictable_pgs_stranded");
194
}
195
196
- if(do_swapio == -1) do_swapio = config_get_boolean("plugin:proc:/proc/vmstat", "swap i/o", 1);
197
- if(do_io == -1) do_io = config_get_boolean("plugin:proc:/proc/vmstat", "disk i/o", 1);
198
- if(do_pgfaults == -1) do_pgfaults = config_get_boolean("plugin:proc:/proc/vmstat", "memory page faults", 1);
196
+ if(do_swapio == -1) do_swapio = config_get_boolean_ondemand("plugin:proc:/proc/vmstat", "swap i/o", CONFIG_ONDEMAND_ONDEMAND);
197
+ if(do_io == -1) do_io = config_get_boolean("plugin:proc:/proc/vmstat", "disk i/o", 1);
198
+ if(do_pgfaults == -1) do_pgfaults = config_get_boolean("plugin:proc:/proc/vmstat", "memory page faults", 1);
199
200
- if(dt) {};
200
+ (void)dt;
201
202
if(!ff) {
203
char filename[FILENAME_MAX + 1];
@@ -415,7 +415,9 @@ int do_proc_vmstat(int update_every, unsigned long long dt) {
415
416
// --------------------------------------------------------------------
417
418
- if(do_swapio) {
418
+ if(pswpin || pswpout || do_swapio == CONFIG_ONDEMAND_YES) {
419
+ do_swapio = CONFIG_ONDEMAND_YES;
420
+
421
static RRDSET *st_swapio = NULL;
422
if(!st_swapio) {
423
st_swapio = rrdset_create("system", "swapio", NULL, "swap", NULL, "Swap I/O", "kilobytes/s", 250, update_every, RRDSET_TYPE_AREA);