Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: Better styling of av options button

by Mathias Kettner

Module: check_mk Branch: master Commit: 23d57003735528b02b47a14a8699bbe8322195f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23d57003735528… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 6 10:21:44 2013 +0100 Better styling of av options button --- web/htdocs/views.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index eb9b3ed..fb693b5 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -507,7 +507,7 @@ div.floatfilter.rangespec table.valuespec_tuple span.title { } div#avoptions_on { - margin-right: 132px; + margin-right: 3px; } table.availability tr.hilite {

11 years, 9 months

Check_MK Git: check_mk: WATO BI Editor - first complete version

by Mathias Kettner

Module: check_mk Branch: master Commit: 742af2fd70ce6e79e08f95c70bd0fb8e53a8e119 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=742af2fd70ce6e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 9 16:45:20 2013 +0100 WATO BI Editor - first complete version still not heavilty tested, help missing etc. --- web/htdocs/wato.py | 638 +++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 506 insertions(+), 132 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=742af2fd70…

11 years, 9 months

Check_MK Git: check_mk: Availability: renamed table column

by Mathias Kettner

Module: check_mk Branch: master Commit: 7e81fb78ab79da455cbbf271421db478ad27bcca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e81fb78ab79da… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 6 21:33:19 2013 +0100 Availability: renamed table column --- web/plugins/views/availability.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 3a2557a..49bb699 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -573,7 +573,7 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, for sid, css, sname, help in availability_columns: if sid == state_id: table.cell(_("State"), sname, css=css + " state narrow") - table.cell(_("Status Text"), row["log_output"]) + table.cell(_("Additional information"), row["log_output"]) table.end()

11 years, 9 months

Check_MK Git: check_mk: WATO BI: fix reference counting

by Mathias Kettner

Module: check_mk Branch: master Commit: c848c810f287292da555ee6a3737e16015c9b544 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c848c810f28729… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 9 17:18:32 2013 +0100 WATO BI: fix reference counting --- web/htdocs/wato.py | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8f27bf8..1b01e1d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11391,6 +11391,8 @@ def count_bi_rule_references(aggregations, aggregation_rules, ruleid): return aggr_refs, rule_refs +# Checks if the rule 'rule' uses either directly +# or indirectly the rule with the id 'ruleid' def bi_rule_uses_rule(aggregation_rules, rule, ruleid): for node in rule["nodes"]: r = bi_called_rule(node) @@ -11398,8 +11400,9 @@ def bi_rule_uses_rule(aggregation_rules, rule, ruleid): ru_id, info = r if ru_id == ruleid: # Rule is directly being used return True - else: - return bi_rule_uses_rule(aggregation_rules, aggregation_rules[ru_id], ruleid) # Check if lower rules use it + # Check if lower rules use it + elif bi_rule_uses_rule(aggregation_rules, aggregation_rules[ru_id], ruleid): + return True return False # We need to replace the BI constants internally with something @@ -11431,7 +11434,7 @@ def load_bi_rules(): # Convert rules from old-style tuples to new-style dicts rules = {} for ruleid, rule in vars["aggregation_rules"].items(): - rules[ruleid] = convert_rule_from_bi(rule) + rules[ruleid] = convert_rule_from_bi(rule, ruleid) aggregations = [] for aggregation in vars["aggregations"]: aggregations.append(convert_aggregation_from_bi(aggregation)) @@ -11470,7 +11473,7 @@ bi_aggregation_functions = {} # Make some conversions so that the format of the # valuespecs is matched -def convert_rule_from_bi(rule): +def convert_rule_from_bi(rule, ruleid): if type(rule) == tuple: rule = { "title" : rule[0], @@ -11483,11 +11486,13 @@ def convert_rule_from_bi(rule): crule["nodes"] = map(convert_node_from_bi, rule["nodes"]) parts = rule["aggregation"].split("!") crule["aggregation"] = (parts[0], tuple(map(saveint, parts[1:]))) + crule["id"] = ruleid return crule def convert_rule_to_bi(rule): brule = {} brule.update(rule) + del brule["id"] brule["nodes"] = map(convert_node_to_bi, rule["nodes"]) brule["aggregation"] = "!".join( [ rule["aggregation"][0] ] + map(str, rule["aggregation"][1])) @@ -12080,6 +12085,13 @@ def mode_bi_edit_rule(phase): html.set_focus("rule_p_title") 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. #. # .-Hooks-&-API----------------------------------------------------------.

11 years, 9 months

Check_MK Git: check_mk: Availability: consider flapping states

by Mathias Kettner

Module: check_mk Branch: master Commit: cf04968e9da1516df9bba191ceea883f60761e8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf04968e9da151… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 6 11:18:00 2013 +0100 Availability: consider flapping states --- web/htdocs/images/bg_flapping.png | Bin 0 -> 420 bytes web/htdocs/views.css | 12 +++++++++--- web/plugins/views/availability.py | 10 +++++++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/web/htdocs/images/bg_flapping.png b/web/htdocs/images/bg_flapping.png new file mode 100644 index 0000000..98692b2 Binary files /dev/null and b/web/htdocs/images/bg_flapping.png differ diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 35fd892..596255f 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -481,14 +481,20 @@ table.data.availability td.number { width: 60px; } -table.data.availability td.downtime, table.timeline td.downtime { +table.data td.flapping, table.timeline td.flapping { + background-image: url("images/bg_flapping.png"); + background-repeat: repeat; + background-color: #f0f; +} + +table.data td.downtime, table.timeline td.downtime { background-color: #0af; } -table.data.availability td.hostdown, table.timeline td.hostdown { +table.data td.hostdown, table.timeline td.hostdown { background-color: #048; color: white; } -table.data.availability td.unmonitored, table.timeline td.unmonitored { +table.data td.unmonitored, table.timeline td.unmonitored { background-color: #ddd; color: #888; } diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 5278dfe..72c7158 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -106,6 +106,9 @@ avoption_entries = [ title = _("Status Classification"), columns = 2, elements = [ + ( "flapping", + Checkbox(label = _("Consider periods of flapping states")), + ), ( "downtime", Checkbox(label = _("Consider scheduled downtimes")), ), @@ -166,6 +169,7 @@ def render_availability_options(): avoptions = config.load_user_file("avoptions", { "range" : (time.time() - 86400, time.time()), "consider" : { + "flapping" : True, "downtime" : True, "host_down" : True, "notification_period" : True, @@ -315,7 +319,7 @@ def get_availability_data(datasource, filterheaders, range, only_sites, limit, t # Columns for availability columns += [ "duration", "from", "until", "state", "host_down", "in_downtime", - "in_host_downtime", "in_notification_period", # "is_flapping", + "in_host_downtime", "in_notification_period", "is_flapping", "log_output" ] if timeline: columns.append("log_output") @@ -329,6 +333,7 @@ host_availability_columns = [ ( "up", "state0", _("UP"), None ), ( "down", "state2", _("DOWN"), None ), ( "unreach", "state3", _("UNREACH"), None ), + ( "flapping", "flapping", _("Flapping"), 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") ), @@ -339,6 +344,7 @@ service_availability_columns = [ ( "warn", "state1", _("WARN"), None ), ( "crit", "state2", _("CRIT"), None ), ( "unknown", "state3", _("UNKNOWN"), None ), + ( "flapping", "flapping", _("Flapping"), None ), ( "host_down", "hostdown", _("H.Down"), _("The host was down") ), ( "in_downtime", "downtime", _("Downtime"), _("The host or service was in a scheduled downtime") ), ( "outof_notification_period", "", _("OO/Notif"), _("Out of Notification Period") ), @@ -393,6 +399,8 @@ def do_render_availability(datasource, filterheaders, avoptions, only_sites, lim s = "in_downtime" elif span["host_down"] and avoptions["consider"]["host_down"]: s = "host_down" + elif span["is_flapping"] and avoptions["consider"]["flapping"]: + s = "flapping" else: if has_service: s = { 0: "ok", 1:"warn", 2:"crit", 3:"unknown" }[state]

11 years, 9 months

Check_MK Git: check_mk: Availability: fix non-persistent av options

by Mathias Kettner

Module: check_mk Branch: master Commit: bea7faab4b8eb23586e7e8089109046bc42fabba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bea7faab4b8eb2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 6 10:20:01 2013 +0100 Availability: fix non-persistent av options --- web/plugins/views/availability.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 1d877d2..64e71a5 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -181,11 +181,12 @@ def render_availability_options(): is_open = False html.begin_form("avoptions") + html.hidden_field("avoptions", "set") 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(): + if html.var("avoptions") == "set": for name, height, vs in avoption_entries: try: avoptions[name] = vs.from_html_vars("avo_" + name)

11 years, 9 months

Check_MK Git: check_mk: Availability: implement BI time warp!

by Mathias Kettner

Module: check_mk Branch: master Commit: 6f5e17c9630cab2e4b67d7052cd86f9127ce2e91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f5e17c9630cab… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 6 18:24:42 2013 +0100 Availability: implement BI time warp! Wie geil ist das denn :-))) --- web/htdocs/images/button_close_hi.png | Bin 0 -> 3132 bytes web/htdocs/images/button_close_lo.png | Bin 0 -> 3760 bytes web/htdocs/images/button_timewarp_hi.png | Bin 0 -> 2307 bytes web/htdocs/images/button_timewarp_lo.png | Bin 0 -> 2743 bytes web/htdocs/images/icon_timewarp.png | Bin 0 -> 2743 bytes web/htdocs/views.css | 5 + web/plugins/views/availability.py | 160 ++++++++++++++++++++---------- 7 files changed, 111 insertions(+), 54 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6f5e17c963…

11 years, 9 months

Check_MK Git: check_mk: Fix links from BI in availability

by Mathias Kettner

Module: check_mk Branch: master Commit: 74d5f8612a837ac1506f0fb1e02b7a4f47153313 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74d5f8612a837a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 6 22:17:39 2013 +0100 Fix links from BI in availability --- web/htdocs/bi.py | 13 ++++--------- web/plugins/views/availability.py | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 687b001..c2d0af9 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1512,23 +1512,18 @@ def aggr_render_leaf(tree, show_host, bare = False): # (4) CPU load (show_host == False, service != None) if show_host or not service: - host_url = html.makeuri([("view_name", "hoststatus"), ("site", site), ("host", host)]) + host_url = "view.py?" + htmllib.urlencode_vars([("view_name", "hoststatus"), ("site", site), ("host", host)]) if service: - service_url = html.makeuri([("view_name", "service"), ("site", site), ("host", host), ("service", service)]) + service_url = "view.py?" + htmllib.urlencode_vars([("view_name", "service"), ("site", site), ("host", host), ("service", service)]) if show_host: content += '<a href="%s">%s</a><b class=bullet>&diams;</b>' % (host_url, host.replace(" ", " ")) - if tree[1] and tree[0] != tree[1]: - addclass = ' class="state assumed"' - else: - addclass = "" - if not service: - content += '<a href="%s"%s>%s</a>' % (host_url, addclass, _("Host status")) + content += '<a href="%s">%s</a>' % (host_url, _("Host status")) else: - content += '<a href="%s"%s>%s</a>' % (service_url, addclass, service.replace(" ", " ")) + content += '<a href="%s">%s</a>' % (service_url, service.replace(" ", " ")) if bare: return content diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 49bb699..e0bf09d 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -58,7 +58,7 @@ def render_availability(view, datasource, filterheaders, display_options, if not html.has_user_errors(): range, range_title = avoptions["range"] rows = get_availability_data(datasource, filterheaders, range, only_sites, limit, timeline) - what == "service" in datasource["infos"] and "service" or "host" + what = "service" in datasource["infos"] and "service" or "host" do_render_availability(rows, what, avoptions, timeline, "") if 'Z' in display_options:

11 years, 9 months

Check_MK Git: check_mk: Availability: better layout of timeline

by Mathias Kettner

Module: check_mk Branch: master Commit: 61b2940324b90a39e08cfc1f4e1a5a9d9792790a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61b2940324b90a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 6 10:44:19 2013 +0100 Availability: better layout of timeline --- web/htdocs/js/checkmk.js | 2 +- web/htdocs/views.css | 28 +++++++++++++++++++++------- web/plugins/views/availability.py | 12 ++++++++---- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index a2f3828..c8108e6 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1877,7 +1877,7 @@ function view_switch_option(oDiv, viewname, option, choices) { function timeline_hover(row_nr, onoff) { - var table = document.getElementsByClassName("availability")[0]; + var table = document.getElementsByClassName("timelineevents")[0]; var row = table.children[0].children[row_nr+1]; if (onoff) add_class(row, 'hilite'); diff --git a/web/htdocs/views.css b/web/htdocs/views.css index fb693b5..35fd892 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -510,15 +510,10 @@ div#avoptions_on { margin-right: 3px; } -table.availability tr.hilite { - background-color: #6ab; - color: white; -} - table.timeline { - width: 100%; + width: 800px; margin-bottom: 20px; - box-shadow: 0.5px 0.5px 3px #000; + box-shadow: 0px 0px 1px #ccf; height: 30px; border-spacing: 0px; border-collapse: collapse; @@ -529,3 +524,22 @@ table.timeline td { border: 1px solid #444; } +table.timelineevents { + width: 800px; +} +table.timelineevents tr.hilite { + background-color: #6ab; + color: white; +} +div.timelinerange { + width: 800px; + float: none; +} +div.timelinerange div { + width: 300px; + float: left; +} +div.timelinerange div.until { + text-align: right; + float: right; +} diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 64e71a5..5278dfe 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -468,11 +468,15 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, t title += " - " + range_title # Render graphical representation - html.write('<h3>%s</h3>' % title) # Make sure that each cell is visible, if possible - min_percentage = min(100.0 / len(timeline_rows), 2) + min_percentage = min(100.0 / len(timeline_rows), 1) rest_percentage = 100 - len(timeline_rows) * min_percentage - html.write('<table class=timeline><tr>') + html.write('<div class=timelinerange>') + html.write('<div class=from>%s</div><div class=until>%s</div></div>' % ( + render_date(from_time), render_date(until_time))) + + html.write('<table class=timeline>') + html.write('<tr class=timeline>') for row_nr, (row, state_id) in enumerate(timeline_rows): for sid, css, sname, help in availability_columns: if sid == state_id: @@ -489,7 +493,7 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, t html.write('</tr></table>') # Render Table - table.begin(_("Detailed list of states"), css="availability") + table.begin("", css="timelineevents") for row_nr, (row, state_id) in enumerate(timeline_rows): table.row() table.cell(_("From"), render_date(row["from"]), css="nobr narrow")

11 years, 9 months

Check_MK Git: check_mk: First version of availability reporting

by Mathias Kettner

Module: check_mk Branch: master Commit: ac934de77aae332e81643523ea5e6331f7cb91b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac934de77aae33… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 3 18:15:40 2013 +0100 First version of availability reporting --- web/.f12 | 3 +- web/htdocs/check_mk.css | 2 + web/htdocs/images/icon_availability.png | Bin 0 -> 4377 bytes web/htdocs/table.py | 12 +- web/htdocs/valuespec.py | 9 +- web/htdocs/views.css | 41 +++- web/htdocs/views.py | 33 ++- web/plugins/views/availability.py | 416 +++++++++++++++++++++++++++++++ 8 files changed, 495 insertions(+), 21 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ac934de77a…

11 years, 9 months

← Newer
1
...
25
26
27
28
29
30
31
...
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