From: Sebastien GODARD Date: Fri, 21 Jun 2019 16:06:09 +0000 (+0200) Subject: simtest: Update sar/sadc/sadf non regression tests X-Git-Tag: v12.1.6~35 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2ea04ecaf1a422feb44e076e14178950ea2064d;p=sysstat simtest: Update sar/sadc/sadf non regression tests Signed-off-by: Sebastien GODARD --- diff --git a/tests/00012 b/tests/00012 index 39c460d..b34644b 100644 --- a/tests/00012 +++ b/tests/00012 @@ -1 +1,3 @@ +rm -f tests/root +ln -s root1 tests/root ./mpstat -V >/dev/null diff --git a/tests/01380 b/tests/01380 index 73e0cd2..42987a8 100644 --- a/tests/01380 +++ b/tests/01380 @@ -1,3 +1,4 @@ +rm -f tests/sa-sigint.tmp rm -f tests/root ln -s root1 tests/root LC_ALL=C TZ=GMT ./sar --unix_time=1556755203 -o tests/sa-sigint.tmp 1 10 > /dev/null diff --git a/tests/01410 b/tests/01410 index 27294b3..c17f7e1 100644 --- a/tests/01410 +++ b/tests/01410 @@ -1 +1 @@ -./sar 0 0 2>&1 | grep "Usage:" >/dev/null +LC_ALL=C ./sar 0 0 2>&1 | grep "Usage:" >/dev/null diff --git a/tests/01415 b/tests/01415 index 10d5abf..8615ff0 100644 --- a/tests/01415 +++ b/tests/01415 @@ -1 +1 @@ -./sar 0 2 2>&1 | grep "Usage:" >/dev/null +LC_ALL=C ./sar 0 2 2>&1 | grep "Usage:" >/dev/null diff --git a/tests/01420 b/tests/01420 index ba56397..7b6dbfe 100644 --- a/tests/01420 +++ b/tests/01420 @@ -1 +1 @@ -./sar 2 0 2>&1 | grep "Usage:" >/dev/null +LC_ALL=C ./sar 2 0 2>&1 | grep "Usage:" >/dev/null diff --git a/tests/01425 b/tests/01425 index f5e222b..f6031e6 100644 --- a/tests/01425 +++ b/tests/01425 @@ -1 +1 @@ -./sar 2 2 2 2>&1 | grep "Usage:" >/dev/null +LC_ALL=C ./sar 2 2 2 2>&1 | grep "Usage:" >/dev/null diff --git a/tests/01430 b/tests/01430 index a9e1732..56b808e 100644 --- a/tests/01430 +++ b/tests/01430 @@ -1 +1 @@ -./sar -o foo 2>&1 | grep "Usage:" >/dev/null +LC_ALL=C ./sar -o foo 2>&1 | grep "Usage:" >/dev/null diff --git a/tests/expected.sadf-d b/tests/expected.sadf-d index 3c39947..609da41 100644 --- a/tests/expected.sadf-d +++ b/tests/expected.sadf-d @@ -2007,8 +2007,8 @@ SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00; SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 # hostname;interval;timestamp;tps;rtps;wtps;dtps;bread/s;bwrtn/s;bdscd/s SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;0.00;0.00;0.00;0.00;0.00;0.00;0.00 -SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;0.00;0.00;0.00;0.00;0.00;0.00;0.00 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;0.00;0.00;0.00;0.00;0.00;0.00;0.00 +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;5.44;2.24;3.20;0.00;0.00;3.20;0.00 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;0.00;0.91;0.00;0.00;299.22;0.00;0.00 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;0.00;0.00;0.00;0.00;0.00;0.00;0.00 # hostname;interval;timestamp;kbmemfree;kbavail;kbmemused;%memused;kbbuffers;kbcached;kbcommit;%commit;kbactive;kbinact;kbdirty;kbanonpg;kbslab;kbkstack;kbpgtbl;kbvmused SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;1437740;4389516;3179712;39.04;260172;2821596;12097852;48.54;4042384;1772396;396;2733164;445740;15328;73760;0 @@ -2059,8 +2059,8 @@ SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;dev8-10;0.00;0.00;0.00;0.00;0.00;0.00;0. SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;dev8-11;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;dev8-12;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;dev8-16;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 -SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-0;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 -SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-1;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-0;6.40;1.60;1.60;0.00;0.50;0.00;1.00;0.32 +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-1;6.40;1.60;1.60;0.00;0.50;0.00;1.00;0.32 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-2;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-3;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-4;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 @@ -2073,8 +2073,8 @@ SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-10;0.00;0.00;0.00;0.00;0.00;0.00;0. SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-11;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-12;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-16;0.67;22.60;0.00;0.00;33.62;0.10;47.00;0.05 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-0;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-1;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-0;1604.70;41499.97;10663.48;0.00;32.51;18.56;12.00;85.36 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-1;1.32;54.75;0.00;0.00;41.33;0.08;60.92;0.11 SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-2;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-3;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-4;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 @@ -2841,7 +2841,7 @@ SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0.00;0.00 # hostname;interval;timestamp;pgpgin/s;pgpgout/s;fault/s;majflt/s;pgfree/s;pgscank/s;pgscand/s;pgsteal/s;%vmeff SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 # hostname;interval;timestamp;tps;rtps;wtps;dtps;bread/s;bwrtn/s;bdscd/s -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0.00;0.00;0.00;0.00;0.00;0.00;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;1.60;0.00;0.00;1.60;0.00;0.00;1.60 # hostname;interval;timestamp;kbmemfree;kbavail;kbmemused;%memused;kbbuffers;kbcached;kbcommit;%commit;kbactive;kbinact;kbdirty;kbanonpg;kbslab;kbkstack;kbpgtbl;kbvmused SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;1437740;4389516;3179712;39.04;260172;2821596;12097852;48.54;4042384;1772396;396;2733164;445740;15328;73760;0 # hostname;interval;timestamp;kbswpfree;kbswpused;%swpused;kbswpcad;%swpcad @@ -2856,8 +2856,8 @@ SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;3;956;3.16;3.24;3.43;0 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;1;0.00;0.00;0.00;0.00;0.00;0.00 # hostname;interval;timestamp;DEV;tps;rkB/s;wkB/s;dkB/s;areq-sz;aqu-sz;await;%util -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev8-0;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev8-1;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev8-0;1.60;0.00;0.00;0.80;0.50;0.00;1.00;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev8-1;1.60;0.00;0.00;0.80;0.50;0.00;1.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev8-2;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev8-3;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev8-4;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 diff --git a/tests/expected.sadf-g b/tests/expected.sadf-g index cf03c8b..83d1da3 100644 --- a/tests/expected.sadf-g +++ b/tests/expected.sadf-g @@ -1004,18 +1004,22 @@ (Min, Max values) -tps (0.00, 0.00) -rtps (0.00, 0.00) -wtps (0.00, 0.00) -dtps (0.00, 0.00) +tps (0.00, 5.44) +rtps (0.00, 2.24) +wtps (0.00, 3.20) +dtps (0.00, 1.60) -0.00. - -0.33. - -0.67. - -1.00. +0. + +1. + +2. + +3. + +4. + +5. 13:20:09 @@ -1039,27 +1043,27 @@ 13:54:29 UTC - - - - + + + + I/O and transfer rate statistics (2) (Min, Max values) -bread/s (0.00, 0.00) -bwrtn/s (0.00, 0.00) -bdscd/s (0.00, 0.00) +bread/s (0.00, 299.22) +bwrtn/s (0.00, 3.20) +bdscd/s (0.00, 1.60) -0.00. - -0.33. - -0.67. - -1.00. +0. + +90. + +180. + +270. 13:20:09 @@ -1083,9 +1087,9 @@ 13:54:29 UTC - - - + + + @@ -1783,15 +1787,15 @@ (Min, Max values) -tps (0.00, 0.00) +tps (0.00, 1604.70) -0.00. - -0.33. - -0.67. - -1.00. +0. + +500. + +1000. + +1500. 13:20:09 @@ -1815,24 +1819,26 @@ 13:54:29 UTC - + Block devices statistics (2) [dev8-0] (Min, Max values) -rkB/s (0.00, 0.00) -wkB/s (0.00, 0.00) -dkB/s (0.00, 0.00) +rkB/s (0.00, 41499.97) +wkB/s (0.00, 10663.48) +dkB/s (0.00, 0.80) -0.00. - -0.33. - -0.67. - -1.00. +0. + +10000. + +20000. + +30000. + +40000. 13:20:09 @@ -1856,25 +1862,25 @@ 13:54:29 UTC - - - + + + Block devices statistics (3) [dev8-0] (Min, Max values) -areq-sz (0.00, 0.00) -aqu-sz (0.00, 0.00) +areq-sz (0.00, 32.51) +aqu-sz (0.00, 18.56) -0.00. - -0.33. - -0.67. - -1.00. +0. + +10. + +20. + +30. 13:20:09 @@ -1898,23 +1904,23 @@ 13:54:29 UTC - - + + Block devices statistics (4) [dev8-0] (Min, Max values) -await (0.00, 0.00) +await (0.00, 12.00) -0.00. - -0.33. - -0.67. - -1.00. +0. + +3. + +6. + +9. 13:20:09 @@ -1938,14 +1944,14 @@ 13:54:29 UTC - + Block devices statistics (5) [dev8-0] (Min, Max values) -%util (0.00, 0.00) +%util (0.00, 85.36) 0. @@ -1979,6 +1985,9 @@ 13:54:29 UTC + + + @@ -1987,15 +1996,15 @@ (Min, Max values) -tps (0.00, 0.00) +tps (0.00, 6.40) -0.00. - -0.33. - -0.67. - -1.00. +0. + +2. + +4. + +6. 13:20:09 @@ -2019,24 +2028,28 @@ 13:54:29 UTC - + Block devices statistics (2) [dev8-1] (Min, Max values) -rkB/s (0.00, 0.00) -wkB/s (0.00, 0.00) -dkB/s (0.00, 0.00) +rkB/s (0.00, 54.75) +wkB/s (0.00, 1.60) +dkB/s (0.00, 0.80) -0.00. - -0.33. - -0.67. - -1.00. +0. + +10. + +20. + +30. + +40. + +50. 13:20:09 @@ -2060,25 +2073,27 @@ 13:54:29 UTC - - - + + + Block devices statistics (3) [dev8-1] (Min, Max values) -areq-sz (0.00, 0.00) -aqu-sz (0.00, 0.00) +areq-sz (0.00, 41.33) +aqu-sz (0.00, 0.08) -0.00. - -0.33. - -0.67. - -1.00. +0. + +10. + +20. + +30. + +40. 13:20:09 @@ -2102,23 +2117,23 @@ 13:54:29 UTC - - + + Block devices statistics (4) [dev8-1] (Min, Max values) -await (0.00, 0.00) +await (0.00, 60.92) -0.00. - -0.33. - -0.67. - -1.00. +0. + +20. + +40. + +60. 13:20:09 @@ -2142,14 +2157,14 @@ 13:54:29 UTC - + Block devices statistics (5) [dev8-1] (Min, Max values) -%util (0.00, 0.00) +%util (0.00, 0.32) 0. @@ -2183,6 +2198,9 @@ 13:54:29 UTC + + + diff --git a/tests/expected.sadf-j b/tests/expected.sadf-j index 762b320..9a67bd0 100644 --- a/tests/expected.sadf-j +++ b/tests/expected.sadf-j @@ -1113,7 +1113,7 @@ ], "swap-pages": {"pswpin": 0.00, "pswpout": 0.00}, "paging": {"pgpgin": 0.00, "pgpgout": 0.00, "fault": 0.00, "majflt": 0.00, "pgfree": 0.00, "pgscank": 0.00, "pgscand": 0.00, "pgsteal": 0.00, "vmeff-percent": 0.00}, - "io": {"tps": 0.00, "io-reads": {"rtps": 0.00, "bread": 0.00}, "io-writes": {"wtps": 0.00, "bwrtn": 0.00}, "io-discard": {"dtps": 0.00, "bdscd": 0.00}}, + "io": {"tps": 5.44, "io-reads": {"rtps": 2.24, "bread": 0.00}, "io-writes": {"wtps": 3.20, "bwrtn": 3.20}, "io-discard": {"dtps": 0.00, "bdscd": 0.00}}, "memory": {"memfree": 1437740, "avail": 4389516, "memused": 3179712, "memused-percent": 39.04, "buffers": 260172, "cached": 2821596, "commit": 12097852, "commit-percent": 48.54, "active": 4042384, "inactive": 1772396, "dirty": 396, "anonpg": 2733164, "slab": 445740, "kstack": 15328, "pgtbl": 73760, "vmused": 0, "swpfree": 16777212, "swpused": 0, "swpused-percent": 0.00, "swpcad": 0, "swpcad-percent": 0.00}, "hugepages": {"hugfree": 0, "hugused": 0, "hugused-percent": 0.00, "hugrsvd": 0, "hugsurp": 0}, "kernel": {"dentunusd": 156063, "file-nr": 16704, "inode-nr": 157735, "pty-nr": 4}, @@ -1123,8 +1123,8 @@ {"line": 1, "rcvin": 0.00, "xmtin": 0.00, "framerr": 0.00, "prtyerr": 0.00, "brk": 0.00, "ovrun": 0.00} ], "disk": [ - {"disk-device": "dev8-0", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, - {"disk-device": "dev8-1", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, + {"disk-device": "dev8-0", "tps": 6.40, "rd_sec": 3.20, "wr_sec": 3.20, "dc_sec": 0.00, "rkB": 1.60, "wkB": 1.60, "dkB": 0.00, "avgrq-sz": 1.00, "areq-sz": 0.50, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 1.00, "util-percent": 0.32}, + {"disk-device": "dev8-1", "tps": 6.40, "rd_sec": 3.20, "wr_sec": 3.20, "dc_sec": 0.00, "rkB": 1.60, "wkB": 1.60, "dkB": 0.00, "avgrq-sz": 1.00, "areq-sz": 0.50, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 1.00, "util-percent": 0.32}, {"disk-device": "dev8-2", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, {"disk-device": "dev8-3", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, {"disk-device": "dev8-4", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, @@ -1711,7 +1711,7 @@ ], "swap-pages": {"pswpin": 0.00, "pswpout": 0.00}, "paging": {"pgpgin": 0.00, "pgpgout": 0.00, "fault": 0.00, "majflt": 0.00, "pgfree": 0.00, "pgscank": 0.00, "pgscand": 0.00, "pgsteal": 0.00, "vmeff-percent": 0.00}, - "io": {"tps": 0.00, "io-reads": {"rtps": 0.00, "bread": 0.00}, "io-writes": {"wtps": 0.00, "bwrtn": 0.00}, "io-discard": {"dtps": 0.00, "bdscd": 0.00}}, + "io": {"tps": 0.00, "io-reads": {"rtps": 0.91, "bread": 299.22}, "io-writes": {"wtps": 0.00, "bwrtn": 0.00}, "io-discard": {"dtps": 0.00, "bdscd": 0.00}}, "memory": {"memfree": 1437740, "avail": 4389516, "memused": 3179712, "memused-percent": 39.04, "buffers": 260172, "cached": 2821596, "commit": 12097852, "commit-percent": 48.54, "active": 4042384, "inactive": 1772396, "dirty": 396, "anonpg": 2733164, "slab": 445740, "kstack": 15328, "pgtbl": 73760, "vmused": 0, "swpfree": 16777212, "swpused": 0, "swpused-percent": 0.00, "swpcad": 0, "swpcad-percent": 0.00}, "hugepages": {"hugfree": 0, "hugused": 0, "hugused-percent": 0.00, "hugrsvd": 0, "hugsurp": 0}, "kernel": {"dentunusd": 156063, "file-nr": 16704, "inode-nr": 157735, "pty-nr": 4}, @@ -1721,8 +1721,8 @@ {"line": 1, "rcvin": 0.00, "xmtin": 0.00, "framerr": 0.00, "prtyerr": 0.00, "brk": 0.00, "ovrun": 0.00} ], "disk": [ - {"disk-device": "dev8-0", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, - {"disk-device": "dev8-1", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, + {"disk-device": "dev8-0", "tps": 1604.70, "rd_sec": 82999.95, "wr_sec": 21326.96, "dc_sec": 0.00, "rkB": 41499.97, "wkB": 10663.48, "dkB": 0.00, "avgrq-sz": 65.01, "areq-sz": 32.51, "avgqu-sz": 18.56, "aqu-sz": 18.56, "await": 12.00, "util-percent": 85.36}, + {"disk-device": "dev8-1", "tps": 1.32, "rd_sec": 109.51, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 54.75, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 82.67, "areq-sz": 41.33, "avgqu-sz": 0.08, "aqu-sz": 0.08, "await": 60.92, "util-percent": 0.11}, {"disk-device": "dev8-2", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, {"disk-device": "dev8-3", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, {"disk-device": "dev8-4", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, @@ -2918,7 +2918,7 @@ ], "swap-pages": {"pswpin": 0.00, "pswpout": 0.00}, "paging": {"pgpgin": 0.00, "pgpgout": 0.00, "fault": 0.00, "majflt": 0.00, "pgfree": 0.00, "pgscank": 0.00, "pgscand": 0.00, "pgsteal": 0.00, "vmeff-percent": 0.00}, - "io": {"tps": 0.00, "io-reads": {"rtps": 0.00, "bread": 0.00}, "io-writes": {"wtps": 0.00, "bwrtn": 0.00}, "io-discard": {"dtps": 0.00, "bdscd": 0.00}}, + "io": {"tps": 1.60, "io-reads": {"rtps": 0.00, "bread": 0.00}, "io-writes": {"wtps": 0.00, "bwrtn": 0.00}, "io-discard": {"dtps": 1.60, "bdscd": 1.60}}, "memory": {"memfree": 1437740, "avail": 4389516, "memused": 3179712, "memused-percent": 39.04, "buffers": 260172, "cached": 2821596, "commit": 12097852, "commit-percent": 48.54, "active": 4042384, "inactive": 1772396, "dirty": 396, "anonpg": 2733164, "slab": 445740, "kstack": 15328, "pgtbl": 73760, "vmused": 0, "swpfree": 16777212, "swpused": 0, "swpused-percent": 0.00, "swpcad": 0, "swpcad-percent": 0.00}, "hugepages": {"hugfree": 0, "hugused": 0, "hugused-percent": 0.00, "hugrsvd": 0, "hugsurp": 0}, "kernel": {"dentunusd": 156063, "file-nr": 16704, "inode-nr": 157735, "pty-nr": 4}, @@ -2928,8 +2928,8 @@ {"line": 1, "rcvin": 0.00, "xmtin": 0.00, "framerr": 0.00, "prtyerr": 0.00, "brk": 0.00, "ovrun": 0.00} ], "disk": [ - {"disk-device": "dev8-0", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, - {"disk-device": "dev8-1", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, + {"disk-device": "dev8-0", "tps": 1.60, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 1.60, "rkB": 0.00, "wkB": 0.00, "dkB": 0.80, "avgrq-sz": 1.00, "areq-sz": 0.50, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 1.00, "util-percent": 0.00}, + {"disk-device": "dev8-1", "tps": 1.60, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 1.60, "rkB": 0.00, "wkB": 0.00, "dkB": 0.80, "avgrq-sz": 1.00, "areq-sz": 0.50, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 1.00, "util-percent": 0.00}, {"disk-device": "dev8-2", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, {"disk-device": "dev8-3", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, {"disk-device": "dev8-4", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, diff --git a/tests/expected.sadf-p b/tests/expected.sadf-p index 5b6288c..de3aacb 100644 --- a/tests/expected.sadf-p +++ b/tests/expected.sadf-p @@ -2353,18 +2353,18 @@ SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC - dtps 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC - bread/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC - bwrtn/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC - bdscd/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC - tps 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC - rtps 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC - wtps 0.00 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC - tps 5.44 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC - rtps 2.24 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC - wtps 3.20 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC - dtps 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC - bread/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC - bwrtn/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC - bwrtn/s 3.20 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC - bdscd/s 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC - tps 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC - rtps 0.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC - rtps 0.91 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC - wtps 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC - dtps 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC - bread/s 0.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC - bread/s 299.22 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC - bwrtn/s 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC - bdscd/s 0.00 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC - tps 0.00 @@ -2678,22 +2678,22 @@ SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC dev8-16 areq-sz 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC dev8-16 aqu-sz 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC dev8-16 await 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC dev8-16 %util 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-0 tps 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-0 rkB/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-0 wkB/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-0 tps 6.40 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-0 rkB/s 1.60 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-0 wkB/s 1.60 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-0 dkB/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-0 areq-sz 0.00 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-0 areq-sz 0.50 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-0 aqu-sz 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-0 await 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-0 %util 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-1 tps 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-1 rkB/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-1 wkB/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-0 await 1.00 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-0 %util 0.32 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-1 tps 6.40 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-1 rkB/s 1.60 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-1 wkB/s 1.60 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-1 dkB/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-1 areq-sz 0.00 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-1 areq-sz 0.50 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-1 aqu-sz 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-1 await 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-1 %util 0.00 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-1 await 1.00 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-1 %util 0.32 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-2 tps 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-2 rkB/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-2 wkB/s 0.00 @@ -2790,22 +2790,22 @@ SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-16 areq-sz 33.62 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-16 aqu-sz 0.10 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-16 await 47.00 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC dev8-16 %util 0.05 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-0 tps 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-0 rkB/s 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-0 wkB/s 0.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-0 tps 1604.70 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-0 rkB/s 41499.97 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-0 wkB/s 10663.48 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-0 dkB/s 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-0 areq-sz 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-0 aqu-sz 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-0 await 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-0 %util 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-1 tps 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-1 rkB/s 0.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-0 areq-sz 32.51 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-0 aqu-sz 18.56 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-0 await 12.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-0 %util 85.36 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-1 tps 1.32 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-1 rkB/s 54.75 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-1 wkB/s 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-1 dkB/s 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-1 areq-sz 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-1 aqu-sz 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-1 await 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-1 %util 0.00 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-1 areq-sz 41.33 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-1 aqu-sz 0.08 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-1 await 60.92 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-1 %util 0.11 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-2 tps 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-2 rkB/s 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC dev8-2 wkB/s 0.00 @@ -4938,13 +4938,13 @@ SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - pgscank/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - pgscand/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - pgsteal/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - %vmeff 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - tps 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - tps 1.60 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - rtps 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - wtps 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - dtps 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - dtps 1.60 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - bread/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - bwrtn/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - bdscd/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - bdscd/s 1.60 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - kbmemfree 1437740 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - kbavail 4389516 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - kbmemused 3179712 @@ -4993,21 +4993,21 @@ SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC ttyS1 framerr/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC ttyS1 prtyerr/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC ttyS1 brk/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC ttyS1 ovrun/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-0 tps 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-0 tps 1.60 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-0 rkB/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-0 wkB/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-0 dkB/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-0 areq-sz 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-0 dkB/s 0.80 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-0 areq-sz 0.50 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-0 aqu-sz 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-0 await 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-0 await 1.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-0 %util 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-1 tps 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-1 tps 1.60 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-1 rkB/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-1 wkB/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-1 dkB/s 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-1 areq-sz 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-1 dkB/s 0.80 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-1 areq-sz 0.50 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-1 aqu-sz 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-1 await 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-1 await 1.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-1 %util 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-2 tps 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-2 rkB/s 0.00 diff --git a/tests/expected.sadf-r b/tests/expected.sadf-r index 64c8bcb..b9c22fd 100644 --- a/tests/expected.sadf-r +++ b/tests/expected.sadf-r @@ -2023,13 +2023,13 @@ # A_PAGE: 1/1 (1) 13:20:49 UTC; pgpgin/s; 2685938; 2685938; pgpgout/s; 1863420; 1863420; fault/s; 60863302; 60863302; majflt/s; 10715; 10715; pgfree/s; 63486798; 63486798; pgscank/s; 0; 0; pgscand/s; 0; 0; pgsteal/s; 0; 0; # A_IO: 1/1 (1) -13:20:19 UTC; tps; 0; 0; rtps; 0; 0; wtps; 0; 0; dtps; 0; 0; bread/s; 0; 0; bwrtn/s; 0; 0; bdscd/s; 0; 0; +13:20:19 UTC; tps; 61832; 61832; rtps; 49652; 49652; wtps; 12180; 12180; dtps; 0; 0; bread/s; 3199714; 3199714; bwrtn/s; 821088; 821088; bdscd/s; 0; 0; # A_IO: 1/1 (1) -13:20:29 UTC; tps; 0; 0; rtps; 0; 0; wtps; 0; 0; dtps; 0; 0; bread/s; 0; 0; bwrtn/s; 0; 0; bdscd/s; 0; 0; +13:20:29 UTC; tps; 61832; 62002; rtps; 49652; 49722; wtps; 12180; 12280; dtps; 0; 0; bread/s [DEC]; 3199714; 3197010; bwrtn/s; 821088; 821188; bdscd/s; 0; 0; # A_IO: 1/1 (1) -13:20:39 UTC; tps; 0; 0; rtps; 0; 0; wtps; 0; 0; dtps; 0; 0; bread/s; 0; 0; bwrtn/s; 0; 0; bdscd/s; 0; 0; +13:20:39 UTC; tps [DEC]; 62002; 61940; rtps; 49722; 49757; wtps [DEC]; 12280; 12183; dtps; 0; 0; bread/s; 3197010; 3208530; bwrtn/s [DEC]; 821188; 821112; bdscd/s; 0; 0; # A_IO: 1/1 (1) -13:20:49 UTC; tps; 0; 0; rtps; 0; 0; wtps; 0; 0; dtps; 0; 0; bread/s; 0; 0; bwrtn/s; 0; 0; bdscd/s; 0; 0; +13:20:49 UTC; tps [DEC]; 61940; 61781; rtps [DEC]; 49757; 49601; wtps [DEC]; 12183; 12180; dtps; 0; 0; bread/s [DEC]; 3208530; 3195498; bwrtn/s [DEC]; 821112; 821088; bdscd/s; 0; 0; # A_MEMORY: 1/1 (1) 13:20:19 UTC; kbmemfree; 1437740; kbavail; 4389516; kbttlmem; 8144960; kbbuffers; 260172; kbcached; 2821596; kbcommit; 12097852; kbactive; 4042384; kbinact; 1772396; kbdirty; 396; kbanonpg; 2733164; kbslab; 445740; kbkstack; 15328; kbpgtbl; 73760; kbvmused; 0; # A_MEMORY: 1/1 (1) @@ -2098,8 +2098,8 @@ 13:20:19 UTC; major; 8; minor; 12; DEV; dev8-12; tps; 13528; 13528; rkB/s; 363650; 363650; wkB/s; 534960; 534960; dkB/s; 0; 0; rd_ticks; 124848; 124848; wr_ticks; 59590; 59590; dc_ticks; 0; 0; tot_ticks; 7316; 7316; aqu-sz; 178474; 178474; 13:20:19 UTC; major; 8; minor; 16; DEV; dev8-16; tps; 51; 51; rkB/s; 4216; 4216; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 3107; 3107; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 41; 41; aqu-sz; 3086; 3086; # A_DISK: 14/18 (18) -13:20:29 UTC; major; 8; minor; 0; DEV; dev8-0; tps; 61781; 61781; rkB/s; 3195498; 3195498; wkB/s; 821088; 821088; dkB/s; 0; 0; rd_ticks; 623970; 623970; wr_ticks; 117109; 117109; dc_ticks; 0; 0; tot_ticks; 32862; 32862; aqu-sz; 714408; 714408; -13:20:29 UTC; major; 8; minor; 1; DEV; dev8-1; tps; 51; 51; rkB/s; 4216; 4216; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 3107; 3107; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 41; 41; aqu-sz; 3086; 3086; +13:20:29 UTC; major; 8; minor; 0; DEV; dev8-0; tps; 61781; 61981; rkB/s; 3195498; 3195598; wkB/s; 821088; 821188; dkB/s; 0; 0; rd_ticks; 623970; 624070; wr_ticks; 117109; 117209; dc_ticks; 0; 0; tot_ticks; 32862; 32962; aqu-sz; 714408; 714508; +13:20:29 UTC; major; 8; minor; 1; DEV; dev8-1; tps; 51; 251; rkB/s; 4216; 4316; wkB/s; 0; 100; dkB/s; 0; 0; rd_ticks; 3107; 3207; wr_ticks; 0; 100; dc_ticks; 0; 0; tot_ticks; 41; 141; aqu-sz; 3086; 3186; 13:20:29 UTC; major; 8; minor; 2; DEV; dev8-2; tps; 47; 47; rkB/s; 4184; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2938; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 33; 33; aqu-sz; 2917; 2917; 13:20:29 UTC; major; 8; minor; 3; DEV; dev8-3; tps; 49; 49; rkB/s; 4200; 4200; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2831; 2831; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 40; 40; aqu-sz; 2810; 2810; 13:20:29 UTC; major; 8; minor; 4; DEV; dev8-4; tps; 5; 5; rkB/s; 28; 28; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1294; 1294; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 8; 8; aqu-sz; 1293; 1293; @@ -2113,8 +2113,8 @@ 13:20:29 UTC; major; 8; minor; 12; DEV; dev8-12; tps; 13528; 13528; rkB/s; 363650; 363650; wkB/s; 534960; 534960; dkB/s; 0; 0; rd_ticks; 124848; 124848; wr_ticks; 59590; 59590; dc_ticks; 0; 0; tot_ticks; 7316; 7316; aqu-sz; 178474; 178474; 13:20:29 UTC; major; 8; minor; 16; DEV [BCK]; dev8-16; tps; 0; 21; rkB/s; 0; 1412; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 0; 987; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 0; 17; aqu-sz; 0; 3000; # A_DISK: 15/18 (18) -13:20:39 UTC; major; 8; minor; 0; DEV; dev8-0; tps; 61781; 61781; rkB/s; 3195498; 3195498; wkB/s; 821088; 821088; dkB/s; 0; 0; rd_ticks; 623970; 623970; wr_ticks; 117109; 117109; dc_ticks; 0; 0; tot_ticks; 32862; 32862; aqu-sz; 714408; 714408; -13:20:39 UTC; major; 8; minor; 1; DEV; dev8-1; tps; 51; 51; rkB/s; 4216; 4216; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 3107; 3107; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 41; 41; aqu-sz; 3086; 3086; +13:20:39 UTC; major; 8; minor; 0; DEV [BCK]; dev8-0; tps; 0; 61781; rkB/s; 0; 3195498; wkB/s; 0; 821088; dkB/s; 0; 0; rd_ticks; 0; 623970; wr_ticks; 0; 117109; dc_ticks; 0; 0; tot_ticks; 0; 32862; aqu-sz; 0; 714408; +13:20:39 UTC; major; 8; minor; 1; DEV [BCK]; dev8-1; tps; 0; 51; rkB/s; 0; 4216; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 0; 3107; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 0; 41; aqu-sz; 0; 3086; 13:20:39 UTC; major; 8; minor; 2; DEV; dev8-2; tps; 47; 47; rkB/s; 4184; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2938; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 33; 33; aqu-sz; 2917; 2917; 13:20:39 UTC; major; 8; minor; 3; DEV; dev8-3; tps; 49; 49; rkB/s; 4200; 4200; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2831; 2831; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 40; 40; aqu-sz; 2810; 2810; 13:20:39 UTC; major; 8; minor; 4; DEV; dev8-4; tps; 5; 5; rkB/s; 28; 28; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1294; 1294; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 8; 8; aqu-sz; 1293; 1293; @@ -2946,7 +2946,7 @@ # A_PAGE: 1/1 (1) 13:54:35 UTC; pgpgin/s; 2685938; 2685938; pgpgout/s; 1863420; 1863420; fault/s; 60863302; 60863302; majflt/s; 10715; 10715; pgfree/s; 63486798; 63486798; pgscank/s; 0; 0; pgscand/s; 0; 0; pgsteal/s; 0; 0; # A_IO: 1/1 (1) -13:54:35 UTC; tps; 0; 0; rtps; 0; 0; wtps; 0; 0; dtps; 0; 0; bread/s; 0; 0; bwrtn/s; 0; 0; bdscd/s; 0; 0; +13:54:35 UTC; tps; 61881; 61931; rtps; 49601; 49601; wtps; 12180; 12180; dtps; 100; 150; bread/s; 3195498; 3195498; bwrtn/s; 821088; 821088; bdscd/s; 100; 150; # A_MEMORY: 1/1 (1) 13:54:35 UTC; kbmemfree; 1437740; kbavail; 4389516; kbttlmem; 8144960; kbbuffers; 260172; kbcached; 2821596; kbcommit; 12097852; kbactive; 4042384; kbinact; 1772396; kbdirty; 396; kbanonpg; 2733164; kbslab; 445740; kbkstack; 15328; kbpgtbl; 73760; kbvmused; 0; # A_MEMORY: 1/1 (1) @@ -2961,8 +2961,8 @@ 13:54:35 UTC; TTY; 0; rcvin/s; 32543; 32543; txmtin/s; 14323; 14323; framerr/s; 123; 123; prtyerr/s; 123; 123; brk/s; 42; 42; ovrun/s; 13; 13; 13:54:35 UTC; TTY; 1; rcvin/s; 0; 0; txmtin/s; 0; 0; framerr/s; 0; 0; prtyerr/s; 0; 0; brk/s; 0; 0; ovrun/s; 0; 0; # A_DISK: 10/18 (18) -13:54:35 UTC; major; 8; minor; 0; DEV; dev8-0; tps; 61781; 61781; rkB/s; 3195498; 3195498; wkB/s; 821088; 821088; dkB/s; 0; 0; rd_ticks; 623970; 623970; wr_ticks; 117109; 117109; dc_ticks; 0; 0; tot_ticks; 32862; 32862; aqu-sz; 714408; 714408; -13:54:35 UTC; major; 8; minor; 1; DEV; dev8-1; tps; 51; 51; rkB/s; 4216; 4216; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 3107; 3107; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 41; 41; aqu-sz; 3086; 3086; +13:54:35 UTC; major; 8; minor; 0; DEV; dev8-0; tps; 61881; 61931; rkB/s; 3195498; 3195498; wkB/s; 821088; 821088; dkB/s; 100; 150; rd_ticks; 623970; 623970; wr_ticks; 117109; 117109; dc_ticks; 100; 150; tot_ticks; 32862; 32862; aqu-sz; 714408; 714408; +13:54:35 UTC; major; 8; minor; 1; DEV; dev8-1; tps; 151; 201; rkB/s; 4216; 4216; wkB/s; 0; 0; dkB/s; 100; 150; rd_ticks; 3107; 3107; wr_ticks; 0; 0; dc_ticks; 100; 150; tot_ticks; 41; 41; aqu-sz; 3086; 3086; 13:54:35 UTC; major; 8; minor; 2; DEV; dev8-2; tps; 47; 47; rkB/s; 4184; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2938; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 33; 33; aqu-sz; 2917; 2917; 13:54:35 UTC; major; 8; minor; 3; DEV; dev8-3; tps; 49; 49; rkB/s; 4200; 4200; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2831; 2831; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 40; 40; aqu-sz; 2810; 2810; 13:54:35 UTC; major; 8; minor; 4; DEV; dev8-4; tps; 5; 5; rkB/s; 28; 28; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1294; 1294; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 8; 8; aqu-sz; 1293; 1293; diff --git a/tests/expected.sadf-se b/tests/expected.sadf-se index 727e779..9b953cb 100644 --- a/tests/expected.sadf-se +++ b/tests/expected.sadf-se @@ -1,5 +1,5 @@ # hostname;interval;timestamp;DEV;tps;rkB/s;wkB/s;dkB/s;areq-sz;aqu-sz;await;%util -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sda;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sda;1604.70;41499.97;10663.48;0.00;32.51;18.56;12.00;85.36 # hostname;interval;timestamp;IFACE;rxpck/s;txpck/s;rxkB/s;txkB/s;rxcmp/s;txcmp/s;rxmcst/s;%ifutil SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;enp6s1;1.90;1.17;0.23;0.21;0.00;0.00;2.31;0.00 # hostname;interval;timestamp;FILESYSTEM;MBfsfree;MBfsused;%fsused;%ufsused;Ifree;Iused;%Iused diff --git a/tests/expected.sadf-x b/tests/expected.sadf-x index ec9063c..c778ff7 100644 --- a/tests/expected.sadf-x +++ b/tests/expected.sadf-x @@ -1146,9 +1146,9 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - 0.00 - - + 5.44 + + @@ -1188,8 +1188,8 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - - + + @@ -1771,7 +1771,7 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> 0.00 - + @@ -1812,8 +1812,8 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - - + + @@ -3029,10 +3029,10 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - 0.00 + 1.60 - + 1437740 @@ -3071,8 +3071,8 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - - + + diff --git a/tests/expected.sar-all b/tests/expected.sar-all index 9a4f20a..2cefe3a 100644 --- a/tests/expected.sar-all +++ b/tests/expected.sar-all @@ -2515,8 +2515,8 @@ Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.0 13:20:09 tps rtps wtps dtps bread/s bwrtn/s bdscd/s 13:20:19 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:29 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:39 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:29 5.44 2.24 3.20 0.00 0.00 3.20 0.00 +13:20:39 0.00 0.91 0.00 0.00 299.22 0.00 0.00 13:20:49 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.00 @@ -2582,8 +2582,8 @@ Average: 1 0.00 0.00 0.00 0.00 0.00 0.0 13:20:19 dev8-11 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:19 dev8-12 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:19 dev8-16 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:29 dev8-0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:29 dev8-1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:29 dev8-0 6.40 1.60 1.60 0.00 0.50 0.00 1.00 0.32 +13:20:29 dev8-1 6.40 1.60 1.60 0.00 0.50 0.00 1.00 0.32 13:20:29 dev8-2 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 dev8-3 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 dev8-4 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 @@ -2596,8 +2596,8 @@ Average: 1 0.00 0.00 0.00 0.00 0.00 0.0 13:20:29 dev8-11 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 dev8-12 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 dev8-16 0.67 22.60 0.00 0.00 33.62 0.10 47.00 0.05 -13:20:39 dev8-0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:39 dev8-1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:39 dev8-0 1604.70 41499.97 10663.48 0.00 32.51 18.56 12.00 85.36 +13:20:39 dev8-1 1.32 54.75 0.00 0.00 41.33 0.08 60.92 0.11 13:20:39 dev8-2 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:39 dev8-3 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:39 dev8-4 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected.sar-dec b/tests/expected.sar-dec index 27c709b..488cb02 100644 --- a/tests/expected.sar-dec +++ b/tests/expected.sar-dec @@ -2515,8 +2515,8 @@ Average: 0 0 0 0 0 0 13:20:09 tps rtps wtps dtps bread/s bwrtn/s bdscd/s 13:20:19 0 0 0 0 0 0 0 -13:20:29 0 0 0 0 0 0 0 -13:20:39 0 0 0 0 0 0 0 +13:20:29 5 2 3 0 0 3 0 +13:20:39 0 1 0 0 299 0 0 13:20:49 0 0 0 0 0 0 0 Average: 0 0 0 0 0 0 0 @@ -2582,8 +2582,8 @@ Average: 1 0 0 0 0 0 13:20:19 dev8-11 0 0 0 0 0 0 0 0 13:20:19 dev8-12 0 0 0 0 0 0 0 0 13:20:19 dev8-16 0 0 0 0 0 0 0 0 -13:20:29 dev8-0 0 0 0 0 0 0 0 0 -13:20:29 dev8-1 0 0 0 0 0 0 0 0 +13:20:29 dev8-0 6 2 2 0 0 0 1 0 +13:20:29 dev8-1 6 2 2 0 0 0 1 0 13:20:29 dev8-2 0 0 0 0 0 0 0 0 13:20:29 dev8-3 0 0 0 0 0 0 0 0 13:20:29 dev8-4 0 0 0 0 0 0 0 0 @@ -2596,8 +2596,8 @@ Average: 1 0 0 0 0 0 13:20:29 dev8-11 0 0 0 0 0 0 0 0 13:20:29 dev8-12 0 0 0 0 0 0 0 0 13:20:29 dev8-16 1 23 0 0 34 0 47 0 -13:20:39 dev8-0 0 0 0 0 0 0 0 0 -13:20:39 dev8-1 0 0 0 0 0 0 0 0 +13:20:39 dev8-0 1605 41500 10663 0 33 19 12 85 +13:20:39 dev8-1 1 55 0 0 41 0 61 0 13:20:39 dev8-2 0 0 0 0 0 0 0 0 13:20:39 dev8-3 0 0 0 0 0 0 0 0 13:20:39 dev8-4 0 0 0 0 0 0 0 0 @@ -3966,8 +3966,8 @@ Average: 0 0 Average: 0 0 0 0 0 0 0 0 0 13:54:15 tps rtps wtps dtps bread/s bwrtn/s bdscd/s -13:54:35 0 0 0 0 0 0 0 -Average: 0 0 0 0 0 0 0 +13:54:35 2 0 0 2 0 0 2 +Average: 2 0 0 2 0 0 2 13:54:15 kbmemfree kbavail kbmemused %memused kbbuffers kbcached kbcommit %commit kbactive kbinact kbdirty kbanonpg kbslab kbkstack kbpgtbl kbvmused 13:54:35 1437740 4389516 3179712 39 260172 2821596 12097852 49 4042384 1772396 396 2733164 445740 15328 73760 0 @@ -3996,8 +3996,8 @@ Average: 0 0 0 0 0 0 Average: 1 0 0 0 0 0 0 13:54:15 DEV tps rkB/s wkB/s dkB/s areq-sz aqu-sz await %util -13:54:35 dev8-0 0 0 0 0 0 0 0 0 -13:54:35 dev8-1 0 0 0 0 0 0 0 0 +13:54:35 dev8-0 2 0 0 1 0 0 1 0 +13:54:35 dev8-1 2 0 0 1 0 0 1 0 13:54:35 dev8-2 0 0 0 0 0 0 0 0 13:54:35 dev8-3 0 0 0 0 0 0 0 0 13:54:35 dev8-4 0 0 0 0 0 0 0 0 @@ -4006,8 +4006,8 @@ Average: 1 0 0 0 0 0 13:54:35 dev8-7 0 0 0 0 0 0 0 0 13:54:35 dev8-8 0 0 0 0 0 0 0 0 13:54:35 dev8-9 0 0 0 0 0 0 0 0 -Average: dev8-0 0 0 0 0 0 0 0 0 -Average: dev8-1 0 0 0 0 0 0 0 0 +Average: dev8-0 2 0 0 1 0 0 1 0 +Average: dev8-1 2 0 0 1 0 0 1 0 Average: dev8-2 0 0 0 0 0 0 0 0 Average: dev8-3 0 0 0 0 0 0 0 0 Average: dev8-4 0 0 0 0 0 0 0 0 diff --git a/tests/expected.sar-dev b/tests/expected.sar-dev index 6c4cb0a..3501fd5 100644 --- a/tests/expected.sar-dev +++ b/tests/expected.sar-dev @@ -2,8 +2,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:09 DEV tps rkB/s wkB/s dkB/s areq-sz aqu-sz await %util 13:20:19 sda 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:29 sda 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:39 sda 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:29 sda 6.40 1.60 1.60 0.00 0.50 0.00 1.00 0.32 +13:20:39 sda 1604.70 41499.97 10663.48 0.00 32.51 18.56 12.00 85.36 13:20:49 sda 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average: sda 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 @@ -12,5 +12,5 @@ Average: sda 0.00 0.00 0.00 0.00 0.00 0.0 13:54:09 LINUX RESTART (10 CPU) 13:54:15 DEV tps rkB/s wkB/s dkB/s areq-sz aqu-sz await %util -13:54:35 sda 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -Average: sda 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:54:35 sda 1.60 0.00 0.00 0.80 0.50 0.00 1.00 0.00 +Average: sda 1.60 0.00 0.00 0.80 0.50 0.00 1.00 0.00 diff --git a/tests/expected.sar-human b/tests/expected.sar-human index 23389b6..88d6465 100644 --- a/tests/expected.sar-human +++ b/tests/expected.sar-human @@ -2515,8 +2515,8 @@ Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.0 13:20:09 tps rtps wtps dtps bread/s bwrtn/s bdscd/s 13:20:19 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:29 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:39 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:29 5.44 2.24 3.20 0.00 0.00 3.20 0.00 +13:20:39 0.00 0.91 0.00 0.00 299.22 0.00 0.00 13:20:49 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.00 @@ -2582,8 +2582,8 @@ Average: 1 0.00 0.00 0.00 0.00 0.00 0.0 13:20:19 dev8-11 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 13:20:19 dev8-12 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 13:20:19 dev8-16 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% -13:20:29 dev8-0 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% -13:20:29 dev8-1 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% +13:20:29 dev8-0 6.40 1.6k 1.6k 0.0k 0.5k 0.00 1.00 0.3% +13:20:29 dev8-1 6.40 1.6k 1.6k 0.0k 0.5k 0.00 1.00 0.3% 13:20:29 dev8-2 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 13:20:29 dev8-3 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 13:20:29 dev8-4 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% @@ -2596,8 +2596,8 @@ Average: 1 0.00 0.00 0.00 0.00 0.00 0.0 13:20:29 dev8-11 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 13:20:29 dev8-12 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 13:20:29 dev8-16 0.67 22.6k 0.0k 0.0k 33.6k 0.10 47.00 0.1% -13:20:39 dev8-0 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% -13:20:39 dev8-1 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% +13:20:39 dev8-0 1604.70 40.5M 10.4M 0.0k 32.5k 18.56 12.00 85.4% +13:20:39 dev8-1 1.32 54.8k 0.0k 0.0k 41.3k 0.08 60.92 0.1% 13:20:39 dev8-2 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 13:20:39 dev8-3 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 13:20:39 dev8-4 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% @@ -3966,8 +3966,8 @@ Average: 0.00 0.00 Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.0% 13:54:15 tps rtps wtps dtps bread/s bwrtn/s bdscd/s -13:54:35 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:54:35 1.60 0.00 0.00 1.60 0.00 0.00 1.60 +Average: 1.60 0.00 0.00 1.60 0.00 0.00 1.60 13:54:15 kbmemfree kbavail kbmemused %memused kbbuffers kbcached kbcommit %commit kbactive kbinact kbdirty kbanonpg kbslab kbkstack kbpgtbl kbvmused 13:54:35 1.4G 4.2G 3.0G 39.0% 254.1M 2.7G 11.5G 48.5% 3.9G 1.7G 396.0k 2.6G 435.3M 15.0M 72.0M 0.0k @@ -3996,8 +3996,8 @@ Average: 0 0.00 0.00 0.00 0.00 0.00 0.0 Average: 1 0.00 0.00 0.00 0.00 0.00 0.00 13:54:15 DEV tps rkB/s wkB/s dkB/s areq-sz aqu-sz await %util -13:54:35 dev8-0 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% -13:54:35 dev8-1 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% +13:54:35 dev8-0 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% +13:54:35 dev8-1 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% 13:54:35 dev8-2 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 13:54:35 dev8-3 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 13:54:35 dev8-4 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% @@ -4006,8 +4006,8 @@ Average: 1 0.00 0.00 0.00 0.00 0.00 0.0 13:54:35 dev8-7 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 13:54:35 dev8-8 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 13:54:35 dev8-9 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% -Average: dev8-0 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% -Average: dev8-1 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% +Average: dev8-0 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% +Average: dev8-1 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% Average: dev8-2 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% Average: dev8-3 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% Average: dev8-4 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% diff --git a/tests/expected.sar-jUUID b/tests/expected.sar-jUUID index 5931496..f8c7cd7 100644 --- a/tests/expected.sar-jUUID +++ b/tests/expected.sar-jUUID @@ -15,8 +15,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:19 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 3f62a0ad-2f16-44c1-b447-66c58d4c66b5 13:20:19 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 43a1c948-8c32-46b8-bb97-c8d58facb27a 13:20:19 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% sdb -13:20:29 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% sda -13:20:29 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% E27E37357E370239 +13:20:29 6.40 1.6k 1.6k 0.0k 0.5k 0.00 1.00 0.3% sda +13:20:29 6.40 1.6k 1.6k 0.0k 0.5k 0.00 1.00 0.3% E27E37357E370239 13:20:29 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% A6B4E393B4E36471 13:20:29 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% C46C80B16C809FB2 13:20:29 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% sda4 @@ -29,8 +29,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:29 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 3f62a0ad-2f16-44c1-b447-66c58d4c66b5 13:20:29 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 43a1c948-8c32-46b8-bb97-c8d58facb27a 13:20:29 0.67 22.6k 0.0k 0.0k 33.6k 0.10 47.00 0.1% sdb -13:20:39 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% sda -13:20:39 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% E27E37357E370239 +13:20:39 1604.70 40.5M 10.4M 0.0k 32.5k 18.56 12.00 85.4% sda +13:20:39 1.32 54.8k 0.0k 0.0k 41.3k 0.08 60.92 0.1% E27E37357E370239 13:20:39 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% A6B4E393B4E36471 13:20:39 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% C46C80B16C809FB2 13:20:39 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% sda4 @@ -80,8 +80,8 @@ Average: 1.08 39.9k 0.1k 0.0k 37.2k 0.03 21.8 13:54:09 LINUX RESTART (10 CPU) 13:54:15 tps rkB/s wkB/s dkB/s areq-sz aqu-sz await %util DEV -13:54:35 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% sda -13:54:35 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% E27E37357E370239 +13:54:35 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% sda +13:54:35 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% E27E37357E370239 13:54:35 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% A6B4E393B4E36471 13:54:35 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% C46C80B16C809FB2 13:54:35 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% sda4 @@ -90,8 +90,8 @@ Average: 1.08 39.9k 0.1k 0.0k 37.2k 0.03 21.8 13:54:35 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc 13:54:35 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 63b74fd4-4fa8-4ff5-99a8-047d61bea682 13:54:35 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% fe9a021c-3148-41f7-a04b-97442a7eae73 -Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% sda -Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% E27E37357E370239 +Average: 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% sda +Average: 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% E27E37357E370239 Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% A6B4E393B4E36471 Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% C46C80B16C809FB2 Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% sda4 diff --git a/tests/expected.sar-z b/tests/expected.sar-z index e81a6c8..fb4d7d2 100644 --- a/tests/expected.sar-z +++ b/tests/expected.sar-z @@ -3,9 +3,13 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (8 CPU) 13:20:09 DEV tps rkB/s wkB/s dkB/s areq-sz aqu-sz await %util 13:20:19 DEV tps rkB/s wkB/s dkB/s areq-sz aqu-sz await %util +13:20:29 sda 6.40 1.60 1.60 0.00 0.50 0.00 1.00 0.32 +13:20:29 sda1 6.40 1.60 1.60 0.00 0.50 0.00 1.00 0.32 13:20:29 sdb 0.67 22.60 0.00 0.00 33.62 0.10 47.00 0.05 13:20:29 DEV tps rkB/s wkB/s dkB/s areq-sz aqu-sz await %util +13:20:39 sda 1604.70 41499.97 10663.48 0.00 32.51 18.56 12.00 85.36 +13:20:39 sda1 1.32 54.75 0.00 0.00 41.33 0.08 60.92 0.11 13:20:39 sdf 1.22 54.34 0.00 0.00 44.51 0.08 62.51 0.09 13:20:39 sdg 2.91 114.91 0.31 0.00 39.61 0.07 24.75 0.19 diff --git a/tests/expected2.sadf-g b/tests/expected2.sadf-g index 8e66dc9..d5e1544 100644 --- a/tests/expected2.sadf-g +++ b/tests/expected2.sadf-g @@ -1012,7 +1012,113 @@ - + + +I/O and transfer rate statistics (1) +(Min, Max values) + + +tps (0.00, 5.44) +rtps (0.00, 2.24) +wtps (0.00, 3.20) +dtps (0.00, 1.60) +SYSSTAT.TEST +04/18/2019 + + +0. + +1. + +2. + +3. + +4. + +5. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + + +I/O and transfer rate statistics (2) +(Min, Max values) + + +bread/s (0.00, 299.22) +bwrtn/s x10 (0.00, 32.01) +bdscd/s x100 (0.00, 160.41) +SYSSTAT.TEST +04/18/2019 + + +0. + +90. + +180. + +270. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + + Memory utilization (1) (Min, Max values) @@ -1314,7 +1420,7 @@ - + Swap utilization (1) (Min, Max values) @@ -1365,7 +1471,7 @@ - + Kernel tables statistics (1) (Min, Max values) @@ -1463,7 +1569,7 @@ - + Queue length (Min, Max values) @@ -1606,7 +1712,489 @@ - + + +Block devices statistics (1) [dev8-0] +(Min, Max values) + + +tps (0.00, 1604.70) +SYSSTAT.TEST +04/18/2019 + + +0. + +500. + +1000. + +1500. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + +Block devices statistics (2) [dev8-0] +(Min, Max values) + + +rkB/s (0.00, 41499.97) +wkB/s (0.00, 10663.48) +dkB/s x10000 (0.00, 8020.53) +SYSSTAT.TEST +04/18/2019 + + +0. + +10000. + +20000. + +30000. + +40000. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + +Block devices statistics (3) [dev8-0] +(Min, Max values) + + +areq-sz (0.00, 32.51) +aqu-sz (0.00, 18.56) +SYSSTAT.TEST +04/18/2019 + + +0. + +10. + +20. + +30. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + +Block devices statistics (4) [dev8-0] +(Min, Max values) + + +await (0.00, 12.00) +SYSSTAT.TEST +04/18/2019 + + +0. + +3. + +6. + +9. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + +Block devices statistics (5) [dev8-0] +(Min, Max values) + + +%util (0.00, 85.36) +SYSSTAT.TEST +04/18/2019 + + +0. + +25. + +50. + +75. + +100. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + + + +Block devices statistics (1) [dev8-1] +(Min, Max values) + + +tps (0.00, 6.40) +SYSSTAT.TEST +04/18/2019 + + +0. + +2. + +4. + +6. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + +Block devices statistics (2) [dev8-1] +(Min, Max values) + + +rkB/s (0.00, 54.75) +wkB/s x10 (0.00, 16.01) +dkB/s x10 (0.00, 8.02) +SYSSTAT.TEST +04/18/2019 + + +0. + +10. + +20. + +30. + +40. + +50. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + +Block devices statistics (3) [dev8-1] +(Min, Max values) + + +areq-sz (0.00, 41.33) +aqu-sz x100 (0.00, 8.02) +SYSSTAT.TEST +04/18/2019 + + +0. + +10. + +20. + +30. + +40. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + +Block devices statistics (4) [dev8-1] +(Min, Max values) + + +await (0.00, 60.92) +SYSSTAT.TEST +04/18/2019 + + +0. + +20. + +40. + +60. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + +Block devices statistics (5) [dev8-1] +(Min, Max values) + + +%util (0.00, 0.32) +SYSSTAT.TEST +04/18/2019 + + +0. + +25. + +50. + +75. + +100. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + + Block devices statistics (1) [dev8-16] (Min, Max values) @@ -1845,7 +2433,7 @@ - + Block devices statistics (1) [dev8-80] (Min, Max values) @@ -2088,7 +2676,7 @@ - + Block devices statistics (1) [dev8-96] (Min, Max values) @@ -2325,7 +2913,7 @@ - + Network interfaces statistics (1) [enp6s0] (Min, Max values) @@ -2521,7 +3109,7 @@ - + Network interfaces statistics (1) [enp6s1] (Min, Max values) @@ -2672,7 +3260,7 @@ - + Network interfaces statistics (1) [wlp5s1] (Min, Max values) @@ -2768,7 +3356,7 @@ - + Network interfaces statistics (1) [enp6s2] (Min, Max values) @@ -2915,7 +3503,7 @@ - + Network interfaces statistics (1) [wlp5s2] (Min, Max values) @@ -3011,7 +3599,7 @@ - + Network interfaces errors statistics (4) [wlp5s1] (Min, Max values) @@ -3062,7 +3650,7 @@ - + IPv4 sockets statistics (1) (Min, Max values) @@ -3162,7 +3750,7 @@ - + IPv6 sockets statistics (Min, Max values) @@ -3215,7 +3803,7 @@ - + CPU clock frequency [all] (Min, Max values) @@ -3262,7 +3850,7 @@ - + CPU clock frequency [0] (Min, Max values) @@ -3309,7 +3897,7 @@ - + CPU clock frequency [1] (Min, Max values) @@ -3356,7 +3944,7 @@ - + CPU clock frequency [2] (Min, Max values) @@ -3403,7 +3991,7 @@ - + CPU clock frequency [3] (Min, Max values) @@ -3450,7 +4038,7 @@ - + CPU clock frequency [4] (Min, Max values) @@ -3497,7 +4085,7 @@ - + CPU clock frequency [5] (Min, Max values) @@ -3544,7 +4132,7 @@ - + CPU clock frequency [6] (Min, Max values) @@ -3591,7 +4179,7 @@ - + CPU clock frequency [7] (Min, Max values) @@ -3638,7 +4226,7 @@ - + CPU clock frequency [8] (Min, Max values) @@ -3685,7 +4273,7 @@ - + CPU clock frequency [9] (Min, Max values) @@ -3732,7 +4320,7 @@ - + Filesystems statistics (1) [/dev/sda9] (Min, Max values) @@ -3930,7 +4518,7 @@ - + Filesystems statistics (1) [/dev/sda7] (Min, Max values) @@ -4128,7 +4716,7 @@ - + Filesystems statistics (1) [/dev/sda12] (Min, Max values) @@ -4326,7 +4914,7 @@ - + Filesystems statistics (1) [/dev/sda6] (Min, Max values) @@ -4524,7 +5112,7 @@ - + Filesystems statistics (1) [/dev/sdf] (Min, Max values) @@ -4673,7 +5261,7 @@ - + Filesystems statistics (1) [/dev/sdg] (Min, Max values) @@ -4873,5 +5461,5 @@ - + diff --git a/tests/expected2.sar-all b/tests/expected2.sar-all index ca75e2f..dabf8c4 100644 --- a/tests/expected2.sar-all +++ b/tests/expected2.sar-all @@ -2515,8 +2515,8 @@ Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.0 13:20:09 tps rtps wtps dtps bread/s bwrtn/s bdscd/s 13:20:19 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:29 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:39 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:29 5.44 2.24 3.20 0.00 0.00 3.20 0.00 +13:20:39 0.00 0.91 0.00 0.00 299.22 0.00 0.00 13:20:49 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.00 @@ -2582,8 +2582,8 @@ Average: 1 0.00 0.00 0.00 0.00 0.00 0.0 13:20:19 dev8-11 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:19 dev8-12 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:19 dev8-16 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:29 dev8-0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:29 dev8-1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:29 dev8-0 6.40 1.60 1.60 0.00 0.50 0.00 1.00 0.32 +13:20:29 dev8-1 6.40 1.60 1.60 0.00 0.50 0.00 1.00 0.32 13:20:29 dev8-2 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 dev8-3 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 dev8-4 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 @@ -2596,8 +2596,8 @@ Average: 1 0.00 0.00 0.00 0.00 0.00 0.0 13:20:29 dev8-11 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 dev8-12 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 dev8-16 0.67 22.60 0.00 0.00 33.62 0.10 47.00 0.05 -13:20:39 dev8-0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:39 dev8-1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:39 dev8-0 1604.70 41499.97 10663.48 0.00 32.51 18.56 12.00 85.36 +13:20:39 dev8-1 1.32 54.75 0.00 0.00 41.33 0.08 60.92 0.11 13:20:39 dev8-2 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:39 dev8-3 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:39 dev8-4 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 @@ -3966,8 +3966,8 @@ Average: 0.00 0.00 Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:54:15 tps rtps wtps dtps bread/s bwrtn/s bdscd/s -13:54:35 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:54:35 1.60 0.00 0.00 1.60 0.00 0.00 1.60 +Average: 1.60 0.00 0.00 1.60 0.00 0.00 1.60 13:54:15 kbmemfree kbavail kbmemused %memused kbbuffers kbcached kbcommit %commit kbactive kbinact kbdirty kbanonpg kbslab kbkstack kbpgtbl kbvmused 13:54:35 1437740 4389516 3179712 39.04 260172 2821596 12097852 48.54 4042384 1772396 396 2733164 445740 15328 73760 0 @@ -3996,8 +3996,8 @@ Average: 0 0.00 0.00 0.00 0.00 0.00 0.0 Average: 1 0.00 0.00 0.00 0.00 0.00 0.00 13:54:15 DEV tps rkB/s wkB/s dkB/s areq-sz aqu-sz await %util -13:54:35 dev8-0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:54:35 dev8-1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:54:35 dev8-0 1.60 0.00 0.00 0.80 0.50 0.00 1.00 0.00 +13:54:35 dev8-1 1.60 0.00 0.00 0.80 0.50 0.00 1.00 0.00 13:54:35 dev8-2 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:54:35 dev8-3 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:54:35 dev8-4 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 @@ -4006,8 +4006,8 @@ Average: 1 0.00 0.00 0.00 0.00 0.00 0.0 13:54:35 dev8-7 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:54:35 dev8-8 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:54:35 dev8-9 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -Average: dev8-0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -Average: dev8-1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +Average: dev8-0 1.60 0.00 0.00 0.80 0.50 0.00 1.00 0.00 +Average: dev8-1 1.60 0.00 0.00 0.80 0.50 0.00 1.00 0.00 Average: dev8-2 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average: dev8-3 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average: dev8-4 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected3.sar-all b/tests/expected3.sar-all index 692699d..a5b1166 100644 --- a/tests/expected3.sar-all +++ b/tests/expected3.sar-all @@ -52,8 +52,8 @@ Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.0 13:20:09 tps rtps wtps dtps bread/s bwrtn/s bdscd/s 13:20:19 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:29 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:39 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:29 5.44 2.24 3.20 0.00 0.00 3.20 0.00 +13:20:39 0.00 0.91 0.00 0.00 299.22 0.00 0.00 13:20:49 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.00 @@ -119,8 +119,8 @@ Average: 1 0.00 0.00 0.00 0.00 0.00 0.0 13:20:19 dev8-11 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:19 dev8-12 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:19 dev8-16 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:29 dev8-0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:29 dev8-1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:29 dev8-0 6.40 1.60 1.60 0.00 0.50 0.00 1.00 0.32 +13:20:29 dev8-1 6.40 1.60 1.60 0.00 0.50 0.00 1.00 0.32 13:20:29 dev8-2 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 dev8-3 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 dev8-4 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 @@ -133,8 +133,8 @@ Average: 1 0.00 0.00 0.00 0.00 0.00 0.0 13:20:29 dev8-11 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 dev8-12 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 dev8-16 0.67 22.60 0.00 0.00 33.62 0.10 47.00 0.05 -13:20:39 dev8-0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -13:20:39 dev8-1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:39 dev8-0 1604.70 41499.97 10663.48 0.00 32.51 18.56 12.00 85.36 +13:20:39 dev8-1 1.32 54.75 0.00 0.00 41.33 0.08 60.92 0.11 13:20:39 dev8-2 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:39 dev8-3 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:39 dev8-4 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/root.README b/tests/root.README index 0596826..ff0a2dc 100644 --- a/tests/root.README +++ b/tests/root.README @@ -8,6 +8,7 @@ CPU#3: tickless CPU#6: offline /proc/diskstats +sda, sda1: counters increase sdb: unregistered then registered again /proc/net/dev @@ -22,6 +23,7 @@ sdh: autofs, registered CPU#6: offline /proc/diskstats +sda, sda1: counters decrease sdb (dev8-16): unregistered sdf (dev8-80), sdg (dev-8,96): registered @@ -51,4 +53,5 @@ enp6s0-2,wlp5s0-2: available Determine number of CPU using /proc/stat ==========root7: - +/proc/diskstats +sda, sda1: discard I/Os diff --git a/tests/root3/proc/diskstats b/tests/root3/proc/diskstats index 7338b6b..3e4b736 100644 --- a/tests/root3/proc/diskstats +++ b/tests/root3/proc/diskstats @@ -1,5 +1,5 @@ - 8 0 sda 49601 2822 3195498 623970 12180 9784 821088 117109 0 32862 714408 0 0 0 0 - 8 1 sda1 51 0 4216 3107 0 0 0 0 0 41 3086 0 0 0 0 + 8 0 sda 49701 2922 3195598 624070 12280 9884 821188 117209 0 32962 714508 0 0 0 0 + 8 1 sda1 151 100 4316 3207 100 100 100 100 100 141 3186 0 0 0 0 8 2 sda2 47 0 4184 2938 0 0 0 0 0 33 2917 0 0 0 0 8 3 sda3 49 0 4200 2831 0 0 0 0 0 40 2810 0 0 0 0 8 4 sda4 5 0 28 1294 0 0 0 0 0 8 1293 0 0 0 0 diff --git a/tests/root6/proc/diskstats b/tests/root6/proc/diskstats index a5fe253..9c20922 100644 --- a/tests/root6/proc/diskstats +++ b/tests/root6/proc/diskstats @@ -1,5 +1,5 @@ - 8 0 sda 49601 2822 3195498 623970 12180 9784 821088 117109 0 32862 714408 0 0 0 0 - 8 1 sda1 51 0 4216 3107 0 0 0 0 0 41 3086 0 0 0 0 + 8 0 sda 49601 2822 3195498 623970 12180 9784 821088 117109 0 32862 714408 100 100 100 100 + 8 1 sda1 51 0 4216 3107 0 0 0 0 0 41 3086 100 100 100 100 8 2 sda2 47 0 4184 2938 0 0 0 0 0 33 2917 0 0 0 0 8 3 sda3 49 0 4200 2831 0 0 0 0 0 40 2810 0 0 0 0 8 4 sda4 5 0 28 1294 0 0 0 0 0 8 1293 0 0 0 0 diff --git a/tests/root7/proc/diskstats b/tests/root7/proc/diskstats index a5fe253..736bee0 100644 --- a/tests/root7/proc/diskstats +++ b/tests/root7/proc/diskstats @@ -1,5 +1,5 @@ - 8 0 sda 49601 2822 3195498 623970 12180 9784 821088 117109 0 32862 714408 0 0 0 0 - 8 1 sda1 51 0 4216 3107 0 0 0 0 0 41 3086 0 0 0 0 + 8 0 sda 49601 2822 3195498 623970 12180 9784 821088 117109 0 32862 714408 150 150 150 150 + 8 1 sda1 51 0 4216 3107 0 0 0 0 0 41 3086 150 150 150 150 8 2 sda2 47 0 4184 2938 0 0 0 0 0 33 2917 0 0 0 0 8 3 sda3 49 0 4200 2831 0 0 0 0 0 40 2810 0 0 0 0 8 4 sda4 5 0 28 1294 0 0 0 0 0 8 1293 0 0 0 0