Checkmk git commits September 2015

checkmk-commits@lists.checkmk.com

8 participants
275 discussions

Check_MK Git: check_mk: the concept of "host downtime" was broadened to " derived downtime" to fit the bi aggregations

by Sebastian Herbord

Module: check_mk Branch: master Commit: d8e54ef27fdf82741330bb1fe8fe541748f132c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8e54ef27fdf82… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Sep 22 16:37:46 2015 +0200 the concept of "host downtime" was broadened to "derived downtime" to fit the bi aggregations --- web/htdocs/bi.py | 31 +++++++------------- ..._hostdowntime.png => icon_derived_downtime.png} | Bin 2966 -> 2966 bytes web/plugins/icons/builtin.py | 4 +-- web/plugins/views/bi.py | 6 ++-- 4 files changed, 15 insertions(+), 26 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 1f04c9f..df1aea0 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1029,8 +1029,7 @@ def execute_leaf_node(node, status_info, use_hard_states): return ({ "state" : MISSING, "output" : _("Host %s not found") % host, - "in_downtime" : False, - "host_in_downtime" : False, + "in_downtime" : 0, "acknowledged" : False, "in_service_period" : True, }, None, node) @@ -1060,8 +1059,7 @@ def execute_leaf_node(node, status_info, use_hard_states): state = { "state" : st, "output" : output, - "in_downtime" : downtime_depth > 0, - "host_in_downtime" : host_in_downtime != 0, + "in_downtime" : downtime_depth > 0 and 2 or host_in_downtime != 0 and 1 or 0, "acknowledged" : not not acknowledged, "in_service_period" : in_service_period, } @@ -1069,8 +1067,7 @@ def execute_leaf_node(node, status_info, use_hard_states): assumed_state = { "state" : state_assumption, "output" : _("Assumed to be %s") % service_state_names[state_assumption], - "in_downtime" : downtime_depth > 0, - "host_in_downtime" : host_in_downtime != 0, + "in_downtime" : downtime_depth > 0 and 2 or host_in_downtime != 0 and 1 or 0, "acknowledged" : not not acknowledged, "in_service_period" : in_service_period, } @@ -1082,8 +1079,7 @@ def execute_leaf_node(node, status_info, use_hard_states): return ({ "state" : MISSING, "output" : _("This host has no such service"), - "in_downtime" : False, - "host_in_downtime" : host_in_downtime != 0, + "in_downtime" : host_in_downtime, "acknowledged" : False, "in_service_period" : True, }, None, node) @@ -1097,8 +1093,7 @@ def execute_leaf_node(node, status_info, use_hard_states): state = { "state" : aggr_state, "output" : host_output, - "in_downtime" : False, - "host_in_downtime" : host_in_downtime != 0, + "in_downtime" : host_in_downtime, "acknowledged" : host_acknowledged, "in_service_period" : host_in_service_period, } @@ -1106,8 +1101,7 @@ def execute_leaf_node(node, status_info, use_hard_states): assumed_state = { "state" : state_assumption, "output" : _("Assumed to be %s") % host_state_names[state_assumption], - "in_downtime" : False, - "host_in_downtime" : host_in_downtime != 0, + "in_downtime" : host_in_downtime != 0, "acknowledged" : host_acknowledged, "in_service_period" : host_in_service_period, } @@ -1141,8 +1135,7 @@ def execute_rule_node(node, status_info, use_hard_states): subtrees.append(result) # Assume items in downtime as CRIT when computing downtime state - downtime_states.append(({"state": result[0]["in_downtime"] and 2 or 0, "output" : ""}, result[2])) - host_downtime_states.append(({"state": result[0]["host_in_downtime"] and 2 or 0, "output" : ""}, result[2])) + downtime_states.append(({"state": result[0]["in_downtime"] != 0 and 2 or 0, "output" : ""}, result[2])) # Assume non-OK nodes that are acked as OK if result[0]["acknowledged"]: @@ -1169,7 +1162,6 @@ def execute_rule_node(node, status_info, use_hard_states): host_downtime_state = func(*([host_downtime_states] + funcargs)) state["in_downtime"] = downtime_state["state"] >= 2 - state["host_in_downtime"] = host_downtime_state["state"] >= 2 # Compute acknowledgedment state if state["state"] > 0: # Non-OK-State -> compute acknowledgedment @@ -1185,7 +1177,6 @@ def execute_rule_node(node, status_info, use_hard_states): if one_assumption: assumed_state = func(*([assumed_states] + funcargs)) assumed_state["in_downtime"] = state["in_downtime"] - assumed_state["host_in_downtime"] = state["host_in_downtime"] assumed_state["acknowledged"] = state["acknowledged"] assumed_state["in_service_period"] = state["in_service_period"] else: @@ -1617,13 +1608,13 @@ def aggr_render_node(tree, title, mousecode, show_host): addclass = "" effective_state = tree[0] - if tree[0]["in_downtime"]: + if tree[0]["in_downtime"] == 2: title = ('<img class="icon bi" src="images/icon_downtime.png" title="%s">' % \ _("This element is currently in a scheduled downtime.")) + title - elif tree[0]["host_in_downtime"]: + elif tree[0]["in_downtime"] == 1: # only display host downtime if the service has no own downtime - title = ('<img class="icon bi" src="images/icon_hostdowntime.png" title="%s">' % \ - _("The host is currently in downtime.")) + title + title = ('<img class="icon bi" src="images/icon_derived_downtime.png" title="%s">' % \ + _("One of the subelements is in a scheduled downtime.")) + title if tree[0]["acknowledged"]: title = ('<img class="icon bi" src="images/icon_ack.png" title="%s">' % \ diff --git a/web/htdocs/images/icon_hostdowntime.png b/web/htdocs/images/icon_derived_downtime.png similarity index 100% rename from web/htdocs/images/icon_hostdowntime.png rename to web/htdocs/images/icon_derived_downtime.png diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index afe42f1..042f6c8 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -482,12 +482,12 @@ def paint_downtimes(what, row, tags, host_custom_vars): # for this host / service if row[what + "_scheduled_downtime_depth"] > 0: if what == "host": - icon = "hostdowntime" + icon = "derived_downtime" else: icon = "downtime" return icon, _("Currently in downtime"), url_to_view(row, 'downtimes_of_' + what) elif what == "service" and row["host_scheduled_downtime_depth"] > 0: - return 'hostdowntime', _("The host is currently in downtime"), url_to_view(row, 'downtimes_of_host') + return 'derived_downtime', _("The host is currently in downtime"), url_to_view(row, 'downtimes_of_host') multisite_icons_and_actions['status_downtimes'] = { 'host_columns': [ 'scheduled_downtime_depth' ], diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 573f415..4212b41 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -85,10 +85,8 @@ def paint_bi_icons(row): html.icon_button(single_url, _("Show only this aggregation"), "showbi") avail_url = single_url + "&mode=availability" html.icon_button(avail_url, _("Analyse availability of this aggregation"), "availability") - if row["aggr_effective_state"]["in_downtime"]: - html.icon(_("This aggregation is currently in a scheduled downtime."), "downtime") - elif row["aggr_effective_state"]["host_in_downtime"]: - html.icon(_("This aggregation is currently in a scheduled downtime."), "hostdowntime") + if row["aggr_effective_state"]["in_downtime"] != 0: + html.icon(_("A service or host in this aggregation is in downtime."), "derived_downtime") if row["aggr_effective_state"]["acknowledged"]: html.icon(_("The critical problems that make this aggregation non-OK have been acknowledged."), "ack") if not row["aggr_effective_state"]["in_service_period"]:

8 years, 12 months

Check_MK Git: check_mk: #2630 FIX fixed incorrect check interval of Check_MK Discovery

by Sebastian Herbord

Module: check_mk Branch: master Commit: aab2c8427160186a448d326e2ea30ca8a8179882 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aab2c842716018… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Sep 22 14:37:13 2015 +0200 #2630 FIX fixed incorrect check interval of Check_MK Discovery After werk #2595 the periodic discovery time configured through the rule was stored as seconds instead of minutes, causing the check frequency to be 60 times slower than intended. --- .werks/2630 | 10 ++++++++++ ChangeLog | 1 + web/plugins/wato/check_mk_configuration.py | 15 +++++++++++---- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.werks/2630 b/.werks/2630 new file mode 100644 index 0000000..5746037 --- /dev/null +++ b/.werks/2630 @@ -0,0 +1,10 @@ +Title: fixed incorrect check interval of Check_MK Discovery +Level: 1 +Component: core +Compatible: compat +Version: 1.2.7i3 +Date: 1442925162 +Class: fix + +After werk #2595 the periodic discovery time configured through the rule was stored as seconds +instead of minutes, causing the check frequency to be 60 times slower than intended. diff --git a/ChangeLog b/ChangeLog index d897bde..d64011b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * 2526 FIX: Fixed crash in filesystem checks in case mountpoint contains non-ascii characters * 2540 FIX: Process piggy backed data even if host is set to "No Agent"... * 2543 FIX: Fixed usage of icons/actions configured directly with process rules + * 2630 FIX: fixed incorrect check interval of Check_MK Discovery... Checks & Agents: * 2312 New checks for EMC VPLEX: emc_vplex_cpu, emc_vplex_director_stats, emc_vplex_if, emc_vplex_volumes... diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index f072249..78ba37f 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1647,7 +1647,7 @@ register_rule(group, title = _("Periodic service discovery"), style = "dropdown", default_value = { - "check_interval" : 2 * 60 * 60, + "check_interval" : 2 * 60, "severity_unmonitored" : 1, "severity_vanished" : 0, "inventory_check_do_scan" : True, @@ -1665,9 +1665,16 @@ register_rule(group, "that are currently not monitored."), elements = [ ( "check_interval", - Age( - title = _("Perform service discovery every"), - )), + Transform( + Age( + minvalue=1, + display = [ "days", "hours", "minutes" ] + ), + forth = lambda v: int(v * 60), + back = lambda v: float(v) / 60.0, + title = _("Perform service discovery every"), + ), + ), ( "severity_unmonitored", DropdownChoice( title = _("Severity of unmonitored services"),

8 years, 12 months

Check_MK Git: check_mk: icons: handle shadow services and hosts

by Mathias Kettner

Module: check_mk Branch: master Commit: 0e2b992af576926996e939905090b22e4f2993f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e2b992af57692… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 22 14:34:19 2015 +0200 icons: handle shadow services and hosts --- .bugs/2379 | 10 ++++++++++ web/plugins/icons/builtin.py | 12 ++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.bugs/2379 b/.bugs/2379 new file mode 100644 index 0000000..07218e5 --- /dev/null +++ b/.bugs/2379 @@ -0,0 +1,10 @@ +Title: Drop action menu icon for services without an entry in this +Component: multisite +State: open +Date: 2015-09-22 09:53:11 +Targetversion: future +Class: bug + +In certain circumstances the dropdown menu for a host or service can be +completely empty (e.g. when using cmcdump). Drop this menu completely in +that case. diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 86e22ce..afe42f1 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -136,6 +136,9 @@ def paint_reschedule(what, row, tags, host_custom_vars): return "cannot_reschedule", _("This service is based on cached agent data and cannot be rescheduled"), None # Reschedule button + if row[what + "_check_type"] == 2: + return # shadow hosts/services cannot be rescheduled + if (row[what + "_active_checks_enabled"] == 1 or row[what + '_check_command'].startswith('check_mk-')) \ and config.may('action.reschedule'): @@ -160,7 +163,7 @@ def paint_reschedule(what, row, tags, host_custom_vars): return icon, txt, url multisite_icons_and_actions['reschedule'] = { - 'columns': [ 'active_checks_enabled', 'check_command' ], + 'columns': [ 'check_type', 'active_checks_enabled', 'check_command' ], 'service_columns': [ 'cached_at' ], 'paint': paint_reschedule, 'toplevel': False, @@ -179,6 +182,9 @@ multisite_icons_and_actions['reschedule'] = { # '----------------------------------------------------------------------' def paint_rule_editor(what, row, tags, host_custom_vars): + if row[what + "_check_type"] == 2: + return # shadow services have no parameters + if config.wato_enabled and config.may("wato.rulesets") and config.multisite_draw_ruleicon: urlvars = [("mode", "object_parameters"), ("host", row["host_name"])] @@ -192,7 +198,7 @@ def paint_rule_editor(what, row, tags, host_custom_vars): return 'rulesets', title, html.makeuri_contextless(urlvars, "wato.py") multisite_icons_and_actions['rule_editor'] = { - 'service_columns': [ 'description', 'check_command', "host_name" ], + 'service_columns': [ 'check_type', 'description', 'check_command', "host_name" ], 'paint': paint_rule_editor, } @@ -813,3 +819,5 @@ multisite_icons_and_actions['crashed_check'] = { 'paint' : paint_icon_crashed_check, 'toplevel' : True, } + +#.

8 years, 12 months

Check_MK Git: check_mk: #2629 BI Aggregations now adopt downtime from hosts

by Sebastian Herbord

Module: check_mk Branch: master Commit: 27eb29c9b02fac759e478948900fde0e315503b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27eb29c9b02fac… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Sep 22 13:22:55 2015 +0200 #2629 BI Aggregations now adopt downtime from hosts Up till now, bi aggregations did not display host downtimes, only service downtimes. Now a host downtime is propagated through all levels of the aggregation the same as service downtimes. --- .werks/2629 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/bi.py | 33 ++++++++++++++++++++++++--------- web/plugins/views/bi.py | 8 +++++--- 4 files changed, 41 insertions(+), 12 deletions(-) diff --git a/.werks/2629 b/.werks/2629 new file mode 100644 index 0000000..fcd8c85 --- /dev/null +++ b/.werks/2629 @@ -0,0 +1,11 @@ +Title: BI Aggregations now adopt downtime from hosts +Level: 1 +Component: bi +Compatible: compat +Version: 1.2.7i3 +Date: 1442920839 +Class: feature + +Up till now, bi aggregations did not display host downtimes, only service downtimes. +Now a host downtime is propagated through all levels of the aggregation the same as service +downtimes. diff --git a/ChangeLog b/ChangeLog index 56a644b..d897bde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -286,6 +286,7 @@ BI: * 2537 BI Editor: restructured, now show tree structure of aggregations, show unused rules... + * 2629 BI Aggregations now adopt downtime from hosts... * 2369 FIX: Fix exception in BI availability via table "Hostname Aggregations" * 2370 FIX: Fix computation of "in downtime" and "acknownledged" of hosts in BI aggregations... * 2485 FIX: Fix Icon "BI Aggregations containing this service", also avoid BI compilation without need... diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 060abb8..1f04c9f 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -492,12 +492,12 @@ def compile_rule_node(aggr_type, calllist, lvl): config.FOREACH_SERVICE ]: matches = find_matching_services(aggr_type, what, calllist[1:]) new_elements = [] - handled_args = set([]) # avoid duplicate rule incarnations + handled_args = set() # avoid duplicate rule incarnations for match in matches: args = [ substitute_matches(a, match) for a in arglist ] - if tuple(args) not in handled_args: + if tuple(args) not in handled_args: new_elements += compile_aggregation_rule(aggr_type, rule, args, lvl) - handled_args.add(tuple(args)) + handled_args.add(tuple(args)) return new_elements else: @@ -775,12 +775,12 @@ def compile_aggregation_rule(aggr_type, rule, args, lvl): calllist.append(n) matches = find_matching_services(aggr_type, node[0], calllist) new_elements = [] - handled_args = set([]) # avoid duplicate rule incarnations + handled_args = set() # avoid duplicate rule incarnations for match in matches: sub_arginfo = dict([(str(n+1), x) for (n,x) in enumerate(match)]) - if tuple(args) + match not in handled_args: + if tuple(args) + match not in handled_args: new_elements += compile_leaf_node(subst_vars(node[-2], sub_arginfo), subst_vars(node[-1], sub_arginfo)) - handled_args.add(tuple(args) + match) + handled_args.add(tuple(args) + match) host_name, service_description = node[-2:] else: @@ -1030,6 +1030,7 @@ def execute_leaf_node(node, status_info, use_hard_states): "state" : MISSING, "output" : _("Host %s not found") % host, "in_downtime" : False, + "host_in_downtime" : False, "acknowledged" : False, "in_service_period" : True, }, None, node) @@ -1060,6 +1061,7 @@ def execute_leaf_node(node, status_info, use_hard_states): "state" : st, "output" : output, "in_downtime" : downtime_depth > 0, + "host_in_downtime" : host_in_downtime != 0, "acknowledged" : not not acknowledged, "in_service_period" : in_service_period, } @@ -1068,6 +1070,7 @@ def execute_leaf_node(node, status_info, use_hard_states): "state" : state_assumption, "output" : _("Assumed to be %s") % service_state_names[state_assumption], "in_downtime" : downtime_depth > 0, + "host_in_downtime" : host_in_downtime != 0, "acknowledged" : not not acknowledged, "in_service_period" : in_service_period, } @@ -1080,6 +1083,7 @@ def execute_leaf_node(node, status_info, use_hard_states): "state" : MISSING, "output" : _("This host has no such service"), "in_downtime" : False, + "host_in_downtime" : host_in_downtime != 0, "acknowledged" : False, "in_service_period" : True, }, None, node) @@ -1093,7 +1097,8 @@ def execute_leaf_node(node, status_info, use_hard_states): state = { "state" : aggr_state, "output" : host_output, - "in_downtime" : host_in_downtime, + "in_downtime" : False, + "host_in_downtime" : host_in_downtime != 0, "acknowledged" : host_acknowledged, "in_service_period" : host_in_service_period, } @@ -1101,7 +1106,8 @@ def execute_leaf_node(node, status_info, use_hard_states): assumed_state = { "state" : state_assumption, "output" : _("Assumed to be %s") % host_state_names[state_assumption], - "in_downtime" : host_in_downtime, + "in_downtime" : False, + "host_in_downtime" : host_in_downtime != 0, "acknowledged" : host_acknowledged, "in_service_period" : host_in_service_period, } @@ -1126,6 +1132,7 @@ def execute_rule_node(node, status_info, use_hard_states): node_states = [] assumed_states = [] downtime_states = [] + host_downtime_states = [] service_period_states = [] ack_states = [] # Needed for computing the acknowledgement of non-OK nodes one_assumption = False @@ -1135,6 +1142,7 @@ def execute_rule_node(node, status_info, use_hard_states): # Assume items in downtime as CRIT when computing downtime state downtime_states.append(({"state": result[0]["in_downtime"] and 2 or 0, "output" : ""}, result[2])) + host_downtime_states.append(({"state": result[0]["host_in_downtime"] and 2 or 0, "output" : ""}, result[2])) # Assume non-OK nodes that are acked as OK if result[0]["acknowledged"]: @@ -1158,7 +1166,10 @@ def execute_rule_node(node, status_info, use_hard_states): # Compute downtime state downtime_state = func(*([downtime_states] + funcargs)) + host_downtime_state = func(*([host_downtime_states] + funcargs)) + state["in_downtime"] = downtime_state["state"] >= 2 + state["host_in_downtime"] = host_downtime_state["state"] >= 2 # Compute acknowledgedment state if state["state"] > 0: # Non-OK-State -> compute acknowledgedment @@ -1174,6 +1185,7 @@ def execute_rule_node(node, status_info, use_hard_states): if one_assumption: assumed_state = func(*([assumed_states] + funcargs)) assumed_state["in_downtime"] = state["in_downtime"] + assumed_state["host_in_downtime"] = state["host_in_downtime"] assumed_state["acknowledged"] = state["acknowledged"] assumed_state["in_service_period"] = state["in_service_period"] else: @@ -1597,7 +1609,6 @@ def render_tree_foldable(row, boxes, omit_root, expansion_level, only_problems, return "aggrtree" + (boxes and "_box" or ""), htmlcode def aggr_render_node(tree, title, mousecode, show_host): - # Check if we have an assumed state: comparing assumed state (tree[1]) with state (tree[0]) if tree[1] and tree[0] != tree[1]: addclass = " " + _("assumed") @@ -1609,6 +1620,10 @@ def aggr_render_node(tree, title, mousecode, show_host): if tree[0]["in_downtime"]: title = ('<img class="icon bi" src="images/icon_downtime.png" title="%s">' % \ _("This element is currently in a scheduled downtime.")) + title + elif tree[0]["host_in_downtime"]: + # only display host downtime if the service has no own downtime + title = ('<img class="icon bi" src="images/icon_hostdowntime.png" title="%s">' % \ + _("The host is currently in downtime.")) + title if tree[0]["acknowledged"]: title = ('<img class="icon bi" src="images/icon_ack.png" title="%s">' % \ diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index de2301c..573f415 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -86,11 +86,13 @@ def paint_bi_icons(row): avail_url = single_url + "&mode=availability" html.icon_button(avail_url, _("Analyse availability of this aggregation"), "availability") if row["aggr_effective_state"]["in_downtime"]: - html.icon(_("This aggregation is currently in a scheduled downtime."), "downtime") + html.icon(_("This aggregation is currently in a scheduled downtime."), "downtime") + elif row["aggr_effective_state"]["host_in_downtime"]: + html.icon(_("This aggregation is currently in a scheduled downtime."), "hostdowntime") if row["aggr_effective_state"]["acknowledged"]: - html.icon(_("The critical problems that make this aggregation non-OK have been acknowledged."), "ack") + html.icon(_("The critical problems that make this aggregation non-OK have been acknowledged."), "ack") if not row["aggr_effective_state"]["in_service_period"]: - html.icon(_("This aggregation is currently out of its service period."), "outof_serviceperiod") + html.icon(_("This aggregation is currently out of its service period."), "outof_serviceperiod") code = html.drain() html.unplug() return "buttons", code

8 years, 12 months

Check_MK Git: check_mk: removed print statement

by Sebastian Herbord

Module: check_mk Branch: master Commit: 09ec5a0ba9091386fb85212411d22a4464a8648a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09ec5a0ba90913… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Sep 22 10:27:04 2015 +0200 removed print statement --- doc/treasures/active_checks/check_bi_aggr | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/treasures/active_checks/check_bi_aggr b/doc/treasures/active_checks/check_bi_aggr index 434bbba..0d38bd4 100755 --- a/doc/treasures/active_checks/check_bi_aggr +++ b/doc/treasures/active_checks/check_bi_aggr @@ -229,7 +229,6 @@ if track_downtime: if downtime_tracked != (row["aggr_in_downtime"] == '1'): # there is a discrepance between tracked downtime state and the real state if row["aggr_in_downtime"] == '1': - print("schedule tracked downtime") # need to track downtime conn.command("[%d] SCHEDULE_SVC_DOWNTIME;%s;Aggr Host %s;%d;%d;1;0;0;" "tracking;Automatic downtime" % (now, hostname, hostname, now, 2147483647))

8 years, 12 months

Check_MK Git: check_mk: #2628 check_bi_aggr service now also goes into downtime if the monitored bi is in downtime

by Sebastian Herbord

Module: check_mk Branch: master Commit: a6910ea6c8368953c416d076d7fbeefb7adbea51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6910ea6c83689… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Sep 22 10:24:37 2015 +0200 #2628 check_bi_aggr service now also goes into downtime if the monitored bi is in downtime the service is assigned a "real" downtime even if the downtime of the bi is derived from the aggregated services. The downtime is also removed automatically when the bi leaves its own downtime. Assignment and removal of the downtime happens only when the check is run so there will be a delay between bi going into downtime and the service following. --- .werks/2628 | 13 +++++++ ChangeLog | 1 + checks/check_bi_aggr | 3 ++ doc/treasures/active_checks/check_bi_aggr | 57 ++++++++++++++++++++++++++++- web/plugins/wato/active_checks.py | 11 +++++- 5 files changed, 82 insertions(+), 3 deletions(-) diff --git a/.werks/2628 b/.werks/2628 new file mode 100644 index 0000000..2d00868 --- /dev/null +++ b/.werks/2628 @@ -0,0 +1,13 @@ +Title: check_bi_aggr service now also goes into downtime if the monitored bi is in downtime +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1442910035 +Class: feature + +the service is assigned a "real" downtime even if the downtime of the bi is derived from the +aggregated services. +The downtime is also removed automatically when the bi leaves its own downtime. +Assignment and removal of the downtime happens only when the check is run so there will be a delay +between bi going into downtime and the service following. diff --git a/ChangeLog b/ChangeLog index 6309e8b..56a644b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -85,6 +85,7 @@ * 2592 new checks netextreme_fan, netextreme_psu, netextreme_psu_in, netextreme_psu_out, netextreme_temp for Extreme Networks Switches... * 2625 kernel.util and winperf_processor.util checks now support an optional graph showing utilization of individual cores... * 2626 ps check configurable to list state of individual processes in long output... + * 2628 check_bi_aggr service now also goes into downtime if the monitored bi is in downtime... * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/checks/check_bi_aggr b/checks/check_bi_aggr index 47ae5be..88ba907 100644 --- a/checks/check_bi_aggr +++ b/checks/check_bi_aggr @@ -45,6 +45,9 @@ def check_bi_aggr_arguments(params): if opt_params.get("acknowledged"): args += ' --acknowledged %s' % opt_params['acknowledged'] + if opt_params.get("track_downtimes"): + args += ' -r -n $HOSTNAME$' + return args diff --git a/doc/treasures/active_checks/check_bi_aggr b/doc/treasures/active_checks/check_bi_aggr index c67a84a..434bbba 100755 --- a/doc/treasures/active_checks/check_bi_aggr +++ b/doc/treasures/active_checks/check_bi_aggr @@ -25,6 +25,9 @@ # Boston, MA 02110-1301 USA. import sys, getopt, urllib2, traceback +import os +import time + # tell urllib2 not to honour "http(s)_proxy" env variables urllib2.getproxies = lambda: {} @@ -32,7 +35,7 @@ urllib2.getproxies = lambda: {} def usage(): sys.stderr.write(""" USAGE: check_bi_aggr -b <BASE_URL> -a <AGGR_NAME> -u <USER> -s <SECRET> - [-m <AUTH_MODE>] [-t <TIMEOUT>] [-d] + [-m <AUTH_MODE>] [-r] [-n <HOSTNAME>] [-t <TIMEOUT>] [-d] OPTIONS: -b BASE_URL The base URL to the monitoring environment, e.g. @@ -47,6 +50,8 @@ OPTIONS: -m AUTH_MODE Authentication mode, either "cookie", "basic" or "digest", defaults to "cookie" -t TIMEOUT HTTP connect timeout in seconds (Default: 60) + -r track downtimes. This requires the hostname to be set. + -n HOSTNAME The hostname for which this check is run. --in-downtime S S can be "ok" or "warn". Force this state if the aggregate is in scheduled downtime. OK states will always be unchanged. @@ -56,7 +61,7 @@ OPTIONS: """) -short_options = 'b:a:u:s:m:t:dh' +short_options = 'b:a:u:s:m:t:n:dhr' long_options = [ "help", "in-downtime=", "acknowledged=" ] try: @@ -74,6 +79,9 @@ timeout = 60 debug = False opt_in_downtime = None opt_acknowledged = None +track_downtime = False +hostname = None + for o,a in opts: if o in [ '-h', '--help' ]: @@ -91,6 +99,10 @@ for o,a in opts: auth_mode = a elif o == '-t': timeout = int(a) + elif o == '-r': + track_downtime = True + elif o == '-n': + hostname = a elif o == '-d': debug = True elif o == '--in-downtime': @@ -114,6 +126,13 @@ if not username or not password: usage() sys.exit(1) +if track_downtime and not hostname: + sys.stderr.write('Please provide a hostname when using ' + 'downtime tracking.\n') + usage() + sys.exit(1) + + def init_auth(): if username and password: passwdmngr = urllib2.HTTPPasswordMgrWithDefaultRealm() @@ -186,6 +205,39 @@ if opt_in_downtime and row["aggr_in_downtime"] == '1': else: # "warn" aggr_state = min(aggr_state, 1) +if track_downtime: + # connect to livestatus + try: + import livestatus + except ImportError: + sys.stderr.write('The python livestatus api module is missing. Please install from\n' + 'Check_MK livestatus sources to a python import path.\n') + sys.exit(1) + + socket_path = os.environ['OMD_ROOT'] + '/tmp/run/live' + + conn = livestatus.SingleSiteConnection('unix:' + socket_path) + + now = time.time() + # find out if, according to previous tracking, there already is a downtime + ids = conn.query_table(("GET downtimes\n" + "Columns: id\n" + "Filter: service_description = Aggr Host %s\n" + "Filter: author = tracking\n" + "Filter: end_time > %d") % (hostname, now)) + downtime_tracked = len(ids) > 0 + if downtime_tracked != (row["aggr_in_downtime"] == '1'): + # there is a discrepance between tracked downtime state and the real state + if row["aggr_in_downtime"] == '1': + print("schedule tracked downtime") + # need to track downtime + conn.command("[%d] SCHEDULE_SVC_DOWNTIME;%s;Aggr Host %s;%d;%d;1;0;0;" + "tracking;Automatic downtime" % (now, hostname, hostname, now, 2147483647)) + else: + for dt_id in ids: + conn.command("[%d] DEL_SVC_DOWNTIME;%d" % (now, dt_id[0])) + + if opt_acknowledged and row["aggr_acknowledged"] == '1': aggr_output += ", is acknowledged" if opt_acknowledged == "ok": @@ -196,3 +248,4 @@ if opt_acknowledged and row["aggr_acknowledged"] == '1': sys.stdout.write('%s\n' % aggr_output) sys.exit(aggr_state) + diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 7769008..dae8d04 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -331,7 +331,7 @@ register_rule(group, Dictionary( title = _("Optional parameters"), elements = [ - ("name", + ("name", TextUnicode( title = _("Alternative Service description"), help = _("The service description will be this name instead DNS Servername"), @@ -1516,6 +1516,15 @@ register_rule(group, ( "warn", _("Force to be WARN, if aggregate is not OK") ), ] )), + ("track_downtimes", + Checkbox( + title = _("Track downtimes"), + label = _("Automatically track downtimes of aggregation"), + help = _("If this is active, the check will automatically go into downtime " + "whenever the aggregation does. This downtime is also cleaned up " + "automatically when the aggregation leaves downtime. " + "Downtimes you set manually for this check are unaffected."), + )), ] ), ]

8 years, 12 months

Check_MK Git: check_mk: #2429 FIX check_mk-netapp_api_disk.summary.php: fixed broken php-template

by Andreas Boesl

Module: check_mk Branch: master Commit: bb3cec54d85eac3397ae74eb398c24c063f64b79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb3cec54d85eac… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 22 09:42:36 2015 +0200 #2429 FIX check_mk-netapp_api_disk.summary.php: fixed broken php-template --- .werks/2429 | 9 +++++++++ ChangeLog | 1 + pnp-templates/check_mk-netapp_api_disk.summary.php | 8 ++++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.werks/2429 b/.werks/2429 new file mode 100644 index 0000000..4f8c1fb --- /dev/null +++ b/.werks/2429 @@ -0,0 +1,9 @@ +Title: check_mk-netapp_api_disk.summary.php: fixed broken php-template +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i3 +Date: 1442907734 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index b9ff5d5..6309e8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -242,6 +242,7 @@ * 2598 FIX: Remove button for removing downtimes an BI aggregates because it cannot work... * 2607 FIX: Fixed broken links from BI views to aggregation group views * 2615 FIX: Fixed bug in legacy dashboard conversion when having users not permitted to access embedded views... + * 2429 FIX: check_mk-netapp_api_disk.summary.php: fixed broken php-template WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/pnp-templates/check_mk-netapp_api_disk.summary.php b/pnp-templates/check_mk-netapp_api_disk.summary.php index 5e66613..abc9f5d 100644 --- a/pnp-templates/check_mk-netapp_api_disk.summary.php +++ b/pnp-templates/check_mk-netapp_api_disk.summary.php @@ -35,20 +35,20 @@ $sizegb = sprintf("%.1f", $MAX[1]); $opt[1] = "--vertical-label Bytes -l 0 -b 1024 --title 'Total raw capacity of $hostname' "; # First graph show current filesystem usage -$def[1] = "DEF:bytes=$RRD[total_space] "; +$def[1] = "DEF:bytes=$RRD[total_disk_capacity] "; $def[1] .= "AREA:bytes#00ffc6:\"Capacity\" "; # read ops $opt[2] = "--vertical-label Disks -l 0 --title 'Spare and broken disks of $hostname' "; $def[2] = "". -"DEF:sparedisks=$RRD[spare] ". +"DEF:sparedisks=$RRD[spare_disks] ". "LINE:sparedisks#00e060:\" Spare \" ". "GPRINT:sparedisks:LAST:\"%7.0lf last\" ". "GPRINT:sparedisks:AVERAGE:\"%7.0lf avg\" ". "GPRINT:sparedisks:MAX:\"%7.0lf max\\n\" ". -"DEF:brokendisks=$RRD[broken] ". -"LINE:brokendisks#e04000:\" Broken \" ". +"DEF:brokendisks=$RRD[failed_disks] ". +"LINE:brokendisks#e04000:\" Failed\" ". "GPRINT:brokendisks:LAST:\"%7.0lf last\" ". "GPRINT:brokendisks:AVERAGE:\"%7.0lf avg\" ". "GPRINT:brokendisks:MAX:\"%7.0lf max\\n\" ";

8 years, 12 months

Check_MK Git: check_mk: Updated bug entries #2378

by Mathias Kettner

Module: check_mk Branch: master Commit: 8fdeb300a483bb5625a35f926cb8b2b109768e01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fdeb300a483bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 21 16:19:04 2015 +0200 Updated bug entries #2378 --- .bugs/2378 | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.bugs/2378 b/.bugs/2378 index dc7aae4..0644141 100644 --- a/.bugs/2378 +++ b/.bugs/2378 @@ -1,12 +1,11 @@ -Title: check_bi_aggr: $HOSTNAME$ in aggregation name does not work with CMC +Title: check_bi_aggr: $HOSTNAME$ in aggregation name does not work correctly with CMC Component: checks State: open Date: 2015-09-21 15:43:27 Targetversion: 1.2.6 Class: bug -The reason seems to be, that $HOSTNAME$ is correctly be added -to the command line arguments, but they are put into the commandlie -as $ARG1$. The CMC does not recursively expand macros in $ARG1$, so -$HOSTNAME$ keeps unexpanded. Recursive expansion is not a good idea, -however! Maybe we need to redefine the API for active checks here... +If you use $HOSTNAME$ as part of the aggregation name (just as the online help +suggests), then the correct aggregation is being queried, but the service description +contains <tt>HOSTNAME</tt> instead of the actual host name. So the expansion +of <tt>$HOSTNAME</tt> in the service description does not work.

8 years, 12 months

Check_MK Git: check_mk: Updated bug entries #2378

by Mathias Kettner

Module: check_mk Branch: master Commit: 423781691129d1f415e45171fbd5b34730c6db05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=423781691129d1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 21 15:45:08 2015 +0200 Updated bug entries #2378 --- .bugs/2378 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/2378 b/.bugs/2378 new file mode 100644 index 0000000..dc7aae4 --- /dev/null +++ b/.bugs/2378 @@ -0,0 +1,12 @@ +Title: check_bi_aggr: $HOSTNAME$ in aggregation name does not work with CMC +Component: checks +State: open +Date: 2015-09-21 15:43:27 +Targetversion: 1.2.6 +Class: bug + +The reason seems to be, that $HOSTNAME$ is correctly be added +to the command line arguments, but they are put into the commandlie +as $ARG1$. The CMC does not recursively expand macros in $ARG1$, so +$HOSTNAME$ keeps unexpanded. Recursive expansion is not a good idea, +however! Maybe we need to redefine the API for active checks here...

8 years, 12 months

Check_MK Git: check_mk: #2599 FIX Fix newly introduced fatal bug preventing creation of new hosts in WATO

by Mathias Kettner

Module: check_mk Branch: master Commit: ccc32c35f7c9b965b8abe85a90734694d154bbda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccc32c35f7c9b9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 21 12:56:53 2015 +0200 #2599 FIX Fix newly introduced fatal bug preventing creation of new hosts in WATO This fixes the error message Invalid User Input, Please specify a hostname. --- .werks/2599 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/2599 b/.werks/2599 new file mode 100644 index 0000000..38f0b93 --- /dev/null +++ b/.werks/2599 @@ -0,0 +1,10 @@ +Title: Fix newly introduced fatal bug preventing creation of new hosts in WATO +Level: 2 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1442832955 + +This fixes the error message Invalid User Input, Please specify a hostname. diff --git a/ChangeLog b/ChangeLog index 1f5b67a..b9ff5d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -273,6 +273,7 @@ * 2603 FIX: Git integration: Preventing issues with *.mk.new files... * 2610 FIX: Fixed host search showing results of not permitted folder * 2611 FIX: Fixed host view permission checks on host related pages... + * 2599 FIX: Fix newly introduced fatal bug preventing creation of new hosts in WATO... Notifications: * 2478 Integrated notification plugin for mobile phone push messages via Pushover... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b1f3526..2f0855f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2216,7 +2216,8 @@ def check_new_host_permissions(folder, host, hostname): config.need_permission("wato.manage_hosts") check_folder_permissions(folder, "write") check_user_contactgroups(host.get("contactgroups", (False, []))) - check_new_hostname("host", hostname) + if hostname != None: # otherwise: name not known yet + check_new_hostname("host", hostname) def check_edit_host_permissions(folder, host, hostname): config.need_permission("wato.edit_hosts")

8 years, 12 months

← Newer
1
...
6
7
8
9
10
11
12
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2015