Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

3335 FIX Improved error handling when requested rule pack does not exist

by Lars Michelsen

Module: check_mk Branch: master Commit: c681ae684805d14b0ebbdc9fa9b2dc4f9de6be35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c681ae684805d1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 15:11:21 2016 +0100 3335 FIX Improved error handling when requested rule pack does not exist --- .werks/3335 | 10 ++++++++++ ChangeLog | 1 + mkeventd/web/plugins/wato/mkeventd.py | 1 + 3 files changed, 12 insertions(+) diff --git a/.werks/3335 b/.werks/3335 new file mode 100644 index 0000000..740e9d8 --- /dev/null +++ b/.werks/3335 @@ -0,0 +1,10 @@ +Title: Improved error handling when requested rule pack does not exist +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458569464 + + diff --git a/ChangeLog b/ChangeLog index 93604b6..33aff24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -186,6 +186,7 @@ * 3262 Event Console: bulk delete button for custom MIBs now available * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... * 3097 FIX: mkeventd: fixed crash with non-descriptive error message if mibs couldn't be loaded + * 3335 FIX: Improved error handling when requested rule pack does not exist Livestatus: * 3233 FIX: Fixed shutdown of Nagios core with Livestatus module... diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index a0c356b..1c431b6 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1141,6 +1141,7 @@ def rule_pack_with_id(rule_packs, rule_pack_id): for nr, entry in enumerate(rule_packs): if entry["id"] == rule_pack_id: return nr, entry + raise MKUserError(None, _("The requested rule pack does not exist.")) def mode_mkeventd_rules(phase):

8 years, 6 months

Speedup interactive graph zooming/ panning in case of multi-language environment

by Mathias Kettner

Module: check_mk Branch: master Commit: 3756327332c3985c43517d3fbb8ff5791b6b1b07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3756327332c398… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 15:07:52 2016 +0100 Speedup interactive graph zooming/panning in case of multi-language environment --- web/htdocs/modules.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/web/htdocs/modules.py b/web/htdocs/modules.py index 1b8e064..6096433 100644 --- a/web/htdocs/modules.py +++ b/web/htdocs/modules.py @@ -96,11 +96,26 @@ def init_modules(): modules += [ globals()[m] for m in set(imports()).difference(module_names_prev) ] +g_all_modules_loaded = False + # Call the load_plugins() function in all modules def load_all_plugins(): + global g_all_modules_loaded + + # CLEANUP: Move this to the pagehandlers if this concept works out. + if html.myfile == "ajax_graph" and g_all_modules_loaded: + only_modules = ["metrics"] + else: + only_modules = None + + g_all_modules_loaded = True + + need_plugins_reload = local_web_plugins_have_changed() for module in modules: + if only_modules != None and get_module_name(module) not in only_modules: + continue try: module.load_plugins # just check if this function exists except AttributeError:

8 years, 6 months

3334 blade_bays: Added checks for power consumption

by Lars Michelsen

Module: check_mk Branch: master Commit: 715b6d77c73e2c009f6eb4ed3088e7cefd7be0d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=715b6d77c73e2c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 14:49:47 2016 +0100 3334 blade_bays: Added checks for power consumption --- .werks/3334 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/3334 b/.werks/3334 new file mode 100644 index 0000000..fe67e9c --- /dev/null +++ b/.werks/3334 @@ -0,0 +1,9 @@ +Title: blade_bays: Added checks for power consumption +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1458568174 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 0df8071..93604b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ * 3012 jolokia_metrics.threads: Improved check output, now showing the actual problem and levels * 3272 oracle_tablespaces: severity of check for autoextension is now configurable... * 3292 livestatus_status: Added Microcore relevant metrics like helper usage and latency... + * 3334 blade_bays: Added checks for power consumption * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters

8 years, 6 months

3333 FIX Predictive levels: Improved error handling in case no RRDs have been created yet

by Lars Michelsen

Module: check_mk Branch: master Commit: 5fe55e423bd4e55c2e6a5ae306bfbafd06e84878 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fe55e423bd4e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 14:44:13 2016 +0100 3333 FIX Predictive levels: Improved error handling in case no RRDs have been created yet --- .werks/3333 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 6 ++++++ modules/prediction.py | 3 +++ 4 files changed, 20 insertions(+) diff --git a/.werks/3333 b/.werks/3333 new file mode 100644 index 0000000..1a246ca --- /dev/null +++ b/.werks/3333 @@ -0,0 +1,10 @@ +Title: Predictive levels: Improved error handling in case no RRDs have been created yet +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458567828 + + diff --git a/ChangeLog b/ChangeLog index e5371d9..0df8071 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,7 @@ * 3299 FIX: mssql_backup: Fixed exception in case of invalid agent output * 3300 FIX: zfsget: Fixed excluding snapshots from zfsget section * 3301 FIX: mrpe: Fixed exception "urllib not defined" when using Nagios as core + * 3333 FIX: Predictive levels: Improved error handling in case no RRDs have been created yet Multisite: * 3187 notification view: new filter for log command via regex diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 422c90f..991338f 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -2113,6 +2113,12 @@ def check_levels(value, dsname, params, unit="", factor=1.0, scale=1.0, statemar infotexts.append("predicted reference: %.2f%s" % (ref_value / scale, unit)) else: infotexts.append("no reference for prediction yet") + + except MKGeneralException, e: + ref_value = None + warn_upper, crit_upper, warn_lower, crit_lower = None, None, None, None + infotexts.append("no reference for prediction (%s)" % e) + except Exception, e: if opt_debug: raise diff --git a/modules/prediction.py b/modules/prediction.py index 4700911..53d3cb8 100644 --- a/modules/prediction.py +++ b/modules/prediction.py @@ -48,6 +48,9 @@ def get_rrd_data(hostname, service_description, varname, cf, fromtime, untiltime raise raise MKGeneralException("Cannot get historic metrics via Livestatus: %s" % e) + if not response: + raise MKGeneralException("Got no historic metrics") + real_fromtime, real_untiltime, step = response[:3] values = response[3:] return step, values

8 years, 6 months

Reserved 30 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 8bd799570baa5862694a1a1133b11185341fe823 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8bd799570baa58… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 14:43:35 2016 +0100 Reserved 30 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 3bd9bce..994cdb5 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3333 +3363

8 years, 6 months

3105 FIX fixed crash in cmk --dump for services containing non-ascii characters

by Sebastian Herbord

Module: check_mk Branch: master Commit: 3661fae796a6f560b4990664a5740da3271f5cd3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3661fae796a6f5… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Mar 21 14:07:03 2016 +0100 3105 FIX fixed crash in cmk --dump for services containing non-ascii characters --- .werks/3105 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/3105 b/.werks/3105 new file mode 100644 index 0000000..8624c23 --- /dev/null +++ b/.werks/3105 @@ -0,0 +1,10 @@ +Title: fixed crash in cmk --dump for services containing non-ascii characters +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458565578 + + diff --git a/ChangeLog b/ChangeLog index 31e8866..e5371d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * 3275 FIX: Piggyback based services were skipped on "No agent hosts"... * 3286 FIX: Fixing possible logging issues when using datasource programs for monitoring... * 3008 FIX: Fixed exception in logwatch config generation when using Nagios... + * 3105 FIX: fixed crash in cmk --dump for services containing non-ascii characters Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller diff --git a/modules/check_mk.py b/modules/check_mk.py index 3287a46..deb0da5 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3800,9 +3800,9 @@ def dump_host(hostname): print_table(headers, colors, [ [ checktype, - item, + make_utf8(item), params, - description, + make_utf8(description), make_utf8(",".join(service_extra_conf(hostname, description, service_groups))), if_aggr(aggregated_service_name(hostname, description)), if_aggr(",".join(service_extra_conf(hostname, aggregated_service_name(hostname, description), summary_service_groups))),

8 years, 6 months

3302 FIX Improved error handling when trying to edit a not existing rule

by Lars Michelsen

Module: check_mk Branch: master Commit: 4eb42c3f88e9f90faf7f88198ac56896d5568a38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4eb42c3f88e9f9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 13:53:30 2016 +0100 3302 FIX Improved error handling when trying to edit a not existing rule --- .werks/3302 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 14 +++++++++++--- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.werks/3302 b/.werks/3302 new file mode 100644 index 0000000..f851793 --- /dev/null +++ b/.werks/3302 @@ -0,0 +1,10 @@ +Title: Improved error handling when trying to edit a not existing rule +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458564780 + + diff --git a/ChangeLog b/ChangeLog index 1407d2b..31e8866 100644 --- a/ChangeLog +++ b/ChangeLog @@ -159,6 +159,7 @@ * 3296 FIX: Hiding pending changes related buttons after discarding changes * 3314 FIX: Correctly add custom user attribute values after change in attribute declaration... * 3316 FIX: Fix validation of empty or missing file uploads (such as in Bulk host import) + * 3302 FIX: Improved error handling when trying to edit a not existing rule Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ecd7132..02b4dcc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12780,10 +12780,18 @@ def mode_edit_rule(phase, new = False): if phase != "action": html.message(_("Cannot create rule: %s") % e) return - rulenr = len(rules) + rulenr = len(rules) else: - rulenr = int(html.var("rulenr")) - rule = rules[rulenr] + rulenr = int(html.var("rulenr")) + try: + rule = rules[rulenr] + except IndexError: + if phase == "action": + raise MKUserError("rulenr", _("You are trying to edit a rule which does not exist " + "anymore.")) + else: + html.show_error(_("You are trying to edit a rule which does not exist anymore.")) + return valuespec = rulespec.get("valuespec") value, tag_specs, host_list, item_list, rule_options = parse_rule(rulespec, rule)

8 years, 6 months

3301 FIX mrpe: Fixed exception "urllib not defined" when using Nagios as core

by Lars Michelsen

Module: check_mk Branch: master Commit: 755a99f7621e78e2af7a9440f9c06bd74c350470 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=755a99f7621e78… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 21 13:30:28 2016 +0100 3301 FIX mrpe: Fixed exception "urllib not defined" when using Nagios as core --- .werks/3301 | 10 ++++++++++ ChangeLog | 1 + checks/mrpe | 2 ++ 3 files changed, 13 insertions(+) diff --git a/.werks/3301 b/.werks/3301 new file mode 100644 index 0000000..652b58c --- /dev/null +++ b/.werks/3301 @@ -0,0 +1,10 @@ +Title: mrpe: Fixed exception "urllib not defined" when using Nagios as core +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458563402 + + diff --git a/ChangeLog b/ChangeLog index 5536aff..1407d2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ * 3298 FIX: winperf_processor.util: Fixed exception when CPU counters were not matched * 3299 FIX: mssql_backup: Fixed exception in case of invalid agent output * 3300 FIX: zfsget: Fixed excluding snapshots from zfsget section + * 3301 FIX: mrpe: Fixed exception "urllib not defined" when using Nagios as core Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/mrpe b/checks/mrpe index d9232f3..118fbeb 100644 --- a/checks/mrpe +++ b/checks/mrpe @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. def inventory_mrpe(info): + import urllib items = [] for line in info: # New Linux agent sends (check_name) in first column. Stay @@ -45,6 +46,7 @@ def mrpe_parse_perfdata(perfinfo): def check_mrpe(item, params, info): + import urllib # This check is cluster-aware. An item might be found # more than once. In that case we use the best of the # multiple statuses.

8 years, 6 months

Updated bug entries #2491

by Mathias Kettner

Module: check_mk Branch: master Commit: cf3ab5de26d3701d2ae3b2b6b444efe6b6a3eccf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf3ab5de26d370… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 12:53:42 2016 +0100 Updated bug entries #2491 --- .bugs/2491 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/2491 b/.bugs/2491 index c893897..2b68e73 100644 --- a/.bugs/2491 +++ b/.bugs/2491 @@ -1,8 +1,10 @@ Title: Rules of Monitoring Agents are applied to GENERIC host Component: wato -State: open +Class: bug +State: done Date: 2016-03-18 13:15:47 Targetversion: 1.2.8 -Class: bug All rules of the Agent Bakery are applied to the default host GENERIC. Although there are conditions like hostname or tags. + +2016-03-21 12:53:40: changed state open -> done

8 years, 6 months

New helper function generic_host_extra_conf

by Mathias Kettner

Module: check_mk Branch: master Commit: 83e3030ea6cde23722213419065cd1d7d1867694 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83e3030ea6cde2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 21 12:49:16 2016 +0100 New helper function generic_host_extra_conf --- modules/check_mk.py | 51 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 280ea23..3287a46 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -709,20 +709,10 @@ def convert_host_ruleset(ruleset): sys.stderr.write('WARNING: deprecated entry [ "" ] in host configuration list\n') for rule in ruleset: - rule, rule_options = get_rule_options(rule) + item, tags, hostlist, rule_options = parse_host_rule(rule) if rule_options.get("disabled"): continue - num_elements = len(rule) - if num_elements == 2: - item, hostlist = rule - tags = [] - elif num_elements == 3: - item, tags, hostlist = rule - else: - raise MKGeneralException("Invalid entry '%r' in host configuration list: must " - "have 2 or 3 entries" % (rule,)) - # Directly compute set of all matching hosts here, this # will avoid recomputation later new_rules.append((item, all_matching_hosts(tags, hostlist, with_foreign_hosts=True))) @@ -739,14 +729,45 @@ def host_extra_conf(hostname, ruleset): entries = [] for item, hostname_list in ruleset: - # Hack for the agent bakery: The hostname may be "True" which is used - # for the generic agent. When the hostname is True it should match - # without conditions. - if hostname == True or hostname in hostname_list: + if hostname in hostname_list: entries.append(item) return entries +def parse_host_rule(rule): + rule, rule_options = get_rule_options(rule) + + num_elements = len(rule) + if num_elements == 2: + item, hostlist = rule + tags = [] + elif num_elements == 3: + item, tags, hostlist = rule + else: + raise MKGeneralException("Invalid entry '%r' in host configuration list: must " + "have 2 or 3 entries" % (rule,)) + + return item, tags, hostlist, rule_options + + +# Needed for agent bakery: Compute ruleset for "generic" host. This +# fictious host has no name and no tags. It matches all rules that +# do not require specific hosts or tags. But it matches rules that +# e.g. except specific hosts or tags (is not, has not set) +def generic_host_extra_conf(ruleset): + entries = [] + + for rule in ruleset: + item, tags, hostlist, rule_options = parse_host_rule(rule) + if tags and not hosttags_match_taglist([], tags): + continue + if not in_extraconf_hostlist(hostlist, ""): + continue + + entries.append(item) + return entries + + def host_extra_conf_merged(hostname, conf): rule_dict = {} for rule in host_extra_conf(hostname, conf):

8 years, 6 months

← Newer
1
2
3
4
5
6
7
8
9
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016