Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

#3245 FIX Fix interpretation of check levels 0.0 as "no levels"

by Mathias Kettner

Module: check_mk Branch: master Commit: c8bc1e55ec929892cc06a1e30ccd25b90a77cda7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8bc1e55ec9298… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 26 11:20:04 2016 +0100 #3245 FIX Fix interpretation of check levels 0.0 as "no levels" E.g. if you have set 0/0 as warn/crit levels for CPU load then the service would always be OK. This has now been fixed. --- .werks/3245 | 11 +++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 6 +++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/3245 b/.werks/3245 new file mode 100644 index 0000000..d951621 --- /dev/null +++ b/.werks/3245 @@ -0,0 +1,11 @@ +Title: Fix interpretation of check levels 0.0 as "no levels" +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456481952 + +E.g. if you have set 0/0 as warn/crit levels for CPU load then the service +would always be OK. This has now been fixed. diff --git a/ChangeLog b/ChangeLog index 642d6c0..3f0091e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ * 3082 FIX: windows agent: with realtime updates active, shutting down the agent could take very long * 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"... 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 a8dc72f..a9d7322 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -2082,7 +2082,11 @@ def check_levels(value, dsname, params, unit="", factor=1.0, scale=1.0, statemar perfdata = [] infotexts = [] - scale_value = lambda v: v != None and v * factor * scale or None + def scale_value(v): + if v == None: + return None + else: + return v * factor * scale # None or (None, None) -> do not check any levels if params == None or params == (None, None):

8 years, 9 months

Fix visibility of host attributes after yesterdays fix

by Mathias Kettner

Module: check_mk Branch: master Commit: 71d594ad722dc3bd290f061b00cabd17f1d541a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71d594ad722dc3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 26 11:15:03 2016 +0100 Fix visibility of host attributes after yesterdays fix --- web/htdocs/js/wato.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 404cadc..01b2c39 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -98,7 +98,7 @@ function wato_fix_visibility() { /* If the Checkbox is unchecked try to get a value from the inherited_tags */ var oCheckbox = oTdLegend.childNodes[1].childNodes[0]; if (oCheckbox.checked == false ){ - var attrname = 'attr_' + oCheckbox.name.replace('_change_', ''); + var attrname = 'attr_' + oCheckbox.name.replace(/.*_change_/, ''); if(attrname in inherited_tags && inherited_tags[attrname] !== null){ currentTags = currentTags.concat(inherited_tags[attrname].split("|")); }

8 years, 9 months

#3244 WATO BI Module: swap order of aggregation function and child node selection

by Mathias Kettner

Module: check_mk Branch: master Commit: c189f5ad189d08774a9a1d0012608332ccb8f0d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c189f5ad189d08… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 26 11:02:45 2016 +0100 #3244 WATO BI Module: swap order of aggregation function and child node selection This is more intuitive. First I decide, which nodes I want to have, then how they should be aggregated. And in most cases worst will be used anyway. --- .werks/3244 | 11 +++++++++++ ChangeLog | 1 + web/plugins/wato/bi.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3244 b/.werks/3244 new file mode 100644 index 0000000..5b39341 --- /dev/null +++ b/.werks/3244 @@ -0,0 +1,11 @@ +Title: WATO BI Module: swap order of aggregation function and child node selection +Level: 1 +Component: wato +Class: feature +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456480905 + +This is more intuitive. First I decide, which nodes I want to have, then how they +should be aggregated. And in most cases worst will be used anyway. diff --git a/ChangeLog b/ChangeLog index 86b2cdc..642d6c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,6 +55,7 @@ * 3181 FIX: Omit icon for downloading agent output on shadow hosts (cmcdump)... WATO: + * 3244 WATO BI Module: swap order of aggregation function and child node selection... * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery... diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 1129311..9f89fa5 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1429,8 +1429,8 @@ class ModeBIEditRule(ModeBI): elements = elements, headers = [ ( _("General Properties"), [ "id", "title", "comment", "params" ]), - ( _("Aggregation Function"), [ "aggregation" ], ), ( _("Child Node Generation"), [ "nodes" ] ), + ( _("Aggregation Function"), [ "aggregation" ], ), ] )

8 years, 9 months

dell_eql_storage: removed ',' in check output

by Andreas Boesl

Module: check_mk Branch: master Commit: 039a4567d0fc39055036702c871d7539c39a577b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=039a4567d0fc39… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 26 09:57:41 2016 +0100 dell_eql_storage: removed ',' in check output --- checks/dell_eql_storage | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/dell_eql_storage b/checks/dell_eql_storage index f474a3a..931c8e3 100644 --- a/checks/dell_eql_storage +++ b/checks/dell_eql_storage @@ -32,7 +32,8 @@ def check_dell_eql_storage(item, _no_params, info): for name, desc, health_state, raid_state, total_storage, \ repl_storage, snap_storage, used_storage in info: if name == item: - yield 0, desc + if desc: + yield 0, desc # Health Status: health_states = {

8 years, 9 months

#2998 FIX Fixed broken WATO rules where content is dynamically loaded

by Andreas Boesl

Module: check_mk Branch: master Commit: 34fd3086d09f701167a565e5a229c0d1236f42be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34fd3086d09f70… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 26 10:14:45 2016 +0100 #2998 FIX Fixed broken WATO rules where content is dynamically loaded Rules like Disabled checks and Deploy custom files with agent (Windows) were no longer displaying any content. This has been fixed. --- .werks/2998 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 7 +++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/2998 b/.werks/2998 new file mode 100644 index 0000000..6eda654 --- /dev/null +++ b/.werks/2998 @@ -0,0 +1,11 @@ +Title: Fixed broken WATO rules where content is dynamically loaded +Level: 2 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456477952 + +Rules like Disabled checks and Deploy custom files with agent (Windows) +were no longer displaying any content. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 982d88c..86b2cdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ * 3179 FIX: Fix labelling of heartbeat interval for liveproxyd settings... * 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... Event Console: * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index b599eb0..42eb62c 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1575,8 +1575,11 @@ class ListChoice(ValueSpec): self._elements = self._choices else: self._elements = self._choices() - else: - self._elements = [] + return + + if self._loaded_at != id(html): + self._elements = self.get_elements() + self._loaded_at = id(html) # unique for each query! def canonical_value(self): return []

8 years, 9 months

Updated bug entries #2424

by Mathias Kettner

Module: check_mk Branch: master Commit: 2b127627819ca5aa317f2fb028cfa4cc893e7f63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b127627819ca5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 26 10:01:40 2016 +0100 Updated bug entries #2424 --- .bugs/2424 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2424 b/.bugs/2424 new file mode 100644 index 0000000..2b2741e --- /dev/null +++ b/.bugs/2424 @@ -0,0 +1,9 @@ +Title: Popup menu for actions on host/services looks nasty in case of an error +Component: multisite +State: open +Date: 2016-02-26 10:00:51 +Targetversion: 1.2.8 +Class: nastiness + +If you click on the action menu (e.g. for reschedule) and the service meanwhile +vanished, then you get a really nasty error message.

8 years, 9 months

Updated bug entries #2423

by Mathias Kettner

Module: check_mk Branch: master Commit: 7f6741ca17787d7072a7b8c5412e1dc139d5c932 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f6741ca17787d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 26 09:14:32 2016 +0100 Updated bug entries #2423 --- .bugs/2423 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2423 b/.bugs/2423 new file mode 100644 index 0000000..82c269c --- /dev/null +++ b/.bugs/2423 @@ -0,0 +1,10 @@ +Title: NagVis does not work anymore because of gadget_type=img +Component: multisite +State: open +Date: 2016-02-26 09:12:18 +Targetversion: 1.2.8 +Class: bug + +Nagvis geht nach dem Update nicht mehr da Links zu maps bis dahin das Attribut +gadget_type=img hatten, was nun nicht mehr erlaubt ist und zu einer Meldung +führt was die GUI blockiert. Entfernen der Werte löst das Problem.

8 years, 9 months

#3243 FIX Fix missing custom graphs in sidebar snapin Views if explicit topic is set

by Mathias Kettner

Module: check_mk Branch: master Commit: dd5a47da74afa918a5181f3de1f58af07402cccb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd5a47da74afa9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 25 13:42:29 2016 +0100 #3243 FIX Fix missing custom graphs in sidebar snapin Views if explicit topic is set --- .werks/3243 | 10 ++++++++++ ChangeLog | 1 + web/plugins/sidebar/shipped.py | 39 ++++++++++++++++++++++++++++++--------- 3 files changed, 41 insertions(+), 9 deletions(-) diff --git a/.werks/3243 b/.werks/3243 new file mode 100644 index 0000000..5c59bf0 --- /dev/null +++ b/.werks/3243 @@ -0,0 +1,10 @@ +Title: Fix missing custom graphs in sidebar snapin Views if explicit topic is set +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456404127 + + diff --git a/ChangeLog b/ChangeLog index 420b99f..982d88c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ * 3178 FIX: docsis_channels_upstream: Fixed crash in graphs * 3082 FIX: windows agent: with realtime updates active, shutting down the agent could take very long * 2997 FIX: Fixed broken SNMP subchecks... + * 3243 FIX: Fix missing custom graphs in sidebar snapin Views if explicit topic is set Multisite: * 3187 notification view: new filter for log command via regex diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 641ae99..48878a9 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -93,9 +93,9 @@ def render_views(): views.load_views() dashboard.load_dashboards() - def render_topic(topic, s): + def render_topic(topic, entries): first = True - for t, title, name, is_view in s: + for t, title, name, is_view in entries: if is_view and config.visible_views and name not in config.visible_views: continue if is_view and config.hidden_views and name in config.hidden_views: @@ -106,21 +106,42 @@ def render_views(): first = False if is_view: bulletlink(title, "view.py?view_name=%s" % name, onclick = "return wato_views_clicked(this)") + elif "?name=" in name: + bulletlink(title, name) else: bulletlink(title, 'dashboard.py?name=%s' % name, onclick = "return wato_views_clicked(this)") # TODO: One day pagestypes should handle the complete snapin. - for page_type in pagetypes.all_page_types().values(): - if issubclass(page_type, pagetypes.PageRenderer): - for t, title, url in page_type.sidebar_links(): - if t == topic: - bulletlink(title, url) + # for page_type in pagetypes.all_page_types().values(): + # if issubclass(page_type, pagetypes.PageRenderer): + # for t, title, url in page_type.sidebar_links(): + # if t == topic: + # bulletlink(title, url) if not first: # at least one item rendered html.end_foldable_container() - for topic, s in visuals_by_topic(views.permitted_views().items() + dashboard.permitted_dashboards().items()): - render_topic(topic, s) + # TODO: One bright day drop this whole visuals stuff and only use page_types + page_type_topics = {} + for page_type in pagetypes.all_page_types().values(): + if issubclass(page_type, pagetypes.PageRenderer): + for t, title, url in page_type.sidebar_links(): + page_type_topics.setdefault(t, []).append((t, title, url, False)) + + visuals_topics_with_entries = visuals_by_topic(views.permitted_views().items() + dashboard.permitted_dashboards().items()) + all_topics_with_entries = [] + for topic, entries in visuals_topics_with_entries: + if topic in page_type_topics: + entries = entries + page_type_topics[topic] + del page_type_topics[topic] + all_topics_with_entries.append((topic, entries)) + + all_topics_with_entries += page_type_topics.items() + all_topics_with_entries.sort() + + for topic, entries in all_topics_with_entries: + render_topic(topic, entries) + links = [] if config.may("general.edit_views"):

8 years, 9 months

Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 1137623f68055572e5a3c0cd96e30bc3e9f31591 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1137623f680555… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 25 13:41:54 2016 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index f698ab1..b17e71b 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3243 +3253

8 years, 9 months

#3182 FIX Fix bulk operations based on search result folder

by Mathias Kettner

Module: check_mk Branch: master Commit: b5b31f3291fda7785ca685def36238de4f6db8ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5b31f3291fda7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 25 13:12:25 2016 +0100 #3182 FIX Fix bulk operations based on search result folder If you searched for a host tag and then did a bulk operation like discovery on the search result - the tag criteria was ignored and too many hosts selected. This has been fixed. --- .werks/3182 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- web/htdocs/watolib.py | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/3182 b/.werks/3182 new file mode 100644 index 0000000..1700b9d --- /dev/null +++ b/.werks/3182 @@ -0,0 +1,12 @@ +Title: Fix bulk operations based on search result folder +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456402291 + +If you searched for a host tag and then did a bulk operation like discovery +on the search result - the tag criteria was ignored and too many hosts +selected. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 70e793c..420b99f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * 3225 FIX: Fixed exception when renaming a host which is configured as parent on a folder * 3179 FIX: Fix labelling of heartbeat interval for liveproxyd settings... * 3180 FIX: Fix broken site specific globals and disabling of WATO in slave sites + * 3182 FIX: Fix bulk operations based on search result folder... Event Console: * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2a2835b..e3b3e9a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15564,7 +15564,7 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr # has not set that attribute. In case of bulk edit we never lock: During bulk edit no # attribute ca be removed anyway. - checkbox_name = "_change_%s" % attrname + checkbox_name = for_what + "_change_%s" % attrname cb = html.get_checkbox(checkbox_name) force_entry = False disabled = False diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 0359164..27b3ebdc6 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -2766,7 +2766,7 @@ def collect_attributes(for_what, do_validate = True, varprefix=""): host = {} for attr, topic in all_host_attributes(): attrname = attr.name() - if not html.var("_change_%s" % attrname, False): + if not html.var(for_what + "_change_%s" % attrname, False): continue if do_validate and attr.needs_validation():

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