add labels

diff --git a/mem.cgi b/mem.cgi
index 477fb5419b2c4e190fa1ce02c001e1b47befe4a0..260f806046a9745f01283ce7c730b9ecfe1cff5c 100755 (executable)
--- a/mem.cgi
+++ b/mem.cgi
@@ -15,9 +15,13 @@
   CDEF:a=avail,1024,*
   CDEF:u=t,a,-
   CDEF:c=a,f,-
-  AREA:u#cc3300:"Used"
-  AREA:c#ffcc33:"Cache/Buffer":STACK
-  AREA:f#6600ff:"Free":STACK>
+  VDEF:curu=u,LAST    VDEF:curc=c,LAST    VDEF:curf=f,LAST
+  VDEF:avgu=u,AVERAGE VDEF:avgc=c,AVERAGE VDEF:avgf=f,AVERAGE
+  VDEF:maxu=u,MAXIMUM VDEF:maxc=c,MAXIMUM VDEF:maxf=f,MAXIMUM
+  COMMENT:"           Current   Average   Maximum\l"
+  AREA:u#cc3300:"Used "       GPRINT:curu:"%5.0lf %SB" GPRINT:avgu:"%5.0lf %SB" GPRINT:maxu:"%5.0lf %SB\l"
+  AREA:c#ffcc33:"Cache":STACK GPRINT:curc:"%5.0lf %SB" GPRINT:avgc:"%5.0lf %SB" GPRINT:maxc:"%5.0lf %SB\l"
+  AREA:f#6600ff:"Free ":STACK GPRINT:curf:"%5.0lf %SB" GPRINT:avgf:"%5.0lf %SB" GPRINT:maxf:"%5.0lf %SB\l">
 <RRD::GRAPH ymem1h.png --title="Ynez Memory Usage, Last Hour"
   -l 0 -s -1hr -w 480 -h 240 -b 1024 -S 120s -z
   --vertical-label "Bytes"
@@ -29,9 +33,13 @@
   CDEF:a=avail,1024,*
   CDEF:u=t,a,-
   CDEF:c=a,f,-
-  AREA:u#cc3000:"Used"
-  AREA:c#ffcc33:"Cache/Buffer":STACK
-  AREA:f#6600ff:"Free":STACK>
+  VDEF:curu=u,LAST    VDEF:curc=c,LAST    VDEF:curf=f,LAST
+  VDEF:avgu=u,AVERAGE VDEF:avgc=c,AVERAGE VDEF:avgf=f,AVERAGE
+  VDEF:maxu=u,MAXIMUM VDEF:maxc=c,MAXIMUM VDEF:maxf=f,MAXIMUM
+  COMMENT:"           Current   Average   Maximum\l"
+  AREA:u#cc3000:"Used "       GPRINT:curu:"%5.0lf %SB" GPRINT:avgu:"%5.0lf %SB" GPRINT:maxu:"%5.0lf %SB\l"
+  AREA:c#ffcc33:"Cache":STACK GPRINT:curc:"%5.0lf %SB" GPRINT:avgc:"%5.0lf %SB" GPRINT:maxc:"%5.0lf %SB\l"
+  AREA:f#6600ff:"Free ":STACK GPRINT:curf:"%5.0lf %SB" GPRINT:avgf:"%5.0lf %SB" GPRINT:maxf:"%5.0lf %SB\l">
 <RRD::GRAPH smem1h.png --title="Serrano Memory Usage, Last Hour"
   -l 0 -s -1hr -w 480 -h 240 -b 1024 -S 120s -z
   --vertical-label "Bytes"
@@ -43,9 +51,13 @@
   CDEF:a=avail,1024,*
   CDEF:u=t,a,-
   CDEF:c=a,f,-
-  AREA:u#cc3000:"Used"
-  AREA:c#ffcc33:"Cache/Buffer":STACK
-  AREA:f#6600ff:"Free":STACK>
+  VDEF:curu=u,LAST    VDEF:curc=c,LAST    VDEF:curf=f,LAST
+  VDEF:avgu=u,AVERAGE VDEF:avgc=c,AVERAGE VDEF:avgf=f,AVERAGE
+  VDEF:maxu=u,MAXIMUM VDEF:maxc=c,MAXIMUM VDEF:maxf=f,MAXIMUM
+  COMMENT:"           Current   Average   Maximum\l"
+  AREA:u#cc3000:"Used "       GPRINT:curu:"%5.0lf %SB" GPRINT:avgu:"%5.0lf %SB" GPRINT:maxu:"%5.0lf %SB\l"
+  AREA:c#ffcc33:"Cache":STACK GPRINT:curc:"%5.0lf %SB" GPRINT:avgc:"%5.0lf %SB" GPRINT:maxc:"%5.0lf %SB\l"
+  AREA:f#6600ff:"Free ":STACK GPRINT:curf:"%5.0lf %SB" GPRINT:avgf:"%5.0lf %SB" GPRINT:maxf:"%5.0lf %SB\l">
 <RRD::GRAPH mem1d.png --title="Memory Usage, Last Day"
   -l 0 -r -s -1d -w 960 -h 240 -b 1024 -S 120s -z
   --vertical-label "Bytes"