Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: WATO BI: added (disabled) default rule set

by Mathias Kettner

Module: check_mk Branch: master Commit: b86a615bbc5f00eb10cf69fc6c6bf976205db20e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b86a615bbc5f00… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 10 14:50:05 2013 +0100 WATO BI: added (disabled) default rule set This is basically the same ruleset as in doc/bi-example.mk. It uses host_aggregations, however and disables the only aggregation. That way no harm is being done. Nothing is effective - unless the user enabled the aggregation within WATO BI. --- web/htdocs/bi.py | 3 + web/htdocs/config.py | 1 + web/htdocs/wato.py | 121 +++++++++++++++++++++++++++++++++------------- web/plugins/wato/bi.py | 126 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 217 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b86a615bbc…

11 years, 7 months

Check_MK Git: check_mk: WATO BI: use real host tag editor

by Mathias Kettner

Module: check_mk Branch: master Commit: 7d20aece0df5c07486e9a79f5a82f8a70c4a111d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d20aece0df5c0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 9 20:00:19 2013 +0100 WATO BI: use real host tag editor --- web/htdocs/wato.py | 97 +++++++++++++++++++++++++++++++++++---------------- 1 files changed, 66 insertions(+), 31 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1098366..30af983 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10472,7 +10472,10 @@ def mode_edit_rule(phase, new = False): html.end_form() # Render HTML input fields for editing a tag based condition -def render_condition_editor(tag_specs): +def render_condition_editor(tag_specs, varprefix=""): + if varprefix: + varprefix += "_" + if len(config.wato_aux_tags) + len(config.wato_host_tags) == 0: html.write(_("You have not configured any <a href=\"wato.py?mode=hosttags\">host tags</a>.")) return @@ -10504,18 +10507,20 @@ def render_condition_editor(tag_specs): # of div that is switched visible by is/isnot def tag_condition_dropdown(tagtype, deflt, id): html.write("<td>") - html.select(tagtype + "_" + id, [ + html.select(varprefix + tagtype + "_" + id, [ ("ignore", _("ignore")), ("is", _("is")), ("isnot", _("isnot"))], deflt, - onchange="valuespec_toggle_dropdownn(this, 'tag_sel_%s');" % id) + onchange="valuespec_toggle_dropdownn(this, '%stag_sel_%s');" % \ + (varprefix, id) + ) html.write("</td><td class=\"tag_sel\">") if html.form_submitted(): div_is_open = html.var(tagtype + "_" + id, "ignore") != "ignore" else: div_is_open = deflt != "ignore" - html.write('<div id="tag_sel_%s" style="%s">' % ( - id, not div_is_open and "display: none;" or "")) + html.write('<div id="%stag_sel_%s" style="%s">' % ( + varprefix, id, not div_is_open and "display: none;" or "")) # Show main tags html.write("<table>") @@ -10525,7 +10530,7 @@ def render_condition_editor(tag_specs): html.write("<tr><td>%s:  </td>" % title) default_tag, deflt = current_tag_setting(choices) tag_condition_dropdown("tag", deflt, id) - html.select("tagvalue_" + id, + html.select(varprefix + "tagvalue_" + id, [t[0:2] for t in choices if t[0] != None], deflt=default_tag) html.write("</div>") html.write("</td></tr>") @@ -10545,13 +10550,15 @@ def render_condition_editor(tag_specs): # Retrieve current tag condition settings from HTML variables -def get_tag_conditions(): +def get_tag_conditions(varprefix=""): + if varprefix: + varprefix += "_" # Main tags tag_list = [] for entry in config.wato_host_tags: id, title, tags = entry[:3] - mode = html.var("tag_" + id) - tagvalue = html.var("tagvalue_" + id) + mode = html.var(varprefix + "tag_" + id) + tagvalue = html.var(varprefix + "tagvalue_" + id) if mode == "is": tag_list.append(tagvalue) elif mode == "isnot": @@ -10559,7 +10566,7 @@ def get_tag_conditions(): # Auxiliary tags for id, title in config.wato_aux_tags: - mode = html.var("auxtag_" + id) + mode = html.var(varprefix + "auxtag_" + id) if mode == "is": tag_list.append(id) elif mode == "isnot": @@ -11408,14 +11415,14 @@ def bi_called_rule(node): return node[1][0], _("Explicit call ") + args elif node[0] == "foreach_host": subnode = node[1][-1] - # if subnode[0] == 'call': # MUST always be 'call' - if node[1][0] == 'host': - info = _("Called for all hosts...") - elif node[1][0] == 'child': - info = _("Called for each child of...") - else: - info = _("Called for each parent of...") - return subnode[1][0], info + if subnode[0] == 'call': + if node[1][0] == 'host': + info = _("Called for all hosts...") + elif node[1][0] == 'child': + info = _("Called for each child of...") + else: + info = _("Called for each parent of...") + return subnode[1][0], info elif node[0] == "foreach_service": subnode = node[1][-1] return subnode[1][0], _("Called for each service...") @@ -11448,6 +11455,43 @@ def bi_rule_uses_rule(aggregation_rules, rule, ruleid): return True return False + +# ValueSpec for editing a tag-condition +class HostTagCondition(ValueSpec): + def __init__(self, **kwargs): + ValueSpec.__init__(self, **kwargs) + + def render_input(self, varprefix, value): + render_condition_editor(value, varprefix) + + def from_html_vars(self, varprefix): + return get_tag_conditions(varprefix=varprefix) + + def canonical_value(self): + return [] + + def value_to_text(self, value): + return "|".join(value) + + def validate_datatype(self, value, varprefix): + if type(value) != list: + raise MKUserError(varprefix, _("The list of host tags must be a list, but " + "is %r") % type(value)) + for x in value: + if type(x) != str: + raise MKUserError(varprefix, _("The list of host tags must only contain strings " + "but also contains %r") % x) + + + + def validate_value(self, value, varprefix): + pass + + + + + + # We need to replace the BI constants internally with something # that we can replace back after writing the BI-Rules out # with pprint.pformat @@ -11691,10 +11735,8 @@ def declare_bi_valuespecs(aggregation_rules): ( 'parent', _("The found hosts' parents") ), ] ), - ListOfStrings( - title = _("Host Tags:"), - orientation = "horizontal", - size = 10, + HostTagCondition( + title = _("Host Tags:") ), OptionalDropdownChoice( title = _("Host Name:"), @@ -11715,10 +11757,8 @@ def declare_bi_valuespecs(aggregation_rules): ( "foreach_service", _("Create nodes based on a service search"), Tuple( elements = [ - ListOfStrings( - title = _("Host Tags:"), - orientation = "horizontal", - size = 10, + HostTagCondition( + title = _("Host Tags:") ), OptionalDropdownChoice( title = _("Host Name:"), @@ -11957,11 +11997,6 @@ def mode_bi_edit_rule(phase): html.set_focus("rule_p_title") html.end_form() -# TODO BI: -# - Host Tags richtig editieren, nicht mit ListOfStrings. -# Dazu ein ValueSpec machen und dies dann auch im Regel- -# editor verwenden. - #. # .-Hooks-&-API----------------------------------------------------------. # | _ _ _ ___ _ ____ ___ |

11 years, 7 months

Check_MK Git: check_mk: WATO BI: check for cycles in rules

by Mathias Kettner

Module: check_mk Branch: master Commit: 42025d1b22a2a057ec08b9ad0d99e2d0b94b6a0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42025d1b22a2a0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 9 19:01:24 2013 +0100 WATO BI: check for cycles in rules --- web/htdocs/wato.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8605019..1098366 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11919,7 +11919,7 @@ def mode_bi_edit_rule(phase): if phase == "action": if html.check_transaction(): new_rule = vs_rule.from_html_vars('rule') - vs_main.validate_value(new_rule, 'rule') + vs_rule.validate_value(new_rule, 'rule') if new: ruleid = new_rule["id"] @@ -11932,6 +11932,10 @@ def mode_bi_edit_rule(phase): log_audit(None, "bi-new-rule", _("Create new BI rule %s") % ruleid) else: aggregation_rules[ruleid].update(new_rule) + new_rule["id"] = ruleid + if bi_rule_uses_rule(aggregation_rules, new_rule, new_rule["id"]): + raise MKUserError(None, _("There is a cycle in your rules. This rule calls itself - " + "either directly or indirectly.")) log_audit(None, "bi-edit-rule", _("Modified BI rule %s") % ruleid) save_bi_rules(aggregations, aggregation_rules) @@ -11954,9 +11958,6 @@ def mode_bi_edit_rule(phase): html.end_form() # TODO BI: -# - Prüfung auf Zyklen in den Regeln. Bzw. die Auswahlbox -# darf nur Regeln zeigen, die die aktuelle Regel nicht -# brauchen. # - Host Tags richtig editieren, nicht mit ListOfStrings. # Dazu ein ValueSpec machen und dies dann auch im Regel- # editor verwenden.

11 years, 7 months

Check_MK Git: check_mk: WATO BI: added some help texts

by Mathias Kettner

Module: check_mk Branch: master Commit: e75e1fa4aee4e0a6fc744155613855d681f3995d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e75e1fa4aee4e0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 10 13:58:57 2013 +0100 WATO BI: added some help texts --- web/htdocs/check_mk.css | 10 +++++- web/htdocs/pages.css | 16 ++++---- web/htdocs/valuespec.py | 1 + web/htdocs/wato.py | 90 ++++++++++++++++++++++++++++++++++------------ web/plugins/wato/bi.py | 22 +++++++++-- 5 files changed, 102 insertions(+), 37 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e75e1fa4ae…

11 years, 7 months

Check_MK Git: check_mk: Availability: implement timeline

by Mathias Kettner

Module: check_mk Branch: master Commit: 02013b4765e1b87f79b8a2592e672df2d63c7e82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02013b4765e1b8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 5 22:03:10 2013 +0100 Availability: implement timeline --- web/htdocs/images/button_timeline_hi.png | Bin 0 -> 2065 bytes web/htdocs/images/button_timeline_lo.png | Bin 0 -> 2427 bytes web/htdocs/views.css | 23 +++++- web/plugins/views/availability.py | 130 +++++++++++++++++++++++++++--- 4 files changed, 137 insertions(+), 16 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=02013b4765…

11 years, 7 months

Check_MK Git: check_mk: Handle availability of hosts correctly

by Mathias Kettner

Module: check_mk Branch: master Commit: 373f574451a806b9b7c076acdb31ce6e70703b44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=373f574451a806… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 4 15:50:47 2013 +0100 Handle availability of hosts correctly --- web/plugins/views/availability.py | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 106d83a..f4dff82 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -281,7 +281,11 @@ def compute_range(rangespec): return (time.mktime(from_broken), until_time), titles[1] def get_availability_data(datasource, filterheaders, range, only_sites, limit): + has_service = "service" in datasource["infos"] av_filter = "Filter: time >= %d\nFilter: time <= %d\n" % range + if not has_service: + av_filter += "Filter: service_description =\n" + query = "GET statehist\n" + av_filter # Add Columns needed for object identification @@ -298,7 +302,16 @@ def get_availability_data(datasource, filterheaders, range, only_sites, limit): return rows -availability_columns = [ +host_availability_columns = [ + ( "up", "state0", _("UP"), None ), + ( "down", "state2", _("DOWN"), None ), + ( "unreach", "state3", _("UNREACH"), None ), + ( "in_downtime", "downtime", _("Downtime"), _("The host was in a scheduled downtime") ), + ( "outof_notification_period", "", _("OO/Notif"), _("Out of Notification Period") ), + ( "unmonitored", "unmonitored", _("N/A"), _("During this time period no monitoring data is available") ), +] + +service_availability_columns = [ ( "ok", "state0", _("OK"), None ), ( "warn", "state1", _("WARN"), None ), ( "crit", "state2", _("CRIT"), None ), @@ -310,6 +323,9 @@ availability_columns = [ ] def do_render_availability(datasource, filterheaders, avoptions, only_sites, limit): + # Is this a host or a service datasource? + has_service = "service" in datasource["infos"] + range, range_title = avoptions["range"] rows = get_availability_data(datasource, filterheaders, range, only_sites, limit) @@ -352,11 +368,15 @@ def do_render_availability(datasource, filterheaders, avoptions, only_sites, lim elif span["host_down"] and avoptions["consider"]["host_down"]: s = "host_down" else: - s = { 0: "ok", 1:"warn", 2:"crit", 3:"unknown" }[state] + if has_service: + s = { 0: "ok", 1:"warn", 2:"crit", 3:"unknown" }[state] + else: + s = { 0: "up", 1:"down", 2:"unreach"}[state] if avoptions["state_grouping"]["warn_is_ok"] and s == "warn": s = "ok" elif avoptions["state_grouping"]["unknown_is_crit"] and s == "unknown": s = "crit" + # TODO: host_down as crit states.setdefault(s, 0) states[s] += span["duration"] @@ -400,6 +420,10 @@ def do_render_availability(datasource, filterheaders, avoptions, only_sites, lim table.cell(_("Host"), '<a href="%s">%s</a>' % (host_url, host)) service_url = "view.py?" + htmllib.urlencode_vars([("view_name", "service"), ("site", site), ("host", host), ("service", service)]) table.cell(_("Service"), '<a href="%s">%s</a>' % (service_url, service)) + if has_service: + availability_columns = service_availability_columns + else: + availability_columns = host_availability_columns for sid, css, sname, help in availability_columns: if sid == "outof_notification_period" and not avoptions["consider"]["notification_period"]: continue

11 years, 7 months

Check_MK Git: check_mk: Availability: make options hidable, like filters

by Mathias Kettner

Module: check_mk Branch: master Commit: b37c296d0eecc8c061341782b2353e93940e3ec0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b37c296d0eecc8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 4 15:37:28 2013 +0100 Availability: make options hidable, like filters --- web/htdocs/images/button_history_hi.png | Bin 0 -> 3519 bytes web/htdocs/images/button_history_lo.png | Bin 0 -> 4711 bytes web/htdocs/views.css | 4 ++++ web/htdocs/views.py | 10 ---------- web/plugins/views/availability.py | 16 +++++++++++++--- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/web/htdocs/images/button_history_hi.png b/web/htdocs/images/button_history_hi.png new file mode 100644 index 0000000..b6bbfc3 Binary files /dev/null and b/web/htdocs/images/button_history_hi.png differ diff --git a/web/htdocs/images/button_history_lo.png b/web/htdocs/images/button_history_lo.png new file mode 100644 index 0000000..d3b8f47 Binary files /dev/null and b/web/htdocs/images/button_history_lo.png differ diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 9185b4d..47be080 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -504,3 +504,7 @@ div.floatfilter.rangespec table.valuespec_tuple span.title { position: relative; top: 7px; } + +div#avoptions_on { + margin-right: 132px; +} diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 1d19c7c..9792000 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1610,16 +1610,6 @@ def view_optiondial(view, option, choices, help): def view_optiondial_off(option): html.write('<div class="optiondial off %s"></div>' % option) - -def view_option_toggler(id, view, option, icon, help, hidden = False): - vo = view_options(view["name"]) - value = vo.get(option, view.get(option, False)) - html.begin_context_buttons() # just to be sure - hide = hidden and ' style="display:none"' or '' - html.write('<div id="%s_on" title="%s" class="togglebutton %s %s" ' - 'onclick="view_switch_option(this, \'%s\', \'%s\');"%s></div>' % ( - id, help, icon, value and "down" or "up", view["name"], option, hide)) - def toggler(id, icon, help, onclick, value, hidden = False): html.begin_context_buttons() # just to be sure hide = hidden and ' style="display:none"' or '' diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 109ab94..106d83a 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -37,6 +37,8 @@ def render_availability(view, datasource, filterheaders, display_options, html.top_heading(title) if 'B' in display_options: html.begin_context_buttons() + togglebutton("avoptions", False, "painteroptions", _("Configure details of the report")) + html.context_button(_("Status View"), html.makeuri([("mode", "status")]), "status") html.end_context_buttons() @@ -165,7 +167,10 @@ def render_availability_options(): }, }) + is_open = False html.begin_form("avoptions") + html.write('<div class="view_form" id="avoptions" %s>' + % (not is_open and 'style="display: none"' or '') ) html.write("<table border=0 cellspacing=0 cellpadding=0 class=filterform><tr><td>") if html.form_submitted(): @@ -197,6 +202,7 @@ def render_availability_options(): html.write("<tr><td>") html.button("apply", _("Apply"), "submit") html.write("</td></tr></table>") + html.write("</div>") html.hidden_fields() html.end_form() @@ -385,11 +391,15 @@ def do_render_availability(datasource, filterheaders, avoptions, only_sites, lim return "%02d:%02d:%02d" % (hours, minn, sec) - table.begin(_("Availability Matrix") + " - " + range_title, css="availability") + table.begin(_("Availability") + " " + range_title, css="availability") for site, host, service, states, considered_duration in availability: table.row() - table.cell(_("Host"), host) - table.cell(_("Service"), service) + table.cell("", css="buttons") + html.icon_button("URL", _("Event History"), "history") + host_url = "view.py?" + htmllib.urlencode_vars([("view_name", "hoststatus"), ("site", site), ("host", host)]) + table.cell(_("Host"), '<a href="%s">%s</a>' % (host_url, host)) + service_url = "view.py?" + htmllib.urlencode_vars([("view_name", "service"), ("site", site), ("host", host), ("service", service)]) + table.cell(_("Service"), '<a href="%s">%s</a>' % (service_url, service)) for sid, css, sname, help in availability_columns: if sid == "outof_notification_period" and not avoptions["consider"]["notification_period"]: continue

11 years, 7 months

Check_MK Git: check_mk: Timeline now with nice hover code

by Mathias Kettner

Module: check_mk Branch: master Commit: fcf71f45278af910b599b86fc74e02904c9da0ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcf71f45278af9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 5 22:29:26 2013 +0100 Timeline now with nice hover code --- web/htdocs/js/checkmk.js | 22 ++++++++++++++++++++++ web/htdocs/views.css | 8 ++++++-- web/plugins/views/availability.py | 11 +++++------ 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 0d9b91f..a2f3828 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1864,3 +1864,25 @@ function view_switch_option(oDiv, viewname, option, choices) { handleReload(''); } + + +// .-Availability----------------------------------------------------------. +// | _ _ _ _ _ _ _ _ | +// | / \__ ____ _(_) | __ _| |__ (_) (_) |_ _ _ | +// | / _ \ \ / / _` | | |/ _` | '_ \| | | | __| | | | | +// | / ___ \ V / (_| | | | (_| | |_) | | | | |_| |_| | | +// | /_/ \_\_/ \__,_|_|_|\__,_|_.__/|_|_|_|\__|\__, | | +// | |___/ | +// '-----------------------------------------------------------------------' + +function timeline_hover(row_nr, onoff) +{ + var table = document.getElementsByClassName("availability")[0]; + var row = table.children[0].children[row_nr+1]; + if (onoff) + add_class(row, 'hilite'); + else { + remove_class(row, 'hilite'); + } +} + diff --git a/web/htdocs/views.css b/web/htdocs/views.css index ce32677..eb9b3ed 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -510,6 +510,11 @@ div#avoptions_on { margin-right: 132px; } +table.availability tr.hilite { + background-color: #6ab; + color: white; +} + table.timeline { width: 100%; margin-bottom: 20px; @@ -520,8 +525,7 @@ table.timeline { } table.timeline td { - display: inline-box; - height: 30px; padding: 0px; border: 1px solid #444; } + diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 7c7ca18..5ccbaed 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -467,7 +467,7 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, t min_percentage = min(100.0 / len(timeline_rows), 1) rest_percentage = 100 - len(timeline_rows) * min_percentage html.write('<table class=timeline><tr>') - for row, state_id in timeline_rows: + for row_nr, (row, state_id) in enumerate(timeline_rows): for sid, css, sname, help in availability_columns: if sid == state_id: title = _("From %s until %s (%s) %s") % ( @@ -477,13 +477,14 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, t if row["log_output"]: title += " - " + row["log_output"] width = min_percentage + rest_percentage * row["duration"] / considered_duration - html.write('<td style="width: %.1f%%" title="%s" class="%s"></td>' % (width, title, css)) + html.write('<td onmouseover="timeline_hover(%d, 1);" onmouseout="timeline_hover(%d, 0);" ' + 'style="width: %.1f%%" title="%s" class="%s"></td>' % ( + row_nr, row_nr, width, title, css)) html.write('</tr></table>') - # Render Table table.begin(_("Detailed list of states"), css="availability") - for row, state_id in timeline_rows: + for row_nr, (row, state_id) in enumerate(timeline_rows): table.row() table.cell(_("From"), render_date(row["from"]), css="nobr narrow") table.cell(_("Until"), render_date(row["until"]), css="nobr narrow") @@ -493,8 +494,6 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, t table.cell(_("State"), sname, css=css + " state narrow") table.cell(_("Plugin output"), row["log_output"]) - # table.cell("TEST") - # html.write(repr(row)) table.end()

11 years, 7 months

Check_MK Git: check_mk: Added small helper for creating random services

by Mathias Kettner

Module: check_mk Branch: master Commit: f1c8bb0db31ce6cc54f4744562294062eaca5e6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1c8bb0db31ce6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 4 19:00:43 2013 +0100 Added small helper for creating random services --- doc/treasures/ds_random | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/doc/treasures/ds_random b/doc/treasures/ds_random new file mode 100755 index 0000000..40e171e --- /dev/null +++ b/doc/treasures/ds_random @@ -0,0 +1,10 @@ +#!/usr/bin/python +# Testing script, that can be used as a datasource program +# and creates a number of random services with random states + +import os, random + +print '<<<local>>>' +for service in os.listdir('/'): + state = int(random.random() * 4) + print "%d Random_%s - Random Random Random" % (state, service)

11 years, 7 months

Check_MK Git: check_mk: Availability: link to events of host/service

by Mathias Kettner

Module: check_mk Branch: master Commit: 673231e52d10eb7d0b6e074aa68936cdbf74f5d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=673231e52d10eb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 4 19:01:04 2013 +0100 Availability: link to events of host/service --- web/htdocs/valuespec.py | 5 ++++- web/htdocs/views.py | 13 ++++++++++--- web/plugins/views/availability.py | 30 ++++++++++++++++++++++++++---- web/plugins/views/filters.py | 13 ++++++++----- 4 files changed, 48 insertions(+), 13 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index bb5df0b..e8edbdf 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1000,7 +1000,10 @@ class CascadingDropdown(ValueSpec): return "" # Nothing selected? Should never happen def from_html_vars(self, varprefix): - sel = int(html.var(varprefix + "_sel")) + try: + sel = int(html.var(varprefix + "_sel")) + except: + sel = 0 val, title, vs = self._choices[sel] if vs: val = (val, vs.from_html_vars(varprefix + "_%d" % sel)) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 9792000..9850f5f 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1369,7 +1369,11 @@ def render_view(view, rows, datasource, group_painters, painters, # Take into account: permissions, display_options row_count > 0 and command_form, # Take into account: layout capabilities - can_display_checkboxes, show_checkboxes) + can_display_checkboxes, show_checkboxes, + # Show link to availability. This exists only for plain hosts + # and services table. The grouping tables have columns that statehist + # is missing. That way some of the filters might fail. + datasource["table"] in [ "hosts", "services"] ) # User errors in filters html.show_user_errors() @@ -1653,7 +1657,8 @@ def togglebutton(id, isopen, icon, help, hidden = False): 'onclick="view_toggle_form(this, \'%s\');"%s></div>' % (id, icon, cssclass, help, id, hide)) def show_context_links(thisview, active_filters, show_filters, display_options, - painter_options, enable_commands, enable_checkboxes, show_checkboxes): + painter_options, enable_commands, enable_checkboxes, show_checkboxes, + show_availability): # html.begin_context_buttons() called automatically by html.context_button() # That way if no button is painted we avoid the empty container if 'B' in display_options: @@ -1733,7 +1738,9 @@ def show_context_links(thisview, active_filters, show_filters, display_options, url = "edit_view.py?clonefrom=%s&load_view=%s&back=%s" % \ (thisview["owner"], thisview["name"], backurl) html.context_button(_("Edit View"), url, "edit", id="edit", bestof=config.context_buttons_to_show) - html.context_button(_("Availability"), html.makeuri([("mode", "availability")]), "availability") + + if show_availability: + html.context_button(_("Availability"), html.makeuri([("mode", "availability")]), "availability") if 'B' in display_options: execute_hooks('buttons-end') diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index f4dff82..7a26a8c 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -138,10 +138,10 @@ avoption_entries = [ columns = 2, elements = [ ( "warn_is_ok", - Checkbox(label = _("Consider WARN as OK")), + Checkbox(label = _("Treat WARN as OK")), ), ( "unknown_is_crit", - Checkbox(label = _("Consider UNKNOWN as CRIT")), + Checkbox(label = _("Treat UNKNOWN as CRIT")), ), ], optional_keys = False, @@ -176,6 +176,7 @@ def render_availability_options(): if html.form_submitted(): for name, height, vs in avoption_entries: try: + html.debug(name) avoptions[name] = vs.from_html_vars("avo_" + name) except MKUserError, e: html.add_user_error(e.varname, e.message) @@ -283,7 +284,9 @@ def compute_range(rangespec): def get_availability_data(datasource, filterheaders, range, only_sites, limit): has_service = "service" in datasource["infos"] av_filter = "Filter: time >= %d\nFilter: time <= %d\n" % range - if not has_service: + if has_service: + av_filter += "Filter: service_description !=\n" + else: av_filter += "Filter: service_description =\n" query = "GET statehist\n" + av_filter @@ -415,7 +418,26 @@ def do_render_availability(datasource, filterheaders, avoptions, only_sites, lim for site, host, service, states, considered_duration in availability: table.row() table.cell("", css="buttons") - html.icon_button("URL", _("Event History"), "history") + history_url_vars = [ + ("site", site), + ("host", host), + ("logtime_from_range", "unix"), # absolute timestamp + ("logtime_until_range", "unix"), # absolute timestamp + ("logtime_from", str(int(from_time))), + ("logtime_until", str(int(until_time)))] + if has_service: + history_url_vars += [ + ("service", service), + ("view_name", "svcevents"), + ] + else: + history_url_vars += [ + ("view_name", "hostevents"), + ] + + history_url = "view.py?" + htmllib.urlencode_vars(history_url_vars) + + html.icon_button(history_url, _("Event History"), "history") host_url = "view.py?" + htmllib.urlencode_vars([("view_name", "hoststatus"), ("site", site), ("host", host)]) table.cell(_("Host"), '<a href="%s">%s</a>' % (host_url, host)) service_url = "view.py?" + htmllib.urlencode_vars([("view_name", "service"), ("site", site), ("host", host), ("service", service)]) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 559cd43..b53286a 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -374,10 +374,10 @@ class FilterTime(Filter): self.column = column self.name = name self.ranges = [ - (86400, _("days")), - (3600, _("hours")), - (60, _("min")), - (1, _("sec")), + (86400, _("days")), + (3600, _("hours")), + (60, _("min")), + (1, _("sec")), ] varnames = [ name + "_from", name + "_from_range", name + "_until", name + "_until_range" ] @@ -389,7 +389,8 @@ class FilterTime(Filter): def display(self): choices = [ (str(sec), title + " " + _("ago")) for sec, title in self.ranges ] + \ - [ ("abs", _("Date (YYYY-MM-DD)")) ] + [ ("abs", _("Date (YYYY-MM-DD)")), + ("unix", _("UNIX timestamp")) ] html.write("<table class=filtertime>") for what, whatname in [ @@ -431,6 +432,8 @@ class FilterTime(Filter): except: html.add_user_error(varprefix, _("Please enter the date in the format YYYY-MM-DD.")) range.append(None) + elif rangename == "unix": + range.append(int(count)) else: try: count = int(count)

11 years, 7 months

← Newer
1
...
23
24
25
26
27
28
29
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013