Update non regression tests

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

diff --git a/tests/00191 b/tests/00191
index 75450d8a8fd43cd15ab57c082b628147a717f55b..ca779287724a7b1aa31f1c76e3453b72d2975685 100644 (file)
--- a/tests/00191
+++ b/tests/00191
@@ -1 +1 @@
-LC_ALL=C TZ=GMT S_TIME_FORMAT= S_COLORS=always S_COLORS_SGR="C=33;22:X=31;1:I=32;22:W=35;1:N=34;1:R=31;22:Z=36;22" ./sar -q MEM -Bu -P 0,3 -d --dev=sda --getenv -f tests/data-new.tmp > tests/out1.sar-always.tmp && diff -u tests/expected1.sar-always tests/out1.sar-always.tmp
+LC_ALL=C TZ=GMT S_TIME_FORMAT= S_COLORS=always S_COLORS_SGR="C=33;22:X=31;1:I=32;22:W=35;1:N=34;1:R=31;22:Z=36;22" ./sar -q MEM -m BAT -Bu -P 0,3 -d --dev=sda --getenv -f tests/data-new.tmp > tests/out1.sar-always.tmp && diff -u tests/expected1.sar-always tests/out1.sar-always.tmp

diff --git a/tests/00193 b/tests/00193
new file mode 100644 (file)
index 0000000..c230903
--- /dev/null
+++ b/tests/00193
@@ -0,0 +1 @@
+LC_ALL=C TZ=GMT S_TIME_FORMAT= S_COLORS=always S_COLORS_SGR="+=33;22:-=35;1" ./sar -m BAT --getenv -f tests/data-new.tmp > tests/out2.sar-always.tmp && diff -u tests/expected2.sar-always tests/out2.sar-always.tmp

diff --git a/tests/TLIST b/tests/TLIST
index 8ba554a25445224f8076c8a31cfbbb7f83ab1fd3..0ee3632224f31aff6b14d973161d94f48334faeb 100644 (file)
--- a/tests/TLIST
+++ b/tests/TLIST
@@ -87,6 +87,7 @@ NOTES:
 00190  LC_ALL=C TZ=GMT S_TIME_FORMAT= S_COLORS=always S_COLORS_SGR="C=33;22:H=31;1:I=32;22:M=35;1:N=34;1:R=31;22:Z=36;22" ./sar -C -u --getenv -f tests/data.tmp > tests/out.sar-always.tmp
 00191  LC_ALL=C TZ=GMT S_TIME_FORMAT= S_COLORS=always S_COLORS_SGR="C=33;22:X=31;1:I=32;22:W=35;1:N=34;1:R=31;22:Z=36;22" ./sar -q MEM -Bu -P 0,3 -d --dev=sda --getenv -f tests/data-new.tmp > tests/out1.sar-always.tmp
 00192  LC_ALL=C TZ=GMT S_REPEAT_HEADER=2 ./sar --getenv -f tests/data-new.tmp > tests/out.sar-rep_hdr.tmp
+00193  LC_ALL=C TZ=GMT S_TIME_FORMAT= S_COLORS=always S_COLORS_SGR="+=33;22:-=35;1" ./sar -m BAT --getenv -f tests/data-new.tmp > tests/out2.sar-always.tmp
 
 =====  sar: Playing with sa1 and sa2 shell scripts
 00200  TZ=GMT ./sa1 --boot; TZ=GMT ./sa1 --unix_time=1555593629 1 1; TZ=GMT ./sa1 --unix_time=1555593649 1 1

diff --git a/tests/expected.data-11.6.5-sadf-x b/tests/expected.data-11.6.5-sadf-x
index 9ab319b8bfe16507035d54edd4fce4d863687ac1..51c528dc5464ffdf78439c82ac92affe58270c1d 100644 (file)
--- a/tests/expected.data-11.6.5-sadf-x
+++ b/tests/expected.data-11.6.5-sadf-x
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sysstat PUBLIC "DTD v3.12 sysstat //EN"
-"http://pagesperso-orange.fr/sebastien.godard/sysstat-3.12.dtd">
+<!DOCTYPE sysstat PUBLIC "DTD v3.13 sysstat //EN"
+"http://pagesperso-orange.fr/sebastien.godard/sysstat-3.13.dtd">
 <sysstat
 xmlns="http://pagesperso-orange.fr/sebastien.godard/sysstat"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
-       <sysdata-version>3.12</sysdata-version>
+       <sysdata-version>3.13</sysdata-version>
        <host nodename="linux.home">
                <sysname>Linux</sysname>
                <release>4.17.18-200.fc28.x86_64</release>

diff --git a/tests/expected.data-wghfreq-sadf-x b/tests/expected.data-wghfreq-sadf-x
index eaae30fbb56b432faceac0eb9f5c9100a371f6f3..05c5896da79d54d9afb963187007cd52e1406389 100644 (file)
--- a/tests/expected.data-wghfreq-sadf-x
+++ b/tests/expected.data-wghfreq-sadf-x
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sysstat PUBLIC "DTD v3.12 sysstat //EN"
-"http://pagesperso-orange.fr/sebastien.godard/sysstat-3.12.dtd">
+<!DOCTYPE sysstat PUBLIC "DTD v3.13 sysstat //EN"
+"http://pagesperso-orange.fr/sebastien.godard/sysstat-3.13.dtd">
 <sysstat
 xmlns="http://pagesperso-orange.fr/sebastien.godard/sysstat"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
-       <sysdata-version>3.12</sysdata-version>
+       <sysdata-version>3.13</sysdata-version>
        <host nodename="SYSSTAT.TEST">
                <sysname>Linux</sysname>
                <release>1.2.3-TEST</release>

diff --git a/tests/expected.sadf-H b/tests/expected.sadf-H
index c38dcfc89e5822d2283f97915bbf42e8d2c2d49b..d1a148d7e65be87e3ee890571904a23bf4f8d83c 100644 (file)
--- a/tests/expected.sadf-H
+++ b/tests/expected.sadf-H
@@ -8,7 +8,7 @@ Timezone: GMT
 File composition: (1,1,12),(0,0,9),(2,0,1)
 Size of a long int: 8
 HZ = 100
-Number of activities in file: 38
+Number of activities in file: 39
 Extra structures available: N
 List of activities:
 01: [8b] A_CPU                Y:  10   (10,0,0)
@@ -44,6 +44,7 @@ List of activities:
 38: [8a] A_NET_FC             Y:   1   (0,4,0)
 39: [8a] A_NET_SOFT           Y:  10   (0,0,6)
 30: [8a] A_PWR_CPU            Y:  10   (0,1,0)
+43: [8a] A_PWR_BAT            Y:   2   (0,0,0)
 36: [8a] A_PWR_USB            Y:   2   (0,0,4)
 37: [8b] A_FS                 Y:   4   (5,0,0)
 40: [8a] A_PSI_CPU            N:   1   (1,3,0)

diff --git a/tests/expected.sadf-d b/tests/expected.sadf-d
index 50f90e45feb64171426bf17e2a843b913ff2e63e..ee8e1a0884ca71f67d45ace33dd9b7f79752608c 100644 (file)
--- a/tests/expected.sadf-d
+++ b/tests/expected.sadf-d
@@ -551,6 +551,13 @@ SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;4;3505.84
 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;5;3493.55
 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;6;3492.22
 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;7;3497.56
+# hostname;interval;timestamp;BAT;%cap;cap/min;status
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;0;100;0.00;Full
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;1;83;-3.85;Unknown
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;0;70;-57.62;Unknown
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;1;80;-5.76;Discharging
+SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;0;75;7.79;Charging
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;0;77;5.36;NotCharging
 # hostname;interval;timestamp;manufact;product;BUS;idvendor;idprod;maxpower
 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;1;3f0;862;196;HP;HP Wireless Keyboard Mouse Kit
 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;3;174c;55aa;0;ASMT;ASM1153
@@ -769,6 +776,7 @@ SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;6;3492.22
 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;7;3497.56
 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;8;3497.56
 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;9;3497.56
+# hostname;interval;timestamp;BAT;%cap;cap/min;status
 # hostname;interval;timestamp;manufact;product;BUS;idvendor;idprod;maxpower
 # hostname;interval;timestamp;FILESYSTEM;MBfsfree;MBfsused;%fsused;%ufsused;Ifree;Iused;%Iused
 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda9;705;145;17.04;18.92;6008414;102818;1.68

diff --git a/tests/expected.sadf-g b/tests/expected.sadf-g
index 237185b95f027e8a8b48368e5a9b89c63d9edf5d..5a71dd93ec68e5538376cc316f74e2e1e40c5900 100644 (file)
--- a/tests/expected.sadf-g
+++ b/tests/expected.sadf-g
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" width="1060" height="115070" fill="black" stroke="#808080" stroke-width="1">
+<svg xmlns="http://www.w3.org/2000/svg" width="1060" height="115690" fill="black" stroke="#808080" stroke-width="1">
 <text x="0" y="30" text-anchor="start" stroke="#a52a2a">Linux 1.2.3-TEST (SYSSTAT.TEST)        04/18/19        _x86_64_        (9 CPU)
 </text>
 <g id="g1-0" transform="translate(0,60)">
@@ -14429,7 +14429,97 @@
 <path d=" M2035,3497.56 L2066,3497.56" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(0.348500,-0.057183)"/>
 </g>
 </g>
-<g id="g37-0" transform="translate(0,104530)">
+<g id="g43-0" transform="translate(0,104530)">
+<rect x="0" y="0" height="300" width="1050" fill="#000000"/>
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Batteries capacity [BAT0]
+<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"/>
+<text x="795" y="50" style="fill: #00cc00; stroke: none; font-size: 12px">%cap (70, 100)</text>
+<g transform="translate(70,250)">
+<text x="0" y="0" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.</text>
+<polyline points="0,25.00 720,25.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-50" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">25.</text>
+<polyline points="0,50.00 720,50.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-100" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">50.</text>
+<polyline points="0,75.00 720,75.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-150" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">75.</text>
+<polyline points="0,100.00 720,100.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-200" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">100.</text>
+<polyline points="0,0 0,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="0" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,0,0)">13:20:09</text>
+<polyline points="206,0 206,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="71" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,71,0)">13:23:35</text>
+<polyline points="412,0 412,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="143" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,143,0)">13:27:01</text>
+<polyline points="618,0 618,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="215" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,215,0)">13:30:27</text>
+<polyline points="824,0 824,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="287" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,287,0)">13:33:53</text>
+<polyline points="1030,0 1030,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="358" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,358,0)">13:37:19</text>
+<polyline points="1236,0 1236,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="430" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,430,0)">13:40:45</text>
+<polyline points="1442,0 1442,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="502" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,502,0)">13:44:11</text>
+<polyline points="1648,0 1648,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="574" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,574,0)">13:47:37</text>
+<polyline points="1854,0 1854,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="646" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,646,0)">13:51:03</text>
+<polyline points="2060,0 2060,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="717" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,717,0)">13:54:29</text>
+<text x="-10" y="30" style="fill: #ffff00; stroke: none; font-size: 12px; text-anchor: end">UTC</text>
+<g style="fill: #00cc00; stroke: none" transform="scale(0.348500,-2.000000)">
+<rect x="0" y="0.00" height="100.00" width="31"/><rect x="0" y="0.00" height="70.00" width="31"/><rect x="0" y="0.00" height="75.00" width="39"/><rect x="18" y="0.00" height="77.00" width="22"/>
+</g>
+</g>
+</g>
+<g id="g43-1" transform="translate(0,104840)">
+<rect x="0" y="0" height="300" width="1050" fill="#000000"/>
+<text x="0" y="20" style="fill: #ffff00; stroke: none">Batteries capacity [BAT1]
+<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"/>
+<text x="795" y="50" style="fill: #00cc00; stroke: none; font-size: 12px">%cap (80, 83)</text>
+<g transform="translate(70,250)">
+<text x="0" y="0" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">0.</text>
+<polyline points="0,25.00 720,25.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-50" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">25.</text>
+<polyline points="0,50.00 720,50.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-100" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">50.</text>
+<polyline points="0,75.00 720,75.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-150" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">75.</text>
+<polyline points="0,100.00 720,100.00" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(1,-2.000000)"/>
+<text x="0" y="-200" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: end">100.</text>
+<polyline points="0,0 0,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="0" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,0,0)">13:20:09</text>
+<polyline points="206,0 206,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="71" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,71,0)">13:23:35</text>
+<polyline points="412,0 412,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="143" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,143,0)">13:27:01</text>
+<polyline points="618,0 618,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="215" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,215,0)">13:30:27</text>
+<polyline points="824,0 824,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="287" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,287,0)">13:33:53</text>
+<polyline points="1030,0 1030,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="358" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,358,0)">13:37:19</text>
+<polyline points="1236,0 1236,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="430" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,430,0)">13:40:45</text>
+<polyline points="1442,0 1442,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="502" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,502,0)">13:44:11</text>
+<polyline points="1648,0 1648,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="574" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,574,0)">13:47:37</text>
+<polyline points="1854,0 1854,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="646" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,646,0)">13:51:03</text>
+<polyline points="2060,0 2060,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(0.348500,1)"/>
+<text x="717" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,717,0)">13:54:29</text>
+<text x="-10" y="30" style="fill: #ffff00; stroke: none; font-size: 12px; text-anchor: end">UTC</text>
+<g style="fill: #00cc00; stroke: none" transform="scale(0.348500,-2.000000)">
+<rect x="0" y="0.00" height="83.00" width="31"/><rect x="0" y="0.00" height="80.00" width="31"/>
+</g>
+</g>
+</g>
+<g id="g37-0" transform="translate(0,105150)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Filesystems statistics (1) [/dev/sda9]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -14603,7 +14693,7 @@
 </g>
 </g>
 </g>
-<g id="g37-1" transform="translate(0,105770)">
+<g id="g37-1" transform="translate(0,106390)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Filesystems statistics (1) [/dev/sda7]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -14777,7 +14867,7 @@
 </g>
 </g>
 </g>
-<g id="g37-2" transform="translate(0,107010)">
+<g id="g37-2" transform="translate(0,107630)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Filesystems statistics (1) [/dev/sda12]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -14951,7 +15041,7 @@
 </g>
 </g>
 </g>
-<g id="g37-3" transform="translate(0,108250)">
+<g id="g37-3" transform="translate(0,108870)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Filesystems statistics (1) [/dev/sda6]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -15125,7 +15215,7 @@
 </g>
 </g>
 </g>
-<g id="g37-4" transform="translate(0,109490)">
+<g id="g37-4" transform="translate(0,110110)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Filesystems statistics (1) [/dev/sdf]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -15299,7 +15389,7 @@
 </g>
 </g>
 </g>
-<g id="g37-5" transform="translate(0,110730)">
+<g id="g37-5" transform="translate(0,111350)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Filesystems statistics (1) [/dev/sdg]
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -15473,7 +15563,7 @@
 </g>
 </g>
 </g>
-<g id="g40-0" transform="translate(0,111970)">
+<g id="g40-0" transform="translate(0,112590)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">CPU pressure trends (some tasks)
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -15561,7 +15651,7 @@
 </g>
 </g>
 </g>
-<g id="g41-0" transform="translate(0,112590)">
+<g id="g41-0" transform="translate(0,113210)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">I/O pressure trends (some tasks)
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -15735,7 +15825,7 @@
 </g>
 </g>
 </g>
-<g id="g42-0" transform="translate(0,113830)">
+<g id="g42-0" transform="translate(0,114450)">
 <rect x="0" y="0" height="300" width="1050" fill="#000000"/>
 <text x="0" y="20" style="fill: #ffff00; stroke: none">Memory pressure trends (some tasks)
 <tspan x="795" y="25" style="fill: #ffff00; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -15909,5 +15999,5 @@
 </g>
 </g>
 </g>
-<!-- Actual canvas height: 115070 -->
+<!-- Actual canvas height: 115690 -->
 </svg>

diff --git a/tests/expected.sadf-j b/tests/expected.sadf-j
index 5f876499bd378f4bc776111b65ed35664d4fb43e..ed99196e52cdcc417463eca86f314e4ded4d7241 100644 (file)
--- a/tests/expected.sadf-j
+++ b/tests/expected.sadf-j
@@ -159,6 +159,10 @@
                                                        {"number": "5", "frequency": 3493.55},
                                                        {"number": "6", "frequency": 3492.22},
                                                        {"number": "7", "frequency": 3497.56}
+                                               ],
+                                               "battery": [
+                                                       {"number": 0, "percent-capacity": 100, "variation": 0.00, "status": "Full"},
+                                                       {"number": 1, "percent-capacity": 83, "variation": -3.85, "status": "Unknown"}
                                                ]
                                        },
                                        "filesystems": [
@@ -321,6 +325,10 @@
                                                        {"number": "6", "frequency": 3492.22},
                                                        {"number": "7", "frequency": 3497.56}
                                                ],
+                                               "battery": [
+                                                       {"number": 0, "percent-capacity": 70, "variation": -57.62, "status": "Unknown"},
+                                                       {"number": 1, "percent-capacity": 80, "variation": -5.76, "status": "Discharging"}
+                                               ],
                                                "usb-devices": [
                                                        {"bus_number": 1, "idvendor": "3f0", "idprod": "862", "maxpower": 196, "manufact": "HP", "product": "HP Wireless Keyboard Mouse Kit"},
                                                        {"bus_number": 3, "idvendor": "174c", "idprod": "55aa", "maxpower": 0, "manufact": "ASMT", "product": "ASM1153"}
@@ -490,6 +498,9 @@
                                                        {"number": "5", "frequency": 3493.55},
                                                        {"number": "6", "frequency": 3492.22},
                                                        {"number": "7", "frequency": 3497.56}
+                                               ],
+                                               "battery": [
+                                                       {"number": 0, "percent-capacity": 75, "variation": 7.79, "status": "Charging"}
                                                ]
                                        },
                                        "filesystems": [
@@ -664,6 +675,9 @@
                                                        {"number": "6", "frequency": 3492.22},
                                                        {"number": "7", "frequency": 3497.56}
                                                ],
+                                               "battery": [
+                                                       {"number": 0, "percent-capacity": 77, "variation": 5.36, "status": "NotCharging"}
+                                               ],
                                                "usb-devices": [
                                                        {"bus_number": 1, "idvendor": "3f0", "idprod": "862", "maxpower": 196, "manufact": "HP", "product": "HP Wireless Keyboard Mouse Kit"},
                                                        {"bus_number": 3, "idvendor": "174c", "idprod": "55aa", "maxpower": 0, "manufact": "ASMT", "product": "ASM1153"},

diff --git a/tests/expected.sadf-p b/tests/expected.sadf-p
index 3039d122a22e407d4c0af7aba45e04841da0bb9d..d29130af366f7c2cd95291d5098cb632953bb8c3 100644 (file)
--- a/tests/expected.sadf-p
+++ b/tests/expected.sadf-p
@@ -4024,6 +4024,24 @@ SYSSTAT.TEST     22      2019-04-18 13:20:49 UTC cpu4    MHz     3505.84
 SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC cpu5    MHz     3493.55
 SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC cpu6    MHz     3492.22
 SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC cpu7    MHz     3497.56
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC BAT0    %cap    100
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC BAT0    cap/min 0.00
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC BAT0    status  Full
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC BAT1    %cap    83
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC BAT1    cap/min -3.85
+SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC BAT1    status  Unknown
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC BAT0    %cap    70
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC BAT0    cap/min -57.62
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC BAT0    status  Unknown
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC BAT1    %cap    80
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC BAT1    cap/min -5.76
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC BAT1    status  Discharging
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC BAT0    %cap    75
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC BAT0    cap/min 7.79
+SYSSTAT.TEST   39      2019-04-18 13:20:39 UTC BAT0    status  Charging
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC BAT0    %cap    77
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC BAT0    cap/min 5.36
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC BAT0    status  NotCharging
 SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC bus1    idvendor        3f0
 SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC bus1    idprod  862
 SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC bus1    maxpower        196

diff --git a/tests/expected.sadf-r b/tests/expected.sadf-r
index c1177a0610719b1bc433a2f108896a18f4558a1f..3b60f177ccd29d6afc3e9d093d106878dbfd69c1 100644 (file)
--- a/tests/expected.sadf-r
+++ b/tests/expected.sadf-r
@@ -829,6 +829,21 @@
 13:20:49 UTC; CPU; 7; MHz; 349756;
 # 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_PWR_BAT; nr_curr; 2; nr_alloc; 2; nr_ini; 2
+13:20:19 UTC; BAT; 0; %cap; 100; 100; status; 4 [Full];
+13:20:19 UTC; BAT; 1; %cap; 85; 83; status; 0 [Unknown];
+# uptime_cs; 725496; ust_time; 1555593629; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:29
+# name; A_PWR_BAT; nr_curr; 2; nr_alloc; 2; nr_ini; 2
+13:20:29 UTC; BAT; 0; %cap; 100; 70; status; 0 [Unknown];
+13:20:29 UTC; BAT; 1; %cap; 83; 80; status; 2 [Discharging];
+# uptime_cs; 729346; ust_time; 1555593639; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:39
+# name; A_PWR_BAT; nr_curr; 1; nr_alloc; 2; nr_ini; 2
+13:20:39 UTC; BAT; 0; %cap; 70; 75; status; 1 [Charging];
+# uptime_cs; 731585; ust_time; 1555593649; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:49
+# name; A_PWR_BAT; nr_curr; 1; nr_alloc; 2; nr_ini; 2
+13:20:49 UTC; BAT; 0; %cap; 75; 77; status; 3 [NotCharging];
+# 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_PWR_USB; nr_curr; 0; nr_alloc; 4; nr_ini; 2
 # uptime_cs; 725496; ust_time; 1555593629; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:29
 # name; A_PWR_USB; nr_curr; 2; nr_alloc; 4; nr_ini; 2
@@ -1123,6 +1138,8 @@
 13:54:35 UTC; CPU; 8; MHz; 349756;
 13:54:35 UTC; CPU; 9; MHz; 349756;
 # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35
+# name; A_PWR_BAT; nr_curr; 0; nr_alloc; 2; nr_ini; 2
+# uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35
 # name; A_PWR_USB; nr_curr; 0; nr_alloc; 4; nr_ini; 2
 # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35
 # name; A_FS; nr_curr; 4; nr_alloc; 8; nr_ini; 4

diff --git a/tests/expected.sadf-x b/tests/expected.sadf-x
index 172b08fc0032d727e62b363ae0f0f591ff827d58..9c07c3af5d56a9804a6021b50e20bdfb1c83bbe4 100644 (file)
--- a/tests/expected.sadf-x
+++ b/tests/expected.sadf-x
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sysstat PUBLIC "DTD v3.12 sysstat //EN"
-"http://pagesperso-orange.fr/sebastien.godard/sysstat-3.12.dtd">
+<!DOCTYPE sysstat PUBLIC "DTD v3.13 sysstat //EN"
+"http://pagesperso-orange.fr/sebastien.godard/sysstat-3.13.dtd">
 <sysstat
 xmlns="http://pagesperso-orange.fr/sebastien.godard/sysstat"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
-       <sysdata-version>3.12</sysdata-version>
+       <sysdata-version>3.13</sysdata-version>
        <host nodename="SYSSTAT.TEST">
                <sysname>Linux</sysname>
                <release>1.2.3-TEST</release>
@@ -543,6 +543,10 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                                <cpufreq number="6" frequency="3492.22"/>
                                                <cpufreq number="7" frequency="3497.56"/>
                                        </cpu-frequency>
+                                       <battery unit="minute">
+                                               <bat number="0" percent-capacity="100" variation="0.00" status="Full"/>
+                                               <bat number="1" percent-capacity="83" variation="-3.85" status="Unknown"/>
+                                       </battery>
                                </power-management>
                                <filesystems>
                                        <filesystem fsname="/dev/sda9" MBfsfree="705" MBfsused="145" fsused-percent="17.04" ufsused-percent="18.92" Ifree="6008414" Iused="102818" Iused-percent="1.68"/>
@@ -1038,6 +1042,10 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                                <cpufreq number="6" frequency="3492.22"/>
                                                <cpufreq number="7" frequency="3497.56"/>
                                        </cpu-frequency>
+                                       <battery unit="minute">
+                                               <bat number="0" percent-capacity="70" variation="-57.62" status="Unknown"/>
+                                               <bat number="1" percent-capacity="80" variation="-5.76" status="Discharging"/>
+                                       </battery>
                                        <usb-devices>
                                                <usb bus_number="1" idvendor="3f0" idprod="862" maxpower="196" manufact="HP" product="HP Wireless Keyboard Mouse Kit"/>
                                                <usb bus_number="3" idvendor="174c" idprod="55aa" maxpower="0" manufact="ASMT" product="ASM1153"/>
@@ -1586,6 +1594,9 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                                <cpufreq number="6" frequency="3492.22"/>
                                                <cpufreq number="7" frequency="3497.56"/>
                                        </cpu-frequency>
+                                       <battery unit="minute">
+                                               <bat number="0" percent-capacity="75" variation="7.79" status="Charging"/>
+                                       </battery>
                                </power-management>
                                <filesystems>
                                        <filesystem fsname="/dev/sda9" MBfsfree="1618" MBfsused="127" fsused-percent="7.27" ufsused-percent="39.50" Ifree="1621550" Iused="299810" Iused-percent="15.60"/>
@@ -2181,6 +2192,9 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                                <cpufreq number="6" frequency="3492.22"/>
                                                <cpufreq number="7" frequency="3497.56"/>
                                        </cpu-frequency>
+                                       <battery unit="minute">
+                                               <bat number="0" percent-capacity="77" variation="5.36" status="NotCharging"/>
+                                       </battery>
                                        <usb-devices>
                                                <usb bus_number="1" idvendor="3f0" idprod="862" maxpower="196" manufact="HP" product="HP Wireless Keyboard Mouse Kit"/>
                                                <usb bus_number="3" idvendor="174c" idprod="55aa" maxpower="0" manufact="ASMT" product="ASM1153"/>

diff --git a/tests/expected.sar-dec b/tests/expected.sar-dec
index 79e5be22b2bb455fbf65a73a2a30158880795727..2ae96efd828dcfdf79ae694ac807c133796485f2 100644 (file)
--- a/tests/expected.sar-dec
+++ b/tests/expected.sar-dec
@@ -731,6 +731,15 @@ Average:          5      3494
 Average:          6      3492
 Average:          7      3498
 
+13:20:09          BAT      %cap   cap/min    status
+13:20:19            0       100        +0         ↑
+13:20:19            1        83        -4         ?
+13:20:29            0        70       -58         ?
+13:20:29            1        80        -6         ↘
+13:20:39            0        75        +8         ↗
+13:20:49            0        77        +5         →
+Average:            0        80       -11
+
 13:20:09        BUS  idvendor    idprod  maxpower manufact                product
 13:20:29          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
 13:20:29          3      174c      55aa         0 ASMT                    ASM1153

diff --git a/tests/expected.sar-human b/tests/expected.sar-human
index fa07f92b73e9e9921077e80cb05d244a1ec9f64e..d116a86ed744d1341acd456ddd937e4e783dd025 100644 (file)
--- a/tests/expected.sar-human
+++ b/tests/expected.sar-human
@@ -731,6 +731,15 @@ Average:          5   3493.55
 Average:          6   3492.22
 Average:          7   3497.56
 
+13:20:09          BAT      %cap   cap/min    status
+13:20:19            0      100%     +0.00         ↑
+13:20:19            1       83%     -3.85         ?
+13:20:29            0       70%    -57.62         ?
+13:20:29            1       80%     -5.76         ↘
+13:20:39            0       75%     +7.79         ↗
+13:20:49            0       77%     +5.36         →
+Average:            0     80.5%    -11.19
+
 13:20:09        BUS  idvendor    idprod  maxpower manufact                product
 13:20:29          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
 13:20:29          3      174c      55aa         0 ASMT                    ASM1153

diff --git a/tests/expected.sar32-A b/tests/expected.sar32-A
index 5b9f44779c768c68ca2d6538ef6b0e655ca3c92f..675c1bbf5d945832eff2a782530ecd2a62dfeddf 100644 (file)
--- a/tests/expected.sar32-A
+++ b/tests/expected.sar32-A
@@ -331,6 +331,12 @@ Average:          5   3493.55
 Average:          6   3492.22
 Average:          7   3497.56
 
+13:20:29          BAT      %cap   cap/min    status
+13:20:39            0       100     +0.00         ↑
+13:20:39            1        83     -3.85         ?
+Average:            0    100.00     +0.00
+Average:            1     83.00     -3.85
+
 13:20:29     MBfsfree  MBfsused   %fsused  %ufsused     Ifree     Iused    %Iused FILESYSTEM
 13:20:39          705       145     17.04     18.92   6008414    102818      1.68 /dev/sda9
 13:20:39         2496       845     25.29     46.57  19051710    150338      0.78 /dev/sda7

diff --git a/tests/expected0.sadf-x b/tests/expected0.sadf-x
index cf777db5eb14e70c3aac7e76dc7974af4710ee23..65c243425daa3d158581e9fc80d1abf878f1526c 100644 (file)
--- a/tests/expected0.sadf-x
+++ b/tests/expected0.sadf-x
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sysstat PUBLIC "DTD v3.12 sysstat //EN"
-"http://pagesperso-orange.fr/sebastien.godard/sysstat-3.12.dtd">
+<!DOCTYPE sysstat PUBLIC "DTD v3.13 sysstat //EN"
+"http://pagesperso-orange.fr/sebastien.godard/sysstat-3.13.dtd">
 <sysstat
 xmlns="http://pagesperso-orange.fr/sebastien.godard/sysstat"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
-       <sysdata-version>3.12</sysdata-version>
+       <sysdata-version>3.13</sysdata-version>
        <host nodename="SYSSTAT.TEST">
                <sysname>Linux</sysname>
                <release>1.2.3-TEST</release>

diff --git a/tests/expected1.sadf-x b/tests/expected1.sadf-x
index cafe9f8157ee9fd48d146033d5bd37915a3d45cb..913cedf185c0c3f6253a165d5883868c3ee683ef 100644 (file)
--- a/tests/expected1.sadf-x
+++ b/tests/expected1.sadf-x
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sysstat PUBLIC "DTD v3.12 sysstat //EN"
-"http://pagesperso-orange.fr/sebastien.godard/sysstat-3.12.dtd">
+<!DOCTYPE sysstat PUBLIC "DTD v3.13 sysstat //EN"
+"http://pagesperso-orange.fr/sebastien.godard/sysstat-3.13.dtd">
 <sysstat
 xmlns="http://pagesperso-orange.fr/sebastien.godard/sysstat"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
-       <sysdata-version>3.12</sysdata-version>
+       <sysdata-version>3.13</sysdata-version>
        <host nodename="SYSSTAT.TEST">
                <sysname>Linux</sysname>
                <release>1.2.3-TEST</release>

diff --git a/tests/expected1.sar-always b/tests/expected1.sar-always
index d7b9211bde1f358e0358e360c70cce0aad943522..ed9e8568f46e595e445fd89805809638d690c1bb 100644 (file)
--- a/tests/expected1.sar-always
+++ b/tests/expected1.sar-always
@@ -26,6 +26,15 @@ Average:   \e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m\e[3
 13:20:49   \e[32;22m       sda\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m
 Average:   \e[32;22m       sda\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m
 
+13:20:09          BAT      %cap   cap/min    status
+13:20:19   \e[32;22m         0\e[0m\e[34;1m       100\e[0m\e[36;22m     +0.00\e[0m\e[32;1m         ↑\e[0m
+13:20:19   \e[32;22m         1\e[0m\e[34;1m        83\e[0m\e[34;1m     -3.85\e[0m         ?
+13:20:29   \e[32;22m         0\e[0m\e[34;1m        70\e[0m\e[31;1m    -57.62\e[0m         ?
+13:20:29   \e[32;22m         1\e[0m\e[34;1m        80\e[0m\e[35;1m     -5.76\e[0m\e[31;1m         ↘\e[0m
+13:20:39   \e[32;22m         0\e[0m\e[34;1m        75\e[0m\e[34;1m     +7.79\e[0m\e[32;1m         ↗\e[0m
+13:20:49   \e[32;22m         0\e[0m\e[34;1m        77\e[0m\e[34;1m     +5.36\e[0m\e[31;1m         →\e[0m
+Average:   \e[32;22m         0\e[0m\e[34;1m     80.50\e[0m\e[31;1m    -11.19\e[0m
+
 13:20:09     %smem-10  %smem-60 %smem-300     %smem  %fmem-10  %fmem-60 %fmem-300     %fmem
 13:20:19   \e[34;1m      3.12\e[0m\e[34;1m      1.40\e[0m\e[34;1m      0.03\e[0m\e[34;1m      0.05\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m\e[34;1m      0.02\e[0m
 13:20:29   \e[34;1m     21.06\e[0m\e[34;1m     14.31\e[0m\e[34;1m      3.80\e[0m\e[34;1m      0.03\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m\e[36;22m      0.00\e[0m\e[34;1m      0.01\e[0m

diff --git a/tests/expected2.sadf-g b/tests/expected2.sadf-g
index 523cde9717306d75328a0a01e4dfd4dcb6afe6de..491e924ab156cb536b870e880728e592494d7cc5 100644 (file)
--- a/tests/expected2.sadf-g
+++ b/tests/expected2.sadf-g
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="6360" height="35790" fill="black" stroke="#000000" stroke-width="1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="6360" height="36430" fill="black" stroke="#000000" stroke-width="1">
 <text x="0" y="30" text-anchor="start" stroke="#000000">Linux 1.2.3-TEST (SYSSTAT.TEST)        04/18/19        _x86_64_        (9 CPU)
 </text>
 <a xlink:href="#g1-0" xlink:title="A_CPU">
@@ -65,15 +65,17 @@
 <text x="10" y="640">Software-based network processing statistics</text></a>
 <a xlink:href="#g30-0" xlink:title="A_PWR_CPU">
 <text x="10" y="660">CPU clock frequency</text></a>
+<a xlink:href="#g43-0" xlink:title="A_PWR_BAT">
+<text x="10" y="680">Batteries capacity</text></a>
 <a xlink:href="#g37-0" xlink:title="A_FS">
-<text x="10" y="680">Filesystems statistics</text></a>
+<text x="10" y="700">Filesystems statistics</text></a>
 <a xlink:href="#g40-0" xlink:title="A_PSI_CPU">
-<text x="10" y="700">Pressure-stall CPU statistics</text></a>
+<text x="10" y="720">Pressure-stall CPU statistics</text></a>
 <a xlink:href="#g41-0" xlink:title="A_PSI_IO">
-<text x="10" y="720">Pressure-stall I/O statistics</text></a>
+<text x="10" y="740">Pressure-stall I/O statistics</text></a>
 <a xlink:href="#g42-0" xlink:title="A_PSI_MEM">
-<text x="10" y="740">Pressure-stall memory statistics</text></a>
-<g id="g1-0" transform="translate(0,760)">
+<text x="10" y="760">Pressure-stall memory statistics</text></a>
+<g id="g1-0" transform="translate(0,780)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU utilization [all]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -161,7 +163,7 @@
 </g>
 </g>
 </g>
-<g id="g1-1" transform="translate(0,1070)">
+<g id="g1-1" transform="translate(0,1090)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU utilization [0]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -240,7 +242,7 @@
 </g>
 </g>
 </g>
-<g id="g1-2" transform="translate(0,1380)">
+<g id="g1-2" transform="translate(0,1400)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU utilization [1]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -316,7 +318,7 @@
 </g>
 </g>
 </g>
-<g id="g1-3" transform="translate(0,1690)">
+<g id="g1-3" transform="translate(0,1710)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU utilization [2]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -395,7 +397,7 @@
 </g>
 </g>
 </g>
-<g id="g1-4" transform="translate(0,2000)">
+<g id="g1-4" transform="translate(0,2020)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU utilization [3]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -474,7 +476,7 @@
 </g>
 </g>
 </g>
-<g id="g1-5" transform="translate(0,2310)">
+<g id="g1-5" transform="translate(0,2330)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU utilization [4]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -553,7 +555,7 @@
 </g>
 </g>
 </g>
-<g id="g1-6" transform="translate(0,2620)">
+<g id="g1-6" transform="translate(0,2640)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU utilization [5]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -629,7 +631,7 @@
 </g>
 </g>
 </g>
-<g id="g1-7" transform="translate(0,2930)">
+<g id="g1-7" transform="translate(0,2950)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU utilization [6]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -708,7 +710,7 @@
 </g>
 </g>
 </g>
-<g id="g1-8" transform="translate(0,3240)">
+<g id="g1-8" transform="translate(0,3260)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU utilization [7]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -784,7 +786,7 @@
 </g>
 </g>
 </g>
-<g id="g1-9" transform="translate(0,3550)">
+<g id="g1-9" transform="translate(0,3570)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU utilization [8]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -872,7 +874,7 @@
 </g>
 </g>
 </g>
-<g id="g1-10" transform="translate(0,3860)">
+<g id="g1-10" transform="translate(0,3880)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU utilization [9]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -951,7 +953,7 @@
 </g>
 </g>
 </g>
-<g id="g2-0" transform="translate(0,4170)">
+<g id="g2-0" transform="translate(0,4190)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Task creation
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -1049,7 +1051,7 @@
 <path d=" M48019,68409.30 L48029,46287.74 L48039,64945.01 L48049,108286.78 M50075,68409.30" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.001847)"/>
 </g>
 </g>
-<g id="g5-0" transform="translate(0,4480)">
+<g id="g5-0" transform="translate(0,4500)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Paging activity (3)
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -1105,7 +1107,7 @@
 <path d=" M48019,0.00 L48029,0.00 L48039,0.23 L48049,0.09 M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #a9a9a9; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-497.555556)"/>
 </g>
 </g>
-<g id="g6-0" transform="translate(0,4790)">
+<g id="g6-0" transform="translate(0,4810)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">I/O and transfer rate statistics (1)
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -1211,7 +1213,7 @@
 <path d=" M48019,32.08 L48029,32.01 L48039,0.00 L48049,214.83 M50075,1.60" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.444696)"/>
 </g>
 </g>
-<g id="g7-0" transform="translate(0,5100)">
+<g id="g7-0" transform="translate(0,5120)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Memory utilization (1)
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -1519,7 +1521,7 @@
 <path d=" M48019,0.00 L48029,0.00 L48039,0.00 L48049,0.00 M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #708090; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.074931)"/>
 </g>
 </g>
-<g id="g7-1" transform="translate(0,5410)">
+<g id="g7-1" transform="translate(0,5430)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Swap utilization (1)
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -1571,7 +1573,7 @@
 <path d=" M48019,0.00 L48029,0.00 L48039,0.00 L48049,0.00 M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.012207)"/>
 </g>
 </g>
-<g id="g8-0" transform="translate(0,5720)">
+<g id="g8-0" transform="translate(0,5740)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Kernel tables statistics (1)
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -1671,7 +1673,7 @@
 <path d=" M48019,4 L48029,4 L48039,4 L48049,4 M50075,4" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-50.000000)"/>
 </g>
 </g>
-<g id="g9-0" transform="translate(0,6030)">
+<g id="g9-0" transform="translate(0,6050)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Queue length
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -1817,7 +1819,7 @@
 <path d=" M48019,3.43 L48029,3.43 L48039,3.43 L48049,3.43 M50075,3.43" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-58.309038)"/>
 </g>
 </g>
-<g id="g11-0" transform="translate(0,6340)">
+<g id="g11-0" transform="translate(0,6360)">
 <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) [sda]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -2061,7 +2063,7 @@
 </g>
 </g>
 </g>
-<g id="g11-1" transform="translate(0,6650)">
+<g id="g11-1" transform="translate(0,6670)">
 <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) [sda1]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -2309,7 +2311,7 @@
 </g>
 </g>
 </g>
-<g id="g11-2" transform="translate(0,6960)">
+<g id="g11-2" transform="translate(0,6980)">
 <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) [sdb]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -2553,7 +2555,7 @@
 </g>
 </g>
 </g>
-<g id="g11-3" transform="translate(0,7270)">
+<g id="g11-3" transform="translate(0,7290)">
 <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) [sdq]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -2795,7 +2797,7 @@
 </g>
 </g>
 </g>
-<g id="g11-4" transform="translate(0,7580)">
+<g id="g11-4" transform="translate(0,7600)">
 <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) [sdr]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -3041,7 +3043,7 @@
 </g>
 </g>
 </g>
-<g id="g11-5" transform="translate(0,7890)">
+<g id="g11-5" transform="translate(0,7910)">
 <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) [sds]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -3285,7 +3287,7 @@
 </g>
 </g>
 </g>
-<g id="g11-6" transform="translate(0,8200)">
+<g id="g11-6" transform="translate(0,8220)">
 <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) [sdf]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -3533,7 +3535,7 @@
 </g>
 </g>
 </g>
-<g id="g11-7" transform="translate(0,8510)">
+<g id="g11-7" transform="translate(0,8530)">
 <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) [sdg]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -3775,7 +3777,7 @@
 </g>
 </g>
 </g>
-<g id="g11-8" transform="translate(0,8820)">
+<g id="g11-8" transform="translate(0,8840)">
 <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) [cciss/c0d0]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -3869,7 +3871,7 @@
 <path d=" M50075,0.10" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-2020.000000)"/>
 </g>
 </g>
-<g id="g11-9" transform="translate(0,9130)">
+<g id="g11-9" transform="translate(0,9150)">
 <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) [cciss/c0d0p2]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -3963,7 +3965,7 @@
 <path d=" M50075,0.10" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-2020.000000)"/>
 </g>
 </g>
-<g id="g11-10" transform="translate(0,9440)">
+<g id="g11-10" transform="translate(0,9460)">
 <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) [xvdp]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -4209,7 +4211,7 @@
 </g>
 </g>
 </g>
-<g id="g11-11" transform="translate(0,9750)">
+<g id="g11-11" transform="translate(0,9770)">
 <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) [xvdiw]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -4455,7 +4457,7 @@
 </g>
 </g>
 </g>
-<g id="g12-0" transform="translate(0,10060)">
+<g id="g12-0" transform="translate(0,10080)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Network interfaces statistics (1) [enp6s0]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -4655,7 +4657,7 @@
 </g>
 </g>
 </g>
-<g id="g12-1" transform="translate(0,10370)">
+<g id="g12-1" transform="translate(0,10390)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Network interfaces statistics (1) [virbr0]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -4803,7 +4805,7 @@
 <path d=" M48019,19.25 L48029,19.21 M48049,0.00 M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-10.390000)"/>
 </g>
 </g>
-<g id="g12-2" transform="translate(0,10680)">
+<g id="g12-2" transform="translate(0,10700)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Network interfaces statistics (1) [virbr0-1]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -4951,7 +4953,7 @@
 <path d=" M48019,320.82 L48029,32.01 L48039,2.60 L48049,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.623400)"/>
 </g>
 </g>
-<g id="g12-3" transform="translate(0,10990)">
+<g id="g12-3" transform="translate(0,11010)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Network interfaces statistics (1) [wlp5s0]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -5099,7 +5101,7 @@
 <path d=" M48019,32.08 L48029,9.60 M48039,1.51 L48049,0.00 M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-6.234000)"/>
 </g>
 </g>
-<g id="g12-4" transform="translate(0,11300)">
+<g id="g12-4" transform="translate(0,11320)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Network interfaces statistics (1) [enp6s1]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -5253,7 +5255,7 @@
 <path d=" M48039,2.31 L48049,0.00 M50075,89.89" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-2.224839)"/>
 </g>
 </g>
-<g id="g12-5" transform="translate(0,11610)">
+<g id="g12-5" transform="translate(0,11630)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Network interfaces statistics (1) [wlp5s1]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -5351,7 +5353,7 @@
 <path d=" M48039,0.01 L48049,0.00 M50075,25.95" style="vector-effect: non-scaling-stroke; stroke: #bebebe; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-7.706666)"/>
 </g>
 </g>
-<g id="g12-6" transform="translate(0,11920)">
+<g id="g12-6" transform="translate(0,11940)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Network interfaces statistics (1) [enp6s2]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -5501,7 +5503,7 @@
 <path d=" M50075,89.89" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-2.224839)"/>
 </g>
 </g>
-<g id="g12-7" transform="translate(0,12230)">
+<g id="g12-7" transform="translate(0,12250)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Network interfaces statistics (1) [wlp5s2]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -5599,7 +5601,7 @@
 <path d=" M50075,25.95" style="vector-effect: non-scaling-stroke; stroke: #bebebe; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-7.707596)"/>
 </g>
 </g>
-<g id="g13-0" transform="translate(0,12540)">
+<g id="g13-0" transform="translate(0,12560)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Network interfaces errors statistics (4) [virbr0]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -5651,7 +5653,7 @@
 <path d=" M48019,2.57 L48029,2.56 M48049,0.00 M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-77.925000)"/>
 </g>
 </g>
-<g id="g13-1" transform="translate(0,12850)">
+<g id="g13-1" transform="translate(0,12870)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Network interfaces errors statistics (4) [virbr0-1]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -5703,7 +5705,7 @@
 <path d=" M48019,0.96 L48029,0.00 L48039,0.23 L48049,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-62.340000)"/>
 </g>
 </g>
-<g id="g13-2" transform="translate(0,13160)">
+<g id="g13-2" transform="translate(0,13180)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Network interfaces errors statistics (2) [wlp5s0]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -5753,7 +5755,7 @@
 <path d=" M48019,0.00 L48029,0.00 M48039,0.00 L48049,0.00 M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-20.826667)"/>
 </g>
 </g>
-<g id="g13-3" transform="translate(0,13470)">
+<g id="g13-3" transform="translate(0,13490)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Network interfaces errors statistics (4) [wlp5s1]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -5805,7 +5807,7 @@
 <path d=" M48039,0.00 L48049,0.00 M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-770.000000)"/>
 </g>
 </g>
-<g id="g16-0" transform="translate(0,13780)">
+<g id="g16-0" transform="translate(0,13800)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">IPv4 sockets statistics (1)
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -5907,7 +5909,7 @@
 <path d=" M48019,1 L48029,1 L48039,1 L48049,1 M50075,1" style="vector-effect: non-scaling-stroke; stroke: #708090; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-200.000000)"/>
 </g>
 </g>
-<g id="g24-0" transform="translate(0,14090)">
+<g id="g24-0" transform="translate(0,14110)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">IPv6 sockets statistics
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -5961,7 +5963,7 @@
 <path d=" M48019,0 L48029,0 L48039,0 L48049,0 M50075,0" style="vector-effect: non-scaling-stroke; stroke: #a9a9a9; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-66.666667)"/>
 </g>
 </g>
-<g id="g38-1" transform="translate(0,14400)">
+<g id="g38-1" transform="translate(0,14420)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Fibre Channel HBA statistics (1) [host1]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -6059,7 +6061,7 @@
 <path d=" M48039,0.05 L48049,0.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-1925.000000)"/>
 </g>
 </g>
-<g id="g39-0" transform="translate(0,14710)">
+<g id="g39-0" transform="translate(0,14730)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Software-based network processing statistics (1) [all]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -6209,7 +6211,7 @@
 <path d=" M48019,0 L48029,0 L48039,10 L48049,457 M50075,0" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.437637)"/>
 </g>
 </g>
-<g id="g39-2" transform="translate(0,15020)">
+<g id="g39-2" transform="translate(0,15040)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Software-based network processing statistics (2) [1]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -6309,7 +6311,7 @@
 <path d=" M48019,0 L48029,0 L48039,10 L48049,223 M50075,0" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.896861)"/>
 </g>
 </g>
-<g id="g39-3" transform="translate(0,15330)">
+<g id="g39-3" transform="translate(0,15350)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Software-based network processing statistics (2) [2]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -6361,7 +6363,7 @@
 <path d=" M48019,0.00 L48029,0.00 L48039,0.00 L48049,0.00 M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-11.417582)"/>
 </g>
 </g>
-<g id="g39-4" transform="translate(0,15640)">
+<g id="g39-4" transform="translate(0,15660)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Software-based network processing statistics (2) [3]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -6413,7 +6415,7 @@
 <path d=" M48019,0.00 L48029,0.00 L48039,0.00 L48049,0.00 M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-7.611722)"/>
 </g>
 </g>
-<g id="g39-5" transform="translate(0,15950)">
+<g id="g39-5" transform="translate(0,15970)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Software-based network processing statistics (2) [4]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -6465,7 +6467,7 @@
 <path d=" M48019,0.00 L48029,0.00 L48039,0.00 L48049,0.00 M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-5.708791)"/>
 </g>
 </g>
-<g id="g39-6" transform="translate(0,16260)">
+<g id="g39-6" transform="translate(0,16280)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Software-based network processing statistics (2) [5]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -6519,7 +6521,7 @@
 <path d=" M48019,0.00 L48029,0.00 L48039,0.00 L48049,0.00 M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-4.567033)"/>
 </g>
 </g>
-<g id="g39-7" transform="translate(0,16570)">
+<g id="g39-7" transform="translate(0,16590)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Software-based network processing statistics (2) [6]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -6621,7 +6623,7 @@
 <path d=" M48019,0 M48029,0 M48039,0 L48049,234 M50075,0" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.854701)"/>
 </g>
 </g>
-<g id="g39-8" transform="translate(0,16880)">
+<g id="g39-8" transform="translate(0,16900)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Software-based network processing statistics (2) [7]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -6673,7 +6675,7 @@
 <path d=" M48019,0.00 L48029,0.00 L48039,0.00 L48049,0.00 M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-3.262166)"/>
 </g>
 </g>
-<g id="g39-9" transform="translate(0,17190)">
+<g id="g39-9" transform="translate(0,17210)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Software-based network processing statistics (1) [8]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -6775,7 +6777,7 @@
 <path d=" M48019,0.00 M48029,0.00 L48039,0.00 L48049,0.00 M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-2.854396)"/>
 </g>
 </g>
-<g id="g39-10" transform="translate(0,17500)">
+<g id="g39-10" transform="translate(0,17520)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Software-based network processing statistics (2) [9]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -6827,7 +6829,7 @@
 <path d=" M50075,0.00" style="vector-effect: non-scaling-stroke; stroke: #000000; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-2.537241)"/>
 </g>
 </g>
-<g id="g30-0" transform="translate(0,17810)">
+<g id="g30-0" transform="translate(0,17830)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [all]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -6875,7 +6877,7 @@
 <path d=" M47988,3522.54 L48019,3522.54 L48029,3522.54 L48039,3522.54 L48049,3522.54 M50044,3517.54 L50075,3517.54" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.056777)"/>
 </g>
 </g>
-<g id="g30-1" transform="translate(0,18120)">
+<g id="g30-1" transform="translate(0,18140)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [0]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -6923,7 +6925,7 @@
 <path d=" M47988,3566.48 L48019,3566.48 L48029,3566.48 L48039,3566.48 L48049,3566.48 M50044,3566.48 L50075,3566.48" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.056078)"/>
 </g>
 </g>
-<g id="g30-2" transform="translate(0,18430)">
+<g id="g30-2" transform="translate(0,18450)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [1]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -6971,7 +6973,7 @@
 <path d=" M47988,3566.39 L48019,3566.39 L48029,3566.39 L48039,3566.39 L48049,3566.39 M50044,3566.39 L50075,3566.39" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.056079)"/>
 </g>
 </g>
-<g id="g30-3" transform="translate(0,18740)">
+<g id="g30-3" transform="translate(0,18760)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [2]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -7019,7 +7021,7 @@
 <path d=" M47988,3492.11 L48019,3492.11 L48029,3492.11 L48039,3492.11 L48049,3492.11 M50044,3492.11 L50075,3492.11" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.057272)"/>
 </g>
 </g>
-<g id="g30-4" transform="translate(0,19050)">
+<g id="g30-4" transform="translate(0,19070)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [3]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -7067,7 +7069,7 @@
 <path d=" M47988,3566.22 L48019,3566.22 L48029,3566.22 L48039,3566.22 L48049,3566.22 M50044,3566.22 L50075,3566.22" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.056082)"/>
 </g>
 </g>
-<g id="g30-5" transform="translate(0,19360)">
+<g id="g30-5" transform="translate(0,19380)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [4]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -7115,7 +7117,7 @@
 <path d=" M47988,3505.84 L48019,3505.84 L48029,3505.84 L48039,3505.84 L48049,3505.84 M50044,3505.84 L50075,3505.84" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.057048)"/>
 </g>
 </g>
-<g id="g30-6" transform="translate(0,19670)">
+<g id="g30-6" transform="translate(0,19690)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [5]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -7163,7 +7165,7 @@
 <path d=" M47988,3493.55 L48019,3493.55 L48029,3493.55 L48039,3493.55 L48049,3493.55 M50044,3493.55 L50075,3493.55" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.057248)"/>
 </g>
 </g>
-<g id="g30-7" transform="translate(0,19980)">
+<g id="g30-7" transform="translate(0,20000)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [6]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -7211,7 +7213,7 @@
 <path d=" M47988,3492.22 L48019,3492.22 L48029,3492.22 L48039,3492.22 L48049,3492.22 M50044,3492.22 L50075,3492.22" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.057270)"/>
 </g>
 </g>
-<g id="g30-8" transform="translate(0,20290)">
+<g id="g30-8" transform="translate(0,20310)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [7]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -7259,7 +7261,7 @@
 <path d=" M47988,3497.56 L48019,3497.56 L48029,3497.56 L48039,3497.56 L48049,3497.56 M50044,3497.56 L50075,3497.56" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.057183)"/>
 </g>
 </g>
-<g id="g30-9" transform="translate(0,20600)">
+<g id="g30-9" transform="translate(0,20620)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [8]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -7307,7 +7309,7 @@
 <path d=" M50044,3497.56 L50075,3497.56" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.057183)"/>
 </g>
 </g>
-<g id="g30-10" transform="translate(0,20910)">
+<g id="g30-10" transform="translate(0,20930)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU clock frequency [9]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -7355,7 +7357,111 @@
 <path d=" M50044,3497.56 L50075,3497.56" style="vector-effect: non-scaling-stroke; stroke: #696969; stroke-width: 1; fill-opacity: 0" transform="scale(0.008333,-0.057183)"/>
 </g>
 </g>
-<g id="g37-0" transform="translate(0,21220)">
+<g id="g43-0" transform="translate(0,21240)">
+<rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
+<text x="0" y="20" style="fill: #000000; stroke: none">Batteries capacity [BAT0]
+<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"/>
+<text x="795" y="50" style="fill: #696969; stroke: none; font-size: 12px">%cap (70, 100)</text>
+<text x="1045" y="250" style="fill: #000000; text-anchor: end; stroke: none; font-size: 14px">SYSSTAT.TEST
+<tspan x="1045" y="264" style="fill: #000000; text-anchor: end; stroke: none; font-size: 14px">04/18/19</tspan>
+</text>
+<g transform="translate(70,250)">
+<text x="0" y="0" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">0.</text>
+<polyline points="0,25.00 720,25.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-50" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">25.</text>
+<polyline points="0,50.00 720,50.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-100" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">50.</text>
+<polyline points="0,75.00 720,75.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-150" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">75.</text>
+<polyline points="0,100.00 720,100.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-200" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">100.</text>
+<polyline points="0,0 0,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="-15" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 0:00</text>
+<polyline points="7200,0 7200,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="45" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 2:00</text>
+<polyline points="14400,0 14400,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="105" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 4:00</text>
+<polyline points="21600,0 21600,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="165" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 6:00</text>
+<polyline points="28800,0 28800,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="225" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 8:00</text>
+<polyline points="36000,0 36000,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="285" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">10:00</text>
+<polyline points="43200,0 43200,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="345" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">12:00</text>
+<polyline points="50400,0 50400,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="405" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">14:00</text>
+<polyline points="57600,0 57600,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="465" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">16:00</text>
+<polyline points="64800,0 64800,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="525" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">18:00</text>
+<polyline points="72000,0 72000,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="585" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">20:00</text>
+<polyline points="79200,0 79200,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="645" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">22:00</text>
+<polyline points="86400,0 86400,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="705" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 0:00</text>
+<text x="-10" y="30" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">GMT</text>
+<g style="fill: #696969; stroke: none" transform="scale(0.008333,-2.000000)">
+<rect x="47988" y="0.00" height="100.00" width="31"/><rect x="47998" y="0.00" height="70.00" width="31"/><rect x="48000" y="0.00" height="75.00" width="39"/><rect x="48027" y="0.00" height="77.00" width="22"/>
+</g>
+</g>
+</g>
+<g id="g43-1" transform="translate(0,21550)">
+<rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
+<text x="0" y="20" style="fill: #000000; stroke: none">Batteries capacity [BAT1]
+<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"/>
+<text x="795" y="50" style="fill: #696969; stroke: none; font-size: 12px">%cap (80, 83)</text>
+<text x="1045" y="250" style="fill: #000000; text-anchor: end; stroke: none; font-size: 14px">SYSSTAT.TEST
+<tspan x="1045" y="264" style="fill: #000000; text-anchor: end; stroke: none; font-size: 14px">04/18/19</tspan>
+</text>
+<g transform="translate(70,250)">
+<text x="0" y="0" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">0.</text>
+<polyline points="0,25.00 720,25.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-50" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">25.</text>
+<polyline points="0,50.00 720,50.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-100" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">50.</text>
+<polyline points="0,75.00 720,75.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-150" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">75.</text>
+<polyline points="0,100.00 720,100.00" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(1,-2.000000)"/>
+<text x="0" y="-200" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">100.</text>
+<polyline points="0,0 0,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="-15" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 0:00</text>
+<polyline points="7200,0 7200,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="45" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 2:00</text>
+<polyline points="14400,0 14400,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="105" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 4:00</text>
+<polyline points="21600,0 21600,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="165" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 6:00</text>
+<polyline points="28800,0 28800,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="225" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 8:00</text>
+<polyline points="36000,0 36000,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="285" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">10:00</text>
+<polyline points="43200,0 43200,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="345" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">12:00</text>
+<polyline points="50400,0 50400,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="405" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">14:00</text>
+<polyline points="57600,0 57600,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="465" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">16:00</text>
+<polyline points="64800,0 64800,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="525" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">18:00</text>
+<polyline points="72000,0 72000,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="585" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">20:00</text>
+<polyline points="79200,0 79200,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="645" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start">22:00</text>
+<polyline points="86400,0 86400,-200" style="vector-effect: non-scaling-stroke; stroke: #bebebe" transform="scale(0.008333,1)"/>
+<text x="705" y="15" style="fill: #000000; stroke: none; font-size: 14px; text-anchor: start"> 0:00</text>
+<text x="-10" y="30" style="fill: #000000; stroke: none; font-size: 12px; text-anchor: end">GMT</text>
+<g style="fill: #696969; stroke: none" transform="scale(0.008333,-2.000000)">
+<rect x="47988" y="0.00" height="83.00" width="31"/><rect x="47998" y="0.00" height="80.00" width="31"/>
+</g>
+</g>
+</g>
+<g id="g37-0" transform="translate(0,21860)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Filesystems statistics (1) [/dev/sda9]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -7557,7 +7663,7 @@
 </g>
 </g>
 </g>
-<g id="g37-1" transform="translate(0,21530)">
+<g id="g37-1" transform="translate(0,22170)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Filesystems statistics (1) [/dev/sda7]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -7759,7 +7865,7 @@
 </g>
 </g>
 </g>
-<g id="g37-2" transform="translate(0,21840)">
+<g id="g37-2" transform="translate(0,22480)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Filesystems statistics (1) [/dev/sda12]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -7961,7 +8067,7 @@
 </g>
 </g>
 </g>
-<g id="g37-3" transform="translate(0,22150)">
+<g id="g37-3" transform="translate(0,22790)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Filesystems statistics (1) [/dev/sda6]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -8163,7 +8269,7 @@
 </g>
 </g>
 </g>
-<g id="g37-4" transform="translate(0,22460)">
+<g id="g37-4" transform="translate(0,23100)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Filesystems statistics (1) [/dev/sdf]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -8365,7 +8471,7 @@
 </g>
 </g>
 </g>
-<g id="g37-5" transform="translate(0,22770)">
+<g id="g37-5" transform="translate(0,23410)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Filesystems statistics (1) [/dev/sdg]
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -8567,7 +8673,7 @@
 </g>
 </g>
 </g>
-<g id="g40-0" transform="translate(0,23080)">
+<g id="g40-0" transform="translate(0,23720)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">CPU stall time (some tasks)
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -8619,7 +8725,7 @@
 </g>
 </g>
 </g>
-<g id="g41-0" transform="translate(0,23390)">
+<g id="g41-0" transform="translate(0,24030)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">I/O pressure trends (some tasks)
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -8821,7 +8927,7 @@
 </g>
 </g>
 </g>
-<g id="g42-0" transform="translate(0,23700)">
+<g id="g42-0" transform="translate(0,24340)">
 <rect x="0" y="0" height="300" width="1050" fill="#ffffff"/>
 <text x="0" y="20" style="fill: #000000; stroke: none">Memory pressure trends (some tasks)
 <tspan x="795" y="25" style="fill: #000000; stroke: none; font-size: 12px">(Min, Max values)</tspan>
@@ -8973,5 +9079,5 @@
 </g>
 </g>
 </g>
-<!-- Actual canvas height: 24010 -->
+<!-- Actual canvas height: 24650 -->
 </svg>

diff --git a/tests/expected2.sar-all b/tests/expected2.sar-all
index 5ae9201c025cdfc77f142765bf1740569161186d..51b69290a3e40e2a0a82185b3994882232e61da0 100644 (file)
--- a/tests/expected2.sar-all
+++ b/tests/expected2.sar-all
@@ -731,6 +731,15 @@ Average:          5   3493.55
 Average:          6   3492.22
 Average:          7   3497.56
 
+13:20:09          BAT      %cap   cap/min    status
+13:20:19            0       100     +0.00         ↑
+13:20:19            1        83     -3.85         ?
+13:20:29            0        70    -57.62         ?
+13:20:29            1        80     -5.76         ↘
+13:20:39            0        75     +7.79         ↗
+13:20:49            0        77     +5.36         →
+Average:            0     80.50    -11.19
+
 13:20:09        BUS  idvendor    idprod  maxpower manufact                product
 13:20:29          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
 13:20:29          3      174c      55aa         0 ASMT                    ASM1153

diff --git a/tests/expected2.sar-always b/tests/expected2.sar-always
new file mode 100644 (file)
index 0000000..7c4bc88
--- /dev/null
+++ b/tests/expected2.sar-always
@@ -0,0 +1,13 @@
+Linux 1.2.3-TEST (SYSSTAT.TEST)        04/18/19        _x86_64_        (9 CPU)
+
+13:20:09          BAT      %cap   cap/min    status
+13:20:19   \e[32;22m         0\e[0m\e[34;1m       100\e[0m\e[34;22m     +0.00\e[0m\e[33;22m         ↑\e[0m
+13:20:19   \e[32;22m         1\e[0m\e[34;1m        83\e[0m\e[34;1m     -3.85\e[0m         ?
+13:20:29   \e[32;22m         0\e[0m\e[34;1m        70\e[0m\e[31;1m    -57.62\e[0m         ?
+13:20:29   \e[32;22m         1\e[0m\e[34;1m        80\e[0m\e[35;1m     -5.76\e[0m\e[35;1m         ↘\e[0m
+13:20:39   \e[32;22m         0\e[0m\e[34;1m        75\e[0m\e[34;1m     +7.79\e[0m\e[33;22m         ↗\e[0m
+13:20:49   \e[32;22m         0\e[0m\e[34;1m        77\e[0m\e[34;1m     +5.36\e[0m\e[35;1m         →\e[0m
+Average:   \e[32;22m         0\e[0m\e[34;1m     80.50\e[0m\e[31;1m    -11.19\e[0m
+
+13:37:29   \e[31;22m  LINUX RESTART     (9 CPU)
+\e[0m
\ No newline at end of file

diff --git a/tests/expected2.sar32-A b/tests/expected2.sar32-A
index f824a293a1422250e0af49e46ec9f39f09c25cd0..aefd09d989c10b08920d1db235fc7959306331a5 100644 (file)
--- a/tests/expected2.sar32-A
+++ b/tests/expected2.sar32-A
@@ -456,6 +456,14 @@ Average:          5   3493.55
 Average:          6   3492.22
 Average:          7   3497.56
 
+13:20:09          BAT      %cap   cap/min    status
+13:20:19            0       100     +0.00         ↑
+13:20:19            1        83     -3.85         ?
+13:20:29            0        70    -57.62         ?
+13:20:29            1        80     -5.76         ↘
+Average:            0     85.00    -28.84
+Average:            1     81.50     -4.81
+
 13:20:09        BUS  idvendor    idprod  maxpower manufact                product
 13:20:29          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
 13:20:29          3      174c      55aa         0 ASMT                    ASM1153

diff --git a/tests/expected3.sar-all b/tests/expected3.sar-all
index 9644fc41ce770fcdf80b6be9b7e4b4cb5e71774f..ce95fac32c9a8208ca880ccd218c32d2af5ce59c 100644 (file)
--- a/tests/expected3.sar-all
+++ b/tests/expected3.sar-all
@@ -424,6 +424,15 @@ Average:          3      0.00      0.00      0.00      0.00      0.00         0
 13:20:49          3   3566.22
 Average:          3   3566.22
 
+13:20:09          BAT      %cap   cap/min    status
+13:20:19            0       100     +0.00         ↑
+13:20:19            1        83     -3.85         ?
+13:20:29            0        70    -57.62         ?
+13:20:29            1        80     -5.76         ↘
+13:20:39            0        75     +7.79         ↗
+13:20:49            0        77     +5.36         →
+Average:            0     80.50    -11.19
+
 13:20:09        BUS  idvendor    idprod  maxpower manufact                product
 13:20:29          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
 13:20:29          3      174c      55aa         0 ASMT                    ASM1153

diff --git a/tests/root1/sys/class/power_supply/BAT0/capacity b/tests/root1/sys/class/power_supply/BAT0/capacity
new file mode 100644 (file)
index 0000000..29d6383
--- /dev/null
+++ b/tests/root1/sys/class/power_supply/BAT0/capacity
@@ -0,0 +1 @@
+100

diff --git a/tests/root1/sys/class/power_supply/BAT0/status b/tests/root1/sys/class/power_supply/BAT0/status
new file mode 100644 (file)
index 0000000..f1a797a
--- /dev/null
+++ b/tests/root1/sys/class/power_supply/BAT0/status
@@ -0,0 +1 @@
+Full

diff --git a/tests/root1/sys/class/power_supply/BAT1/capacity b/tests/root1/sys/class/power_supply/BAT1/capacity
new file mode 100644 (file)
index 0000000..a862eb8
--- /dev/null
+++ b/tests/root1/sys/class/power_supply/BAT1/capacity
@@ -0,0 +1 @@
+85

diff --git a/tests/root1/sys/class/power_supply/BAT1/status b/tests/root1/sys/class/power_supply/BAT1/status
new file mode 100644 (file)
index 0000000..7acbb0e
--- /dev/null
+++ b/tests/root1/sys/class/power_supply/BAT1/status
@@ -0,0 +1 @@
+Not charging

diff --git a/tests/root1/sys/class/power_supply/_list b/tests/root1/sys/class/power_supply/_list
new file mode 100644 (file)
index 0000000..cacd3be
--- /dev/null
+++ b/tests/root1/sys/class/power_supply/_list
@@ -0,0 +1,4 @@
+.
+..
+BAT0
+BAT1

diff --git a/tests/root2/root1 b/tests/root2/root1
new file mode 120000 (symlink)
index 0000000..bc96be9
--- /dev/null
+++ b/tests/root2/root1
@@ -0,0 +1 @@
+root1
\ No newline at end of file

diff --git a/tests/root2/root2 b/tests/root2/root2
new file mode 120000 (symlink)
index 0000000..c65031a
--- /dev/null
+++ b/tests/root2/root2
@@ -0,0 +1 @@
+root2
\ No newline at end of file

diff --git a/tests/root2/sys/class/power_supply/BAT0/capacity b/tests/root2/sys/class/power_supply/BAT0/capacity
new file mode 100644 (file)
index 0000000..29d6383
--- /dev/null
+++ b/tests/root2/sys/class/power_supply/BAT0/capacity
@@ -0,0 +1 @@
+100

diff --git a/tests/root2/sys/class/power_supply/BAT0/status b/tests/root2/sys/class/power_supply/BAT0/status
new file mode 100644 (file)
index 0000000..f1a797a
--- /dev/null
+++ b/tests/root2/sys/class/power_supply/BAT0/status
@@ -0,0 +1 @@
+Full

diff --git a/tests/root2/sys/class/power_supply/BAT1/capacity b/tests/root2/sys/class/power_supply/BAT1/capacity
new file mode 100644 (file)
index 0000000..76a8b2b
--- /dev/null
+++ b/tests/root2/sys/class/power_supply/BAT1/capacity
@@ -0,0 +1 @@
+83

diff --git a/tests/root2/sys/class/power_supply/BAT1/status b/tests/root2/sys/class/power_supply/BAT1/status
new file mode 100644 (file)
index 0000000..59fd4d6
--- /dev/null
+++ b/tests/root2/sys/class/power_supply/BAT1/status
@@ -0,0 +1 @@
+Error

diff --git a/tests/root2/sys/class/power_supply/_list b/tests/root2/sys/class/power_supply/_list
new file mode 100644 (file)
index 0000000..cacd3be
--- /dev/null
+++ b/tests/root2/sys/class/power_supply/_list
@@ -0,0 +1,4 @@
+.
+..
+BAT0
+BAT1

diff --git a/tests/root3/sys/class/power_supply/BAT0/capacity b/tests/root3/sys/class/power_supply/BAT0/capacity
new file mode 100644 (file)
index 0000000..2bbd69c
--- /dev/null
+++ b/tests/root3/sys/class/power_supply/BAT0/capacity
@@ -0,0 +1 @@
+70

diff --git a/tests/root3/sys/class/power_supply/BAT0/status b/tests/root3/sys/class/power_supply/BAT0/status
new file mode 100644 (file)
index 0000000..1ee1f7b
--- /dev/null
+++ b/tests/root3/sys/class/power_supply/BAT0/status
@@ -0,0 +1 @@
+Unknown

diff --git a/tests/root3/sys/class/power_supply/BAT1/capacity b/tests/root3/sys/class/power_supply/BAT1/capacity
new file mode 100644 (file)
index 0000000..d15a2cc
--- /dev/null
+++ b/tests/root3/sys/class/power_supply/BAT1/capacity
@@ -0,0 +1 @@
+80

diff --git a/tests/root3/sys/class/power_supply/BAT1/status b/tests/root3/sys/class/power_supply/BAT1/status
new file mode 100644 (file)
index 0000000..4674475
--- /dev/null
+++ b/tests/root3/sys/class/power_supply/BAT1/status
@@ -0,0 +1 @@
+Discharging

diff --git a/tests/root3/sys/class/power_supply/_list b/tests/root3/sys/class/power_supply/_list
new file mode 100644 (file)
index 0000000..cacd3be
--- /dev/null
+++ b/tests/root3/sys/class/power_supply/_list
@@ -0,0 +1,4 @@
+.
+..
+BAT0
+BAT1

diff --git a/tests/root4/sys/class/power_supply/BAT0/capacity b/tests/root4/sys/class/power_supply/BAT0/capacity
new file mode 100644 (file)
index 0000000..78eb67c
--- /dev/null
+++ b/tests/root4/sys/class/power_supply/BAT0/capacity
@@ -0,0 +1 @@
+75

diff --git a/tests/root4/sys/class/power_supply/BAT0/status b/tests/root4/sys/class/power_supply/BAT0/status
new file mode 100644 (file)
index 0000000..a71a143
--- /dev/null
+++ b/tests/root4/sys/class/power_supply/BAT0/status
@@ -0,0 +1 @@
+Charging

diff --git a/tests/root4/sys/class/power_supply/_list b/tests/root4/sys/class/power_supply/_list
new file mode 100644 (file)
index 0000000..ddf1cf1
--- /dev/null
+++ b/tests/root4/sys/class/power_supply/_list
@@ -0,0 +1,3 @@
+.
+..
+BAT0

diff --git a/tests/root5/sys/class/power_supply/BAT0/capacity b/tests/root5/sys/class/power_supply/BAT0/capacity
new file mode 100644 (file)
index 0000000..987e7ca
--- /dev/null
+++ b/tests/root5/sys/class/power_supply/BAT0/capacity
@@ -0,0 +1 @@
+77

diff --git a/tests/root5/sys/class/power_supply/BAT0/status b/tests/root5/sys/class/power_supply/BAT0/status
new file mode 100644 (file)
index 0000000..7acbb0e
--- /dev/null
+++ b/tests/root5/sys/class/power_supply/BAT0/status
@@ -0,0 +1 @@
+Not charging

diff --git a/tests/root5/sys/class/power_supply/_list b/tests/root5/sys/class/power_supply/_list
new file mode 100644 (file)
index 0000000..ddf1cf1
--- /dev/null
+++ b/tests/root5/sys/class/power_supply/_list
@@ -0,0 +1,3 @@
+.
+..
+BAT0