From 9152869466e7ae25114b38040f90ecbf5d91fe89 Mon Sep 17 00:00:00 2001 From: Paul Wise Date: Sun, 20 Feb 2011 15:57:20 +0800 Subject: [PATCH] Improve the label text and formatting of the labels for the queue graphs. Rename the queue graph labels to ones shorter and of equal length. Don't attempt to merge the numbers into the label, use cur instead. Also use labels that are more indicative of their meaning. Don't force the numbers to 3 digits in length. Turn Min/Max/Avg in the labels to lower case. --- dak/graph.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dak/graph.py b/dak/graph.py index 6691f929..b900b3ea 100755 --- a/dak/graph.py +++ b/dak/graph.py @@ -74,26 +74,26 @@ packages rrd_args += (""" DEF:ds1=%s:ds1:AVERAGE -LINE2:ds1#D9382B:Total package count: +LINE2:ds1#D9382B:changes count VDEF:lds1=ds1,LAST VDEF:minds1=ds1,MINIMUM VDEF:maxds1=ds1,MAXIMUM VDEF:avgds1=ds1,AVERAGE -GPRINT:lds1:%%3.0lf -GPRINT:minds1:\tMin\\: %%3.0lf -GPRINT:maxds1:\tMax\\: %%3.0lf -GPRINT:avgds1:\tAvg\\: %%3.0lf\\j +GPRINT:lds1:cur\\: %%.0lf +GPRINT:minds1:min\\: %%.0lf +GPRINT:maxds1:max\\: %%.0lf +GPRINT:avgds1:avg\\: %%.0lf\\j DEF:ds0=%s:ds0:AVERAGE VDEF:lds0=ds0,LAST VDEF:minds0=ds0,MINIMUM VDEF:maxds0=ds0,MAXIMUM VDEF:avgds0=ds0,AVERAGE -LINE2:ds0#3069DA:Package count in %s: -GPRINT:lds0:%%3.0lf -GPRINT:minds0:\tMin\\: %%3.0lf -GPRINT:maxds0:\tMax\\: %%3.0lf -GPRINT:avgds0:\tAvg\\: %%3.0lf\\j -""" % (rrd_file, rrd_file, name.upper())).strip().split("\n") +LINE2:ds0#3069DA:src pkg count +GPRINT:lds0:cur\\: %%.0lf +GPRINT:minds0:min\\: %%.0lf +GPRINT:maxds0:max\\: %%.0lf +GPRINT:avgds0:avg\\: %%.0lf\\j +""" % (rrd_file, rrd_file)).strip().split("\n") rrd_args += extra_args try: -- 2.39.5