Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64461 discussions

Check_MK Git: check_mk: keep alive mode alarm handling debugging

by Lars Michelsen

Module: check_mk Branch: master Commit: 7bda12dad35c9172a22316cd7e89b165f792ad31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bda12dad35c91… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 21 14:10:10 2013 +0200 keep alive mode alarm handling debugging --- modules/check_mk_base.py | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 7d795fb..8225234 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -988,7 +988,7 @@ def do_check_keepalive(): def check_timeout(signum, frame): raise MKCheckTimeout() - signal.signal(signal.SIGALRM, check_timeout) + signal.signal(signal.SIGALRM, signal.SIG_IGN) # Prevent ALRM from CheckHelper.cc global total_check_output total_check_output = "" @@ -1012,28 +1012,31 @@ def do_check_keepalive(): break timeout = int(sys.stdin.readline()) - try: - signal.alarm(timeout) - if ';' in hostname: - hostname, ipaddress = hostname.split(";", 1) - elif hostname in ipaddress_cache: - ipaddress = ipaddress_cache[hostname] - else: - if is_cluster(hostname): - ipaddress = None + try: # catch non-timeout exceptions + try: # catch timeouts + signal.signal(signal.SIGALRM, check_timeout) + signal.alarm(timeout) + if ';' in hostname: + hostname, ipaddress = hostname.split(";", 1) + elif hostname in ipaddress_cache: + ipaddress = ipaddress_cache[hostname] else: - try: - ipaddress = lookup_ipaddress(hostname) - except: - raise MKGeneralException("Cannot resolve hostname %s into IP address" % hostname) - ipaddress_cache[hostname] = ipaddress + if is_cluster(hostname): + ipaddress = None + else: + try: + ipaddress = lookup_ipaddress(hostname) + except: + raise MKGeneralException("Cannot resolve hostname %s into IP address" % hostname) + ipaddress_cache[hostname] = ipaddress - try: status = do_check(hostname, ipaddress) + signal.signal(signal.SIGALRM, signal.SIG_IGN) # Prevent ALRM from CheckHelper.cc signal.alarm(0) except MKCheckTimeout: + signal.signal(signal.SIGALRM, signal.SIG_IGN) # Prevent ALRM from CheckHelper.cc status = 3 - total_check_output = "UNKNOWN - Check_MK timed out after %d seconds" % timeout + total_check_output = "UNKNOWN - Check_MK timed out after %d seconds\n" % timeout sys.stdout.write("%03d\n%08d\n%s" % (status, len(total_check_output), total_check_output)) @@ -1058,6 +1061,7 @@ def do_check_keepalive(): sys.stdout.write("UNKNOWN - %s\n3\n" % e) + def check_unimplemented(checkname, params, info): return (3, 'UNKNOWN - Check not implemented')

11 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0895

by Mathias Kettner

Module: check_mk Branch: master Commit: 70d532681fef5cef298dd56598f2a5e457d09a4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70d532681fef5c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 21 11:59:17 2013 +0200 Updated bug entries #0895 --- .bugs/895 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/895 b/.bugs/895 new file mode 100644 index 0000000..413cd30 --- /dev/null +++ b/.bugs/895 @@ -0,0 +1,10 @@ +Title: Inventory check should honor exit code settings +Component: core +State: open +Date: 2013-06-21 11:58:34 +Targetversion: future +Class: bug + +If you use the feature that the Check_MK exit code is also OK +when the host is down, that should also apply for the inventory +check.

11 years, 3 months

Check_MK Git: check_mk: Fix encoding problem in keepalive notification

by Mathias Kettner

Module: check_mk Branch: master Commit: 7cf1cfbf20587d35aef12be4c9112214bbcd8047 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cf1cfbf20587d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 21 09:55:44 2013 +0200 Fix encoding problem in keepalive notification --- modules/notify.py | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index b68c0cb..0c47e36 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -368,12 +368,12 @@ def notify_keepalive(): notify_log("Configuration has changed. Restarting myself.") os.execvp("cmk", sys.argv) - new_data = os.read(0, 4096) + new_data = os.read(0, 20000) if not new_data: sys.exit(0) # closed stdin g_notify_readahead_buffer += new_data if g_notify_readahead_buffer.startswith('\n\n'): - exit(0) + sys.exit(0) while '\n\n' in g_notify_readahead_buffer: notify_notify() except Exception, e: @@ -381,6 +381,7 @@ def notify_keepalive(): raise notify_log("ERROR %s\n%s" % (e, format_exception())) +# Note: The values of the context are *always* unicode! def notify_get_context(): global g_notify_readahead_buffer if opt_keepalive: @@ -391,7 +392,7 @@ def notify_get_context(): try: for line in this_part.split('\n'): varname, value = line.strip().split("=", 1) - context[varname] = value.decode("utf-8") + context[varname] = value except Exception, e: # line without '=' ignored or alerted if opt_debug: raise @@ -401,13 +402,25 @@ def notify_get_context(): # Information about notification is excpected in the # environment in variables with the prefix NOTIFY_ return dict([ - (var[7:], value.decode("utf-8")) + (var[7:], value) for (var, value) in os.environ.items() if var.startswith("NOTIFY_") and not re.match('^\$[A-Z]+\$$', value)]) +def convert_context_to_unicode(context): + # Convert all values to unicode + for key, value in context.iteritems(): + if type(value) == str: + try: + value_unicode = value.decode("utf-8") + except: + try: + value_unicode = value.decode("latin-1") + except: + value_unicode = u"(Invalid byte sequence)" + context[key] = value_unicode def notify_notify(): context = notify_get_context() @@ -452,6 +465,8 @@ def notify_notify(): if context['WHAT'] != 'HOST' and 'LASTSERVICESTATECHANGE' in context: context['LASTSERVICESTATECHANGE_REL'] = get_readable_rel_date(context['LASTSERVICESTATECHANGE']) + convert_context_to_unicode(context) + if notification_logging >= 2: notify_log("Notification context:\n" + "\n".join(["%s=%s" % v for v in sorted(context.items())])) @@ -620,7 +635,7 @@ def call_notification_script(plugin, parameters, context, write_into_spoolfile): # Export complete context to have all vars in environment. # Existing vars are replaced, some already existing might remain for key in context: - os.putenv('NOTIFY_' + key, context[key].encode('utf-8')) + os.putenv('NOTIFY_' + key, context[key].encode('utf-8')) # Remove service macros for host notifications if context['WHAT'] == 'HOST':

11 years, 3 months

Check_MK Git: check_mk: Fixed two typos in logfile messages

by Mathias Kettner

Module: check_mk Branch: master Commit: bbfa5177c143b829945d53cedf274b5cd14efdb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbfa5177c143b8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 21 09:28:21 2013 +0200 Fixed two typos in logfile messages --- modules/notify.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index 1ba3024..b68c0cb 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -519,7 +519,7 @@ def should_notify(context, entry): if entry.get("only_hosts"): hostname = context.get("HOSTNAME") if hostname not in entry["only_hosts"]: - notify_log(" - Skipping: host '%s' matches non of %s" % (hostname, ", ".join(entry["only_hosts"]))) + notify_log(" - Skipping: host '%s' matches none of %s" % (hostname, ", ".join(entry["only_hosts"]))) return False # Check if the host has to be in a special service_level @@ -554,7 +554,7 @@ def should_notify(context, entry): skip = negate break if skip: - notify_log(" - Skipping: service '%s' matches non of %s" % ( + notify_log(" - Skipping: service '%s' matches none of %s" % ( servicedesc, ", ".join(entry["only_services"]))) return False

11 years, 3 months

Check_MK Git: check_mk: Fix encoding problem in notify keepalive

by Mathias Kettner

Module: check_mk Branch: master Commit: dea9ef5f9eb470594bf78c7f331f3418b73487ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dea9ef5f9eb470… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 21 09:27:26 2013 +0200 Fix encoding problem in notify keepalive --- modules/notify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/notify.py b/modules/notify.py index 2bc9257..1ba3024 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -391,7 +391,7 @@ def notify_get_context(): try: for line in this_part.split('\n'): varname, value = line.strip().split("=", 1) - context[varname] = value + context[varname] = value.decode("utf-8") except Exception, e: # line without '=' ignored or alerted if opt_debug: raise

11 years, 3 months

Check_MK Git: check_mk: hwg_temp: WATO rule, man page, pnp graph, Perf-O-Meter

by Mathias Kettner

Module: check_mk Branch: master Commit: a47f9808dc2703a34980b5be42c107a90634a77e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a47f9808dc2703… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 20 17:36:18 2013 +0200 hwg_temp: WATO rule, man page, pnp graph, Perf-O-Meter --- ChangeLog | 2 ++ checkman/hwg_temp | 22 +++++++++++++++++++++ checks/hwg_temp | 37 ++++++++++++++++++++--------------- pnp-templates/check_mk-hwg_temp.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 5 files changed, 47 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index e450226..14fa65c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,8 @@ was misleading for different agent versions on multiple nodes) * job check: better handling of unexpected agent output * lnx_thermal: Added check for linux thermal sensors (e.g. acpi) + * hwg_temp: Make WATO-Rule "Room Temperature" match, add man page, graph + and Perf-O-Meter Multisite: * User accounts can now be locked after a specified amount of auth diff --git a/checkman/hwg_temp b/checkman/hwg_temp new file mode 100644 index 0000000..ffd294f --- /dev/null +++ b/checkman/hwg_temp @@ -0,0 +1,22 @@ +title: HWg-STE Ethernet thermometer +agents: snmp +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check monitors the environmental temperature via a + HWg-STE Ethernet thermometer. + +item: + The name of the sensor "a string". + +perfdata: + One variable: the current temperature. + +inventory: + All available temperature sensors are automatically inventorized. + +[parameters] +warn(int): Warning level for the temperature. +crit(int): Critical level for the temperature. + diff --git a/checks/hwg_temp b/checks/hwg_temp index 02e382b..3704b64 100644 --- a/checks/hwg_temp +++ b/checks/hwg_temp @@ -24,8 +24,13 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + hwg_temp_defaultlevels = (23, 25) +def inventory_hwg_temp(info): + return [ (line[0], "hwg_temp_defaultlevels" ) for line in info if int(line[2]) != 0] + + def check_hwg_temp(item, params, info): warn, crit = params status_text = { @@ -67,24 +72,24 @@ def check_hwg_temp(item, params, info): return (3, "Sensor %s not found in SNMP data %s" % (item) ) check_info['hwg_temp'] = { - "check_function" : check_hwg_temp, - "inventory_function" : lambda info: [ (line[0], hwg_temp_defaultlevels ) for line in info if int(line[2]) != 0] , - "service_description" : "Temperature %s", - "has_perfdata" : True, + "check_function" : check_hwg_temp, + "inventory_function" : inventory_hwg_temp, + "service_description" : "Temperature %s", + "has_perfdata" : True, "snmp_info" : (".1.3.6.1.4.1.21796.4.1.3", [# sensors index (1-2) - "1.1", - # sensor name string - "1.2", - # unit state: 0=Invalid, 1=Normal, 2=OutOfRangeLo, 3=OutOfRangeHi, 4=AlarmLo, 5=AlarmHi - "1.3", - # current value string - "1.4", - # current value*10 integer - "1.5", - # sensor unit integer 0=unknown, 1=°C, 2=°F, 3=°K, 4=% - "1.7", + "1.1", + # sensor name string + "1.2", + # unit state: 0=Invalid, 1=Normal, 2=OutOfRangeLo, 3=OutOfRangeHi, 4=AlarmLo, 5=AlarmHi + "1.3", + # current value string + "1.4", + # current value*10 integer + "1.5", + # sensor unit integer 0=unknown, 1=°C, 2=°F, 3=°K, 4=% + "1.7", ]), "snmp_scan_function" : lambda oid: "hwg" in oid(".1.3.6.1.2.1.1.1.0").lower(), - "group" : "hw_temperature", + "group" : "room_temperature", } diff --git a/pnp-templates/check_mk-hwg_temp.php b/pnp-templates/check_mk-hwg_temp.php new file mode 120000 index 0000000..a7f1e24 --- /dev/null +++ b/pnp-templates/check_mk-hwg_temp.php @@ -0,0 +1 @@ +check_mk-cmctc.temp.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index efdeed5..047bf6b 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -275,6 +275,7 @@ perfometers["check_mk-hp_proliant_temp"] = perfometer_temperature perfometers["check_mk-akcp_sensor_temp"] = perfometer_temperature perfometers["check_mk-fsc_temp"] = perfometer_temperature perfometers["check_mk-viprinet_temp"] = perfometer_temperature +perfometers["check_mk-hwg_temp"] = perfometer_temperature def perfometer_blower(row, check_command, perf_data): rpm = saveint(perf_data[0][1])

11 years, 3 months

Check_MK Git: check_mk: Fix syntax error in lnx_thermal, rename check file

by Mathias Kettner

Module: check_mk Branch: master Commit: 0295e28db5d8ee458140b5d96a24b536f19d2723 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0295e28db5d8ee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 20 17:35:58 2013 +0200 Fix syntax error in lnx_thermal, rename check file --- checks/{thermal => lnx_thermal} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/thermal b/checks/lnx_thermal similarity index 96% rename from checks/thermal rename to checks/lnx_thermal index b22a849..8e9a595 100644 --- a/checks/thermal +++ b/checks/lnx_thermal @@ -63,8 +63,8 @@ def check_lnx_thermal(item, params, info): return (3, 'No data found for sensor "thermal_zone%s"' % item) check_info['lnx_thermal'] = { - "inventory_function" : inventory_thermal, - "check_function" : check_thermal, + "inventory_function" : inventory_lnx_thermal, + "check_function" : check_lnx_thermal, "service_description" : "Temperature %s", "has_perfdata" : True, }

11 years, 3 months

Check_MK Git: check_mk: FIX: fix layout of Auxiliary tags table

by Mathias Kettner

Module: check_mk Branch: master Commit: 1665adcdcc7fab977e9b39910bd5b8ae6961712b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1665adcdcc7fab… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 20 16:18:30 2013 +0200 FIX: fix layout of Auxiliary tags table Conflicts: ChangeLog --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index f05de5c..e450226 100644 --- a/ChangeLog +++ b/ChangeLog @@ -204,6 +204,10 @@ * FIX: Fixed missing roles in auth.php (in some cases) which resulted in non visible pnp graphs and missing nagvis permissions + WATO: + * FIX: fix layout of Auxiliary tags table + + 1.2.2p2: Core: * FIX: livecheck: fixed handling of one-line plugin outputs and missing \n

11 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0894

by Mathias Kettner

Module: check_mk Branch: master Commit: 0ecbf4501cb359618911ee1199b131a26d9c10de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ecbf4501cb359… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 20 16:13:37 2013 +0200 Updated bug entries #0894 --- .bugs/894 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/894 b/.bugs/894 new file mode 100644 index 0000000..ec9bede --- /dev/null +++ b/.bugs/894 @@ -0,0 +1,9 @@ +Title: never read automation_secret.mk from Multisite +Component: multisite +State: open +Date: 2013-06-20 16:12:17 +Targetversion: future +Class: nastiness + +That file should be "write only" from the point of view of Multisite +and only be read by external skripts.

11 years, 3 months

Check_MK Git: check_mk: Optical cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 1fb62eda1a0f841cf4726ae9ef3cf03311db30da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fb62eda1a0f84… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 20 16:00:30 2013 +0200 Optical cleanup --- modules/check_mk_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 7d795fb..ab590f1 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1649,7 +1649,7 @@ def check_timeperiod(timeperiod): s.connect(livestatus_unix_socket) # We just get the currently inactive timeperiods. All others # (also non-existing) are considered to be active - s.send("GET timeperiods\nColumns:name\nFilter: in = 0\n") + s.send("GET timeperiods\nColumns: name\nFilter: in = 0\n") s.shutdown(socket.SHUT_WR) g_inactive_timerperiods = s.recv(10000000).splitlines() except Exception, e:

11 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits