update cpu1wk legend

diff --git a/cpu.cgi b/cpu.cgi
index d2208e7fddce85f9568fe980d8e9a8773521405a..efd1b1dec693e9b7a14baaef70ed780bfc39691d 100755 (executable)
--- a/cpu.cgi
+++ b/cpu.cgi
@@ -37,7 +37,7 @@
          COMMENT:"  SERRANO   (tot)"       GPRINT:curs:"%7.2lf %%"  GPRINT:avgs:"%7.2lf %%"  GPRINT:maxs:"%7.2lf %%\l">
 <br />
 <RRD::GRAPH cpu1wk.png --title="CPU Utilization, Last Week"
-  -s -1wk -w 1200 -h 240 -S 120s -z
+  -s -1wk -w 1040 -h 240 -S 120s -z
   --vertical-label "Average (system + user) percent per core"
   DEF:tu=/srv/stats/temescal/cpu.rrd:user:AVERAGE
   DEF:ts=/srv/stats/temescal/cpu.rrd:system:AVERAGE
@@ -57,16 +57,16 @@
   VDEF:maxt=t,MAXIMUM VDEF:maxy=y,MAXIMUM VDEF:maxs=s,MAXIMUM
   VDEF:maxtu=tu,MAXIMUM VDEF:maxyu=yu,MAXIMUM VDEF:maxsu=su,MAXIMUM
   VDEF:maxts=ts,MAXIMUM VDEF:maxys=ys,MAXIMUM VDEF:maxss=ss,MAXIMUM
-  COMMENT:"                    Current    Average    Maximum\l"
-  AREA:ts#a0404040:"TEMESCAL  (sys)"       GPRINT:curts:"%7.2lf %%" GPRINT:avgts:"%7.2lf %%" GPRINT:maxts:"%7.2lf %%\l"
-  AREA:tu#c0404080:"TEMESCAL (user)":STACK GPRINT:curtu:"%7.2lf %%" GPRINT:avgtu:"%7.2lf %%" GPRINT:maxtu:"%7.2lf %%\l"
-         COMMENT:"  TEMESCAL  (tot)"       GPRINT:curt:"%7.2lf %%"  GPRINT:avgt:"%7.2lf %%"  GPRINT:maxt:"%7.2lf %%\l"
-  AREA:ys#40a04040:"YNEZ      (sys)"       GPRINT:curys:"%7.2lf %%" GPRINT:avgys:"%7.2lf %%" GPRINT:maxys:"%7.2lf %%\l"
-  AREA:yu#40c04080:"YNEZ     (user)":STACK GPRINT:curyu:"%7.2lf %%" GPRINT:avgyu:"%7.2lf %%" GPRINT:maxyu:"%7.2lf %%\l"
-         COMMENT:"  YNEZ      (tot)"       GPRINT:cury:"%7.2lf %%"  GPRINT:avgy:"%7.2lf %%"  GPRINT:maxy:"%7.2lf %%\l"
-  AREA:ss#4040a040:"SERRANO   (sys)"       GPRINT:curss:"%7.2lf %%" GPRINT:avgss:"%7.2lf %%" GPRINT:maxss:"%7.2lf %%\l"
-  AREA:ss#4040c080:"SERRANO  (user)":STACK GPRINT:cursu:"%7.2lf %%" GPRINT:avgsu:"%7.2lf %%" GPRINT:maxsu:"%7.2lf %%\l"
-         COMMENT:"  SERRANO   (tot)"       GPRINT:curs:"%7.2lf %%"  GPRINT:avgs:"%7.2lf %%"  GPRINT:maxs:"%7.2lf %%\l">
+  COMMENT:"                    Current    Average    Maximum                        Current    Average    Maximum                        Current    Average    Maximum\l"
+  AREA:ts#a0404040:"TEMESCAL  (sys)" GPRINT:curts:"%7.2lf %%" GPRINT:avgts:"%7.2lf %%" GPRINT:maxts:"%7.2lf %%"
+  AREA:ys#40a04040:"YNEZ      (sys)" GPRINT:curys:"%7.2lf %%" GPRINT:avgys:"%7.2lf %%" GPRINT:maxys:"%7.2lf %%"
+  AREA:ss#4040a040:"SERRANO   (sys)" GPRINT:curss:"%7.2lf %%" GPRINT:avgss:"%7.2lf %%" GPRINT:maxss:"%7.2lf %%\l"
+  AREA:ts AREA:tu#c0404080:"TEMESCAL (user)":STACK GPRINT:curtu:"%7.2lf %%" GPRINT:avgtu:"%7.2lf %%" GPRINT:maxtu:"%7.2lf %%"
+  AREA:ys AREA:yu#40c04080:"YNEZ     (user)":STACK GPRINT:curyu:"%7.2lf %%" GPRINT:avgyu:"%7.2lf %%" GPRINT:maxyu:"%7.2lf %%"
+  AREA:ss AREA:ss#4040c080:"SERRANO  (user)":STACK GPRINT:cursu:"%7.2lf %%" GPRINT:avgsu:"%7.2lf %%" GPRINT:maxsu:"%7.2lf %%\l"
+  COMMENT:"  TEMESCAL  (tot)" GPRINT:curt:"%7.2lf %%" GPRINT:avgt:"%7.2lf %%" GPRINT:maxt:"%7.2lf %%"
+  COMMENT:"  YNEZ      (tot)" GPRINT:cury:"%7.2lf %%" GPRINT:avgy:"%7.2lf %%" GPRINT:maxy:"%7.2lf %%"
+  COMMENT:"  SERRANO   (tot)" GPRINT:curs:"%7.2lf %%" GPRINT:avgs:"%7.2lf %%" GPRINT:maxs:"%7.2lf %%\l">
 <footer style="text-align:center">
 <hr />
 <a href="https://acme.com/software/thttpd/"><img src="/badges/thttpd.gif" alt="powered by thttpd" height="31" width="88"></a>