Update non regression tests

Update non regression tests results as device names are now
pretty-printed by default with sar.
Also test new option --pretty.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/tests/00170 b/tests/00170
new file mode 100644 (file)
index 0000000..e3ebfc2
--- /dev/null
+++ b/tests/00170
@@ -0,0 +1 @@
+LC_ALL=C TZ=GMT ./sar --pretty -d -f tests/data.tmp > tests/out.sar-pretty.tmp

diff --git a/tests/00172 b/tests/00172
new file mode 100644 (file)
index 0000000..263f8fa
--- /dev/null
+++ b/tests/00172
@@ -0,0 +1 @@
+diff -u tests/out.sar-pretty.tmp tests/expected.sar-pretty

diff --git a/tests/02080 b/tests/02080
new file mode 100644 (file)
index 0000000..7d054bd
--- /dev/null
+++ b/tests/02080
@@ -0,0 +1,3 @@
+rm -f tests/root
+ln -s root1 tests/root
+LC_ALL=C TZ=GMT ./iostat --pretty -d ALL -p ALL 2 2 > tests/out.iostat-pretty.tmp

diff --git a/tests/02085 b/tests/02085
new file mode 100644 (file)
index 0000000..296604e
--- /dev/null
+++ b/tests/02085
@@ -0,0 +1 @@
+diff -u tests/out.iostat-pretty.tmp tests/expected.iostat-pretty

diff --git a/tests/04560 b/tests/04560
new file mode 100644 (file)
index 0000000..53d38b5
--- /dev/null
+++ b/tests/04560
@@ -0,0 +1,3 @@
+rm -f tests/root
+ln -s root1 tests/root
+LC_ALL=C TZ=GMT ./cifsiostat --pretty 2 3 > tests/out.cifsiostat-pretty.tmp

diff --git a/tests/04565 b/tests/04565
new file mode 100644 (file)
index 0000000..2e83e50
--- /dev/null
+++ b/tests/04565
@@ -0,0 +1 @@
+diff -u tests/out.cifsiostat-pretty.tmp tests/expected.cifsiostat-pretty

diff --git a/tests/TLIST b/tests/TLIST
index 5515086123c8cba116060a530a2f924b6ebc29ac..2e2c7777fecf8059a36218c7b1ec6c2457393303 100644 (file)
--- a/tests/TLIST
+++ b/tests/TLIST
@@ -35,6 +35,8 @@ NOTES:
 00161  LC_ALL=C TZ=GMT ./sar -A -f tests/data.tmp > tests/out2.sar-all.tmp
 00164  diff -u tests/out2.sar-u.tmp tests/expected2.sar-u
 00166  diff -u tests/out2.sar-all.tmp tests/expected2.sar-all
+00170  LC_ALL=C TZ=GMT ./sar --pretty -d -f tests/data.tmp > tests/out.sar-pretty.tmp
+00172  diff -u tests/out.sar-pretty.tmp tests/expected.sar-pretty
 
 =====  sar: Playing with environment variables
 00180  LC_ALL=C TZ=GMT S_TIME_FORMAT=ISO S_COLORS= ./sar -C -u --getenv -f tests/data.tmp > tests/out.sar-ISO.tmp
@@ -346,6 +348,8 @@ NOTES:
 02065  diff -u tests/out.iostat-0.tmp tests/expected.iostat-0
 02070  LC_ALL=C TZ=GMT ./iostat sda sdc 2 3 > tests/out.iostat-list.tmp
 02075  diff -u tests/out.iostat-list.tmp tests/expected.iostat-list
+02080  LC_ALL=C TZ=GMT ./iostat --pretty -d ALL -p ALL 2 2 > tests/out.iostat-pretty.tmp
+02085  diff -u tests/out.iostat-pretty.tmp tests/expected.iostat-pretty
 
 =====  iostat extended statistics
 02110  LC_ALL=C TZ=GMT ./iostat -x 1 2 > tests/out.iostat-x.tmp
@@ -551,6 +555,8 @@ NOTES:
 04545  diff -u tests/out.cifsiostat-dec.tmp tests/expected.cifsiostat-dec
 04550  LC_ALL=C TZ=GMT ./cifsiostat 1 2 > tests/out.cifsiostat-SMB2.tmp
 04555  diff -u tests/out.cifsiostat-SMB2.tmp tests/expected.cifsiostat-SMB2
+04560  LC_ALL=C TZ=GMT ./cifsiostat --pretty 2 3 > tests/out.cifsiostat-pretty.tmp
+04565  diff -u tests/out.cifsiostat-pretty.tmp tests/expected.cifsiostat-pretty
 
 =====  Test cifsiostat error cases
 04600  LC_ALL=C ./cifsiostat -1 2>&1 | grep "Usage:" >/dev/null

diff --git a/tests/expected.cifsiostat-pretty b/tests/expected.cifsiostat-pretty
new file mode 100644 (file)
index 0000000..51b66a8
--- /dev/null
+++ b/tests/expected.cifsiostat-pretty
@@ -0,0 +1,13 @@
+Linux 1.2.3-TEST (SYSSTAT.TEST)        01/01/70        _x86_64_        (8 CPU)
+
+         rB/s         wB/s    rops/s    wops/s         fo/s         fc/s         fd/s Filesystem
+         0.03         0.00      0.00      0.00         0.00         0.00         0.00 \\addr\SHARED
+
+         rB/s         wB/s    rops/s    wops/s         fo/s         fc/s         fd/s Filesystem
+        23.10         3.95      0.19      0.10         0.00         0.00         0.00 \\addr\SHARED
+         2.92         3.30      0.16      0.06         0.16         0.06         0.03 \\server\share1
+
+         rB/s         wB/s    rops/s    wops/s         fo/s         fc/s         fd/s Filesystem
+         0.00         0.00      0.00      0.00         0.10         0.19         0.16 \\addr\SHARED
+        25.93        22.41      0.29      0.38         0.32         0.32         0.32 \\server\share1
+

diff --git a/tests/expected.data-10.3.1 b/tests/expected.data-10.3.1
index 143e16992e34a05c746307c6863fcdf729f7a043..9f5f4c5a27d0242b5d0d2267c502e11204ba9790 100644 (file)
--- a/tests/expected.data-10.3.1
+++ b/tests/expected.data-10.3.1
@@ -1040,30 +1040,30 @@ Average:       131729     10144     65292         3
 Average:            0       594      0.07      0.07      0.08         0
 
 08:15:09          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
-08:15:10       dev8-0      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:15:10       dev8-1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:15:10       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:15:10       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:15:10       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:15:10       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:15:10       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:15:10       dev8-7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:15:10       dev8-8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:15:10       dev8-9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:15:10      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:15:10      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-0      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-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:      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:15:10          sda      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:15:10         sda1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:15:10         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:15:10         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:15:10         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:15:10         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:15:10         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:15:10         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:15:10         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:15:10         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:15:10        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:15:10        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:          sda      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
 
 08:15:09        IFACE   rxpck/s   txpck/s    rxkB/s    txkB/s   rxcmp/s   txcmp/s  rxmcst/s   %ifutil
 08:15:10           lo      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00

diff --git a/tests/expected.data-11.6.5 b/tests/expected.data-11.6.5
index 5c47f3a64fe1f5853cbefdea93e55dd63dc6e998..14b3629686e2e052a0ac899e02b00271b3770466 100644 (file)
--- a/tests/expected.data-11.6.5
+++ b/tests/expected.data-11.6.5
@@ -1051,32 +1051,32 @@ Average:            1       911      0.10      0.07      0.08         0
 09:34:30     COM Hello, world!
 
 09:33:48          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
-09:34:34       dev8-0      5.93     55.16    173.42      0.00     38.57      0.04      6.68      1.22
-09:34:34       dev8-1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-09:34:34       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-09:34:34       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-09:34:34       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-09:34:34       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-09:34:34       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-09:34:34       dev8-7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-09:34:34       dev8-8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-09:34:34       dev8-9      4.10     55.16      2.27      0.00     14.02      0.01      1.82      0.64
-09:34:34      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-09:34:34      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-09:34:34      dev8-12      1.83      0.00    171.15      0.00     93.52      0.03     17.54      0.58
-Average:       dev8-0      5.93     55.16    173.42      0.00     38.57      0.04      6.68      1.22
-Average:       dev8-1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-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      4.10     55.16      2.27      0.00     14.02      0.01      1.82      0.64
-Average:      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:      dev8-12      1.83      0.00    171.15      0.00     93.52      0.03     17.54      0.58
+09:34:34          sda      5.93     55.16    173.42      0.00     38.57      0.04      6.68      1.22
+09:34:34         sda1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+09:34:34         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+09:34:34         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+09:34:34         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+09:34:34         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+09:34:34         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+09:34:34         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+09:34:34         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+09:34:34         sda9      4.10     55.16      2.27      0.00     14.02      0.01      1.82      0.64
+09:34:34        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+09:34:34        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+09:34:34        sda12      1.83      0.00    171.15      0.00     93.52      0.03     17.54      0.58
+Average:          sda      5.93     55.16    173.42      0.00     38.57      0.04      6.68      1.22
+Average:         sda1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda9      4.10     55.16      2.27      0.00     14.02      0.01      1.82      0.64
+Average:        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:        sda12      1.83      0.00    171.15      0.00     93.52      0.03     17.54      0.58
 09:34:30     COM Hello, world!
 
 09:33:48        IFACE   rxpck/s   txpck/s    rxkB/s    txkB/s   rxcmp/s   txcmp/s  rxmcst/s   %ifutil

diff --git a/tests/expected.data-12.0.0 b/tests/expected.data-12.0.0
index 5b371a685d8751908c1180b9629b41acf94201db..621fb57eacaf620297af78c1943172d709e19545 100644 (file)
--- a/tests/expected.data-12.0.0
+++ b/tests/expected.data-12.0.0
@@ -1050,33 +1050,33 @@ Average:       108520     14400    122115         2
 Average:            0       826      0.15      0.22      0.26         0
 
 05:39:33          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
-05:39:34       dev8-0      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-05:39:34       dev8-1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-05:39:34       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-05:39:34       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-05:39:34       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-05:39:34       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-05:39:34       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-05:39:34       dev8-7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-05:39:34       dev8-8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-05:39:34       dev8-9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-05:39:34      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-05:39:34      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-05:39:34      dev8-12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+05:39:34          sda      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+05:39:34         sda1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+05:39:34         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+05:39:34         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+05:39:34         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+05:39:34         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+05:39:34         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+05:39:34         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+05:39:34         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+05:39:34         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+05:39:34        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+05:39:34        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+05:39:34        sda12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
 05:40:26     COM Hello world!
-Average:       dev8-0      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-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:      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:      dev8-12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:          sda      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:        sda12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
 
 05:39:33        IFACE   rxpck/s   txpck/s    rxkB/s    txkB/s   rxcmp/s   txcmp/s  rxmcst/s   %ifutil
 05:39:34    virbr0-nic      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00

diff --git a/tests/expected.data-9.1.6 b/tests/expected.data-9.1.6
index de63ad867c626f14fff3e7306994de13963d14b7..962237aece6168998905167cf369cf2185bad396 100644 (file)
--- a/tests/expected.data-9.1.6
+++ b/tests/expected.data-9.1.6
@@ -572,30 +572,30 @@ Average:       131728     10176     65290         3
 Average:            0       594      0.11      0.07      0.08         0
 
 08:17:01          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
-08:17:02       dev8-0      1.00      0.00      4.00      0.00      4.00      0.02     22.00      2.10
-08:17:02       dev8-1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:17:02       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:17:02       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:17:02       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:17:02       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:17:02       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:17:02       dev8-7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:17:02       dev8-8      1.00      0.00      4.00      0.00      4.00      0.02     22.00      2.10
-08:17:02       dev8-9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:17:02      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-08:17:02      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-0      1.00      0.00      4.00      0.00      4.00      0.02     22.00      2.10
-Average:       dev8-1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-8      1.00      0.00      4.00      0.00      4.00      0.02     22.00      2.10
-Average:       dev8-9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:17:02          sda      1.00      0.00      4.00      0.00      4.00      0.02     22.00      2.10
+08:17:02         sda1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:17:02         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:17:02         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:17:02         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:17:02         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:17:02         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:17:02         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:17:02         sda8      1.00      0.00      4.00      0.00      4.00      0.02     22.00      2.10
+08:17:02         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:17:02        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+08:17:02        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:          sda      1.00      0.00      4.00      0.00      4.00      0.02     22.00      2.10
+Average:         sda1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda8      1.00      0.00      4.00      0.00      4.00      0.02     22.00      2.10
+Average:         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
 
 08:17:01        IFACE   rxpck/s   txpck/s    rxkB/s    txkB/s   rxcmp/s   txcmp/s  rxmcst/s   %ifutil
 08:17:02           lo      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00

diff --git a/tests/expected.iostat-pretty b/tests/expected.iostat-pretty
new file mode 100644 (file)
index 0000000..b5913c7
--- /dev/null
+++ b/tests/expected.iostat-pretty
@@ -0,0 +1,45 @@
+Linux 1.2.3-TEST (SYSSTAT.TEST)        01/01/70        _x86_64_        (8 CPU)
+
+      tps    kB_read/s    kB_wrtn/s    kB_dscd/s    kB_read    kB_wrtn    kB_dscd Device
+     8.59       222.14        57.08         0.00    1597749     410544          0 sda
+     0.01         0.29         0.00         0.00       2108          0          0 sda1
+     0.01         0.29         0.00         0.00       2092          0          0 sda2
+     0.01         0.29         0.00         0.00       2100          0          0 sda3
+     0.00         0.00         0.00         0.00         14          0          0 sda4
+     0.01         0.31         0.00         0.00       2252          0          0 sda5
+     0.02         0.62         0.00         0.00       4424         12          0 sda6
+     0.02         0.62         0.00         0.00       4437         12          0 sda7
+     0.01         0.34         0.00         0.00       2444          0          0 sda8
+     6.60       193.17        19.89         0.00    1389369     143040          0 sda9
+     0.01         0.31         0.00         0.00       2220          0          0 sda10
+     0.01         0.31         0.00         0.00       2252          0          0 sda11
+     1.88        25.28        37.19         0.00     181825     267480          0 sda12
+     0.00         0.00         0.00         0.00          0          0          0 sr0
+     0.01         0.29         0.00         0.00       2108          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 dm-2
+
+
+      tps    kB_read/s    kB_wrtn/s    kB_dscd/s    kB_read    kB_wrtn    kB_dscd Device
+     0.00         0.00         0.00         0.00          0          0          0 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 sr0
+     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
+
+

diff --git a/tests/expected.sadf-d b/tests/expected.sadf-d
index 0c6247f5bf3c60fbaabe15a9ad26c2eecd33d3e4..e8973b41e707edc3a406f78a80d98e29aab20982 100644 (file)
--- a/tests/expected.sadf-d
+++ b/tests/expected.sadf-d
@@ -2045,64 +2045,64 @@ SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;1;0.00;0.00;0.00;0.00;0.00;0.00
 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;0;0.00;0.00;0.00;0.00;0.00;0.00
 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;1;0.00;0.00;0.00;0.00;0.00;0.00
 # hostname;interval;timestamp;DEV;tps;rkB/s;wkB/s;dkB/s;areq-sz;aqu-sz;await;%util
-SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;dev8-0;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;dev8-1;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;dev8-2;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;dev8-3;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;dev8-4;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;dev8-5;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;dev8-6;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;dev8-7;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;dev8-8;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;dev8-9;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;dev8-10;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;dev8-11;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;dev8-12;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;dev8-16;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-0;6.40;1.60;1.60;0.00;0.50;0.00;1.00;0.32
-SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-1;6.40;1.60;1.60;0.00;0.50;0.00;1.00;0.32
-SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-2;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-3;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-4;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-5;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-6;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-7;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-8;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-9;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-10;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-11;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-12;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;dev8-16;0.67;22.60;0.00;0.00;33.62;0.10;47.00;0.05
-SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-0;1604.70;41499.97;10663.48;0.00;32.51;18.56;12.00;85.36
-SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-1;1.32;54.75;0.00;0.00;41.33;0.08;60.92;0.11
-SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-2;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-3;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-4;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-5;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-6;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-7;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-8;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-9;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-10;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-11;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-12;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-80;1.22;54.34;0.00;0.00;44.51;0.08;62.51;0.09
-SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;dev8-96;2.91;114.91;0.31;0.00;39.61;0.07;24.75;0.19
-SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;dev8-0;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;dev8-1;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;dev8-2;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;dev8-3;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;dev8-4;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;dev8-5;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;dev8-6;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;dev8-7;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;dev8-8;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;dev8-9;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;dev8-10;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;dev8-11;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;dev8-12;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;dev8-80;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;dev8-96;0.94;22.33;0.22;0.00;24.05;0.04;6.19;0.09
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;sda;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;sda1;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;sda2;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;sda3;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;sda4;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;sda5;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;sda6;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;sda7;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;sda8;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;sda9;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;sda10;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;sda11;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;sda12;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;sdb;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;sda;6.40;1.60;1.60;0.00;0.50;0.00;1.00;0.32
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;sda1;6.40;1.60;1.60;0.00;0.50;0.00;1.00;0.32
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;sda2;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;sda3;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;sda4;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;sda5;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;sda6;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;sda7;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;sda8;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;sda9;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;sda10;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;sda11;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;sda12;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;sdb;0.67;22.60;0.00;0.00;33.62;0.10;47.00;0.05
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sda;1604.70;41499.97;10663.48;0.00;32.51;18.56;12.00;85.36
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sda1;1.32;54.75;0.00;0.00;41.33;0.08;60.92;0.11
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sda2;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sda3;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sda4;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sda5;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sda6;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sda7;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sda8;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sda9;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sda10;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sda11;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sda12;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sdf;1.22;54.34;0.00;0.00;44.51;0.08;62.51;0.09
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;sdg;2.91;114.91;0.31;0.00;39.61;0.07;24.75;0.19
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;sda;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;sda1;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;sda2;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;sda3;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;sda4;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;sda5;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;sda6;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;sda7;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;sda8;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;sda9;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;sda10;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;sda11;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;sda12;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;sdf;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;sdg;0.94;22.33;0.22;0.00;24.05;0.04;6.19;0.09
 # 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:20:19 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:20:19 UTC;virbr0-nic;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
@@ -2873,21 +2873,21 @@ SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;3;956;3.16;3.24;3.43;0
 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;0;0.00;0.00;0.00;0.00;0.00;0.00
 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;1;0.00;0.00;0.00;0.00;0.00;0.00
 # hostname;interval;timestamp;DEV;tps;rkB/s;wkB/s;dkB/s;areq-sz;aqu-sz;await;%util
-SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev8-0;1.60;0.00;0.00;0.80;0.50;0.00;1.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev8-1;1.60;0.00;0.00;0.80;0.50;0.00;1.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev8-2;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev8-3;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev8-4;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00
-SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev8-5;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-6;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-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
-SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev202-240;0.32;16.04;0.00;0.00;50.00;0.00;1.00;0.03
-SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;dev202-4096;0.32;16.04;0.00;0.00;50.00;0.00;1.00;0.03
+SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;sda;1.60;0.00;0.00;0.80;0.50;0.00;1.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;sda1;1.60;0.00;0.00;0.80;0.50;0.00;1.00;0.00
+SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;sda2;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;sda3;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;sda4;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;sda5;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;sda6;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;sda7;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;sda8;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;sda9;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;cciss/c0d0;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;cciss/c0d0p1;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;cciss/c0d0p2;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;xvdp;0.32;16.04;0.00;0.00;50.00;0.00;1.00;0.03
+SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;xvdiw;0.32;16.04;0.00;0.00;50.00;0.00;1.00;0.03
 # 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 e2ca5c168a4ec0133f212b56ac01b27b3db0c421..ce558ae5b7843249b4d72a15e5bec5286b52c9f6 100644 (file)
--- a/tests/expected.sadf-g
+++ b/tests/expected.sadf-g
@@ -1779,7 +1779,7 @@
 </g>
 <g id="g11-0" transform="translate(0,10910)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev8-0]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [sda]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -1818,7 +1818,7 @@
 <path d=" M10,0.00 L20,6.40 L30,1604.70 L40,0.00 M2066,1.60" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.124634)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev8-0]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [sda]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -1863,7 +1863,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.80" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.004819)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev8-0]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [sda]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -1904,7 +1904,7 @@
 <path d=" M10,0.00 L20,0.00 L30,18.56 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-6.152588)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev8-0]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [sda]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -1943,7 +1943,7 @@
 <path d=" M10,0.00 L20,1.00 L30,12.00 L40,0.00 M2066,1.00" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-16.673256)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev8-0]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [sda]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -1988,7 +1988,7 @@
 </g>
 <g id="g11-1" transform="translate(0,12460)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev8-1]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [sda1]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2027,7 +2027,7 @@
 <path d=" M10,0.00 L20,6.40 L30,1.32 L40,0.00 M2066,1.60" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-31.240000)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev8-1]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [sda1]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2074,7 +2074,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.80" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-3.652751)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev8-1]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [sda1]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2117,7 +2117,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.08 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-4.838710)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev8-1]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [sda1]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2156,7 +2156,7 @@
 <path d=" M10,0.00 L20,1.00 L30,60.92 L40,0.00 M2066,1.00" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-3.282910)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev8-1]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [sda1]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2201,7 +2201,7 @@
 </g>
 <g id="g11-2" transform="translate(0,14010)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev8-2]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [sda2]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2240,7 +2240,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev8-2]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [sda2]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2283,7 +2283,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev8-2]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [sda2]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2324,7 +2324,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev8-2]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [sda2]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2363,7 +2363,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev8-2]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [sda2]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2405,7 +2405,7 @@
 </g>
 <g id="g11-3" transform="translate(0,15560)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev8-3]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [sda3]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2444,7 +2444,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev8-3]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [sda3]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2487,7 +2487,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev8-3]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [sda3]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2528,7 +2528,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev8-3]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [sda3]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2567,7 +2567,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev8-3]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [sda3]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2609,7 +2609,7 @@
 </g>
 <g id="g11-4" transform="translate(0,17110)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev8-4]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [sda4]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2648,7 +2648,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev8-4]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [sda4]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2691,7 +2691,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev8-4]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [sda4]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2732,7 +2732,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev8-4]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [sda4]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2771,7 +2771,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev8-4]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [sda4]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2813,7 +2813,7 @@
 </g>
 <g id="g11-5" transform="translate(0,18660)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev8-5]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [sda5]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2852,7 +2852,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev8-5]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [sda5]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2895,7 +2895,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev8-5]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [sda5]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2936,7 +2936,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev8-5]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [sda5]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -2975,7 +2975,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev8-5]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [sda5]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3017,7 +3017,7 @@
 </g>
 <g id="g11-6" transform="translate(0,20210)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev8-6]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [sda6]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3056,7 +3056,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev8-6]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [sda6]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3099,7 +3099,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev8-6]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [sda6]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3140,7 +3140,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev8-6]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [sda6]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3179,7 +3179,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev8-6]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [sda6]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3221,7 +3221,7 @@
 </g>
 <g id="g11-7" transform="translate(0,21760)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev8-7]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [sda7]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3260,7 +3260,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev8-7]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [sda7]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3303,7 +3303,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev8-7]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [sda7]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3344,7 +3344,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev8-7]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [sda7]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3383,7 +3383,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev8-7]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [sda7]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3425,7 +3425,7 @@
 </g>
 <g id="g11-8" transform="translate(0,23310)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev8-8]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [sda8]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3464,7 +3464,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev8-8]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [sda8]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3507,7 +3507,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev8-8]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [sda8]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3548,7 +3548,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev8-8]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [sda8]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3587,7 +3587,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev8-8]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [sda8]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3629,7 +3629,7 @@
 </g>
 <g id="g11-9" transform="translate(0,24860)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev8-9]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [sda9]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3668,7 +3668,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev8-9]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [sda9]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3711,7 +3711,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev8-9]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [sda9]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3752,7 +3752,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev8-9]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [sda9]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3791,7 +3791,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00 M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev8-9]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [sda9]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3833,7 +3833,7 @@
 </g>
 <g id="g11-10" transform="translate(0,26410)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev8-10]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [sda10]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3872,7 +3872,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev8-10]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [sda10]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3915,7 +3915,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev8-10]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [sda10]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3956,7 +3956,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev8-10]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [sda10]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -3995,7 +3995,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev8-10]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [sda10]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4037,7 +4037,7 @@
 </g>
 <g id="g11-11" transform="translate(0,27960)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev8-11]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [sda11]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4076,7 +4076,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev8-11]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [sda11]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4119,7 +4119,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev8-11]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [sda11]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4160,7 +4160,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev8-11]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [sda11]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4199,7 +4199,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev8-11]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [sda11]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4241,7 +4241,7 @@
 </g>
 <g id="g11-12" transform="translate(0,29510)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev8-12]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [sda12]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4280,7 +4280,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev8-12]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [sda12]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4323,7 +4323,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev8-12]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [sda12]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4364,7 +4364,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev8-12]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [sda12]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4403,7 +4403,7 @@
 <path d=" M10,0.00 L20,0.00 L30,0.00 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev8-12]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [sda12]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4445,7 +4445,7 @@
 </g>
 <g id="g11-13" transform="translate(0,31060)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev8-16]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [sdb]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4484,7 +4484,7 @@
 <path d=" M10,0.00 L20,0.67" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-297.523810)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev8-16]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [sdb]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4527,7 +4527,7 @@
 <path d=" M10,0.00 L20,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-8.849858)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev8-16]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [sdb]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4568,7 +4568,7 @@
 <path d=" M10,0.00 L20,0.10" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-5.949008)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev8-16]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [sdb]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4609,7 +4609,7 @@
 <path d=" M10,0.00 L20,47.00" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-4.255319)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev8-16]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [sdb]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4654,7 +4654,7 @@
 </g>
 <g id="g11-14" transform="translate(0,32610)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev8-80]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [sdf]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4693,7 +4693,7 @@
 <path d=" M30,1.22 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-163.829787)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev8-80]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [sdf]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4740,7 +4740,7 @@
 <path d=" M30,0.00 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-3.680688)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev8-80]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [sdf]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4783,7 +4783,7 @@
 <path d=" M30,0.08 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-4.493308)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev8-80]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [sdf]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4822,7 +4822,7 @@
 <path d=" M30,62.51 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-3.199455)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev8-80]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [sdf]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4867,7 +4867,7 @@
 </g>
 <g id="g11-15" transform="translate(0,34160)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev8-96]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [sdg]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4906,7 +4906,7 @@
 <path d=" M30,2.91 L40,0.94" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-68.750000)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev8-96]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [sdg]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4949,7 +4949,7 @@
 <path d=" M30,0.00 L40,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-1.740506)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev8-96]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [sdg]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -4990,7 +4990,7 @@
 <path d=" M30,0.07 L40,0.04" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-5.049594)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev8-96]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [sdg]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5029,7 +5029,7 @@
 <path d=" M30,24.75 L40,6.19" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-8.080808)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev8-96]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [sdg]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5074,7 +5074,7 @@
 </g>
 <g id="g11-16" transform="translate(0,35710)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev104-0]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [cciss/c0d0]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5113,7 +5113,7 @@
 <path d=" M2066,32402.95" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.006172)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev104-0]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [cciss/c0d0]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5156,7 +5156,7 @@
 <path d=" M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev104-0]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [cciss/c0d0]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5197,7 +5197,7 @@
 <path d=" M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev104-0]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [cciss/c0d0]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5236,7 +5236,7 @@
 <path d=" M2066,0.10" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-2020.000000)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev104-0]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [cciss/c0d0]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5278,7 +5278,7 @@
 </g>
 <g id="g11-17" transform="translate(0,37260)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev104-1]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [cciss/c0d0p1]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5317,7 +5317,7 @@
 <path d=" M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev104-1]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [cciss/c0d0p1]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5360,7 +5360,7 @@
 <path d=" M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev104-1]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [cciss/c0d0p1]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5401,7 +5401,7 @@
 <path d=" M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev104-1]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [cciss/c0d0p1]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5440,7 +5440,7 @@
 <path d=" M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev104-1]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [cciss/c0d0p1]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5482,7 +5482,7 @@
 </g>
 <g id="g11-18" transform="translate(0,38810)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev104-2]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [cciss/c0d0p2]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5521,7 +5521,7 @@
 <path d=" M2066,32402.95" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.006172)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev104-2]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [cciss/c0d0p2]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5564,7 +5564,7 @@
 <path d=" M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev104-2]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [cciss/c0d0p2]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5605,7 +5605,7 @@
 <path d=" M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev104-2]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [cciss/c0d0p2]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5644,7 +5644,7 @@
 <path d=" M2066,0.10" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-2020.000000)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev104-2]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [cciss/c0d0p2]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5686,7 +5686,7 @@
 </g>
 <g id="g11-19" transform="translate(0,40360)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev202-240]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [xvdp]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5725,7 +5725,7 @@
 <path d=" M2066,0.32" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-623.400000)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev202-240]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [xvdp]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5768,7 +5768,7 @@
 <path d=" M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-12.468000)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev202-240]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [xvdp]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5813,7 +5813,7 @@
 <path d=" M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-4.000000)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev202-240]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [xvdp]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5852,7 +5852,7 @@
 <path d=" M2066,1.00" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev202-240]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [xvdp]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5897,7 +5897,7 @@
 </g>
 <g id="g11-20" transform="translate(0,41910)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
-<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [dev202-4096]
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Block devices statistics (1) [xvdiw]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5936,7 +5936,7 @@
 <path d=" M2066,0.32" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-623.400000)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
-<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [dev202-4096]
+<text x="0" y="330" style="fill: #ffff00; stroke: none">Block devices statistics (2) [xvdiw]
 <tspan x="795" y="335" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,360 70,560 790,560" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -5979,7 +5979,7 @@
 <path d=" M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #ff0000; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-12.468000)"/>
 </g>
 <rect x="0" y="620" height="300" width="1050" fill="#000000"/>
-<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [dev202-4096]
+<text x="0" y="640" style="fill: #ffff00; stroke: none">Block devices statistics (3) [xvdiw]
 <tspan x="795" y="645" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,670 70,870 790,870" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -6024,7 +6024,7 @@
 <path d=" M2066,0.00" style="vector-effect: non-scaling-stroke; stroke: #0000ff; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-4.000000)"/>
 </g>
 <rect x="0" y="930" height="300" width="1050" fill="#000000"/>
-<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [dev202-4096]
+<text x="0" y="950" style="fill: #ffff00; stroke: none">Block devices statistics (4) [xvdiw]
 <tspan x="795" y="955" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,980 70,1180 790,1180" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>
@@ -6063,7 +6063,7 @@
 <path d=" M2066,1.00" style="vector-effect: non-scaling-stroke; stroke: #006020; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-200.000000)"/>
 </g>
 <rect x="0" y="1240" height="300" width="1050" fill="#000000"/>
-<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [dev202-4096]
+<text x="0" y="1260" style="fill: #ffff00; stroke: none">Block devices statistics (5) [xvdiw]
 <tspan x="795" y="1265" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,1290 70,1490 790,1490" style="fill: #000000; stroke: #ffffff; stroke-width: 2"/>

diff --git a/tests/expected.sadf-j b/tests/expected.sadf-j
index 904655e48b3d4d4979e36b4dc0e90b9315a61a77..9838564ed59a153739318f7c9d22504e60c1ad4c 100644 (file)
--- a/tests/expected.sadf-j
+++ b/tests/expected.sadf-j
@@ -527,20 +527,20 @@
                                                {"line": 1, "rcvin": 0.00, "xmtin": 0.00, "framerr": 0.00, "prtyerr": 0.00, "brk": 0.00, "ovrun": 0.00}
                                        ],
                                        "disk": [
-                                               {"disk-device": "dev8-0", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-1", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-2", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-3", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-4", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-5", "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-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-10", "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-11", "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-12", "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-16", "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": "sda", "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": "sda1", "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": "sda2", "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": "sda3", "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": "sda4", "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": "sda5", "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": "sda6", "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": "sda7", "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": "sda8", "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": "sda9", "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": "sda10", "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": "sda11", "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": "sda12", "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": "sdb", "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}
                                        ],
                                        "network": {
                                                "net-dev": [
@@ -1129,20 +1129,20 @@
                                                {"line": 1, "rcvin": 0.00, "xmtin": 0.00, "framerr": 0.00, "prtyerr": 0.00, "brk": 0.00, "ovrun": 0.00}
                                        ],
                                        "disk": [
-                                               {"disk-device": "dev8-0", "tps": 6.40, "rd_sec": 3.20, "wr_sec": 3.20, "dc_sec": 0.00, "rkB": 1.60, "wkB": 1.60, "dkB": 0.00, "avgrq-sz": 1.00, "areq-sz": 0.50, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 1.00, "util-percent": 0.32},
-                                               {"disk-device": "dev8-1", "tps": 6.40, "rd_sec": 3.20, "wr_sec": 3.20, "dc_sec": 0.00, "rkB": 1.60, "wkB": 1.60, "dkB": 0.00, "avgrq-sz": 1.00, "areq-sz": 0.50, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 1.00, "util-percent": 0.32},
-                                               {"disk-device": "dev8-2", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-3", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-4", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-5", "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-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-10", "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-11", "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-12", "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-16", "tps": 0.67, "rd_sec": 45.20, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 22.60, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 67.24, "areq-sz": 33.62, "avgqu-sz": 0.10, "aqu-sz": 0.10, "await": 47.00, "util-percent": 0.05}
+                                               {"disk-device": "sda", "tps": 6.40, "rd_sec": 3.20, "wr_sec": 3.20, "dc_sec": 0.00, "rkB": 1.60, "wkB": 1.60, "dkB": 0.00, "avgrq-sz": 1.00, "areq-sz": 0.50, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 1.00, "util-percent": 0.32},
+                                               {"disk-device": "sda1", "tps": 6.40, "rd_sec": 3.20, "wr_sec": 3.20, "dc_sec": 0.00, "rkB": 1.60, "wkB": 1.60, "dkB": 0.00, "avgrq-sz": 1.00, "areq-sz": 0.50, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 1.00, "util-percent": 0.32},
+                                               {"disk-device": "sda2", "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": "sda3", "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": "sda4", "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": "sda5", "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": "sda6", "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": "sda7", "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": "sda8", "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": "sda9", "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": "sda10", "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": "sda11", "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": "sda12", "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": "sdb", "tps": 0.67, "rd_sec": 45.20, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 22.60, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 67.24, "areq-sz": 33.62, "avgqu-sz": 0.10, "aqu-sz": 0.10, "await": 47.00, "util-percent": 0.05}
                                        ],
                                        "network": {
                                                "net-dev": [
@@ -1732,21 +1732,21 @@
                                                {"line": 1, "rcvin": 0.00, "xmtin": 0.00, "framerr": 0.00, "prtyerr": 0.00, "brk": 0.00, "ovrun": 0.00}
                                        ],
                                        "disk": [
-                                               {"disk-device": "dev8-0", "tps": 1604.70, "rd_sec": 82999.95, "wr_sec": 21326.96, "dc_sec": 0.00, "rkB": 41499.97, "wkB": 10663.48, "dkB": 0.00, "avgrq-sz": 65.01, "areq-sz": 32.51, "avgqu-sz": 18.56, "aqu-sz": 18.56, "await": 12.00, "util-percent": 85.36},
-                                               {"disk-device": "dev8-1", "tps": 1.32, "rd_sec": 109.51, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 54.75, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 82.67, "areq-sz": 41.33, "avgqu-sz": 0.08, "aqu-sz": 0.08, "await": 60.92, "util-percent": 0.11},
-                                               {"disk-device": "dev8-2", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-3", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-4", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-5", "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-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-10", "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-11", "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-12", "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-80", "tps": 1.22, "rd_sec": 108.68, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 54.34, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 89.02, "areq-sz": 44.51, "avgqu-sz": 0.08, "aqu-sz": 0.08, "await": 62.51, "util-percent": 0.09},
-                                               {"disk-device": "dev8-96", "tps": 2.91, "rd_sec": 229.82, "wr_sec": 0.62, "dc_sec": 0.00, "rkB": 114.91, "wkB": 0.31, "dkB": 0.00, "avgrq-sz": 79.21, "areq-sz": 39.61, "avgqu-sz": 0.07, "aqu-sz": 0.07, "await": 24.75, "util-percent": 0.19}
+                                               {"disk-device": "sda", "tps": 1604.70, "rd_sec": 82999.95, "wr_sec": 21326.96, "dc_sec": 0.00, "rkB": 41499.97, "wkB": 10663.48, "dkB": 0.00, "avgrq-sz": 65.01, "areq-sz": 32.51, "avgqu-sz": 18.56, "aqu-sz": 18.56, "await": 12.00, "util-percent": 85.36},
+                                               {"disk-device": "sda1", "tps": 1.32, "rd_sec": 109.51, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 54.75, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 82.67, "areq-sz": 41.33, "avgqu-sz": 0.08, "aqu-sz": 0.08, "await": 60.92, "util-percent": 0.11},
+                                               {"disk-device": "sda2", "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": "sda3", "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": "sda4", "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": "sda5", "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": "sda6", "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": "sda7", "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": "sda8", "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": "sda9", "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": "sda10", "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": "sda11", "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": "sda12", "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": "sdf", "tps": 1.22, "rd_sec": 108.68, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 54.34, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 89.02, "areq-sz": 44.51, "avgqu-sz": 0.08, "aqu-sz": 0.08, "await": 62.51, "util-percent": 0.09},
+                                               {"disk-device": "sdg", "tps": 2.91, "rd_sec": 229.82, "wr_sec": 0.62, "dc_sec": 0.00, "rkB": 114.91, "wkB": 0.31, "dkB": 0.00, "avgrq-sz": 79.21, "areq-sz": 39.61, "avgqu-sz": 0.07, "aqu-sz": 0.07, "await": 24.75, "util-percent": 0.19}
                                        ],
                                        "network": {
                                                "net-dev": [
@@ -2340,21 +2340,21 @@
                                                {"line": 1, "rcvin": 0.00, "xmtin": 0.00, "framerr": 0.00, "prtyerr": 0.00, "brk": 0.00, "ovrun": 0.00}
                                        ],
                                        "disk": [
-                                               {"disk-device": "dev8-0", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-1", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-2", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-3", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-4", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-5", "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-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-10", "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-11", "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-12", "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-80", "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-96", "tps": 0.94, "rd_sec": 44.66, "wr_sec": 0.45, "dc_sec": 0.00, "rkB": 22.33, "wkB": 0.22, "dkB": 0.00, "avgrq-sz": 48.10, "areq-sz": 24.05, "avgqu-sz": 0.04, "aqu-sz": 0.04, "await": 6.19, "util-percent": 0.09}
+                                               {"disk-device": "sda", "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": "sda1", "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": "sda2", "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": "sda3", "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": "sda4", "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": "sda5", "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": "sda6", "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": "sda7", "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": "sda8", "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": "sda9", "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": "sda10", "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": "sda11", "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": "sda12", "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": "sdf", "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": "sdg", "tps": 0.94, "rd_sec": 44.66, "wr_sec": 0.45, "dc_sec": 0.00, "rkB": 22.33, "wkB": 0.22, "dkB": 0.00, "avgrq-sz": 48.10, "areq-sz": 24.05, "avgqu-sz": 0.04, "aqu-sz": 0.04, "await": 6.19, "util-percent": 0.09}
                                        ],
                                        "network": {
                                                "net-dev": [
@@ -2951,21 +2951,21 @@
                                                {"line": 1, "rcvin": 0.00, "xmtin": 0.00, "framerr": 0.00, "prtyerr": 0.00, "brk": 0.00, "ovrun": 0.00}
                                        ],
                                        "disk": [
-                                               {"disk-device": "dev8-0", "tps": 1.60, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 1.60, "rkB": 0.00, "wkB": 0.00, "dkB": 0.80, "avgrq-sz": 1.00, "areq-sz": 0.50, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 1.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-1", "tps": 1.60, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 1.60, "rkB": 0.00, "wkB": 0.00, "dkB": 0.80, "avgrq-sz": 1.00, "areq-sz": 0.50, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 1.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-2", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-3", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-4", "tps": 0.00, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 0.00, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 0.00, "areq-sz": 0.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 0.00, "util-percent": 0.00},
-                                               {"disk-device": "dev8-5", "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-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": "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},
-                                               {"disk-device": "dev202-240", "tps": 0.32, "rd_sec": 32.08, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 16.04, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 100.00, "areq-sz": 50.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 1.00, "util-percent": 0.03},
-                                               {"disk-device": "dev202-4096", "tps": 0.32, "rd_sec": 32.08, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 16.04, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 100.00, "areq-sz": 50.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 1.00, "util-percent": 0.03}
+                                               {"disk-device": "sda", "tps": 1.60, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 1.60, "rkB": 0.00, "wkB": 0.00, "dkB": 0.80, "avgrq-sz": 1.00, "areq-sz": 0.50, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 1.00, "util-percent": 0.00},
+                                               {"disk-device": "sda1", "tps": 1.60, "rd_sec": 0.00, "wr_sec": 0.00, "dc_sec": 1.60, "rkB": 0.00, "wkB": 0.00, "dkB": 0.80, "avgrq-sz": 1.00, "areq-sz": 0.50, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 1.00, "util-percent": 0.00},
+                                               {"disk-device": "sda2", "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": "sda3", "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": "sda4", "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": "sda5", "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": "sda6", "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": "sda7", "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": "sda8", "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": "sda9", "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": "cciss/c0d0", "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": "cciss/c0d0p1", "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": "cciss/c0d0p2", "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": "xvdp", "tps": 0.32, "rd_sec": 32.08, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 16.04, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 100.00, "areq-sz": 50.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 1.00, "util-percent": 0.03},
+                                               {"disk-device": "xvdiw", "tps": 0.32, "rd_sec": 32.08, "wr_sec": 0.00, "dc_sec": 0.00, "rkB": 16.04, "wkB": 0.00, "dkB": 0.00, "avgrq-sz": 100.00, "areq-sz": 50.00, "avgqu-sz": 0.00, "aqu-sz": 0.00, "await": 1.00, "util-percent": 0.03}
                                        ],
                                        "network": {
                                                "net-dev": [

diff --git a/tests/expected.sadf-p b/tests/expected.sadf-p
index ffc1b4d0d59ec840ad0c79813502543da6a4a940..acd49e8c83f15e39286a83c3ad4453b640cd69b2 100644 (file)
--- a/tests/expected.sadf-p
+++ b/tests/expected.sadf-p
@@ -2566,470 +2566,470 @@ SYSSTAT.TEST  22      2019-04-18 13:20:49 UTC ttyS1   framerr/s       0.00
 SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC ttyS1   prtyerr/s       0.00
 SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC ttyS1   brk/s   0.00
 SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC ttyS1   ovrun/s 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-0  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-0  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-0  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-0  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-0  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-0  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-0  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-0  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-1  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-1  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-1  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-1  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-1  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-1  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-1  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-1  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-2  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-2  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-2  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-2  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-2  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-2  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-2  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-2  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-3  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-3  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-3  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-3  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-3  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-3  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-3  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-3  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-4  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-4  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-4  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-4  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-4  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-4  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-4  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-4  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-5  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-5  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-5  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-5  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-5  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-5  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-5  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-5  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-6  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-6  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-6  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-6  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-6  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-6  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-6  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-6  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-7  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-7  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-7  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-7  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-7  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-7  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-7  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-7  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-8  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-8  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-8  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-8  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-8  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-8  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-8  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-8  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-9  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-9  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-9  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-9  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-9  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-9  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-9  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-9  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-10 tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-10 rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-10 wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-10 dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-10 areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-10 aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-10 await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-10 %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-11 tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-11 rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-11 wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-11 dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-11 areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-11 aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-11 await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-11 %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-12 tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-12 rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-12 wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-12 dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-12 areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-12 aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-12 await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-12 %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-16 tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-16 rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-16 wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-16 dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-16 areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-16 aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-16 await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC dev8-16 %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-0  tps     6.40
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-0  rkB/s   1.60
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-0  wkB/s   1.60
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-0  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-0  areq-sz 0.50
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-0  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-0  await   1.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-0  %util   0.32
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-1  tps     6.40
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-1  rkB/s   1.60
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-1  wkB/s   1.60
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-1  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-1  areq-sz 0.50
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-1  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-1  await   1.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-1  %util   0.32
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-2  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-2  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-2  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-2  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-2  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-2  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-2  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-2  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-3  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-3  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-3  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-3  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-3  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-3  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-3  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-3  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-4  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-4  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-4  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-4  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-4  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-4  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-4  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-4  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-5  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-5  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-5  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-5  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-5  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-5  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-5  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-5  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-6  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-6  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-6  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-6  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-6  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-6  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-6  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-6  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-7  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-7  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-7  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-7  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-7  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-7  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-7  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-7  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-8  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-8  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-8  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-8  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-8  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-8  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-8  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-8  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-9  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-9  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-9  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-9  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-9  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-9  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-9  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-9  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-10 tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-10 rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-10 wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-10 dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-10 areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-10 aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-10 await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-10 %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-11 tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-11 rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-11 wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-11 dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-11 areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-11 aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-11 await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-11 %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-12 tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-12 rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-12 wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-12 dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-12 areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-12 aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-12 await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-12 %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-16 tps     0.67
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-16 rkB/s   22.60
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-16 wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-16 dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-16 areq-sz 33.62
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-16 aqu-sz  0.10
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-16 await   47.00
-SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC dev8-16 %util   0.05
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-0  tps     1604.70
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-0  rkB/s   41499.97
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-0  wkB/s   10663.48
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-0  dkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-0  areq-sz 32.51
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-0  aqu-sz  18.56
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-0  await   12.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-0  %util   85.36
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-1  tps     1.32
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-1  rkB/s   54.75
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-1  wkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-1  dkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-1  areq-sz 41.33
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-1  aqu-sz  0.08
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-1  await   60.92
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-1  %util   0.11
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-2  tps     0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-2  rkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-2  wkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-2  dkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-2  areq-sz 0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-2  aqu-sz  0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-2  await   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-2  %util   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-3  tps     0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-3  rkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-3  wkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-3  dkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-3  areq-sz 0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-3  aqu-sz  0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-3  await   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-3  %util   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-4  tps     0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-4  rkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-4  wkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-4  dkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-4  areq-sz 0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-4  aqu-sz  0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-4  await   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-4  %util   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-5  tps     0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-5  rkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-5  wkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-5  dkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-5  areq-sz 0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-5  aqu-sz  0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-5  await   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-5  %util   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-6  tps     0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-6  rkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-6  wkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-6  dkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-6  areq-sz 0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-6  aqu-sz  0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-6  await   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-6  %util   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-7  tps     0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-7  rkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-7  wkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-7  dkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-7  areq-sz 0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-7  aqu-sz  0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-7  await   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-7  %util   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-8  tps     0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-8  rkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-8  wkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-8  dkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-8  areq-sz 0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-8  aqu-sz  0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-8  await   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-8  %util   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-9  tps     0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-9  rkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-9  wkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-9  dkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-9  areq-sz 0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-9  aqu-sz  0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-9  await   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-9  %util   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-10 tps     0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-10 rkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-10 wkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-10 dkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-10 areq-sz 0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-10 aqu-sz  0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-10 await   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-10 %util   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-11 tps     0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-11 rkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-11 wkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-11 dkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-11 areq-sz 0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-11 aqu-sz  0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-11 await   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-11 %util   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-12 tps     0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-12 rkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-12 wkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-12 dkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-12 areq-sz 0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-12 aqu-sz  0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-12 await   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-12 %util   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-80 tps     1.22
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-80 rkB/s   54.34
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-80 wkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-80 dkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-80 areq-sz 44.51
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-80 aqu-sz  0.08
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-80 await   62.51
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-80 %util   0.09
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-96 tps     2.91
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-96 rkB/s   114.91
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-96 wkB/s   0.31
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-96 dkB/s   0.00
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-96 areq-sz 39.61
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-96 aqu-sz  0.07
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-96 await   24.75
-SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC dev8-96 %util   0.19
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-0  tps     0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-0  rkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-0  wkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-0  dkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-0  areq-sz 0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-0  aqu-sz  0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-0  await   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-0  %util   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-1  tps     0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-1  rkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-1  wkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-1  dkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-1  areq-sz 0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-1  aqu-sz  0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-1  await   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-1  %util   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-2  tps     0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-2  rkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-2  wkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-2  dkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-2  areq-sz 0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-2  aqu-sz  0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-2  await   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-2  %util   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-3  tps     0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-3  rkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-3  wkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-3  dkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-3  areq-sz 0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-3  aqu-sz  0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-3  await   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-3  %util   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-4  tps     0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-4  rkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-4  wkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-4  dkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-4  areq-sz 0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-4  aqu-sz  0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-4  await   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-4  %util   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-5  tps     0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-5  rkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-5  wkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-5  dkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-5  areq-sz 0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-5  aqu-sz  0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-5  await   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-5  %util   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-6  tps     0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-6  rkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-6  wkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-6  dkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-6  areq-sz 0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-6  aqu-sz  0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-6  await   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-6  %util   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-7  tps     0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-7  rkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-7  wkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-7  dkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-7  areq-sz 0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-7  aqu-sz  0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-7  await   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-7  %util   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-8  tps     0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-8  rkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-8  wkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-8  dkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-8  areq-sz 0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-8  aqu-sz  0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-8  await   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-8  %util   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-9  tps     0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-9  rkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-9  wkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-9  dkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-9  areq-sz 0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-9  aqu-sz  0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-9  await   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-9  %util   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-10 tps     0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-10 rkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-10 wkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-10 dkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-10 areq-sz 0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-10 aqu-sz  0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-10 await   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-10 %util   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-11 tps     0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-11 rkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-11 wkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-11 dkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-11 areq-sz 0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-11 aqu-sz  0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-11 await   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-11 %util   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-12 tps     0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-12 rkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-12 wkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-12 dkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-12 areq-sz 0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-12 aqu-sz  0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-12 await   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-12 %util   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-80 tps     0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-80 rkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-80 wkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-80 dkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-80 areq-sz 0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-80 aqu-sz  0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-80 await   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-80 %util   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-96 tps     0.94
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-96 rkB/s   22.33
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-96 wkB/s   0.22
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-96 dkB/s   0.00
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-96 areq-sz 24.05
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-96 aqu-sz  0.04
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-96 await   6.19
-SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC dev8-96 %util   0.09
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda     tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda     rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda     wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda     dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda     areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda     aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda     await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda     %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda1    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda1    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda1    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda1    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda1    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda1    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda1    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda1    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda2    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda2    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda2    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda2    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda2    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda2    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda2    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda2    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda3    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda3    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda3    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda3    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda3    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda3    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda3    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda3    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda4    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda4    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda4    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda4    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda4    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda4    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda4    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda4    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda5    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda5    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda5    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda5    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda5    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda5    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda5    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda5    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda6    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda6    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda6    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda6    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda6    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda6    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda6    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda6    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda7    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda7    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda7    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda7    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda7    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda7    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda7    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda7    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda8    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda8    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda8    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda8    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda8    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda8    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda8    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda8    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda9    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda9    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda9    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda9    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda9    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda9    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda9    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda9    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda10   tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda10   rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda10   wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda10   dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda10   areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda10   aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda10   await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda10   %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda11   tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda11   rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda11   wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda11   dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda11   areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda11   aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda11   await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda11   %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda12   tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda12   rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda12   wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda12   dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda12   areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda12   aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda12   await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sda12   %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sdb     tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sdb     rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sdb     wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sdb     dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sdb     areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sdb     aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sdb     await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC sdb     %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda     tps     6.40
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda     rkB/s   1.60
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda     wkB/s   1.60
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda     dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda     areq-sz 0.50
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda     aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda     await   1.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda     %util   0.32
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda1    tps     6.40
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda1    rkB/s   1.60
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda1    wkB/s   1.60
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda1    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda1    areq-sz 0.50
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda1    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda1    await   1.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda1    %util   0.32
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda2    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda2    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda2    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda2    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda2    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda2    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda2    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda2    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda3    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda3    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda3    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda3    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda3    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda3    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda3    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda3    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda4    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda4    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda4    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda4    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda4    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda4    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda4    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda4    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda5    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda5    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda5    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda5    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda5    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda5    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda5    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda5    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda6    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda6    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda6    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda6    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda6    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda6    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda6    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda6    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda7    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda7    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda7    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda7    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda7    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda7    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda7    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda7    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda8    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda8    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda8    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda8    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda8    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda8    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda8    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda8    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda9    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda9    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda9    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda9    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda9    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda9    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda9    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda9    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda10   tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda10   rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda10   wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda10   dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda10   areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda10   aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda10   await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda10   %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda11   tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda11   rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda11   wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda11   dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda11   areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda11   aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda11   await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda11   %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda12   tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda12   rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda12   wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda12   dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda12   areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda12   aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda12   await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sda12   %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sdb     tps     0.67
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sdb     rkB/s   22.60
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sdb     wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sdb     dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sdb     areq-sz 33.62
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sdb     aqu-sz  0.10
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sdb     await   47.00
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC sdb     %util   0.05
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda     tps     1604.70
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda     rkB/s   41499.97
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda     wkB/s   10663.48
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda     dkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda     areq-sz 32.51
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda     aqu-sz  18.56
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda     await   12.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda     %util   85.36
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda1    tps     1.32
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda1    rkB/s   54.75
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda1    wkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda1    dkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda1    areq-sz 41.33
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda1    aqu-sz  0.08
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda1    await   60.92
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda1    %util   0.11
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda2    tps     0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda2    rkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda2    wkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda2    dkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda2    areq-sz 0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda2    aqu-sz  0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda2    await   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda2    %util   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda3    tps     0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda3    rkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda3    wkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda3    dkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda3    areq-sz 0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda3    aqu-sz  0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda3    await   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda3    %util   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda4    tps     0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda4    rkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda4    wkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda4    dkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda4    areq-sz 0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda4    aqu-sz  0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda4    await   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda4    %util   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda5    tps     0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda5    rkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda5    wkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda5    dkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda5    areq-sz 0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda5    aqu-sz  0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda5    await   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda5    %util   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda6    tps     0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda6    rkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda6    wkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda6    dkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda6    areq-sz 0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda6    aqu-sz  0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda6    await   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda6    %util   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda7    tps     0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda7    rkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda7    wkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda7    dkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda7    areq-sz 0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda7    aqu-sz  0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda7    await   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda7    %util   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda8    tps     0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda8    rkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda8    wkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda8    dkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda8    areq-sz 0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda8    aqu-sz  0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda8    await   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda8    %util   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda9    tps     0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda9    rkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda9    wkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda9    dkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda9    areq-sz 0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda9    aqu-sz  0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda9    await   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda9    %util   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda10   tps     0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda10   rkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda10   wkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda10   dkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda10   areq-sz 0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda10   aqu-sz  0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda10   await   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda10   %util   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda11   tps     0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda11   rkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda11   wkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda11   dkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda11   areq-sz 0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda11   aqu-sz  0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda11   await   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda11   %util   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda12   tps     0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda12   rkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda12   wkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda12   dkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda12   areq-sz 0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda12   aqu-sz  0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda12   await   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sda12   %util   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sdf     tps     1.22
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sdf     rkB/s   54.34
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sdf     wkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sdf     dkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sdf     areq-sz 44.51
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sdf     aqu-sz  0.08
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sdf     await   62.51
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sdf     %util   0.09
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sdg     tps     2.91
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sdg     rkB/s   114.91
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sdg     wkB/s   0.31
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sdg     dkB/s   0.00
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sdg     areq-sz 39.61
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sdg     aqu-sz  0.07
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sdg     await   24.75
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC sdg     %util   0.19
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda     tps     0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda     rkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda     wkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda     dkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda     areq-sz 0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda     aqu-sz  0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda     await   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda     %util   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda1    tps     0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda1    rkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda1    wkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda1    dkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda1    areq-sz 0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda1    aqu-sz  0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda1    await   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda1    %util   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda2    tps     0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda2    rkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda2    wkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda2    dkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda2    areq-sz 0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda2    aqu-sz  0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda2    await   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda2    %util   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda3    tps     0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda3    rkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda3    wkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda3    dkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda3    areq-sz 0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda3    aqu-sz  0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda3    await   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda3    %util   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda4    tps     0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda4    rkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda4    wkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda4    dkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda4    areq-sz 0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda4    aqu-sz  0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda4    await   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda4    %util   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda5    tps     0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda5    rkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda5    wkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda5    dkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda5    areq-sz 0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda5    aqu-sz  0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda5    await   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda5    %util   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda6    tps     0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda6    rkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda6    wkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda6    dkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda6    areq-sz 0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda6    aqu-sz  0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda6    await   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda6    %util   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda7    tps     0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda7    rkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda7    wkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda7    dkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda7    areq-sz 0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda7    aqu-sz  0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda7    await   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda7    %util   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda8    tps     0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda8    rkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda8    wkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda8    dkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda8    areq-sz 0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda8    aqu-sz  0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda8    await   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda8    %util   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda9    tps     0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda9    rkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda9    wkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda9    dkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda9    areq-sz 0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda9    aqu-sz  0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda9    await   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda9    %util   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda10   tps     0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda10   rkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda10   wkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda10   dkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda10   areq-sz 0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda10   aqu-sz  0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda10   await   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda10   %util   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda11   tps     0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda11   rkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda11   wkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda11   dkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda11   areq-sz 0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda11   aqu-sz  0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda11   await   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda11   %util   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda12   tps     0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda12   rkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda12   wkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda12   dkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda12   areq-sz 0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda12   aqu-sz  0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda12   await   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sda12   %util   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sdf     tps     0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sdf     rkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sdf     wkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sdf     dkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sdf     areq-sz 0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sdf     aqu-sz  0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sdf     await   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sdf     %util   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sdg     tps     0.94
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sdg     rkB/s   22.33
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sdg     wkB/s   0.22
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sdg     dkB/s   0.00
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sdg     areq-sz 24.05
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sdg     aqu-sz  0.04
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sdg     await   6.19
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC sdg     %util   0.09
 SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC lo      rxpck/s 0.00
 SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC lo      txpck/s 0.00
 SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC lo      rxkB/s  0.00
@@ -5081,126 +5081,126 @@ SYSSTAT.TEST  31      2019-04-18 13:54:35 UTC ttyS1   framerr/s       0.00
 SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC ttyS1   prtyerr/s       0.00
 SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC ttyS1   brk/s   0.00
 SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC ttyS1   ovrun/s 0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-0  tps     1.60
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-0  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-0  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-0  dkB/s   0.80
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-0  areq-sz 0.50
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-0  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-0  await   1.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-0  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-1  tps     1.60
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-1  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-1  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-1  dkB/s   0.80
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-1  areq-sz 0.50
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-1  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-1  await   1.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-1  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-2  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-2  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-2  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-2  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-2  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-2  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-2  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-2  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-3  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-3  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-3  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-3  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-3  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-3  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-3  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-3  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-4  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-4  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-4  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-4  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-4  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-4  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-4  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-4  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-5  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-5  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-5  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-5  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-5  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-5  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-5  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-5  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-6  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-6  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-6  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-6  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-6  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-6  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-6  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-6  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-7  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-7  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-7  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-7  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-7  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-7  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-7  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-7  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-8  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-8  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-8  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-8  dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-8  areq-sz 0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-8  aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-8  await   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-8  %util   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-9  tps     0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-9  rkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-9  wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev8-9  dkB/s   0.00
-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 dev202-240      tps     0.32
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev202-240      rkB/s   16.04
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev202-240      wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev202-240      dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev202-240      areq-sz 50.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev202-240      aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev202-240      await   1.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev202-240      %util   0.03
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev202-4096     tps     0.32
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev202-4096     rkB/s   16.04
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev202-4096     wkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev202-4096     dkB/s   0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev202-4096     areq-sz 50.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev202-4096     aqu-sz  0.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev202-4096     await   1.00
-SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC dev202-4096     %util   0.03
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda     tps     1.60
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda     rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda     wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda     dkB/s   0.80
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda     areq-sz 0.50
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda     aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda     await   1.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda     %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda1    tps     1.60
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda1    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda1    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda1    dkB/s   0.80
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda1    areq-sz 0.50
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda1    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda1    await   1.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda1    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda2    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda2    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda2    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda2    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda2    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda2    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda2    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda2    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda3    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda3    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda3    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda3    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda3    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda3    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda3    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda3    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda4    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda4    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda4    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda4    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda4    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda4    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda4    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda4    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda5    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda5    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda5    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda5    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda5    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda5    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda5    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda5    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda6    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda6    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda6    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda6    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda6    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda6    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda6    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda6    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda7    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda7    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda7    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda7    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda7    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda7    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda7    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda7    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda8    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda8    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda8    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda8    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda8    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda8    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda8    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda8    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda9    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda9    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda9    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda9    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda9    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda9    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda9    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC sda9    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0      tps     32402.95
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0      rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0      wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0      dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0      areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0      aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0      await   0.10
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0      %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0p1    tps     0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0p1    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0p1    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0p1    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0p1    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0p1    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0p1    await   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0p1    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0p2    tps     32402.95
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0p2    rkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0p2    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0p2    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0p2    areq-sz 0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0p2    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0p2    await   0.10
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC cciss/c0d0p2    %util   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC xvdp    tps     0.32
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC xvdp    rkB/s   16.04
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC xvdp    wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC xvdp    dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC xvdp    areq-sz 50.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC xvdp    aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC xvdp    await   1.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC xvdp    %util   0.03
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC xvdiw   tps     0.32
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC xvdiw   rkB/s   16.04
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC xvdiw   wkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC xvdiw   dkB/s   0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC xvdiw   areq-sz 50.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC xvdiw   aqu-sz  0.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC xvdiw   await   1.00
+SYSSTAT.TEST   31      2019-04-18 13:54:35 UTC xvdiw   %util   0.03
 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 aeb3bc6ed40a426928a0f8c5d79bf6093ceff4e0..ac4f0c65b22d99308f2876ac9babd344f77cdbc8 100644 (file)
--- a/tests/expected.sadf-r
+++ b/tests/expected.sadf-r
@@ -2145,70 +2145,70 @@
 # 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
-13:20:19 UTC; major; 8; minor; 0; DEV; dev8-0; tps; 61781; 61781; rkB/s; 3195498; 3195498; wkB/s; 821088; 821088; dkB/s; 0; 0; rd_ticks; 623970; 623970; wr_ticks; 117109; 117109; dc_ticks; 0; 0; tot_ticks; 32862; 32862; aqu-sz; 714408; 714408;
-13:20:19 UTC; major; 8; minor; 1; DEV; dev8-1; tps; 51; 51; rkB/s; 4216; 4216; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 3107; 3107; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 41; 41; aqu-sz; 3086; 3086;
-13:20:19 UTC; major; 8; minor; 2; DEV; dev8-2; tps; 47; 47; rkB/s; 4184; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2938; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 33; 33; aqu-sz; 2917; 2917;
-13:20:19 UTC; major; 8; minor; 3; DEV; dev8-3; tps; 49; 49; rkB/s; 4200; 4200; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2831; 2831; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 40; 40; aqu-sz; 2810; 2810;
-13:20:19 UTC; major; 8; minor; 4; DEV; dev8-4; tps; 5; 5; rkB/s; 28; 28; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1294; 1294; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 8; 8; aqu-sz; 1293; 1293;
-13:20:19 UTC; major; 8; minor; 5; DEV; dev8-5; tps; 57; 57; rkB/s; 4504; 4504; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 11927; 11927; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 51; 51; aqu-sz; 11902; 11902;
-13:20:19 UTC; major; 8; minor; 6; DEV; dev8-6; tps; 112; 112; rkB/s; 8848; 8848; wkB/s; 24; 24; dkB/s; 0; 0; rd_ticks; 2732; 2732; wr_ticks; 40; 40; dc_ticks; 0; 0; tot_ticks; 73; 73; aqu-sz; 2724; 2724;
-13:20:19 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:20:19 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:20:19 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:20:19 UTC; major; 8; minor; 10; DEV; dev8-10; tps; 48; 48; rkB/s; 4440; 4440; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1301; 1301; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 45; 45; aqu-sz; 1284; 1284;
-13:20:19 UTC; major; 8; minor; 11; DEV; dev8-11; tps; 57; 57; rkB/s; 4504; 4504; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2180; 2180; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 53; 53; aqu-sz; 2155; 2155;
-13:20:19 UTC; major; 8; minor; 12; DEV; dev8-12; tps; 13528; 13528; rkB/s; 363650; 363650; wkB/s; 534960; 534960; dkB/s; 0; 0; rd_ticks; 124848; 124848; wr_ticks; 59590; 59590; dc_ticks; 0; 0; tot_ticks; 7316; 7316; aqu-sz; 178474; 178474;
-13:20:19 UTC; major; 8; minor; 16; DEV; dev8-16; tps; 51; 51; rkB/s; 4216; 4216; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 3107; 3107; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 41; 41; aqu-sz; 3086; 3086;
+13:20:19 UTC; major; 8; minor; 0; DEV; sda; tps; 61781; 61781; rkB/s; 3195498; 3195498; wkB/s; 821088; 821088; dkB/s; 0; 0; rd_ticks; 623970; 623970; wr_ticks; 117109; 117109; dc_ticks; 0; 0; tot_ticks; 32862; 32862; aqu-sz; 714408; 714408;
+13:20:19 UTC; major; 8; minor; 1; DEV; sda1; tps; 51; 51; rkB/s; 4216; 4216; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 3107; 3107; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 41; 41; aqu-sz; 3086; 3086;
+13:20:19 UTC; major; 8; minor; 2; DEV; sda2; tps; 47; 47; rkB/s; 4184; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2938; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 33; 33; aqu-sz; 2917; 2917;
+13:20:19 UTC; major; 8; minor; 3; DEV; sda3; tps; 49; 49; rkB/s; 4200; 4200; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2831; 2831; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 40; 40; aqu-sz; 2810; 2810;
+13:20:19 UTC; major; 8; minor; 4; DEV; sda4; tps; 5; 5; rkB/s; 28; 28; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1294; 1294; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 8; 8; aqu-sz; 1293; 1293;
+13:20:19 UTC; major; 8; minor; 5; DEV; sda5; tps; 57; 57; rkB/s; 4504; 4504; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 11927; 11927; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 51; 51; aqu-sz; 11902; 11902;
+13:20:19 UTC; major; 8; minor; 6; DEV; sda6; tps; 112; 112; rkB/s; 8848; 8848; wkB/s; 24; 24; dkB/s; 0; 0; rd_ticks; 2732; 2732; wr_ticks; 40; 40; dc_ticks; 0; 0; tot_ticks; 73; 73; aqu-sz; 2724; 2724;
+13:20:19 UTC; major; 8; minor; 7; DEV; sda7; 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:20:19 UTC; major; 8; minor; 8; DEV; sda8; 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:20:19 UTC; major; 8; minor; 9; DEV; sda9; 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:20:19 UTC; major; 8; minor; 10; DEV; sda10; tps; 48; 48; rkB/s; 4440; 4440; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1301; 1301; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 45; 45; aqu-sz; 1284; 1284;
+13:20:19 UTC; major; 8; minor; 11; DEV; sda11; tps; 57; 57; rkB/s; 4504; 4504; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2180; 2180; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 53; 53; aqu-sz; 2155; 2155;
+13:20:19 UTC; major; 8; minor; 12; DEV; sda12; tps; 13528; 13528; rkB/s; 363650; 363650; wkB/s; 534960; 534960; dkB/s; 0; 0; rd_ticks; 124848; 124848; wr_ticks; 59590; 59590; dc_ticks; 0; 0; tot_ticks; 7316; 7316; aqu-sz; 178474; 178474;
+13:20:19 UTC; major; 8; minor; 16; DEV; sdb; tps; 51; 51; rkB/s; 4216; 4216; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 3107; 3107; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 41; 41; aqu-sz; 3086; 3086;
 # uptime_cs; 725496; ust_time; 1555593629; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:29
 # name; A_DISK; nr_curr; 14; nr_alloc; 19; nr_ini; 19
-13:20:29 UTC; major; 8; minor; 0; DEV; dev8-0; tps; 61781; 61981; rkB/s; 3195498; 3195598; wkB/s; 821088; 821188; dkB/s; 0; 0; rd_ticks; 623970; 624070; wr_ticks; 117109; 117209; dc_ticks; 0; 0; tot_ticks; 32862; 32962; aqu-sz; 714408; 714508;
-13:20:29 UTC; major; 8; minor; 1; DEV; dev8-1; tps; 51; 251; rkB/s; 4216; 4316; wkB/s; 0; 100; dkB/s; 0; 0; rd_ticks; 3107; 3207; wr_ticks; 0; 100; dc_ticks; 0; 0; tot_ticks; 41; 141; aqu-sz; 3086; 3186;
-13:20:29 UTC; major; 8; minor; 2; DEV; dev8-2; tps; 47; 47; rkB/s; 4184; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2938; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 33; 33; aqu-sz; 2917; 2917;
-13:20:29 UTC; major; 8; minor; 3; DEV; dev8-3; tps; 49; 49; rkB/s; 4200; 4200; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2831; 2831; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 40; 40; aqu-sz; 2810; 2810;
-13:20:29 UTC; major; 8; minor; 4; DEV; dev8-4; tps; 5; 5; rkB/s; 28; 28; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1294; 1294; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 8; 8; aqu-sz; 1293; 1293;
-13:20:29 UTC; major; 8; minor; 5; DEV; dev8-5; tps; 57; 57; rkB/s; 4504; 4504; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 11927; 11927; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 51; 51; aqu-sz; 11902; 11902;
-13:20:29 UTC; major; 8; minor; 6; DEV; dev8-6; tps; 112; 112; rkB/s; 8848; 8848; wkB/s; 24; 24; dkB/s; 0; 0; rd_ticks; 2732; 2732; wr_ticks; 40; 40; dc_ticks; 0; 0; tot_ticks; 73; 73; aqu-sz; 2724; 2724;
-13:20:29 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:20:29 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:20:29 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:20:29 UTC; major; 8; minor; 10; DEV; dev8-10; tps; 48; 48; rkB/s; 4440; 4440; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1301; 1301; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 45; 45; aqu-sz; 1284; 1284;
-13:20:29 UTC; major; 8; minor; 11; DEV; dev8-11; tps; 57; 57; rkB/s; 4504; 4504; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2180; 2180; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 53; 53; aqu-sz; 2155; 2155;
-13:20:29 UTC; major; 8; minor; 12; DEV; dev8-12; tps; 13528; 13528; rkB/s; 363650; 363650; wkB/s; 534960; 534960; dkB/s; 0; 0; rd_ticks; 124848; 124848; wr_ticks; 59590; 59590; dc_ticks; 0; 0; tot_ticks; 7316; 7316; aqu-sz; 178474; 178474;
-13:20:29 UTC; major; 8; minor; 16; DEV [BCK]; dev8-16; tps; 0; 21; rkB/s; 0; 1412; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 0; 987; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 0; 17; aqu-sz; 0; 3000;
+13:20:29 UTC; major; 8; minor; 0; DEV; sda; tps; 61781; 61981; rkB/s; 3195498; 3195598; wkB/s; 821088; 821188; dkB/s; 0; 0; rd_ticks; 623970; 624070; wr_ticks; 117109; 117209; dc_ticks; 0; 0; tot_ticks; 32862; 32962; aqu-sz; 714408; 714508;
+13:20:29 UTC; major; 8; minor; 1; DEV; sda1; tps; 51; 251; rkB/s; 4216; 4316; wkB/s; 0; 100; dkB/s; 0; 0; rd_ticks; 3107; 3207; wr_ticks; 0; 100; dc_ticks; 0; 0; tot_ticks; 41; 141; aqu-sz; 3086; 3186;
+13:20:29 UTC; major; 8; minor; 2; DEV; sda2; tps; 47; 47; rkB/s; 4184; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2938; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 33; 33; aqu-sz; 2917; 2917;
+13:20:29 UTC; major; 8; minor; 3; DEV; sda3; tps; 49; 49; rkB/s; 4200; 4200; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2831; 2831; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 40; 40; aqu-sz; 2810; 2810;
+13:20:29 UTC; major; 8; minor; 4; DEV; sda4; tps; 5; 5; rkB/s; 28; 28; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1294; 1294; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 8; 8; aqu-sz; 1293; 1293;
+13:20:29 UTC; major; 8; minor; 5; DEV; sda5; tps; 57; 57; rkB/s; 4504; 4504; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 11927; 11927; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 51; 51; aqu-sz; 11902; 11902;
+13:20:29 UTC; major; 8; minor; 6; DEV; sda6; tps; 112; 112; rkB/s; 8848; 8848; wkB/s; 24; 24; dkB/s; 0; 0; rd_ticks; 2732; 2732; wr_ticks; 40; 40; dc_ticks; 0; 0; tot_ticks; 73; 73; aqu-sz; 2724; 2724;
+13:20:29 UTC; major; 8; minor; 7; DEV; sda7; 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:20:29 UTC; major; 8; minor; 8; DEV; sda8; 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:20:29 UTC; major; 8; minor; 9; DEV; sda9; 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:20:29 UTC; major; 8; minor; 10; DEV; sda10; tps; 48; 48; rkB/s; 4440; 4440; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1301; 1301; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 45; 45; aqu-sz; 1284; 1284;
+13:20:29 UTC; major; 8; minor; 11; DEV; sda11; tps; 57; 57; rkB/s; 4504; 4504; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2180; 2180; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 53; 53; aqu-sz; 2155; 2155;
+13:20:29 UTC; major; 8; minor; 12; DEV; sda12; tps; 13528; 13528; rkB/s; 363650; 363650; wkB/s; 534960; 534960; dkB/s; 0; 0; rd_ticks; 124848; 124848; wr_ticks; 59590; 59590; dc_ticks; 0; 0; tot_ticks; 7316; 7316; aqu-sz; 178474; 178474;
+13:20:29 UTC; major; 8; minor; 16; DEV [BCK]; sdb; tps; 0; 21; rkB/s; 0; 1412; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 0; 987; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 0; 17; aqu-sz; 0; 3000;
 # uptime_cs; 729346; ust_time; 1555593639; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:39
 # name; A_DISK; nr_curr; 15; nr_alloc; 19; nr_ini; 19
-13:20:39 UTC; major; 8; minor; 0; DEV [BCK]; dev8-0; tps; 0; 61781; rkB/s; 0; 3195498; wkB/s; 0; 821088; dkB/s; 0; 0; rd_ticks; 0; 623970; wr_ticks; 0; 117109; dc_ticks; 0; 0; tot_ticks; 0; 32862; aqu-sz; 0; 714408;
-13:20:39 UTC; major; 8; minor; 1; DEV [BCK]; dev8-1; tps; 0; 51; rkB/s; 0; 4216; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 0; 3107; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 0; 41; aqu-sz; 0; 3086;
-13:20:39 UTC; major; 8; minor; 2; DEV; dev8-2; tps; 47; 47; rkB/s; 4184; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2938; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 33; 33; aqu-sz; 2917; 2917;
-13:20:39 UTC; major; 8; minor; 3; DEV; dev8-3; tps; 49; 49; rkB/s; 4200; 4200; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2831; 2831; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 40; 40; aqu-sz; 2810; 2810;
-13:20:39 UTC; major; 8; minor; 4; DEV; dev8-4; tps; 5; 5; rkB/s; 28; 28; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1294; 1294; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 8; 8; aqu-sz; 1293; 1293;
-13:20:39 UTC; major; 8; minor; 5; DEV; dev8-5; tps; 57; 57; rkB/s; 4504; 4504; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 11927; 11927; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 51; 51; aqu-sz; 11902; 11902;
-13:20:39 UTC; major; 8; minor; 6; DEV; dev8-6; tps; 112; 112; rkB/s; 8848; 8848; wkB/s; 24; 24; dkB/s; 0; 0; rd_ticks; 2732; 2732; wr_ticks; 40; 40; dc_ticks; 0; 0; tot_ticks; 73; 73; aqu-sz; 2724; 2724;
-13:20:39 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:20:39 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:20:39 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:20:39 UTC; major; 8; minor; 10; DEV; dev8-10; tps; 48; 48; rkB/s; 4440; 4440; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1301; 1301; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 45; 45; aqu-sz; 1284; 1284;
-13:20:39 UTC; major; 8; minor; 11; DEV; dev8-11; tps; 57; 57; rkB/s; 4504; 4504; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2180; 2180; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 53; 53; aqu-sz; 2155; 2155;
-13:20:39 UTC; major; 8; minor; 12; DEV; dev8-12; tps; 13528; 13528; rkB/s; 363650; 363650; wkB/s; 534960; 534960; dkB/s; 0; 0; rd_ticks; 124848; 124848; wr_ticks; 59590; 59590; dc_ticks; 0; 0; tot_ticks; 7316; 7316; aqu-sz; 178474; 178474;
-13:20:39 UTC; major; 8; minor; 80; DEV [NEW]; dev8-80; tps; 0; 47; rkB/s; 0; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 0; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 0; 33; aqu-sz; 0; 2917;
-13:20:39 UTC; major; 8; minor; 96; DEV [NEW]; dev8-96; tps; 0; 112; rkB/s; 0; 8848; wkB/s; 0; 24; dkB/s; 0; 0; rd_ticks; 0; 2732; wr_ticks; 0; 40; dc_ticks; 0; 0; tot_ticks; 0; 73; aqu-sz; 0; 2724;
+13:20:39 UTC; major; 8; minor; 0; DEV [BCK]; sda; tps; 0; 61781; rkB/s; 0; 3195498; wkB/s; 0; 821088; dkB/s; 0; 0; rd_ticks; 0; 623970; wr_ticks; 0; 117109; dc_ticks; 0; 0; tot_ticks; 0; 32862; aqu-sz; 0; 714408;
+13:20:39 UTC; major; 8; minor; 1; DEV [BCK]; sda1; tps; 0; 51; rkB/s; 0; 4216; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 0; 3107; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 0; 41; aqu-sz; 0; 3086;
+13:20:39 UTC; major; 8; minor; 2; DEV; sda2; tps; 47; 47; rkB/s; 4184; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2938; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 33; 33; aqu-sz; 2917; 2917;
+13:20:39 UTC; major; 8; minor; 3; DEV; sda3; tps; 49; 49; rkB/s; 4200; 4200; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2831; 2831; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 40; 40; aqu-sz; 2810; 2810;
+13:20:39 UTC; major; 8; minor; 4; DEV; sda4; tps; 5; 5; rkB/s; 28; 28; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1294; 1294; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 8; 8; aqu-sz; 1293; 1293;
+13:20:39 UTC; major; 8; minor; 5; DEV; sda5; tps; 57; 57; rkB/s; 4504; 4504; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 11927; 11927; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 51; 51; aqu-sz; 11902; 11902;
+13:20:39 UTC; major; 8; minor; 6; DEV; sda6; tps; 112; 112; rkB/s; 8848; 8848; wkB/s; 24; 24; dkB/s; 0; 0; rd_ticks; 2732; 2732; wr_ticks; 40; 40; dc_ticks; 0; 0; tot_ticks; 73; 73; aqu-sz; 2724; 2724;
+13:20:39 UTC; major; 8; minor; 7; DEV; sda7; 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:20:39 UTC; major; 8; minor; 8; DEV; sda8; 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:20:39 UTC; major; 8; minor; 9; DEV; sda9; 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:20:39 UTC; major; 8; minor; 10; DEV; sda10; tps; 48; 48; rkB/s; 4440; 4440; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1301; 1301; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 45; 45; aqu-sz; 1284; 1284;
+13:20:39 UTC; major; 8; minor; 11; DEV; sda11; tps; 57; 57; rkB/s; 4504; 4504; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2180; 2180; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 53; 53; aqu-sz; 2155; 2155;
+13:20:39 UTC; major; 8; minor; 12; DEV; sda12; tps; 13528; 13528; rkB/s; 363650; 363650; wkB/s; 534960; 534960; dkB/s; 0; 0; rd_ticks; 124848; 124848; wr_ticks; 59590; 59590; dc_ticks; 0; 0; tot_ticks; 7316; 7316; aqu-sz; 178474; 178474;
+13:20:39 UTC; major; 8; minor; 80; DEV [NEW]; sdf; tps; 0; 47; rkB/s; 0; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 0; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 0; 33; aqu-sz; 0; 2917;
+13:20:39 UTC; major; 8; minor; 96; DEV [NEW]; sdg; tps; 0; 112; rkB/s; 0; 8848; wkB/s; 0; 24; dkB/s; 0; 0; rd_ticks; 0; 2732; wr_ticks; 0; 40; dc_ticks; 0; 0; tot_ticks; 0; 73; aqu-sz; 0; 2724;
 # uptime_cs; 731585; ust_time; 1555593649; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:49
 # name; A_DISK; nr_curr; 15; nr_alloc; 19; nr_ini; 19
-13:20:49 UTC; major; 8; minor; 0; DEV; dev8-0; tps; 61781; 61781; rkB/s; 3195498; 3195498; wkB/s; 821088; 821088; dkB/s; 0; 0; rd_ticks; 623970; 623970; wr_ticks; 117109; 117109; dc_ticks; 0; 0; tot_ticks; 32862; 32862; aqu-sz; 714408; 714408;
-13:20:49 UTC; major; 8; minor; 1; DEV; dev8-1; tps; 51; 51; rkB/s; 4216; 4216; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 3107; 3107; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 41; 41; aqu-sz; 3086; 3086;
-13:20:49 UTC; major; 8; minor; 2; DEV; dev8-2; tps; 47; 47; rkB/s; 4184; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2938; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 33; 33; aqu-sz; 2917; 2917;
-13:20:49 UTC; major; 8; minor; 3; DEV; dev8-3; tps; 49; 49; rkB/s; 4200; 4200; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2831; 2831; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 40; 40; aqu-sz; 2810; 2810;
-13:20:49 UTC; major; 8; minor; 4; DEV; dev8-4; tps; 5; 5; rkB/s; 28; 28; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1294; 1294; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 8; 8; aqu-sz; 1293; 1293;
-13:20:49 UTC; major; 8; minor; 5; DEV; dev8-5; tps; 57; 57; rkB/s; 4504; 4504; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 11927; 11927; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 51; 51; aqu-sz; 11902; 11902;
-13:20:49 UTC; major; 8; minor; 6; DEV; dev8-6; tps; 112; 112; rkB/s; 8848; 8848; wkB/s; 24; 24; dkB/s; 0; 0; rd_ticks; 2732; 2732; wr_ticks; 40; 40; dc_ticks; 0; 0; tot_ticks; 73; 73; aqu-sz; 2724; 2724;
-13:20:49 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:20:49 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:20:49 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:20:49 UTC; major; 8; minor; 10; DEV; dev8-10; tps; 48; 48; rkB/s; 4440; 4440; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1301; 1301; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 45; 45; aqu-sz; 1284; 1284;
-13:20:49 UTC; major; 8; minor; 11; DEV; dev8-11; tps; 57; 57; rkB/s; 4504; 4504; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2180; 2180; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 53; 53; aqu-sz; 2155; 2155;
-13:20:49 UTC; major; 8; minor; 12; DEV; dev8-12; tps; 13528; 13528; rkB/s; 363650; 363650; wkB/s; 534960; 534960; dkB/s; 0; 0; rd_ticks; 124848; 124848; wr_ticks; 59590; 59590; dc_ticks; 0; 0; tot_ticks; 7316; 7316; aqu-sz; 178474; 178474;
-13:20:49 UTC; major; 8; minor; 80; DEV; dev8-80; tps; 47; 47; rkB/s; 4184; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2938; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 33; 33; aqu-sz; 2917; 2917;
-13:20:49 UTC; major; 8; minor; 96; DEV; dev8-96; tps; 112; 133; rkB/s; 8848; 9848; wkB/s; 24; 34; dkB/s; 0; 0; rd_ticks; 2732; 2832; wr_ticks; 40; 70; dc_ticks; 0; 0; tot_ticks; 73; 93; aqu-sz; 2724; 3724;
+13:20:49 UTC; major; 8; minor; 0; DEV; sda; tps; 61781; 61781; rkB/s; 3195498; 3195498; wkB/s; 821088; 821088; dkB/s; 0; 0; rd_ticks; 623970; 623970; wr_ticks; 117109; 117109; dc_ticks; 0; 0; tot_ticks; 32862; 32862; aqu-sz; 714408; 714408;
+13:20:49 UTC; major; 8; minor; 1; DEV; sda1; tps; 51; 51; rkB/s; 4216; 4216; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 3107; 3107; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 41; 41; aqu-sz; 3086; 3086;
+13:20:49 UTC; major; 8; minor; 2; DEV; sda2; tps; 47; 47; rkB/s; 4184; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2938; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 33; 33; aqu-sz; 2917; 2917;
+13:20:49 UTC; major; 8; minor; 3; DEV; sda3; tps; 49; 49; rkB/s; 4200; 4200; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2831; 2831; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 40; 40; aqu-sz; 2810; 2810;
+13:20:49 UTC; major; 8; minor; 4; DEV; sda4; tps; 5; 5; rkB/s; 28; 28; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1294; 1294; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 8; 8; aqu-sz; 1293; 1293;
+13:20:49 UTC; major; 8; minor; 5; DEV; sda5; tps; 57; 57; rkB/s; 4504; 4504; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 11927; 11927; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 51; 51; aqu-sz; 11902; 11902;
+13:20:49 UTC; major; 8; minor; 6; DEV; sda6; tps; 112; 112; rkB/s; 8848; 8848; wkB/s; 24; 24; dkB/s; 0; 0; rd_ticks; 2732; 2732; wr_ticks; 40; 40; dc_ticks; 0; 0; tot_ticks; 73; 73; aqu-sz; 2724; 2724;
+13:20:49 UTC; major; 8; minor; 7; DEV; sda7; 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:20:49 UTC; major; 8; minor; 8; DEV; sda8; 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:20:49 UTC; major; 8; minor; 9; DEV; sda9; 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:20:49 UTC; major; 8; minor; 10; DEV; sda10; tps; 48; 48; rkB/s; 4440; 4440; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1301; 1301; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 45; 45; aqu-sz; 1284; 1284;
+13:20:49 UTC; major; 8; minor; 11; DEV; sda11; tps; 57; 57; rkB/s; 4504; 4504; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2180; 2180; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 53; 53; aqu-sz; 2155; 2155;
+13:20:49 UTC; major; 8; minor; 12; DEV; sda12; tps; 13528; 13528; rkB/s; 363650; 363650; wkB/s; 534960; 534960; dkB/s; 0; 0; rd_ticks; 124848; 124848; wr_ticks; 59590; 59590; dc_ticks; 0; 0; tot_ticks; 7316; 7316; aqu-sz; 178474; 178474;
+13:20:49 UTC; major; 8; minor; 80; DEV; sdf; tps; 47; 47; rkB/s; 4184; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2938; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 33; 33; aqu-sz; 2917; 2917;
+13:20:49 UTC; major; 8; minor; 96; DEV; sdg; tps; 112; 133; rkB/s; 8848; 9848; wkB/s; 24; 34; dkB/s; 0; 0; rd_ticks; 2732; 2832; wr_ticks; 40; 70; dc_ticks; 0; 0; tot_ticks; 73; 93; aqu-sz; 2724; 3724;
 # 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_NET_DEV; nr_curr; 5; nr_alloc; 10; nr_ini; 5
@@ -3194,21 +3194,21 @@
 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;
 # 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; dev8-0; tps; 61881; 61931; rkB/s; 3195498; 3195498; wkB/s; 821088; 821088; dkB/s; 100; 150; rd_ticks; 623970; 623970; wr_ticks; 117109; 117109; dc_ticks; 100; 150; tot_ticks; 32862; 32862; aqu-sz; 714408; 714408;
-13:54:35 UTC; major; 8; minor; 1; DEV; dev8-1; tps; 151; 201; rkB/s; 4216; 4216; wkB/s; 0; 0; dkB/s; 100; 150; rd_ticks; 3107; 3107; wr_ticks; 0; 0; dc_ticks; 100; 150; tot_ticks; 41; 41; aqu-sz; 3086; 3086;
-13:54:35 UTC; major; 8; minor; 2; DEV; dev8-2; tps; 47; 47; rkB/s; 4184; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2938; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 33; 33; aqu-sz; 2917; 2917;
-13:54:35 UTC; major; 8; minor; 3; DEV; dev8-3; tps; 49; 49; rkB/s; 4200; 4200; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2831; 2831; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 40; 40; aqu-sz; 2810; 2810;
-13:54:35 UTC; major; 8; minor; 4; DEV; dev8-4; tps; 5; 5; rkB/s; 28; 28; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1294; 1294; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 8; 8; aqu-sz; 1293; 1293;
-13:54:35 UTC; major; 8; minor; 5; DEV; dev8-5; tps; 57; 57; rkB/s; 4504; 4504; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 11927; 11927; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 51; 51; aqu-sz; 11902; 11902;
-13:54:35 UTC; major; 8; minor; 6; DEV; dev8-6; tps; 112; 112; rkB/s; 8848; 8848; wkB/s; 24; 24; dkB/s; 0; 0; rd_ticks; 2732; 2732; wr_ticks; 40; 40; dc_ticks; 0; 0; tot_ticks; 73; 73; aqu-sz; 2724; 2724;
-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;
-13:54:35 UTC; major; 202; minor; 240; DEV; dev202-240; tps; 82; 92; rkB/s; 3096; 4096; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 82; 92; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 52; 62; aqu-sz; 44; 54;
-13:54:35 UTC; major; 202; minor; 4096; DEV; dev202-4096; tps; 52; 62; rkB/s; 2096; 3096; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 31; 41; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 20; 30; aqu-sz; 40; 50;
+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;
+13:54:35 UTC; major; 8; minor; 1; DEV; sda1; 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; sda2; tps; 47; 47; rkB/s; 4184; 4184; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2938; 2938; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 33; 33; aqu-sz; 2917; 2917;
+13:54:35 UTC; major; 8; minor; 3; DEV; sda3; tps; 49; 49; rkB/s; 4200; 4200; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 2831; 2831; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 40; 40; aqu-sz; 2810; 2810;
+13:54:35 UTC; major; 8; minor; 4; DEV; sda4; tps; 5; 5; rkB/s; 28; 28; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 1294; 1294; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 8; 8; aqu-sz; 1293; 1293;
+13:54:35 UTC; major; 8; minor; 5; DEV; sda5; tps; 57; 57; rkB/s; 4504; 4504; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 11927; 11927; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 51; 51; aqu-sz; 11902; 11902;
+13:54:35 UTC; major; 8; minor; 6; DEV; sda6; tps; 112; 112; rkB/s; 8848; 8848; wkB/s; 24; 24; dkB/s; 0; 0; rd_ticks; 2732; 2732; wr_ticks; 40; 40; dc_ticks; 0; 0; tot_ticks; 73; 73; aqu-sz; 2724; 2724;
+13:54:35 UTC; major; 8; minor; 7; DEV; sda7; 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; sda8; 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; sda9; 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; cciss/c0d0; 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; cciss/c0d0p1; 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; cciss/c0d0p2; 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;
+13:54:35 UTC; major; 202; minor; 240; DEV; xvdp; tps; 82; 92; rkB/s; 3096; 4096; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 82; 92; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 52; 62; aqu-sz; 44; 54;
+13:54:35 UTC; major; 202; minor; 4096; DEV; xvdiw; tps; 52; 62; rkB/s; 2096; 3096; wkB/s; 0; 0; dkB/s; 0; 0; rd_ticks; 31; 41; wr_ticks; 0; 0; dc_ticks; 0; 0; tot_ticks; 20; 30; aqu-sz; 40; 50;
 # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35
 # name; A_NET_DEV; nr_curr; 9; nr_alloc; 10; nr_ini; 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;

diff --git a/tests/expected.sadf-x b/tests/expected.sadf-x
index 12967411c8a56a48c36c87274ed3703e87da204c..b2c7fb72fa182e15a42b4a9fc0c97fe0d6cfa4a7 100644 (file)
--- a/tests/expected.sadf-x
+++ b/tests/expected.sadf-x
@@ -566,20 +566,20 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                        <tty line="1" rcvin="0.00" xmtin="0.00" framerr="0.00" prtyerr="0.00" brk="0.00" ovrun="0.00"/>
                                </serial>
                                <disk per="second">
-                                       <disk-device dev="dev8-0" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-1" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-2" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-3" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-4" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-5" 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 dev="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 dev="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 dev="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 dev="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 dev="dev8-10" 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 dev="dev8-11" 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 dev="dev8-12" 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 dev="dev8-16" 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 dev="sda" 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 dev="sda1" 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 dev="sda2" 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 dev="sda3" 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 dev="sda4" 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 dev="sda5" 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 dev="sda6" 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 dev="sda7" 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 dev="sda8" 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 dev="sda9" 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 dev="sda10" 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 dev="sda11" 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 dev="sda12" 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 dev="sdb" 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>
                                <network per="second">
                                        <net-dev iface="lo" rxpck="0.00" txpck="0.00" rxkB="0.00" txkB="0.00" rxcmp="0.00" txcmp="0.00" rxmcst="0.00" ifutil-percent="0.00"/>
@@ -1194,20 +1194,20 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                        <tty line="1" rcvin="0.00" xmtin="0.00" framerr="0.00" prtyerr="0.00" brk="0.00" ovrun="0.00"/>
                                </serial>
                                <disk per="second">
-                                       <disk-device dev="dev8-0" tps="6.40" rd_sec="3.20" wr_sec="3.20" dc_sec="0.00" rkB="1.60" wkB="1.60" dkB="0.00" avgrq-sz="1.00" areq-sz="0.50" avgqu-sz="0.00" aqu-sz="0.00" await="1.00" util-percent="0.32"/>
-                                       <disk-device dev="dev8-1" tps="6.40" rd_sec="3.20" wr_sec="3.20" dc_sec="0.00" rkB="1.60" wkB="1.60" dkB="0.00" avgrq-sz="1.00" areq-sz="0.50" avgqu-sz="0.00" aqu-sz="0.00" await="1.00" util-percent="0.32"/>
-                                       <disk-device dev="dev8-2" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-3" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-4" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-5" 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 dev="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 dev="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 dev="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 dev="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 dev="dev8-10" 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 dev="dev8-11" 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 dev="dev8-12" 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 dev="dev8-16" tps="0.67" rd_sec="45.20" wr_sec="0.00" dc_sec="0.00" rkB="22.60" wkB="0.00" dkB="0.00" avgrq-sz="67.24" areq-sz="33.62" avgqu-sz="0.10" aqu-sz="0.10" await="47.00" util-percent="0.05"/>
+                                       <disk-device dev="sda" tps="6.40" rd_sec="3.20" wr_sec="3.20" dc_sec="0.00" rkB="1.60" wkB="1.60" dkB="0.00" avgrq-sz="1.00" areq-sz="0.50" avgqu-sz="0.00" aqu-sz="0.00" await="1.00" util-percent="0.32"/>
+                                       <disk-device dev="sda1" tps="6.40" rd_sec="3.20" wr_sec="3.20" dc_sec="0.00" rkB="1.60" wkB="1.60" dkB="0.00" avgrq-sz="1.00" areq-sz="0.50" avgqu-sz="0.00" aqu-sz="0.00" await="1.00" util-percent="0.32"/>
+                                       <disk-device dev="sda2" 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 dev="sda3" 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 dev="sda4" 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 dev="sda5" 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 dev="sda6" 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 dev="sda7" 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 dev="sda8" 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 dev="sda9" 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 dev="sda10" 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 dev="sda11" 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 dev="sda12" 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 dev="sdb" tps="0.67" rd_sec="45.20" wr_sec="0.00" dc_sec="0.00" rkB="22.60" wkB="0.00" dkB="0.00" avgrq-sz="67.24" areq-sz="33.62" avgqu-sz="0.10" aqu-sz="0.10" await="47.00" util-percent="0.05"/>
                                </disk>
                                <network per="second">
                                        <net-dev iface="lo" rxpck="0.00" txpck="0.00" rxkB="0.00" txkB="0.00" rxcmp="0.00" txcmp="0.00" rxmcst="0.00" ifutil-percent="0.00"/>
@@ -1823,21 +1823,21 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                        <tty line="1" rcvin="0.00" xmtin="0.00" framerr="0.00" prtyerr="0.00" brk="0.00" ovrun="0.00"/>
                                </serial>
                                <disk per="second">
-                                       <disk-device dev="dev8-0" tps="1604.70" rd_sec="82999.95" wr_sec="21326.96" dc_sec="0.00" rkB="41499.97" wkB="10663.48" dkB="0.00" avgrq-sz="65.01" areq-sz="32.51" avgqu-sz="18.56" aqu-sz="18.56" await="12.00" util-percent="85.36"/>
-                                       <disk-device dev="dev8-1" tps="1.32" rd_sec="109.51" wr_sec="0.00" dc_sec="0.00" rkB="54.75" wkB="0.00" dkB="0.00" avgrq-sz="82.67" areq-sz="41.33" avgqu-sz="0.08" aqu-sz="0.08" await="60.92" util-percent="0.11"/>
-                                       <disk-device dev="dev8-2" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-3" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-4" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-5" 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 dev="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 dev="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 dev="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 dev="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 dev="dev8-10" 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 dev="dev8-11" 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 dev="dev8-12" 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 dev="dev8-80" tps="1.22" rd_sec="108.68" wr_sec="0.00" dc_sec="0.00" rkB="54.34" wkB="0.00" dkB="0.00" avgrq-sz="89.02" areq-sz="44.51" avgqu-sz="0.08" aqu-sz="0.08" await="62.51" util-percent="0.09"/>
-                                       <disk-device dev="dev8-96" tps="2.91" rd_sec="229.82" wr_sec="0.62" dc_sec="0.00" rkB="114.91" wkB="0.31" dkB="0.00" avgrq-sz="79.21" areq-sz="39.61" avgqu-sz="0.07" aqu-sz="0.07" await="24.75" util-percent="0.19"/>
+                                       <disk-device dev="sda" tps="1604.70" rd_sec="82999.95" wr_sec="21326.96" dc_sec="0.00" rkB="41499.97" wkB="10663.48" dkB="0.00" avgrq-sz="65.01" areq-sz="32.51" avgqu-sz="18.56" aqu-sz="18.56" await="12.00" util-percent="85.36"/>
+                                       <disk-device dev="sda1" tps="1.32" rd_sec="109.51" wr_sec="0.00" dc_sec="0.00" rkB="54.75" wkB="0.00" dkB="0.00" avgrq-sz="82.67" areq-sz="41.33" avgqu-sz="0.08" aqu-sz="0.08" await="60.92" util-percent="0.11"/>
+                                       <disk-device dev="sda2" 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 dev="sda3" 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 dev="sda4" 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 dev="sda5" 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 dev="sda6" 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 dev="sda7" 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 dev="sda8" 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 dev="sda9" 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 dev="sda10" 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 dev="sda11" 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 dev="sda12" 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 dev="sdf" tps="1.22" rd_sec="108.68" wr_sec="0.00" dc_sec="0.00" rkB="54.34" wkB="0.00" dkB="0.00" avgrq-sz="89.02" areq-sz="44.51" avgqu-sz="0.08" aqu-sz="0.08" await="62.51" util-percent="0.09"/>
+                                       <disk-device dev="sdg" tps="2.91" rd_sec="229.82" wr_sec="0.62" dc_sec="0.00" rkB="114.91" wkB="0.31" dkB="0.00" avgrq-sz="79.21" areq-sz="39.61" avgqu-sz="0.07" aqu-sz="0.07" await="24.75" util-percent="0.19"/>
                                </disk>
                                <network per="second">
                                        <net-dev iface="lo" rxpck="0.00" txpck="0.00" rxkB="0.00" txkB="0.00" rxcmp="0.00" txcmp="0.00" rxmcst="0.00" ifutil-percent="0.00"/>
@@ -2457,21 +2457,21 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                        <tty line="1" rcvin="0.00" xmtin="0.00" framerr="0.00" prtyerr="0.00" brk="0.00" ovrun="0.00"/>
                                </serial>
                                <disk per="second">
-                                       <disk-device dev="dev8-0" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-1" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-2" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-3" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-4" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-5" 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 dev="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 dev="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 dev="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 dev="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 dev="dev8-10" 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 dev="dev8-11" 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 dev="dev8-12" 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 dev="dev8-80" 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 dev="dev8-96" tps="0.94" rd_sec="44.66" wr_sec="0.45" dc_sec="0.00" rkB="22.33" wkB="0.22" dkB="0.00" avgrq-sz="48.10" areq-sz="24.05" avgqu-sz="0.04" aqu-sz="0.04" await="6.19" util-percent="0.09"/>
+                                       <disk-device dev="sda" 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 dev="sda1" 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 dev="sda2" 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 dev="sda3" 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 dev="sda4" 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 dev="sda5" 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 dev="sda6" 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 dev="sda7" 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 dev="sda8" 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 dev="sda9" 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 dev="sda10" 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 dev="sda11" 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 dev="sda12" 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 dev="sdf" 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 dev="sdg" tps="0.94" rd_sec="44.66" wr_sec="0.45" dc_sec="0.00" rkB="22.33" wkB="0.22" dkB="0.00" avgrq-sz="48.10" areq-sz="24.05" avgqu-sz="0.04" aqu-sz="0.04" await="6.19" util-percent="0.09"/>
                                </disk>
                                <network per="second">
                                        <net-dev iface="lo" rxpck="0.00" txpck="0.00" rxkB="0.00" txkB="0.00" rxcmp="0.00" txcmp="0.00" rxmcst="0.00" ifutil-percent="0.00"/>
@@ -3094,21 +3094,21 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                        <tty line="1" rcvin="0.00" xmtin="0.00" framerr="0.00" prtyerr="0.00" brk="0.00" ovrun="0.00"/>
                                </serial>
                                <disk per="second">
-                                       <disk-device dev="dev8-0" tps="1.60" rd_sec="0.00" wr_sec="0.00" dc_sec="1.60" rkB="0.00" wkB="0.00" dkB="0.80" avgrq-sz="1.00" areq-sz="0.50" avgqu-sz="0.00" aqu-sz="0.00" await="1.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-1" tps="1.60" rd_sec="0.00" wr_sec="0.00" dc_sec="1.60" rkB="0.00" wkB="0.00" dkB="0.80" avgrq-sz="1.00" areq-sz="0.50" avgqu-sz="0.00" aqu-sz="0.00" await="1.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-2" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-3" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-4" tps="0.00" rd_sec="0.00" wr_sec="0.00" dc_sec="0.00" rkB="0.00" wkB="0.00" dkB="0.00" avgrq-sz="0.00" areq-sz="0.00" avgqu-sz="0.00" aqu-sz="0.00" await="0.00" util-percent="0.00"/>
-                                       <disk-device dev="dev8-5" 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 dev="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 dev="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 dev="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 dev="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 dev="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 dev="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 dev="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"/>
-                                       <disk-device dev="dev202-240" tps="0.32" rd_sec="32.08" wr_sec="0.00" dc_sec="0.00" rkB="16.04" wkB="0.00" dkB="0.00" avgrq-sz="100.00" areq-sz="50.00" avgqu-sz="0.00" aqu-sz="0.00" await="1.00" util-percent="0.03"/>
-                                       <disk-device dev="dev202-4096" tps="0.32" rd_sec="32.08" wr_sec="0.00" dc_sec="0.00" rkB="16.04" wkB="0.00" dkB="0.00" avgrq-sz="100.00" areq-sz="50.00" avgqu-sz="0.00" aqu-sz="0.00" await="1.00" util-percent="0.03"/>
+                                       <disk-device dev="sda" tps="1.60" rd_sec="0.00" wr_sec="0.00" dc_sec="1.60" rkB="0.00" wkB="0.00" dkB="0.80" avgrq-sz="1.00" areq-sz="0.50" avgqu-sz="0.00" aqu-sz="0.00" await="1.00" util-percent="0.00"/>
+                                       <disk-device dev="sda1" tps="1.60" rd_sec="0.00" wr_sec="0.00" dc_sec="1.60" rkB="0.00" wkB="0.00" dkB="0.80" avgrq-sz="1.00" areq-sz="0.50" avgqu-sz="0.00" aqu-sz="0.00" await="1.00" util-percent="0.00"/>
+                                       <disk-device dev="sda2" 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 dev="sda3" 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 dev="sda4" 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 dev="sda5" 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 dev="sda6" 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 dev="sda7" 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 dev="sda8" 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 dev="sda9" 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 dev="cciss/c0d0" 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 dev="cciss/c0d0p1" 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 dev="cciss/c0d0p2" 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 dev="xvdp" tps="0.32" rd_sec="32.08" wr_sec="0.00" dc_sec="0.00" rkB="16.04" wkB="0.00" dkB="0.00" avgrq-sz="100.00" areq-sz="50.00" avgqu-sz="0.00" aqu-sz="0.00" await="1.00" util-percent="0.03"/>
+                                       <disk-device dev="xvdiw" tps="0.32" rd_sec="32.08" wr_sec="0.00" dc_sec="0.00" rkB="16.04" wkB="0.00" dkB="0.00" avgrq-sz="100.00" areq-sz="50.00" avgqu-sz="0.00" aqu-sz="0.00" await="1.00" util-percent="0.03"/>
                                </disk>
                                <network per="second">
                                        <net-dev iface="lo" rxpck="0.00" txpck="0.00" rxkB="0.00" txkB="0.00" rxcmp="0.00" txcmp="0.00" rxmcst="0.00" ifutil-percent="0.00"/>

diff --git a/tests/expected.sar-all b/tests/expected.sar-all
index 91397cebd031cdb83b59553e4f26256e06d5aa55..36e6cf812de10bc4b1a57f150f5478b706c0ec9a 100644 (file)
--- a/tests/expected.sar-all
+++ b/tests/expected.sar-all
@@ -2568,79 +2568,79 @@ Average:            0      0.00      0.00      0.00      0.00      0.00      0.0
 Average:            1      0.00      0.00      0.00      0.00      0.00      0.00
 
 13:20:09          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
-13:20:19       dev8-0      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19      dev8-12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19      dev8-16      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-0      6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32
-13:20:29       dev8-1      6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32
-13:20:29       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29      dev8-12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29      dev8-16      0.67     22.60      0.00      0.00     33.62      0.10     47.00      0.05
-13:20:39       dev8-0   1604.70  41499.97  10663.48      0.00     32.51     18.56     12.00     85.36
-13:20:39       dev8-1      1.32     54.75      0.00      0.00     41.33      0.08     60.92      0.11
-13:20:39       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39      dev8-12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39      dev8-80      1.22     54.34      0.00      0.00     44.51      0.08     62.51      0.09
-13:20:39      dev8-96      2.91    114.91      0.31      0.00     39.61      0.07     24.75      0.19
-13:20:49       dev8-0      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49      dev8-12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49      dev8-80      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49      dev8-96      0.94     22.33      0.22      0.00     24.05      0.04      6.19      0.09
-Average:       dev8-0      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-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:      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:      dev8-12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:      dev8-80      0.38     16.97      0.00      0.00     44.51      0.02     62.51      0.03
-Average:      dev8-96      1.08     39.94      0.14      0.00     37.15      0.03     21.82      0.08
+13:20:19          sda      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19        sda12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19          sdb      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29          sda      6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32
+13:20:29         sda1      6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32
+13:20:29         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29        sda12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29          sdb      0.67     22.60      0.00      0.00     33.62      0.10     47.00      0.05
+13:20:39          sda   1604.70  41499.97  10663.48      0.00     32.51     18.56     12.00     85.36
+13:20:39         sda1      1.32     54.75      0.00      0.00     41.33      0.08     60.92      0.11
+13:20:39         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39        sda12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39          sdf      1.22     54.34      0.00      0.00     44.51      0.08     62.51      0.09
+13:20:39          sdg      2.91    114.91      0.31      0.00     39.61      0.07     24.75      0.19
+13:20:49          sda      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49        sda12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49          sdf      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49          sdg      0.94     22.33      0.22      0.00     24.05      0.04      6.19      0.09
+Average:          sda      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:        sda12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:          sdf      0.38     16.97      0.00      0.00     44.51      0.02     62.51      0.03
+Average:          sdg      1.08     39.94      0.14      0.00     37.15      0.03     21.82      0.08
 
 13:20:09        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

diff --git a/tests/expected.sar-dec b/tests/expected.sar-dec
index 11c4e87da1cbc6b97f04aa9873961ac63ae9a63e..5c7a8acff9f604898c69b8c0da7a42bc3b80ec6b 100644 (file)
--- a/tests/expected.sar-dec
+++ b/tests/expected.sar-dec
@@ -2568,79 +2568,79 @@ Average:            0         0         0         0         0         0
 Average:            1         0         0         0         0         0         0
 
 13:20:09          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
-13:20:19       dev8-0         0         0         0         0         0         0         0         0
-13:20:19       dev8-1         0         0         0         0         0         0         0         0
-13:20:19       dev8-2         0         0         0         0         0         0         0         0
-13:20:19       dev8-3         0         0         0         0         0         0         0         0
-13:20:19       dev8-4         0         0         0         0         0         0         0         0
-13:20:19       dev8-5         0         0         0         0         0         0         0         0
-13:20:19       dev8-6         0         0         0         0         0         0         0         0
-13:20:19       dev8-7         0         0         0         0         0         0         0         0
-13:20:19       dev8-8         0         0         0         0         0         0         0         0
-13:20:19       dev8-9         0         0         0         0         0         0         0         0
-13:20:19      dev8-10         0         0         0         0         0         0         0         0
-13:20:19      dev8-11         0         0         0         0         0         0         0         0
-13:20:19      dev8-12         0         0         0         0         0         0         0         0
-13:20:19      dev8-16         0         0         0         0         0         0         0         0
-13:20:29       dev8-0         6         2         2         0         0         0         1         0
-13:20:29       dev8-1         6         2         2         0         0         0         1         0
-13:20:29       dev8-2         0         0         0         0         0         0         0         0
-13:20:29       dev8-3         0         0         0         0         0         0         0         0
-13:20:29       dev8-4         0         0         0         0         0         0         0         0
-13:20:29       dev8-5         0         0         0         0         0         0         0         0
-13:20:29       dev8-6         0         0         0         0         0         0         0         0
-13:20:29       dev8-7         0         0         0         0         0         0         0         0
-13:20:29       dev8-8         0         0         0         0         0         0         0         0
-13:20:29       dev8-9         0         0         0         0         0         0         0         0
-13:20:29      dev8-10         0         0         0         0         0         0         0         0
-13:20:29      dev8-11         0         0         0         0         0         0         0         0
-13:20:29      dev8-12         0         0         0         0         0         0         0         0
-13:20:29      dev8-16         1        23         0         0        34         0        47         0
-13:20:39       dev8-0      1605     41500     10663         0        33        19        12        85
-13:20:39       dev8-1         1        55         0         0        41         0        61         0
-13:20:39       dev8-2         0         0         0         0         0         0         0         0
-13:20:39       dev8-3         0         0         0         0         0         0         0         0
-13:20:39       dev8-4         0         0         0         0         0         0         0         0
-13:20:39       dev8-5         0         0         0         0         0         0         0         0
-13:20:39       dev8-6         0         0         0         0         0         0         0         0
-13:20:39       dev8-7         0         0         0         0         0         0         0         0
-13:20:39       dev8-8         0         0         0         0         0         0         0         0
-13:20:39       dev8-9         0         0         0         0         0         0         0         0
-13:20:39      dev8-10         0         0         0         0         0         0         0         0
-13:20:39      dev8-11         0         0         0         0         0         0         0         0
-13:20:39      dev8-12         0         0         0         0         0         0         0         0
-13:20:39      dev8-80         1        54         0         0        45         0        63         0
-13:20:39      dev8-96         3       115         0         0        40         0        25         0
-13:20:49       dev8-0         0         0         0         0         0         0         0         0
-13:20:49       dev8-1         0         0         0         0         0         0         0         0
-13:20:49       dev8-2         0         0         0         0         0         0         0         0
-13:20:49       dev8-3         0         0         0         0         0         0         0         0
-13:20:49       dev8-4         0         0         0         0         0         0         0         0
-13:20:49       dev8-5         0         0         0         0         0         0         0         0
-13:20:49       dev8-6         0         0         0         0         0         0         0         0
-13:20:49       dev8-7         0         0         0         0         0         0         0         0
-13:20:49       dev8-8         0         0         0         0         0         0         0         0
-13:20:49       dev8-9         0         0         0         0         0         0         0         0
-13:20:49      dev8-10         0         0         0         0         0         0         0         0
-13:20:49      dev8-11         0         0         0         0         0         0         0         0
-13:20:49      dev8-12         0         0         0         0         0         0         0         0
-13:20:49      dev8-80         0         0         0         0         0         0         0         0
-13:20:49      dev8-96         1        22         0         0        24         0         6         0
-Average:       dev8-0         0         0         0         0         0         0         0         0
-Average:       dev8-1         0         0         0         0         0         0         0         0
-Average:       dev8-2         0         0         0         0         0         0         0         0
-Average:       dev8-3         0         0         0         0         0         0         0         0
-Average:       dev8-4         0         0         0         0         0         0         0         0
-Average:       dev8-5         0         0         0         0         0         0         0         0
-Average:       dev8-6         0         0         0         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:      dev8-10         0         0         0         0         0         0         0         0
-Average:      dev8-11         0         0         0         0         0         0         0         0
-Average:      dev8-12         0         0         0         0         0         0         0         0
-Average:      dev8-80         0        17         0         0        45         0        63         0
-Average:      dev8-96         1        40         0         0        37         0        22         0
+13:20:19          sda         0         0         0         0         0         0         0         0
+13:20:19         sda1         0         0         0         0         0         0         0         0
+13:20:19         sda2         0         0         0         0         0         0         0         0
+13:20:19         sda3         0         0         0         0         0         0         0         0
+13:20:19         sda4         0         0         0         0         0         0         0         0
+13:20:19         sda5         0         0         0         0         0         0         0         0
+13:20:19         sda6         0         0         0         0         0         0         0         0
+13:20:19         sda7         0         0         0         0         0         0         0         0
+13:20:19         sda8         0         0         0         0         0         0         0         0
+13:20:19         sda9         0         0         0         0         0         0         0         0
+13:20:19        sda10         0         0         0         0         0         0         0         0
+13:20:19        sda11         0         0         0         0         0         0         0         0
+13:20:19        sda12         0         0         0         0         0         0         0         0
+13:20:19          sdb         0         0         0         0         0         0         0         0
+13:20:29          sda         6         2         2         0         0         0         1         0
+13:20:29         sda1         6         2         2         0         0         0         1         0
+13:20:29         sda2         0         0         0         0         0         0         0         0
+13:20:29         sda3         0         0         0         0         0         0         0         0
+13:20:29         sda4         0         0         0         0         0         0         0         0
+13:20:29         sda5         0         0         0         0         0         0         0         0
+13:20:29         sda6         0         0         0         0         0         0         0         0
+13:20:29         sda7         0         0         0         0         0         0         0         0
+13:20:29         sda8         0         0         0         0         0         0         0         0
+13:20:29         sda9         0         0         0         0         0         0         0         0
+13:20:29        sda10         0         0         0         0         0         0         0         0
+13:20:29        sda11         0         0         0         0         0         0         0         0
+13:20:29        sda12         0         0         0         0         0         0         0         0
+13:20:29          sdb         1        23         0         0        34         0        47         0
+13:20:39          sda      1605     41500     10663         0        33        19        12        85
+13:20:39         sda1         1        55         0         0        41         0        61         0
+13:20:39         sda2         0         0         0         0         0         0         0         0
+13:20:39         sda3         0         0         0         0         0         0         0         0
+13:20:39         sda4         0         0         0         0         0         0         0         0
+13:20:39         sda5         0         0         0         0         0         0         0         0
+13:20:39         sda6         0         0         0         0         0         0         0         0
+13:20:39         sda7         0         0         0         0         0         0         0         0
+13:20:39         sda8         0         0         0         0         0         0         0         0
+13:20:39         sda9         0         0         0         0         0         0         0         0
+13:20:39        sda10         0         0         0         0         0         0         0         0
+13:20:39        sda11         0         0         0         0         0         0         0         0
+13:20:39        sda12         0         0         0         0         0         0         0         0
+13:20:39          sdf         1        54         0         0        45         0        63         0
+13:20:39          sdg         3       115         0         0        40         0        25         0
+13:20:49          sda         0         0         0         0         0         0         0         0
+13:20:49         sda1         0         0         0         0         0         0         0         0
+13:20:49         sda2         0         0         0         0         0         0         0         0
+13:20:49         sda3         0         0         0         0         0         0         0         0
+13:20:49         sda4         0         0         0         0         0         0         0         0
+13:20:49         sda5         0         0         0         0         0         0         0         0
+13:20:49         sda6         0         0         0         0         0         0         0         0
+13:20:49         sda7         0         0         0         0         0         0         0         0
+13:20:49         sda8         0         0         0         0         0         0         0         0
+13:20:49         sda9         0         0         0         0         0         0         0         0
+13:20:49        sda10         0         0         0         0         0         0         0         0
+13:20:49        sda11         0         0         0         0         0         0         0         0
+13:20:49        sda12         0         0         0         0         0         0         0         0
+13:20:49          sdf         0         0         0         0         0         0         0         0
+13:20:49          sdg         1        22         0         0        24         0         6         0
+Average:          sda         0         0         0         0         0         0         0         0
+Average:         sda1         0         0         0         0         0         0         0         0
+Average:         sda2         0         0         0         0         0         0         0         0
+Average:         sda3         0         0         0         0         0         0         0         0
+Average:         sda4         0         0         0         0         0         0         0         0
+Average:         sda5         0         0         0         0         0         0         0         0
+Average:         sda6         0         0         0         0         0         0         0         0
+Average:         sda7         0         0         0         0         0         0         0         0
+Average:         sda8         0         0         0         0         0         0         0         0
+Average:         sda9         0         0         0         0         0         0         0         0
+Average:        sda10         0         0         0         0         0         0         0         0
+Average:        sda11         0         0         0         0         0         0         0         0
+Average:        sda12         0         0         0         0         0         0         0         0
+Average:          sdf         0        17         0         0        45         0        63         0
+Average:          sdg         1        40         0         0        37         0        22         0
 
 13:20:09        IFACE   rxpck/s   txpck/s    rxkB/s    txkB/s   rxcmp/s   txcmp/s  rxmcst/s   %ifutil
 13:20:19           lo         0         0         0         0         0         0         0         0
@@ -4020,36 +4020,36 @@ Average:            0         0         0         0         0         0
 Average:            1         0         0         0         0         0         0
 
 13:54:15          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
-13:54:35       dev8-0         2         0         0         1         0         0         1         0
-13:54:35       dev8-1         2         0         0         1         0         0         1         0
-13:54:35       dev8-2         0         0         0         0         0         0         0         0
-13:54:35       dev8-3         0         0         0         0         0         0         0         0
-13:54:35       dev8-4         0         0         0         0         0         0         0         0
-13:54:35       dev8-5         0         0         0         0         0         0         0         0
-13:54:35       dev8-6         0         0         0         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
-13:54:35    dev202-240         0        16         0         0        50         0         1         0
-13:54:35    dev202-4096         0        16         0         0        50         0         1         0
-Average:       dev8-0         2         0         0         1         0         0         1         0
-Average:       dev8-1         2         0         0         1         0         0         1         0
-Average:       dev8-2         0         0         0         0         0         0         0         0
-Average:       dev8-3         0         0         0         0         0         0         0         0
-Average:       dev8-4         0         0         0         0         0         0         0         0
-Average:       dev8-5         0         0         0         0         0         0         0         0
-Average:       dev8-6         0         0         0         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
-Average:    dev202-240         0        16         0         0        50         0         1         0
-Average:    dev202-4096         0        16         0         0        50         0         1         0
+13:54:35          sda         2         0         0         1         0         0         1         0
+13:54:35         sda1         2         0         0         1         0         0         1         0
+13:54:35         sda2         0         0         0         0         0         0         0         0
+13:54:35         sda3         0         0         0         0         0         0         0         0
+13:54:35         sda4         0         0         0         0         0         0         0         0
+13:54:35         sda5         0         0         0         0         0         0         0         0
+13:54:35         sda6         0         0         0         0         0         0         0         0
+13:54:35         sda7         0         0         0         0         0         0         0         0
+13:54:35         sda8         0         0         0         0         0         0         0         0
+13:54:35         sda9         0         0         0         0         0         0         0         0
+13:54:35    cciss/c0d0     32403         0         0         0         0         0         0         0
+13:54:35    cciss/c0d0p1         0         0         0         0         0         0         0         0
+13:54:35    cciss/c0d0p2     32403         0         0         0         0         0         0         0
+13:54:35         xvdp         0        16         0         0        50         0         1         0
+13:54:35        xvdiw         0        16         0         0        50         0         1         0
+Average:          sda         2         0         0         1         0         0         1         0
+Average:         sda1         2         0         0         1         0         0         1         0
+Average:         sda2         0         0         0         0         0         0         0         0
+Average:         sda3         0         0         0         0         0         0         0         0
+Average:         sda4         0         0         0         0         0         0         0         0
+Average:         sda5         0         0         0         0         0         0         0         0
+Average:         sda6         0         0         0         0         0         0         0         0
+Average:         sda7         0         0         0         0         0         0         0         0
+Average:         sda8         0         0         0         0         0         0         0         0
+Average:         sda9         0         0         0         0         0         0         0         0
+Average:    cciss/c0d0     32403         0         0         0         0         0         0         0
+Average:    cciss/c0d0p1         0         0         0         0         0         0         0         0
+Average:    cciss/c0d0p2     32403         0         0         0         0         0         0         0
+Average:         xvdp         0        16         0         0        50         0         1         0
+Average:        xvdiw         0        16         0         0        50         0         1         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-dev b/tests/expected.sar-dev
index 3501fd5eda6c9b6436cf9d7503cd23bba02c503d..eb71e7452e4d6a874cca507c175f920d6358ab16 100644 (file)
--- a/tests/expected.sar-dev
+++ b/tests/expected.sar-dev
@@ -1,16 +1,16 @@
 Linux 1.2.3-TEST (SYSSTAT.TEST)        04/18/19        _x86_64_        (8 CPU)
 
-13:20:09          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
-13:20:19          sda      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29          sda      6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32
-13:20:39          sda   1604.70  41499.97  10663.48      0.00     32.51     18.56     12.00     85.36
-13:20:49          sda      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:          sda      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:09          tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util DEV
+13:20:19         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda
+13:20:29         6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32 sda
+13:20:39      1604.70  41499.97  10663.48      0.00     32.51     18.56     12.00     85.36 sda
+13:20:49         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda
 
 13:37:29     LINUX RESTART     (8 CPU)
 
 13:54:09     LINUX RESTART     (10 CPU)
 
-13:54:15          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
-13:54:35          sda      1.60      0.00      0.00      0.80      0.50      0.00      1.00      0.00
-Average:          sda      1.60      0.00      0.00      0.80      0.50      0.00      1.00      0.00
+13:54:15          tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util DEV
+13:54:35         1.60      0.00      0.00      0.80      0.50      0.00      1.00      0.00 sda
+Average:         1.60      0.00      0.00      0.80      0.50      0.00      1.00      0.00 sda

diff --git a/tests/expected.sar-human b/tests/expected.sar-human
index 59f8229e803791e8a63284cd78b95d04c0b81665..2121abe9c276c9159591215ad8282ea8814bb47f 100644 (file)
--- a/tests/expected.sar-human
+++ b/tests/expected.sar-human
@@ -2568,79 +2568,79 @@ Average:            0      0.00      0.00      0.00      0.00      0.00      0.0
 Average:            1      0.00      0.00      0.00      0.00      0.00      0.00
 
 13:20:09          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
-13:20:19       dev8-0      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:19       dev8-1      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:19       dev8-2      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:19       dev8-3      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:19       dev8-4      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:19       dev8-5      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:19       dev8-6      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:19       dev8-7      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:19       dev8-8      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:19       dev8-9      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:19      dev8-10      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:19      dev8-11      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:19      dev8-12      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:19      dev8-16      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:29       dev8-0      6.40      1.6k      1.6k      0.0k      0.5k      0.00      1.00      0.3%
-13:20:29       dev8-1      6.40      1.6k      1.6k      0.0k      0.5k      0.00      1.00      0.3%
-13:20:29       dev8-2      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:29       dev8-3      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:29       dev8-4      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:29       dev8-5      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:29       dev8-6      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:29       dev8-7      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:29       dev8-8      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:29       dev8-9      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:29      dev8-10      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:29      dev8-11      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:29      dev8-12      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:29      dev8-16      0.67     22.6k      0.0k      0.0k     33.6k      0.10     47.00      0.1%
-13:20:39       dev8-0   1604.70     40.5M     10.4M      0.0k     32.5k     18.56     12.00     85.4%
-13:20:39       dev8-1      1.32     54.8k      0.0k      0.0k     41.3k      0.08     60.92      0.1%
-13:20:39       dev8-2      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:39       dev8-3      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:39       dev8-4      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:39       dev8-5      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:39       dev8-6      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:39       dev8-7      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:39       dev8-8      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:39       dev8-9      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:39      dev8-10      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:39      dev8-11      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:39      dev8-12      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:39      dev8-80      1.22     54.3k      0.0k      0.0k     44.5k      0.08     62.51      0.1%
-13:20:39      dev8-96      2.91    114.9k      0.3k      0.0k     39.6k      0.07     24.75      0.2%
-13:20:49       dev8-0      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:49       dev8-1      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:49       dev8-2      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:49       dev8-3      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:49       dev8-4      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:49       dev8-5      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:49       dev8-6      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:49       dev8-7      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:49       dev8-8      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:49       dev8-9      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:49      dev8-10      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:49      dev8-11      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:49      dev8-12      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:49      dev8-80      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:20:49      dev8-96      0.94     22.3k      0.2k      0.0k     24.0k      0.04      6.19      0.1%
-Average:       dev8-0      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-Average:       dev8-1      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-Average:       dev8-2      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-Average:       dev8-3      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-Average:       dev8-4      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-Average:       dev8-5      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-Average:       dev8-6      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      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:      dev8-10      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-Average:      dev8-11      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-Average:      dev8-12      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-Average:      dev8-80      0.38     17.0k      0.0k      0.0k     44.5k      0.02     62.51      0.0%
-Average:      dev8-96      1.08     39.9k      0.1k      0.0k     37.2k      0.03     21.82      0.1%
+13:20:19          sda      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:19         sda1      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:19         sda2      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:19         sda3      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:19         sda4      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:19         sda5      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:19         sda6      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:19         sda7      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:19         sda8      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:19         sda9      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:19        sda10      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:19        sda11      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:19        sda12      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:19          sdb      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:29          sda      6.40      1.6k      1.6k      0.0k      0.5k      0.00      1.00      0.3%
+13:20:29         sda1      6.40      1.6k      1.6k      0.0k      0.5k      0.00      1.00      0.3%
+13:20:29         sda2      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:29         sda3      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:29         sda4      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:29         sda5      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:29         sda6      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:29         sda7      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:29         sda8      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:29         sda9      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:29        sda10      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:29        sda11      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:29        sda12      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:29          sdb      0.67     22.6k      0.0k      0.0k     33.6k      0.10     47.00      0.1%
+13:20:39          sda   1604.70     40.5M     10.4M      0.0k     32.5k     18.56     12.00     85.4%
+13:20:39         sda1      1.32     54.8k      0.0k      0.0k     41.3k      0.08     60.92      0.1%
+13:20:39         sda2      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:39         sda3      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:39         sda4      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:39         sda5      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:39         sda6      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:39         sda7      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:39         sda8      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:39         sda9      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:39        sda10      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:39        sda11      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:39        sda12      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:39          sdf      1.22     54.3k      0.0k      0.0k     44.5k      0.08     62.51      0.1%
+13:20:39          sdg      2.91    114.9k      0.3k      0.0k     39.6k      0.07     24.75      0.2%
+13:20:49          sda      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:49         sda1      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:49         sda2      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:49         sda3      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:49         sda4      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:49         sda5      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:49         sda6      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:49         sda7      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:49         sda8      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:49         sda9      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:49        sda10      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:49        sda11      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:49        sda12      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:49          sdf      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:20:49          sdg      0.94     22.3k      0.2k      0.0k     24.0k      0.04      6.19      0.1%
+Average:          sda      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:         sda1      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:         sda2      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:         sda3      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:         sda4      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:         sda5      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:         sda6      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:         sda7      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:         sda8      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:         sda9      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:        sda10      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:        sda11      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:        sda12      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:          sdf      0.38     17.0k      0.0k      0.0k     44.5k      0.02     62.51      0.0%
+Average:          sdg      1.08     39.9k      0.1k      0.0k     37.2k      0.03     21.82      0.1%
 
 13:20:09        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.0B      0.0B      0.00      0.00      0.00      0.0%
@@ -4020,36 +4020,36 @@ Average:            0      0.00      0.00      0.00      0.00      0.00      0.0
 Average:            1      0.00      0.00      0.00      0.00      0.00      0.00
 
 13:54:15          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
-13:54:35       dev8-0      1.60      0.0k      0.0k      0.8k      0.5k      0.00      1.00      0.0%
-13:54:35       dev8-1      1.60      0.0k      0.0k      0.8k      0.5k      0.00      1.00      0.0%
-13:54:35       dev8-2      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:54:35       dev8-3      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:54:35       dev8-4      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:54:35       dev8-5      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-13:54:35       dev8-6      0.00      0.0k      0.0k      0.0k      0.0k      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%
-13:54:35    dev202-240      0.32     16.0k      0.0k      0.0k     50.0k      0.00      1.00      0.0%
-13:54:35    dev202-4096      0.32     16.0k      0.0k      0.0k     50.0k      0.00      1.00      0.0%
-Average:       dev8-0      1.60      0.0k      0.0k      0.8k      0.5k      0.00      1.00      0.0%
-Average:       dev8-1      1.60      0.0k      0.0k      0.8k      0.5k      0.00      1.00      0.0%
-Average:       dev8-2      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-Average:       dev8-3      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-Average:       dev8-4      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-Average:       dev8-5      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
-Average:       dev8-6      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      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%
-Average:    dev202-240      0.32     16.0k      0.0k      0.0k     50.0k      0.00      1.00      0.0%
-Average:    dev202-4096      0.32     16.0k      0.0k      0.0k     50.0k      0.00      1.00      0.0%
+13:54:35          sda      1.60      0.0k      0.0k      0.8k      0.5k      0.00      1.00      0.0%
+13:54:35         sda1      1.60      0.0k      0.0k      0.8k      0.5k      0.00      1.00      0.0%
+13:54:35         sda2      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:54:35         sda3      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:54:35         sda4      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:54:35         sda5      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:54:35         sda6      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:54:35         sda7      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:54:35         sda8      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:54:35         sda9      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:54:35    cciss/c0d0  32402.95      0.0k      0.0k      0.0k      0.0k      0.00      0.10      0.0%
+13:54:35    cciss/c0d0p1      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+13:54:35    cciss/c0d0p2  32402.95      0.0k      0.0k      0.0k      0.0k      0.00      0.10      0.0%
+13:54:35         xvdp      0.32     16.0k      0.0k      0.0k     50.0k      0.00      1.00      0.0%
+13:54:35        xvdiw      0.32     16.0k      0.0k      0.0k     50.0k      0.00      1.00      0.0%
+Average:          sda      1.60      0.0k      0.0k      0.8k      0.5k      0.00      1.00      0.0%
+Average:         sda1      1.60      0.0k      0.0k      0.8k      0.5k      0.00      1.00      0.0%
+Average:         sda2      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:         sda3      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:         sda4      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:         sda5      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:         sda6      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:         sda7      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:         sda8      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:         sda9      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:    cciss/c0d0  32402.95      0.0k      0.0k      0.0k      0.0k      0.00      0.10      0.0%
+Average:    cciss/c0d0p1      0.00      0.0k      0.0k      0.0k      0.0k      0.00      0.00      0.0%
+Average:    cciss/c0d0p2  32402.95      0.0k      0.0k      0.0k      0.0k      0.00      0.10      0.0%
+Average:         xvdp      0.32     16.0k      0.0k      0.0k     50.0k      0.00      1.00      0.0%
+Average:        xvdiw      0.32     16.0k      0.0k      0.0k     50.0k      0.00      1.00      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-pretty b/tests/expected.sar-pretty
new file mode 100644 (file)
index 0000000..22d4059
--- /dev/null
+++ b/tests/expected.sar-pretty
@@ -0,0 +1,112 @@
+Linux 1.2.3-TEST (SYSSTAT.TEST)        04/18/19        _x86_64_        (8 CPU)
+
+13:20:09          tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util DEV
+13:20:19         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda
+13:20:19         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda1
+13:20:19         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda2
+13:20:19         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda3
+13:20:19         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda4
+13:20:19         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda5
+13:20:19         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda6
+13:20:19         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda7
+13:20:19         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda8
+13:20:19         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda9
+13:20:19         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda10
+13:20:19         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda11
+13:20:19         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda12
+13:20:19         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sdb
+13:20:29         6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32 sda
+13:20:29         6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32 sda1
+13:20:29         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda2
+13:20:29         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda3
+13:20:29         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda4
+13:20:29         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda5
+13:20:29         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda6
+13:20:29         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda7
+13:20:29         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda8
+13:20:29         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda9
+13:20:29         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda10
+13:20:29         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda11
+13:20:29         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda12
+13:20:29         0.67     22.60      0.00      0.00     33.62      0.10     47.00      0.05 sdb
+13:20:39      1604.70  41499.97  10663.48      0.00     32.51     18.56     12.00     85.36 sda
+13:20:39         1.32     54.75      0.00      0.00     41.33      0.08     60.92      0.11 sda1
+13:20:39         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda2
+13:20:39         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda3
+13:20:39         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda4
+13:20:39         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda5
+13:20:39         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda6
+13:20:39         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda7
+13:20:39         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda8
+13:20:39         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda9
+13:20:39         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda10
+13:20:39         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda11
+13:20:39         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda12
+13:20:39         1.22     54.34      0.00      0.00     44.51      0.08     62.51      0.09 sdf
+13:20:39         2.91    114.91      0.31      0.00     39.61      0.07     24.75      0.19 sdg
+13:20:49         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda
+13:20:49         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda1
+13:20:49         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda2
+13:20:49         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda3
+13:20:49         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda4
+13:20:49         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda5
+13:20:49         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda6
+13:20:49         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda7
+13:20:49         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda8
+13:20:49         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda9
+13:20:49         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda10
+13:20:49         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda11
+13:20:49         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda12
+13:20:49         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sdf
+13:20:49         0.94     22.33      0.22      0.00     24.05      0.04      6.19      0.09 sdg
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda1
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda2
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda3
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda4
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda5
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda6
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda7
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda8
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda9
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda10
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda11
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda12
+Average:         0.38     16.97      0.00      0.00     44.51      0.02     62.51      0.03 sdf
+Average:         1.08     39.94      0.14      0.00     37.15      0.03     21.82      0.08 sdg
+
+13:37:29     LINUX RESTART     (8 CPU)
+
+13:54:09     LINUX RESTART     (10 CPU)
+
+13:54:15          tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util DEV
+13:54:35         1.60      0.00      0.00      0.80      0.50      0.00      1.00      0.00 sda
+13:54:35         1.60      0.00      0.00      0.80      0.50      0.00      1.00      0.00 sda1
+13:54:35         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda2
+13:54:35         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda3
+13:54:35         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda4
+13:54:35         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda5
+13:54:35         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda6
+13:54:35         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda7
+13:54:35         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda8
+13:54:35         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda9
+13:54:35     32402.95      0.00      0.00      0.00      0.00      0.00      0.10      0.00 cciss!c0d0
+13:54:35         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 cciss!c0d0p1
+13:54:35     32402.95      0.00      0.00      0.00      0.00      0.00      0.10      0.00 cciss!c0d0p2
+13:54:35         0.32     16.04      0.00      0.00     50.00      0.00      1.00      0.03 xvdp
+13:54:35         0.32     16.04      0.00      0.00     50.00      0.00      1.00      0.03 xvdq
+Average:         1.60      0.00      0.00      0.80      0.50      0.00      1.00      0.00 sda
+Average:         1.60      0.00      0.00      0.80      0.50      0.00      1.00      0.00 sda1
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda2
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda3
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda4
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda5
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda6
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda7
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda8
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 sda9
+Average:     32402.95      0.00      0.00      0.00      0.00      0.00      0.10      0.00 cciss!c0d0
+Average:         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 cciss!c0d0p1
+Average:     32402.95      0.00      0.00      0.00      0.00      0.00      0.10      0.00 cciss!c0d0p2
+Average:         0.32     16.04      0.00      0.00     50.00      0.00      1.00      0.03 xvdp
+Average:         0.32     16.04      0.00      0.00     50.00      0.00      1.00      0.03 xvdq

diff --git a/tests/expected.sar-z b/tests/expected.sar-z
index fb4d7d2063869ccc727f917bfa38f8dca26f1bdf..3303c5f1bb8d0fdcef6fcdcca25cf9761c163f5b 100644 (file)
--- a/tests/expected.sar-z
+++ b/tests/expected.sar-z
@@ -1,38 +1,38 @@
 Linux 1.2.3-TEST (SYSSTAT.TEST)        04/18/19        _x86_64_        (8 CPU)
 
-13:20:09          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
+13:20:09          tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util DEV
 
-13:20:19          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
-13:20:29          sda      6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32
-13:20:29         sda1      6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32
-13:20:29          sdb      0.67     22.60      0.00      0.00     33.62      0.10     47.00      0.05
+13:20:19          tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util DEV
+13:20:29         6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32 sda
+13:20:29         6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32 sda1
+13:20:29         0.67     22.60      0.00      0.00     33.62      0.10     47.00      0.05 sdb
 
-13:20:29          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
-13:20:39          sda   1604.70  41499.97  10663.48      0.00     32.51     18.56     12.00     85.36
-13:20:39         sda1      1.32     54.75      0.00      0.00     41.33      0.08     60.92      0.11
-13:20:39          sdf      1.22     54.34      0.00      0.00     44.51      0.08     62.51      0.09
-13:20:39          sdg      2.91    114.91      0.31      0.00     39.61      0.07     24.75      0.19
+13:20:29          tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util DEV
+13:20:39      1604.70  41499.97  10663.48      0.00     32.51     18.56     12.00     85.36 sda
+13:20:39         1.32     54.75      0.00      0.00     41.33      0.08     60.92      0.11 sda1
+13:20:39         1.22     54.34      0.00      0.00     44.51      0.08     62.51      0.09 sdf
+13:20:39         2.91    114.91      0.31      0.00     39.61      0.07     24.75      0.19 sdg
 
-13:20:39          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
-13:20:49          sdg      0.94     22.33      0.22      0.00     24.05      0.04      6.19      0.09
+13:20:39          tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util DEV
+13:20:49         0.94     22.33      0.22      0.00     24.05      0.04      6.19      0.09 sdg
 
-Average:          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
-Average:          sdf      0.38     16.97      0.00      0.00     44.51      0.02     62.51      0.03
-Average:          sdg      1.08     39.94      0.14      0.00     37.15      0.03     21.82      0.08
+Average:          tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util DEV
+Average:         0.38     16.97      0.00      0.00     44.51      0.02     62.51      0.03 sdf
+Average:         1.08     39.94      0.14      0.00     37.15      0.03     21.82      0.08 sdg
 
-13:20:09        IFACE   rxpck/s   txpck/s    rxkB/s    txkB/s   rxcmp/s   txcmp/s  rxmcst/s   %ifutil
+13:20:09      rxpck/s   txpck/s    rxkB/s    txkB/s   rxcmp/s   txcmp/s  rxmcst/s   %ifutil IFACE
 
-13:20:19        IFACE   rxpck/s   txpck/s    rxkB/s    txkB/s   rxcmp/s   txcmp/s  rxmcst/s   %ifutil
-13:20:29       enp6s0     53.55     17.45     64.37      3.38      0.00      0.00      9.25      0.05
+13:20:19      rxpck/s   txpck/s    rxkB/s    txkB/s   rxcmp/s   txcmp/s  rxmcst/s   %ifutil IFACE
+13:20:29        53.55     17.45     64.37      3.38      0.00      0.00      9.25      0.05 enp6s0
 
-13:20:29        IFACE   rxpck/s   txpck/s    rxkB/s    txkB/s   rxcmp/s   txcmp/s  rxmcst/s   %ifutil
-13:20:39       enp6s1      1.90      1.17      0.23      0.21      0.00      0.00      2.31      0.00
-13:20:39       wlp5s1      0.39      0.13      0.03      0.01      0.00      0.00      0.00      0.00
+13:20:29      rxpck/s   txpck/s    rxkB/s    txkB/s   rxcmp/s   txcmp/s  rxmcst/s   %ifutil IFACE
+13:20:39         1.90      1.17      0.23      0.21      0.00      0.00      2.31      0.00 enp6s1
+13:20:39         0.39      0.13      0.03      0.01      0.00      0.00      0.00      0.00 wlp5s1
 
-13:20:39        IFACE   rxpck/s   txpck/s    rxkB/s    txkB/s   rxcmp/s   txcmp/s  rxmcst/s   %ifutil
-13:20:49    virbr0-nic      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       enp6s0   7397.68   2412.77   8891.46    466.82      0.00      0.00    116.21      7.28
+13:20:39      rxpck/s   txpck/s    rxkB/s    txkB/s   rxcmp/s   txcmp/s  rxmcst/s   %ifutil IFACE
+13:20:49         0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00 virbr0-nic
+13:20:49      7397.68   2412.77   8891.46    466.82      0.00      0.00    116.21      7.28 enp6s0
 
-Average:        IFACE   rxpck/s   txpck/s    rxkB/s    txkB/s   rxcmp/s   txcmp/s  rxmcst/s   %ifutil
-Average:       enp6s1      0.59      0.36      0.07      0.06      0.00      0.00      0.72      0.00
-Average:       wlp5s1      0.12      0.04      0.01      0.00      0.00      0.00      0.00      0.00
+Average:      rxpck/s   txpck/s    rxkB/s    txkB/s   rxcmp/s   txcmp/s  rxmcst/s   %ifutil IFACE
+Average:         0.59      0.36      0.07      0.06      0.00      0.00      0.72      0.00 enp6s1
+Average:         0.12      0.04      0.01      0.00      0.00      0.00      0.00      0.00 wlp5s1

diff --git a/tests/expected2.sadf-g b/tests/expected2.sadf-g
index 017d11fc61a39e0494e49b74ac52315c6243daa3..ca9b8560a6ac51638f8cb0bd98651b1d461a268f 100644 (file)
--- a/tests/expected2.sadf-g
+++ b/tests/expected2.sadf-g
@@ -1716,7 +1716,7 @@
 </g>
 <g id="g11-0" transform="translate(0,6030)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="0" y="20" style="fill: #000000; stroke: none">Block devices statistics (1) [dev8-0]
+<text x="0" y="20" style="fill: #000000; stroke: none">Block devices statistics (1) [sda]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -1761,7 +1761,7 @@
 <path d=" M48019,0.00 L48029,6.40 L48039,1604.70 L48049,0.00 M50075,1.60" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.124634)"/>
 </g>
 <rect x="1060" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="1060" y="20" style="fill: #000000; stroke: none">Block devices statistics (2) [dev8-0]
+<text x="1060" y="20" style="fill: #000000; stroke: none">Block devices statistics (2) [sda]
 <tspan x="1855" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="1130,50 1130,250 1850,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -1812,7 +1812,7 @@
 <path d=" M48019,0.00 L48029,0.00 L48039,0.00 L48049,0.00 M50075,0.80" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-48.192801)"/>
 </g>
 <rect x="2120" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="2120" y="20" style="fill: #000000; stroke: none">Block devices statistics (3) [dev8-0]
+<text x="2120" y="20" style="fill: #000000; stroke: none">Block devices statistics (3) [sda]
 <tspan x="2915" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="2190,50 2190,250 2910,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -1859,7 +1859,7 @@
 <path d=" M48019,0.00 L48029,0.00 L48039,18.56 L48049,0.00 M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-6.152588)"/>
 </g>
 <rect x="3180" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="3180" y="20" style="fill: #000000; stroke: none">Block devices statistics (4) [dev8-0]
+<text x="3180" y="20" style="fill: #000000; stroke: none">Block devices statistics (4) [sda]
 <tspan x="3975" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="3250,50 3250,250 3970,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -1904,7 +1904,7 @@
 <path d=" M48019,0.00 L48029,1.00 L48039,12.00 L48049,0.00 M50075,1.00" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-16.673256)"/>
 </g>
 <rect x="4240" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="4240" y="20" style="fill: #000000; stroke: none">Block devices statistics (5) [dev8-0]
+<text x="4240" y="20" style="fill: #000000; stroke: none">Block devices statistics (5) [sda]
 <tspan x="5035" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="4310,50 4310,250 5030,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -1955,7 +1955,7 @@
 </g>
 <g id="g11-1" transform="translate(0,6340)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="0" y="20" style="fill: #000000; stroke: none">Block devices statistics (1) [dev8-1]
+<text x="0" y="20" style="fill: #000000; stroke: none">Block devices statistics (1) [sda1]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2000,7 +2000,7 @@
 <path d=" M48019,0.00 L48029,6.40 L48039,1.32 L48049,0.00 M50075,1.60" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-31.240000)"/>
 </g>
 <rect x="1060" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="1060" y="20" style="fill: #000000; stroke: none">Block devices statistics (2) [dev8-1]
+<text x="1060" y="20" style="fill: #000000; stroke: none">Block devices statistics (2) [sda1]
 <tspan x="1855" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="1130,50 1130,250 1850,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2053,7 +2053,7 @@
 <path d=" M48019,0.00 L48029,0.00 L48039,0.00 L48049,0.00 M50075,0.80" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-36.527514)"/>
 </g>
 <rect x="2120" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="2120" y="20" style="fill: #000000; stroke: none">Block devices statistics (3) [dev8-1]
+<text x="2120" y="20" style="fill: #000000; stroke: none">Block devices statistics (3) [sda1]
 <tspan x="2915" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="2190,50 2190,250 2910,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2102,7 +2102,7 @@
 <path d=" M48019,0.00 L48029,0.00 L48039,0.08 L48049,0.00 M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-483.870968)"/>
 </g>
 <rect x="3180" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="3180" y="20" style="fill: #000000; stroke: none">Block devices statistics (4) [dev8-1]
+<text x="3180" y="20" style="fill: #000000; stroke: none">Block devices statistics (4) [sda1]
 <tspan x="3975" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="3250,50 3250,250 3970,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2147,7 +2147,7 @@
 <path d=" M48019,0.00 L48029,1.00 L48039,60.92 L48049,0.00 M50075,1.00" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-3.282910)"/>
 </g>
 <rect x="4240" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="4240" y="20" style="fill: #000000; stroke: none">Block devices statistics (5) [dev8-1]
+<text x="4240" y="20" style="fill: #000000; stroke: none">Block devices statistics (5) [sda1]
 <tspan x="5035" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="4310,50 4310,250 5030,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2198,7 +2198,7 @@
 </g>
 <g id="g11-2" transform="translate(0,6650)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="0" y="20" style="fill: #000000; stroke: none">Block devices statistics (1) [dev8-16]
+<text x="0" y="20" style="fill: #000000; stroke: none">Block devices statistics (1) [sdb]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2243,7 +2243,7 @@
 <path d=" M48019,0.00 L48029,0.67" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-297.523810)"/>
 </g>
 <rect x="1060" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="1060" y="20" style="fill: #000000; stroke: none">Block devices statistics (2) [dev8-16]
+<text x="1060" y="20" style="fill: #000000; stroke: none">Block devices statistics (2) [sdb]
 <tspan x="1855" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="1130,50 1130,250 1850,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2292,7 +2292,7 @@
 <path d=" M48019,0.00 L48029,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-8.849858)"/>
 </g>
 <rect x="2120" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="2120" y="20" style="fill: #000000; stroke: none">Block devices statistics (3) [dev8-16]
+<text x="2120" y="20" style="fill: #000000; stroke: none">Block devices statistics (3) [sdb]
 <tspan x="2915" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="2190,50 2190,250 2910,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2339,7 +2339,7 @@
 <path d=" M48019,0.00 L48029,0.10" style="vector-effect: non-scaling-stroke; stroke: #bebebe; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-594.900850)"/>
 </g>
 <rect x="3180" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="3180" y="20" style="fill: #000000; stroke: none">Block devices statistics (4) [dev8-16]
+<text x="3180" y="20" style="fill: #000000; stroke: none">Block devices statistics (4) [sdb]
 <tspan x="3975" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="3250,50 3250,250 3970,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2386,7 +2386,7 @@
 <path d=" M48019,0.00 L48029,47.00" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-4.255319)"/>
 </g>
 <rect x="4240" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="4240" y="20" style="fill: #000000; stroke: none">Block devices statistics (5) [dev8-16]
+<text x="4240" y="20" style="fill: #000000; stroke: none">Block devices statistics (5) [sdb]
 <tspan x="5035" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="4310,50 4310,250 5030,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2437,7 +2437,7 @@
 </g>
 <g id="g11-3" transform="translate(0,6960)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="0" y="20" style="fill: #000000; stroke: none">Block devices statistics (1) [dev8-80]
+<text x="0" y="20" style="fill: #000000; stroke: none">Block devices statistics (1) [sdf]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2482,7 +2482,7 @@
 <path d=" M48039,1.22 L48049,0.00" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-163.829787)"/>
 </g>
 <rect x="1060" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="1060" y="20" style="fill: #000000; stroke: none">Block devices statistics (2) [dev8-80]
+<text x="1060" y="20" style="fill: #000000; stroke: none">Block devices statistics (2) [sdf]
 <tspan x="1855" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="1130,50 1130,250 1850,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2535,7 +2535,7 @@
 <path d=" M48039,0.00 L48049,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-3.680688)"/>
 </g>
 <rect x="2120" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="2120" y="20" style="fill: #000000; stroke: none">Block devices statistics (3) [dev8-80]
+<text x="2120" y="20" style="fill: #000000; stroke: none">Block devices statistics (3) [sdf]
 <tspan x="2915" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="2190,50 2190,250 2910,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2584,7 +2584,7 @@
 <path d=" M48039,0.08 L48049,0.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-449.330784)"/>
 </g>
 <rect x="3180" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="3180" y="20" style="fill: #000000; stroke: none">Block devices statistics (4) [dev8-80]
+<text x="3180" y="20" style="fill: #000000; stroke: none">Block devices statistics (4) [sdf]
 <tspan x="3975" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="3250,50 3250,250 3970,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2629,7 +2629,7 @@
 <path d=" M48039,62.51 L48049,0.00" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-3.199455)"/>
 </g>
 <rect x="4240" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="4240" y="20" style="fill: #000000; stroke: none">Block devices statistics (5) [dev8-80]
+<text x="4240" y="20" style="fill: #000000; stroke: none">Block devices statistics (5) [sdf]
 <tspan x="5035" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="4310,50 4310,250 5030,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2680,7 +2680,7 @@
 </g>
 <g id="g11-4" transform="translate(0,7270)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="0" y="20" style="fill: #000000; stroke: none">Block devices statistics (1) [dev8-96]
+<text x="0" y="20" style="fill: #000000; stroke: none">Block devices statistics (1) [sdg]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2725,7 +2725,7 @@
 <path d=" M48039,2.91 L48049,0.94" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-68.750000)"/>
 </g>
 <rect x="1060" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="1060" y="20" style="fill: #000000; stroke: none">Block devices statistics (2) [dev8-96]
+<text x="1060" y="20" style="fill: #000000; stroke: none">Block devices statistics (2) [sdg]
 <tspan x="1855" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="1130,50 1130,250 1850,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2774,7 +2774,7 @@
 <path d=" M48039,0.00 L48049,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-1.740506)"/>
 </g>
 <rect x="2120" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="2120" y="20" style="fill: #000000; stroke: none">Block devices statistics (3) [dev8-96]
+<text x="2120" y="20" style="fill: #000000; stroke: none">Block devices statistics (3) [sdg]
 <tspan x="2915" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="2190,50 2190,250 2910,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2821,7 +2821,7 @@
 <path d=" M48039,0.07 L48049,0.04" style="vector-effect: non-scaling-stroke; stroke: #bebebe; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-504.959423)"/>
 </g>
 <rect x="3180" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="3180" y="20" style="fill: #000000; stroke: none">Block devices statistics (4) [dev8-96]
+<text x="3180" y="20" style="fill: #000000; stroke: none">Block devices statistics (4) [sdg]
 <tspan x="3975" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="3250,50 3250,250 3970,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2866,7 +2866,7 @@
 <path d=" M48039,24.75 L48049,6.19" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-8.080808)"/>
 </g>
 <rect x="4240" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="4240" y="20" style="fill: #000000; stroke: none">Block devices statistics (5) [dev8-96]
+<text x="4240" y="20" style="fill: #000000; stroke: none">Block devices statistics (5) [sdg]
 <tspan x="5035" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="4310,50 4310,250 5030,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2917,7 +2917,7 @@
 </g>
 <g id="g11-5" transform="translate(0,7580)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="0" y="20" style="fill: #000000; stroke: none">Block devices statistics (1) [dev104-0]
+<text x="0" y="20" style="fill: #000000; stroke: none">Block devices statistics (1) [cciss/c0d0]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -2962,7 +2962,7 @@
 <path d=" M50075,32402.95" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.006172)"/>
 </g>
 <rect x="1060" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="1060" y="20" style="fill: #000000; stroke: none">Block devices statistics (4) [dev104-0]
+<text x="1060" y="20" style="fill: #000000; stroke: none">Block devices statistics (4) [cciss/c0d0]
 <tspan x="1855" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="1130,50 1130,250 1850,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -3009,7 +3009,7 @@
 </g>
 <g id="g11-6" transform="translate(0,7890)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="0" y="20" style="fill: #000000; stroke: none">Block devices statistics (1) [dev104-2]
+<text x="0" y="20" style="fill: #000000; stroke: none">Block devices statistics (1) [cciss/c0d0p2]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -3054,7 +3054,7 @@
 <path d=" M50075,32402.95" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.006172)"/>
 </g>
 <rect x="1060" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="1060" y="20" style="fill: #000000; stroke: none">Block devices statistics (4) [dev104-2]
+<text x="1060" y="20" style="fill: #000000; stroke: none">Block devices statistics (4) [cciss/c0d0p2]
 <tspan x="1855" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="1130,50 1130,250 1850,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -3101,7 +3101,7 @@
 </g>
 <g id="g11-7" transform="translate(0,8200)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="0" y="20" style="fill: #000000; stroke: none">Block devices statistics (1) [dev202-240]
+<text x="0" y="20" style="fill: #000000; stroke: none">Block devices statistics (1) [xvdp]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -3146,7 +3146,7 @@
 <path d=" M50075,0.32" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-623.400000)"/>
 </g>
 <rect x="1060" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="1060" y="20" style="fill: #000000; stroke: none">Block devices statistics (2) [dev202-240]
+<text x="1060" y="20" style="fill: #000000; stroke: none">Block devices statistics (2) [xvdp]
 <tspan x="1855" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="1130,50 1130,250 1850,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -3195,7 +3195,7 @@
 <path d=" M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-12.468000)"/>
 </g>
 <rect x="2120" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="2120" y="20" style="fill: #000000; stroke: none">Block devices statistics (3) [dev202-240]
+<text x="2120" y="20" style="fill: #000000; stroke: none">Block devices statistics (3) [xvdp]
 <tspan x="2915" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="2190,50 2190,250 2910,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -3246,7 +3246,7 @@
 <path d=" M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-400000.000000)"/>
 </g>
 <rect x="3180" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="3180" y="20" style="fill: #000000; stroke: none">Block devices statistics (4) [dev202-240]
+<text x="3180" y="20" style="fill: #000000; stroke: none">Block devices statistics (4) [xvdp]
 <tspan x="3975" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="3250,50 3250,250 3970,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -3291,7 +3291,7 @@
 <path d=" M50075,1.00" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-200.000000)"/>
 </g>
 <rect x="4240" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="4240" y="20" style="fill: #000000; stroke: none">Block devices statistics (5) [dev202-240]
+<text x="4240" y="20" style="fill: #000000; stroke: none">Block devices statistics (5) [xvdp]
 <tspan x="5035" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="4310,50 4310,250 5030,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -3342,7 +3342,7 @@
 </g>
 <g id="g11-8" transform="translate(0,8510)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="0" y="20" style="fill: #000000; stroke: none">Block devices statistics (1) [dev202-4096]
+<text x="0" y="20" style="fill: #000000; stroke: none">Block devices statistics (1) [xvdiw]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="70,50 70,250 790,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -3387,7 +3387,7 @@
 <path d=" M50075,0.32" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-623.400000)"/>
 </g>
 <rect x="1060" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="1060" y="20" style="fill: #000000; stroke: none">Block devices statistics (2) [dev202-4096]
+<text x="1060" y="20" style="fill: #000000; stroke: none">Block devices statistics (2) [xvdiw]
 <tspan x="1855" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="1130,50 1130,250 1850,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -3436,7 +3436,7 @@
 <path d=" M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-12.468000)"/>
 </g>
 <rect x="2120" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="2120" y="20" style="fill: #000000; stroke: none">Block devices statistics (3) [dev202-4096]
+<text x="2120" y="20" style="fill: #000000; stroke: none">Block devices statistics (3) [xvdiw]
 <tspan x="2915" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="2190,50 2190,250 2910,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -3487,7 +3487,7 @@
 <path d=" M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-400000.000000)"/>
 </g>
 <rect x="3180" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="3180" y="20" style="fill: #000000; stroke: none">Block devices statistics (4) [dev202-4096]
+<text x="3180" y="20" style="fill: #000000; stroke: none">Block devices statistics (4) [xvdiw]
 <tspan x="3975" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="3250,50 3250,250 3970,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>
@@ -3532,7 +3532,7 @@
 <path d=" M50075,1.00" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-200.000000)"/>
 </g>
 <rect x="4240" y="0" height="300" width="1050" fill="#ffffff"/>
-<text x="4240" y="20" style="fill: #000000; stroke: none">Block devices statistics (5) [dev202-4096]
+<text x="4240" y="20" style="fill: #000000; stroke: none">Block devices statistics (5) [xvdiw]
 <tspan x="5035" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
 </text>
 <polyline points="4310,50 4310,250 5030,250" style="fill: #ffffff; stroke: #000000; stroke-width: 2"/>

diff --git a/tests/expected2.sar-all b/tests/expected2.sar-all
index ceaf1182dbb9523c27508efc658fff79a337d808..cdbe1995e68f5a6e534487e853639d4248da3632 100644 (file)
--- a/tests/expected2.sar-all
+++ b/tests/expected2.sar-all
@@ -2568,79 +2568,79 @@ Average:            0      0.00      0.00      0.00      0.00      0.00      0.0
 Average:            1      0.00      0.00      0.00      0.00      0.00      0.00
 
 13:20:09          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
-13:20:19       dev8-0      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19      dev8-12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19      dev8-16      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-0      6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32
-13:20:29       dev8-1      6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32
-13:20:29       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29      dev8-12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29      dev8-16      0.67     22.60      0.00      0.00     33.62      0.10     47.00      0.05
-13:20:39       dev8-0   1604.70  41499.97  10663.48      0.00     32.51     18.56     12.00     85.36
-13:20:39       dev8-1      1.32     54.75      0.00      0.00     41.33      0.08     60.92      0.11
-13:20:39       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39      dev8-12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39      dev8-80      1.22     54.34      0.00      0.00     44.51      0.08     62.51      0.09
-13:20:39      dev8-96      2.91    114.91      0.31      0.00     39.61      0.07     24.75      0.19
-13:20:49       dev8-0      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49      dev8-12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49      dev8-80      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49      dev8-96      0.94     22.33      0.22      0.00     24.05      0.04      6.19      0.09
-Average:       dev8-0      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-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:      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:      dev8-12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:      dev8-80      0.38     16.97      0.00      0.00     44.51      0.02     62.51      0.03
-Average:      dev8-96      1.08     39.94      0.14      0.00     37.15      0.03     21.82      0.08
+13:20:19          sda      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19        sda12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19          sdb      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29          sda      6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32
+13:20:29         sda1      6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32
+13:20:29         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29        sda12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29          sdb      0.67     22.60      0.00      0.00     33.62      0.10     47.00      0.05
+13:20:39          sda   1604.70  41499.97  10663.48      0.00     32.51     18.56     12.00     85.36
+13:20:39         sda1      1.32     54.75      0.00      0.00     41.33      0.08     60.92      0.11
+13:20:39         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39        sda12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39          sdf      1.22     54.34      0.00      0.00     44.51      0.08     62.51      0.09
+13:20:39          sdg      2.91    114.91      0.31      0.00     39.61      0.07     24.75      0.19
+13:20:49          sda      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49        sda12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49          sdf      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49          sdg      0.94     22.33      0.22      0.00     24.05      0.04      6.19      0.09
+Average:          sda      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:        sda12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:          sdf      0.38     16.97      0.00      0.00     44.51      0.02     62.51      0.03
+Average:          sdg      1.08     39.94      0.14      0.00     37.15      0.03     21.82      0.08
 
 13:20:09        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
@@ -4020,36 +4020,36 @@ Average:            0      0.00      0.00      0.00      0.00      0.00      0.0
 Average:            1      0.00      0.00      0.00      0.00      0.00      0.00
 
 13:54:15          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
-13:54:35       dev8-0      1.60      0.00      0.00      0.80      0.50      0.00      1.00      0.00
-13:54:35       dev8-1      1.60      0.00      0.00      0.80      0.50      0.00      1.00      0.00
-13:54:35       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:54:35       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:54:35       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:54:35       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:54:35       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-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
-13:54:35    dev202-240      0.32     16.04      0.00      0.00     50.00      0.00      1.00      0.03
-13:54:35    dev202-4096      0.32     16.04      0.00      0.00     50.00      0.00      1.00      0.03
-Average:       dev8-0      1.60      0.00      0.00      0.80      0.50      0.00      1.00      0.00
-Average:       dev8-1      1.60      0.00      0.00      0.80      0.50      0.00      1.00      0.00
-Average:       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-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
-Average:    dev202-240      0.32     16.04      0.00      0.00     50.00      0.00      1.00      0.03
-Average:    dev202-4096      0.32     16.04      0.00      0.00     50.00      0.00      1.00      0.03
+13:54:35          sda      1.60      0.00      0.00      0.80      0.50      0.00      1.00      0.00
+13:54:35         sda1      1.60      0.00      0.00      0.80      0.50      0.00      1.00      0.00
+13:54:35         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:54:35         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:54:35         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:54:35         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:54:35         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:54:35         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:54:35         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:54:35         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:54:35    cciss!c0d0  32402.95      0.00      0.00      0.00      0.00      0.00      0.10      0.00
+13:54:35    cciss!c0d0p1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:54:35    cciss!c0d0p2  32402.95      0.00      0.00      0.00      0.00      0.00      0.10      0.00
+13:54:35         xvdp      0.32     16.04      0.00      0.00     50.00      0.00      1.00      0.03
+13:54:35         xvdq      0.32     16.04      0.00      0.00     50.00      0.00      1.00      0.03
+Average:          sda      1.60      0.00      0.00      0.80      0.50      0.00      1.00      0.00
+Average:         sda1      1.60      0.00      0.00      0.80      0.50      0.00      1.00      0.00
+Average:         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:    cciss!c0d0  32402.95      0.00      0.00      0.00      0.00      0.00      0.10      0.00
+Average:    cciss!c0d0p1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:    cciss!c0d0p2  32402.95      0.00      0.00      0.00      0.00      0.00      0.10      0.00
+Average:         xvdp      0.32     16.04      0.00      0.00     50.00      0.00      1.00      0.03
+Average:         xvdq      0.32     16.04      0.00      0.00     50.00      0.00      1.00      0.03
 
 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/expected3.sar-all b/tests/expected3.sar-all
index de7411fb8129cfc1b6f16dbe30050b348733de82..0477c3af9010953ce3f71839f7d9f53775060534 100644 (file)
--- a/tests/expected3.sar-all
+++ b/tests/expected3.sar-all
@@ -105,79 +105,79 @@ Average:            0      0.00      0.00      0.00      0.00      0.00      0.0
 Average:            1      0.00      0.00      0.00      0.00      0.00      0.00
 
 13:20:09          DEV       tps     rkB/s     wkB/s     dkB/s   areq-sz    aqu-sz     await     %util
-13:20:19       dev8-0      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19       dev8-9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19      dev8-12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:19      dev8-16      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-0      6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32
-13:20:29       dev8-1      6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32
-13:20:29       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29       dev8-9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29      dev8-12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:29      dev8-16      0.67     22.60      0.00      0.00     33.62      0.10     47.00      0.05
-13:20:39       dev8-0   1604.70  41499.97  10663.48      0.00     32.51     18.56     12.00     85.36
-13:20:39       dev8-1      1.32     54.75      0.00      0.00     41.33      0.08     60.92      0.11
-13:20:39       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39       dev8-9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39      dev8-12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:39      dev8-80      1.22     54.34      0.00      0.00     44.51      0.08     62.51      0.09
-13:20:39      dev8-96      2.91    114.91      0.31      0.00     39.61      0.07     24.75      0.19
-13:20:49       dev8-0      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49       dev8-9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49      dev8-12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49      dev8-80      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-13:20:49      dev8-96      0.94     22.33      0.22      0.00     24.05      0.04      6.19      0.09
-Average:       dev8-0      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:       dev8-6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-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:      dev8-10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:      dev8-11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:      dev8-12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
-Average:      dev8-80      0.38     16.97      0.00      0.00     44.51      0.02     62.51      0.03
-Average:      dev8-96      1.08     39.94      0.14      0.00     37.15      0.03     21.82      0.08
+13:20:19          sda      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19        sda12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:19          sdb      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29          sda      6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32
+13:20:29         sda1      6.40      1.60      1.60      0.00      0.50      0.00      1.00      0.32
+13:20:29         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29        sda12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:29          sdb      0.67     22.60      0.00      0.00     33.62      0.10     47.00      0.05
+13:20:39          sda   1604.70  41499.97  10663.48      0.00     32.51     18.56     12.00     85.36
+13:20:39         sda1      1.32     54.75      0.00      0.00     41.33      0.08     60.92      0.11
+13:20:39         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39        sda12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:39          sdf      1.22     54.34      0.00      0.00     44.51      0.08     62.51      0.09
+13:20:39          sdg      2.91    114.91      0.31      0.00     39.61      0.07     24.75      0.19
+13:20:49          sda      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49        sda12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49          sdf      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+13:20:49          sdg      0.94     22.33      0.22      0.00     24.05      0.04      6.19      0.09
+Average:          sda      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda1      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda2      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda3      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda4      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda5      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda6      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda7      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda8      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:         sda9      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:        sda10      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:        sda11      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:        sda12      0.00      0.00      0.00      0.00      0.00      0.00      0.00      0.00
+Average:          sdf      0.38     16.97      0.00      0.00     44.51      0.02     62.51      0.03
+Average:          sdg      1.08     39.94      0.14      0.00     37.15      0.03     21.82      0.08
 
 13:20:09        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