From: Sebastien GODARD Date: Sun, 21 Jul 2019 14:10:53 +0000 (+0200) Subject: iostat: Add new non regression tests X-Git-Tag: v12.1.6~7 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6c9a69842263644f7da8ad5e4c3e8322a7c463d;p=sysstat iostat: Add new non regression tests These tests focus on devices with a slash in their name (e.g. cciss/c0d0...). Signed-off-by: Sebastien GODARD --- diff --git a/tests/00350 b/tests/00350 new file mode 100644 index 0000000..25d330d --- /dev/null +++ b/tests/00350 @@ -0,0 +1,6 @@ +. tests/variables +if [ ! -z "$VER_JSON" ]; then + rm -f tests/root + ln -s root1 tests/root + ./iostat -o JSON -g total /dev/sda1 sda3 -g foo 1 3 | $VER_JSON >/dev/null; +fi diff --git a/tests/02670 b/tests/02670 new file mode 100644 index 0000000..6e539d8 --- /dev/null +++ b/tests/02670 @@ -0,0 +1,3 @@ +rm -f tests/root +ln -s root1 tests/root +LC_ALL=C ./iostat -g total sda -g foo 1 2 > tests/out.iostat-g2.tmp diff --git a/tests/02675 b/tests/02675 new file mode 100644 index 0000000..38af236 --- /dev/null +++ b/tests/02675 @@ -0,0 +1 @@ +diff -u tests/out.iostat-g2.tmp tests/expected.iostat-g2 diff --git a/tests/02680 b/tests/02680 new file mode 100644 index 0000000..cc7e472 --- /dev/null +++ b/tests/02680 @@ -0,0 +1,3 @@ +rm -f tests/root +ln -s root1 tests/root +LC_ALL=C ./iostat -g total ALL 1 2 > tests/out.iostat-gALL.tmp diff --git a/tests/02685 b/tests/02685 new file mode 100644 index 0000000..30f14db --- /dev/null +++ b/tests/02685 @@ -0,0 +1 @@ +diff -u tests/out.iostat-gALL.tmp tests/expected.iostat-gALL diff --git a/tests/02690 b/tests/02690 new file mode 100644 index 0000000..84501f0 --- /dev/null +++ b/tests/02690 @@ -0,0 +1,3 @@ +rm -f tests/root +ln -s root1 tests/root +LC_ALL=C ./iostat -g total -p ALL 1 2 > tests/out.iostat-gpALL.tmp diff --git a/tests/02695 b/tests/02695 new file mode 100644 index 0000000..caa6db0 --- /dev/null +++ b/tests/02695 @@ -0,0 +1 @@ +diff -u tests/out.iostat-gpALL.tmp tests/expected.iostat-gpALL diff --git a/tests/02700 b/tests/02700 new file mode 100644 index 0000000..021ac04 --- /dev/null +++ b/tests/02700 @@ -0,0 +1,3 @@ +rm -f tests/root +ln -s root1 tests/root +LC_ALL=C ./iostat -g total -p sda 1 2 > tests/out.iostat-gp.tmp diff --git a/tests/02705 b/tests/02705 new file mode 100644 index 0000000..6fb2d5c --- /dev/null +++ b/tests/02705 @@ -0,0 +1 @@ +diff -u tests/out.iostat-gp.tmp tests/expected.iostat-gp diff --git a/tests/02710 b/tests/02710 new file mode 100644 index 0000000..dfea9ca --- /dev/null +++ b/tests/02710 @@ -0,0 +1,3 @@ +rm -f tests/root +ln -s root1 tests/root +LC_ALL=C ./iostat -g total -p sda -y 1 3 > tests/out.iostat-gpy.tmp diff --git a/tests/02715 b/tests/02715 new file mode 100644 index 0000000..8646479 --- /dev/null +++ b/tests/02715 @@ -0,0 +1 @@ +diff -u tests/out.iostat-gpy.tmp tests/expected.iostat-gpy diff --git a/tests/02720 b/tests/02720 new file mode 100644 index 0000000..2e87a9f --- /dev/null +++ b/tests/02720 @@ -0,0 +1,3 @@ +rm -f tests/root +ln -s root6 tests/root +LC_ALL=C ./iostat -p cciss/c0d0 1 2 > tests/out.iostat-p-cciss.tmp diff --git a/tests/02725 b/tests/02725 new file mode 100644 index 0000000..c0ff3d1 --- /dev/null +++ b/tests/02725 @@ -0,0 +1 @@ +diff -u tests/out.iostat-p-cciss.tmp tests/expected.iostat-p-cciss diff --git a/tests/02730 b/tests/02730 new file mode 100644 index 0000000..3f9d335 --- /dev/null +++ b/tests/02730 @@ -0,0 +1,3 @@ +rm -f tests/root +ln -s root6 tests/root +LC_ALL=C ./iostat cciss/c0d0p2 1 2 > tests/out.iostat-cciss.tmp diff --git a/tests/02735 b/tests/02735 new file mode 100644 index 0000000..3851ead --- /dev/null +++ b/tests/02735 @@ -0,0 +1 @@ +diff -u tests/out.iostat-cciss.tmp tests/expected.iostat-cciss diff --git a/tests/TLIST b/tests/TLIST index 294ff31..aa82404 100644 --- a/tests/TLIST +++ b/tests/TLIST @@ -49,6 +49,7 @@ NOTES: 00345 ./iostat -y 1 3 -o JSON ALL -p ALL -xt | $VER_JSON >/dev/null 00346 ./iostat 1 3 -o JSON | $VER_JSON >/dev/null 00347 ./iostat -xs 1 3 -o JSON ALL -p ALL | $VER_JSON >/dev/null +00350 ./iostat -o JSON -g total /dev/sda1 sda3 -g foo 1 3 | $VER_JSON >/dev/null; ===== Checking XML output validity 00400 ./sadf -x tests/data.tmp -C -- -A | $VER_XML --schema xml/sysstat.xsd - >/dev/null && ./sadf -x tests/data.tmp | $VER_XML --schema xml/sysstat.xsd - >/dev/null && ./sadf -T -x tests/data.tmp | $VER_XML --schema xml/sysstat.xsd - >/dev/null @@ -336,3 +337,17 @@ NOTES: 02655 diff -u tests/out.iostat-jLABEL-list.tmp tests/expected.iostat-jLABEL-list 02660 LC_ALL=C ./iostat -dxs -j UUID 2578463f-6947-48c7-8b09-876a4145cfb1 1 2 > tests/out.iostat-jUUID-list.tmp 02665 diff -u tests/out.iostat-jUUID-list.tmp tests/expected.iostat-jUUID-list +02670 LC_ALL=C ./iostat -g total sda -g foo 1 2 > tests/out.iostat-g2.tmp +02675 diff -u tests/out.iostat-g2.tmp tests/expected.iostat-g2 +02680 LC_ALL=C ./iostat -g total ALL 1 2 > tests/out.iostat-gALL.tmp +02685 diff -u tests/out.iostat-gALL.tmp tests/expected.iostat-gALL +02690 LC_ALL=C ./iostat -g total -p ALL 1 2 > tests/out.iostat-gpALL.tmp +02695 diff -u tests/out.iostat-gpALL.tmp tests/expected.iostat-gpALL +02700 LC_ALL=C ./iostat -g total -p sda 1 2 > tests/out.iostat-gp.tmp +02705 diff -u tests/out.iostat-gp.tmp tests/expected.iostat-gp +02710 LC_ALL=C ./iostat -g total -p sda -y 1 3 > tests/out.iostat-gpy.tmp +02715 diff -u tests/out.iostat-gpy.tmp tests/expected.iostat-gpy +02720 LC_ALL=C ./iostat -p cciss/c0d0 1 2 > tests/out.iostat-p-cciss.tmp +02725 diff -u tests/out.iostat-p-cciss.tmp tests/expected.iostat-p-cciss +02730 LC_ALL=C ./iostat cciss/c0d0p1 1 2 > tests/out.iostat-cciss.tmp +02735 diff -u tests/out.iostat-cciss.tmp tests/expected.iostat-cciss diff --git a/tests/expected.iostat-cciss b/tests/expected.iostat-cciss new file mode 100644 index 0000000..bcdc6c2 --- /dev/null +++ b/tests/expected.iostat-cciss @@ -0,0 +1,16 @@ +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (10 CPU) + +avg-cpu: %user %nice %system %iowait %steal %idle + 1.65 44.89 1.85 1.01 0.00 50.59 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +cciss/c0d0p2 699.33 0.00 0.00 0.00 0 0 0 + + +avg-cpu: %user %nice %system %iowait %steal %idle + 2.47 17.18 3.55 0.77 0.00 76.03 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +cciss/c0d0p2 32402.95 0.00 0.00 0.00 0 0 0 + + diff --git a/tests/expected.iostat-g2 b/tests/expected.iostat-g2 new file mode 100644 index 0000000..e94f3ea --- /dev/null +++ b/tests/expected.iostat-g2 @@ -0,0 +1,20 @@ +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) + +avg-cpu: %user %nice %system %iowait %steal %idle + 1.65 44.90 1.84 1.01 0.00 50.60 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +sda 8.59 222.14 57.08 0.00 1597749 410544 0 + total 8.59 222.14 57.08 0.00 1597749 410544 0 + foo 0.00 0.00 0.00 0.00 0 0 0 + + +avg-cpu: %user %nice %system %iowait %steal %idle + 2.15 12.50 2.35 0.12 0.00 82.89 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +sda 0.00 0.00 0.00 0.00 0 0 0 + total 0.00 0.00 0.00 0.00 0 0 0 + foo 0.00 0.00 0.00 0.00 0 0 0 + + diff --git a/tests/expected.iostat-gALL b/tests/expected.iostat-gALL new file mode 100644 index 0000000..eed5cd8 --- /dev/null +++ b/tests/expected.iostat-gALL @@ -0,0 +1,29 @@ +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) + +avg-cpu: %user %nice %system %iowait %steal %idle + 1.65 44.90 1.84 1.01 0.00 50.60 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +dm-2 0.00 0.00 0.00 0.00 0 0 0 +sda 8.59 222.14 57.08 0.00 1597749 410544 0 +sdb 0.01 0.29 0.00 0.00 2108 0 0 +sdc 0.00 0.00 0.00 0.00 0 0 0 +sdd 0.00 0.00 0.00 0.00 0 0 0 +sde 0.00 0.00 0.00 0.00 0 0 0 +scd0 0.00 0.00 0.00 0.00 0 0 0 + total 8.60 222.43 57.08 0.00 1599857 410544 0 + + +avg-cpu: %user %nice %system %iowait %steal %idle + 2.15 12.50 2.35 0.12 0.00 82.89 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +sda 0.00 0.00 0.00 0.00 0 0 0 +sdb 0.00 0.00 0.00 0.00 0 0 0 +sdc 0.00 0.00 0.00 0.00 0 0 0 +sdd 0.00 0.00 0.00 0.00 0 0 0 +sde 0.00 0.00 0.00 0.00 0 0 0 +scd0 0.00 0.00 0.00 0.00 0 0 0 + total 0.00 0.00 0.00 0.00 0 0 0 + + diff --git a/tests/expected.iostat-gp b/tests/expected.iostat-gp new file mode 100644 index 0000000..4b7cb35 --- /dev/null +++ b/tests/expected.iostat-gp @@ -0,0 +1,42 @@ +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) + +avg-cpu: %user %nice %system %iowait %steal %idle + 1.65 44.90 1.84 1.01 0.00 50.60 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +sda 8.59 222.14 57.08 0.00 1597749 410544 0 +sda1 0.01 0.29 0.00 0.00 2108 0 0 +sda10 0.01 0.31 0.00 0.00 2220 0 0 +sda11 0.01 0.31 0.00 0.00 2252 0 0 +sda12 1.88 25.28 37.19 0.00 181825 267480 0 +sda2 0.01 0.29 0.00 0.00 2092 0 0 +sda3 0.01 0.29 0.00 0.00 2100 0 0 +sda4 0.00 0.00 0.00 0.00 14 0 0 +sda5 0.01 0.31 0.00 0.00 2252 0 0 +sda6 0.02 0.62 0.00 0.00 4424 12 0 +sda7 0.02 0.62 0.00 0.00 4437 12 0 +sda8 0.01 0.34 0.00 0.00 2444 0 0 +sda9 6.60 193.17 19.89 0.00 1389369 143040 0 + total 17.16 443.97 114.16 0.00 3193286 821088 0 + + +avg-cpu: %user %nice %system %iowait %steal %idle + 2.15 12.50 2.35 0.12 0.00 82.89 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +sda 0.00 0.00 0.00 0.00 0 0 0 +sda1 0.00 0.00 0.00 0.00 0 0 0 +sda10 0.00 0.00 0.00 0.00 0 0 0 +sda11 0.00 0.00 0.00 0.00 0 0 0 +sda12 0.00 0.00 0.00 0.00 0 0 0 +sda2 0.00 0.00 0.00 0.00 0 0 0 +sda3 0.00 0.00 0.00 0.00 0 0 0 +sda4 0.00 0.00 0.00 0.00 0 0 0 +sda5 0.00 0.00 0.00 0.00 0 0 0 +sda6 0.00 0.00 0.00 0.00 0 0 0 +sda7 0.00 0.00 0.00 0.00 0 0 0 +sda8 0.00 0.00 0.00 0.00 0 0 0 +sda9 0.00 0.00 0.00 0.00 0 0 0 + total 0.00 0.00 0.00 0.00 0 0 0 + + diff --git a/tests/expected.iostat-gpALL b/tests/expected.iostat-gpALL new file mode 100644 index 0000000..49dabc3 --- /dev/null +++ b/tests/expected.iostat-gpALL @@ -0,0 +1,53 @@ +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) + +avg-cpu: %user %nice %system %iowait %steal %idle + 1.65 44.90 1.84 1.01 0.00 50.60 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +sda 8.59 222.14 57.08 0.00 1597749 410544 0 +sda1 0.01 0.29 0.00 0.00 2108 0 0 +sda2 0.01 0.29 0.00 0.00 2092 0 0 +sda3 0.01 0.29 0.00 0.00 2100 0 0 +sda4 0.00 0.00 0.00 0.00 14 0 0 +sda5 0.01 0.31 0.00 0.00 2252 0 0 +sda6 0.02 0.62 0.00 0.00 4424 12 0 +sda7 0.02 0.62 0.00 0.00 4437 12 0 +sda8 0.01 0.34 0.00 0.00 2444 0 0 +sda9 6.60 193.17 19.89 0.00 1389369 143040 0 +sda10 0.01 0.31 0.00 0.00 2220 0 0 +sda11 0.01 0.31 0.00 0.00 2252 0 0 +sda12 1.88 25.28 37.19 0.00 181825 267480 0 +scd0 0.00 0.00 0.00 0.00 0 0 0 +sdb 0.01 0.29 0.00 0.00 2108 0 0 +sde 0.00 0.00 0.00 0.00 0 0 0 +sdc 0.00 0.00 0.00 0.00 0 0 0 +sdd 0.00 0.00 0.00 0.00 0 0 0 +dm-2 0.00 0.00 0.00 0.00 0 0 0 + total 17.16 444.26 114.16 0.00 3195394 821088 0 + + +avg-cpu: %user %nice %system %iowait %steal %idle + 2.15 12.50 2.35 0.12 0.00 82.89 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +sda 0.00 0.00 0.00 0.00 0 0 0 +sda1 0.00 0.00 0.00 0.00 0 0 0 +sda2 0.00 0.00 0.00 0.00 0 0 0 +sda3 0.00 0.00 0.00 0.00 0 0 0 +sda4 0.00 0.00 0.00 0.00 0 0 0 +sda5 0.00 0.00 0.00 0.00 0 0 0 +sda6 0.00 0.00 0.00 0.00 0 0 0 +sda7 0.00 0.00 0.00 0.00 0 0 0 +sda8 0.00 0.00 0.00 0.00 0 0 0 +sda9 0.00 0.00 0.00 0.00 0 0 0 +sda10 0.00 0.00 0.00 0.00 0 0 0 +sda11 0.00 0.00 0.00 0.00 0 0 0 +sda12 0.00 0.00 0.00 0.00 0 0 0 +scd0 0.00 0.00 0.00 0.00 0 0 0 +sdb 0.00 0.00 0.00 0.00 0 0 0 +sde 0.00 0.00 0.00 0.00 0 0 0 +sdc 0.00 0.00 0.00 0.00 0 0 0 +sdd 0.00 0.00 0.00 0.00 0 0 0 + total 0.00 0.00 0.00 0.00 0 0 0 + + diff --git a/tests/expected.iostat-gpy b/tests/expected.iostat-gpy new file mode 100644 index 0000000..7cd2748 --- /dev/null +++ b/tests/expected.iostat-gpy @@ -0,0 +1,51 @@ +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) + + +avg-cpu: %user %nice %system %iowait %steal %idle + 2.15 12.50 2.35 0.12 0.00 82.89 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +sda 0.00 0.00 0.00 0.00 0 0 0 +sda1 0.00 0.00 0.00 0.00 0 0 0 +sda10 0.00 0.00 0.00 0.00 0 0 0 +sda11 0.00 0.00 0.00 0.00 0 0 0 +sda12 0.00 0.00 0.00 0.00 0 0 0 +sda2 0.00 0.00 0.00 0.00 0 0 0 +sda3 0.00 0.00 0.00 0.00 0 0 0 +sda4 0.00 0.00 0.00 0.00 0 0 0 +sda5 0.00 0.00 0.00 0.00 0 0 0 +sda6 0.00 0.00 0.00 0.00 0 0 0 +sda7 0.00 0.00 0.00 0.00 0 0 0 +sda8 0.00 0.00 0.00 0.00 0 0 0 +sda9 0.00 0.00 0.00 0.00 0 0 0 + total 0.00 0.00 0.00 0.00 0 0 0 + + +avg-cpu: %user %nice %system %iowait %steal %idle + 1.96 12.49 1.91 0.52 0.00 83.13 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +sda 6.40 1.60 1.60 0.00 50 50 0 +sda1 6.40 1.60 1.60 0.00 50 50 0 +sda10 0.00 0.00 0.00 0.00 0 0 0 +sda11 0.00 0.00 0.00 0.00 0 0 0 +sda12 0.00 0.00 0.00 0.00 0 0 0 +sda2 0.00 0.00 0.00 0.00 0 0 0 +sda3 0.00 0.00 0.00 0.00 0 0 0 +sda4 0.00 0.00 0.00 0.00 0 0 0 +sda5 0.00 0.00 0.00 0.00 0 0 0 +sda6 0.00 0.00 0.00 0.00 0 0 0 +sda7 0.00 0.00 0.00 0.00 0 0 0 +sda8 0.00 0.00 0.00 0.00 0 0 0 +sda9 0.00 0.00 0.00 0.00 0 0 0 + total 12.80 3.20 3.20 0.00 100 100 0 + + +avg-cpu: %user %nice %system %iowait %steal %idle + 2.99 12.51 2.49 0.20 0.00 81.81 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +sda 1604.70 41499.97 10663.48 0.00 1597749 410544 0 + total 1604.70 41499.97 10663.48 0.00 1597749 410544 0 + + diff --git a/tests/expected.iostat-p-cciss b/tests/expected.iostat-p-cciss new file mode 100644 index 0000000..ae0cc6b --- /dev/null +++ b/tests/expected.iostat-p-cciss @@ -0,0 +1,20 @@ +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (10 CPU) + +avg-cpu: %user %nice %system %iowait %steal %idle + 1.65 44.89 1.85 1.01 0.00 50.59 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +cciss/c0d0 707.89 0.00 0.00 0.00 0 0 0 +cciss/c0d0p1 8.55 0.00 0.00 0.00 0 0 0 +cciss/c0d0p2 699.33 0.00 0.00 0.00 0 0 0 + + +avg-cpu: %user %nice %system %iowait %steal %idle + 2.47 17.18 3.55 0.77 0.00 76.03 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +cciss/c0d0 32402.95 0.00 0.00 0.00 0 0 0 +cciss/c0d0p1 0.00 0.00 0.00 0.00 0 0 0 +cciss/c0d0p2 32402.95 0.00 0.00 0.00 0 0 0 + + diff --git a/tests/expected.iostat-sigint b/tests/expected.iostat-sigint index f3cddc0..e9a2e09 100644 --- a/tests/expected.iostat-sigint +++ b/tests/expected.iostat-sigint @@ -44,6 +44,7 @@ avg-cpu: %user %nice %system %iowait %steal %idle 0.00 0.00 0.00 0.00 0.00 0.00 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +cciss/c0d0 0.00 0.00 0.00 0.00 0 0 0 sda 0.00 0.00 0.00 0.00 0 0 50 @@ -51,6 +52,7 @@ avg-cpu: %user %nice %system %iowait %steal %idle 2.47 17.18 3.55 0.77 0.00 76.03 Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +cciss/c0d0 32402.95 0.00 0.00 0.00 0 0 0 sda 1.60 0.00 0.00 0.80 0 0 25 diff --git a/tests/expected.iostat-x-ALL-p-ALL b/tests/expected.iostat-x-ALL-p-ALL index d662882..d5f44e7 100644 --- a/tests/expected.iostat-x-ALL-p-ALL +++ b/tests/expected.iostat-x-ALL-p-ALL @@ -124,6 +124,9 @@ sdb 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0. sde 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 sdc 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 sdd 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +cciss/c0d0 0.00 0.00 0.00 29.81 4.56 0.00 0.00 0.00 0.00 76.30 3.72 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +cciss/c0d0p1 0.00 0.00 0.00 47.25 10.91 0.00 0.00 0.00 0.00 99.12 158.54 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +cciss/c0d0p2 0.00 0.00 0.00 25.00 3.33 0.00 0.00 0.00 0.00 66.67 2.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Device r/s rkB/s rrqm/s %rrqm r_await rareq-sz w/s wkB/s wrqm/s %wrqm w_await wareq-sz d/s dkB/s drqm/s %drqm d_await dareq-sz aqu-sz %util @@ -142,5 +145,8 @@ sdb 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0. sde 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 sdc 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 sdd 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +cciss/c0d0 320.82 0.00 320.82 50.00 10.00 0.00 32082.13 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +cciss/c0d0p1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +cciss/c0d0p2 320.82 0.00 320.82 50.00 10.00 0.00 32082.13 0.00 0.00 0.00 0.00 0.00 0.00 0.00 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 a83fa52..e4a2d0f 100644 --- a/tests/expected.sadf-d +++ b/tests/expected.sadf-d @@ -2843,7 +2843,7 @@ SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0.00;0.00 # hostname;interval;timestamp;pgpgin/s;pgpgout/s;fault/s;majflt/s;pgfree/s;pgscank/s;pgscand/s;pgsteal/s;%vmeff SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 # hostname;interval;timestamp;tps;rtps;wtps;dtps;bread/s;bwrtn/s;bdscd/s -SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;1.60;0.00;0.00;1.60;0.00;0.00;1.60 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;32404.56;320.82;32082.13;1.60;0.00;0.00;1.60 # hostname;interval;timestamp;kbmemfree;kbavail;kbmemused;%memused;kbbuffers;kbcached;kbcommit;%commit;kbactive;kbinact;kbdirty;kbanonpg;kbslab;kbkstack;kbpgtbl;kbvmused SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;1437740;4389516;3179712;39.04;260172;2821596;12097852;48.54;4042384;1772396;396;2733164;445740;15328;73760;0 # hostname;interval;timestamp;kbswpfree;kbswpused;%swpused;kbswpcad;%swpcad @@ -2868,6 +2868,9 @@ SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev8-6;0.00;0.00;0.00;0.00;0.00;0.00;0.0 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev8-7;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev8-8;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev8-9;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev104-0;32402.95;0.00;0.00;0.00;0.00;0.00;0.10;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev104-1;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 +SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev104-2;32402.95;0.00;0.00;0.00;0.00;0.00;0.10;0.00 # hostname;interval;timestamp;IFACE;rxpck/s;txpck/s;rxkB/s;txkB/s;rxcmp/s;txcmp/s;rxmcst/s;%ifutil SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;lo;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;virbr0-nic;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00 diff --git a/tests/expected.sadf-g b/tests/expected.sadf-g index fff7b9c..6d7acab 100644 --- a/tests/expected.sadf-g +++ b/tests/expected.sadf-g @@ -1,6 +1,6 @@ - + Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/2019 _x86_64_ (8 CPU) @@ -1004,22 +1004,18 @@ (Min, Max values) -tps (0.00, 5.44) -rtps (0.00, 2.24) -wtps (0.00, 3.20) +tps (0.00, 32404.56) +rtps (0.00, 320.82) +wtps (0.00, 32082.13) dtps (0.00, 1.60) 0. - -1. - -2. - -3. - -4. - -5. + +10000. + +20000. + +30000. 13:20:09 @@ -1043,10 +1039,10 @@ 13:54:29 UTC - - - - + + + + I/O and transfer rate statistics (2) @@ -5076,7 +5072,619 @@ - + + +Block devices statistics (1) [dev104-0] +(Min, Max values) + + +tps (32402.95, 32402.95) + +0. + +10000. + +20000. + +30000. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + +Block devices statistics (2) [dev104-0] +(Min, Max values) + + +rkB/s (0.00, 0.00) +wkB/s (0.00, 0.00) +dkB/s (0.00, 0.00) + +0.00. + +0.33. + +0.67. + +1.00. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + + +Block devices statistics (3) [dev104-0] +(Min, Max values) + + +areq-sz (0.00, 0.00) +aqu-sz (0.00, 0.00) + +0.00. + +0.33. + +0.67. + +1.00. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + +Block devices statistics (4) [dev104-0] +(Min, Max values) + + +await (0.10, 0.10) + +0.00. + +0.03. + +0.07. + +0.10. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + +Block devices statistics (5) [dev104-0] +(Min, Max values) + + +%util (0.00, 0.00) + +0. + +25. + +50. + +75. + +100. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + +Block devices statistics (1) [dev104-1] +(Min, Max values) + + +tps (0.00, 0.00) + +0.00. + +0.33. + +0.67. + +1.00. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + +Block devices statistics (2) [dev104-1] +(Min, Max values) + + +rkB/s (0.00, 0.00) +wkB/s (0.00, 0.00) +dkB/s (0.00, 0.00) + +0.00. + +0.33. + +0.67. + +1.00. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + + +Block devices statistics (3) [dev104-1] +(Min, Max values) + + +areq-sz (0.00, 0.00) +aqu-sz (0.00, 0.00) + +0.00. + +0.33. + +0.67. + +1.00. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + +Block devices statistics (4) [dev104-1] +(Min, Max values) + + +await (0.00, 0.00) + +0.00. + +0.33. + +0.67. + +1.00. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + +Block devices statistics (5) [dev104-1] +(Min, Max values) + + +%util (0.00, 0.00) + +0. + +25. + +50. + +75. + +100. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + +Block devices statistics (1) [dev104-2] +(Min, Max values) + + +tps (32402.95, 32402.95) + +0. + +10000. + +20000. + +30000. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + +Block devices statistics (2) [dev104-2] +(Min, Max values) + + +rkB/s (0.00, 0.00) +wkB/s (0.00, 0.00) +dkB/s (0.00, 0.00) + +0.00. + +0.33. + +0.67. + +1.00. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + + +Block devices statistics (3) [dev104-2] +(Min, Max values) + + +areq-sz (0.00, 0.00) +aqu-sz (0.00, 0.00) + +0.00. + +0.33. + +0.67. + +1.00. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + + +Block devices statistics (4) [dev104-2] +(Min, Max values) + + +await (0.10, 0.10) + +0.00. + +0.03. + +0.07. + +0.10. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + +Block devices statistics (5) [dev104-2] +(Min, Max values) + + +%util (0.00, 0.00) + +0. + +25. + +50. + +75. + +100. + +13:20:09 + +13:23:35 + +13:27:01 + +13:30:27 + +13:33:53 + +13:37:19 + +13:40:45 + +13:44:11 + +13:47:37 + +13:51:03 + +13:54:29 +UTC + + + Network interfaces statistics (1) [lo] (Min, Max values) @@ -5243,7 +5851,7 @@ UTC - + Network interfaces statistics (1) [virbr0-nic] (Min, Max values) @@ -5410,7 +6018,7 @@ UTC - + Network interfaces statistics (1) [enp6s0] (Min, Max values) @@ -5582,7 +6190,7 @@ - + Network interfaces statistics (1) [virbr0] (Min, Max values) @@ -5749,7 +6357,7 @@ UTC - + Network interfaces statistics (1) [wlp5s0] (Min, Max values) @@ -5916,7 +6524,7 @@ UTC - + Network interfaces statistics (1) [enp6s1] (Min, Max values) @@ -6092,7 +6700,7 @@ - + Network interfaces statistics (1) [wlp5s1] (Min, Max values) @@ -6259,7 +6867,7 @@ UTC - + Network interfaces statistics (1) [enp6s2] (Min, Max values) @@ -6428,7 +7036,7 @@ UTC - + Network interfaces statistics (1) [wlp5s2] (Min, Max values) @@ -6595,7 +7203,7 @@ UTC - + Network interfaces errors statistics (1) [lo] (Min, Max values) @@ -6763,7 +7371,7 @@ - + Network interfaces errors statistics (1) [virbr0-nic] (Min, Max values) @@ -6931,7 +7539,7 @@ - + Network interfaces errors statistics (1) [enp6s0] (Min, Max values) @@ -7099,7 +7707,7 @@ - + Network interfaces errors statistics (1) [virbr0] (Min, Max values) @@ -7267,7 +7875,7 @@ - + Network interfaces errors statistics (1) [wlp5s0] (Min, Max values) @@ -7435,7 +8043,7 @@ - + Network interfaces errors statistics (1) [enp6s1] (Min, Max values) @@ -7603,7 +8211,7 @@ - + Network interfaces errors statistics (1) [wlp5s1] (Min, Max values) @@ -7771,7 +8379,7 @@ - + Network interfaces errors statistics (1) [enp6s2] (Min, Max values) @@ -7939,7 +8547,7 @@ - + Network interfaces errors statistics (1) [wlp5s2] (Min, Max values) @@ -8107,7 +8715,7 @@ - + NFS client statistics (1) (Min, Max values) @@ -8232,7 +8840,7 @@ - + NFS server statistics (1) (Min, Max values) @@ -8441,7 +9049,7 @@ - + IPv4 sockets statistics (1) (Min, Max values) @@ -8529,7 +9137,7 @@ - + IPv4 traffic statistics (1) (Min, Max values) @@ -8658,7 +9266,7 @@ - + IPv4 traffic errors statistics (1) (Min, Max values) @@ -8787,7 +9395,7 @@ - + ICMPv4 traffic statistics (1) (Min, Max values) @@ -8965,7 +9573,7 @@ - + ICMPv4 traffic errors statistics (1) (Min, Max values) @@ -9213,7 +9821,7 @@ - + TCPv4 traffic statistics (1) (Min, Max values) @@ -9297,7 +9905,7 @@ - + TCPv4 traffic errors statistics (1) (Min, Max values) @@ -9383,7 +9991,7 @@ - + UDPv4 traffic statistics (1) (Min, Max values) @@ -9467,7 +10075,7 @@ - + IPv6 sockets statistics (Min, Max values) @@ -9514,7 +10122,7 @@ - + IPv6 traffic statistics (1) (Min, Max values) @@ -9684,7 +10292,7 @@ - + IPv6 traffic errors statistics (1) (Min, Max values) @@ -9856,7 +10464,7 @@ - + ICMPv6 traffic statistics (1) (Min, Max values) @@ -10077,7 +10685,7 @@ - + ICMPv6 traffic errors statistics (1) (Min, Max values) @@ -10323,7 +10931,7 @@ - + UDPv6 traffic statistics (1) (Min, Max values) @@ -10407,7 +11015,7 @@ - + Fibre Channel HBA statistics (1) [host0] (Min, Max values) @@ -10491,7 +11099,7 @@ - + Fibre Channel HBA statistics (1) [host1] (Min, Max values) @@ -10575,7 +11183,7 @@ - + Software-based network processing statistics (1) [all] (Min, Max values) @@ -10661,7 +11269,7 @@ - + Software-based network processing statistics (1) [0] (Min, Max values) @@ -10747,7 +11355,7 @@ - + Software-based network processing statistics (1) [1] (Min, Max values) @@ -10833,7 +11441,7 @@ - + Software-based network processing statistics (1) [2] (Min, Max values) @@ -10919,7 +11527,7 @@ - + Software-based network processing statistics (1) [3] (Min, Max values) @@ -11005,7 +11613,7 @@ - + Software-based network processing statistics (1) [4] (Min, Max values) @@ -11091,7 +11699,7 @@ - + Software-based network processing statistics (1) [5] (Min, Max values) @@ -11177,7 +11785,7 @@ - + Software-based network processing statistics (1) [6] (Min, Max values) @@ -11263,7 +11871,7 @@ - + Software-based network processing statistics (1) [7] (Min, Max values) @@ -11349,7 +11957,7 @@ - + Software-based network processing statistics (1) [8] (Min, Max values) @@ -11435,7 +12043,7 @@ - + Software-based network processing statistics (1) [9] (Min, Max values) @@ -11521,7 +12129,7 @@ - + CPU clock frequency [all] (Min, Max values) @@ -11562,7 +12170,7 @@ - + CPU clock frequency [0] (Min, Max values) @@ -11603,7 +12211,7 @@ - + CPU clock frequency [1] (Min, Max values) @@ -11644,7 +12252,7 @@ - + CPU clock frequency [2] (Min, Max values) @@ -11685,7 +12293,7 @@ - + CPU clock frequency [3] (Min, Max values) @@ -11726,7 +12334,7 @@ - + CPU clock frequency [4] (Min, Max values) @@ -11767,7 +12375,7 @@ - + CPU clock frequency [5] (Min, Max values) @@ -11808,7 +12416,7 @@ - + CPU clock frequency [6] (Min, Max values) @@ -11849,7 +12457,7 @@ - + CPU clock frequency [7] (Min, Max values) @@ -11890,7 +12498,7 @@ - + CPU clock frequency [8] (Min, Max values) @@ -11931,7 +12539,7 @@ - + CPU clock frequency [9] (Min, Max values) @@ -11972,7 +12580,7 @@ - + Filesystems statistics (1) [/dev/sda9] (Min, Max values) @@ -12146,7 +12754,7 @@ - + Filesystems statistics (1) [/dev/sda7] (Min, Max values) @@ -12320,7 +12928,7 @@ - + Filesystems statistics (1) [/dev/sda12] (Min, Max values) @@ -12494,7 +13102,7 @@ - + Filesystems statistics (1) [/dev/sda6] (Min, Max values) @@ -12668,7 +13276,7 @@ - + Filesystems statistics (1) [/dev/sdf] (Min, Max values) @@ -12842,7 +13450,7 @@ - + Filesystems statistics (1) [/dev/sdg] (Min, Max values) @@ -13018,5 +13626,5 @@ - + diff --git a/tests/expected.sadf-j b/tests/expected.sadf-j index 81360b9..0acb213 100644 --- a/tests/expected.sadf-j +++ b/tests/expected.sadf-j @@ -2920,7 +2920,7 @@ ], "swap-pages": {"pswpin": 0.00, "pswpout": 0.00}, "paging": {"pgpgin": 0.00, "pgpgout": 0.00, "fault": 0.00, "majflt": 0.00, "pgfree": 0.00, "pgscank": 0.00, "pgscand": 0.00, "pgsteal": 0.00, "vmeff-percent": 0.00}, - "io": {"tps": 1.60, "io-reads": {"rtps": 0.00, "bread": 0.00}, "io-writes": {"wtps": 0.00, "bwrtn": 0.00}, "io-discard": {"dtps": 1.60, "bdscd": 1.60}}, + "io": {"tps": 32404.56, "io-reads": {"rtps": 320.82, "bread": 0.00}, "io-writes": {"wtps": 32082.13, "bwrtn": 0.00}, "io-discard": {"dtps": 1.60, "bdscd": 1.60}}, "memory": {"memfree": 1437740, "avail": 4389516, "memused": 3179712, "memused-percent": 39.04, "buffers": 260172, "cached": 2821596, "commit": 12097852, "commit-percent": 48.54, "active": 4042384, "inactive": 1772396, "dirty": 396, "anonpg": 2733164, "slab": 445740, "kstack": 15328, "pgtbl": 73760, "vmused": 0, "swpfree": 16777212, "swpused": 0, "swpused-percent": 0.00, "swpcad": 0, "swpcad-percent": 0.00}, "hugepages": {"hugfree": 0, "hugused": 0, "hugused-percent": 0.00, "hugrsvd": 0, "hugsurp": 0}, "kernel": {"dentunusd": 156063, "file-nr": 16704, "inode-nr": 157735, "pty-nr": 4}, @@ -2939,7 +2939,10 @@ {"disk-device": "dev8-6", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, {"disk-device": "dev8-7", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, {"disk-device": "dev8-8", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, - {"disk-device": "dev8-9", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00} + {"disk-device": "dev8-9", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, + {"disk-device": "dev104-0", "tps": 32402.95, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.10, "util-percent": 0.00}, + {"disk-device": "dev104-1", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00}, + {"disk-device": "dev104-2", "tps": 32402.95, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.10, "util-percent": 0.00} ], "network": { "net-dev": [ diff --git a/tests/expected.sadf-p b/tests/expected.sadf-p index e9103a7..2dcbb69 100644 --- a/tests/expected.sadf-p +++ b/tests/expected.sadf-p @@ -4946,9 +4946,9 @@ SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - pgscank/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - pgscand/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - pgsteal/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - %vmeff 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - tps 1.60 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - rtps 0.00 -SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - wtps 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - tps 32404.56 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - rtps 320.82 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - wtps 32082.13 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - dtps 1.60 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - bread/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC - bwrtn/s 0.00 @@ -5081,6 +5081,30 @@ SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-9 areq-sz 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-9 aqu-sz 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-9 await 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev8-9 %util 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-0 tps 32402.95 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-0 rkB/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-0 wkB/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-0 dkB/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-0 areq-sz 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-0 aqu-sz 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-0 await 0.10 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-0 %util 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-1 tps 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-1 rkB/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-1 wkB/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-1 dkB/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-1 areq-sz 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-1 aqu-sz 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-1 await 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-1 %util 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-2 tps 32402.95 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-2 rkB/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-2 wkB/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-2 dkB/s 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-2 areq-sz 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-2 aqu-sz 0.00 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-2 await 0.10 +SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC dev104-2 %util 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC lo rxpck/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC lo txpck/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:54:35 UTC lo rxkB/s 0.00 diff --git a/tests/expected.sadf-r b/tests/expected.sadf-r index 87d4b12..a7c1324 100644 --- a/tests/expected.sadf-r +++ b/tests/expected.sadf-r @@ -2948,7 +2948,7 @@ # A_PAGE: 1/1 (1) 13:54:35 UTC; pgpgin/s; 2685938; 2685938; pgpgout/s; 1863420; 1863420; fault/s; 60863302; 60863302; majflt/s; 10715; 10715; pgfree/s; 63486798; 63486798; pgscank/s; 0; 0; pgscand/s; 0; 0; pgsteal/s; 0; 0; # A_IO: 1/1 (1) -13:54:35 UTC; tps; 61881; 61931; rtps; 49601; 49601; wtps; 12180; 12180; dtps; 100; 150; bread/s; 3195498; 3195498; bwrtn/s; 821088; 821088; bdscd/s; 100; 150; +13:54:35 UTC; tps; 5153409; 6163459; rtps; 85418; 95418; wtps; 5067891; 6067891; dtps; 100; 150; bread/s; 3195498; 3195498; bwrtn/s; 821088; 821088; bdscd/s; 100; 150; # A_MEMORY: 1/1 (1) 13:54:35 UTC; kbmemfree; 1437740; kbavail; 4389516; kbttlmem; 8144960; kbbuffers; 260172; kbcached; 2821596; kbcommit; 12097852; kbactive; 4042384; kbinact; 1772396; kbdirty; 396; kbanonpg; 2733164; kbslab; 445740; kbkstack; 15328; kbpgtbl; 73760; kbvmused; 0; # A_MEMORY: 1/1 (1) @@ -2962,7 +2962,7 @@ # A_SERIAL: 2/2 (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; -# A_DISK: 10/19 (19) +# A_DISK: 13/19 (19) 13:54:35 UTC; major; 8; minor; 0; DEV; dev8-0; tps; 61881; 61931; rkB/s; 3195498; 3195498; wkB/s; 821088; 821088; dkB/s; 100; 150; rd_ticks; 623970; 623970; wr_ticks; 117109; 117109; dc_ticks; 100; 150; tot_ticks; 32862; 32862; aqu-sz; 714408; 714408; 13:54:35 UTC; major; 8; minor; 1; DEV; dev8-1; tps; 151; 201; rkB/s; 4216; 4216; wkB/s; 0; 0; dkB/s; 100; 150; rd_ticks; 3107; 3107; wr_ticks; 0; 0; dc_ticks; 100; 150; tot_ticks; 41; 41; aqu-sz; 3086; 3086; 13:54:35 UTC; major; 8; minor; 2; DEV; dev8-2; tps; 47; 47; rkB/s; 4184; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2938; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 33; 33; aqu-sz; 2917; 2917; @@ -2973,6 +2973,9 @@ 13:54:35 UTC; major; 8; minor; 7; DEV; dev8-7; tps; 114; 114; rkB/s; 8874; 8874; wkB/s; 24; 24; dkB/s; 0; 0; rd_ticks; 2612; 2612; wr_ticks; 60; 60; dc_ticks; 0; 0; tot_ticks; 86; 86; aqu-sz; 2624; 2624; 13:54:35 UTC; major; 8; minor; 8; DEV; dev8-8; tps; 58; 58; rkB/s; 4888; 4888; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2510; 2510; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 52; 52; aqu-sz; 2484; 2484; 13:54:35 UTC; major; 8; minor; 9; DEV; dev8-9; tps; 47488; 47488; rkB/s; 2778738; 2778738; wkB/s; 286080; 286080; dkB/s; 0; 0; rd_ticks; 464054; 464054; wr_ticks; 55902; 55902; dc_ticks; 0; 0; tot_ticks; 26401; 26401; aqu-sz; 499574; 499574; +13:54:35 UTC; major; 104; minor; 0; DEV; dev104-0; tps; 5091528; 6101528; rkB/s; 0; 0; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 163484; 263484; wr_ticks; 18832400; 18832400; dc_ticks; 0; 0; tot_ticks; 7365500; 7365500; aqu-sz; 19000180; 19000180; +13:54:35 UTC; major; 104; minor; 1; DEV; dev104-1; tps; 61528; 61528; rkB/s; 0; 0; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 63484; 63484; wr_ticks; 8832400; 8832400; dc_ticks; 0; 0; tot_ticks; 365500; 365500; aqu-sz; 9000180; 9000180; +13:54:35 UTC; major; 104; minor; 2; DEV; dev104-2; tps; 5030000; 6040000; rkB/s; 0; 0; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 100000; 200000; wr_ticks; 10000000; 10000000; dc_ticks; 0; 0; tot_ticks; 7000000; 7000000; aqu-sz; 10000000; 10000000; # A_NET_DEV: 9/10 (5) 13:54:35 UTC; IFACE; lo; rxpck/s; 95831; 95831; txpck/s; 95831; 95831; rxkB/s; 81228574; 81228574; txkB/s; 81228574; 81228574; rxcmp/s; 0; 0; txcmp/s; 0; 0; rxmcst/s; 0; 0; speed; 0; duplex; 0; 13:54:35 UTC; IFACE; virbr0-nic; rxpck/s; 0; 0; txpck/s; 0; 0; rxkB/s; 0; 0; txkB/s; 0; 0; rxcmp/s; 0; 0; txcmp/s; 0; 0; rxmcst/s; 0; 0; speed; 0; duplex; 0; diff --git a/tests/expected.sadf-x b/tests/expected.sadf-x index 1912647..fbfe746 100644 --- a/tests/expected.sadf-x +++ b/tests/expected.sadf-x @@ -3031,9 +3031,9 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - 1.60 - - + 32404.56 + + @@ -3083,6 +3083,9 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> + + + diff --git a/tests/expected.sar-dec b/tests/expected.sar-dec index 107613e..50237e8 100644 --- a/tests/expected.sar-dec +++ b/tests/expected.sar-dec @@ -3969,8 +3969,8 @@ Average: 0 0 Average: 0 0 0 0 0 0 0 0 0 13:54:15 tps rtps wtps dtps bread/s bwrtn/s bdscd/s -13:54:35 2 0 0 2 0 0 2 -Average: 2 0 0 2 0 0 2 +13:54:35 32405 321 32082 2 0 0 2 +Average: 32405 321 32082 2 0 0 2 13:54:15 kbmemfree kbavail kbmemused %memused kbbuffers kbcached kbcommit %commit kbactive kbinact kbdirty kbanonpg kbslab kbkstack kbpgtbl kbvmused 13:54:35 1437740 4389516 3179712 39 260172 2821596 12097852 49 4042384 1772396 396 2733164 445740 15328 73760 0 @@ -4009,6 +4009,9 @@ Average: 1 0 0 0 0 0 13:54:35 dev8-7 0 0 0 0 0 0 0 0 13:54:35 dev8-8 0 0 0 0 0 0 0 0 13:54:35 dev8-9 0 0 0 0 0 0 0 0 +13:54:35 dev104-0 32403 0 0 0 0 0 0 0 +13:54:35 dev104-1 0 0 0 0 0 0 0 0 +13:54:35 dev104-2 32403 0 0 0 0 0 0 0 Average: dev8-0 2 0 0 1 0 0 1 0 Average: dev8-1 2 0 0 1 0 0 1 0 Average: dev8-2 0 0 0 0 0 0 0 0 @@ -4019,6 +4022,9 @@ Average: dev8-6 0 0 0 0 0 Average: dev8-7 0 0 0 0 0 0 0 0 Average: dev8-8 0 0 0 0 0 0 0 0 Average: dev8-9 0 0 0 0 0 0 0 0 +Average: dev104-0 32403 0 0 0 0 0 0 0 +Average: dev104-1 0 0 0 0 0 0 0 0 +Average: dev104-2 32403 0 0 0 0 0 0 0 13:54:15 IFACE rxpck/s txpck/s rxkB/s txkB/s rxcmp/s txcmp/s rxmcst/s %ifutil 13:54:35 lo 0 0 0 0 0 0 0 0 diff --git a/tests/expected.sar-human b/tests/expected.sar-human index 64574e6..91c8d15 100644 --- a/tests/expected.sar-human +++ b/tests/expected.sar-human @@ -3969,8 +3969,8 @@ Average: 0.00 0.00 Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.0% 13:54:15 tps rtps wtps dtps bread/s bwrtn/s bdscd/s -13:54:35 1.60 0.00 0.00 1.60 0.00 0.00 1.60 -Average: 1.60 0.00 0.00 1.60 0.00 0.00 1.60 +13:54:35 32404.56 320.82 32082.13 1.60 0.00 0.00 1.60 +Average: 32404.56 320.82 32082.13 1.60 0.00 0.00 1.60 13:54:15 kbmemfree kbavail kbmemused %memused kbbuffers kbcached kbcommit %commit kbactive kbinact kbdirty kbanonpg kbslab kbkstack kbpgtbl kbvmused 13:54:35 1.4G 4.2G 3.0G 39.0% 254.1M 2.7G 11.5G 48.5% 3.9G 1.7G 396.0k 2.6G 435.3M 15.0M 72.0M 0.0k @@ -4009,6 +4009,9 @@ Average: 1 0.00 0.00 0.00 0.00 0.00 0.0 13:54:35 dev8-7 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 13:54:35 dev8-8 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 13:54:35 dev8-9 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% +13:54:35 dev104-0 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% +13:54:35 dev104-1 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% +13:54:35 dev104-2 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% Average: dev8-0 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% Average: dev8-1 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% Average: dev8-2 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% @@ -4019,6 +4022,9 @@ Average: dev8-6 0.00 0.0k 0.0k 0.0k 0.0k 0.0 Average: dev8-7 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% Average: dev8-8 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% Average: dev8-9 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% +Average: dev104-0 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% +Average: dev104-1 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% +Average: dev104-2 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% 13:54:15 IFACE rxpck/s txpck/s rxkB/s txkB/s rxcmp/s txcmp/s rxmcst/s %ifutil 13:54:35 lo 0.00 0.00 0.0B 0.0B 0.00 0.00 0.00 0.0% diff --git a/tests/expected.sar-jUUID b/tests/expected.sar-jUUID index f8c7cd7..4b165af 100644 --- a/tests/expected.sar-jUUID +++ b/tests/expected.sar-jUUID @@ -90,6 +90,9 @@ Average: 1.08 39.9k 0.1k 0.0k 37.2k 0.03 21.8 13:54:35 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc 13:54:35 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 63b74fd4-4fa8-4ff5-99a8-047d61bea682 13:54:35 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% fe9a021c-3148-41f7-a04b-97442a7eae73 +13:54:35 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% cciss/c0d0 +13:54:35 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% cciss/c0d0p1 +13:54:35 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% cciss/c0d0p2 Average: 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% sda Average: 1.60 0.0k 0.0k 0.8k 0.5k 0.00 1.00 0.0% E27E37357E370239 Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% A6B4E393B4E36471 @@ -100,3 +103,6 @@ Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.0 Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% 63b74fd4-4fa8-4ff5-99a8-047d61bea682 Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% fe9a021c-3148-41f7-a04b-97442a7eae73 +Average: 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% cciss/c0d0 +Average: 0.00 0.0k 0.0k 0.0k 0.0k 0.00 0.00 0.0% cciss/c0d0p1 +Average: 32402.95 0.0k 0.0k 0.0k 0.0k 0.00 0.10 0.0% cciss/c0d0p2 diff --git a/tests/expected2.sadf-g b/tests/expected2.sadf-g index 551d01c..e925794 100644 --- a/tests/expected2.sadf-g +++ b/tests/expected2.sadf-g @@ -1,6 +1,6 @@ - + Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/2019 _x86_64_ (8 CPU) @@ -1018,25 +1018,21 @@ (Min, Max values) -tps (0.00, 5.44) -rtps (0.00, 2.24) -wtps (0.00, 3.20) -dtps (0.00, 1.60) +tps (0.00, 32404.56) +rtps x100 (0.00, 32082.13) +wtps (0.00, 32082.13) +dtps x10000 (0.00, 16041.07) SYSSTAT.TEST 04/18/2019 0. - -1. - -2. - -3. - -4. - -5. + +10000. + +20000. + +30000. 0:00 @@ -1063,10 +1059,10 @@ 22:00 0:00 - - - - + + + + I/O and transfer rate statistics (2) @@ -2913,7 +2909,191 @@ - + + +Block devices statistics (1) [dev104-0] +(Min, Max values) + + +tps (32402.95, 32402.95) +SYSSTAT.TEST +04/18/2019 + + +0. + +10000. + +20000. + +30000. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + +Block devices statistics (4) [dev104-0] +(Min, Max values) + + +await (0.10, 0.10) +SYSSTAT.TEST +04/18/2019 + + +0.00. + +0.03. + +0.07. + +0.10. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + + +Block devices statistics (1) [dev104-2] +(Min, Max values) + + +tps (32402.95, 32402.95) +SYSSTAT.TEST +04/18/2019 + + +0. + +10000. + +20000. + +30000. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + +Block devices statistics (4) [dev104-2] +(Min, Max values) + + +await (0.10, 0.10) +SYSSTAT.TEST +04/18/2019 + + +0.00. + +0.03. + +0.07. + +0.10. + + 0:00 + + 2:00 + + 4:00 + + 6:00 + + 8:00 + +10:00 + +12:00 + +14:00 + +16:00 + +18:00 + +20:00 + +22:00 + + 0:00 + + + + Network interfaces statistics (1) [enp6s0] (Min, Max values) @@ -3109,7 +3289,7 @@ - + Network interfaces statistics (1) [enp6s1] (Min, Max values) @@ -3260,7 +3440,7 @@ - + Network interfaces statistics (1) [wlp5s1] (Min, Max values) @@ -3356,7 +3536,7 @@ - + Network interfaces statistics (1) [enp6s2] (Min, Max values) @@ -3503,7 +3683,7 @@ - + Network interfaces statistics (1) [wlp5s2] (Min, Max values) @@ -3599,7 +3779,7 @@ - + Network interfaces errors statistics (4) [wlp5s1] (Min, Max values) @@ -3650,7 +3830,7 @@ - + IPv4 sockets statistics (1) (Min, Max values) @@ -3750,7 +3930,7 @@ - + IPv6 sockets statistics (Min, Max values) @@ -3803,7 +3983,7 @@ - + Fibre Channel HBA statistics (1) [host1] (Min, Max values) @@ -3899,7 +4079,7 @@ - + CPU clock frequency [all] (Min, Max values) @@ -3946,7 +4126,7 @@ - + CPU clock frequency [0] (Min, Max values) @@ -3993,7 +4173,7 @@ - + CPU clock frequency [1] (Min, Max values) @@ -4040,7 +4220,7 @@ - + CPU clock frequency [2] (Min, Max values) @@ -4087,7 +4267,7 @@ - + CPU clock frequency [3] (Min, Max values) @@ -4134,7 +4314,7 @@ - + CPU clock frequency [4] (Min, Max values) @@ -4181,7 +4361,7 @@ - + CPU clock frequency [5] (Min, Max values) @@ -4228,7 +4408,7 @@ - + CPU clock frequency [6] (Min, Max values) @@ -4275,7 +4455,7 @@ - + CPU clock frequency [7] (Min, Max values) @@ -4322,7 +4502,7 @@ - + CPU clock frequency [8] (Min, Max values) @@ -4369,7 +4549,7 @@ - + CPU clock frequency [9] (Min, Max values) @@ -4416,7 +4596,7 @@ - + Filesystems statistics (1) [/dev/sda9] (Min, Max values) @@ -4614,7 +4794,7 @@ - + Filesystems statistics (1) [/dev/sda7] (Min, Max values) @@ -4812,7 +4992,7 @@ - + Filesystems statistics (1) [/dev/sda12] (Min, Max values) @@ -5010,7 +5190,7 @@ - + Filesystems statistics (1) [/dev/sda6] (Min, Max values) @@ -5208,7 +5388,7 @@ - + Filesystems statistics (1) [/dev/sdf] (Min, Max values) @@ -5357,7 +5537,7 @@ - + Filesystems statistics (1) [/dev/sdg] (Min, Max values) @@ -5557,5 +5737,5 @@ - + diff --git a/tests/expected2.sar-all b/tests/expected2.sar-all index 0ecd7bb..6737502 100644 --- a/tests/expected2.sar-all +++ b/tests/expected2.sar-all @@ -3969,8 +3969,8 @@ Average: 0.00 0.00 Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:54:15 tps rtps wtps dtps bread/s bwrtn/s bdscd/s -13:54:35 1.60 0.00 0.00 1.60 0.00 0.00 1.60 -Average: 1.60 0.00 0.00 1.60 0.00 0.00 1.60 +13:54:35 32404.56 320.82 32082.13 1.60 0.00 0.00 1.60 +Average: 32404.56 320.82 32082.13 1.60 0.00 0.00 1.60 13:54:15 kbmemfree kbavail kbmemused %memused kbbuffers kbcached kbcommit %commit kbactive kbinact kbdirty kbanonpg kbslab kbkstack kbpgtbl kbvmused 13:54:35 1437740 4389516 3179712 39.04 260172 2821596 12097852 48.54 4042384 1772396 396 2733164 445740 15328 73760 0 @@ -4009,6 +4009,9 @@ Average: 1 0.00 0.00 0.00 0.00 0.00 0.0 13:54:35 dev8-7 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:54:35 dev8-8 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:54:35 dev8-9 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:54:35 dev104-0 32402.95 0.00 0.00 0.00 0.00 0.00 0.10 0.00 +13:54:35 dev104-1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:54:35 dev104-2 32402.95 0.00 0.00 0.00 0.00 0.00 0.10 0.00 Average: dev8-0 1.60 0.00 0.00 0.80 0.50 0.00 1.00 0.00 Average: dev8-1 1.60 0.00 0.00 0.80 0.50 0.00 1.00 0.00 Average: dev8-2 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 @@ -4019,6 +4022,9 @@ Average: dev8-6 0.00 0.00 0.00 0.00 0.00 0.0 Average: dev8-7 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average: dev8-8 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 Average: dev8-9 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +Average: dev104-0 32402.95 0.00 0.00 0.00 0.00 0.00 0.10 0.00 +Average: dev104-1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +Average: dev104-2 32402.95 0.00 0.00 0.00 0.00 0.00 0.10 0.00 13:54:15 IFACE rxpck/s txpck/s rxkB/s txkB/s rxcmp/s txcmp/s rxmcst/s %ifutil 13:54:35 lo 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 diff --git a/tests/root.README b/tests/root.README index 9107bfa..4d95641 100644 --- a/tests/root.README +++ b/tests/root.README @@ -47,6 +47,7 @@ Old kernel format, with no steal/guest/guest_nice fields. /proc/diskstats sda10, sda11, sda12: unregistered +cciss/c0d0* registered /proc/net/dev enp6s0-2,wlp5s0-2: available diff --git a/tests/root6/dev/cciss/c0d0 b/tests/root6/dev/cciss/c0d0 new file mode 100644 index 0000000..2b6c2b5 --- /dev/null +++ b/tests/root6/dev/cciss/c0d0 @@ -0,0 +1 @@ +104 0 diff --git a/tests/root6/dev/cciss/c0d0p1 b/tests/root6/dev/cciss/c0d0p1 new file mode 100644 index 0000000..9dc79ec --- /dev/null +++ b/tests/root6/dev/cciss/c0d0p1 @@ -0,0 +1 @@ +104 1 diff --git a/tests/root6/dev/cciss/c0d0p2 b/tests/root6/dev/cciss/c0d0p2 new file mode 100644 index 0000000..16be9fd --- /dev/null +++ b/tests/root6/dev/cciss/c0d0p2 @@ -0,0 +1 @@ +104 2 diff --git a/tests/root6/proc/diskstats b/tests/root6/proc/diskstats index 9c20922..0cc5f16 100644 --- a/tests/root6/proc/diskstats +++ b/tests/root6/proc/diskstats @@ -13,3 +13,6 @@ 8 64 sde 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 32 sdc 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 48 sdd 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 104 0 cciss/c0d0 35817 15211 0 163484 5055711 16279213 0 18832400 0 7365500 19000180 + 104 1 cciss/c0d0p1 5817 5211 0 63484 055711 6279213 0 8832400 0 365500 9000180 + 104 2 cciss/c0d0p2 30000 10000 0 100000 5000000 10000000 0 10000000 0 7000000 10000000 diff --git a/tests/root6/sys/block/_list b/tests/root6/sys/block/_list index b6de75b..d0c2d6b 100644 --- a/tests/root6/sys/block/_list +++ b/tests/root6/sys/block/_list @@ -1,5 +1,6 @@ . .. +cciss!c0d0 sda sdb sdc diff --git a/tests/root6/sys/block/cciss!c0d0/_list b/tests/root6/sys/block/cciss!c0d0/_list new file mode 100644 index 0000000..aab23c0 --- /dev/null +++ b/tests/root6/sys/block/cciss!c0d0/_list @@ -0,0 +1,6 @@ +. +.. +cciss!c0d0p1 +cciss!c0d0p2 +device +stat diff --git a/tests/root6/sys/block/cciss!c0d0/cciss!c0d0p1/stat b/tests/root6/sys/block/cciss!c0d0/cciss!c0d0p1/stat new file mode 100644 index 0000000..1693245 --- /dev/null +++ b/tests/root6/sys/block/cciss!c0d0/cciss!c0d0p1/stat @@ -0,0 +1 @@ +5817 5211 0 63484 055711 6279213 0 8832400 0 365500 9000180 diff --git a/tests/root6/sys/block/cciss!c0d0/cciss!c0d0p2/stat b/tests/root6/sys/block/cciss!c0d0/cciss!c0d0p2/stat new file mode 100644 index 0000000..97ae3f1 --- /dev/null +++ b/tests/root6/sys/block/cciss!c0d0/cciss!c0d0p2/stat @@ -0,0 +1 @@ +30000 10000 0 100000 5000000 10000000 0 10000000 0 7000000 10000000 diff --git a/tests/root6/sys/block/cciss!c0d0/device/_void b/tests/root6/sys/block/cciss!c0d0/device/_void new file mode 100644 index 0000000..e69de29 diff --git a/tests/root6/sys/block/cciss!c0d0/stat b/tests/root6/sys/block/cciss!c0d0/stat new file mode 100644 index 0000000..e5218d1 --- /dev/null +++ b/tests/root6/sys/block/cciss!c0d0/stat @@ -0,0 +1 @@ +35817 15211 0 163484 5055711 16279213 0 18832400 0 7365500 19000180 diff --git a/tests/root6/sys/dev/block/104:0 b/tests/root6/sys/dev/block/104:0 new file mode 120000 index 0000000..ee39d6c --- /dev/null +++ b/tests/root6/sys/dev/block/104:0 @@ -0,0 +1 @@ +../../block/cciss!c0d0/ \ No newline at end of file diff --git a/tests/root6/sys/dev/block/104:1 b/tests/root6/sys/dev/block/104:1 new file mode 120000 index 0000000..f7e3138 --- /dev/null +++ b/tests/root6/sys/dev/block/104:1 @@ -0,0 +1 @@ +../../block/cciss!c0d0/cciss!c0d0p1/ \ No newline at end of file diff --git a/tests/root6/sys/dev/block/104:2 b/tests/root6/sys/dev/block/104:2 new file mode 120000 index 0000000..277a35f --- /dev/null +++ b/tests/root6/sys/dev/block/104:2 @@ -0,0 +1 @@ +../../block/cciss!c0d0/cciss!c0d0p2/ \ No newline at end of file diff --git a/tests/root7/dev/cciss/c0d0 b/tests/root7/dev/cciss/c0d0 new file mode 100644 index 0000000..2b6c2b5 --- /dev/null +++ b/tests/root7/dev/cciss/c0d0 @@ -0,0 +1 @@ +104 0 diff --git a/tests/root7/dev/cciss/c0d0p1 b/tests/root7/dev/cciss/c0d0p1 new file mode 100644 index 0000000..9dc79ec --- /dev/null +++ b/tests/root7/dev/cciss/c0d0p1 @@ -0,0 +1 @@ +104 1 diff --git a/tests/root7/dev/cciss/c0d0p2 b/tests/root7/dev/cciss/c0d0p2 new file mode 100644 index 0000000..16be9fd --- /dev/null +++ b/tests/root7/dev/cciss/c0d0p2 @@ -0,0 +1 @@ +104 2 diff --git a/tests/root7/proc/diskstats b/tests/root7/proc/diskstats index 736bee0..ab39edb 100644 --- a/tests/root7/proc/diskstats +++ b/tests/root7/proc/diskstats @@ -13,3 +13,6 @@ 8 64 sde 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 32 sdc 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 48 sdd 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 104 0 cciss/c0d0 45817 25211 0 263484 6055711 16279213 0 18832400 0 7365500 19000180 + 104 1 cciss/c0d0p1 5817 5211 0 63484 055711 6279213 0 8832400 0 365500 9000180 + 104 2 cciss/c0d0p2 40000 20000 0 200000 6000000 10000000 0 10000000 0 7000000 10000000 diff --git a/tests/root7/sys/block/_list b/tests/root7/sys/block/_list index b6de75b..d0c2d6b 100644 --- a/tests/root7/sys/block/_list +++ b/tests/root7/sys/block/_list @@ -1,5 +1,6 @@ . .. +cciss!c0d0 sda sdb sdc diff --git a/tests/root7/sys/block/cciss!c0d0/_list b/tests/root7/sys/block/cciss!c0d0/_list new file mode 100644 index 0000000..aab23c0 --- /dev/null +++ b/tests/root7/sys/block/cciss!c0d0/_list @@ -0,0 +1,6 @@ +. +.. +cciss!c0d0p1 +cciss!c0d0p2 +device +stat diff --git a/tests/root7/sys/block/cciss!c0d0/cciss!c0d0p1/stat b/tests/root7/sys/block/cciss!c0d0/cciss!c0d0p1/stat new file mode 100644 index 0000000..1693245 --- /dev/null +++ b/tests/root7/sys/block/cciss!c0d0/cciss!c0d0p1/stat @@ -0,0 +1 @@ +5817 5211 0 63484 055711 6279213 0 8832400 0 365500 9000180 diff --git a/tests/root7/sys/block/cciss!c0d0/cciss!c0d0p2/stat b/tests/root7/sys/block/cciss!c0d0/cciss!c0d0p2/stat new file mode 100644 index 0000000..375edc5 --- /dev/null +++ b/tests/root7/sys/block/cciss!c0d0/cciss!c0d0p2/stat @@ -0,0 +1 @@ +40000 20000 0 200000 6000000 10000000 0 10000000 0 7000000 10000000 diff --git a/tests/root7/sys/block/cciss!c0d0/device/_void b/tests/root7/sys/block/cciss!c0d0/device/_void new file mode 100644 index 0000000..e69de29 diff --git a/tests/root7/sys/block/cciss!c0d0/stat b/tests/root7/sys/block/cciss!c0d0/stat new file mode 100644 index 0000000..55c75f8 --- /dev/null +++ b/tests/root7/sys/block/cciss!c0d0/stat @@ -0,0 +1 @@ +45817 25211 0 263484 6055711 16279213 0 18832400 0 7365500 19000180 diff --git a/tests/root7/sys/dev/block/104:0 b/tests/root7/sys/dev/block/104:0 new file mode 120000 index 0000000..ee39d6c --- /dev/null +++ b/tests/root7/sys/dev/block/104:0 @@ -0,0 +1 @@ +../../block/cciss!c0d0/ \ No newline at end of file diff --git a/tests/root7/sys/dev/block/104:1 b/tests/root7/sys/dev/block/104:1 new file mode 120000 index 0000000..f7e3138 --- /dev/null +++ b/tests/root7/sys/dev/block/104:1 @@ -0,0 +1 @@ +../../block/cciss!c0d0/cciss!c0d0p1/ \ No newline at end of file diff --git a/tests/root7/sys/dev/block/104:2 b/tests/root7/sys/dev/block/104:2 new file mode 120000 index 0000000..277a35f --- /dev/null +++ b/tests/root7/sys/dev/block/104:2 @@ -0,0 +1 @@ +../../block/cciss!c0d0/cciss!c0d0p2/ \ No newline at end of file