Add some magic to collecty that makes the graph templates smaller

[collecty.git] / src / collecty / plugins / loadavg.py

diff --git a/src/collecty/plugins/loadavg.py b/src/collecty/plugins/loadavg.py
index 4125c8e796981f03e14cefb08ed79e7e2ce7b48d..8ac398ad9bcdd0e3900412d1a8f71b079c753a77 100644 (file)
--- a/src/collecty/plugins/loadavg.py
+++ b/src/collecty/plugins/loadavg.py
@@ -33,33 +33,20 @@ class GraphTemplateLoadAvg(base.GraphTemplate):
                _ = self.locale.translate
 
                return [
-                       "DEF:load1=%(file)s:load1:AVERAGE",
-                       "DEF:load5=%(file)s:load5:AVERAGE",
-                       "DEF:load15=%(file)s:load15:AVERAGE",
-
                        "AREA:load1#ff0000:%s" % _("Load average  1m"),
-                       "VDEF:load1min=load1,MINIMUM",
-                       "VDEF:load1max=load1,MAXIMUM",
-                       "VDEF:load1avg=load1,AVERAGE",
-                       "GPRINT:load1max:%12s\:" % _("Maximum") + " %6.2lf",
-                       "GPRINT:load1min:%12s\:" % _("Minimum") + " %6.2lf",
-                       "GPRINT:load1avg:%12s\:" % _("Average") + " %6.2lf\\n",
+                       "GPRINT:load1_max:%12s\:" % _("Maximum") + " %6.2lf",
+                       "GPRINT:load1_min:%12s\:" % _("Minimum") + " %6.2lf",
+                       "GPRINT:load1_avg:%12s\:" % _("Average") + " %6.2lf\\n",
 
                        "AREA:load5#ff9900:%s" % _("Load average  5m"),
-                       "VDEF:load5min=load5,MINIMUM",
-                       "VDEF:load5max=load5,MAXIMUM",
-                       "VDEF:load5avg=load5,AVERAGE",
-                       "GPRINT:load5max:%12s\:" % _("Maximum") + " %6.2lf",
-                       "GPRINT:load5min:%12s\:" % _("Minimum") + " %6.2lf",
-                       "GPRINT:load5avg:%12s\:" % _("Average") + " %6.2lf\\n",
+                       "GPRINT:load5_max:%12s\:" % _("Maximum") + " %6.2lf",
+                       "GPRINT:load5_min:%12s\:" % _("Minimum") + " %6.2lf",
+                       "GPRINT:load5_avg:%12s\:" % _("Average") + " %6.2lf\\n",
 
                        "AREA:load15#ffff00:%s" % _("Load average 15m"),
-                       "VDEF:load15min=load15,MINIMUM",
-                       "VDEF:load15max=load15,MAXIMUM",
-                       "VDEF:load15avg=load15,AVERAGE",
-                       "GPRINT:load15max:%12s\:" % _("Maximum") + " %6.2lf",
-                       "GPRINT:load15min:%12s\:" % _("Minimum") + " %6.2lf",
-                       "GPRINT:load15avg:%12s\:" % _("Average") + " %6.2lf\\n",
+                       "GPRINT:load15_max:%12s\:" % _("Maximum") + " %6.2lf",
+                       "GPRINT:load15_min:%12s\:" % _("Minimum") + " %6.2lf",
+                       "GPRINT:load15_avg:%12s\:" % _("Average") + " %6.2lf\\n",
 
                        "LINE:load5#dd8800",
                        "LINE:load1#dd0000",