]> git.ais-ucla.org Git - stats.ais-ucla.org.git/commitdiff
update cpu1hr graph
authorChristopher Milan <chrismilan@ucla.edu>
Sat, 15 Feb 2025 19:28:39 +0000 (11:28 -0800)
committerChristopher Milan <chrismilan@ucla.edu>
Sat, 15 Feb 2025 20:01:50 +0000 (12:01 -0800)
cpu.cgi

diff --git a/cpu.cgi b/cpu.cgi
index 236f44d6dbbe87ea0ab1263062af97bc357dbc16..ba7d89305484d12ffd19c02f228f80b4029f6a9a 100755 (executable)
--- a/cpu.cgi
+++ b/cpu.cgi
@@ -4,30 +4,69 @@
 <head><title>Cluster CPU Report</title></head>
 <body style="background-image: url('/bg.gif')">
 <h1>Cluster CPU Report</h1>
-<RRD::GRAPH cpu1h.png --title="CPU Usage, Last Hour"
-            -u 100 -l 0 -r -s -1hr -w 480 -h 240
-            DEF:tuser=/srv/stats/temescal/cpu.rrd:user:AVERAGE
-            DEF:tsystem=/srv/stats/temescal/cpu.rrd:system:AVERAGE
-            CDEF:t=tuser,tsystem,+,32,/
-            DEF:yuser=/srv/stats/ynez/cpu.rrd:user:AVERAGE
-            DEF:ysystem=/srv/stats/ynez/cpu.rrd:system:AVERAGE
-            CDEF:y=yuser,ysystem,+,64,/
-            DEF:suser=/srv/stats/serrano/cpu.rrd:user:AVERAGE
-            DEF:ssystem=/srv/stats/serrano/cpu.rrd:system:AVERAGE
-            CDEF:s=suser,ssystem,+,48,/
-            LINE2:t#a00000:"Temescal" LINE2:y#00a000:"Ynez" LINE2:s#0000a0:"Serrano">
-<RRD::GRAPH cpu1d.png --title="CPU Usage, Last Day"
-            -u 100 -l 0 -r -s -1d -w 960 -h 240
-            DEF:tuser=/srv/stats/temescal/cpu.rrd:user:AVERAGE
-            DEF:tsystem=/srv/stats/temescal/cpu.rrd:system:AVERAGE
-            CDEF:t=tuser,tsystem,+,32,/
-            DEF:yuser=/srv/stats/ynez/cpu.rrd:user:AVERAGE
-            DEF:ysystem=/srv/stats/ynez/cpu.rrd:system:AVERAGE
-            CDEF:y=yuser,ysystem,+,64,/
-            DEF:suser=/srv/stats/serrano/cpu.rrd:user:AVERAGE
-            DEF:ssystem=/srv/stats/serrano/cpu.rrd:system:AVERAGE
-            CDEF:s=suser,ssystem,+,48,/
-            LINE2:t#a00000:"Temescal" LINE2:y#00a000:"Ynez" LINE2:s#0000a0:"Serrano">
+<RRD::GRAPH cpu1h.png --title="CPU Utilization, Last Hour"
+  -s -1hr -w 480 -h 240 -S 120s
+  --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
+  CDEF:t=tu,ts,+
+  DEF:yu=/srv/stats/ynez/cpu.rrd:user:AVERAGE
+  DEF:ys=/srv/stats/ynez/cpu.rrd:system:AVERAGE
+  CDEF:y=yu,ys,+
+  DEF:su=/srv/stats/serrano/cpu.rrd:user:AVERAGE
+  DEF:ss=/srv/stats/serrano/cpu.rrd:system:AVERAGE
+  CDEF:s=su,ss,+
+  VDEF:curt=t,LAST VDEF:cury=y,LAST VDEF:curs=s,LAST
+  VDEF:curtu=tu,LAST VDEF:curyu=yu,LAST VDEF:cursu=su,LAST
+  VDEF:curts=ts,LAST VDEF:curys=ys,LAST VDEF:curss=ss,LAST
+  VDEF:avgt=t,AVERAGE VDEF:avgy=y,AVERAGE VDEF:avgs=s,AVERAGE
+  VDEF:avgtu=tu,AVERAGE VDEF:avgyu=yu,AVERAGE VDEF:avgsu=su,AVERAGE
+  VDEF:avgts=ts,AVERAGE VDEF:avgys=ys,AVERAGE VDEF:avgss=ss,AVERAGE
+  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">
+<br />
+<RRD::GRAPH cpu1wk.png --title="CPU Utilization, Last Week"
+  -s -1wk -w 1200 -h 240 -S 120s
+  --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
+  CDEF:t=tu,ts,+
+  DEF:yu=/srv/stats/ynez/cpu.rrd:user:AVERAGE
+  DEF:ys=/srv/stats/ynez/cpu.rrd:system:AVERAGE
+  CDEF:y=yu,ys,+
+  DEF:su=/srv/stats/serrano/cpu.rrd:user:AVERAGE
+  DEF:ss=/srv/stats/serrano/cpu.rrd:system:AVERAGE
+  CDEF:s=su,ss,+
+  VDEF:curt=t,LAST VDEF:cury=y,LAST VDEF:curs=s,LAST
+  VDEF:curtu=tu,LAST VDEF:curyu=yu,LAST VDEF:cursu=su,LAST
+  VDEF:curts=ts,LAST VDEF:curys=ys,LAST VDEF:curss=ss,LAST
+  VDEF:avgt=t,AVERAGE VDEF:avgy=y,AVERAGE VDEF:avgs=s,AVERAGE
+  VDEF:avgtu=tu,AVERAGE VDEF:avgyu=yu,AVERAGE VDEF:avgsu=su,AVERAGE
+  VDEF:avgts=ts,AVERAGE VDEF:avgys=ys,AVERAGE VDEF:avgss=ss,AVERAGE
+  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">
 <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>