Checkmk git commits February 2011

checkmk-commits@lists.checkmk.com

3 participants
186 discussions

Check_MK Git: check_mk: fix PNP template for if/if64

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: be79fd33dd0459334cb3625e762b2cb05df86c96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be79fd33dd0459… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 2 14:06:38 2011 +0100 fix PNP template for if/if64 --- ChangeLog | 5 ++ pnp-templates/check_mk-if.php | 145 ++++++++++++++++++++++------------------- 2 files changed, 83 insertions(+), 67 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a6b5ec..be45558 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,11 @@ * Fixed clustering of SNMP hosts * Fix status output of Check_MK check in mixed cluster setups + Checks & Agents: + * PNP templates for if/if64: fix bugs: outgoing packets had been + same as incoming, errors and discards were swapped (thanks to + Paul Freeman) + 1.1.9i6: INCOMPATIBLE CHANGES: * Removed out-dated checks blade_misc, ironport_misc and snia_sml. Replaced diff --git a/pnp-templates/check_mk-if.php b/pnp-templates/check_mk-if.php index 3bff161..fd82ebe 100644 --- a/pnp-templates/check_mk-if.php +++ b/pnp-templates/check_mk-if.php @@ -41,10 +41,12 @@ $bitBandwidth = $MAX[1] * 8; $warn = $WARN[1]; $crit = $CRIT[1]; +$megabyte = 1024.0 * 1024.0; + $bandwidth = $bitBandwidth; -$mByteBandwidth = $MAX[1] / 1000 / 1000; -$mByteWarn = $WARN[1] / 1000 / 1000; -$mByteCrit = $CRIT[1] / 1000 / 1000; +$mByteBandwidth = $MAX[1] / $megabyte; +$mByteWarn = $WARN[1] / $megabyte; +$mByteCrit = $CRIT[1] / $megabyte; $bwuom = ' '; $base = 1000; @@ -53,41 +55,50 @@ if($bandwidth > $base * $base * $base) { $crit /= $base * $base * $base; $bandwidth /= $base * $base * $base; $bwuom = 'G'; -} elseif($bandwidth > $base * $base) { +} elseif ($bandwidth > $base * $base) { $warn /= $base * $base; $crit /= $base * $base; $bandwidth /= $base * $base; $bwuom = 'M'; -} elseif($bandwidth > $base) { +} elseif ($bandwidth > $base) { $warn /= $base; $crit /= $base; $bandwidth /= $base; $bwuom = 'K'; } +if ($mByteBandwidth < 10) + $range = $mByteBandwidth; +else + $range = 10.0; + + $ds_name[1] = 'Used bandwidth'; -$opt[1] = "--vertical-label \"MByte/sec\" -X0 -b 1024 --title \"Used bandwidth $hostname / $servicedesc\" "; +$opt[1] = "--vertical-label \"MByte/sec\" -l -$range -u $range -X0 -b 1024 --title \"Used bandwidth $hostname / $servicedesc at $bandwidth${bwuom}Bit/s;\" "; $def[1] = "HRULE:0#c0c0c0 ". - "LINE:$mByteBandwidth#808080:\"Port speed\: " . sprintf("%.1f", $bandwidth) . " ".$bwuom."Bit/s \" ". - "LINE:$mByteWarn#ffff00:\"Warning\: " . sprintf("%.1f", $warn) . " ".$bwuom."Byte/s \" ". - "LINE:$mByteCrit#ff0000:\"Critical\: " . sprintf("%.1f", $crit) . " ".$bwuom."Byte/s\\n\" ". - "LINE:-$mByteWarn#ffff00: ". - "LINE:-$mByteCrit#ff0000: ". - "LINE:-$mByteBandwidth#808080: ". - "DEF:inbytes=$RRDFILE[1]:$DS[1]:MAX ". + "HRULE:$mByteBandwidth#808080:\"Port speed\: " . sprintf("%.1f", $bandwidth) . " ".$bwuom."Bit/s\\n\" ". + "HRULE:-$mByteBandwidth#808080: "; + if ($warn) + $def[1] .= "HRULE:$mByteWarn#ffff00:\"Warning\: " . sprintf("%6.1f", $warn) . " ".$bwuom."B/s\\n\" ". + "HRULE:-$mByteWarn#ffff00: "; + if ($crit) + $def[1] .= "HRULE:$mByteCrit#ff0000:\"Critical\: " . sprintf("%6.1f", $crit) . " ".$bwuom."B/s\\n\" ". + "HRULE:-$mByteCrit#ff0000: "; + + $def[1] .= "DEF:inbytes=$RRDFILE[1]:$DS[1]:MAX ". "DEF:outbytes=$RRDFILE[6]:$DS[6]:MAX ". "CDEF:inmb=inbytes,1048576,/ ". "CDEF:outmb=outbytes,1048576,/ ". "CDEF:minusoutmb=0,outmb,- ". - "AREA:inmb#00e060:\"in \" ". - "GPRINT:inbytes:LAST:\"%5.1lf %sB/s last\" ". - "GPRINT:inbytes:AVERAGE:\"%5.1lf %sB/s avg\" ". - "GPRINT:inbytes:MAX:\"%5.1lf %sB/s max\\n\" ". - "AREA:minusoutmb#0080e0:\"out \" ". - "GPRINT:outbytes:LAST:\"%5.1lf %sB/s last\" ". - "GPRINT:outbytes:AVERAGE:\"%5.1lf %sB/s avg\" ". - "GPRINT:outbytes:MAX:\"%5.1lf %sB/s max\\n\" "; + "AREA:inmb#00e060:\"in \" ". + "GPRINT:inbytes:LAST:\"%6.1lf %sB/s last\" ". + "GPRINT:inbytes:AVERAGE:\"%6.1lf %sB/s avg\" ". + "GPRINT:inbytes:MAX:\"%6.1lf %sB/s max\\n\" ". + "AREA:minusoutmb#0080e0:\"out \" ". + "GPRINT:outbytes:LAST:\"%6.1lf %sB/s last\" ". + "GPRINT:outbytes:AVERAGE:\"%6.1lf %sB/s avg\" ". + "GPRINT:outbytes:MAX:\"%6.1lf %sB/s max\\n\" "; if (isset($DS[12])) { $def[1] .= @@ -96,14 +107,14 @@ if (isset($DS[12])) { "CDEF:inmba=inbytesa,1048576,/ ". "CDEF:outmba=outbytesa,1048576,/ ". "CDEF:minusoutmba=0,outmba,- ". - "LINE:inmba#007030:\"in (avg) \" ". - "GPRINT:inbytesa:LAST:\"%5.1lf %sB/s last\" ". - "GPRINT:inbytesa:AVERAGE:\"%5.1lf %sB/s avg\" ". - "GPRINT:inbytesa:MAX:\"%5.1lf %sB/s max\\n\" ". - "LINE:minusoutmba#004070:\"out (avg) \" ". - "GPRINT:outbytesa:LAST:\"%5.1lf %sB/s last\" ". - "GPRINT:outbytesa:AVERAGE:\"%5.1lf %sB/s avg\" ". - "GPRINT:outbytesa:MAX:\"%5.1lf %sB/s max\\n\" "; + "LINE:inmba#00a060:\"in (avg) \" ". + "GPRINT:inbytesa:LAST:\"%6.1lf %sB/s last\" ". + "GPRINT:inbytesa:AVERAGE:\"%6.1lf %sB/s avg\" ". + "GPRINT:inbytesa:MAX:\"%6.1lf %sB/s max\\n\" ". + "LINE:minusoutmba#0060c0:\"out (avg) \" ". + "GPRINT:outbytesa:LAST:\"%6.1lf %sB/s last\" ". + "GPRINT:outbytesa:AVERAGE:\"%6.1lf %sB/s avg\" ". + "GPRINT:outbytesa:MAX:\"%6.1lf %sB/s max\\n\" "; } # Graph 2: packets @@ -113,52 +124,52 @@ $def[2] = "HRULE:0#c0c0c0 ". "DEF:inu=$RRDFILE[2]:$DS[2]:MAX ". "DEF:innu=$RRDFILE[3]:$DS[3]:MAX ". - "AREA:inu#00ffc0:\"in unicast \" ". - "GPRINT:inu:LAST:\"%5.2lf/s last\" ". - "GPRINT:inu:AVERAGE:\"%5.2lf/s avg\" ". - "GPRINT:inu:MAX:\"%5.2lf/s max\\n\" ". - "AREA:innu#00c080:\"in broadcast/multicast \":STACK ". - "GPRINT:innu:LAST:\"%5.2lf/s last \" ". - "GPRINT:innu:AVERAGE:\"%5.2lf/s avg \" ". - "GPRINT:innu:MAX:\"%5.2lf/s max\\n\" ". - "DEF:outu=$RRDFILE[2]:$DS[2]:MAX ". - "DEF:outnu=$RRDFILE[3]:$DS[3]:MAX ". + "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\" ". + "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\" ". + "DEF:outu=$RRDFILE[7]:$DS[7]:MAX ". + "DEF:outnu=$RRDFILE[8]:$DS[8]:MAX ". "CDEF:minusoutu=0,outu,- ". "CDEF:minusoutnu=0,outnu,- ". - "AREA:minusoutu#00c0ff:\"out unicast \" ". - "GPRINT:outu:LAST:\"%5.2lf/s last\" ". - "GPRINT:outu:AVERAGE:\"%5.2lf/s avg\" ". - "GPRINT:outu:MAX:\"%5.2lf/s max\\n\" ". - "AREA:minusoutnu#0080c0:\"out broadcast/multicast\":STACK ". - "GPRINT:outnu:LAST:\"%5.2lf/s last \" ". - "GPRINT:outnu:AVERAGE:\"%5.2lf/s avg \" ". - "GPRINT:outnu:MAX:\"%5.2lf/s max\\n\" "; + "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\" ". + "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\" "; # Graph 3: errors and discards $ds_name[3] = 'Errors and discards'; $opt[3] = "--vertical-label \"packets/sec\" -X0 --title \"Problems $hostname / $servicedesc\" "; $def[3] = "HRULE:0#c0c0c0 ". - "DEF:inerr=$RRDFILE[4]:$DS[4]:MAX ". - "DEF:indisc=$RRDFILE[5]:$DS[5]:MAX ". - "AREA:inerr#ff0000:\"in errors \" ". - "GPRINT:inerr:LAST:\"%5.2lf/s last\" ". - "GPRINT:inerr:AVERAGE:\"%5.2lf/s avg\" ". - "GPRINT:inerr:MAX:\"%5.2lf/s max\\n\" ". - "AREA:indisc#ff8000:\"in discards \":STACK ". - "GPRINT:indisc:LAST:\"%5.2lf/s last\" ". - "GPRINT:indisc:AVERAGE:\"%5.2lf/s avg\" ". - "GPRINT:indisc:MAX:\"%5.2lf/s max\\n\" ". - "DEF:outerr=$RRDFILE[9]:$DS[9]:MAX ". - "DEF:outdisc=$RRDFILE[10]:$DS[10]:MAX ". + "DEF:inerr=$RRDFILE[5]:$DS[5]:MAX ". + "DEF:indisc=$RRDFILE[4]:$DS[4]:MAX ". + "AREA:inerr#ff0000:\"in errors \" ". + "GPRINT:inerr:LAST:\"%7.2lf/s last \" ". + "GPRINT:inerr:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:inerr:MAX:\"%7.2lf/s max\\n\" ". + "AREA:indisc#ff8000:\"in discards \":STACK ". + "GPRINT:indisc:LAST:\"%7.2lf/s last \" ". + "GPRINT:indisc:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:indisc:MAX:\"%7.2lf/s max\\n\" ". + "DEF:outerr=$RRDFILE[10]:$DS[10]:MAX ". + "DEF:outdisc=$RRDFILE[9]:$DS[9]:MAX ". "CDEF:minusouterr=0,outerr,- ". "CDEF:minusoutdisc=0,outdisc,- ". - "AREA:minusouterr#ff0080:\"out errors \" ". - "GPRINT:outerr:LAST:\"%5.2lf/s last\" ". - "GPRINT:outerr:AVERAGE:\"%5.2lf/s avg\" ". - "GPRINT:outerr:MAX:\"%5.2lf/s max\\n\" ". - "AREA:minusoutdisc#ff8080:\"out discards\":STACK ". - "GPRINT:outdisc:LAST:\"%5.2lf/s last\" ". - "GPRINT:outdisc:AVERAGE:\"%5.2lf/s avg\" ". - "GPRINT:outdisc:MAX:\"%5.2lf/s max\\n\" "; + "AREA:minusouterr#ff0080:\"out errors \" ". + "GPRINT:outerr:LAST:\"%7.2lf/s last \" ". + "GPRINT:outerr:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:outerr:MAX:\"%7.2lf/s max\\n\" ". + "AREA:minusoutdisc#ff8080:\"out discards \":STACK ". + "GPRINT:outdisc:LAST:\"%7.2lf/s last \" ". + "GPRINT:outdisc:AVERAGE:\"%7.2lf/s avg \" ". + "GPRINT:outdisc:MAX:\"%7.2lf/s max\\n\" "; ?>

13 years, 4 months

Check_MK Git: check_mk: Multisite: fix views snapin

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 02b61da1829138656caffe4443d26079298f6d2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02b61da1829138… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 2 16:17:08 2011 +0100 Multisite: fix views snapin --- web/plugins/sidebar/shipped.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index ef9a108..9f694ff 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -107,7 +107,7 @@ def render_views(): first = False html.write("<ul>") bulletlink(title, "view.py?view_name=%s" % name) - if first: # at least one item rendered + if not first: # at least one item rendered html.write("</ul>") s = [ (view.get("topic", "Other"), view["title"], name) for name, view in html.available_views.items() if not view["hidden"] ]

13 years, 4 months

Check_MK Git: check_mk: Fix bug with fake_file class

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e6d52651a6f070ca897c8571fa33a73c2298299f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6d52651a6f070… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 2 09:05:15 2011 +0100 Fix bug with fake_file class --- ChangeLog | 4 ++++ modules/check_mk.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87033a1..d442f49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.1.9i7: + Core, Setup, etc.: + * Fix crash on Python 2.4 (e.g. RedHat) with fake_file + 1.1.9i6: INCOMPATIBLE CHANGES: * Removed out-dated checks blade_misc, ironport_misc and snia_sml. Replaced diff --git a/modules/check_mk.py b/modules/check_mk.py index f338a4e..c9693ae 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3662,7 +3662,7 @@ def automation_restart(): # HTTP connections. Really. os.closerange(3, 256) - class fake_file(): + class null_file: def write(self, stuff): pass def flush(self): @@ -3670,7 +3670,7 @@ def automation_restart(): # Deactivate stdout by introducing fake file without filedescriptor old_stdout = sys.stdout - sys.stdout = fake_file() + sys.stdout = null_file() try: if os.path.exists(nagios_objects_file):

13 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of 10.52.110.108:git/check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cccd9f75a858453a30ab41b82a6a881893859104 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cccd9f75a85845… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 2 09:39:34 2011 +0100 Merge branch 'master' of 10.52.110.108:git/check_mk ---

13 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8c1df6ed55ec0609f3f01039037c79f649831f29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c1df6ed55ec06… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 1 17:33:42 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: .bugs/110 ---

13 years, 4 months

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 93473e8fbf52db23172cc7f99f887ec7ee6ce5f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93473e8fbf52db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 1 13:52:09 2011 +0100 Updated bug entries --- .bugs/110 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/110 b/.bugs/110 new file mode 100644 index 0000000..7edcfdc --- /dev/null +++ b/.bugs/110 @@ -0,0 +1,9 @@ +Title: bytes_readable function to format negative values +Component: core +Benefit: 7 +State: open +Cost: 1 +Date: 2011-02-01 13:47:06 +Class: nastiness + +The bytes readable formating function was not able to format negative values over here. This should really be possible.

13 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2011