From: Sebastien GODARD Date: Tue, 24 Nov 2020 17:02:45 +0000 (+0100) Subject: Add new and update existing non regression tests X-Git-Tag: v12.5.2~16 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c03fbde176955e6e8598c79ec8e60fbf68cf6248;p=sysstat Add new and update existing non regression tests Signed-off-by: Sebastien GODARD --- diff --git a/tests/01800 b/tests/01800 new file mode 100644 index 0000000..b0cf621 --- /dev/null +++ b/tests/01800 @@ -0,0 +1,54 @@ +rm -f tests/datax.tmp + +rm -f tests/root +ln -s root1 tests/root +TZ=GMT ./sadc --unix_time=1555593609 -S A_NULL,A_CPU,A_IRQ,A_NET_DEV,A_FS,A_PCSW tests/datax.tmp +TZ=GMT ./sadc --unix_time=1555593613 tests/datax.tmp -C "First comment!" >/dev/null +TZ=GMT ./sadc --unix_time=1555593615 tests/datax.tmp 1 1 >/dev/null + +rm -f tests/root +ln -s root2 tests/root +TZ=GMT ./sadc --unix_time=1555593619 tests/datax.tmp 1 1 >/dev/null + +rm -f tests/root +ln -s root3 tests/root +TZ=GMT ./sadc --unix_time=1555593623 tests/datax.tmp 1 1 >/dev/null + +rm -f tests/root +ln -s root4 tests/root +TZ=GMT ./sadc --unix_time=1555593627 tests/datax.tmp 1 1 >/dev/null + +# LINUX RESTART +rm -f tests/root +ln -s root1 tests/root +TZ=GMT ./sadc --unix_time=1555593731 tests/datax.tmp >/dev/null +TZ=GMT ./sadc --unix_time=1555593741 tests/datax.tmp 1 1 >/dev/null + +rm -f tests/root +ln -s root2 tests/root +TZ=GMT ./sadc --unix_time=1555593751 tests/datax.tmp 1 1 >/dev/null +TZ=GMT ./sadc --unix_time=1555593755 tests/datax.tmp -C "Second comment!" >/dev/null + +#LINUX RESTART +rm -f tests/root +ln -s root1 tests/root +TZ=GMT ./sadc --unix_time=1555593800 tests/datax.tmp >/dev/null +TZ=GMT ./sadc --unix_time=1555593808 tests/datax.tmp 1 1 >/dev/null + +#LINUX RESTART +rm -f tests/root +ln -s root1 tests/root +TZ=GMT ./sadc --unix_time=1555593850 tests/datax.tmp >/dev/null +TZ=GMT ./sadc --unix_time=1555593852 tests/datax.tmp >/dev/null +TZ=GMT ./sadc --unix_time=1555593860 tests/datax.tmp 1 1 >/dev/null + +rm -f tests/root +ln -s root2 tests/root +TZ=GMT ./sadc --unix_time=1555593865 tests/datax.tmp 1 1 >/dev/null + +TZ=GMT ./sadc --unix_time=1555593766 tests/datax.tmp -C "Third..." >/dev/null +TZ=GMT ./sadc --unix_time=1555593767 tests/datax.tmp -C "and fourth comment!" >/dev/null + +rm -f tests/root +ln -s root3 tests/root +TZ=GMT ./sadc --unix_time=1555593870 tests/datax.tmp 1 1 >/dev/null diff --git a/tests/01810 b/tests/01810 new file mode 100644 index 0000000..1b216e0 --- /dev/null +++ b/tests/01810 @@ -0,0 +1 @@ +LC_ALL=C TZ=GMT ./sar -C -P ALL -uw -n DEV -F -I 2,3 -f tests/datax.tmp > tests/out.sar-ext-hl.tmp && diff -u tests/expected.sar-ext-hl tests/out.sar-ext-hl.tmp diff --git a/tests/TLIST b/tests/TLIST index 9813b0c..8af3de8 100644 --- a/tests/TLIST +++ b/tests/TLIST @@ -11,7 +11,7 @@ NOTES: 00016 ./tapestat -V >/dev/null 00017 ./cifsiostat -V >/dev/null -===== Creating data.tmp +===== Creating data.tmp [.....RC] 00100 5 x TZ=GMT ./sadc --unix_time=XXXXXXXXX -S XALL,-A_PWR_FAN,-A_PWR_IN,-A_PWR_TEMP,-A_PWR_FREQ tests/data.tmp 1 1 >/dev/null 00110 TZ=GMT ./sadc --unix_time=XXXXXXXXX tests/data.tmp 00120 TZ=GMT ./sadc --unix_time=1555594749 -C "Testing sysstat!" tests/data.tmp @@ -23,7 +23,7 @@ NOTES: 00132 LC_ALL=C TZ=GMT ./sar -A -I 2-5 -P 3 -f tests/data.tmp > tests/out3.sar-all.tmp [Check that -A doesn't necessarily imply -I ALL -P ALL] -===== Appending data to data.tmp +===== Appending data to data.tmp [.....RCR..] 00140 TZ=GMT ./sadc --unix_time=1555595649 tests/data.tmp 00150 2 x TZ=GMT ./sadc --unix_time=XXXXXXXXX -S XALL tests/data.tmp 1 1 >/dev/null @@ -160,7 +160,7 @@ NOTES: 00980 4 x TZ=GMT ./sadc --unix_time=xxxxxxx tests/data1.tmp 1 1 >/dev/null 00982 LC_ALL=C TZ=GMT ./sar -f tests/data1.tmp -q ALL > tests/out2.sar-q.tmp -===== Creating data0.tmp and data1.tmp with no data inside +===== Creating data0.tmp [R] and data1.tmp [..R..] with no data inside 01000 TZ=GMT ./sadc --unix_time=1555593609 -S A_NULL,A_PCSW tests/data0.tmp >/dev/null 01010 4 x TZ=GMT ./sadc --unix_time=xxxxxxx tests/data1.tmp 1 1 >/dev/null 01012 LC_ALL=C TZ=GMT ./sar -f tests/data1.tmp -q ALL > tests/out2.sar-qALL.tmp @@ -175,7 +175,7 @@ NOTES: 01145 LC_ALL=C ./sadf tests/data0.tmp 2>&1 | grep "Requested activities not available" >/dev/null 01150 LC_ALL=C ./sadf -g tests/data0.tmp -- -A > tests/out0.sadf-g.tmp -===== Append data to data0.tmp then read its contents +===== Append data to data0.tmp [RR.] then read its contents 01200 2 x TZ=GMT ./sadc --unix_time=xxxxxxxxx [ -S XALL ] tests/data0.tmp [ 1 1 ] >/dev/null 01210 LC_ALL=C TZ=GMT ./sar -A -f tests/data0.tmp > tests/out01.sar-A.tmp 01220 ./sadf -d tests/data0.tmp -- -A > tests/out01.sadf-d.tmp @@ -251,6 +251,10 @@ NOTES: 01720 LC_ALL=C TZ=GMT ./sar -P ALL -u -n SOFT 2 3 > tests/out.sar-cpu8off.tmp [CPU#8 - Last in list - already offline] +===== Creating datax.tmp [RC....R..CR.RR..CC.] +01800 n x TZ=GMT ./sadc --unix_time=xxxxxxxxxx tests/datax.tmp (...) +01810 LC_ALL=C TZ=GMT ./sar -C -P ALL -uw -n DEV -F -I 2,3 -f tests/datax.tmp > tests/out.sar-ext-hl.tmp + ===== iostat tests (basic output) 02010 LC_ALL=C TZ=GMT ./iostat 2 3 > tests/out.iostat.tmp 02020 LC_ALL=C TZ=GMT ./iostat ALL 2 3 > tests/out.iostat-ALL.tmp diff --git a/tests/expected.sa2 b/tests/expected.sa2 index f8387b9..ed19ca6 100644 --- a/tests/expected.sa2 +++ b/tests/expected.sa2 @@ -57,7 +57,7 @@ Average: 156063 16704 157735 4 13:20:49 3 956 3.16 3.24 3.43 0 Average: 3 956 3.16 3.24 3.43 0 -13:20:29 TTY rcvin/s txmtin/s framerr/s prtyerr/s brk/s ovrun/s +13:20:29 TTY rcvin/s xmtin/s framerr/s prtyerr/s brk/s ovrun/s 13:20:49 0 0.00 0.00 0.00 0.00 0.00 0.00 13:20:49 1 0.00 0.00 0.00 0.00 0.00 0.00 Average: 0 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected.sadf-d b/tests/expected.sadf-d index fb8f505..f5a9e00 100644 --- a/tests/expected.sadf-d +++ b/tests/expected.sadf-d @@ -2037,7 +2037,7 @@ SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;3;956;3.16;3.24;3.43;0 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;3;956;3.16;3.24;3.43;0 SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;3;956;3.16;3.24;3.43;0 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;3;956;3.16;3.24;3.43;0 -# hostname;interval;timestamp;TTY;rcvin/s;txmtin/s;framerr/s;prtyerr/s;brk/s;ovrun/s +# hostname;interval;timestamp;TTY;rcvin/s;xmtin/s;framerr/s;prtyerr/s;brk/s;ovrun/s SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;0;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;1;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;0;0.00;0.00;0.00;0.00;0.00;0.00 @@ -2873,7 +2873,7 @@ SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0;0;0.00;0;0 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;156063;16704;157735;4 # hostname;interval;timestamp;runq-sz;plist-sz;ldavg-1;ldavg-5;ldavg-15;blocked SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;3;956;3.16;3.24;3.43;0 -# hostname;interval;timestamp;TTY;rcvin/s;txmtin/s;framerr/s;prtyerr/s;brk/s;ovrun/s +# hostname;interval;timestamp;TTY;rcvin/s;xmtin/s;framerr/s;prtyerr/s;brk/s;ovrun/s SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;1;0.00;0.00;0.00;0.00;0.00;0.00 # hostname;interval;timestamp;DEV;tps;rkB/s;wkB/s;dkB/s;areq-sz;aqu-sz;await;%util diff --git a/tests/expected.sadf-r b/tests/expected.sadf-r index 6597f5f..9d2d542 100644 --- a/tests/expected.sadf-r +++ b/tests/expected.sadf-r @@ -2132,20 +2132,20 @@ # 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_SERIAL; nr_curr; 2; nr_alloc; 2; nr_ini; 2 -13:20:19 UTC; TTY; 0; rcvin/s; 32543; 32543; txmtin/s; 14323; 14323; framerr/s; 123; 123; prtyerr/s; 123; 123; brk/s; 42; 42; ovrun/s; 13; 13; -13:20:19 UTC; TTY; 1; rcvin/s; 0; 0; txmtin/s; 0; 0; framerr/s; 0; 0; prtyerr/s; 0; 0; brk/s; 0; 0; ovrun/s; 0; 0; +13:20:19 UTC; TTY; 0; rcvin/s; 32543; 32543; xmtin/s; 14323; 14323; framerr/s; 123; 123; prtyerr/s; 123; 123; brk/s; 42; 42; ovrun/s; 13; 13; +13:20:19 UTC; TTY; 1; rcvin/s; 0; 0; xmtin/s; 0; 0; framerr/s; 0; 0; prtyerr/s; 0; 0; brk/s; 0; 0; ovrun/s; 0; 0; # uptime_cs; 725496; ust_time; 1555593629; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:29 # name; A_SERIAL; nr_curr; 2; nr_alloc; 2; nr_ini; 2 -13:20:29 UTC; TTY; 0; rcvin/s; 32543; 32543; txmtin/s; 14323; 14323; framerr/s; 123; 123; prtyerr/s; 123; 123; brk/s; 42; 42; ovrun/s; 13; 13; -13:20:29 UTC; TTY; 1; rcvin/s; 0; 0; txmtin/s; 0; 0; framerr/s; 0; 0; prtyerr/s; 0; 0; brk/s; 0; 0; ovrun/s; 0; 0; +13:20:29 UTC; TTY; 0; rcvin/s; 32543; 32543; xmtin/s; 14323; 14323; framerr/s; 123; 123; prtyerr/s; 123; 123; brk/s; 42; 42; ovrun/s; 13; 13; +13:20:29 UTC; TTY; 1; rcvin/s; 0; 0; xmtin/s; 0; 0; framerr/s; 0; 0; prtyerr/s; 0; 0; brk/s; 0; 0; ovrun/s; 0; 0; # uptime_cs; 729346; ust_time; 1555593639; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:39 # name; A_SERIAL; nr_curr; 2; nr_alloc; 2; nr_ini; 2 -13:20:39 UTC; TTY; 0; rcvin/s; 32543; 32543; txmtin/s; 14323; 14323; framerr/s; 123; 123; prtyerr/s; 123; 123; brk/s; 42; 42; ovrun/s; 13; 13; -13:20:39 UTC; TTY; 1; rcvin/s; 0; 0; txmtin/s; 0; 0; framerr/s; 0; 0; prtyerr/s; 0; 0; brk/s; 0; 0; ovrun/s; 0; 0; +13:20:39 UTC; TTY; 0; rcvin/s; 32543; 32543; xmtin/s; 14323; 14323; framerr/s; 123; 123; prtyerr/s; 123; 123; brk/s; 42; 42; ovrun/s; 13; 13; +13:20:39 UTC; TTY; 1; rcvin/s; 0; 0; xmtin/s; 0; 0; framerr/s; 0; 0; prtyerr/s; 0; 0; brk/s; 0; 0; ovrun/s; 0; 0; # uptime_cs; 731585; ust_time; 1555593649; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:49 # name; A_SERIAL; nr_curr; 2; nr_alloc; 2; nr_ini; 2 -13:20:49 UTC; TTY; 0; rcvin/s; 32543; 32543; txmtin/s; 14323; 14323; framerr/s; 123; 123; prtyerr/s; 123; 123; brk/s; 42; 42; ovrun/s; 13; 13; -13:20:49 UTC; TTY; 1; rcvin/s; 0; 0; txmtin/s; 0; 0; framerr/s; 0; 0; prtyerr/s; 0; 0; brk/s; 0; 0; ovrun/s; 0; 0; +13:20:49 UTC; TTY; 0; rcvin/s; 32543; 32543; xmtin/s; 14323; 14323; framerr/s; 123; 123; prtyerr/s; 123; 123; brk/s; 42; 42; ovrun/s; 13; 13; +13:20:49 UTC; TTY; 1; rcvin/s; 0; 0; xmtin/s; 0; 0; framerr/s; 0; 0; prtyerr/s; 0; 0; brk/s; 0; 0; ovrun/s; 0; 0; # 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_DISK; nr_curr; 14; nr_alloc; 19; nr_ini; 19 @@ -3198,8 +3198,8 @@ 13:54:35 UTC; runq-sz; 3; plist-sz; 956; ldavg-1; 316; ldavg-5; 324; ldavg-15; 343; blocked; 0; # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35 # name; A_SERIAL; nr_curr; 2; nr_alloc; 2; nr_ini; 2 -13:54:35 UTC; TTY; 0; rcvin/s; 32543; 32543; txmtin/s; 14323; 14323; framerr/s; 123; 123; prtyerr/s; 123; 123; brk/s; 42; 42; ovrun/s; 13; 13; -13:54:35 UTC; TTY; 1; rcvin/s; 0; 0; txmtin/s; 0; 0; framerr/s; 0; 0; prtyerr/s; 0; 0; brk/s; 0; 0; ovrun/s; 0; 0; +13:54:35 UTC; TTY; 0; rcvin/s; 32543; 32543; xmtin/s; 14323; 14323; framerr/s; 123; 123; prtyerr/s; 123; 123; brk/s; 42; 42; ovrun/s; 13; 13; +13:54:35 UTC; TTY; 1; rcvin/s; 0; 0; xmtin/s; 0; 0; framerr/s; 0; 0; prtyerr/s; 0; 0; brk/s; 0; 0; ovrun/s; 0; 0; # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35 # name; A_DISK; nr_curr; 15; nr_alloc; 19; nr_ini; 19 13:54:35 UTC; major; 8; minor; 0; DEV; sda; tps; 61881; 61931; rkB/s; 3195498; 3195498; wkB/s; 821088; 821088; dkB/s; 100; 150; rd_ticks; 623970; 623970; wr_ticks; 117109; 117109; dc_ticks; 100; 150; tot_ticks; 32862; 32862; aqu-sz; 714408; 714408; diff --git a/tests/expected.sar-all b/tests/expected.sar-all index d568dca..763c840 100644 --- a/tests/expected.sar-all +++ b/tests/expected.sar-all @@ -2558,7 +2558,7 @@ Average: 156063 16704 157735 4 13:20:49 3 956 3.16 3.24 3.43 0 Average: 3 956 3.16 3.24 3.43 0 -13:20:09 TTY rcvin/s txmtin/s framerr/s prtyerr/s brk/s ovrun/s +13:20:09 TTY rcvin/s xmtin/s framerr/s prtyerr/s brk/s ovrun/s 13:20:19 0 0.00 0.00 0.00 0.00 0.00 0.00 13:20:19 1 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 0 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected.sar-dec b/tests/expected.sar-dec index 7a4f54d..a31956f 100644 --- a/tests/expected.sar-dec +++ b/tests/expected.sar-dec @@ -2558,7 +2558,7 @@ Average: 156063 16704 157735 4 13:20:49 3 956 3 3 3 0 Average: 3 956 3 3 3 0 -13:20:09 TTY rcvin/s txmtin/s framerr/s prtyerr/s brk/s ovrun/s +13:20:09 TTY rcvin/s xmtin/s framerr/s prtyerr/s brk/s ovrun/s 13:20:19 0 0 0 0 0 0 0 13:20:19 1 0 0 0 0 0 0 13:20:29 0 0 0 0 0 0 0 @@ -4019,7 +4019,7 @@ Average: 156063 16704 157735 4 13:54:35 3 956 3 3 3 0 Average: 3 956 3 3 3 0 -13:54:15 TTY rcvin/s txmtin/s framerr/s prtyerr/s brk/s ovrun/s +13:54:15 TTY rcvin/s xmtin/s framerr/s prtyerr/s brk/s ovrun/s 13:54:35 0 0 0 0 0 0 0 13:54:35 1 0 0 0 0 0 0 Average: 0 0 0 0 0 0 0 diff --git a/tests/expected.sar-ext-hl b/tests/expected.sar-ext-hl new file mode 100644 index 0000000..9ae92db --- /dev/null +++ b/tests/expected.sar-ext-hl @@ -0,0 +1,259 @@ +Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/19 _x86_64_ (9 CPU) + +13:20:09 LINUX RESTART (9 CPU) +13:20:13 COM First comment! + +13:20:15 CPU %user %nice %system %iowait %steal %idle +13:20:19 all 2.15 12.50 2.36 0.12 0.00 82.88 +13:20:19 0 2.71 0.03 3.12 0.00 0.00 94.14 +13:20:19 1 2.85 0.00 5.16 0.00 0.00 91.99 +13:20:19 2 2.25 0.03 1.86 0.68 0.00 95.18 +13:20:19 3 0.00 99.55 0.45 0.00 0.00 0.00 +13:20:19 4 2.41 0.00 2.06 0.03 0.00 95.50 +13:20:19 5 1.65 0.00 2.78 0.00 0.00 95.57 +13:20:19 6 2.41 0.00 2.60 0.16 0.00 94.82 +13:20:19 7 2.89 0.00 0.87 0.06 0.00 96.18 +13:20:23 all 2.28 0.00 1.93 0.48 0.00 95.31 +13:20:23 0 1.25 0.00 2.28 0.35 0.00 96.12 +13:20:23 1 2.15 0.00 1.22 0.77 0.00 95.87 +13:20:23 2 3.27 0.00 2.05 0.77 0.00 93.90 +13:20:23 3 0.00 0.00 0.00 0.00 0.00 100.00 +13:20:23 4 3.44 0.00 2.64 0.84 0.00 93.08 +13:20:23 5 2.76 0.00 2.37 0.16 0.00 94.71 +13:20:23 7 0.83 0.00 0.99 0.00 0.00 98.17 +13:20:27 all 2.67 23.08 2.40 0.17 0.00 71.68 +13:20:27 0 2.19 52.01 2.21 0.00 0.00 43.59 +13:20:27 1 3.45 0.00 3.06 0.55 0.00 92.94 +13:20:27 2 0.68 16.81 2.19 0.39 0.00 79.93 +13:20:27 3 2.33 44.73 1.48 0.01 0.00 51.44 +13:20:27 4 3.11 31.18 2.95 0.00 0.00 62.76 +13:20:27 5 3.92 0.00 3.03 0.03 0.00 93.02 +13:20:27 7 3.23 0.00 1.61 0.36 0.00 94.79 +13:20:27 8 5.26 0.00 26.97 0.00 0.00 67.76 +Average: all 2.40 13.65 2.26 0.23 0.00 81.46 +Average: 0 2.06 19.85 2.52 0.11 0.00 75.46 +Average: 1 2.86 0.00 3.13 0.45 0.00 93.56 +Average: 2 1.97 6.41 2.05 0.60 0.00 88.97 +Average: 3 1.61 61.69 1.16 0.01 0.00 35.53 +Average: 4 3.00 11.88 2.58 0.27 0.00 82.27 +Average: 5 2.86 0.00 2.75 0.06 0.00 94.33 +Average: 6 2.41 0.00 2.60 0.16 0.00 94.82 +Average: 7 2.38 0.00 1.19 0.15 0.00 96.28 +Average: 8 5.26 0.00 26.97 0.00 0.00 67.76 + +13:20:15 proc/s cswch/s +13:20:19 3.56 68409.30 +13:20:23 4.83 46287.74 +13:20:27 3.66 64945.01 +Average: 3.99 60239.12 + +13:20:15 INTR intr/s +13:20:19 2 0.00 +13:20:19 3 0.00 +13:20:23 2 0.00 +13:20:23 3 0.00 +13:20:27 2 0.00 +13:20:27 3 0.00 +Average: 2 0.00 +Average: 3 0.00 + +13:20:15 IFACE rxpck/s txpck/s rxkB/s txkB/s rxcmp/s txcmp/s rxmcst/s %ifutil +13:20:19 lo 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:19 virbr0-nic 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:19 enp6s0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:19 virbr0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:19 wlp5s0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:23 lo 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:23 virbr0-nic 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:23 enp6s0 53.55 17.45 64.37 3.38 0.00 0.00 9.25 0.05 +13:20:23 virbr0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:23 wlp5s0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:27 lo 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:27 enp6s0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:27 enp6s1 1.90 1.17 0.23 0.21 0.00 0.00 2.31 0.00 +13:20:27 virbr0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:27 wlp5s0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:27 wlp5s1 0.39 0.13 0.03 0.01 0.00 0.00 0.00 0.00 +Average: lo 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +Average: enp6s0 16.58 5.40 19.93 1.05 0.00 0.00 2.86 0.02 +Average: enp6s1 0.72 0.45 0.09 0.08 0.00 0.00 0.88 0.00 +Average: virbr0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +Average: wlp5s0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +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:22:11 LINUX RESTART (9 CPU) + +13:22:21 CPU %user %nice %system %iowait %steal %idle +13:22:31 all 2.15 12.50 2.36 0.12 0.00 82.88 +13:22:31 0 2.71 0.03 3.12 0.00 0.00 94.14 +13:22:31 1 2.85 0.00 5.16 0.00 0.00 91.99 +13:22:31 2 2.25 0.03 1.86 0.68 0.00 95.18 +13:22:31 3 0.00 99.55 0.45 0.00 0.00 0.00 +13:22:31 4 2.41 0.00 2.06 0.03 0.00 95.50 +13:22:31 5 1.65 0.00 2.78 0.00 0.00 95.57 +13:22:31 6 2.41 0.00 2.60 0.16 0.00 94.82 +13:22:31 7 2.89 0.00 0.87 0.06 0.00 96.18 +13:22:35 COM Second comment! +Average: all 2.15 12.50 2.36 0.12 0.00 82.88 +Average: 0 2.71 0.03 3.12 0.00 0.00 94.14 +Average: 1 2.85 0.00 5.16 0.00 0.00 91.99 +Average: 2 2.25 0.03 1.86 0.68 0.00 95.18 +Average: 3 0.00 99.55 0.45 0.00 0.00 0.00 +Average: 4 2.41 0.00 2.06 0.03 0.00 95.50 +Average: 5 1.65 0.00 2.78 0.00 0.00 95.57 +Average: 6 2.41 0.00 2.60 0.16 0.00 94.82 +Average: 7 2.89 0.00 0.87 0.06 0.00 96.18 +Average: 8 0.00 0.00 0.00 0.00 0.00 100.00 + +13:22:21 proc/s cswch/s +13:22:31 3.56 68409.30 +13:22:35 COM Second comment! +Average: 3.56 68409.30 + +13:22:21 INTR intr/s +13:22:31 2 0.00 +13:22:31 3 0.00 +13:22:35 COM Second comment! +Average: 2 0.00 +Average: 3 0.00 + +13:22:21 IFACE rxpck/s txpck/s rxkB/s txkB/s rxcmp/s txcmp/s rxmcst/s %ifutil +13:22:31 lo 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:22:31 virbr0-nic 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:22:31 enp6s0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:22:31 virbr0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:22:31 wlp5s0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:22:35 COM Second comment! +Average: lo 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +Average: virbr0-nic 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +Average: enp6s0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +Average: virbr0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +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: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 + +13:23:20 LINUX RESTART (9 CPU) + +13:24:10 LINUX RESTART (9 CPU) + +13:24:12 LINUX RESTART (9 CPU) + +13:24:20 CPU %user %nice %system %iowait %steal %idle +13:24:25 all 2.15 12.50 2.36 0.12 0.00 82.88 +13:24:25 0 2.71 0.03 3.12 0.00 0.00 94.14 +13:24:25 1 2.85 0.00 5.16 0.00 0.00 91.99 +13:24:25 2 2.25 0.03 1.86 0.68 0.00 95.18 +13:24:25 3 0.00 99.55 0.45 0.00 0.00 0.00 +13:24:25 4 2.41 0.00 2.06 0.03 0.00 95.50 +13:24:25 5 1.65 0.00 2.78 0.00 0.00 95.57 +13:24:25 6 2.41 0.00 2.60 0.16 0.00 94.82 +13:24:25 7 2.89 0.00 0.87 0.06 0.00 96.18 +13:22:46 COM Third... +13:22:47 COM and fourth comment! +13:24:30 all 2.28 0.00 1.93 0.48 0.00 95.31 +13:24:30 0 1.25 0.00 2.28 0.35 0.00 96.12 +13:24:30 1 2.15 0.00 1.22 0.77 0.00 95.87 +13:24:30 2 3.27 0.00 2.05 0.77 0.00 93.90 +13:24:30 3 0.00 0.00 0.00 0.00 0.00 100.00 +13:24:30 4 3.44 0.00 2.64 0.84 0.00 93.08 +13:24:30 5 2.76 0.00 2.37 0.16 0.00 94.71 +13:24:30 7 0.83 0.00 0.99 0.00 0.00 98.17 +Average: all 2.20 7.13 2.17 0.27 0.00 88.22 +Average: 0 1.98 0.02 2.70 0.18 0.00 95.13 +Average: 1 2.50 0.00 3.17 0.39 0.00 93.94 +Average: 2 2.76 0.02 1.96 0.72 0.00 94.54 +Average: 3 0.00 99.55 0.45 0.00 0.00 0.00 +Average: 4 2.93 0.00 2.35 0.43 0.00 94.29 +Average: 5 2.21 0.00 2.58 0.08 0.00 95.14 +Average: 6 2.41 0.00 2.60 0.16 0.00 94.82 +Average: 7 1.86 0.00 0.93 0.02 0.00 97.19 +Average: 8 0.00 0.00 0.00 0.00 0.00 100.00 + +13:24:20 proc/s cswch/s +13:24:25 3.56 68409.30 +13:22:46 COM Third... +13:22:47 COM and fourth comment! +13:24:30 4.83 46287.74 +Average: 4.20 57336.12 + +13:24:20 INTR intr/s +13:24:25 2 0.00 +13:24:25 3 0.00 +13:22:46 COM Third... +13:22:47 COM and fourth comment! +13:24:30 2 0.00 +13:24:30 3 0.00 +Average: 2 0.00 +Average: 3 0.00 + +13:24:20 IFACE rxpck/s txpck/s rxkB/s txkB/s rxcmp/s txcmp/s rxmcst/s %ifutil +13:24:25 lo 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:24:25 virbr0-nic 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:24:25 enp6s0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:24:25 virbr0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:24:25 wlp5s0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:22:46 COM Third... +13:22:47 COM and fourth comment! +13:24:30 lo 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:24:30 virbr0-nic 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:24:30 enp6s0 53.55 17.45 64.37 3.38 0.00 0.00 9.25 0.05 +13:24:30 virbr0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:24:30 wlp5s0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +Average: lo 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +Average: virbr0-nic 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +Average: enp6s0 26.81 8.73 32.22 1.69 0.00 0.00 4.63 0.03 +Average: virbr0 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +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: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 diff --git a/tests/expected.sar-human b/tests/expected.sar-human index 6449b4c..8110035 100644 --- a/tests/expected.sar-human +++ b/tests/expected.sar-human @@ -2558,7 +2558,7 @@ Average: 156063 16704 157735 4 13:20:49 3 956 3.16 3.24 3.43 0 Average: 3 956 3.16 3.24 3.43 0 -13:20:09 TTY rcvin/s txmtin/s framerr/s prtyerr/s brk/s ovrun/s +13:20:09 TTY rcvin/s xmtin/s framerr/s prtyerr/s brk/s ovrun/s 13:20:19 0 0.00 0.00 0.00 0.00 0.00 0.00 13:20:19 1 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 0 0.00 0.00 0.00 0.00 0.00 0.00 @@ -4019,7 +4019,7 @@ Average: 156063 16704 157735 4 13:54:35 3 956 3.16 3.24 3.43 0 Average: 3 956 3.16 3.24 3.43 0 -13:54:15 TTY rcvin/s txmtin/s framerr/s prtyerr/s brk/s ovrun/s +13:54:15 TTY rcvin/s xmtin/s framerr/s prtyerr/s brk/s ovrun/s 13:54:35 0 0.00 0.00 0.00 0.00 0.00 0.00 13:54:35 1 0.00 0.00 0.00 0.00 0.00 0.00 Average: 0 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected2.sar-all b/tests/expected2.sar-all index 0ff9873..5850c87 100644 --- a/tests/expected2.sar-all +++ b/tests/expected2.sar-all @@ -2558,7 +2558,7 @@ Average: 156063 16704 157735 4 13:20:49 3 956 3.16 3.24 3.43 0 Average: 3 956 3.16 3.24 3.43 0 -13:20:09 TTY rcvin/s txmtin/s framerr/s prtyerr/s brk/s ovrun/s +13:20:09 TTY rcvin/s xmtin/s framerr/s prtyerr/s brk/s ovrun/s 13:20:19 0 0.00 0.00 0.00 0.00 0.00 0.00 13:20:19 1 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 0 0.00 0.00 0.00 0.00 0.00 0.00 @@ -4019,7 +4019,7 @@ Average: 156063 16704 157735 4 13:54:35 3 956 3.16 3.24 3.43 0 Average: 3 956 3.16 3.24 3.43 0 -13:54:15 TTY rcvin/s txmtin/s framerr/s prtyerr/s brk/s ovrun/s +13:54:15 TTY rcvin/s xmtin/s framerr/s prtyerr/s brk/s ovrun/s 13:54:35 0 0.00 0.00 0.00 0.00 0.00 0.00 13:54:35 1 0.00 0.00 0.00 0.00 0.00 0.00 Average: 0 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/expected3.sar-all b/tests/expected3.sar-all index 031f85c..8654f75 100644 --- a/tests/expected3.sar-all +++ b/tests/expected3.sar-all @@ -92,7 +92,7 @@ Average: 156063 16704 157735 4 13:20:49 3 956 3.16 3.24 3.43 0 Average: 3 956 3.16 3.24 3.43 0 -13:20:09 TTY rcvin/s txmtin/s framerr/s prtyerr/s brk/s ovrun/s +13:20:09 TTY rcvin/s xmtin/s framerr/s prtyerr/s brk/s ovrun/s 13:20:19 0 0.00 0.00 0.00 0.00 0.00 0.00 13:20:19 1 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 0 0.00 0.00 0.00 0.00 0.00 0.00