From: Sebastien GODARD Date: Sun, 13 Dec 2020 15:17:50 +0000 (+0100) Subject: simtest: Change values used for filesystems statistics X-Git-Tag: v12.5.2~7 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96ecbb6f0989c7b36352673f99013b119339397e;p=sysstat simtest: Change values used for filesystems statistics Make sure values are not greater than UINT_MAX. Signed-off-by: Sebastien GODARD --- diff --git a/systest.c b/systest.c index 9be44c1..7277aff 100644 --- a/systest.c +++ b/systest.c @@ -99,11 +99,16 @@ void get_uname(struct utsname *h) int get_fs_stat(char *c, struct statvfs *buf) { static int p = 0; - unsigned long long bfree[4] = {89739427840, 293286670336, 11696156672, 292616732672}; - unsigned long long blocks[4] = {97891291136, 309502345216, 30829043712, 309502345216}; - unsigned long long bavail[4] = {84722675712, 277541253120, 10106515456, 276871315456}; - unsigned long long files[4] = {6111232, 19202048, 1921360, 19202048}; - unsigned long long ffree[4] = {6008414, 19201593, 1621550, 19051710}; + /* + * f_bfree, f_blocks and f_bavail used to be unsigned long. + * So don't use values greater then UINT_MAX to make sure that values + * won't overflow on 32-bit systems. + */ + unsigned long long bfree[4] = {739427840, 286670336, 1696156672, 2616732672}; + unsigned long long blocks[4] = {891291136, 502345216, 1829043712, 3502345216}; + unsigned long long bavail[4] = {722675712, 241253120, 1106515456, 1871315456}; + unsigned long long files[4] = {6111232, 19202048, 1921360, 19202048}; + unsigned long long ffree[4] = {6008414, 19201593, 1621550, 19051710}; buf->f_bfree = bfree[p]; buf->f_blocks = blocks[p]; diff --git a/tests/expected.data-ini b/tests/expected.data-ini index b6610c5..5c74265 100644 --- a/tests/expected.data-ini +++ b/tests/expected.data-ini @@ -2925,32 +2925,32 @@ Average: 6 3492.22 Average: 7 3497.56 13:20:09 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM -13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -13:20:19 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 -13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:20:19 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda9 -13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf -13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg -13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda9 -13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf -13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg -13:20:49 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -13:20:49 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -13:20:49 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 -13:20:49 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg +13:20:19 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +13:20:19 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda7 +13:20:19 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda12 +13:20:19 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 +13:20:29 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda9 +13:20:29 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda7 +13:20:29 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda12 +13:20:29 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 +13:20:29 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdf +13:20:29 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sdg +13:20:39 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda9 +13:20:39 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda7 +13:20:39 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda12 +13:20:39 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 +13:20:39 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdf +13:20:39 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sdg +13:20:49 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +13:20:49 273 206 42.93 51.97 19201593 455 0.00 /dev/sda7 +13:20:49 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda12 +13:20:49 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda6 +Summary: 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +Summary: 273 206 42.93 51.97 19201593 455 0.00 /dev/sda7 +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda12 +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda6 +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdf +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sdg 13:37:29 LINUX RESTART (9 CPU) 13:39:09 COM Testing sysstat! @@ -4192,11 +4192,11 @@ Average: 8 3497.56 Average: 9 3497.56 13:54:15 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM -13:54:35 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -13:54:35 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -13:54:35 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 -13:54:35 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 +13:54:35 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +13:54:35 273 206 42.93 51.97 19201593 455 0.00 /dev/sda7 +13:54:35 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda12 +13:54:35 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda6 +Summary: 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +Summary: 273 206 42.93 51.97 19201593 455 0.00 /dev/sda7 +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda12 +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda6 diff --git a/tests/expected.sadf-d b/tests/expected.sadf-d index f5a9e00..815c152 100644 --- a/tests/expected.sadf-d +++ b/tests/expected.sadf-d @@ -2315,26 +2315,26 @@ SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;5;3493.55 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;6;3492.22 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;7;3497.56 # hostname;interval;timestamp;FILESYSTEM;MBfsfree;MBfsused;%fsused;%ufsused;Ifree;Iused;%Iused -SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;/dev/sda9;85582;7774;8.33;13.45;6008414;102818;1.68 -SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;/dev/sda7;279061;16103;5.46;10.54;19051710;150338;0.78 -SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;/dev/sda12;85582;7774;8.33;13.45;6008414;102818;1.68 -SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;/dev/sda6;279700;15464;5.24;10.33;19201593;455;0.00 -SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sda9;11154;18247;62.06;67.22;1621550;299810;15.60 -SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sda7;279061;16103;5.46;10.54;19051710;150338;0.78 -SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sda12;85582;7774;8.33;13.45;6008414;102818;1.68 -SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sda6;279700;15464;5.24;10.33;19201593;455;0.00 -SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sdf;11154;18247;62.06;67.22;1621550;299810;15.60 -SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sdg;279061;16103;5.46;10.54;19051710;150338;0.78 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda9;11154;18247;62.06;67.22;1621550;299810;15.60 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda7;279061;16103;5.46;10.54;19051710;150338;0.78 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda12;85582;7774;8.33;13.45;6008414;102818;1.68 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda6;279700;15464;5.24;10.33;19201593;455;0.00 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sdf;11154;18247;62.06;67.22;1621550;299810;15.60 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sdg;279061;16103;5.46;10.54;19051710;150338;0.78 -SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;/dev/sda9;85582;7774;8.33;13.45;6008414;102818;1.68 -SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;/dev/sda7;279700;15464;5.24;10.33;19201593;455;0.00 -SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;/dev/sda12;11154;18247;62.06;67.22;1621550;299810;15.60 -SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;/dev/sda6;279061;16103;5.46;10.54;19051710;150338;0.78 +SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;/dev/sda9;705;145;17.04;18.92;6008414;102818;1.68 +SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;/dev/sda7;2496;845;25.29;46.57;19051710;150338;0.78 +SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;/dev/sda12;705;145;17.04;18.92;6008414;102818;1.68 +SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;/dev/sda6;273;206;42.93;51.97;19201593;455;0.00 +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sda9;1618;127;7.27;39.50;1621550;299810;15.60 +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sda7;2496;845;25.29;46.57;19051710;150338;0.78 +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sda12;705;145;17.04;18.92;6008414;102818;1.68 +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sda6;273;206;42.93;51.97;19201593;455;0.00 +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sdf;1618;127;7.27;39.50;1621550;299810;15.60 +SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;/dev/sdg;2496;845;25.29;46.57;19051710;150338;0.78 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda9;1618;127;7.27;39.50;1621550;299810;15.60 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda7;2496;845;25.29;46.57;19051710;150338;0.78 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda12;705;145;17.04;18.92;6008414;102818;1.68 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda6;273;206;42.93;51.97;19201593;455;0.00 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sdf;1618;127;7.27;39.50;1621550;299810;15.60 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sdg;2496;845;25.29;46.57;19051710;150338;0.78 +SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;/dev/sda9;705;145;17.04;18.92;6008414;102818;1.68 +SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;/dev/sda7;273;206;42.93;51.97;19201593;455;0.00 +SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;/dev/sda12;1618;127;7.27;39.50;1621550;299810;15.60 +SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;/dev/sda6;2496;845;25.29;46.57;19051710;150338;0.78 # hostname;interval;timestamp;%scpu-10;%scpu-60;%scpu-300;%scpu SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;0.00;0.00;0.00;0.03 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;0.00;0.00;0.00;0.23 @@ -2971,10 +2971,10 @@ SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;7;3497.56 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;8;3497.56 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;9;3497.56 # hostname;interval;timestamp;FILESYSTEM;MBfsfree;MBfsused;%fsused;%ufsused;Ifree;Iused;%Iused -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda9;85582;7774;8.33;13.45;6008414;102818;1.68 -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda7;279700;15464;5.24;10.33;19201593;455;0.00 -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda12;11154;18247;62.06;67.22;1621550;299810;15.60 -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda6;279061;16103;5.46;10.54;19051710;150338;0.78 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda9;705;145;17.04;18.92;6008414;102818;1.68 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda7;273;206;42.93;51.97;19201593;455;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda12;1618;127;7.27;39.50;1621550;299810;15.60 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda6;2496;845;25.29;46.57;19051710;150338;0.78 # hostname;interval;timestamp;%scpu-10;%scpu-60;%scpu-300;%scpu SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0.00;0.00;0.00;0.00 # hostname;interval;timestamp;%sio-10;%sio-60;%sio-300;%sio;%fio-10;%fio-60;%fio-300;%fio diff --git a/tests/expected.sadf-g b/tests/expected.sadf-g index bd2c5f8..bba8642 100644 --- a/tests/expected.sadf-g +++ b/tests/expected.sadf-g @@ -13038,18 +13038,16 @@ (Min, Max values) -MBfsfree (11154, 85582) -MBfsused (7774, 18247) +MBfsfree (705, 1618) +MBfsused (127, 145) 0. - -20000. - -40000. - -60000. - -80000. + +500. + +1000. + +1500. 13:20:09 @@ -13073,16 +13071,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/dev/sda9] (Min, Max values) -%ufsused (13.45, 67.22) -%fsused (8.33, 62.06) +%ufsused (18.92, 39.50) +%fsused (7.27, 17.04) 0. @@ -13117,10 +13115,10 @@ 13:54:29 UTC - + - + @@ -13214,16 +13212,16 @@ (Min, Max values) -MBfsfree (279061, 279700) -MBfsused (15464, 16103) +MBfsfree (273, 2496) +MBfsused (206, 845) 0. - -90000. - -180000. - -270000. + +800. + +1600. + +2400. 13:20:09 @@ -13247,16 +13245,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/dev/sda7] (Min, Max values) -%ufsused (10.33, 10.54) -%fsused (5.24, 5.46) +%ufsused (46.57, 51.97) +%fsused (25.29, 42.93) 0. @@ -13291,10 +13289,10 @@ 13:54:29 UTC - + - + @@ -13388,18 +13386,16 @@ (Min, Max values) -MBfsfree (11154, 85582) -MBfsused (7774, 18247) +MBfsfree (705, 1618) +MBfsused (127, 145) 0. - -20000. - -40000. - -60000. - -80000. + +500. + +1000. + +1500. 13:20:09 @@ -13423,16 +13419,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/dev/sda12] (Min, Max values) -%ufsused (13.45, 67.22) -%fsused (8.33, 62.06) +%ufsused (18.92, 39.50) +%fsused (7.27, 17.04) 0. @@ -13467,10 +13463,10 @@ 13:54:29 UTC - + - + @@ -13564,16 +13560,16 @@ (Min, Max values) -MBfsfree (279061, 279700) -MBfsused (15464, 16103) +MBfsfree (273, 2496) +MBfsused (206, 845) 0. - -90000. - -180000. - -270000. + +800. + +1600. + +2400. 13:20:09 @@ -13597,16 +13593,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/dev/sda6] (Min, Max values) -%ufsused (10.33, 10.54) -%fsused (5.24, 5.46) +%ufsused (46.57, 51.97) +%fsused (25.29, 42.93) 0. @@ -13641,10 +13637,10 @@ 13:54:29 UTC - + - + @@ -13738,16 +13734,16 @@ (Min, Max values) -MBfsfree (11154, 11154) -MBfsused (18247, 18247) +MBfsfree (1618, 1618) +MBfsused (127, 127) 0. - -6000. - -12000. - -18000. + +500. + +1000. + +1500. 13:20:09 @@ -13771,16 +13767,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/dev/sdf] (Min, Max values) -%ufsused (67.22, 67.22) -%fsused (62.06, 62.06) +%ufsused (39.50, 39.50) +%fsused (7.27, 7.27) 0. @@ -13815,10 +13811,10 @@ 13:54:29 UTC - + - + @@ -13912,16 +13908,16 @@ (Min, Max values) -MBfsfree (279061, 279061) -MBfsused (16103, 16103) +MBfsfree (2496, 2496) +MBfsused (845, 845) 0. - -90000. - -180000. - -270000. + +800. + +1600. + +2400. 13:20:09 @@ -13945,16 +13941,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/dev/sdg] (Min, Max values) -%ufsused (10.54, 10.54) -%fsused (5.46, 5.46) +%ufsused (46.57, 46.57) +%fsused (25.29, 25.29) 0. @@ -13989,10 +13985,10 @@ 13:54:29 UTC - + - + diff --git a/tests/expected.sadf-j b/tests/expected.sadf-j index 58b7d44..ef23580 100644 --- a/tests/expected.sadf-j +++ b/tests/expected.sadf-j @@ -602,10 +602,10 @@ ] }, "filesystems": [ - {"filesystem": "/dev/sda9", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, - {"filesystem": "/dev/sda7", "MBfsfree": 279061, "MBfsused": 16103, "%fsused": 5.46, "%ufsused": 10.54, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78}, - {"filesystem": "/dev/sda12", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, - {"filesystem": "/dev/sda6", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00} + {"filesystem": "/dev/sda9", "MBfsfree": 705, "MBfsused": 145, "%fsused": 17.04, "%ufsused": 18.92, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, + {"filesystem": "/dev/sda7", "MBfsfree": 2496, "MBfsused": 845, "%fsused": 25.29, "%ufsused": 46.57, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78}, + {"filesystem": "/dev/sda12", "MBfsfree": 705, "MBfsused": 145, "%fsused": 17.04, "%ufsused": 18.92, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, + {"filesystem": "/dev/sda6", "MBfsfree": 273, "MBfsused": 206, "%fsused": 42.93, "%ufsused": 51.97, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00} ], "psi": { "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_avg": 0.03}, @@ -1203,12 +1203,12 @@ ] }, "filesystems": [ - {"filesystem": "/dev/sda9", "MBfsfree": 11154, "MBfsused": 18247, "%fsused": 62.06, "%ufsused": 67.22, "Ifree": 1621550, "Iused": 299810, "%Iused": 15.60}, - {"filesystem": "/dev/sda7", "MBfsfree": 279061, "MBfsused": 16103, "%fsused": 5.46, "%ufsused": 10.54, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78}, - {"filesystem": "/dev/sda12", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, - {"filesystem": "/dev/sda6", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, - {"filesystem": "/dev/sdf", "MBfsfree": 11154, "MBfsused": 18247, "%fsused": 62.06, "%ufsused": 67.22, "Ifree": 1621550, "Iused": 299810, "%Iused": 15.60}, - {"filesystem": "/dev/sdg", "MBfsfree": 279061, "MBfsused": 16103, "%fsused": 5.46, "%ufsused": 10.54, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78} + {"filesystem": "/dev/sda9", "MBfsfree": 1618, "MBfsused": 127, "%fsused": 7.27, "%ufsused": 39.50, "Ifree": 1621550, "Iused": 299810, "%Iused": 15.60}, + {"filesystem": "/dev/sda7", "MBfsfree": 2496, "MBfsused": 845, "%fsused": 25.29, "%ufsused": 46.57, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78}, + {"filesystem": "/dev/sda12", "MBfsfree": 705, "MBfsused": 145, "%fsused": 17.04, "%ufsused": 18.92, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, + {"filesystem": "/dev/sda6", "MBfsfree": 273, "MBfsused": 206, "%fsused": 42.93, "%ufsused": 51.97, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, + {"filesystem": "/dev/sdf", "MBfsfree": 1618, "MBfsused": 127, "%fsused": 7.27, "%ufsused": 39.50, "Ifree": 1621550, "Iused": 299810, "%Iused": 15.60}, + {"filesystem": "/dev/sdg", "MBfsfree": 2496, "MBfsused": 845, "%fsused": 25.29, "%ufsused": 46.57, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78} ], "psi": { "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_avg": 0.23}, @@ -1812,12 +1812,12 @@ ] }, "filesystems": [ - {"filesystem": "/dev/sda9", "MBfsfree": 11154, "MBfsused": 18247, "%fsused": 62.06, "%ufsused": 67.22, "Ifree": 1621550, "Iused": 299810, "%Iused": 15.60}, - {"filesystem": "/dev/sda7", "MBfsfree": 279061, "MBfsused": 16103, "%fsused": 5.46, "%ufsused": 10.54, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78}, - {"filesystem": "/dev/sda12", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, - {"filesystem": "/dev/sda6", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, - {"filesystem": "/dev/sdf", "MBfsfree": 11154, "MBfsused": 18247, "%fsused": 62.06, "%ufsused": 67.22, "Ifree": 1621550, "Iused": 299810, "%Iused": 15.60}, - {"filesystem": "/dev/sdg", "MBfsfree": 279061, "MBfsused": 16103, "%fsused": 5.46, "%ufsused": 10.54, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78} + {"filesystem": "/dev/sda9", "MBfsfree": 1618, "MBfsused": 127, "%fsused": 7.27, "%ufsused": 39.50, "Ifree": 1621550, "Iused": 299810, "%Iused": 15.60}, + {"filesystem": "/dev/sda7", "MBfsfree": 2496, "MBfsused": 845, "%fsused": 25.29, "%ufsused": 46.57, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78}, + {"filesystem": "/dev/sda12", "MBfsfree": 705, "MBfsused": 145, "%fsused": 17.04, "%ufsused": 18.92, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, + {"filesystem": "/dev/sda6", "MBfsfree": 273, "MBfsused": 206, "%fsused": 42.93, "%ufsused": 51.97, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, + {"filesystem": "/dev/sdf", "MBfsfree": 1618, "MBfsused": 127, "%fsused": 7.27, "%ufsused": 39.50, "Ifree": 1621550, "Iused": 299810, "%Iused": 15.60}, + {"filesystem": "/dev/sdg", "MBfsfree": 2496, "MBfsused": 845, "%fsused": 25.29, "%ufsused": 46.57, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78} ], "psi": { "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_avg": 0.01}, @@ -2425,10 +2425,10 @@ ] }, "filesystems": [ - {"filesystem": "/dev/sda9", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, - {"filesystem": "/dev/sda7", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, - {"filesystem": "/dev/sda12", "MBfsfree": 11154, "MBfsused": 18247, "%fsused": 62.06, "%ufsused": 67.22, "Ifree": 1621550, "Iused": 299810, "%Iused": 15.60}, - {"filesystem": "/dev/sda6", "MBfsfree": 279061, "MBfsused": 16103, "%fsused": 5.46, "%ufsused": 10.54, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78} + {"filesystem": "/dev/sda9", "MBfsfree": 705, "MBfsused": 145, "%fsused": 17.04, "%ufsused": 18.92, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, + {"filesystem": "/dev/sda7", "MBfsfree": 273, "MBfsused": 206, "%fsused": 42.93, "%ufsused": 51.97, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, + {"filesystem": "/dev/sda12", "MBfsfree": 1618, "MBfsused": 127, "%fsused": 7.27, "%ufsused": 39.50, "Ifree": 1621550, "Iused": 299810, "%Iused": 15.60}, + {"filesystem": "/dev/sda6", "MBfsfree": 2496, "MBfsused": 845, "%fsused": 25.29, "%ufsused": 46.57, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78} ], "psi": { "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_avg": 0.23}, @@ -3043,10 +3043,10 @@ ] }, "filesystems": [ - {"filesystem": "/dev/sda9", "MBfsfree": 85582, "MBfsused": 7774, "%fsused": 8.33, "%ufsused": 13.45, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, - {"filesystem": "/dev/sda7", "MBfsfree": 279700, "MBfsused": 15464, "%fsused": 5.24, "%ufsused": 10.33, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, - {"filesystem": "/dev/sda12", "MBfsfree": 11154, "MBfsused": 18247, "%fsused": 62.06, "%ufsused": 67.22, "Ifree": 1621550, "Iused": 299810, "%Iused": 15.60}, - {"filesystem": "/dev/sda6", "MBfsfree": 279061, "MBfsused": 16103, "%fsused": 5.46, "%ufsused": 10.54, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78} + {"filesystem": "/dev/sda9", "MBfsfree": 705, "MBfsused": 145, "%fsused": 17.04, "%ufsused": 18.92, "Ifree": 6008414, "Iused": 102818, "%Iused": 1.68}, + {"filesystem": "/dev/sda7", "MBfsfree": 273, "MBfsused": 206, "%fsused": 42.93, "%ufsused": 51.97, "Ifree": 19201593, "Iused": 455, "%Iused": 0.00}, + {"filesystem": "/dev/sda12", "MBfsfree": 1618, "MBfsused": 127, "%fsused": 7.27, "%ufsused": 39.50, "Ifree": 1621550, "Iused": 299810, "%Iused": 15.60}, + {"filesystem": "/dev/sda6", "MBfsfree": 2496, "MBfsused": 845, "%fsused": 25.29, "%ufsused": 46.57, "Ifree": 19051710, "Iused": 150338, "%Iused": 0.78} ], "psi": { "psi-cpu": {"some_avg10": 0.00, "some_avg60": 0.00, "some_avg300": 0.00, "some_avg": 0.00}, diff --git a/tests/expected.sadf-p b/tests/expected.sadf-p index a1de12e..ba6ba3d 100644 --- a/tests/expected.sadf-p +++ b/tests/expected.sadf-p @@ -4221,143 +4221,143 @@ SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu4 MHz 3505.84 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu5 MHz 3493.55 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu6 MHz 3492.22 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC cpu7 MHz 3497.56 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda9 MBfsfree 85582 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda9 MBfsused 7774 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda9 %fsused 8.33 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda9 %ufsused 13.45 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda9 MBfsfree 705 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda9 MBfsused 145 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda9 %fsused 17.04 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda9 %ufsused 18.92 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda9 Ifree 6008414 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda9 Iused 102818 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda9 %Iused 1.68 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 MBfsfree 279061 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 MBfsused 16103 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 %fsused 5.46 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 %ufsused 10.54 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 MBfsfree 2496 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 MBfsused 845 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 %fsused 25.29 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 %ufsused 46.57 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 Ifree 19051710 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 Iused 150338 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda7 %Iused 0.78 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda12 MBfsfree 85582 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda12 MBfsused 7774 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda12 %fsused 8.33 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda12 %ufsused 13.45 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda12 MBfsfree 705 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda12 MBfsused 145 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda12 %fsused 17.04 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda12 %ufsused 18.92 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda12 Ifree 6008414 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda12 Iused 102818 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda12 %Iused 1.68 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda6 MBfsfree 279700 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda6 MBfsused 15464 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda6 %fsused 5.24 -SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda6 %ufsused 10.33 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda6 MBfsfree 273 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda6 MBfsused 206 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda6 %fsused 42.93 +SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda6 %ufsused 51.97 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda6 Ifree 19201593 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda6 Iused 455 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC /dev/sda6 %Iused 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 MBfsfree 11154 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 MBfsused 18247 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 %fsused 62.06 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 %ufsused 67.22 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 MBfsfree 1618 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 MBfsused 127 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 %fsused 7.27 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 %ufsused 39.50 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 Ifree 1621550 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 Iused 299810 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda9 %Iused 15.60 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 MBfsfree 279061 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 MBfsused 16103 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 %fsused 5.46 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 %ufsused 10.54 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 MBfsfree 2496 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 MBfsused 845 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 %fsused 25.29 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 %ufsused 46.57 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 Ifree 19051710 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 Iused 150338 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda7 %Iused 0.78 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 MBfsfree 85582 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 MBfsused 7774 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 %fsused 8.33 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 %ufsused 13.45 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 MBfsfree 705 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 MBfsused 145 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 %fsused 17.04 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 %ufsused 18.92 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 Ifree 6008414 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 Iused 102818 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda12 %Iused 1.68 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 MBfsfree 279700 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 MBfsused 15464 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 %fsused 5.24 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 %ufsused 10.33 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 MBfsfree 273 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 MBfsused 206 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 %fsused 42.93 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 %ufsused 51.97 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 Ifree 19201593 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 Iused 455 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sda6 %Iused 0.00 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf MBfsfree 11154 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf MBfsused 18247 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf %fsused 62.06 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf %ufsused 67.22 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf MBfsfree 1618 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf MBfsused 127 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf %fsused 7.27 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf %ufsused 39.50 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf Ifree 1621550 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf Iused 299810 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdf %Iused 15.60 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg MBfsfree 279061 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg MBfsused 16103 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg %fsused 5.46 -SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg %ufsused 10.54 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg MBfsfree 2496 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg MBfsused 845 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg %fsused 25.29 +SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg %ufsused 46.57 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg Ifree 19051710 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg Iused 150338 SYSSTAT.TEST 31 2019-04-18 13:20:29 UTC /dev/sdg %Iused 0.78 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 MBfsfree 11154 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 MBfsused 18247 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 %fsused 62.06 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 %ufsused 67.22 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 MBfsfree 1618 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 MBfsused 127 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 %fsused 7.27 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 %ufsused 39.50 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 Ifree 1621550 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 Iused 299810 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda9 %Iused 15.60 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 MBfsfree 279061 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 MBfsused 16103 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 %fsused 5.46 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 %ufsused 10.54 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 MBfsfree 2496 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 MBfsused 845 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 %fsused 25.29 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 %ufsused 46.57 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 Ifree 19051710 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 Iused 150338 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda7 %Iused 0.78 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 MBfsfree 85582 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 MBfsused 7774 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 %fsused 8.33 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 %ufsused 13.45 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 MBfsfree 705 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 MBfsused 145 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 %fsused 17.04 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 %ufsused 18.92 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 Ifree 6008414 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 Iused 102818 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda12 %Iused 1.68 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 MBfsfree 279700 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 MBfsused 15464 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 %fsused 5.24 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 %ufsused 10.33 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 MBfsfree 273 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 MBfsused 206 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 %fsused 42.93 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 %ufsused 51.97 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 Ifree 19201593 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 Iused 455 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sda6 %Iused 0.00 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf MBfsfree 11154 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf MBfsused 18247 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf %fsused 62.06 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf %ufsused 67.22 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf MBfsfree 1618 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf MBfsused 127 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf %fsused 7.27 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf %ufsused 39.50 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf Ifree 1621550 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf Iused 299810 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdf %Iused 15.60 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg MBfsfree 279061 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg MBfsused 16103 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg %fsused 5.46 -SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg %ufsused 10.54 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg MBfsfree 2496 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg MBfsused 845 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg %fsused 25.29 +SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg %ufsused 46.57 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg Ifree 19051710 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg Iused 150338 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC /dev/sdg %Iused 0.78 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda9 MBfsfree 85582 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda9 MBfsused 7774 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda9 %fsused 8.33 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda9 %ufsused 13.45 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda9 MBfsfree 705 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda9 MBfsused 145 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda9 %fsused 17.04 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda9 %ufsused 18.92 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda9 Ifree 6008414 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda9 Iused 102818 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda9 %Iused 1.68 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda7 MBfsfree 279700 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda7 MBfsused 15464 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda7 %fsused 5.24 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda7 %ufsused 10.33 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda7 MBfsfree 273 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda7 MBfsused 206 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda7 %fsused 42.93 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda7 %ufsused 51.97 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda7 Ifree 19201593 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda7 Iused 455 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda7 %Iused 0.00 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 MBfsfree 11154 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 MBfsused 18247 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 %fsused 62.06 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 %ufsused 67.22 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 MBfsfree 1618 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 MBfsused 127 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 %fsused 7.27 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 %ufsused 39.50 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 Ifree 1621550 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 Iused 299810 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda12 %Iused 15.60 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 MBfsfree 279061 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 MBfsused 16103 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 %fsused 5.46 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 %ufsused 10.54 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 MBfsfree 2496 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 MBfsused 845 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 %fsused 25.29 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 %ufsused 46.57 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 Ifree 19051710 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 Iused 150338 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC /dev/sda6 %Iused 0.78 @@ -5589,31 +5589,31 @@ SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu6 MHz 3492.22 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu7 MHz 3497.56 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu8 MHz 3497.56 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC cpu9 MHz 3497.56 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda9 MBfsfree 85582 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda9 MBfsused 7774 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda9 %fsused 8.33 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda9 %ufsused 13.45 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda9 MBfsfree 705 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda9 MBfsused 145 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda9 %fsused 17.04 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda9 %ufsused 18.92 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda9 Ifree 6008414 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda9 Iused 102818 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda9 %Iused 1.68 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda7 MBfsfree 279700 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda7 MBfsused 15464 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda7 %fsused 5.24 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda7 %ufsused 10.33 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda7 MBfsfree 273 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda7 MBfsused 206 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda7 %fsused 42.93 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda7 %ufsused 51.97 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda7 Ifree 19201593 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda7 Iused 455 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda7 %Iused 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 MBfsfree 11154 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 MBfsused 18247 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 %fsused 62.06 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 %ufsused 67.22 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 MBfsfree 1618 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 MBfsused 127 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 %fsused 7.27 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 %ufsused 39.50 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 Ifree 1621550 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 Iused 299810 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda12 %Iused 15.60 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 MBfsfree 279061 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 MBfsused 16103 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 %fsused 5.46 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 %ufsused 10.54 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 MBfsfree 2496 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 MBfsused 845 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 %fsused 25.29 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 %ufsused 46.57 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 Ifree 19051710 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 Iused 150338 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC /dev/sda6 %Iused 0.78 diff --git a/tests/expected.sadf-r b/tests/expected.sadf-r index 9d2d542..22eee52 100644 --- a/tests/expected.sadf-r +++ b/tests/expected.sadf-r @@ -2593,32 +2593,32 @@ # uptime_cs; 0; ust_time; 1555594649; extra_next; 0; record_type; 2; HH:MM:SS; 13:37:29 # uptime_cs; 722372; ust_time; 1555593619; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:19 # name; A_FS; nr_curr; 4; nr_alloc; 8; nr_ini; 4 -13:20:19 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; -13:20:19 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 292616732672; f_blocks; 309502345216; f_bavail; 276871315456; Ifree; 19051710; f_files; 19202048; -13:20:19 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; -13:20:19 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; +13:20:19 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 739427840; f_blocks; 891291136; f_bavail; 722675712; Ifree; 6008414; f_files; 6111232; +13:20:19 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 2616732672; f_blocks; 3502345216; f_bavail; 1871315456; Ifree; 19051710; f_files; 19202048; +13:20:19 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 739427840; f_blocks; 891291136; f_bavail; 722675712; Ifree; 6008414; f_files; 6111232; +13:20:19 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 286670336; f_blocks; 502345216; f_bavail; 241253120; Ifree; 19201593; f_files; 19202048; # uptime_cs; 725496; ust_time; 1555593629; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:29 # name; A_FS; nr_curr; 6; nr_alloc; 8; nr_ini; 4 -13:20:29 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 11696156672; f_blocks; 30829043712; f_bavail; 10106515456; Ifree; 1621550; f_files; 1921360; -13:20:29 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 292616732672; f_blocks; 309502345216; f_bavail; 276871315456; Ifree; 19051710; f_files; 19202048; -13:20:29 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; -13:20:29 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; -13:20:29 UTC; FILESYSTEM; "/dev/sdf"; f_bfree; 11696156672; f_blocks; 30829043712; f_bavail; 10106515456; Ifree; 1621550; f_files; 1921360; -13:20:29 UTC; FILESYSTEM; "/dev/sdg"; f_bfree; 292616732672; f_blocks; 309502345216; f_bavail; 276871315456; Ifree; 19051710; f_files; 19202048; +13:20:29 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 1696156672; f_blocks; 1829043712; f_bavail; 1106515456; Ifree; 1621550; f_files; 1921360; +13:20:29 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 2616732672; f_blocks; 3502345216; f_bavail; 1871315456; Ifree; 19051710; f_files; 19202048; +13:20:29 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 739427840; f_blocks; 891291136; f_bavail; 722675712; Ifree; 6008414; f_files; 6111232; +13:20:29 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 286670336; f_blocks; 502345216; f_bavail; 241253120; Ifree; 19201593; f_files; 19202048; +13:20:29 UTC; FILESYSTEM; "/dev/sdf"; f_bfree; 1696156672; f_blocks; 1829043712; f_bavail; 1106515456; Ifree; 1621550; f_files; 1921360; +13:20:29 UTC; FILESYSTEM; "/dev/sdg"; f_bfree; 2616732672; f_blocks; 3502345216; f_bavail; 1871315456; Ifree; 19051710; f_files; 19202048; # uptime_cs; 729346; ust_time; 1555593639; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:39 # name; A_FS; nr_curr; 6; nr_alloc; 8; nr_ini; 4 -13:20:39 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 11696156672; f_blocks; 30829043712; f_bavail; 10106515456; Ifree; 1621550; f_files; 1921360; -13:20:39 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 292616732672; f_blocks; 309502345216; f_bavail; 276871315456; Ifree; 19051710; f_files; 19202048; -13:20:39 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; -13:20:39 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; -13:20:39 UTC; FILESYSTEM; "/dev/sdf"; f_bfree; 11696156672; f_blocks; 30829043712; f_bavail; 10106515456; Ifree; 1621550; f_files; 1921360; -13:20:39 UTC; FILESYSTEM; "/dev/sdg"; f_bfree; 292616732672; f_blocks; 309502345216; f_bavail; 276871315456; Ifree; 19051710; f_files; 19202048; +13:20:39 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 1696156672; f_blocks; 1829043712; f_bavail; 1106515456; Ifree; 1621550; f_files; 1921360; +13:20:39 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 2616732672; f_blocks; 3502345216; f_bavail; 1871315456; Ifree; 19051710; f_files; 19202048; +13:20:39 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 739427840; f_blocks; 891291136; f_bavail; 722675712; Ifree; 6008414; f_files; 6111232; +13:20:39 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 286670336; f_blocks; 502345216; f_bavail; 241253120; Ifree; 19201593; f_files; 19202048; +13:20:39 UTC; FILESYSTEM; "/dev/sdf"; f_bfree; 1696156672; f_blocks; 1829043712; f_bavail; 1106515456; Ifree; 1621550; f_files; 1921360; +13:20:39 UTC; FILESYSTEM; "/dev/sdg"; f_bfree; 2616732672; f_blocks; 3502345216; f_bavail; 1871315456; Ifree; 19051710; f_files; 19202048; # uptime_cs; 731585; ust_time; 1555593649; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:49 # name; A_FS; nr_curr; 4; nr_alloc; 8; nr_ini; 4 -13:20:49 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; -13:20:49 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; -13:20:49 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 11696156672; f_blocks; 30829043712; f_bavail; 10106515456; Ifree; 1621550; f_files; 1921360; -13:20:49 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 292616732672; f_blocks; 309502345216; f_bavail; 276871315456; Ifree; 19051710; f_files; 19202048; +13:20:49 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 739427840; f_blocks; 891291136; f_bavail; 722675712; Ifree; 6008414; f_files; 6111232; +13:20:49 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 286670336; f_blocks; 502345216; f_bavail; 241253120; Ifree; 19201593; f_files; 19202048; +13:20:49 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 1696156672; f_blocks; 1829043712; f_bavail; 1106515456; Ifree; 1621550; f_files; 1921360; +13:20:49 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 2616732672; f_blocks; 3502345216; f_bavail; 1871315456; Ifree; 19051710; f_files; 19202048; # uptime_cs; 0; ust_time; 1555594649; extra_next; 0; record_type; 2; HH:MM:SS; 13:37:29 # uptime_cs; 722372; ust_time; 1555593619; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:19 # name; A_PSI_CPU; nr_curr; 1; nr_alloc; 1; nr_ini; 1 @@ -3317,10 +3317,10 @@ 13:54:35 UTC; CPU; 9; MHz; 349756; # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35 # name; A_FS; nr_curr; 4; nr_alloc; 8; nr_ini; 4 -13:54:35 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 89739427840; f_blocks; 97891291136; f_bavail; 84722675712; Ifree; 6008414; f_files; 6111232; -13:54:35 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 293286670336; f_blocks; 309502345216; f_bavail; 277541253120; Ifree; 19201593; f_files; 19202048; -13:54:35 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 11696156672; f_blocks; 30829043712; f_bavail; 10106515456; Ifree; 1621550; f_files; 1921360; -13:54:35 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 292616732672; f_blocks; 309502345216; f_bavail; 276871315456; Ifree; 19051710; f_files; 19202048; +13:54:35 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 739427840; f_blocks; 891291136; f_bavail; 722675712; Ifree; 6008414; f_files; 6111232; +13:54:35 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 286670336; f_blocks; 502345216; f_bavail; 241253120; Ifree; 19201593; f_files; 19202048; +13:54:35 UTC; FILESYSTEM; "/dev/sda12"; f_bfree; 1696156672; f_blocks; 1829043712; f_bavail; 1106515456; Ifree; 1621550; f_files; 1921360; +13:54:35 UTC; FILESYSTEM; "/dev/sda6"; f_bfree; 2616732672; f_blocks; 3502345216; f_bavail; 1871315456; Ifree; 19051710; f_files; 19202048; # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35 # name; A_PSI_CPU; nr_curr; 1; nr_alloc; 1; nr_ini; 1 13:54:35 UTC; %scpu-10; 0; %scpu-60; 0; %scpu-300; 0; %scpu; 0; 0; diff --git a/tests/expected.sadf-se b/tests/expected.sadf-se index de11f56..66d95f1 100644 --- a/tests/expected.sadf-se +++ b/tests/expected.sadf-se @@ -3,4 +3,4 @@ SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sda;1604.70;41499.97;10663.48;0.00;32.51 # 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 -SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda6;279700;15464;5.24;10.33;19201593;455;0.00 +SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;/dev/sda6;273;206;42.93;51.97;19201593;455;0.00 diff --git a/tests/expected.sadf-x b/tests/expected.sadf-x index 79594b4..24bebc2 100644 --- a/tests/expected.sadf-x +++ b/tests/expected.sadf-x @@ -633,10 +633,10 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - - - - + + + + @@ -1260,12 +1260,12 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - - - - - - + + + + + + @@ -1895,12 +1895,12 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - - - - - - + + + + + + @@ -2534,10 +2534,10 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - - - - + + + + @@ -3178,10 +3178,10 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - - - - + + + + diff --git a/tests/expected.sar-F-jUUID b/tests/expected.sar-F-jUUID index 2a29126..f57092e 100644 --- a/tests/expected.sar-F-jUUID +++ b/tests/expected.sar-F-jUUID @@ -1,43 +1,43 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM -13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 fe9a021c-3148-41f7-a04b-97442a7eae73 -13:20:19 279061 16103 5.46 10.54 19051710 150338 0.78 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc -13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 43a1c948-8c32-46b8-bb97-c8d58facb27a -13:20:19 279700 15464 5.24 10.33 19201593 455 0.00 25b1e232-0d3c-4742-82b6-927b2a091f1b -13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 fe9a021c-3148-41f7-a04b-97442a7eae73 -13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 43a1c948-8c32-46b8-bb97-c8d58facb27a -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 25b1e232-0d3c-4742-82b6-927b2a091f1b -13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf -13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg -13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 fe9a021c-3148-41f7-a04b-97442a7eae73 -13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 43a1c948-8c32-46b8-bb97-c8d58facb27a -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 25b1e232-0d3c-4742-82b6-927b2a091f1b -13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf -13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg -13:20:49 85582 7774 8.33 13.45 6008414 102818 1.68 fe9a021c-3148-41f7-a04b-97442a7eae73 -13:20:49 279700 15464 5.24 10.33 19201593 455 0.00 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc -13:20:49 11154 18247 62.06 67.22 1621550 299810 15.60 43a1c948-8c32-46b8-bb97-c8d58facb27a -13:20:49 279061 16103 5.46 10.54 19051710 150338 0.78 25b1e232-0d3c-4742-82b6-927b2a091f1b -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 fe9a021c-3148-41f7-a04b-97442a7eae73 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 43a1c948-8c32-46b8-bb97-c8d58facb27a -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 25b1e232-0d3c-4742-82b6-927b2a091f1b -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg +13:20:19 705 145 17.04 18.92 6008414 102818 1.68 fe9a021c-3148-41f7-a04b-97442a7eae73 +13:20:19 2496 845 25.29 46.57 19051710 150338 0.78 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc +13:20:19 705 145 17.04 18.92 6008414 102818 1.68 43a1c948-8c32-46b8-bb97-c8d58facb27a +13:20:19 273 206 42.93 51.97 19201593 455 0.00 25b1e232-0d3c-4742-82b6-927b2a091f1b +13:20:29 1618 127 7.27 39.50 1621550 299810 15.60 fe9a021c-3148-41f7-a04b-97442a7eae73 +13:20:29 2496 845 25.29 46.57 19051710 150338 0.78 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc +13:20:29 705 145 17.04 18.92 6008414 102818 1.68 43a1c948-8c32-46b8-bb97-c8d58facb27a +13:20:29 273 206 42.93 51.97 19201593 455 0.00 25b1e232-0d3c-4742-82b6-927b2a091f1b +13:20:29 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdf +13:20:29 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sdg +13:20:39 1618 127 7.27 39.50 1621550 299810 15.60 fe9a021c-3148-41f7-a04b-97442a7eae73 +13:20:39 2496 845 25.29 46.57 19051710 150338 0.78 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc +13:20:39 705 145 17.04 18.92 6008414 102818 1.68 43a1c948-8c32-46b8-bb97-c8d58facb27a +13:20:39 273 206 42.93 51.97 19201593 455 0.00 25b1e232-0d3c-4742-82b6-927b2a091f1b +13:20:39 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdf +13:20:39 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sdg +13:20:49 705 145 17.04 18.92 6008414 102818 1.68 fe9a021c-3148-41f7-a04b-97442a7eae73 +13:20:49 273 206 42.93 51.97 19201593 455 0.00 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc +13:20:49 1618 127 7.27 39.50 1621550 299810 15.60 43a1c948-8c32-46b8-bb97-c8d58facb27a +13:20:49 2496 845 25.29 46.57 19051710 150338 0.78 25b1e232-0d3c-4742-82b6-927b2a091f1b +Summary: 705 145 17.04 18.92 6008414 102818 1.68 fe9a021c-3148-41f7-a04b-97442a7eae73 +Summary: 273 206 42.93 51.97 19201593 455 0.00 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 43a1c948-8c32-46b8-bb97-c8d58facb27a +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 25b1e232-0d3c-4742-82b6-927b2a091f1b +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdf +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sdg 13:37:29 LINUX RESTART (9 CPU) 13:54:09 LINUX RESTART (10 CPU) 13:54:15 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM -13:54:35 85582 7774 8.33 13.45 6008414 102818 1.68 fe9a021c-3148-41f7-a04b-97442a7eae73 -13:54:35 279700 15464 5.24 10.33 19201593 455 0.00 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc -13:54:35 11154 18247 62.06 67.22 1621550 299810 15.60 43a1c948-8c32-46b8-bb97-c8d58facb27a -13:54:35 279061 16103 5.46 10.54 19051710 150338 0.78 25b1e232-0d3c-4742-82b6-927b2a091f1b -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 fe9a021c-3148-41f7-a04b-97442a7eae73 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 43a1c948-8c32-46b8-bb97-c8d58facb27a -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 25b1e232-0d3c-4742-82b6-927b2a091f1b +13:54:35 705 145 17.04 18.92 6008414 102818 1.68 fe9a021c-3148-41f7-a04b-97442a7eae73 +13:54:35 273 206 42.93 51.97 19201593 455 0.00 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc +13:54:35 1618 127 7.27 39.50 1621550 299810 15.60 43a1c948-8c32-46b8-bb97-c8d58facb27a +13:54:35 2496 845 25.29 46.57 19051710 150338 0.78 25b1e232-0d3c-4742-82b6-927b2a091f1b +Summary: 705 145 17.04 18.92 6008414 102818 1.68 fe9a021c-3148-41f7-a04b-97442a7eae73 +Summary: 273 206 42.93 51.97 19201593 455 0.00 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 43a1c948-8c32-46b8-bb97-c8d58facb27a +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 25b1e232-0d3c-4742-82b6-927b2a091f1b diff --git a/tests/expected.sar-FMOUNT-jUUID b/tests/expected.sar-FMOUNT-jUUID index 50fae51..9bf04d5 100644 --- a/tests/expected.sar-FMOUNT-jUUID +++ b/tests/expected.sar-FMOUNT-jUUID @@ -1,43 +1,43 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused MOUNTPOINT -13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 / -13:20:19 279061 16103 5.46 10.54 19051710 150338 0.78 /opt -13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /home -13:20:19 279700 15464 5.24 10.33 19201593 455 0.00 /data -13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 / -13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /opt -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /home -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /data -13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 /foo -13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /bar -13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 / -13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /opt -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /home -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /data -13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 /foo -13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /bar -13:20:49 85582 7774 8.33 13.45 6008414 102818 1.68 / -13:20:49 279700 15464 5.24 10.33 19201593 455 0.00 /opt -13:20:49 11154 18247 62.06 67.22 1621550 299810 15.60 /home -13:20:49 279061 16103 5.46 10.54 19051710 150338 0.78 /data -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 / -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /opt -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /home -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /data -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /foo -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /bar +13:20:19 705 145 17.04 18.92 6008414 102818 1.68 / +13:20:19 2496 845 25.29 46.57 19051710 150338 0.78 /opt +13:20:19 705 145 17.04 18.92 6008414 102818 1.68 /home +13:20:19 273 206 42.93 51.97 19201593 455 0.00 /data +13:20:29 1618 127 7.27 39.50 1621550 299810 15.60 / +13:20:29 2496 845 25.29 46.57 19051710 150338 0.78 /opt +13:20:29 705 145 17.04 18.92 6008414 102818 1.68 /home +13:20:29 273 206 42.93 51.97 19201593 455 0.00 /data +13:20:29 1618 127 7.27 39.50 1621550 299810 15.60 /foo +13:20:29 2496 845 25.29 46.57 19051710 150338 0.78 /bar +13:20:39 1618 127 7.27 39.50 1621550 299810 15.60 / +13:20:39 2496 845 25.29 46.57 19051710 150338 0.78 /opt +13:20:39 705 145 17.04 18.92 6008414 102818 1.68 /home +13:20:39 273 206 42.93 51.97 19201593 455 0.00 /data +13:20:39 1618 127 7.27 39.50 1621550 299810 15.60 /foo +13:20:39 2496 845 25.29 46.57 19051710 150338 0.78 /bar +13:20:49 705 145 17.04 18.92 6008414 102818 1.68 / +13:20:49 273 206 42.93 51.97 19201593 455 0.00 /opt +13:20:49 1618 127 7.27 39.50 1621550 299810 15.60 /home +13:20:49 2496 845 25.29 46.57 19051710 150338 0.78 /data +Summary: 705 145 17.04 18.92 6008414 102818 1.68 / +Summary: 273 206 42.93 51.97 19201593 455 0.00 /opt +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 /home +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /data +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 /foo +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /bar 13:37:29 LINUX RESTART (9 CPU) 13:54:09 LINUX RESTART (10 CPU) 13:54:15 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused MOUNTPOINT -13:54:35 85582 7774 8.33 13.45 6008414 102818 1.68 / -13:54:35 279700 15464 5.24 10.33 19201593 455 0.00 /opt -13:54:35 11154 18247 62.06 67.22 1621550 299810 15.60 /home -13:54:35 279061 16103 5.46 10.54 19051710 150338 0.78 /data -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 / -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /opt -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /home -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /data +13:54:35 705 145 17.04 18.92 6008414 102818 1.68 / +13:54:35 273 206 42.93 51.97 19201593 455 0.00 /opt +13:54:35 1618 127 7.27 39.50 1621550 299810 15.60 /home +13:54:35 2496 845 25.29 46.57 19051710 150338 0.78 /data +Summary: 705 145 17.04 18.92 6008414 102818 1.68 / +Summary: 273 206 42.93 51.97 19201593 455 0.00 /opt +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 /home +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /data diff --git a/tests/expected.sar-all b/tests/expected.sar-all index 763c840..4a1b765 100644 --- a/tests/expected.sar-all +++ b/tests/expected.sar-all @@ -2927,31 +2927,31 @@ Average: 6 3492.22 Average: 7 3497.56 13:20:09 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM -13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -13:20:19 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 -13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:20:19 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda9 -13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf -13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg -13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda9 -13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf -13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg -13:20:49 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -13:20:49 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -13:20:49 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 -13:20:49 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg +13:20:19 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +13:20:19 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda7 +13:20:19 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda12 +13:20:19 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 +13:20:29 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda9 +13:20:29 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda7 +13:20:29 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda12 +13:20:29 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 +13:20:29 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdf +13:20:29 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sdg +13:20:39 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda9 +13:20:39 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda7 +13:20:39 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda12 +13:20:39 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 +13:20:39 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdf +13:20:39 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sdg +13:20:49 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +13:20:49 273 206 42.93 51.97 19201593 455 0.00 /dev/sda7 +13:20:49 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda12 +13:20:49 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda6 +Summary: 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +Summary: 273 206 42.93 51.97 19201593 455 0.00 /dev/sda7 +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda12 +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda6 +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdf +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sdg 13:37:29 LINUX RESTART (9 CPU) diff --git a/tests/expected.sar-dec b/tests/expected.sar-dec index a31956f..ec40548 100644 --- a/tests/expected.sar-dec +++ b/tests/expected.sar-dec @@ -2927,32 +2927,32 @@ Average: 6 3492 Average: 7 3498 13:20:09 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM -13:20:19 85582 7774 8 13 6008414 102818 2 /dev/sda9 -13:20:19 279061 16103 5 11 19051710 150338 1 /dev/sda7 -13:20:19 85582 7774 8 13 6008414 102818 2 /dev/sda12 -13:20:19 279700 15464 5 10 19201593 455 0 /dev/sda6 -13:20:29 11154 18247 62 67 1621550 299810 16 /dev/sda9 -13:20:29 279061 16103 5 11 19051710 150338 1 /dev/sda7 -13:20:29 85582 7774 8 13 6008414 102818 2 /dev/sda12 -13:20:29 279700 15464 5 10 19201593 455 0 /dev/sda6 -13:20:29 11154 18247 62 67 1621550 299810 16 /dev/sdf -13:20:29 279061 16103 5 11 19051710 150338 1 /dev/sdg -13:20:39 11154 18247 62 67 1621550 299810 16 /dev/sda9 -13:20:39 279061 16103 5 11 19051710 150338 1 /dev/sda7 -13:20:39 85582 7774 8 13 6008414 102818 2 /dev/sda12 -13:20:39 279700 15464 5 10 19201593 455 0 /dev/sda6 -13:20:39 11154 18247 62 67 1621550 299810 16 /dev/sdf -13:20:39 279061 16103 5 11 19051710 150338 1 /dev/sdg -13:20:49 85582 7774 8 13 6008414 102818 2 /dev/sda9 -13:20:49 279700 15464 5 10 19201593 455 0 /dev/sda7 -13:20:49 11154 18247 62 67 1621550 299810 16 /dev/sda12 -13:20:49 279061 16103 5 11 19051710 150338 1 /dev/sda6 -Summary: 85582 7774 8 13 6008414 102818 2 /dev/sda9 -Summary: 279700 15464 5 10 19201593 455 0 /dev/sda7 -Summary: 11154 18247 62 67 1621550 299810 16 /dev/sda12 -Summary: 279061 16103 5 11 19051710 150338 1 /dev/sda6 -Summary: 11154 18247 62 67 1621550 299810 16 /dev/sdf -Summary: 279061 16103 5 11 19051710 150338 1 /dev/sdg +13:20:19 705 145 17 19 6008414 102818 2 /dev/sda9 +13:20:19 2496 845 25 47 19051710 150338 1 /dev/sda7 +13:20:19 705 145 17 19 6008414 102818 2 /dev/sda12 +13:20:19 273 206 43 52 19201593 455 0 /dev/sda6 +13:20:29 1618 127 7 40 1621550 299810 16 /dev/sda9 +13:20:29 2496 845 25 47 19051710 150338 1 /dev/sda7 +13:20:29 705 145 17 19 6008414 102818 2 /dev/sda12 +13:20:29 273 206 43 52 19201593 455 0 /dev/sda6 +13:20:29 1618 127 7 40 1621550 299810 16 /dev/sdf +13:20:29 2496 845 25 47 19051710 150338 1 /dev/sdg +13:20:39 1618 127 7 40 1621550 299810 16 /dev/sda9 +13:20:39 2496 845 25 47 19051710 150338 1 /dev/sda7 +13:20:39 705 145 17 19 6008414 102818 2 /dev/sda12 +13:20:39 273 206 43 52 19201593 455 0 /dev/sda6 +13:20:39 1618 127 7 40 1621550 299810 16 /dev/sdf +13:20:39 2496 845 25 47 19051710 150338 1 /dev/sdg +13:20:49 705 145 17 19 6008414 102818 2 /dev/sda9 +13:20:49 273 206 43 52 19201593 455 0 /dev/sda7 +13:20:49 1618 127 7 40 1621550 299810 16 /dev/sda12 +13:20:49 2496 845 25 47 19051710 150338 1 /dev/sda6 +Summary: 705 145 17 19 6008414 102818 2 /dev/sda9 +Summary: 273 206 43 52 19201593 455 0 /dev/sda7 +Summary: 1618 127 7 40 1621550 299810 16 /dev/sda12 +Summary: 2496 845 25 47 19051710 150338 1 /dev/sda6 +Summary: 1618 127 7 40 1621550 299810 16 /dev/sdf +Summary: 2496 845 25 47 19051710 150338 1 /dev/sdg 13:20:09 %scpu-10 %scpu-60 %scpu-300 %scpu 13:20:19 0 0 0 0 @@ -4214,14 +4214,14 @@ Average: 8 3498 Average: 9 3498 13:54:15 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM -13:54:35 85582 7774 8 13 6008414 102818 2 /dev/sda9 -13:54:35 279700 15464 5 10 19201593 455 0 /dev/sda7 -13:54:35 11154 18247 62 67 1621550 299810 16 /dev/sda12 -13:54:35 279061 16103 5 11 19051710 150338 1 /dev/sda6 -Summary: 85582 7774 8 13 6008414 102818 2 /dev/sda9 -Summary: 279700 15464 5 10 19201593 455 0 /dev/sda7 -Summary: 11154 18247 62 67 1621550 299810 16 /dev/sda12 -Summary: 279061 16103 5 11 19051710 150338 1 /dev/sda6 +13:54:35 705 145 17 19 6008414 102818 2 /dev/sda9 +13:54:35 273 206 43 52 19201593 455 0 /dev/sda7 +13:54:35 1618 127 7 40 1621550 299810 16 /dev/sda12 +13:54:35 2496 845 25 47 19051710 150338 1 /dev/sda6 +Summary: 705 145 17 19 6008414 102818 2 /dev/sda9 +Summary: 273 206 43 52 19201593 455 0 /dev/sda7 +Summary: 1618 127 7 40 1621550 299810 16 /dev/sda12 +Summary: 2496 845 25 47 19051710 150338 1 /dev/sda6 13:54:15 %scpu-10 %scpu-60 %scpu-300 %scpu 13:54:35 0 0 0 0 diff --git a/tests/expected.sar-ext-hl b/tests/expected.sar-ext-hl index 9ae92db..42f65ff 100644 --- a/tests/expected.sar-ext-hl +++ b/tests/expected.sar-ext-hl @@ -82,28 +82,28 @@ Average: wlp5s0 0.00 0.00 0.00 0.00 0.00 0.0 Average: wlp5s1 0.15 0.05 0.01 0.00 0.00 0.00 0.00 0.00 13:20:15 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM -13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -13:20:19 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 -13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:20:19 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:23 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda9 -13:20:23 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda7 -13:20:23 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda12 -13:20:23 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda6 -13:20:23 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sdf -13:20:23 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdg -13:20:27 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda9 -13:20:27 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda7 -13:20:27 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda12 -13:20:27 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda6 -13:20:27 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sdf -13:20:27 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdg -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda9 -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda7 -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda12 -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda6 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sdf -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdg +13:20:19 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +13:20:19 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda7 +13:20:19 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda12 +13:20:19 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 +13:20:23 273 206 42.93 51.97 19201593 455 0.00 /dev/sda9 +13:20:23 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda7 +13:20:23 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda12 +13:20:23 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda6 +13:20:23 273 206 42.93 51.97 19201593 455 0.00 /dev/sdf +13:20:23 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdg +13:20:27 273 206 42.93 51.97 19201593 455 0.00 /dev/sda9 +13:20:27 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda7 +13:20:27 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda12 +13:20:27 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda6 +13:20:27 273 206 42.93 51.97 19201593 455 0.00 /dev/sdf +13:20:27 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdg +Summary: 273 206 42.93 51.97 19201593 455 0.00 /dev/sda9 +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda7 +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda12 +Summary: 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda6 +Summary: 273 206 42.93 51.97 19201593 455 0.00 /dev/sdf +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdg 13:22:11 LINUX RESTART (9 CPU) @@ -155,15 +155,15 @@ Average: virbr0 0.00 0.00 0.00 0.00 0.00 0.0 Average: wlp5s0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:22:21 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM -13:22:31 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -13:22:31 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 -13:22:31 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:22:31 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:22:31 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +13:22:31 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda7 +13:22:31 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda12 +13:22:31 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 13:22:35 COM Second comment! -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +Summary: 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda7 +Summary: 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda12 +Summary: 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 13:23:20 LINUX RESTART (9 CPU) @@ -239,21 +239,21 @@ Average: virbr0 0.00 0.00 0.00 0.00 0.00 0.0 Average: wlp5s0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:24:20 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM -13:24:25 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -13:24:25 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 -13:24:25 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:24:25 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 +13:24:25 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +13:24:25 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda7 +13:24:25 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda12 +13:24:25 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 13:22:46 COM Third... 13:22:47 COM and fourth comment! -13:24:30 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda9 -13:24:30 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda7 -13:24:30 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda12 -13:24:30 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda6 -13:24:30 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sdf -13:24:30 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdg -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda9 -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda7 -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda12 -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda6 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sdf -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdg +13:24:30 273 206 42.93 51.97 19201593 455 0.00 /dev/sda9 +13:24:30 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda7 +13:24:30 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda12 +13:24:30 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda6 +13:24:30 273 206 42.93 51.97 19201593 455 0.00 /dev/sdf +13:24:30 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdg +Summary: 273 206 42.93 51.97 19201593 455 0.00 /dev/sda9 +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda7 +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda12 +Summary: 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda6 +Summary: 273 206 42.93 51.97 19201593 455 0.00 /dev/sdf +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdg diff --git a/tests/expected.sar-fs b/tests/expected.sar-fs index 2113e61..225ed99 100644 --- a/tests/expected.sar-fs +++ b/tests/expected.sar-fs @@ -1,16 +1,16 @@ Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) 13:20:09 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM -13:20:19 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:49 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 +13:20:19 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 +13:20:29 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 +13:20:39 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 +13:20:49 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda6 +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda6 13:37:29 LINUX RESTART (9 CPU) 13:54:09 LINUX RESTART (10 CPU) 13:54:15 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM -13:54:35 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 +13:54:35 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda6 +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda6 diff --git a/tests/expected.sar-human b/tests/expected.sar-human index 8110035..8409ebd 100644 --- a/tests/expected.sar-human +++ b/tests/expected.sar-human @@ -2927,32 +2927,32 @@ Average: 6 3492.22 Average: 7 3497.56 13:20:09 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM -13:20:19 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda9 -13:20:19 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sda7 -13:20:19 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda12 -13:20:19 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda6 -13:20:29 10.9G 17.8G 62.1% 67.2% 1621550 299810 15.6% /dev/sda9 -13:20:29 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sda7 -13:20:29 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda12 -13:20:29 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda6 -13:20:29 10.9G 17.8G 62.1% 67.2% 1621550 299810 15.6% /dev/sdf -13:20:29 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sdg -13:20:39 10.9G 17.8G 62.1% 67.2% 1621550 299810 15.6% /dev/sda9 -13:20:39 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sda7 -13:20:39 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda12 -13:20:39 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda6 -13:20:39 10.9G 17.8G 62.1% 67.2% 1621550 299810 15.6% /dev/sdf -13:20:39 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sdg -13:20:49 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda9 -13:20:49 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda7 -13:20:49 10.9G 17.8G 62.1% 67.2% 1621550 299810 15.6% /dev/sda12 -13:20:49 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sda6 -Summary: 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda9 -Summary: 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda7 -Summary: 10.9G 17.8G 62.1% 67.2% 1621550 299810 15.6% /dev/sda12 -Summary: 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sda6 -Summary: 10.9G 17.8G 62.1% 67.2% 1621550 299810 15.6% /dev/sdf -Summary: 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sdg +13:20:19 705.2M 144.8M 17.0% 18.9% 6008414 102818 1.7% /dev/sda9 +13:20:19 2.4G 844.6M 25.3% 46.6% 19051710 150338 0.8% /dev/sda7 +13:20:19 705.2M 144.8M 17.0% 18.9% 6008414 102818 1.7% /dev/sda12 +13:20:19 273.4M 205.7M 42.9% 52.0% 19201593 455 0.0% /dev/sda6 +13:20:29 1.6G 126.7M 7.3% 39.5% 1621550 299810 15.6% /dev/sda9 +13:20:29 2.4G 844.6M 25.3% 46.6% 19051710 150338 0.8% /dev/sda7 +13:20:29 705.2M 144.8M 17.0% 18.9% 6008414 102818 1.7% /dev/sda12 +13:20:29 273.4M 205.7M 42.9% 52.0% 19201593 455 0.0% /dev/sda6 +13:20:29 1.6G 126.7M 7.3% 39.5% 1621550 299810 15.6% /dev/sdf +13:20:29 2.4G 844.6M 25.3% 46.6% 19051710 150338 0.8% /dev/sdg +13:20:39 1.6G 126.7M 7.3% 39.5% 1621550 299810 15.6% /dev/sda9 +13:20:39 2.4G 844.6M 25.3% 46.6% 19051710 150338 0.8% /dev/sda7 +13:20:39 705.2M 144.8M 17.0% 18.9% 6008414 102818 1.7% /dev/sda12 +13:20:39 273.4M 205.7M 42.9% 52.0% 19201593 455 0.0% /dev/sda6 +13:20:39 1.6G 126.7M 7.3% 39.5% 1621550 299810 15.6% /dev/sdf +13:20:39 2.4G 844.6M 25.3% 46.6% 19051710 150338 0.8% /dev/sdg +13:20:49 705.2M 144.8M 17.0% 18.9% 6008414 102818 1.7% /dev/sda9 +13:20:49 273.4M 205.7M 42.9% 52.0% 19201593 455 0.0% /dev/sda7 +13:20:49 1.6G 126.7M 7.3% 39.5% 1621550 299810 15.6% /dev/sda12 +13:20:49 2.4G 844.6M 25.3% 46.6% 19051710 150338 0.8% /dev/sda6 +Summary: 705.2M 144.8M 17.0% 18.9% 6008414 102818 1.7% /dev/sda9 +Summary: 273.4M 205.7M 42.9% 52.0% 19201593 455 0.0% /dev/sda7 +Summary: 1.6G 126.7M 7.3% 39.5% 1621550 299810 15.6% /dev/sda12 +Summary: 2.4G 844.6M 25.3% 46.6% 19051710 150338 0.8% /dev/sda6 +Summary: 1.6G 126.7M 7.3% 39.5% 1621550 299810 15.6% /dev/sdf +Summary: 2.4G 844.6M 25.3% 46.6% 19051710 150338 0.8% /dev/sdg 13:20:09 %scpu-10 %scpu-60 %scpu-300 %scpu 13:20:19 0.0% 0.0% 0.0% 0.0% @@ -4214,14 +4214,14 @@ Average: 8 3497.56 Average: 9 3497.56 13:54:15 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM -13:54:35 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda9 -13:54:35 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda7 -13:54:35 10.9G 17.8G 62.1% 67.2% 1621550 299810 15.6% /dev/sda12 -13:54:35 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sda6 -Summary: 83.6G 7.6G 8.3% 13.5% 6008414 102818 1.7% /dev/sda9 -Summary: 273.1G 15.1G 5.2% 10.3% 19201593 455 0.0% /dev/sda7 -Summary: 10.9G 17.8G 62.1% 67.2% 1621550 299810 15.6% /dev/sda12 -Summary: 272.5G 15.7G 5.5% 10.5% 19051710 150338 0.8% /dev/sda6 +13:54:35 705.2M 144.8M 17.0% 18.9% 6008414 102818 1.7% /dev/sda9 +13:54:35 273.4M 205.7M 42.9% 52.0% 19201593 455 0.0% /dev/sda7 +13:54:35 1.6G 126.7M 7.3% 39.5% 1621550 299810 15.6% /dev/sda12 +13:54:35 2.4G 844.6M 25.3% 46.6% 19051710 150338 0.8% /dev/sda6 +Summary: 705.2M 144.8M 17.0% 18.9% 6008414 102818 1.7% /dev/sda9 +Summary: 273.4M 205.7M 42.9% 52.0% 19201593 455 0.0% /dev/sda7 +Summary: 1.6G 126.7M 7.3% 39.5% 1621550 299810 15.6% /dev/sda12 +Summary: 2.4G 844.6M 25.3% 46.6% 19051710 150338 0.8% /dev/sda6 13:54:15 %scpu-10 %scpu-60 %scpu-300 %scpu 13:54:35 0.0% 0.0% 0.0% 0.0% diff --git a/tests/expected1.sadf-g b/tests/expected1.sadf-g index c60efc4..6872a45 100644 --- a/tests/expected1.sadf-g +++ b/tests/expected1.sadf-g @@ -9,18 +9,16 @@ (Min, Max values) -MBfsfree (11154, 85582) -MBfsused (7774, 18247) +MBfsfree (705, 1618) +MBfsused (127, 145) 0. - -20000. - -40000. - -60000. - -80000. + +500. + +1000. + +1500. 13:20:09 @@ -44,16 +42,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/] (Min, Max values) -%ufsused (13.45, 67.22) -%fsused (8.33, 62.06) +%ufsused (18.92, 39.50) +%fsused (7.27, 17.04) 0. @@ -88,10 +86,10 @@ 13:54:29 UTC - + - + @@ -185,16 +183,16 @@ (Min, Max values) -MBfsfree (279061, 279700) -MBfsused (15464, 16103) +MBfsfree (273, 2496) +MBfsused (206, 845) 0. - -90000. - -180000. - -270000. + +800. + +1600. + +2400. 13:20:09 @@ -218,16 +216,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/opt] (Min, Max values) -%ufsused (10.33, 10.54) -%fsused (5.24, 5.46) +%ufsused (46.57, 51.97) +%fsused (25.29, 42.93) 0. @@ -262,10 +260,10 @@ 13:54:29 UTC - + - + @@ -359,18 +357,16 @@ (Min, Max values) -MBfsfree (11154, 85582) -MBfsused (7774, 18247) +MBfsfree (705, 1618) +MBfsused (127, 145) 0. - -20000. - -40000. - -60000. - -80000. + +500. + +1000. + +1500. 13:20:09 @@ -394,16 +390,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/home] (Min, Max values) -%ufsused (13.45, 67.22) -%fsused (8.33, 62.06) +%ufsused (18.92, 39.50) +%fsused (7.27, 17.04) 0. @@ -438,10 +434,10 @@ 13:54:29 UTC - + - + @@ -535,16 +531,16 @@ (Min, Max values) -MBfsfree (279061, 279700) -MBfsused (15464, 16103) +MBfsfree (273, 2496) +MBfsused (206, 845) 0. - -90000. - -180000. - -270000. + +800. + +1600. + +2400. 13:20:09 @@ -568,16 +564,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/data] (Min, Max values) -%ufsused (10.33, 10.54) -%fsused (5.24, 5.46) +%ufsused (46.57, 51.97) +%fsused (25.29, 42.93) 0. @@ -612,10 +608,10 @@ 13:54:29 UTC - + - + @@ -709,16 +705,16 @@ (Min, Max values) -MBfsfree (11154, 11154) -MBfsused (18247, 18247) +MBfsfree (1618, 1618) +MBfsused (127, 127) 0. - -6000. - -12000. - -18000. + +500. + +1000. + +1500. 13:20:09 @@ -742,16 +738,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/foo] (Min, Max values) -%ufsused (67.22, 67.22) -%fsused (62.06, 62.06) +%ufsused (39.50, 39.50) +%fsused (7.27, 7.27) 0. @@ -786,10 +782,10 @@ 13:54:29 UTC - + - + @@ -883,16 +879,16 @@ (Min, Max values) -MBfsfree (279061, 279061) -MBfsused (16103, 16103) +MBfsfree (2496, 2496) +MBfsused (845, 845) 0. - -90000. - -180000. - -270000. + +800. + +1600. + +2400. 13:20:09 @@ -916,16 +912,16 @@ 13:54:29 UTC - - + + Filesystems statistics (2) [/bar] (Min, Max values) -%ufsused (10.54, 10.54) -%fsused (5.46, 5.46) +%ufsused (46.57, 46.57) +%fsused (25.29, 25.29) 0. @@ -960,10 +956,10 @@ 13:54:29 UTC - + - + diff --git a/tests/expected2.sadf-g b/tests/expected2.sadf-g index eefba0f..0bf5ea9 100644 --- a/tests/expected2.sadf-g +++ b/tests/expected2.sadf-g @@ -5724,21 +5724,19 @@ (Min, Max values) -MBfsfree (11154, 85582) -MBfsused (7774, 18247) +MBfsfree (705, 1618) +MBfsused x10 (1267, 1448) SYSSTAT.TEST 04/18/19 0. - -20000. - -40000. - -60000. - -80000. + +500. + +1000. + +1500. 0:00 @@ -5765,16 +5763,16 @@ 22:00 0:00 - - + + Filesystems statistics (2) [/dev/sda9] (Min, Max values) -%ufsused (13.45, 67.22) -%fsused (8.33, 62.06) +%ufsused (18.92, 39.50) +%fsused (7.27, 17.04) SYSSTAT.TEST 04/18/19 @@ -5815,10 +5813,10 @@ 0:00 - + - + @@ -5924,19 +5922,19 @@ (Min, Max values) -MBfsfree (279061, 279700) -MBfsused x10 (154645, 161034) +MBfsfree (273, 2496) +MBfsused (206, 845) SYSSTAT.TEST 04/18/19 0. - -90000. - -180000. - -270000. + +800. + +1600. + +2400. 0:00 @@ -5963,16 +5961,16 @@ 22:00 0:00 - - + + Filesystems statistics (2) [/dev/sda7] (Min, Max values) -%ufsused (10.33, 10.54) -%fsused (5.24, 5.46) +%ufsused (46.57, 51.97) +%fsused (25.29, 42.93) SYSSTAT.TEST 04/18/19 @@ -6013,10 +6011,10 @@ 0:00 - + - + @@ -6122,21 +6120,19 @@ (Min, Max values) -MBfsfree (11154, 85582) -MBfsused (7774, 18247) +MBfsfree (705, 1618) +MBfsused x10 (1267, 1448) SYSSTAT.TEST 04/18/19 0. - -20000. - -40000. - -60000. - -80000. + +500. + +1000. + +1500. 0:00 @@ -6163,16 +6159,16 @@ 22:00 0:00 - - + + Filesystems statistics (2) [/dev/sda12] (Min, Max values) -%ufsused (13.45, 67.22) -%fsused (8.33, 62.06) +%ufsused (18.92, 39.50) +%fsused (7.27, 17.04) SYSSTAT.TEST 04/18/19 @@ -6213,10 +6209,10 @@ 0:00 - + - + @@ -6322,19 +6318,19 @@ (Min, Max values) -MBfsfree (279061, 279700) -MBfsused x10 (154645, 161034) +MBfsfree (273, 2496) +MBfsused (206, 845) SYSSTAT.TEST 04/18/19 0. - -90000. - -180000. - -270000. + +800. + +1600. + +2400. 0:00 @@ -6361,16 +6357,16 @@ 22:00 0:00 - - + + Filesystems statistics (2) [/dev/sda6] (Min, Max values) -%ufsused (10.33, 10.54) -%fsused (5.24, 5.46) +%ufsused (46.57, 51.97) +%fsused (25.29, 42.93) SYSSTAT.TEST 04/18/19 @@ -6411,10 +6407,10 @@ 0:00 - + - + @@ -6520,19 +6516,19 @@ (Min, Max values) -MBfsfree (11154, 11154) -MBfsused (18247, 18247) +MBfsfree (1618, 1618) +MBfsused x10 (1267, 1267) SYSSTAT.TEST 04/18/19 0. - -6000. - -12000. - -18000. + +500. + +1000. + +1500. 0:00 @@ -6559,16 +6555,16 @@ 22:00 0:00 - - + + Filesystems statistics (2) [/dev/sdf] (Min, Max values) -%ufsused (67.22, 67.22) -%fsused (62.06, 62.06) +%ufsused (39.50, 39.50) +%fsused (7.27, 7.27) SYSSTAT.TEST 04/18/19 @@ -6609,10 +6605,10 @@ 0:00 - + - + @@ -6718,19 +6714,19 @@ (Min, Max values) -MBfsfree (279061, 279061) -MBfsused x10 (161034, 161034) +MBfsfree (2496, 2496) +MBfsused (845, 845) SYSSTAT.TEST 04/18/19 0. - -90000. - -180000. - -270000. + +800. + +1600. + +2400. 0:00 @@ -6757,16 +6753,16 @@ 22:00 0:00 - - + + Filesystems statistics (2) [/dev/sdg] (Min, Max values) -%ufsused (10.54, 10.54) -%fsused (5.46, 5.46) +%ufsused (46.57, 46.57) +%fsused (25.29, 25.29) SYSSTAT.TEST 04/18/19 @@ -6807,10 +6803,10 @@ 0:00 - + - + diff --git a/tests/expected2.sar-all b/tests/expected2.sar-all index 5850c87..d29b1c4 100644 --- a/tests/expected2.sar-all +++ b/tests/expected2.sar-all @@ -2927,32 +2927,32 @@ Average: 6 3492.22 Average: 7 3497.56 13:20:09 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM -13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -13:20:19 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 -13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:20:19 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda9 -13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf -13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg -13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda9 -13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf -13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg -13:20:49 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -13:20:49 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -13:20:49 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 -13:20:49 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg +13:20:19 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +13:20:19 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda7 +13:20:19 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda12 +13:20:19 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 +13:20:29 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda9 +13:20:29 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda7 +13:20:29 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda12 +13:20:29 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 +13:20:29 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdf +13:20:29 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sdg +13:20:39 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda9 +13:20:39 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda7 +13:20:39 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda12 +13:20:39 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 +13:20:39 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdf +13:20:39 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sdg +13:20:49 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +13:20:49 273 206 42.93 51.97 19201593 455 0.00 /dev/sda7 +13:20:49 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda12 +13:20:49 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda6 +Summary: 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +Summary: 273 206 42.93 51.97 19201593 455 0.00 /dev/sda7 +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda12 +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda6 +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdf +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sdg 13:20:09 %scpu-10 %scpu-60 %scpu-300 %scpu 13:20:19 0.00 0.00 0.00 0.03 @@ -4214,14 +4214,14 @@ Average: 8 3497.56 Average: 9 3497.56 13:54:15 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM -13:54:35 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -13:54:35 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -13:54:35 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 -13:54:35 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 +13:54:35 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +13:54:35 273 206 42.93 51.97 19201593 455 0.00 /dev/sda7 +13:54:35 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda12 +13:54:35 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda6 +Summary: 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +Summary: 273 206 42.93 51.97 19201593 455 0.00 /dev/sda7 +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda12 +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda6 13:54:15 %scpu-10 %scpu-60 %scpu-300 %scpu 13:54:35 0.00 0.00 0.00 0.00 diff --git a/tests/expected3.sar-all b/tests/expected3.sar-all index 8654f75..5032ca7 100644 --- a/tests/expected3.sar-all +++ b/tests/expected3.sar-all @@ -380,32 +380,32 @@ Average: 3 0.00 0.00 0.00 0.00 0.00 Average: 3 3566.22 13:20:09 MBfsfree MBfsused %fsused %ufsused Ifree Iused %Iused FILESYSTEM -13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -13:20:19 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 -13:20:19 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:20:19 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda9 -13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 -13:20:29 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:20:29 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:29 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf -13:20:29 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg -13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda9 -13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda7 -13:20:39 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda12 -13:20:39 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda6 -13:20:39 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf -13:20:39 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg -13:20:49 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -13:20:49 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -13:20:49 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 -13:20:49 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 -Summary: 85582 7774 8.33 13.45 6008414 102818 1.68 /dev/sda9 -Summary: 279700 15464 5.24 10.33 19201593 455 0.00 /dev/sda7 -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sda12 -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sda6 -Summary: 11154 18247 62.06 67.22 1621550 299810 15.60 /dev/sdf -Summary: 279061 16103 5.46 10.54 19051710 150338 0.78 /dev/sdg +13:20:19 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +13:20:19 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda7 +13:20:19 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda12 +13:20:19 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 +13:20:29 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda9 +13:20:29 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda7 +13:20:29 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda12 +13:20:29 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 +13:20:29 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdf +13:20:29 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sdg +13:20:39 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda9 +13:20:39 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda7 +13:20:39 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda12 +13:20:39 273 206 42.93 51.97 19201593 455 0.00 /dev/sda6 +13:20:39 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdf +13:20:39 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sdg +13:20:49 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +13:20:49 273 206 42.93 51.97 19201593 455 0.00 /dev/sda7 +13:20:49 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda12 +13:20:49 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda6 +Summary: 705 145 17.04 18.92 6008414 102818 1.68 /dev/sda9 +Summary: 273 206 42.93 51.97 19201593 455 0.00 /dev/sda7 +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sda12 +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sda6 +Summary: 1618 127 7.27 39.50 1621550 299810 15.60 /dev/sdf +Summary: 2496 845 25.29 46.57 19051710 150338 0.78 /dev/sdg 13:20:09 %scpu-10 %scpu-60 %scpu-300 %scpu 13:20:19 0.00 0.00 0.00 0.03