Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

#3250 FIX cisco_mem: remove bogus memory check for "Driver text"

by Mathias Kettner

Module: check_mk Branch: master Commit: e2ece336b8dcf66dce6d0d820dbfebe21e5a5891 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2ece336b8dcf6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 26 16:51:31 2016 +0100 #3250 FIX cisco_mem: remove bogus memory check for "Driver text" Some C3XXX devices send this information which 40 Bytes used memory of 1 MB, which seems to be totally useless. We no longer discover these items now. --- .werks/3250 | 11 +++++++++++ ChangeLog | 1 + checks/cisco_mem.include | 5 ++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/3250 b/.werks/3250 new file mode 100644 index 0000000..a61c217 --- /dev/null +++ b/.werks/3250 @@ -0,0 +1,11 @@ +Title: cisco_mem: remove bogus memory check for "Driver text" +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456501845 + +Some C3XXX devices send this information which 40 Bytes used memory of 1 MB, +which seems to be totally useless. We no longer discover these items now. diff --git a/ChangeLog b/ChangeLog index 6289efe..c433715 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ * 2997 FIX: Fixed broken SNMP subchecks... * 3243 FIX: Fix missing custom graphs in sidebar snapin Views if explicit topic is set * 3245 FIX: Fix interpretation of check levels 0.0 as "no levels"... + * 3250 FIX: cisco_mem: remove bogus memory check for "Driver text"... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/cisco_mem.include b/checks/cisco_mem.include index 1229d0c..f6f2148 100644 --- a/checks/cisco_mem.include +++ b/checks/cisco_mem.include @@ -27,7 +27,10 @@ cisco_mem_default_levels = (80.0, 90.0) def inventory_cisco_mem(info): - return [ (line[0], "cisco_mem_default_levels") for line in info ] + return [ + (line[0], "cisco_mem_default_levels") + for line in info + if line[0] != "Driver text" ] def check_cisco_mem(item, params, info): for line in info:

8 years, 9 months

cisco_mem: avoid fetching non-standard OID during SNMP scan

by Mathias Kettner

Module: check_mk Branch: master Commit: 56f9125cafb8aef5dfa1e7ad7958a2600ed7f2aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56f9125cafb8ae… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 26 16:46:20 2016 +0100 cisco_mem: avoid fetching non-standard OID during SNMP scan --- checks/cisco_mem | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/cisco_mem b/checks/cisco_mem index 5f07a68..ee0d859 100644 --- a/checks/cisco_mem +++ b/checks/cisco_mem @@ -36,7 +36,8 @@ check_info["cisco_mem"] = { "service_description" : "Mem used %s", "has_perfdata" : True, "group" : "cisco_mem", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.9.9.48.1.1.1.6.1") \ + "snmp_scan_function" : lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ + oid(".1.3.6.1.4.1.9.9.48.1.1.1.6.1") \ and not oid(".1.3.6.1.2.1.1.1.0").lower().startswith("cisco adaptive security"), "snmp_info" : ( ".1.3.6.1.4.1.9.9.48.1.1.1", [ "2", "5", "6", "7" ]), "includes" : ['cisco_mem.include'],

8 years, 9 months

solaris agent no longer tries to run prtdiag in local zones

by Sebastian Herbord

Module: check_mk Branch: master Commit: f87bb35eff5e9db19b5b6be4914675bbfadd0283 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f87bb35eff5e9d… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Feb 26 16:06:40 2016 +0100 solaris agent no longer tries to run prtdiag in local zones --- agents/check_mk_agent.solaris | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 9a0eba0..3cf8046 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -268,7 +268,11 @@ fi if type prtdiag >/dev/null 2>&1 then - run_cached -s solaris_prtdiag_status 300 '/usr/sbin/prtdiag 1>/dev/null 2>&1; echo $?' + # prtdiag does not work in local zones + if [ "$zonename" == "global" ] + then + run_cached -s solaris_prtdiag_status 300 '/usr/sbin/prtdiag 1>/dev/null 2>&1; echo $?' + fi fi # TCP Connection stats

8 years, 9 months

#3249 FIX Fix missing filter for non-OK services when report is called via context button

by Mathias Kettner

Module: check_mk Branch: master Commit: 889d3bb74a3c661cd7ce254398db093323e34ca0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=889d3bb74a3c66… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 26 16:06:53 2016 +0100 #3249 FIX Fix missing filter for non-OK services when report is called via context button --- .werks/3249 | 10 ++++ ChangeLog | 3 ++ web/plugins/views/builtin.py | 122 +++++------------------------------------- 3 files changed, 25 insertions(+), 110 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=889d3bb74a…

8 years, 9 months

#3248 FIX Avoid broken list of context filters and case of a BI error

by Mathias Kettner

Module: check_mk Branch: master Commit: 969eaa5f0094b4d3eacf15224224f96e4a93649b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=969eaa5f0094b4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 26 12:28:32 2016 +0100 #3248 FIX Avoid broken list of context filters and case of a BI error --- .werks/3248 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/bi.py | 10 +++++----- web/htdocs/visuals.py | 9 ++++++++- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.werks/3248 b/.werks/3248 new file mode 100644 index 0000000..2bd67df --- /dev/null +++ b/.werks/3248 @@ -0,0 +1,10 @@ +Title: Avoid broken list of context filters and case of a BI error +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456486084 + + diff --git a/ChangeLog b/ChangeLog index 339165b..06d9c2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ * 3076 FIX: fixed broken views in check_mk raw edition * 3077 FIX: CSV export is now available for host/service availability and now includes summary line * 3181 FIX: Omit icon for downloading agent output on shadow hosts (cmcdump)... + * 3248 FIX: Avoid broken list of context filters and case of a BI error WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index d6033a2..c4d32c1 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -720,23 +720,23 @@ def compile_aggregation_rule(aggr_type, rule, args, lvl): ) if len(rule) != 4: - raise MKConfigError(_("<b>Invalid aggregation rule</b><br><br>" + raise MKConfigError(_("<b>Invalid BI aggregation rule</b>: " "Aggregation rules must contain four elements: description, argument list, " "aggregation function and list of nodes. Your rule has %d elements: " "<pre>%s</pre>") % (len(rule), pprint.pformat(rule))) if lvl == 50: - raise MKConfigError(_("<b>Depth limit reached</b><br><br>" + raise MKConfigError(_("<b>BI depth limit reached</b>: " "The nesting level of aggregations is limited to 50. You either configured " - "too many levels or built an infinite recursion. This happened in rule <pre>%s</pre>") + "too many levels or built an infinite recursion. This happened in rule %s") % pprint.pformat(rule)) description, arglist, funcname, nodes = rule # check arguments and convert into dictionary if len(arglist) != len(args): - raise MKConfigError(_("<b>Invalid rule usage</b><br><br>" - "The rule '%s' needs %d arguments: <tt>%s</tt><br>" + raise MKConfigError(_("<b>Invalid BI rule usage</b>: " + "The rule '%s' needs %d arguments: <tt>%s</tt>. " "You've specified %d arguments: <tt>%s</tt>") % ( description, len(arglist), repr(arglist), len(args), repr(args))) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 2b0c763..4a85a30 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -821,7 +821,14 @@ def show_filter(f): html.write('<div class="floatfilter %s">' % (f.double_height() and "double" or "single")) html.write('<div class=legend>%s</div>' % html.attrencode(f.title)) html.write('<div class=content>') - f.display() + try: + f.display() + except Exception, e: + if config.debug: + raise + html.icon(_("This filter cannot be displayed"), "alert") + html.write("%s" % e) + html.write("</div>") html.write("</div>")

8 years, 9 months

#3247 FIX Do not allow multiple BI aggregates with the same title

by Mathias Kettner

Module: check_mk Branch: master Commit: c6bf2d3a7a28ce838e2a70fdfc4aa3e36486a481 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6bf2d3a7a28ce… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 26 12:14:15 2016 +0100 #3247 FIX Do not allow multiple BI aggregates with the same title Doing that leads into several anomalies and strange behaviour. The BI titles must be unique. This is now enforced and an error printed in cased. --- .werks/3247 | 12 ++++++++++++ ChangeLog | 3 +++ web/htdocs/bi.py | 17 +++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/.werks/3247 b/.werks/3247 new file mode 100644 index 0000000..36528e5 --- /dev/null +++ b/.werks/3247 @@ -0,0 +1,12 @@ +Title: Do not allow multiple BI aggregates with the same title +Level: 2 +Component: bi +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456485207 + +Doing that leads into several anomalies and strange behaviour. The BI +titles must be unique. This is now enforced and an error printed in +cased. diff --git a/ChangeLog b/ChangeLog index fde18f8..339165b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -71,6 +71,9 @@ * 2998 FIX: Fixed broken WATO rules where content is dynamically loaded... * 3246 FIX: Fix link for editing a BI aggregation after coming back from the details of another aggregation... + BI: + * 3247 FIX: Do not allow multiple BI aggregates with the same title... + Event Console: * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 3b3dc7c..d6033a2 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -422,6 +422,8 @@ def compile_forest(user, only_hosts = None, only_groups = None): # Remember successful compile in cache g_cache[user] = cache + check_title_uniqueness(cache["forest"]) + if compile_logging(): num_total_aggr = 0 for grp, aggrs in cache['forest'].iteritems(): @@ -464,6 +466,21 @@ def compile_forest(user, only_hosts = None, only_groups = None): len(config.host_aggregations), )) + +def check_title_uniqueness(forest): + known_titles = set() + for group, aggrs in forest.iteritems(): + for aggr in aggrs: + title = aggr["title"] + if title in known_titles: + raise MKConfigError(_("Duplicate BI aggregation with the title \"<b>%s</b>\". " + "Please check your BI configuration and make sure that within each group no aggregation has " + "the same title as any other. Note: you can use arguments in the top level " + "aggregation rule, like <tt>Host $HOST$</tt>.") % ( + html.attrencode(title))) + else: + known_titles.add(title) + def compile_logging(): return config.bi_compile_log is not None

8 years, 9 months

#3246 FIX Fix link for editing a BI aggregation after coming back from the details of another aggregation

by Mathias Kettner

Module: check_mk Branch: master Commit: 7c994c9e584ddcb4c3a0c2f51050f1ccfde4178c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c994c9e584ddc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 26 12:13:18 2016 +0100 #3246 FIX Fix link for editing a BI aggregation after coming back from the details of another aggregation The problem occurred if you tried to edit first one aggregation, then directly after that another one. --- .werks/3246 | 11 +++++++++++ ChangeLog | 1 + web/plugins/wato/bi.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3246 b/.werks/3246 new file mode 100644 index 0000000..b15da17 --- /dev/null +++ b/.werks/3246 @@ -0,0 +1,11 @@ +Title: Fix link for editing a BI aggregation after coming back from the details of another aggregation +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456485140 + +The problem occurred if you tried to edit first one aggregation, then +directly after that another one. diff --git a/ChangeLog b/ChangeLog index 3f96778..fde18f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ * 3180 FIX: Fix broken site specific globals and disabling of WATO in slave sites * 3182 FIX: Fix bulk operations based on search result folder... * 2998 FIX: Fixed broken WATO rules where content is dynamically loaded... + * 3246 FIX: Fix link for editing a BI aggregation after coming back from the details of another aggregation... Event Console: * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 81333f6..cd38c59 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -996,7 +996,7 @@ class ModeBIAggregations(ModeBI): for nr, aggregation in enumerate(self._pack["aggregations"]): table.row() table.cell(_("Actions"), css="buttons") - edit_url = html.makeuri([("mode", "bi_edit_aggregation"), ("id", nr)]) + edit_url = html.makeuri_contextless([("mode", "bi_edit_aggregation"), ("id", nr), ("pack", self._pack_id)]) html.icon_button(edit_url, _("Edit this aggregation"), "edit") if self.is_contact_for_pack(): delete_url = html.makeactionuri([("_del_aggr", nr)])

8 years, 9 months

Better handling of exceptions in context icon handlers

by Mathias Kettner

Module: check_mk Branch: master Commit: 6c5a0ec38232c31bb85356fb67c1f4fc56cc4618 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c5a0ec38232c3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 26 11:59:58 2016 +0100 Better handling of exceptions in context icon handlers --- web/plugins/views/painters.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 645d296..fde0003 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -276,7 +276,12 @@ def process_multisite_icons(what, row, tags, custom_vars, toplevel): # b) single string - the icon name (without .png) # c) tuple - icon, title # d) triple - icon, title, url - result = icon['paint'](what, row, tags, custom_vars) + try: + result = icon['paint'](what, row, tags, custom_vars) + except Exception, e: + if config.debug: + raise + result = ("alert", "%s" % e) if result == None: continue

8 years, 9 months

#3235 FIX Unbreak COMMAND handling

by Sven Panne

Module: check_mk Branch: master Commit: 97a9ef60dd88eb78ec4b0e80f6143885259b8882 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97a9ef60dd88eb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 26 11:22:11 2016 +0100 #3235 FIX Unbreak COMMAND handling Due to a recent bug, only the first of several COMMANDs piped into livestatus was executed. This made e.g. replaying the output of cmcdump impossible. This has been fixed now. --- .werks/3235 | 13 +++++++++++++ ChangeLog | 1 + livestatus/src/InputBuffer.cc | 42 ++++++++++++++++++++--------------------- livestatus/src/InputBuffer.h | 6 ++++-- livestatus/src/Query.cc | 2 +- livestatus/src/Query.h | 2 +- livestatus/src/Store.cc | 31 +++++++++++++++++++++--------- livestatus/src/Store.h | 2 +- 8 files changed, 64 insertions(+), 35 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=97a9ef60dd…

8 years, 9 months

Better online help BI aggregation worst

by Mathias Kettner

Module: check_mk Branch: master Commit: 77fb6f6f4d161e2b2fe85e170892ccb37f12ce27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77fb6f6f4d161e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 26 11:23:34 2016 +0100 Better online help BI aggregation worst --- web/plugins/wato/bi.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 9f89fa5..81333f6 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1454,9 +1454,10 @@ bi_aggregation_functions["worst"] = { Integer( help = _("Normally this value is <tt>1</tt>, which means that the worst state " "of all child nodes is being used as the total state. If you set it for example " - "to <tt>2</tt>, then the node with the worst state is not being regarded. " - "If the states of the child nodes would be CRIT, WARN and OK, then to total " - "state would be WARN."), + "to <tt>3</tt>, then instead the node with the 3rd worst state is being regarded. " + "Example: In the case of five nodes with the states CRIT CRIT WARN OK OK then " + "resulting state would be WARN. Or you could say that the worst to nodes are " + "first dropped and then the worst of the remaining nodes defines the state. "), title = _("Take n'th worst state for n = "), default_value = 1, min_value = 1),

8 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016