more labels

diff --git a/mem.cgi b/mem.cgi
index 260f806046a9745f01283ce7c730b9ecfe1cff5c..699b03ffcab4eaf053ad1292926f09c59c6f9b41 100755 (executable)
--- a/mem.cgi
+++ b/mem.cgi
@@ -85,15 +85,19 @@
   CDEF:sa=savail,1024,*
   CDEF:su=st,sa,-
   CDEF:sc=sa,sf,-
-  AREA:tu#FF009940:"Temescal MemTotal"
-  AREA:tc#FF006640:"Temescal MemFree":STACK
-  AREA:tf#FF003340:"Temescal MemAvail":STACK
-  AREA:yu#66CC9940:"Ynez MemTotal"
-  AREA:yc#66CC6640:"Ynez MemFree":STACK
-  AREA:yf#66CC3340:"Ynez MemAvail":STACK
-  AREA:su#6600FF40:"Serrano MemTotal"
-  AREA:sc#6600CC40:"Serrano MemFree":STACK
-  AREA:sf#66009940:"Serrano MemAvail":STACK>
+  VDEF:curtu=tu,LAST    VDEF:curtc=tc,LAST    VDEF:curtf=tf,LAST    VDEF:curyu=yu,LAST    VDEF:curyc=yc,LAST    VDEF:curyf=yf,LAST    VDEF:cursu=su,LAST    VDEF:cursc=sc,LAST    VDEF:cursf=sf,LAST
+  VDEF:avgtu=tu,AVERAGE VDEF:avgtc=tc,AVERAGE VDEF:avgtf=tf,AVERAGE VDEF:avgyu=yu,AVERAGE VDEF:avgyc=yc,AVERAGE VDEF:avgyf=yf,AVERAGE VDEF:avgsu=su,AVERAGE VDEF:avgsc=sc,AVERAGE VDEF:avgsf=sf,AVERAGE
+  VDEF:maxtu=tu,MAXIMUM VDEF:maxtc=tc,MAXIMUM VDEF:maxtf=tf,MAXIMUM VDEF:maxyu=yu,MAXIMUM VDEF:maxyc=yc,MAXIMUM VDEF:maxyf=yf,MAXIMUM VDEF:maxsu=su,MAXIMUM VDEF:maxsc=sc,MAXIMUM VDEF:maxsf=sf,MAXIMUM
+  COMMENT:"                     Current   Average   Maximum                     Current   Average   Maximum                     Current   Average   Maximum\l"
+  AREA:tu#FF009940:"TEMESCAL Used "       GPRINT:curtu:"%5.0lf %SB" GPRINT:avgtu:"%5.0lf %SB" GPRINT:maxtu:"%5.0lf %SB"
+  AREA:tc#FF006640:"TEMESCAL Cache":STACK GPRINT:curtc:"%5.0lf %SB" GPRINT:avgtc:"%5.0lf %SB" GPRINT:maxtc:"%5.0lf %SB"
+  AREA:tf#FF003340:"TEMESCAL Free ":STACK GPRINT:curtf:"%5.0lf %SB" GPRINT:avgtf:"%5.0lf %SB" GPRINT:maxtf:"%5.0lf %SB\l"
+  AREA:yu#66CC9940:"YNEZ Used     "       GPRINT:curyu:"%5.0lf %SB" GPRINT:avgyu:"%5.0lf %SB" GPRINT:maxyu:"%5.0lf %SB"
+  AREA:yc#66CC6640:"YNEZ Cache    ":STACK GPRINT:curyc:"%5.0lf %SB" GPRINT:avgyc:"%5.0lf %SB" GPRINT:maxyc:"%5.0lf %SB"
+  AREA:yf#66CC3340:"YNEZ Free     ":STACK GPRINT:curyf:"%5.0lf %SB" GPRINT:avgyf:"%5.0lf %SB" GPRINT:maxyf:"%5.0lf %SB\l"
+  AREA:su#6600FF40:"SERRANO Used  "       GPRINT:cursu:"%5.0lf %SB" GPRINT:avgsu:"%5.0lf %SB" GPRINT:maxsu:"%5.0lf %SB"
+  AREA:sc#6600CC40:"SERRANO Cache ":STACK GPRINT:cursc:"%5.0lf %SB" GPRINT:avgsc:"%5.0lf %SB" GPRINT:maxsc:"%5.0lf %SB"
+  AREA:sf#66009940:"SERRANO Free  ":STACK GPRINT:cursf:"%5.0lf %SB" GPRINT:avgsf:"%5.0lf %SB" GPRINT:maxsf:"%5.0lf %SB\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>