[checkmk-commits] Check_MK Git: check_mk: if/if64 and friends: add 95% percentiles to graphs

Module: check_mk Branch: master Commit: 301c899d6e42d34ef84e43cbc16a23c1580b1fb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=301c899d6e42d3… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Mon Oct 7 19:13:05 2013 +0200 if/if64 and friends: add 95% percentiles to graphs --- ChangeLog | 1 + pnp-templates/check_mk-if.php | 73 ++++++++++++++++++++++++++++------------- 2 files changed, 51 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca7b650..381be12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * FIX: host notification email in html format: fixed formating error (typo in tag) * agent_vsphere: now able to handle < > & ' " in login credentials + * if/if64 and friends: add 95% percentiles to graphs Multisite: * FIX: add missing service icons to view "All Services with this descr..." diff --git a/pnp-templates/check_mk-if.php b/pnp-templates/check_mk-if.php index 3a224cb..17a359e 100644 --- a/pnp-templates/check_mk-if.php +++ b/pnp-templates/check_mk-if.php @@ -103,21 +103,36 @@ $def[1] = $def[1] .= "HRULE:$mCritH#ff0000:\"Critical\: " . sprintf("%6.1f", $crit) . " ".$bwuom."$unit/s\\n\" ". "HRULE:-$mCritH#ff0000: "; - $def[1] .= "DEF:inbytes=$RRDFILE[1]:$DS[1]:MAX ". - "DEF:outbytes=$RRDFILE[6]:$DS[6]:MAX ". + $def[1] .= "". + # incoming + "DEF:inbytes=$RRDFILE[1]:$DS[1]:MAX ". "CDEF:intraffic=inbytes,$unit_multiplier,* ". - "CDEF:outtraffic=outbytes,$unit_multiplier,* ". "CDEF:inmb=intraffic,1048576,/ ". + "AREA:inmb#00e060:\"in \" ". + "GPRINT:intraffic:LAST:\"%7.1lf %s$unit/s last\" ". + "GPRINT:intraffic:AVERAGE:\"%7.1lf %s$unit/s avg\" ". + "GPRINT:intraffic:MAX:\"%7.1lf %s$unit/s max\\n\" ". + "VDEF:inperc=intraffic,95,PERCENTNAN ". + "VDEF:inpercmb=inmb,95,PERCENTNAN ". + "LINE:inpercmb#008f00:\"95% percentile\" ". + "GPRINT:inperc:\"%7.1lf %s$unit/s\\n\" ". + + # outgoing + "DEF:outbytes=$RRDFILE[6]:$DS[6]:MAX ". + "CDEF:outtraffic=outbytes,$unit_multiplier,* ". + "CDEF:minusouttraffic=outtraffic,-1,* ". "CDEF:outmb=outtraffic,1048576,/ ". "CDEF:minusoutmb=0,outmb,- ". - "AREA:inmb#00e060:\"in \" ". - "GPRINT:intraffic:LAST:\"%6.1lf %s$unit/s last\" ". - "GPRINT:intraffic:AVERAGE:\"%6.1lf %s$unit/s avg\" ". - "GPRINT:intraffic:MAX:\"%6.1lf %s$unit/s max\\n\" ". - "AREA:minusoutmb#0080e0:\"out \" ". - "GPRINT:outtraffic:LAST:\"%6.1lf %s$unit/s last\" ". - "GPRINT:outtraffic:AVERAGE:\"%6.1lf %s$unit/s avg\" ". - "GPRINT:outtraffic:MAX:\"%6.1lf %s$unit/s max\\n\" "; + "AREA:minusoutmb#0080e0:\"out \" ". + "GPRINT:outtraffic:LAST:\"%7.1lf %s$unit/s last\" ". + "GPRINT:outtraffic:AVERAGE:\"%7.1lf %s$unit/s avg\" ". + "GPRINT:outtraffic:MAX:\"%7.1lf %s$unit/s max\\n\" ". + "VDEF:outperc=minusouttraffic,5,PERCENTNAN ". + "VDEF:outpercmb=minusoutmb,5,PERCENTNAN ". + "LINE:outpercmb#00008f:\"95% percentile\" ". + "GPRINT:outperc:\"%7.1lf %s$unit/s\\n\" ". + + ""; if (isset($DS[12])) { $def[1] .= @@ -142,29 +157,41 @@ if (isset($DS[12])) { $ds_name[2] = 'Packets'; $opt[2] = "--vertical-label \"packets/sec\" --title \"Packets $hostname / $servicedesc\" "; $def[2] = + # ingoing "HRULE:0#c0c0c0 ". "DEF:inu=$RRDFILE[2]:$DS[2]:MAX ". "DEF:innu=$RRDFILE[3]:$DS[3]:MAX ". + "CDEF:in=inu,innu,+ ". "AREA:inu#00ffc0:\"in unicast \" ". - "GPRINT:inu:LAST:\"%7.2lf/s last \" ". - "GPRINT:inu:AVERAGE:\"%7.2lf/s avg \" ". - "GPRINT:inu:MAX:\"%7.2lf/s max\\n\" ". + "GPRINT:inu:LAST:\"%8.2lf/s last \" ". + "GPRINT:inu:AVERAGE:\"%8.2lf/s avg \" ". + "GPRINT:inu:MAX:\"%8.2lf/s max\\n\" ". "AREA:innu#00c080:\"in broadcast/multicast \":STACK ". - "GPRINT:innu:LAST:\"%7.2lf/s last \" ". - "GPRINT:innu:AVERAGE:\"%7.2lf/s avg \" ". - "GPRINT:innu:MAX:\"%7.2lf/s max\\n\" ". + "GPRINT:innu:LAST:\"%8.2lf/s last \" ". + "GPRINT:innu:AVERAGE:\"%8.2lf/s avg \" ". + "GPRINT:innu:MAX:\"%8.2lf/s max\\n\" ". + "VDEF:inperc=in,95,PERCENTNAN ". + "LINE:inperc#00cf00:\"95% percentile incoming \" ". + "GPRINT:inperc:\"%8.2lf/s\\n\" ". + + # outgoing "DEF:outu=$RRDFILE[7]:$DS[7]:MAX ". "DEF:outnu=$RRDFILE[8]:$DS[8]:MAX ". "CDEF:minusoutu=0,outu,- ". "CDEF:minusoutnu=0,outnu,- ". + "CDEF:minusout=minusoutu,minusoutnu,+ ". "AREA:minusoutu#00c0ff:\"out unicast \" ". - "GPRINT:outu:LAST:\"%7.2lf/s last \" ". - "GPRINT:outu:AVERAGE:\"%7.2lf/s avg \" ". - "GPRINT:outu:MAX:\"%7.2lf/s max\\n\" ". + "GPRINT:outu:LAST:\"%8.2lf/s last \" ". + "GPRINT:outu:AVERAGE:\"%8.2lf/s avg \" ". + "GPRINT:outu:MAX:\"%8.2lf/s max\\n\" ". "AREA:minusoutnu#0080c0:\"out broadcast/multicast \":STACK ". - "GPRINT:outnu:LAST:\"%7.2lf/s last \" ". - "GPRINT:outnu:AVERAGE:\"%7.2lf/s avg \" ". - "GPRINT:outnu:MAX:\"%7.2lf/s max\\n\" "; + "GPRINT:outnu:LAST:\"%8.2lf/s last \" ". + "GPRINT:outnu:AVERAGE:\"%8.2lf/s avg \" ". + "GPRINT:outnu:MAX:\"%8.2lf/s max\\n\" ". + "VDEF:outperc=minusout,5,PERCENTNAN ". + "LINE:outperc#0000cf:\"95% percentile outgoing\" ". + "GPRINT:outperc:\"%8.2lf/s\\n\" ". + ""; # Graph 3: errors and discards $ds_name[3] = 'Errors and discards';