From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Sat, 20 Feb 2010 06:10:11 +0000 (+0000)
Subject: Imre Gergely discovered that the rrd graphs do not support more than 200% cpu usage... 
X-Git-Tag: rec-3.2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6e4d44724e63788185298b1e7cc51377d37a915;p=pdns

Imre Gergely discovered that the rrd graphs do not support more than 200% cpu usage. In addition, the 'total cpu usage' line on the graph was wrong, but the graph overall was correct.


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

diff --git a/pdns/tools/rrd/create b/pdns/tools/rrd/create
index bf5d7f4a3..383521306 100755
--- a/pdns/tools/rrd/create
+++ b/pdns/tools/rrd/create
@@ -29,7 +29,7 @@ DS:answers100-1000:COUNTER:600:0:100000 \
 DS:answers-slow:COUNTER:600:0:100000 \
 DS:udp-overruns:COUNTER:600:0:100000 \
 DS:qa-latency:GAUGE:600:0:10000000 \
-DS:user-msec:COUNTER:600:0:2000 \
+DS:user-msec:COUNTER:600:0:64000 \
 DS:uptime:GAUGE:600:0:U \
 DS:unexpected-packets:COUNTER:600:0:1000000 \
 DS:resource-limits:COUNTER:600:0:1000000 \
@@ -38,7 +38,7 @@ DS:client-parse-errors:COUNTER:600:0:1000000 \
 DS:server-parse-errors:COUNTER:600:0:1000000 \
 DS:unauthorized-udp:COUNTER:600:0:1000000 \
 DS:unauthorized-tcp:COUNTER:600:0:1000000 \
-DS:sys-msec:COUNTER:600:0:2000 \
+DS:sys-msec:COUNTER:600:0:6400 \
 	RRA:AVERAGE:0.5:1:9600  \
 	RRA:AVERAGE:0.5:4:9600 	\
 	RRA:AVERAGE:0.5:24:6000	\
diff --git a/pdns/tools/rrd/makegraphs b/pdns/tools/rrd/makegraphs
index 1d31548c8..27f0a87fb 100755
--- a/pdns/tools/rrd/makegraphs
+++ b/pdns/tools/rrd/makegraphs
@@ -159,7 +159,7 @@ function makeGraphs()
 	DEF:msysmsec=pdns_recursor.rrd:sys-msec:MAX \
 	CDEF:userperc=usermsec,10,/ \
 	CDEF:sysperc=sysmsec,10,/ \
-	CDEF:totmperc=musermsec,msysmsec,+,10,/ \
+	CDEF:totmperc=usermsec,sysmsec,+,10,/ \
         LINE1:totmperc#ffff00:"max cpu use" \
         AREA:userperc#ff0000:"user cpu percentage" \
         STACK:sysperc#00ff00:"system cpu percentage" \