add peak cpu use line

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@663 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/tools/rrd/create b/pdns/tools/rrd/create
index f4fa5ad916bf4b665a52c5634a92f974ae122499..4af7bac8a28421efdf4ec43f28536957cdace6a6 100755 (executable)
--- a/pdns/tools/rrd/create
+++ b/pdns/tools/rrd/create
@@ -30,3 +30,6 @@ DS:sys-msec:COUNTER:600:0:2000 \
        RRA:AVERAGE:0.5:1:9600  \
        RRA:AVERAGE:0.5:4:9600  \
        RRA:AVERAGE:0.5:24:6000 \
+       RRA:MAX:0.5:1:9600  \
+       RRA:MAX:0.5:4:9600      \
+       RRA:MAX:0.5:24:6000     

diff --git a/pdns/tools/rrd/makegraphs b/pdns/tools/rrd/makegraphs
index 3652b175ecbfc32cd83b37a3088d9601f6f18c2a..59fa4477f094e1abf010510958080e27fb61ae52 100755 (executable)
--- a/pdns/tools/rrd/makegraphs
+++ b/pdns/tools/rrd/makegraphs
@@ -102,10 +102,14 @@ function makeGraphs()
        DEF:cachemisses=pdns_recursor.rrd:cache-misses:AVERAGE  \
        DEF:usermsec=pdns_recursor.rrd:user-msec:AVERAGE \
        DEF:sysmsec=pdns_recursor.rrd:sys-msec:AVERAGE \
-       CDEF:perc=cachehits,100,*,cachehits,cachemisses,+,/    \
+       DEF:musermsec=pdns_recursor.rrd:user-msec:MAX \
+       DEF:msysmsec=pdns_recursor.rrd:sys-msec:MAX \
+       CDEF:perc=cachehits,100,*,cachehits,cachemisses,+,/ \
        CDEF:userperc=usermsec,10,/ \
        CDEF:sysperc=sysmsec,10,/ \
+       CDEF:totmperc=musermsec,msysmsec,+,10,/ \
         LINE2:perc#0000ff:"percentage cache hits"  \
+        LINE2:totmperc#ffff00:"max cpu use" \
         AREA:userperc#ff0000:"user cpu percentage" \
         STACK:sysperc#00ff00:"system cpu percentage" \
         COMMENT:"\l" \