Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: agent_netapp: let --debug make Python exception come through

by Mathias Kettner

Module: check_mk Branch: master Commit: 5bb2d0db6b637551a9718d321f24af0fc3848b61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bb2d0db6b6375… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 7 18:03:00 2015 +0200 agent_netapp: let --debug make Python exception come through --- agents/special/agent_netapp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 64fb6a3..a1b4cae 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -31,9 +31,9 @@ try: from NaElement import * from NaServer import * except Exception, e: - sys.stderr.write("Unable to import the files NaServer.py/NaElement.py. These files are "\ + sys.stderr.write("Unable to import the files NaServer.py/NaElement.py.\nThese files are "\ "provided by the NetApp Managability SDK and must be put into "\ - "the sites folder ~/local/lib/python.\nDetailed error: %s" % e) + "the sites folder ~/local/lib/python.\nDetailed error: %s\n" % e) sys.exit(1) @@ -406,7 +406,8 @@ try: raise Exception("\n".join(errors)) except Exception, e: + if opt_debug: + raise sys.stderr.write("Error(s) on processing the received data:\n%s" % e) sys.exit(1) -

9 years, 5 months

Check_MK Git: check_mk: Fix problem with translation of silly perf variables of df checks

by Mathias Kettner

Module: check_mk Branch: master Commit: c84b24700dd2a23bd0812e5567f8fdcc06323f68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c84b24700dd2a2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 7 17:49:40 2015 +0200 Fix problem with translation of silly perf variables of df checks --- web/htdocs/metrics.py | 13 ++++++++++--- web/plugins/metrics/check_mk.py | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index ac48d1f..29ac803 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -160,10 +160,17 @@ def translate_metrics(perf_data, check_command): translated_metrics = {} for nr, entry in enumerate(perf_data): varname = entry[0] - if nr in cm: - translation_entry = cm[nr] # access by index of perfdata (e.g. in filesystem) + + translation_entry = {} # Default: no translation neccessary + + if varname in cm: + translation_entry = cm[varname] else: - translation_entry = cm.get(varname, {}) + for orig_varname, te in cm.items(): + if orig_varname[0] == "~" and regex(orig_varname[1:]).match(varname): # Regex entry + translation_entry = te + break + # Translate name metric_name = translation_entry.get("name", varname) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 47e440d..3156829 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1133,7 +1133,7 @@ check_metrics["check_mk-tcp_conn_stats"] = { } df_translation = { - 0 : { "name" : "fs_used", "scale" : MB }, + "~[_/]" : { "name" : "fs_used", "scale" : MB }, "fs_size" : { "scale" : MB }, "growth" : { "name" : "fs_growth", "scale" : MB / 86400.0 }, "trend" : { "name" : "fs_trend", "scale" : MB / 86400.0 }, @@ -1288,7 +1288,7 @@ check_metrics["check_mk-postgres_sessions"] = { "total": {"n check_metrics["check_mk-db2_bp_hitratios"] = {} check_metrics["check_mk-db2_connections"] = {} check_metrics["check_mk-db2_counters"] = {} -check_metrics["check_mk-db2_logsize"] = { 0: { "name": "fs_used", "scale" : MB } } +check_metrics["check_mk-db2_logsize"] = { "~[_/]": { "name": "fs_used", "scale" : MB } } check_metrics["check_mk-db2_sort_overflow"] = {} check_metrics["check_mk-db2_tablespaces"] = {} check_metrics["check_mk-siemens_plc.temp"] = {}

9 years, 5 months

Check_MK Git: check_mk: Remove obsolete debug message

by Mathias Kettner

Module: check_mk Branch: master Commit: 96d5a93862694b3bee79682b9684e9c85c049f4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96d5a93862694b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 7 17:11:35 2015 +0200 Remove obsolete debug message --- livestatus/src/Table.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/livestatus/src/Table.cc b/livestatus/src/Table.cc index c6c0d65..d462be2 100644 --- a/livestatus/src/Table.cc +++ b/livestatus/src/Table.cc @@ -117,7 +117,6 @@ Column *Table::dynamicColumn(const char *colname_with_args) const char *argstring = sep_pos + 1; - logger(LOG_NOTICE, "Dynamic column %s with args [%s]", name.c_str(), argstring); _dynamic_columns_t::iterator it = _dynamic_columns.find(name); if (it != _dynamic_columns.end()) return it->second->createColumn(argstring);

9 years, 5 months

Check_MK Git: check_mk: Be more tolerant against non UTF-8 characters in items

by Mathias Kettner

Module: check_mk Branch: master Commit: dc65f60d39fed8ae5a97614d2e7bdf6c71f41dae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc65f60d39fed8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 7 15:11:03 2015 +0200 Be more tolerant against non UTF-8 characters in items Note: this makes rules never match for items with invalid characters. Make sure that in the agent output everything is either UTF-8 or the section header as an :encoding(foobar) option where foobar is the correct encoding, e.g. latin1 or IBM347. --- modules/check_mk.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 69c674e..a221c57 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1927,7 +1927,12 @@ def in_extraconf_servicelist(service_matchers, item): # FIXME: items in autochecks might contain umlauts, the strings # are saved as UTF-8 encoded ascii strings. should be saved as # unicode strings in this case or at least converted after reading. - result = func(item.decode('utf-8')) + try: + result = func(item.decode('utf-8')) + except: + if opt_debug: + raise + result = False if result: return not negate

9 years, 5 months

Check_MK Git: check_mk: Fix service rule execution for more complex regular expressions

by Mathias Kettner

Module: check_mk Branch: master Commit: 78c084f689eb4d7e6483ab871d52d27b30cdd6db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78c084f689eb4d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 7 14:46:25 2015 +0200 Fix service rule execution for more complex regular expressions e.g. such containing \ and + --- .bugs/2298 | 8 ++++++-- modules/check_mk.py | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.bugs/2298 b/.bugs/2298 index 037371d..6deab96 100644 --- a/.bugs/2298 +++ b/.bugs/2298 @@ -1,8 +1,12 @@ Title: Service Discovery Checks reports disabled services as new Component: checks -State: open +Class: bug +State: done Date: 2015-04-01 14:03:37 Targetversion: 1.2.7 -Class: bug error does not occur in 1.2.6, but in 2015-04-01 + +2015-04-07 14:45:29: changed state open -> done +Fixed. The detection for regular expressions was incomplete and just checked +for the characters '*$|[', the complete list is now .?*+^$|[](){}\ diff --git a/modules/check_mk.py b/modules/check_mk.py index 9382e32..69c674e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1686,9 +1686,11 @@ def get_rule_options(entry): # This function tries to parse the pattern and return different kind of matching # functions which can then be performed faster than just using the regex match. def convert_pattern(pattern): + # TODO: Wouldn't it be faster to declare these functions in global scope + # i.e. only once? def is_regex(pattern): for c in pattern: - if c in '*$|[': + if c in '.?*+^$|[](){}\\': return True return False @@ -1717,6 +1719,7 @@ def convert_pattern(pattern): elif is_prefix_match(pattern): # prefix match with tailing .* pattern = pattern[:-2] + # TODO: Should we not rather use startswith()? return negate, lambda txt: txt[:len(pattern)] == pattern elif is_regex(pattern): @@ -1725,6 +1728,7 @@ def convert_pattern(pattern): else: # prefix match without any regex chars + # TODO: Should we not rather use startswith()? return negate, lambda txt: txt[:len(pattern)] == pattern

9 years, 5 months

Check_MK Git: check_mk: Ignored checks: 25 instead of 5 rows in check type selection

by Mathias Kettner

Module: check_mk Branch: master Commit: f05a3bd6e999367f8be4a5d9a4c26498cd352124 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f05a3bd6e99936… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 7 14:02:25 2015 +0200 Ignored checks: 25 instead of 5 rows in check type selection --- web/htdocs/valuespec.py | 5 +++-- web/htdocs/wato.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 70e58be..d12bd44 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1592,6 +1592,7 @@ class DualListChoice(ListChoice): self._custom_order = kwargs.get("custom_order", False) self._instant_add = kwargs.get("instant_add", False) self._enlarge_active = kwargs.get("enlarge_active", False) + self._rows = kwargs.get("rows", 5) def render_input(self, varprefix, value): self.load_elements() @@ -1643,7 +1644,7 @@ class DualListChoice(ListChoice): html.sorted_select(varprefix + '_unselected', unselected, attrs = { - 'size' : 5, + 'size' : self._rows, 'multiple' : 'multiple', 'style' : self._autoheight and 'height:auto' or '', 'ondblclick' : not self._instant_add and select_func or '', @@ -1653,7 +1654,7 @@ class DualListChoice(ListChoice): func = self._custom_order and html.select or html.sorted_select func(varprefix + '_selected', selected, attrs = { - 'size' : 5, + 'size' : self._rows, 'multiple' : 'multiple', 'style' : self._autoheight and 'height:auto' or '', 'ondblclick' : not self._instant_add and unselect_func or '', diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d9a0ffa..653a55f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7089,7 +7089,7 @@ def factory_reset(): class CheckTypeSelection(DualListChoice): def __init__(self, **kwargs): - DualListChoice.__init__(self, **kwargs) + DualListChoice.__init__(self, rows=25, **kwargs) def get_elements(self): checks = check_mk_local_automation("get-check-information")

9 years, 5 months

Check_MK Git: check_mk: Fixed comment headers

by Mathias Kettner

Module: check_mk Branch: master Commit: 17b7601e0c276704997ce3cc74766fb8d5806832 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17b7601e0c2767… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 7 10:49:53 2015 +0200 Fixed comment headers --- checks/akcp_sensor.include | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/checks/akcp_sensor.include b/checks/akcp_sensor.include index c79b3a3..c7919aa 100644 --- a/checks/akcp_sensor.include +++ b/checks/akcp_sensor.include @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. -# .--general-------------------------------------------------------------. +# .--General-------------------------------------------------------------. # | _ | # | __ _ ___ _ __ ___ _ __ __ _| | | # | / _` |/ _ \ '_ \ / _ \ '__/ _` | | | @@ -60,7 +60,7 @@ def inventory_akcp_sensor_no_params(info): yield line[0], None #. -# .--humidity------------------------------------------------------------. +# .--Humidity------------------------------------------------------------. # | _ _ _ _ _ | # | | |__ _ _ _ __ ___ (_) __| (_) |_ _ _ | # | | '_ \| | | | '_ ` _ \| |/ _` | | __| | | | | @@ -108,7 +108,7 @@ def check_akcp_humidity(item, params, info): return 0, infotext, perfdata #. -# .--temperature---------------------------------------------------------. +# .--Temperature---------------------------------------------------------. # | _ _ | # | | |_ ___ _ __ ___ _ __ ___ _ __ __ _| |_ _ _ _ __ ___ | # | | __/ _ \ '_ ` _ \| '_ \ / _ \ '__/ _` | __| | | | '__/ _ \ | @@ -166,7 +166,7 @@ def check_akcp_sensor_temp(item, params, info): (high_warn, high_crit), (low_warn, low_crit)) #. -# .--water & smoke-------------------------------------------------------. +# .--Water & Smoke-------------------------------------------------------. # | _ ___ _ | # |__ ____ _| |_ ___ _ __ ( _ ) ___ _ __ ___ ___ | | _____ | # |\ \ /\ / / _` | __/ _ \ '__| / _ \/\ / __| '_ ` _ \ / _ \| |/ / _ \ | @@ -198,7 +198,7 @@ def check_akcp_sensor_relay(item, _no_params, info): #. -# .--drycontact----------------------------------------------------------. +# .--Drycontact----------------------------------------------------------. # | _ _ _ | # | __| |_ __ _ _ ___ ___ _ __ | |_ __ _ ___| |_ | # | / _` | '__| | | |/ __/ _ \| '_ \| __/ _` |/ __| __| |

9 years, 5 months

Check_MK Git: check_mk: hwg_humidity: fix crash when core is Nagios ( missing include)

by Mathias Kettner

Module: check_mk Branch: master Commit: f98ec54213c219ec344097516c36b2b2bcac5e3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f98ec54213c219… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 7 10:48:16 2015 +0200 hwg_humidity: fix crash when core is Nagios (missing include) --- checks/hwg_humidity | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/hwg_humidity b/checks/hwg_humidity index 7307adc..c9a4369 100644 --- a/checks/hwg_humidity +++ b/checks/hwg_humidity @@ -75,5 +75,6 @@ check_info['hwg_humidity'] = { ]), "snmp_scan_function" : lambda oid: "hwg" in oid(".1.3.6.1.2.1.1.1.0").lower(), "group" : "humidity", + "includes" : [ "humidity.include" ], }

9 years, 5 months

Check_MK Git: check_mk: Fix exception about is_snmpv3_host on SNMP devices with Nagios core

by Mathias Kettner

Module: check_mk Branch: master Commit: 8fddc8b6b29fc2130f658f3722f9760521e7f018 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fddc8b6b29fc2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 7 10:45:25 2015 +0200 Fix exception about is_snmpv3_host on SNMP devices with Nagios core --- modules/check_mk.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 5e2823e..9382e32 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2985,18 +2985,19 @@ no_discovery_possible = None output.write("def clusters_of(hostname):\n return %r\n\n" % clusters_of(hostname)) # snmp hosts - output.write("def is_snmp_host(hostname):\n return %r\n\n" % is_snmp_host(hostname)) - output.write("def is_tcp_host(hostname):\n return %r\n\n" % is_tcp_host(hostname)) - output.write("def is_usewalk_host(hostname):\n return %r\n\n" % is_usewalk_host(hostname)) + output.write("def is_snmp_host(hostname):\n return % r\n\n" % is_snmp_host(hostname)) + output.write("def is_snmpv3_host(hostname):\n return % r\n\n" % is_snmpv3_host(hostname)) + output.write("def is_tcp_host(hostname):\n return % r\n\n" % is_tcp_host(hostname)) + output.write("def is_usewalk_host(hostname):\n return % r\n\n" % is_usewalk_host(hostname)) if has_inline_snmp and use_inline_snmp: - output.write("def is_snmpv2c_host(hostname):\n return %r\n\n" % is_snmpv2c_host(hostname)) - output.write("def is_bulkwalk_host(hostname):\n return %r\n\n" % is_bulkwalk_host(hostname)) - output.write("def snmp_timing_of(hostname):\n return %r\n\n" % snmp_timing_of(hostname)) - output.write("def snmp_credentials_of(hostname):\n return %s\n\n" % pprint.pformat(snmp_credentials_of(hostname))) - output.write("def snmp_port_of(hostname):\n return %r\n\n" % snmp_port_of(hostname)) + output.write("def is_snmpv2c_host(hostname):\n return % r\n\n" % is_snmpv2c_host(hostname)) + output.write("def is_bulkwalk_host(hostname):\n return % r\n\n" % is_bulkwalk_host(hostname)) + output.write("def snmp_timing_of(hostname):\n return % r\n\n" % snmp_timing_of(hostname)) + output.write("def snmp_credentials_of(hostname):\n return % s\n\n" % pprint.pformat(snmp_credentials_of(hostname))) + output.write("def snmp_port_of(hostname):\n return % r\n\n" % snmp_port_of(hostname)) else: - output.write("def snmp_port_spec(hostname):\n return %r\n\n" % snmp_port_spec(hostname)) - output.write("def snmp_walk_command(hostname):\n return %r\n\n" % snmp_walk_command(hostname)) + output.write("def snmp_port_spec(hostname):\n return % r\n\n" % snmp_port_spec(hostname)) + output.write("def snmp_walk_command(hostname):\n return % r\n\n" % snmp_walk_command(hostname)) # IP addresses needed_ipaddresses = {}

9 years, 5 months

Check_MK Git: check_mk: Updated bug entries #2310

by Mathias Kettner

Module: check_mk Branch: master Commit: 508c375ad086e9a086a105290505f5bf248eba89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=508c375ad086e9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 7 10:31:59 2015 +0200 Updated bug entries #2310 --- .bugs/2310 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/2310 b/.bugs/2310 new file mode 100644 index 0000000..2cc09dc --- /dev/null +++ b/.bugs/2310 @@ -0,0 +1,11 @@ +Title: Quicksearch: service list of host not sorted +Component: multisite +State: open +Date: 2015-04-07 10:31:05 +Targetversion: future +Class: nastiness + +When you enter h:somehost s:... then you will see a list of the +service of the host. This list is not but should be sorted +alphabetically. Might be the case that only with CMC it's not +sorted...

9 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015