Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64478 discussions

Check_MK Git: check_mk: logwatch: fixed reclassification of solely informational lines

by Andreas Boesl

Module: check_mk Branch: master Commit: c9c6f77a80d09f78942852321c83d5479c18ccae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9c6f77a80d09f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 19 13:34:08 2013 +0200 logwatch: fixed reclassification of solely informational lines --- ChangeLog | 1 + checks/logwatch | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9348809..42fb6d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,7 @@ by the check plugin * agent_vsphere: completely rewritten, now considerably faster vCenter is still queried by old version + * logwatch: fixed reclassification of solely informational lines Notifications: diff --git a/checks/logwatch b/checks/logwatch index 1669bf2..e21c553 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -121,6 +121,7 @@ def logwatch_level_name(level): def logwatch_level_worst(worst, level): if level == 'O': return max(worst, 0) + elif level == 'I': return max(worst, 0) elif level == 'W': return max(worst, 1) elif level == 'u': return max(worst, 1) elif level == 'C': return max(worst, 2)

11 years

Check_MK Git: check_mk: etherbox check: fixed exception in scan function

by Andreas Boesl

Module: check_mk Branch: master Commit: 2f1292a88799399e626fa77349f69a3ec41fe81b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f1292a8879939… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 19 11:01:46 2013 +0200 etherbox check: fixed exception in scan function --- checks/etherbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/etherbox b/checks/etherbox index 45dcfe7..5129ba8 100644 --- a/checks/etherbox +++ b/checks/etherbox @@ -65,7 +65,7 @@ def etherbox_get_sensor(item, item_type, info): raise Exception("Sensor not found") def etherbox_scan(oid): - return oid(".1.3.6.1.4.1.14848.2.1.1.1.0").startswith("Version"), + return oid(".1.3.6.1.4.1.14848.2.1.1.1.0").startswith("Version") etherbox_info = [ ( ".1.3.6.1.4.1.14848.2.1.1.3", [ '' ]), # temperature unit

11 years

Check_MK Git: check_mk: FIX: Slightly more transparent handling of syntax errors when loading rules.mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 9e8f19ed0911b2a0791e1193fa0b21d101a7e863 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e8f19ed0911b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 19 09:49:58 2013 +0200 FIX: Slightly more transparent handling of syntax errors when loading rules.mk --- ChangeLog | 1 + web/htdocs/wato.py | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95702e9..9348809 100644 --- a/ChangeLog +++ b/ChangeLog @@ -202,6 +202,7 @@ "WLC WiFi client connections" * FIX: Snapshot handling is a little more robust agains manually created files in snapshot directory now + * FIX: Slightly more transparent handling of syntax errors when loading rules.mk Notifications: * Flexible Notification can now filter service levels diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 40aba20..c059b11 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11418,7 +11418,11 @@ def save_rule(out, folder, rulespec, rule): def load_rulesets(folder): # TODO: folder berücksichtigen - path = root_dir + "/" + folder[".path"] + "/" + "rules.mk" + if folder[".path"]: + path = root_dir + folder[".path"] + "/" + "rules.mk" + else: + path = root_dir + "rules.mk" + vars = { "ALL_HOSTS" : ALL_HOSTS, "ALL_SERVICES" : [ "" ], @@ -11438,8 +11442,15 @@ def load_rulesets(folder): try: execfile(path, vars, vars) - except: - pass + except IOError: + pass # Non existant files are ok... + except Exception, e: + if config.debug: + raise MKGeneralException(_("Cannot read configuration file %s: %s" % + (path, e))) + else: + html.log('load_rulesets: Problem while loading rulesets (%s - %s). ' + 'Continue with partly loaded rules...' % (path, e)) # Extract only specified rule variables rulevars = {}

11 years

Check_MK Git: check_mk: Updated bug entries #1057

by Götz Golla

Module: check_mk Branch: master Commit: eaefee9909057fbf3daacca1119c0688f3c08f47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eaefee9909057f… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Sep 19 09:47:54 2013 +0200 Updated bug entries #1057 --- .bugs/1057 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/1057 b/.bugs/1057 new file mode 100644 index 0000000..e4d27f3 --- /dev/null +++ b/.bugs/1057 @@ -0,0 +1,10 @@ +Title: Beim Clicken auf Vorschau wird neue Angebotsnummer generiert +Component: wato +State: open +Date: 2013-09-19 09:39:02 +Targetversion: future +Class: bug + +Klicken man beim Erstellen eines Angebots auf den Vorschau-Button, wird anscheinend immer +eine neue Angebotsnummer erzeugt. Sinnvoll vermutlich, dass nur das erste Mal eine Angebotsnummer +erzeugt wird.

11 years

Check_MK Git: check_mk: snapshot removal: only try to remove snapshot files

by Lars Michelsen

Module: check_mk Branch: master Commit: 736ef415552ccb4fef22f3967bc8b5a52a89727b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=736ef415552ccb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 19 09:25:36 2013 +0200 snapshot removal: only try to remove snapshot files --- ChangeLog | 6 ++++-- web/htdocs/wato.py | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d8b89fd..95702e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -188,6 +188,8 @@ Host/Service/Contact Groups, Timeperiods and Roles * Removed "do not connect" option from site socket editor. Use the checkbox "Disable" to disable the site for multisite. + * ADD: Rule to check state of physical switch (currently used by etherbox check) + * ADD: new ruleset cisco_wlc: Allows to configure handling of missing AP * FIX: do validation of check items in rule editor * FIX: More consistent handling of folderpath select in rule editor * FIX: Now correctly handling depends_on_tags on page rendering for @@ -196,10 +198,10 @@ large" error messages during submitting forms * FIX: automation snmp scan now adhere rules for shoddy snmp devices which have no sys description - * ADD: Rule to check state of physical switch (currently used by etherbox check) * FIX: Cisco ruleset "Cisco WLC WiFi client connections" has been generalized to "WLC WiFi client connections" - * ADD: new ruleset cisco_wlc: Allows to configure handling of missing AP + * FIX: Snapshot handling is a little more robust agains manually created + files in snapshot directory now Notifications: * Flexible Notification can now filter service levels diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d3f409a..40aba20 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5292,7 +5292,8 @@ def create_snapshot(): # Maintenance, remove old snapshots snapshots = [] for f in os.listdir(snapshot_dir): - snapshots.append(f) + if f.startswith('wato-snapshot-') and f.endswith('.tar.gz'): + snapshots.append(f) snapshots.sort(reverse=True) while len(snapshots) > config.wato_max_snapshots: log_audit(None, "snapshot-removed", _("Removed snapshot %s") % snapshots[-1])

11 years

Check_MK Git: check_mk: Reserved 5 bug IDS

by Götz Golla

Module: check_mk Branch: master Commit: 2eeba43beb5ca16ebc1df1793fb06116d49c23ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2eeba43beb5ca1… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Sep 19 09:38:31 2013 +0200 Reserved 5 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index c500a5f..3680448 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -1057 +1062

11 years

Check_MK Git: check_mk: fixed representation of snmptrap syslog facility

by Andreas Boesl

Module: check_mk Branch: master Commit: da00488554a3d794befe53f1a0446a6995fa973f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da00488554a3d7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 19 09:10:02 2013 +0200 fixed representation of snmptrap syslog facility --- mkeventd/web/plugins/wato/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 8f56414..f836951 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -964,7 +964,7 @@ def mode_mkeventd_rules(phase): # Syslog Facility if "match_facility" in rule: facnr = rule["match_facility"] - html.write("<td>%s</td>" % mkeventd.syslog_facilities[facnr][1]) + html.write("<td>%s</td>" % dict(mkeventd.syslog_facilities)[facnr]) else: html.write("<td></td>")

11 years

Check_MK Git: check_mk: Fixed browser reload handling for non check_mk urls (nagvis, ...)

by Lars Michelsen

Module: check_mk Branch: master Commit: 6d8dc522ef2167a9aacbc9d9c5debe883c0b2cf7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d8dc522ef2167… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 18 14:19:34 2013 +0200 Fixed browser reload handling for non check_mk urls (nagvis, ...) --- web/htdocs/js/sidebar.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 868b2bc..9a56a2c 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -361,8 +361,9 @@ function contentFrameAccessible() { function update_content_location() { // init the original frameset title - if (g_orig_title == null) + if (g_orig_title == null) { g_orig_title = window.parent.document.title; + } var content_frame = window.parent.frames[1]; @@ -376,7 +377,7 @@ function update_content_location() { window.parent.document.title = page_title; // Construct the URL to be called on page reload - var parts = content_frame.location.pathname.split('/') + var parts = window.parent.location.pathname.split('/') parts.pop(); var cmk_path = parts.join('/'); var rel_url = content_frame.location.pathname + content_frame.location.search + content_frame.location.hash

11 years

Check_MK Git: check_mk: help text for service freshness modified to explain relation to the new feature service staleness

by Götz Golla

Module: check_mk Branch: master Commit: 084e128c035fda5d6cb8b6c784068869dcb83cb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=084e128c035fda… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Sep 18 13:52:14 2013 +0200 help text for service freshness modified to explain relation to the new feature service staleness --- web/plugins/wato/active_checks.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index e978655..2562b65 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -873,8 +873,14 @@ register_rule(group, Dictionary( title = _("Check freshness"), help = _("Freshness checking is only useful for passive checks. It makes sure that passive " - "check results are submitted on a regular base. If not, the check is being set to " - "warning, critical or unknown."), + "check results are submitted on a regular basis. If not, the check is being set to " + "warning, critical or unknown.<br>" + "The freshness checking works in addition to the staleness feature. The latter grays " + "out passive checks for which no data were received after an interval. The interval " + "is calculated from the staleness value in <tt>Global Settings</tt> multiplied by " + "the normal check interval defined in a separate rule (default is 60sec). If you use " + "freshness checking you might want to modify the normal check interval for your check " + "as well."), optional_keys = False, elements = [ ( "interval",

11 years

Check_MK Git: check_mk: Move some code from check_mk_base.py to check_mk.py

by Mathias Kettner

Module: check_mk Branch: master Commit: 377c9b3573ffcc524bb62a2fc1ff91d1d8246b83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=377c9b3573ffcc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 18 13:46:39 2013 +0200 Move some code from check_mk_base.py to check_mk.py This makes the precompiled host checks smaller --- modules/check_mk.py | 118 ++++++++++++++++++++++++++++++++++++++++++++++ modules/check_mk_base.py | 118 ---------------------------------------------- 2 files changed, 118 insertions(+), 118 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index d911cd9..83d4571 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4957,6 +4957,124 @@ def ip_to_dnsname(ip): return None +# Reset some global variable to their original value. This +# is needed in keepalive mode. +# We could in fact do some positive caching in keepalive +# mode - e.g. the counters of the hosts could be saved in memory. +def cleanup_globals(): + global g_agent_already_contacted + g_agent_already_contacted = {} + global g_hostname + g_hostname = "unknown" + global g_counters + g_counters = {} + global g_infocache + g_infocache = {} + global g_broken_agent_hosts + g_broken_agent_hosts = set([]) + global g_broken_snmp_hosts + g_broken_snmp_hosts = set([]) + global g_inactive_timerperiods + g_inactive_timerperiods = None + global g_walk_cache + g_walk_cache = {} + + +# Diagnostic function for detecting global variables that have +# changed during checking. This is slow and canno be used +# in production mode. +def copy_globals(): + import copy + global_saved = {} + for varname, value in globals().items(): + # Some global caches are allowed to change. + if varname not in [ "g_service_description", "g_multihost_checks", "g_check_table_cache", "g_singlehost_checks", "total_check_outout" ] \ + and type(value).__name__ not in [ "function", "module", "SRE_Pattern" ]: + global_saved[varname] = copy.copy(value) + return global_saved + + +def do_check_keepalive(): + global g_initial_times + + def check_timeout(signum, frame): + raise MKCheckTimeout() + + signal.signal(signal.SIGALRM, signal.SIG_IGN) # Prevent ALRM from CheckHelper.cc + + global total_check_output + total_check_output = "" + if opt_debug: + before = copy_globals() + + ipaddress_cache = {} + + while True: + cleanup_globals() + hostname = sys.stdin.readline() + g_initial_times = os.times() + if not hostname: + break + hostname = hostname.strip() + if hostname == "*": + if opt_debug: + sys.stdout.write("Restarting myself...\n") + sys.stdout.flush() + os.execvp("cmk", sys.argv) + elif not hostname: + break + + timeout = int(sys.stdin.readline()) + 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: + 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 + + 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\n" % timeout + + sys.stdout.write("%03d\n%08d\n%s" % + (status, len(total_check_output), total_check_output)) + sys.stdout.flush() + total_check_output = "" + cleanup_globals() + + # Check if all global variables are clean, but only in debug mode + if opt_debug: + after = copy_globals() + for varname, value in before.items(): + if value != after[varname]: + sys.stderr.write("WARNING: global variable %s has changed: %r ==> %s\n" + % (varname, value, repr(after[varname])[:50])) + new_vars = set(after.keys()).difference(set(before.keys())) + if (new_vars): + sys.stderr.write("WARNING: new variable appeared: %s" % ", ".join(new_vars)) + + except Exception, e: + if opt_debug: + raise + sys.stdout.write("UNKNOWN - %s\n3\n" % e) + + + # +----------------------------------------------------------------------+ # | ____ _ __ _ | diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index f715f2c..6e54c8d 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -949,128 +949,10 @@ def do_check(hostname, ipaddress, only_check_types = None): sys.stdout.write(nagios_state_names[status] + " - " + output) sys.exit(status) - -# Reset some global variable to their original value. This -# is needed in keepalive mode. -# We could in fact do some positive caching in keepalive -# mode - e.g. the counters of the hosts could be saved in memory. -def cleanup_globals(): - global g_agent_already_contacted - g_agent_already_contacted = {} - global g_hostname - g_hostname = "unknown" - global g_counters - g_counters = {} - global g_infocache - g_infocache = {} - global g_broken_agent_hosts - g_broken_agent_hosts = set([]) - global g_broken_snmp_hosts - g_broken_snmp_hosts = set([]) - global g_inactive_timerperiods - g_inactive_timerperiods = None - global g_walk_cache - g_walk_cache = {} - - -# Diagnostic function for detecting global variables that have -# changed during checking. This is slow and canno be used -# in production mode. -def copy_globals(): - import copy - global_saved = {} - for varname, value in globals().items(): - # Some global caches are allowed to change. - if varname not in [ "g_service_description", "g_multihost_checks", "g_check_table_cache", "g_singlehost_checks", "total_check_outout" ] \ - and type(value).__name__ not in [ "function", "module", "SRE_Pattern" ]: - global_saved[varname] = copy.copy(value) - return global_saved - - # Keepalive-mode for running cmk as a check helper. class MKCheckTimeout(Exception): pass -def do_check_keepalive(): - global g_initial_times - - def check_timeout(signum, frame): - raise MKCheckTimeout() - - signal.signal(signal.SIGALRM, signal.SIG_IGN) # Prevent ALRM from CheckHelper.cc - - global total_check_output - total_check_output = "" - if opt_debug: - before = copy_globals() - - ipaddress_cache = {} - - while True: - cleanup_globals() - hostname = sys.stdin.readline() - g_initial_times = os.times() - if not hostname: - break - hostname = hostname.strip() - if hostname == "*": - if opt_debug: - sys.stdout.write("Restarting myself...\n") - sys.stdout.flush() - os.execvp("cmk", sys.argv) - elif not hostname: - break - - timeout = int(sys.stdin.readline()) - 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: - 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 - - 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\n" % timeout - - sys.stdout.write("%03d\n%08d\n%s" % - (status, len(total_check_output), total_check_output)) - sys.stdout.flush() - total_check_output = "" - cleanup_globals() - - # Check if all global variables are clean, but only in debug mode - if opt_debug: - after = copy_globals() - for varname, value in before.items(): - if value != after[varname]: - sys.stderr.write("WARNING: global variable %s has changed: %r ==> %s\n" - % (varname, value, repr(after[varname])[:50])) - new_vars = set(after.keys()).difference(set(before.keys())) - if (new_vars): - sys.stderr.write("WARNING: new variable appeared: %s" % ", ".join(new_vars)) - - except Exception, e: - if opt_debug: - raise - sys.stdout.write("UNKNOWN - %s\n3\n" % e) - - def check_unimplemented(checkname, params, info): return (3, 'UNKNOWN - Check not implemented')

11 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits