Checkmk git commits November 2014

checkmk-commits@lists.checkmk.com

6 participants
232 discussions

Check_MK Git: check_mk: Repaired inline snmp timeout handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 6e9f735635ebde31bbc629c9522310de23a9809a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e9f735635ebde… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 26 08:54:56 2014 +0100 Repaired inline snmp timeout handling --- modules/check_mk.py | 8 ++++---- modules/check_mk_base.py | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 16af22b..66abbe4 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5493,7 +5493,7 @@ def restart_myself(keepalive_fd): def do_check_keepalive(): - global g_initial_times + global g_initial_times, g_timeout def check_timeout(signum, frame): raise MKCheckTimeout() @@ -5537,11 +5537,11 @@ def do_check_keepalive(): num_checks += 1 - timeout = int(keepalive_read_line()) + g_timeout = int(keepalive_read_line()) try: # catch non-timeout exceptions try: # catch timeouts signal.signal(signal.SIGALRM, check_timeout) - signal.alarm(timeout) + signal.alarm(g_timeout) if ';' in hostname: hostname, ipaddress = hostname.split(";", 1) elif hostname in ipaddress_cache: @@ -5564,7 +5564,7 @@ def do_check_keepalive(): spec = exit_code_spec(hostname) status = spec.get("timeout", 2) total_check_output = "%s - Check_MK timed out after %d seconds\n" % ( - nagios_state_names[status], timeout) + nagios_state_names[status], g_timeout) os.write(keepalive_fd, "%03d\n%08d\n%s" % (status, len(total_check_output), total_check_output)) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index f03b192..db6b925 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -90,6 +90,7 @@ g_single_oid_hostname = None g_single_oid_cache = {} g_broken_snmp_hosts = set([]) g_broken_agent_hosts = set([]) +g_timeout = None # variables set later by getopt

9 years, 10 months

Check_MK Git: check_mk: #1549 FIX bluecat_threads: do not inventorize this check where information is missing

by Mathias Kettner

Module: check_mk Branch: master Commit: 3d7c1f8dc4915eef6e33ee03eaaad929a7b54102 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d7c1f8dc4915e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 25 11:58:02 2014 +0100 #1549 FIX bluecat_threads: do not inventorize this check where information is missing This avoid UNKNOWN check results on devices where no thread information is available. --- .werks/1549 | 11 +++++++++++ ChangeLog | 1 + checks/bluecat_threads | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/1549 b/.werks/1549 new file mode 100644 index 0000000..315bf35 --- /dev/null +++ b/.werks/1549 @@ -0,0 +1,11 @@ +Title: bluecat_threads: do not inventorize this check where information is missing +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1416913048 + +This avoid UNKNOWN check results on devices where no thread information is +available. diff --git a/ChangeLog b/ChangeLog index 229af5d..9a22256 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * 1449 FIX: nginx_status: agent plugin no longer honours "http(s)_proxy" env variables of root user * 1532 FIX: mk_sap: Cleaning up old state information from sap.state file... * 1548 FIX: bluecat_ntp: do not inventorized devices where NTP information is missing + * 1549 FIX: bluecat_threads: do not inventorize this check where information is missing... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/bluecat_threads b/checks/bluecat_threads index 7b67507..49c2e32 100644 --- a/checks/bluecat_threads +++ b/checks/bluecat_threads @@ -28,7 +28,8 @@ threads_default_levels = (2000, 4000) def inventory_bluecat_threads(info): - return [(None, "threads_default_levels")] + if info: + return [(None, "threads_default_levels")] def check_bluecat_threads(item, params, info): nthreads = int(info[0][0])

9 years, 10 months

Check_MK Git: check_mk: #1548 FIX bluecat_ntp: do not inventorized devices where NTP information is missing

by Mathias Kettner

Module: check_mk Branch: master Commit: a01c99fc4fe5360db78a16842e39eefec5915d67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a01c99fc4fe536… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 25 11:54:24 2014 +0100 #1548 FIX bluecat_ntp: do not inventorized devices where NTP information is missing --- .werks/1548 | 10 ++++++++++ ChangeLog | 1 + checks/bluecat_ntp | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1548 b/.werks/1548 new file mode 100644 index 0000000..215be9d --- /dev/null +++ b/.werks/1548 @@ -0,0 +1,10 @@ +Title: bluecat_ntp: do not inventorized devices where NTP information is missing +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1416912842 + + diff --git a/ChangeLog b/ChangeLog index bc3f9df..229af5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * 1515 FIX: cisco_secure: fix service description, fix OK state in case of no violation * 1449 FIX: nginx_status: agent plugin no longer honours "http(s)_proxy" env variables of root user * 1532 FIX: mk_sap: Cleaning up old state information from sap.state file... + * 1548 FIX: bluecat_ntp: do not inventorized devices where NTP information is missing Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/bluecat_ntp b/checks/bluecat_ntp index 7f90e00..b76b87b 100644 --- a/checks/bluecat_ntp +++ b/checks/bluecat_ntp @@ -33,7 +33,8 @@ factory_settings["bluecat_ntp"] = { } def inventory_bluecat_ntp(info): - return [(None, None)] + if len(info) > 0 and info[0][0] != 'NULL': + return [(None, None)] def check_bluecat_ntp(item, params, info): oper_state, sys_leap, stratum = map(int, info[0])

9 years, 10 months

Check_MK Git: check_mk: Faster implementation of attrencode,

by Mathias Kettner

small speedup for large Multisite pages Message-ID: <54745ede.wW1gBWvn0xMnqWQc%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: be7a859377ccad63b8740ebbf1b2e1033f87b302 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be7a859377ccad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 25 11:50:03 2014 +0100 Faster implementation of attrencode, small speedup for large Multisite pages --- web/htdocs/htmllib.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index c43be21..1727e0f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1213,19 +1213,7 @@ class html: elif type(value) not in [str, unicode]: value = str(value) - new = "" - for c in value: - if c == '"': - new += """ - elif c == '<': - new += "<" - elif c == '>': - new += ">" - else: - new += c - return new - - + return value.replace('"', """).replace("<", "<").replace(">", ">") # This function returns a str object, never unicode! # Beware: this code is crucial for the performance of Multisite!

9 years, 10 months

Check_MK Git: check_mk: Re-added default monitored SAP path for dialog monitoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 5ffe01da1223745ea4ec0fe80fc61c13ec248aa1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ffe01da122374… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 25 10:54:33 2014 +0100 Re-added default monitored SAP path for dialog monitoring --- agents/plugins/mk_sap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mk_sap b/agents/plugins/mk_sap index 747f9ae..d794d37 100755 --- a/agents/plugins/mk_sap +++ b/agents/plugins/mk_sap @@ -137,7 +137,7 @@ local_cfg = { # The * matches the whole following string and does not end on next "/". # For examples, take a look at the default config file (/etc/check_mk/sap.cfg). monitor_paths = [ -# 'SAP CCMS Monitor Templates/Dialog Overview/*', + 'SAP CCMS Monitor Templates/Dialog Overview/*', ] monitor_types = [] config_file = os.getenv('MK_CONFDIR', '/etc/check_mk') + '/sap.cfg'

9 years, 10 months

Check_MK Git: check_mk: Added todo note

by Lars Michelsen

Module: check_mk Branch: master Commit: 15d5074643033497110537cd2755fc441a238e67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15d50746430334… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 25 10:25:49 2014 +0100 Added todo note --- web/htdocs/valuespec.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e090a59..513687c 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -867,6 +867,7 @@ class ListOf(ValueSpec): # Actual table of currently existing entries html.write('<table class="valuespec_listof" id="%s_table">' % varprefix) + # FIXME: Use plug/unplug mechanism instead of transform / then remove transform for nr, v in enumerate(value): html.push_transformation(lambda x: x.replace(self._magic, str(nr+1))) html.write('<tr><td class=vlof_buttons>')

9 years, 10 months

Check_MK Git: check_mk: #1532 FIX mk_sap: Cleaning up old state information from sap.state file

by Lars Michelsen

Module: check_mk Branch: master Commit: 110cd6b42743bc5470cb32f8fa2baf5ab6c40367 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=110cd6b42743bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 25 10:32:32 2014 +0100 #1532 FIX mk_sap: Cleaning up old state information from sap.state file The mk_sap agent plugin writes a state file which contains information for each SAP alert log file which is monitored. Old log files are now cleaned up from this file, when they are not monitored anymore. --- .werks/1532 | 11 +++++++++++ ChangeLog | 1 + agents/plugins/mk_sap | 46 +++++++++++++++++++++++++++++++++++++--------- 3 files changed, 49 insertions(+), 9 deletions(-) diff --git a/.werks/1532 b/.werks/1532 new file mode 100644 index 0000000..bf6feb4 --- /dev/null +++ b/.werks/1532 @@ -0,0 +1,11 @@ +Title: mk_sap: Cleaning up old state information from sap.state file +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1416907854 +Class: fix + +The mk_sap agent plugin writes a state file which contains information +for each SAP alert log file which is monitored. Old log files are now +cleaned up from this file, when they are not monitored anymore. diff --git a/ChangeLog b/ChangeLog index a5092a2..bc3f9df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * 1503 FIX: Fixed monitoring of multiple SAP instances with one mk_sap plugin... * 1515 FIX: cisco_secure: fix service description, fix OK state in case of no violation * 1449 FIX: nginx_status: agent plugin no longer honours "http(s)_proxy" env variables of root user + * 1532 FIX: mk_sap: Cleaning up old state information from sap.state file... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/plugins/mk_sap b/agents/plugins/mk_sap index 8f867df..747f9ae 100755 --- a/agents/plugins/mk_sap +++ b/agents/plugins/mk_sap @@ -109,6 +109,7 @@ SKIP_MTCLASSES = [ ] STATE_FILE = '/etc/check_mk/sap.state' +state_file_changed = False # ############################################################################# @@ -139,7 +140,6 @@ monitor_paths = [ # 'SAP CCMS Monitor Templates/Dialog Overview/*', ] monitor_types = [] -# henri config_file = os.getenv('MK_CONFDIR', '/etc/check_mk') + '/sap.cfg' cfg = {} @@ -156,6 +156,10 @@ try: except IOError: states = {} +# index of all logfiles which have been found in a run. This is used to +# remove logfiles which are not available anymore from the states dict. +logfiles = [] + # ############################################################################# # @@ -322,6 +326,8 @@ def alert_details(cfg, alert): return state, msg def process_alerts(cfg, logs, ms_name, mon_name, node, alerts): + global state_file_changed + sid = node["MTSYSID"].strip() or 'Other' context = node["MTMCNAME"].strip() or 'Other' path = node["PATH"] @@ -330,6 +336,8 @@ def process_alerts(cfg, logs, ms_name, mon_name, node, alerts): hostname = sid logfile = context + "/" + path + logfiles.append((hostname, logfile)) + logs.setdefault(sid, {}) logs[hostname][logfile] = [] newest_log_dt = None @@ -350,7 +358,7 @@ def process_alerts(cfg, logs, ms_name, mon_name, node, alerts): if newest_log_dt: # Write newest log age to cache to prevent double processing of logs states[(hostname, logfile)] = newest_log_dt - file(STATE_FILE, 'w').write(repr(states)) + state_file_changed = True return logs @@ -452,12 +460,32 @@ def check(cfg): # It is possible to configure multiple SAP instances to monitor. Loop them all, but # do not terminate when one connection failed -for entry in cfg: - try: - check(entry) - except sapnwrfc.RFCCommunicationError, e: - sys.stderr.write('ERROR: Unable to connect (%s)\n' % e) - except: - sys.stderr.write('ERROR: Unhandled exception (%s)\n' % e) +processed_all = True +try: + for entry in cfg: + try: + check(entry) + except sapnwrfc.RFCCommunicationError, e: + sys.stderr.write('ERROR: Unable to connect (%s)\n' % e) + processed_all = False + except Exception, e: + sys.stderr.write('ERROR: Unhandled exception (%s)\n' % e) + processed_all = False + + # Now check whether or not an old logfile needs to be removed. This can only + # be done this way, when all hosts have been reached. Otherwise the cleanup + # is skipped. + if processed_all: + for key in states.keys(): + if key not in logfiles: + state_file_changed = True + del states[key] + + # Only write the state file once per run. And only when it has been changed + if state_file_changed: + file(STATE_FILE, 'w').write(repr(states)) + +except Exception, e: + sys.stderr.write('ERROR: Unhandled exception (%s)\n' % e) sys.exit(0)

9 years, 10 months

Check_MK Git: check_mk: Updated bug entries #2206

by Lars Michelsen

Module: check_mk Branch: master Commit: 1cf1c6ae1d62c5a9ae227f405916399805e7e8d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cf1c6ae1d62c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 25 10:14:43 2014 +0100 Updated bug entries #2206 --- .bugs/2206 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.bugs/2206 b/.bugs/2206 new file mode 100644 index 0000000..318df69 --- /dev/null +++ b/.bugs/2206 @@ -0,0 +1,22 @@ +Title: Rework "crashed checks" mechanism +Component: core +State: open +Date: 2014-11-25 10:11:51 +Targetversion: 1.2.5i1 +Class: todo + +The optional crashed checks log should be replaced by a new mechanism +where each exception is written to a dedicated folder hierarchy like +HOST/SERVICE, where only the last exception is stored per service. +It is written as text file where all needed information like + +a) the raw agent output +b) the raw SNMP data +c) the traceback + +are written to. + +This file can be downloaded from the Web-GUI by clicking on an icon +which is shown when there is some file for a service available. + +The files are removed using the diskspace cleanup mechanism regularly.

9 years, 10 months

Check_MK Git: check_mk: #1531 FIX Fixed exception in event history view when displaying CHANGESTATE events

by Lars Michelsen

Module: check_mk Branch: master Commit: 524c7fc406e2833895c2c716a45d875cf4e162a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=524c7fc406e283… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 25 08:57:40 2014 +0100 #1531 FIX Fixed exception in event history view when displaying CHANGESTATE events --- .werks/1531 | 10 ++++++++++ ChangeLog | 1 + mkeventd/web/htdocs/mkeventd.py | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1531 b/.werks/1531 new file mode 100644 index 0000000..846f053 --- /dev/null +++ b/.werks/1531 @@ -0,0 +1,10 @@ +Title: Fixed exception in event history view when displaying CHANGESTATE events +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1416902234 + + diff --git a/ChangeLog b/ChangeLog index f3eed41..a5092a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,7 @@ Event Console: * 1169 Added host state type filter to "recent event history" view + * 1531 FIX: Fixed exception in event history view when displaying CHANGESTATE events HW/SW-Inventory: * 1479 liveproxyd: new function for collecting remote inventory data... diff --git a/mkeventd/web/htdocs/mkeventd.py b/mkeventd/web/htdocs/mkeventd.py index 4e8526c..bd2fb95 100644 --- a/mkeventd/web/htdocs/mkeventd.py +++ b/mkeventd/web/htdocs/mkeventd.py @@ -93,12 +93,13 @@ action_whats = { "COUNTFAILED" : _("Event created by required count was not reached in time"), "UPDATE" : _("Event information updated by user"), "NEW" : _("New event created"), - "DELETE" : _("Event deleted manually bu user"), + "DELETE" : _("Event deleted manually by user"), "EMAIL" : _("Email sent"), "SCRIPT" : _("Script executed"), "CANCELLED" : _("The event was cancelled because the corresponding OK message was received"), "ARCHIVED" : _("Event was archived because no rule matched and archiving is activated in global settings."), "AUTODELETE" : _("Event was deleted automatically"), + "CHANGESTATE" : _("State of event changed by user"), } def service_levels():

9 years, 10 months

Check_MK Git: check_mk: Updated bug entries #2205

by Lars Michelsen

Module: check_mk Branch: master Commit: 51209db66fd5529e420f3f78a2716f6bb4b89112 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51209db66fd552… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 24 15:13:46 2014 +0100 Updated bug entries #2205 --- .bugs/2205 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2205 b/.bugs/2205 new file mode 100644 index 0000000..d9ac414 --- /dev/null +++ b/.bugs/2205 @@ -0,0 +1,10 @@ +Title: Path in debug_log is wrong in distributed WATO setups +Component: wato +State: open +Date: 2014-11-24 15:07:07 +Targetversion: 1.2.5i1 +Class: bug + +The shown path always shows the path on the centeral site. It should either +show the path to the correct site, or better, just a spacer which indicates +that the site id needs to be put into the path.

9 years, 10 months

← Newer
1
2
3
4
5
6
7
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2014