Checkmk git commits March 2011

checkmk-commits@lists.checkmk.com

3 participants
205 discussions

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2bcd96b7e624bf2a030f57b9693bc2d549c623e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bcd96b7e624bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 31 18:10:21 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 5 months

Check_MK Git: check_mk: BI: error handling of unused variables

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a461ae2f4841877fdbeaf423cfe3f4c01547b7e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a461ae2f484187… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 31 18:10:18 2011 +0200 BI: error handling of unused variables --- ChangeLog | 3 --- web/htdocs/bi.py | 13 +++++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b2c7fe..b23ebd2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,9 +17,6 @@ BI: * Added new component BI to Multisite. - * New third argument for worst and best: the worst possible - state (see docu) - * Make PENDING be slightly worst than OK WATO: * Allow moving hosts from one to another config file diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index c032fc3..b7a036a 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -272,10 +272,13 @@ def compile_aggregation(rule, args, lvl = 0): # value for all SINGLE arguments groups = {} + used_parameters = set([]) single_names = [ varname for (varname, (expansion, value)) in arginfo.items() if expansion == SINGLE ] for instargs, node in elements: # Honor that some variables might be unused and thus not contained in instargs key = tuple([ (varname, instargs[varname]) for varname in single_names if varname in instargs ]) + for var in instargs: + used_parameters.add(var) nodes = groups.get(key, []) nodes.append(node) groups[key] = nodes @@ -375,6 +378,7 @@ def compile_aggregation(rule, args, lvl = 0): while bilateral_mergegroups(groups): pass + # Check for unmergeable entries, fill up missing values # from parameters (assuming they are not regexes) for ikey, inodes in groups.items(): @@ -386,6 +390,15 @@ def compile_aggregation(rule, args, lvl = 0): newkey = tuple(d.items()) groups[newkey] = inodes del groups[ikey] + + # track unused parameters - if we are not empty anyway + if len(groups) > 0: + for var in single_names: + if var not in used_parameters: + raise MKConfigError("<h1>Invalid rule</h1>" + "The rule '<tt>%s</tt>' never uses the variable '<tt>%s</tt>'.<br>" + "This is not allowed. All singleton parameters must be used in the rule." \ + % (description, var)) # now sort groups after instantiations def cmp_group(a, b):

13 years, 5 months

Check_MK Git: check_mk: netif.params: honor linux_nic_check

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 877ec65a3a542a001f46fc82a371051dd6454d28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=877ec65a3a542a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 31 13:36:01 2011 +0200 netif.params: honor linux_nic_check --- checks/netif | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/checks/netif b/checks/netif index 155870f..ac3646c 100644 --- a/checks/netif +++ b/checks/netif @@ -57,6 +57,8 @@ def check_netif_link(item, targetstate, info): def inventory_netif_params(checkname, info): + if linux_nic_check != "legacy": + return [] return [ (i[0], '', tuple(i[1:4])) for i in info if len(i) == 5 ] def check_netif_params(item, params, info):

13 years, 5 months

Check_MK Git: check_mk: FIX: fix typo in permissions page

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9bc9c6f3d64c2af8dec67ed4e946a5aec654f6cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bc9c6f3d64c2a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 31 12:32:01 2011 +0200 FIX: fix typo in permissions page --- web/htdocs/permissions.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/permissions.py b/web/htdocs/permissions.py index cfd25cd..1c5bb28 100644 --- a/web/htdocs/permissions.py +++ b/web/htdocs/permissions.py @@ -69,7 +69,7 @@ def page_edit_permissions(h): config.save_permissions(permissions) config.load_permissions() - html.message("Permissions have beend saved.") + html.message("Permissions have been saved.") html.begin_form("permissions")

13 years, 5 months

Check_MK Git: check_mk: Updated bug entries

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 62bb065dee91b3b030b5286dc75b6e3f5087d60a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62bb065dee91b3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 31 12:25:39 2011 +0200 Updated bug entries --- .bugs/223 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/.bugs/223 b/.bugs/223 new file mode 100644 index 0000000..c77bb2c --- /dev/null +++ b/.bugs/223 @@ -0,0 +1,12 @@ +Title: Service search and PNP search should be linked +Component: multisite +Benefit: 3 +State: open +Cost: 2 +Date: 2011-03-31 12:24:42 +Class: feature + +When you make service service and find some services, +then you should be able to press a button and go to +the view with the PNP search - that way viewing the +graphs of the found services.

13 years, 5 months

Check_MK Git: check_mk: lnx_if: new check for linuc nics

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 36f0377032303e29e9c1704482b71062f292842f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36f0377032303e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 30 20:37:41 2011 +0200 lnx_if: new check for linuc nics --- ChangeLog | 6 +- agents/check_mk_agent.linux | 12 +++ checkman/if | 2 +- checkman/lnx_if | 142 +++++++++++++++++++++++++++++++++++ checkman/netctr.combined | 4 + checkman/netif.link | 12 +++ checkman/netif.params | 13 +++ checks/lnx_if | 142 +++++++++++++++++++++++++++++++++++ checks/netctr | 4 + checks/netif | 3 + pnp-rraconf/check_mk-lnx_if.rra.cfg | 1 + pnp-templates/check_mk-if.php | 2 +- pnp-templates/check_mk-lnx_if.php | 1 + web/plugins/perfometer/check_mk.py | 3 +- 14 files changed, 342 insertions(+), 5 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=36f0377032…

13 years, 5 months

Check_MK Git: check_mk: if/if64: also output performance data if operstate not as expected

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 24823706dd48a40141882264e467427f68c37cbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24823706dd48a4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 31 09:16:19 2011 +0200 if/if64: also output performance data if operstate not as expected --- ChangeLog | 1 + checks/if.include | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd3cd13..58d78af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ a reboot is needed after updates have been installed. * lnx_if: new check for Linux NICs compatible with if/if64 replacing netif.* and netctr. + * if/if64: also output performance data if operstate not as expected 1.1.10: diff --git a/checks/if.include b/checks/if.include index 358e650..01429f5 100644 --- a/checks/if.include +++ b/checks/if.include @@ -119,8 +119,10 @@ def check_if_common(item, params, info): elif len(params) == 6: err_warn, err_crit, targetspeed, bw_warn, bw_crit, allowed_operstates = params - for ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, inucast, inmcast, inbcast, ifInDiscards, \ - ifInErrors, ifOutOctets, outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, ifOutQLen, ifAlias in info: + for ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, \ + inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, \ + outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, \ + ifOutQLen, ifAlias in info: ifDescr = cleanup_if_strings(ifDescr) ifAlias = cleanup_if_strings(ifAlias) @@ -128,7 +130,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 == '') and (item == ifDescr or ifDescr == ''): # description trivial + if item == ifIndex and (item == ifAlias or ifAlias == '') \ + and (item == ifDescr or ifDescr == ''): # description trivial infotext = "" elif item != ifAlias and ifAlias != '': # alias useful infotext = "[%s] " % ifAlias @@ -137,21 +140,24 @@ def check_if_common(item, params, info): else: infotext = "[%s] " % ifIndex + state = 0 + operstatus = if_statename(str(ifOperStatus)) if targetstate and \ (ifOperStatus != targetstate - and not (type(targetstate) == list and ifOperStatus in targetstate)): - return (2, "CRIT - %soperstatus: %s (CRIT)" % (infotext, operstatus)) - infotext += "(%s) " % operstatus + and not (type(targetstate) == list and ifOperStatus in targetstate)): + state = 2 + infotext += "(%s!!) " % operstatus + else: + infotext += "(%s) " % operstatus - state = 0 # Check speed speed = saveint(ifSpeed) infotext += get_nic_speed_human_readable(speed) if not targetspeed is None and speed != targetspeed: infotext += " (wrong speed! expected: %s)" % get_nic_speed_human_readable(targetspeed) - state = 1 + state = max(state, 1) # convert percentages to absolute values and vice verca - if possible if speed:

13 years, 5 months

Check_MK Git: check_mk: if/if64: add Perf-O-Meter in case of unknown bandwidth

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d1701043f44134d0edda9dab0c102e8a5ec256e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1701043f44134… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 30 21:02:00 2011 +0200 if/if64: add Perf-O-Meter in case of unknown bandwidth --- .bugs/36 | 10 +++++++--- web/plugins/perfometer/check_mk.py | 19 +++++++++++++++---- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.bugs/36 b/.bugs/36 index b5bc62c..c37bba2 100644 --- a/.bugs/36 +++ b/.bugs/36 @@ -1,13 +1,17 @@ Title: Linux-NICs: Check kompatibel zu if/if64 machen Component: core +State: done +Class: cleanup +Date: 2010-12-21 20:52:24 Benefit: 2 -State: open Cost: 2 -Date: 2010-12-21 20:52:24 -Class: cleanup +Fun: 0 Man könnte das doch evtl. kompatibel mit if machen. Und dann evtl auch die Ausgabe noch kompatibel. Man monitort dann nur die verwendeten NICs. Und man bau eine neue Sektion <<<nics>>>, welche die Ausgaben von ethtool und /proc/net/dev kombiniert, damit man einen Check bauen kann, der wirklich 100% kompatibel zu if ist (dann klappen auch die Network Wethermaps) + +2011-03-30 20:39:22: changed state open -> done +New check named lnx_if diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index da05504..c8bb4e2 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -189,8 +189,8 @@ perfometers["check_mk-ipmi_sensors"] = perfometer_check_mk_ipmi_sensors perfometers["check_mk-nvidia.temp"] = perfometer_check_mk_ipmi_sensors def performeter_check_mk_if(row, check_command, perf_data): - # return str(perf_data), "" txt = [] + have_bw = True h = '<table><tr>' for name, perf, color in [ ("in", perf_data[0], "#0e6"), @@ -200,7 +200,8 @@ def performeter_check_mk_if(row, check_command, perf_data): if bw > 0.0: rrate = bytes / bw else: - return 'unknown bandwidth', '<table></table>' + have_bw = False + break drate = max(0.02, rrate ** 0.5 ** 0.5) rperc = 100 * rrate dperc = 100 * drate @@ -211,8 +212,18 @@ def performeter_check_mk_if(row, check_command, perf_data): else: h += a + b # color right, white left txt.append("%.1f%%" % rperc) - h += '</tr></table>' - return "   ".join(txt), h + if have_bw: + h += '</tr></table>' + return "   ".join(txt), h + + # make logarithmic perf-o-meter + in_bytes = savefloat(perf_data[0][1]) + out_bytes = savefloat(perf_data[5][1]) + MB = 1000000.0 + text = "%.1fM/s %.1fM/s" % (in_bytes/MB, out_bytes/MB) + + return text, perfometer_logarithmic_dual( + in_bytes, "#0e6", out_bytes, "#2af", 1000000, 10) perfometers["check_mk-if"] = performeter_check_mk_if perfometers["check_mk-if64"] = performeter_check_mk_if

13 years, 5 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 10c3ae15e0ad120a14c90c1f01b8a17365ec3320 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10c3ae15e0ad12… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 31 09:25:47 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 5 months

Check_MK Git: check_mk: if/if64: also show perf-o-meter if speed is unknown

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f4fedf1ce91192ecdfa0473589e8740c35a91692 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4fedf1ce91192… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 31 09:25:43 2011 +0200 if/if64: also show perf-o-meter if speed is unknown --- ChangeLog | 7 ++++--- web/plugins/perfometer/check_mk.py | 5 +++-- web/plugins/views/perfometer.py | 12 ++++++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58d78af..6b2c7fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,12 +36,13 @@ * FIX: mk_logwatch: improve implementation in order to save RAM * FIX: mk_oracle: Updated tablespace query to use 'used blocks' instead of 'user blocks' * FIX: bluecoat_sensors: Using scale parameter provided by the host for reported values + * FIX: fjdarye60_devencs, fjdarye60_disks.summary: added snmp scan functions + * FIX: decru_*: added snmp scan functions * printer_supply: Changed order of tests. When a printer reports -3 this is used before the check if maxlevel is -2. * printer_supply: Skipping inventory of supplies which have current value and maxlevel both set to -2. * cisco_locif: The check has been removed. Please switch to if/if64 - * if/if64: scan function now also detects devices where the first port has not the index 1 * cisco_temp/cisco_temp_perf: scan function handles sensors not beginning with index 1 @@ -50,8 +51,6 @@ * printer_alerts: Added new check for monitoring alert states reported by printers using the PRINTER-MIB * diskstat: rewritten check: now show different devices, r+w in one check - * FIX: fjdarye60_devencs, fjdarye60_disks.summary: added snmp scan functions - * FIX: decru_*: added snmp scan functions * canon_pages: Added new check for monitoring processed pages on canon printer/multi-function devices * strem1_sensors: added check to monitor sensors attached to Sensatorinc EM1 devices @@ -61,6 +60,8 @@ * lnx_if: new check for Linux NICs compatible with if/if64 replacing netif.* and netctr. * if/if64: also output performance data if operstate not as expected + * if/if64: scan function now also detects devices where the first port + * if/if64: also show perf-o-meter if speed is unknown 1.1.10: diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index c8bb4e2..454170e 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -220,10 +220,11 @@ def performeter_check_mk_if(row, check_command, perf_data): in_bytes = savefloat(perf_data[0][1]) out_bytes = savefloat(perf_data[5][1]) MB = 1000000.0 - text = "%.1fM/s %.1fM/s" % (in_bytes/MB, out_bytes/MB) + text = "%s/s   %s/s" % ( + number_human_readable(in_bytes), number_human_readable(out_bytes)) return text, perfometer_logarithmic_dual( - in_bytes, "#0e6", out_bytes, "#2af", 1000000, 10) + in_bytes, "#0e6", out_bytes, "#2af", 1000000, 5) perfometers["check_mk-if"] = performeter_check_mk_if perfometers["check_mk-if64"] = performeter_check_mk_if diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 2fdac40..f05040f 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -89,6 +89,18 @@ def perfometer_logarithmic_dual(value_left, color_left, value_right, color_right return result + '</tr></table>' +def number_human_readable(n): + n = float(n) + if abs(n) > 1024 * 1024 * 1024: + return "%.1fG" % (n / (1024.0 * 1024 * 1024)) + elif abs(n) > 1024 * 1024: + return "%.1fM" % (n / (1024.0 * 1024)) + elif abs(n) > 1024: + return "%.fK" % (n / 1024.0) + else: + return "%.1fB" % n + + perfometer_plugins_dir = defaults.web_dir + "/plugins/perfometer" for fn in os.listdir(perfometer_plugins_dir): if fn.endswith(".py"):

13 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2011