Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

Check_MK Git: check_mk: if/if64/lnx_if: pad port numbers with zeros in order to sort correctly.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: aa0f043002d9345bd3a8190e9f64dec9954120e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa0f043002d934… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 2 10:59:57 2012 +0100 if/if64/lnx_if: pad port numbers with zeros in order to sort correctly. --- .bugs/131 | 7 +++++-- ChangeLog | 2 ++ checkman/if | 5 +++++ checkman/if64 | 5 +++++ checkman/lnx_if | 5 +++++ checks/if.include | 20 +++++++++++++++++--- web/plugins/wato/check_mk_configuration.py | 12 ++++++++++++ 7 files changed, 51 insertions(+), 5 deletions(-) diff --git a/.bugs/131 b/.bugs/131 index cd10ed2..b826b71 100644 --- a/.bugs/131 +++ b/.bugs/131 @@ -1,10 +1,10 @@ Title: if checks: Add 0 prefix on port numbers below 10 Component: core +State: done +Class: todo Benefit: 3 -State: open Cost: 5 Date: 2011-02-11 11:17:50 -Class: todo Targetversion: 1.2.0 When monitoring switches the services are ordered as follows: @@ -28,3 +28,6 @@ Look at brocade_fcport for details. Also we could make this configurable in order not to break existing checks. + +2012-01-02 10:59:50: changed state open -> done +Is done and switchable off with if_inventory_pad_portnumbers diff --git a/ChangeLog b/ChangeLog index e83dba2..7805173 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,8 @@ If you have changed the trend range, then your historic values will be displayed in a wrong scale. On the other hand - from now on changes in the range-setting will not affect the graph anymore. + * if/if64/lnx_if: pad port numbers with zeros in order to sort correctly. + This can be turned off with if_inventory_pad_portnumbers = False. 1.1.13i2: Core, Setup, etc.: diff --git a/checkman/if b/checkman/if index f31f46d..f65ab36 100644 --- a/checkman/if +++ b/checkman/if @@ -107,6 +107,11 @@ if_inventory_portstates (list of strings): Per default this variable is set to { only ports found in the state {up} are being added to the monitoring. If you set this to {['1', '2', '5']} then also ports in state {down} and {dormant} will be monitored. +if_inventory_pad_portnumbers (boolean): If this is set to {True} (the default), then port numbers used as + items are padded with zeroes so that all items have the same length and ports will sort correctly in + the GUI. You can set this to {False} if you want to keep the same service descriptions as in versions + prior to 1.1.13i3. + if_inventory_uses_description (boolean): Whether inventory should use the interface description as item (instead of the interface index). Default is {False}. diff --git a/checkman/if64 b/checkman/if64 index 6980812..23c3666 100644 --- a/checkman/if64 +++ b/checkman/if64 @@ -108,6 +108,11 @@ if_inventory_portstates (list of strings): Per default this variable is set to { only ports found in the state {up} are being added to the monitoring. If you set this to {['1', '2', '5']} then also ports in state {down} and {dormant} will be monitored. +if_inventory_pad_portnumbers (boolean): If this is set to {True} (the default), then port numbers used as + items are padded with zeroes so that all items have the same length and ports will sort correctly in + the GUI. You can set this to {False} if you want to keep the same service descriptions as in versions + prior to 1.1.13i3. + if_inventory_uses_description (boolean): Whether inventory should use the interface description as item (instead of the interface index). Default is {False}. diff --git a/checkman/lnx_if b/checkman/lnx_if index 272fe36..020e273 100644 --- a/checkman/lnx_if +++ b/checkman/lnx_if @@ -114,6 +114,11 @@ if_inventory_portstates (list of strings): Per default this variable is set to { only ports found in the state {up} are being added to the monitoring. If you set this to {['1', '2', '4']} then also ports in state {down} and {unknown} will be monitored. +if_inventory_pad_portnumbers (boolean): If this is set to {True} (the default), then port numbers used as + items are padded with zeroes so that all items have the same length and ports will sort correctly in + the GUI. You can set this to {False} if you want to keep the same service descriptions as in versions + prior to 1.1.13i3. + if_inventory_uses_description (boolean): Whether inventory should use the interface name as item (instead of the interface index). Default is {False}. diff --git a/checks/if.include b/checks/if.include index 85c57a0..1c96cbc 100644 --- a/checks/if.include +++ b/checks/if.include @@ -30,6 +30,7 @@ if_inventory_porttypes = [ '6', '32', '117' ] if_inventory_portstates = [ '1' ] if_inventory_uses_description = False if_inventory_uses_alias = False +if_inventory_pad_portnumbers = True if_inventory_monitor_speed = True if_inventory_monitor_state = True @@ -71,6 +72,18 @@ def if_statename(st): '7': 'lowerLayerDown' } return names.get(st, st) + +# Pads port numbers with zeroes, so that items +# nicely sort alphabetically +def if_pad_with_zeroes(info, ifIndex): + if if_inventory_pad_portnumbers: + max_index = max([int(line[0]) for line in info]) + digits = len(str(max_index)) + return ("%0"+str(digits)+"d") % int(ifIndex) + else: + return ifIndex + + def inventory_if_common(info): if len(info) == 0 or len(info[0]) != 19: return [] @@ -91,7 +104,7 @@ def inventory_if_common(info): elif if_inventory_uses_alias and ifAlias: item = ifAlias else: - item = ifIndex + item = if_pad_with_zeroes(info, ifIndex) if item in seen_items: # duplicate duplicate.add(item) @@ -147,7 +160,7 @@ def check_if_common(item, params, info): ifDescr = cleanup_if_strings(ifDescr) ifAlias = cleanup_if_strings(ifAlias) - if item == ifIndex \ + if item.lstrip("0") == ifIndex \ or item == ifAlias \ or item == ifDescr \ or item == "%s %s" % (ifAlias, ifIndex) \ @@ -155,7 +168,8 @@ def check_if_common(item, params, info): # Display port number or alias in infotext if that is not part # of the service description anyway - if item == ifIndex and (item == ifAlias or ifAlias == '') \ + if item.lstrip("0") == ifIndex \ + and (item == ifAlias or ifAlias == '') \ and (item == ifDescr or ifDescr == ''): # description trivial infotext = "" elif item == "%s %s" % (ifAlias, ifIndex) and ifDescr != '': # non-unique Alias diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 468f594..78caade 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -368,6 +368,18 @@ register_configvar(group, "parameters via a rule."))) register_configvar(group, + "if_inventory_pad_portnumbers", + Checkbox(title = _("Pad port numbers with zeroes"), + label = _("pad port numbers"), + help = _("If this option is activated then Check_MK will pad port numbers of " + "network interfaces with zeroes so that all port descriptions from " + "all ports of a host or switch have the same length and thus sort " + "currectly in the GUI. In versions prior to 1.1.13i3 there was no " + "padding. You can switch back to the old behaviour by disabling this " + "option. This will retain the old service descriptions and the old " + "performance data."))) + +register_configvar(group, "if_inventory_uses_description", Checkbox(title = _("Use description as service name for network interface checks"), label = _("use description"),

12 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0128

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2a2ac976f37a6309798707b36e10fd00389d7bf5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a2ac976f37a63… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 2 10:32:08 2012 +0100 Updated bug entries #0128 --- .bugs/128 | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.bugs/128 b/.bugs/128 index ff2b7b6..47dca1e 100644 --- a/.bugs/128 +++ b/.bugs/128 @@ -1,12 +1,12 @@ Title: df trends: Peak values after changing the trend_range Component: checks -State: open -Class: bug -Date: 2011-02-10 09:45:24 Benefit: 1 -Cost: 2 Fun: 0 +State: done +Cost: 2 +Date: 2011-02-10 09:45:24 Targetversion: 1.2.0 +Class: bug After changing the trend_range to a larger time the check reports a peak value which is wrong. It might be needed to detect such a change and reset @@ -44,3 +44,7 @@ range than 24h. We will do this after 1.1.11i3 is out. + +2012-01-02 10:32:06: changed state open -> done +Is done like described. Throrough testing will need some time, +though...

12 years, 9 months

Check_MK Git: check_mk: Filesystem checks: normalize trend perfdata to MB/ 24h

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dd198d266f83dd2f98b6e168dcf733c22177948e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd198d266f83dd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 2 10:31:35 2012 +0100 Filesystem checks: normalize trend perfdata to MB/24h --- ChangeLog | 5 ++++- checks/df.include | 12 ++++++++++-- pnp-templates/check_mk-df.php | 22 ++++++++++++---------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01e4823..e83dba2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,7 +13,10 @@ existing RRDs of these checks. Sorry, but these have been that last checks still using counters... * ibm_imm_health: added last missing scan function - + * Filesystem checks: trend performance data is now normalized to MB/24h. + If you have changed the trend range, then your historic values will + be displayed in a wrong scale. On the other hand - from now on changes + in the range-setting will not affect the graph anymore. 1.1.13i2: Core, Setup, etc.: diff --git a/checks/df.include b/checks/df.include index 6882248..10ff062 100644 --- a/checks/df.include +++ b/checks/df.include @@ -155,6 +155,7 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): problems = [] MB = 1024 * 1024.0 + H24 = 60 * 60 * 24 if levels.get("trend_range"): try: @@ -165,7 +166,9 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): # first compute current rate in MB/s by computing delta since last check timedif, rate = get_counter("df.%s.delta" % mountpoint, this_time, used_mb, True) if levels.get("trend_perfdata"): - perfdata.append(("growth", rate * range_sec)) + # Change in 1.1.13i3: The trend perfdata always outputs + # the growth in MB/24h, not any longer in MB/trendrange + perfdata.append(("growth", rate * H24)) # average trend, initialize with zero, rate_avg is in MB/s timedif, rate_avg = get_average("df.%s.trend" % mountpoint, @@ -215,7 +218,12 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): problems[-1] += "!" if levels.get("trend_perfdata"): - perfdata.append(("trend", trend, warn_perf, crit_perf, 0, size_mb / range)) + # New in 1.1.13i3: output trend not as MB / trend_range, but as + # MB / 24 hours. The same holds for the warn and crit information. + # It is configured in MB / trend range but in the performance data + # it's sent as MB / 24h. + perfdata.append(("trend", rate_avg * H24, warn_perf / range_sec * H24, + crit_perf / range_sec * H24, 0, size_mb / range)) # compute time until filesystem is full (only for positive trend, of course) if trend > 0: diff --git a/pnp-templates/check_mk-df.php b/pnp-templates/check_mk-df.php index 6bf079c..73818f2 100644 --- a/pnp-templates/check_mk-df.php +++ b/pnp-templates/check_mk-df.php @@ -58,15 +58,18 @@ $def[1] .= "GPRINT:var1:LAST:\"current\: %6.2lf GB\" "; $def[1] .= "GPRINT:var1:MAX:\"max\: %6.2lf GB \" "; $def[1] .= "GPRINT:var1:AVERAGE:\"avg\: %6.2lf GB\" "; -# Second graph is optional and shows trend +# Second graph is optional and shows trend. The MAX field +# of the third variable contains (size of the filesystem in MB +# / range in hours). From that we can compute the configured range. if (isset($DS[2])) { $size_mb_per_hours = floatval($MAX[3]); // this is size_mb / range(hours) $size_mb = floatval($MAX[1]); $hours = 1.0 / ($size_mb_per_hours / $size_mb); $range = sprintf("%.0fh", $hours); - // Current growth / shrinking - $opt[2] = "--vertical-label '+/- MB / $range' -l -1 -u 1 -X0 --title '$hostname: Growth of $fstitle' "; + // Current growth / shrinking. This value is give as MB / 24 hours. + // Note: This has changed in 1.1.13i3. Prior it was MB / trend_range! + $opt[2] = "--vertical-label '+/- MB / 24h' -l -1 -u 1 -X0 --title '$hostname: Growth of $fstitle' "; $def[2] = "DEF:growth_max=$RRDFILE[2]:$DS[2]:MAX "; $def[2] .= "DEF:growth_min=$RRDFILE[2]:$DS[2]:MIN "; $def[2] .= "DEF:trend=$RRDFILE[3]:$DS[3]:AVERAGE "; @@ -77,25 +80,24 @@ if (isset($DS[2])) { $def[2] .= "HRULE:0#c0c0c0 "; $def[2] .= "AREA:growth_pos#3060f0:\"Grow\" "; $def[2] .= "AREA:growth_neg#30f060:\"Shrink \" "; - $def[2] .= "GPRINT:growth:LAST:\"Current\: %+9.2lfMB / $range\" "; - $def[2] .= "GPRINT:growth:MAX:\"Max\: %+9.2lfMB / $range\\n\" "; + $def[2] .= "GPRINT:growth:LAST:\"Current\: %+9.2lfMB / 24h\" "; + $def[2] .= "GPRINT:growth:MAX:\"Max\: %+9.2lfMB / 24h\\n\" "; // Trend - $opt[3] = "--vertical-label '+/- MB / $range' -l -1 -u 1 -X0 --title '$hostname: Trend for $fstitle' "; + $opt[3] = "--vertical-label '+/- MB / 24h' -l -1 -u 1 -X0 --title '$hostname: Trend for $fstitle' "; $def[3] = "DEF:trend=$RRDFILE[3]:$DS[3]:AVERAGE "; $def[3] .= "HRULE:0#c0c0c0 "; $def[3] .= "LINE1:trend#000000:\"Trend\:\" "; - $def[3] .= "GPRINT:trend:LAST:\"%+7.2lf MB/$range\" "; + $def[3] .= "GPRINT:trend:LAST:\"%+7.2lf MB/24h\" "; if ($WARN[3]) { - $warn_mb = sprintf("%.2fMB", $WARN[3]); + $warn_mb = sprintf("%.2fMB", $WARN[3] * $hours / 24.0); $def[3] .= "LINE1:$WARN[3]#ffff00:\"Warn\: $warn_mb / $range\" "; } if ($CRIT[3]) { - $crit_mb = sprintf("%.2fMB", $CRIT[3]); + $crit_mb = sprintf("%.2fMB", $CRIT[3] * $hours / 24.0); $def[3] .= "LINE1:$CRIT[3]#ff0000:\"Crit\: $crit_mb / $range\" "; } $def[3] .= "COMMENT:\"\\n\" "; } - ?>

12 years, 9 months

Check_MK Git: check_mk: Moved code from WATO to valuespec

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 129e26e753569a3f888f0d34b1c1659d6c8f452a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=129e26e753569a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jan 1 14:29:37 2012 +0100 Moved code from WATO to valuespec --- web/htdocs/js/checkmk.js | 37 +++++++++++++++++++++++++++++++++++++ web/htdocs/js/wato.js | 26 -------------------------- web/htdocs/valuespec.py | 6 +++--- web/htdocs/wato.py | 6 +++--- 4 files changed, 43 insertions(+), 32 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index a8737b8..3c6382c 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1346,3 +1346,40 @@ function unhide_context_buttons(oA) oDiv = null; } +// .-----------------------------------------------------------------------. +// | __ __ _ ____ | +// | \ \ / /_ _| |_ _ ___/ ___| _ __ ___ ___ | +// | \ \ / / _` | | | | |/ _ \___ \| '_ \ / _ \/ __| | +// | \ V / (_| | | |_| | __/___) | |_) | __/ (__ | +// | \_/ \__,_|_|\__,_|\___|____/| .__/ \___|\___| | +// | |_| | +// +-----------------------------------------------------------------------+ +// | Functions needed by HTML code from ValueSpec (valuespec.py) | +// '-----------------------------------------------------------------------' + +function valuespec_toggle_option(oCheckbox, divid, negate) { + var oDiv = document.getElementById(divid); + if ((oCheckbox.checked && !negate) || (!oCheckbox.checked && negate)) + oDiv.style.display = ""; + else + oDiv.style.display = "none"; + oDiv = null; +} + +function valuespec_toggle_dropdown(oDropdown, divid) { + var oDiv = document.getElementById(divid); + if (oDropdown.value == "other") oDiv.style.display = ""; + else + oDiv.style.display = "none"; + oDiv = null; +} + +function valuespec_toggle_dropdownn(oDropdown, divid) { + var oDiv = document.getElementById(divid); + if (oDropdown.value == "ignore") + oDiv.style.display = "none"; + else + oDiv.style.display = ""; + oDiv = null; +} + diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index c4dac0e..fc7b944 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -147,32 +147,6 @@ function wato_fix_visibility() { } } -function wato_toggle_option(oCheckbox, divid, negate) { - var oDiv = document.getElementById(divid); - if ((oCheckbox.checked && !negate) || (!oCheckbox.checked && negate)) - oDiv.style.display = ""; - else - oDiv.style.display = "none"; - oDiv = null; -} - -function wato_toggle_dropdown(oDropdown, divid) { - var oDiv = document.getElementById(divid); - if (oDropdown.value == "other") oDiv.style.display = ""; - else - oDiv.style.display = "none"; - oDiv = null; -} - -function wato_toggle_dropdownn(oDropdown, divid) { - var oDiv = document.getElementById(divid); - if (oDropdown.value == "ignore") - oDiv.style.display = "none"; - else - oDiv.style.display = ""; - oDiv = null; -} - // ---------------------------------------------------------------------------- diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index a288aac..8c0fa99 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -499,7 +499,7 @@ class OptionalDropdownChoice(ValueSpec): defval = str(n) options.append(("other", self._otherlabel)) html.select(varprefix, options, defval, attrs={"style":"float:left;"}, - onchange="wato_toggle_dropdown(this, '%s_ex');" % varprefix ) + onchange="valuespec_toggle_dropdown(this, '%s_ex');" % varprefix ) if html.form_submitted(): div_is_open = html.var(varprefix) == "other" @@ -561,7 +561,7 @@ class Optional(ValueSpec): checked = self._negate != (value != None) html.write("<div style=\"float: none;\">") html.checkbox(varprefix + "_use" , checked, - onclick="wato_toggle_option(this, %r, %r)" % + onclick="valuespec_toggle_option(this, %r, %r)" % (div_id, self._negate and 1 or 0)) if self._label: html.write(self._label) @@ -761,7 +761,7 @@ class Dictionary(ValueSpec): if visible == None: visible = param in value html.checkbox(vp + "_USE", param in value, - onclick="wato_toggle_option(this, %r)" % div_id) + onclick="valuespec_toggle_option(this, %r)" % div_id) html.write(" %s<br>" % vs.title()) html.write('<div class=dictelement id="%s" style="display: %s">' % ( div_id, not visible and "none" or "")) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 40220ab..be43355 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8709,7 +8709,7 @@ def mode_edit_rule(phase): ("ignore", _("ignore")), ("is", _("is")), ("isnot", _("isnot"))], deflt, - onchange="wato_toggle_dropdownn(this, 'tag_sel_%s');" % id) + onchange="valuespec_toggle_dropdownn(this, 'tag_sel_%s');" % id) html.write("</td><td>") if html.form_submitted(): div_is_open = html.var("tag_" + id) != "ignore" @@ -8735,7 +8735,7 @@ def mode_edit_rule(phase): div_id = "div_all_hosts" checked = host_list != ALL_HOSTS - html.checkbox("explicit_hosts", checked, onclick="wato_toggle_option(this, %r)" % div_id) + html.checkbox("explicit_hosts", checked, onclick="valuespec_toggle_option(this, %r)" % div_id) html.write(" " + _("Specify explicit host names")) html.write('<div id="%s" style="display: %s">' % ( div_id, not checked and "none" or "")) @@ -8799,7 +8799,7 @@ def mode_edit_rule(phase): if checked == None: # read from rule itself checked = len(item_list) == 0 or item_list[0] != "" div_id = "itemlist" - html.checkbox("explicit_services", checked, onclick="wato_toggle_option(this, %r)" % div_id) + html.checkbox("explicit_services", checked, onclick="valuespec_toggle_option(this, %r)" % div_id) html.write(" " + _("Specify explicit values")) html.write('<div id="%s" style="display: %s; padding: 0px;">' % ( div_id, not checked and "none" or ""))

12 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2012