Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: c833b2edb1fc72625daf6c86411b34bda58f013c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c833b2edb1fc72… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 10 13:38:46 2014 +0200 Approved fix --- web/htdocs/views.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d81eb5b..8ebe806 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1975,23 +1975,6 @@ def link_to_view(content, row, view_name): new_vars = filter_object.variable_settings(row) vars += new_vars - # FIXME: WDTCD (What Does This Contraption Do)? - # Brauchen wir das hier? Aktuell macht das ein Problem: Wenn man in der View "allservices" - # auf einen Gruppenkopf klickt - den Hostnamen, dann steckt in der Row der komplette Datensatz - # zum ersten Service der Gruppe. Die new_vars erzeugen daraufhin einen Filter mit service_regex - # mit dem ersten Service. In der Zielview bekommt man dann nur noch einen Service zu sehen, - # und nicht alle von dem Host. Außerdem: VisualFilterList ist ein ValueSpec - zum Editieren - # von Daten durch den Benutzer. Sollte das hier mißbraucht werden für ganz andere Zwecke? - ## else: - ## new_vars = visuals.VisualFilterList([info_key]).filter_variable_settings(view['context'], row) - ## if "service_regex" in dict(new_vars): - ## html.debug("VIEW-Titel", view["title"]) - ## html.debug('CONTEXT', view["context"]) - ## html.debug("NEW", new_vars) - ## html.debug("row", row) - ## raise 9 - ## vars += new_vars - do = html.var("display_options") if do: vars.append(("display_options", do))

9 years, 9 months

Check_MK Git: check_mk: Fix links to views in group headers

by Mathias Kettner

Module: check_mk Branch: master Commit: eb726e2bbeda3ebabe82d950e2f16394a8fe342a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb726e2bbeda3e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 10 12:48:35 2014 +0200 Fix links to views in group headers this comment removes some code that seems to be useless. --- web/htdocs/views.py | 24 ++++++++++++++++++++---- web/htdocs/visuals.py | 20 +++++++++++--------- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e0b6b0e..d81eb5b 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1971,10 +1971,26 @@ def link_to_view(content, row, view_name): for info_key in datasource['infos']: if info_key in view['single_infos']: for key in visuals.info_params(info_key): - vars += visuals.get_filter(key).variable_settings(row) - - else: - vars += visuals.VisualFilterList([info_key]).filter_variable_settings(view['context'], row) + filter_object = visuals.get_filter(key) + new_vars = filter_object.variable_settings(row) + vars += new_vars + + # FIXME: WDTCD (What Does This Contraption Do)? + # Brauchen wir das hier? Aktuell macht das ein Problem: Wenn man in der View "allservices" + # auf einen Gruppenkopf klickt - den Hostnamen, dann steckt in der Row der komplette Datensatz + # zum ersten Service der Gruppe. Die new_vars erzeugen daraufhin einen Filter mit service_regex + # mit dem ersten Service. In der Zielview bekommt man dann nur noch einen Service zu sehen, + # und nicht alle von dem Host. Außerdem: VisualFilterList ist ein ValueSpec - zum Editieren + # von Daten durch den Benutzer. Sollte das hier mißbraucht werden für ganz andere Zwecke? + ## else: + ## new_vars = visuals.VisualFilterList([info_key]).filter_variable_settings(view['context'], row) + ## if "service_regex" in dict(new_vars): + ## html.debug("VIEW-Titel", view["title"]) + ## html.debug('CONTEXT', view["context"]) + ## html.debug("NEW", new_vars) + ## html.debug("row", row) + ## raise 9 + ## vars += new_vars do = html.var("display_options") if do: diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 1a2b118..1f76acd 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1009,15 +1009,17 @@ class VisualFilterList(ListOfMultiple): # get the filters to be used from the value and the data from the filter # objects using the row data - def filter_variable_settings(self, value, row): - vars = [] - for fname in value.keys(): - try: - vars += self._filters[fname].variable_settings(row) - except KeyError: - # When the row misses at least one var for a filter ignore this filter completely - pass - return vars + ## FIXME: This function does not deal with user input. It is just being + ## used for creating links to views. Why is it here? + ## def filter_variable_settings(self, value, row): + ## vars = [] + ## for fname in value.keys(): + ## try: + ## vars += self._filters[fname].variable_settings(row) + ## except KeyError: + ## # When the row misses at least one var for a filter ignore this filter completely + ## pass + ## return vars # Realizes a Multisite/visual filter in a valuespec. It can render the filter form, get # the filled in values and provide the filled in information for persistance.

9 years, 9 months

Check_MK Git: check_mk: availability: return empty list instead of None, if no items found

by Mathias Kettner

Module: check_mk Branch: master Commit: 72f6d3392d5b44804214617ed8501e7ad81c7624 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72f6d3392d5b44… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 10 11:58:09 2014 +0200 availability: return empty list instead of None, if no items found --- web/plugins/views/availability.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 5c70cd3..af317a0 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -1182,7 +1182,7 @@ def render_availability_table(availability, from_time, until_time, range_title, if not availability: if not no_html: html.message(_("No matching hosts/services.")) - return # No objects + return [] # No objects grouping = avoptions["grouping"] fetch_data = []

9 years, 9 months

Check_MK Git: check_mk: FIX for case when disk is removed from the device, thanks to Marcel Schulte

by Goetz Golla

Module: check_mk Branch: master Commit: e983bfcbb1b67d25f9fd2a06d59f59fd48c3a9ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e983bfcbb1b67d… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Oct 10 11:41:31 2014 +0200 FIX for case when disk is removed from the device, thanks to Marcel Schulte --- checks/diskstat.include | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/checks/diskstat.include b/checks/diskstat.include index a095b8a..6543833 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -234,7 +234,9 @@ def check_diskstat_generic(item, params, this_time, info, mode='sectors'): result = check_diskstat_line(this_time, item, params, line, mode) else: result = (2, "more than one device found in cluster") - return result + + if result != "": + return result return (3, "device missing")

9 years, 9 months

Check_MK Git: check_mk: #1125 FIX EC actions couldn' t get saved when a EC rule had "Send monitoring notification" set

by Andreas Boesl

Module: check_mk Branch: master Commit: 6856f5fcb4584feb1363ac1f95ac6d9b4ce378a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6856f5fcb4584f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 10 11:36:44 2014 +0200 #1125 FIX EC actions couldn't get saved when a EC rule had "Send monitoring notification" set This lead to the warning <tt>You are missing the action with the ID @NOTIFY which is still used in some rules</tt> --- .werks/1125 | 10 ++++++++++ ChangeLog | 1 + mkeventd/web/plugins/wato/mkeventd.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1125 b/.werks/1125 new file mode 100644 index 0000000..05e6dc2 --- /dev/null +++ b/.werks/1125 @@ -0,0 +1,10 @@ +Title: EC actions couldn't get saved when a EC rule had "Send monitoring notification" set +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.5i6 +Date: 1412933594 +Class: fix + +This lead to the warning +<tt>You are missing the action with the ID @NOTIFY which is still used in some rules</tt> diff --git a/ChangeLog b/ChangeLog index b38b8cc..3e77fe0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -157,6 +157,7 @@ * 1399 FIX: Fix left-over tac processes when showing Event Console history... * 1402 FIX: Fixed cased where counting events did not reach required count... * 1124 FIX: WATO EC configuration: no longer raises an exception when user has restricted WATO access... + * 1125 FIX: EC actions couldn't get saved when a EC rule had "Send monitoring notification" set... HW/SW-Inventory: * 0643 windows inventory: OS now contains the install date, reg_uninstall now contains the path... diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 6ea1e41..81304c4 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -88,7 +88,7 @@ class ActionList(ListOf): rules = load_mkeventd_rules() for rule in rules: for action_id in rule.get("actions", []): - if action_id not in action_ids: + if action_id not in action_ids + ["@NOTIFY"]: raise MKUserError(varprefix, _("You are missing the action with the ID %s, " "which is still used in some rules.") % action_id)

9 years, 9 months

Check_MK Git: check_mk: mkeventd: Can use the a sites local mongodb instance for history / archiving now

by Lars Michelsen

Module: check_mk Branch: master Commit: 98209c3ce9c8cb119d8eb648d73d392abd916f76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98209c3ce9c8cb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 10 11:24:14 2014 +0200 mkeventd: Can use the a sites local mongodb instance for history / archiving now --- mkeventd/bin/mkeventd | 218 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 212 insertions(+), 6 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=98209c3ce9…

9 years, 9 months

Check_MK Git: check_mk: forms: fixed exception when a validation error in a dict happens

by Mathias Kettner

Module: check_mk Branch: master Commit: 33c9deeb1be65fc4162e4381714fb46ed5d3156c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33c9deeb1be65f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 10 09:22:07 2014 +0200 forms: fixed exception when a validation error in a dict happens --- web/htdocs/forms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 972d57a..0588f19 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -89,8 +89,8 @@ def edit_dictionaries(dictionaries, value, focus=None, hover_help=True, try: new_value[keyname] = entries.from_html_vars(keyname) entries.validate_value(new_value[keyname], keyname) - except: - messages.append("%s: %s" % (entries.title(), e.message)) + except Exception, e: + messages.append("%s: %s" % (entries.title() or _("Properties"), e.message)) html.add_user_error(e.varname, e.message) if validate and not html.has_user_errors():

9 years, 9 months

Check_MK Git: check_mk: Availability summary: add css for summary line

by Mathias Kettner

Module: check_mk Branch: master Commit: c128a8dce2b45a8c1cae3d408bb51bc86ac74f23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c128a8dce2b45a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 9 18:36:11 2014 +0200 Availability summary: add css for summary line --- web/plugins/views/availability.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 55601df..5c70cd3 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -1427,7 +1427,7 @@ def render_availability_group(group_title, range_title, group_id, availability, if not "omit_buttons" in labelling and not no_html: table.cell("") if not "omit_host" in labelling: - table.cell("", _("Summary")) + table.cell("", _("Summary"), css="heading") if what == "service": table.cell("", "") @@ -1447,7 +1447,7 @@ def render_availability_group(group_title, range_title, group_id, availability, if number and av_levels and sid in [ "ok", "up" ]: css = "state%d" % check_av_levels(number, av_levels, considered_duration) - table.cell(sname, render_number(number, considered_duration), css="number " + css, help=help) + table.cell(sname, render_number(number, considered_duration), css="heading number " + css, help=help) os_aggrs, os_states = avoptions.get("outage_statistics", ([],[])) if sid in os_states: for aggr in os_aggrs:

9 years, 9 months

Check_MK Git: check_mk: Small adaptions for computing BI availability

by Mathias Kettner

Module: check_mk Branch: master Commit: 77f96600af2047ce2f021146b94c4eaccf8321ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77f96600af2047… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 9 17:47:28 2014 +0200 Small adaptions for computing BI availability --- web/plugins/views/availability.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index bb17a82..55601df 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -852,7 +852,7 @@ def do_render_availability(rows, what, avoptions, timeline, timewarpcode, fetch= render_timeline(timeline_rows, from_time, until_time, total_duration, timeline, range_title, render_number, what, timewarpcode, avoptions, style="standalone") else: - fetch_data["table"] = render_availability_table(availability, from_time, until_time, range_title, + fetch_data["table"] = render_availability_table(availability, from_time, until_time, range_title, what, avoptions, render_number, fetch) if not fetch: @@ -1189,7 +1189,7 @@ def render_availability_table(availability, from_time, until_time, range_title, if not grouping: fetch_data.append((None, - render_availability_group(range_title, range_title, None, availability, from_time, + render_availability_group(range_title, range_title, None, availability, from_time, until_time, what, avoptions, render_number, fetch))) else: @@ -1216,7 +1216,7 @@ def render_availability_table(availability, from_time, until_time, range_title, # 3. Loop over all groups and render them for title, group_id in titled_groups: fetch_data.append((title, - render_availability_group(title, range_title, group_id, availability, + render_availability_group(title, range_title, group_id, availability, from_time, until_time, what, avoptions, render_number, fetch) )) @@ -1265,7 +1265,8 @@ def get_av_groups(availability, grouping): # When grouping is enabled, this function is called once for each group -def render_availability_group(group_title, range_title, group_id, availability, from_time, until_time, what, avoptions, render_number, fetch): +def render_availability_group(group_title, range_title, group_id, availability, + from_time, until_time, what, avoptions, render_number, fetch): # Filter out groups that we want to show this time group_availability = [] @@ -1339,8 +1340,12 @@ def render_availability_group(group_title, range_title, group_id, availability, host_url = "view.py?" + html.urlencode_vars([("view_name", "hoststatus"), ("site", site), ("host", host)]) if what == "bi": - bi_url = "view.py?" + html.urlencode_vars([("view_name", "aggr_single"), ("aggr_group", host), ("aggr_name", service)]) - table.cell(_("Aggregate"), '<a href="%s">%s</a>' % (bi_url, service)) + table.cell(_("Aggregate")) + if no_html: + html.write(service) + else: + bi_url = "view.py?" + html.urlencode_vars([("view_name", "aggr_single"), ("aggr_group", host), ("aggr_name", service)]) + html.write('<a href="%s">%s</a>' % (bi_url, service)) availability_columns = bi_availability_columns else: if not "omit_host" in labelling: @@ -1474,6 +1479,13 @@ def check_av_levels(number, av_levels, considered_duration): return 0 +def compute_bi_availability(avoptions, aggr_rows): + rows = [] + for aggr_row in aggr_rows: + these_rows, tree_state = get_bi_timeline(aggr_row["aggr_tree"], aggr_row["aggr_group"], avoptions, False) + rows += these_rows + return do_render_availability(rows, "bi", avoptions, timeline=False, timewarpcode=None, fetch=True) + # Render availability of a BI aggregate. This is currently # no view and does not support display options

9 years, 9 months

Check_MK Git: check_mk: #1124 FIX WATO EC configuration: no longer raises an exception when user has restricted WATO access

by Andreas Boesl

Module: check_mk Branch: master Commit: 9dcfe7b5bd842fd821b375664e03ac6f2faf2b9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9dcfe7b5bd842f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 9 16:38:57 2014 +0200 #1124 FIX WATO EC configuration: no longer raises an exception when user has restricted WATO access An exception happened, when a user had restricted WATO permissions, but was allowed to edit the WATO EC configuration. The following role settings caused this error: <tt>WATO - Check_MK's Web Administration Tool -> Read access to all modules.... -> No</tt> and <tt>Event Console -> Configuration of event rules -> Yes</tt> --- .werks/1124 | 14 ++++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 +++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/1124 b/.werks/1124 new file mode 100644 index 0000000..f27ae7c --- /dev/null +++ b/.werks/1124 @@ -0,0 +1,14 @@ +Title: WATO EC configuration: no longer raises an exception when user has restricted WATO access +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.5i6 +Date: 1412864930 +Class: fix + +An exception happened, when a user had restricted WATO permissions, but was allowed to edit the WATO EC configuration. +The following role settings caused this error: + +<tt>WATO - Check_MK's Web Administration Tool -> Read access to all modules.... -> No</tt> +and +<tt>Event Console -> Configuration of event rules -> Yes</tt> diff --git a/ChangeLog b/ChangeLog index 5bc5c41..b38b8cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -156,6 +156,7 @@ * 1007 FIX: check_mkevents: fix case where events contain binary zeroes * 1399 FIX: Fix left-over tac processes when showing Event Console history... * 1402 FIX: Fixed cased where counting events did not reach required count... + * 1124 FIX: WATO EC configuration: no longer raises an exception when user has restricted WATO access... HW/SW-Inventory: * 0643 windows inventory: OS now contains the install date, reg_uninstall now contains the path... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a4cf757..b0fea5a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -214,7 +214,9 @@ def page_handler(): # Check general permission for this mode if modeperms != None and not config.may("wato.seeall"): for pname in modeperms: - config.need_permission("wato." + pname) + if '.' not in pname: + pname = "wato." + pname + config.need_permission(pname) # Do actions (might switch mode) action_message = None

9 years, 9 months

← Newer
1
...
17
18
19
20
21
22
23
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014