Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: Intermediate step of WATO BI editor

by Mathias Kettner

Module: check_mk Branch: master Commit: c4c2f175986a2e1b3de4c452693ba5a396315666 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4c2f175986a2e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 7 22:36:35 2013 +0100 Intermediate step of WATO BI editor --- web/htdocs/wato.py | 225 ++++++++++++++++++++++++++++++++++++++++++++++- web/plugins/wato/bi.py | 70 +++++++++++++++ 2 files changed, 290 insertions(+), 5 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c4c2f17598…

11 years, 7 months

Check_MK Git: check_mk: WATO BI: Visualize rule tree

by Mathias Kettner

Module: check_mk Branch: master Commit: 946e6279e196824a05737ac1ce514a9d0ef8ff47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=946e6279e19682… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 9 18:27:46 2013 +0100 WATO BI: Visualize rule tree --- doc/bi-example.mk | 9 -------- web/htdocs/wato.css | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/wato.py | 49 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 101 insertions(+), 11 deletions(-) diff --git a/doc/bi-example.mk b/doc/bi-example.mk index 129aa10..f61da69 100644 --- a/doc/bi-example.mk +++ b/doc/bi-example.mk @@ -85,15 +85,6 @@ aggregation_rules["networking"] = ( ] ) -aggregation_rules["nic"] = ( - "NIC $NIC$", - [ "HOST", "NIC" ], - "worst", - [ - ( "$HOST$", "NIC $NIC$" ), - ] -) - aggregation_rules["checkmk"] = ( "Check_MK", [ "HOST" ], diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 3dedc13..bd08270 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -1025,3 +1025,57 @@ table.multisite_conn_method td { table.multisite_conn_method td input { height: 18px; } + +/* BI Editor */ + +.wato .biruletree div { + float: none; + display: inline-block; + vertical-align: top; +} + +.wato .biruletree .birule { + background-color: #ccc; + border: 1px solid #666; + box-shadow: 0.5px 0.5px 2px #000; + color: black; + width: 150px; + border-radius: 4px; + padding-left: 4px; + height: 20px; + margin-bottom: 3px; + padding-top: 2px; + margin-top: 5px; +} + +.wato .biruletree .birule img { + position: relative; + top: -1px; +} + + +.wato .biruletree .birule:hover { + background-color: #eee; +} + +.wato .biruletree .birule a { + color: black; + text-decoration: none; + display: block; +} + +.wato .biruletree .arrow { + border-style: none none solid solid; + border-color: #134; + border-width: 2px; + margin-left: 40px; + margin-right: 3px; + width: 50px; + height: 16px; + border-radius: 0px 10px; +} + +.wato .biruletree .node { + margin-top: 0px; +} + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1b01e1d..b7e91bf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11279,7 +11279,7 @@ def mode_bi_rules(phase): aggregations, aggregation_rules = load_bi_rules() if phase == "buttons": - global_buttons() + html.context_button(_("Main Menu"), make_link([("mode", "main")]), "home") if aggregation_rules: html.context_button(_("New Aggregation"), make_link([("mode", "bi_edit_aggregation")]), "new") @@ -11343,6 +11343,9 @@ def mode_bi_rules(phase): edit_url = make_link([("mode", "bi_edit_rule"), ("id", ruleid)]) html.icon_button(edit_url, _("Edit this rule"), "edit") aggr_refs, rule_refs = count_bi_rule_references(aggregations, aggregation_rules, ruleid) + if rule_refs == 0: + tree_url = make_link([("mode", "bi_rule_tree"), ("id", ruleid)]) + html.icon_button(tree_url, _("This is a top-level rule. Show rule tree"), "aggr") refs = aggr_refs + rule_refs if refs == 0: delete_url = make_action_link([("mode", "bi_rules"), ("_del_rule", ruleid)]) @@ -11356,6 +11359,46 @@ def mode_bi_rules(phase): table.cell(_("Comment"), rule.get("comment", "")) table.end() +def mode_bi_rule_tree(phase): + ruleid = html.var("id") + + if phase == "title": + return _("BI - Rule Tree of") + " " + ruleid + + aggregations, aggregation_rules = load_bi_rules() + + if phase == "buttons": + html.context_button(_("Main Menu"), make_link([("mode", "main")]), "home") + html.context_button(_("Back"), make_link([("mode", "bi_rules")]), "back") + return + + if phase == "action": + return + + aggr_refs, rule_refs = count_bi_rule_references(aggregations, aggregation_rules, ruleid) + if rule_refs == 0: + render_rule_tree(aggregation_rules, ruleid) + +def render_rule_tree(aggregation_rules, ruleid): + rule = aggregation_rules[ruleid] + html.write('<div class=biruletree><div class=birule>') + edit_url = make_link([("mode", "bi_edit_rule"), ("id", ruleid)]) + html.write('<a href="%s">' % edit_url) + html.icon(rule.get("comment", rule["title"]), "aggr") + html.write(" " + ruleid + "</a>") + html.write('</div>') + for node in rule["nodes"]: + r = bi_called_rule(node) + if r: + subnode_id = r[0] + html.write('<br><div class=arrow></div>') + html.write('<div class=node>') + render_rule_tree(aggregation_rules, subnode_id) + html.write('</div>') + html.write('</div>') + + + def bi_called_rule(node): if node[0] == "call": if node[1][1]: @@ -11492,7 +11535,8 @@ def convert_rule_from_bi(rule, ruleid): def convert_rule_to_bi(rule): brule = {} brule.update(rule) - del brule["id"] + if "id" in brule: + del brule["id"] brule["nodes"] = map(convert_node_to_bi, rule["nodes"]) brule["aggregation"] = "!".join( [ rule["aggregation"][0] ] + map(str, rule["aggregation"][1])) @@ -12670,6 +12714,7 @@ modes = { "edit_auxtag" : (["hosttags"], mode_edit_auxtag), "pattern_editor" : (["pattern_editor"], mode_pattern_editor), "bi_rules" : (["bi_rules"], mode_bi_rules), + "bi_rule_tree" : (["bi_rules"], mode_bi_rule_tree), "bi_edit_rule" : (["bi_rules"], mode_bi_edit_rule), "bi_edit_aggregation": (["bi_rules"], mode_bi_edit_aggregation), }

11 years, 7 months

Check_MK Git: check_mk: Availability: added some internal notes

by Mathias Kettner

Module: check_mk Branch: master Commit: 0e15fe3bb4e91a404f3b7d103f3d65c4d1136d9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e15fe3bb4e91a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 7 16:50:53 2013 +0100 Availability: added some internal notes --- web/plugins/views/availability.py | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index e0bf09d..1c48831 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -862,9 +862,12 @@ def compute_tree_state(tree, status): return tree_state -# Av Options: -# Zeitspannen < X Minuten nicht werten -# Verhalten bei Flapping - # Idee: # Bei OK während Downtime OK Vorrang lassen (einstellbar) + +# Probleme: +# Timeline z.B. OK --> Flapping start --> CRIT --> Flapping stop. +# => Bei dem Zeitabschnitt, zu dem das Flapping endet, ist der +# Plugin output vom CRIT-Ereignis verschwunden. Soll man das so +# lassen? +

11 years, 7 months

Check_MK Git: check_mk: WATO BI Editor: edit nodes of type FOREACH_...

by Mathias Kettner

Module: check_mk Branch: master Commit: 9ad49e9e6e2ad1bba6b897783573eb071a2b22dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ad49e9e6e2ad1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 8 22:29:12 2013 +0100 WATO BI Editor: edit nodes of type FOREACH_... --- web/htdocs/wato.py | 240 ++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 195 insertions(+), 45 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9ad49e9e6e…

11 years, 7 months

Check_MK Git: check_mk: BI: allow dict rules, WATO can load/save rules

by Mathias Kettner

Module: check_mk Branch: master Commit: a117e2f9c2dfb291484790213cfc09dec0fe8dee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a117e2f9c2dfb2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 7 17:35:02 2013 +0100 BI: allow dict rules, WATO can load/save rules --- doc/treasures/ds_random_bi.mk | 24 +++++++-- web/htdocs/bi.py | 10 ++++ web/htdocs/images/button_aggr_hi.png | Bin 0 -> 2668 bytes web/htdocs/images/button_aggr_lo.png | Bin 0 -> 3365 bytes web/htdocs/wato.py | 94 ++++++++++++++++++++++++++++++++- web/plugins/sidebar/wato.py | 2 + web/plugins/wato/builtin_modules.py | 8 ++- 7 files changed, 127 insertions(+), 11 deletions(-) diff --git a/doc/treasures/ds_random_bi.mk b/doc/treasures/ds_random_bi.mk index bcc87a0..e58ae4e 100644 --- a/doc/treasures/ds_random_bi.mk +++ b/doc/treasures/ds_random_bi.mk @@ -1,14 +1,26 @@ -aggregation_rules["host"] = ( - "Host $HOST$", - [ "HOST" ], - "worst", - [ +# aggregation_rules["host"] = ( +# "Host $HOST$", +# [ "HOST" ], +# "worst", +# [ +# ( "snarks", [ "$HOST$" ] ), +# ( "gnogo", [ "$HOST$" ] ), +# ( "other", [ "$HOST$" ] ), +# ] +# ) + +aggregation_rules["host"] = { + "title" : "Host $HOST$", + "params" : [ "HOST" ], + "aggregation" : "worst", + "nodes" : [ ( "snarks", [ "$HOST$" ] ), ( "gnogo", [ "$HOST$" ] ), ( "other", [ "$HOST$" ] ), ] -) +} + aggregation_rules["snarks"] = ( "Snarks", diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index c2d0af9..ae94b7c 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -680,6 +680,16 @@ def compile_aggregation_rule(aggr_type, rule, args, lvl): global g_remaining_refs g_remaining_refs = [] + # Convert new dictionary style rule into old tuple based + # format + if type(rule) == dict: + rule = ( + rule.get("title", _("Untitled BI rule")), + rule.get("params", []), + rule.get("aggregation", "worst"), + rule.get("nodes", []) + ) + if len(rule) != 4: raise MKConfigError(_("<h3>Invalid aggregation rule</h1>" "Aggregation rules must contain four elements: description, argument list, " diff --git a/web/htdocs/images/button_aggr_hi.png b/web/htdocs/images/button_aggr_hi.png new file mode 100644 index 0000000..b35f28e Binary files /dev/null and b/web/htdocs/images/button_aggr_hi.png differ diff --git a/web/htdocs/images/button_aggr_lo.png b/web/htdocs/images/button_aggr_lo.png new file mode 100644 index 0000000..a3b93ff Binary files /dev/null and b/web/htdocs/images/button_aggr_lo.png differ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 91d46d3..ded71e2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10965,7 +10965,7 @@ def page_user_profile(): html.footer() #. -# .--Sampleconfig--------------------------------------------------------. +# .-Sampleconfig---------------------------------------------------------. # | ____ _ __ _ | # | / ___| __ _ _ __ ___ _ __ | | ___ ___ ___ _ __ / _(_) __ _ | # | \___ \ / _` | '_ ` _ \| '_ \| |/ _ \/ __/ _ \| '_ \| |_| |/ _` | | @@ -11047,7 +11047,7 @@ def create_sample_config(): save_rulesets(g_root_folder, rulesets) #. -# .--Pattern Editor------------------------------------------------------. +# .-Pattern Editor-------------------------------------------------------. # | ____ _ _ _____ _ _ _ | # | | _ \ __ _| |_| |_ ___ _ __ _ __ | ____|__| (_) |_ ___ _ __ | # | | |_) / _` | __| __/ _ \ '__| '_ \ | _| / _` | | __/ _ \| '__| | @@ -11262,7 +11262,89 @@ def mode_pattern_editor(phase): html.write('</table>\n') html.end_foldable_container() +#. +# .--BI Rules------------------------------------------------------------. +# | ____ ___ ____ _ | +# | | __ )_ _| | _ \ _ _| | ___ ___ | +# | | _ \| | | |_) | | | | |/ _ \/ __| | +# | | |_) | | | _ <| |_| | | __/\__ \ | +# | |____/___| |_| \_\\__,_|_|\___||___/ | +# | | +# +----------------------------------------------------------------------+ +# | Editor for the Rules of BI | +# '----------------------------------------------------------------------' +def mode_bi_rules(phase): + if phase == "title": + return _("BI - Business Intelligence") + + elif phase == "buttons": + global_buttons() + return + + elif phase == "actions": + return + + aggregations, aggregation_rules = load_bi_rules() + save_bi_rules(aggregations, aggregation_rules) + html.debug(aggregation_rules) + +# We need to replace the BI constants internally with something +# that we can replace back after writing the BI-Rules out +# with pprint.pformat +bi_constants = { + 'ALL_HOSTS' : 'f41e728b-0bce-40dc-82ea-51091d034fc3', + 'HOST_STATE' : '7e521edf-122c-4013-b135-669e2673bcfa', + 'HIDDEN' : '87c5fea7-d8fd-4ccf-b3ac-72c3d048cd3b', + 'FOREACH_HOST' : '907b2cdd-07ac-4439-bb4e-1f16eddfdb27', + 'FOREACH_CHILD' : 'd6b000f4-ba42-4638-a5f8-2d07f33940de', + 'FOREACH_PARENT' : 'a18f5691-c929-420c-9ee2-bcf2bd358319', + 'FOREACH_SERVICE' : 'a18f5691-c929-420c-9ee2-bcf2bd358319', + 'REMAINING' : '8f716937-de9c-44b2-bf9a-ec6f6e1d820e', +} + +# returns aggregations, aggregation_rules +def load_bi_rules(): + filename = multisite_dir + "bi.mk" + if not os.path.exists(filename): + return [], {} + + try: + vars = { "aggregation_rules" : {}, + "aggregations" : [], + } + vars.update(bi_constants) + execfile(filename, vars, vars) + return vars["aggregations"], vars["aggregation_rules"] + except Exception, e: + if config.debug: + raise MKGeneralException(_("Cannot read configuration file %s: %s" % + (filename, e))) + return [], {} + +def save_bi_rules(aggregations, aggregation_rules): + def replace_constants(s): + for name, uuid in bi_constants.items(): + while True: + n = s.replace("'%s'" % uuid, name) + if n != s: + s = n + else: + break + return s[0] + '\n ' + s[1:-1] + '\n' + s[-1] + + make_nagios_directory(multisite_dir) + out = create_user_file(multisite_dir + "bi.mk", "w") + out.write("# Written by WATO\n# encoding: utf-8\n\n") + for ruleid, rule in aggregation_rules.items(): + out.write('aggregation_rules["%s"] = %s\n\n' % + ( ruleid, replace_constants(pprint.pformat(rule, width=50)))) + out.write('\n') + out.write("aggregations += %s\n" % + replace_constants(pprint.pformat(aggregations))) + + +#. # .-Hooks-&-API----------------------------------------------------------. # | _ _ _ ___ _ ____ ___ | # | | | | | ___ ___ | | _____ ( _ ) / \ | _ \_ _| | @@ -11837,7 +11919,8 @@ modes = { "hosttags" : (["hosttags"], mode_hosttags), "edit_hosttag" : (["hosttags"], mode_edit_hosttag), "edit_auxtag" : (["hosttags"], mode_edit_auxtag), - "pattern_editor" : (["pattern_editor"], mode_pattern_editor) + "pattern_editor" : (["pattern_editor"], mode_pattern_editor), + "bi_rules" : (["bi_rules"], mode_bi_rules), } loaded_with_language = False @@ -12070,6 +12153,11 @@ def load_plugins(): _("Access to the module for analyzing and validating logfile patterns."), [ "admin", "user" ]) + config.declare_permission("wato.bi_rules", + _("Business Intelligence Rules"), + _("Edit the rules for the BI aggregations."), + [ "admin" ]) + load_web_plugins("wato", globals()) diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 22550fd..8c90ffc 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -54,6 +54,8 @@ def render_wato(mini): html.icon_button(url, title, icon, target="main") else: iconlink(title, url, icon) + else: + html.debug("HIRN") num_pending = wato.api.num_pending_changes() if num_pending: diff --git a/web/plugins/wato/builtin_modules.py b/web/plugins/wato/builtin_modules.py index 333fa26..528aca0 100644 --- a/web/plugins/wato/builtin_modules.py +++ b/web/plugins/wato/builtin_modules.py @@ -62,6 +62,12 @@ modules = [ _("Timeperiods restrict notifications and other things to certain periods of " "the day.") ), + ( "pattern_editor", _("Logfile Pattern Analyzer"), "analyze", "pattern_editor", + _("Analyze logfile pattern rules and validate logfile patterns against custom text.")), + + ( "bi_rules", _("BI - Business Intelligence"), "aggr", "bi_rules", + _("Configuration of Check_MK's Business Intelligence component.")), + ( "sites", _("Distributed Monitoring"), "sites", "sites", _("Distributed monitoring via Multsite, distributed configuration via WATO")), @@ -71,7 +77,5 @@ modules = [ ( "snapshot", _("Backup & Restore"), "backup", "snapshots", _("Make snapshots of your configuration, download, upload and restore snapshots.")), - ( "pattern_editor", _("Logfile Pattern Analyzer"), "analyze", "pattern_editor", - _("Analyze logfile pattern rules and validate logfile patterns against custom text.")), ]

11 years, 7 months

Check_MK Git: check_mk: Timeline: new test script ds_random, fixed bug

by Mathias Kettner

Module: check_mk Branch: master Commit: f26e05d25e9e11ea69cdc90dd349b79d6f6aed8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f26e05d25e9e11… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 5 23:15:14 2013 +0100 Timeline: new test script ds_random, fixed bug --- doc/treasures/SLAviews/README.sla_view | 3 - doc/treasures/SLAviews/reporting.py | 324 -------------------------------- doc/treasures/ds_random | 63 ++++++- web/plugins/views/availability.py | 11 +- 4 files changed, 66 insertions(+), 335 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f26e05d25e…

11 years, 7 months

Check_MK Git: check_mk: First prototype version of BI availability

by Mathias Kettner

Module: check_mk Branch: master Commit: d7e40c3e4a3de93da25f0c1e402d353930e7cefb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7e40c3e4a3de9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 6 17:35:51 2013 +0100 First prototype version of BI availability --- doc/treasures/ds_random_bi.mk | 42 ++++++ web/htdocs/bi.py | 23 +++- web/htdocs/images/button_availability_hi.png | Bin 0 -> 3452 bytes web/htdocs/images/button_availability_lo.png | Bin 0 -> 4377 bytes web/htdocs/images/button_showbi_hi.png | Bin 0 -> 1990 bytes web/htdocs/images/button_showbi_lo.png | Bin 0 -> 2558 bytes web/htdocs/images/icon_showbi.png | Bin 0 -> 2558 bytes web/htdocs/images/icon_timeline.png | Bin 0 -> 2427 bytes web/plugins/pages/shipped.py | 2 + web/plugins/views/availability.py | 190 ++++++++++++++++++++++++-- web/plugins/views/bi.py | 21 +++ web/plugins/views/builtin.py | 30 +++-- 12 files changed, 283 insertions(+), 25 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d7e40c3e4a…

11 years, 7 months

Check_MK Git: check_mk: Availability: better state grouping and melting

by Mathias Kettner

Module: check_mk Branch: master Commit: d154f19d2dd033a5f27579bada956dc7e600acbc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d154f19d2dd033… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 6 11:56:16 2013 +0100 Availability: better state grouping and melting --- web/htdocs/views.css | 6 +- web/plugins/views/availability.py | 139 +++++++++++++++++++++++++++---------- 2 files changed, 104 insertions(+), 41 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 596255f..66921da 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -482,8 +482,8 @@ table.data.availability td.number { } table.data td.flapping, table.timeline td.flapping { - background-image: url("images/bg_flapping.png"); - background-repeat: repeat; + /* background-image: url("images/bg_flapping.png"); + background-repeat: repeat; */ background-color: #f0f; } @@ -499,7 +499,7 @@ table.data td.unmonitored, table.timeline td.unmonitored { color: #888; } table.data.availability tr.odd0 td.number { - background-image: url("images/white_20percent.png"); + background-image: url("images/white_30percent.png"); background-repeat: repeat; } diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 72c7158..ab71e32 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -119,13 +119,58 @@ avoption_entries = [ Checkbox(label = _("Consider notification period")), ), ( "unmonitored", - Checkbox(label = _("Consider unmonitored time")), + Checkbox(label = _("Include unmonitored time")), ), ], optional_keys = False, ), ), + # Optionally group some states togehter + ( "state_grouping", + "double", + Dictionary( + title = _("Status Grouping"), + columns = 2, + elements = [ + ( "warn", + DropdownChoice( + label = _("Treat Warning as: "), + choices = [ + ( "ok", _("OK") ), + ( "warn", _("WARN") ), + ( "crit", _("CRIT") ), + ( "unknown", _("UNKNOWN") ), + ] + ), + ), + ( "unknown", + DropdownChoice( + label = _("Treat Unknown as: "), + choices = [ + ( "ok", _("OK") ), + ( "warn", _("WARN") ), + ( "crit", _("CRIT") ), + ( "unknown", _("UNKNOWN") ), + ] + ), + ), + ( "host_down", + DropdownChoice( + label = _("Treat Host Down as: "), + choices = [ + ( "ok", _("OK") ), + ( "warn", _("WARN") ), + ( "crit", _("CRIT") ), + ( "unknown", _("UNKNOWN") ), + ( "host_down", _("Host Down") ), + ] + ), + ), + ], + optional_keys = False, + ), + ), # Format of numbers ( "timeformat", "single", @@ -145,21 +190,14 @@ avoption_entries = [ ), - # Optionally group some states togehter - ( "state_grouping", + # Short time intervals + ( "short_intervals", "single", - Dictionary( - title = _("Status Grouping"), - columns = 2, - elements = [ - ( "warn_is_ok", - Checkbox(label = _("Treat WARN as OK")), - ), - ( "unknown_is_crit", - Checkbox(label = _("Treat UNKNOWN as CRIT")), - ), - ], - optional_keys = False, + Integer( + title = _("Short Time Intervalls"), + minvalue = 0, + unit = _("sec"), + label = _("Ignore intervals shorter or equal"), ), ), ] @@ -178,9 +216,11 @@ def render_availability_options(): "timeformat" : "percentage_2", "rangespec" : "d0", "state_grouping" : { - "warn_is_ok" : False, - "unknown_is_crit" : False, + "warn" : "warn", + "unknown" : "unknown", + "host_down" : "host_down", }, + "short_intervals" : 0, }) is_open = False @@ -380,12 +420,12 @@ def do_render_availability(datasource, filterheaders, avoptions, only_sites, lim # 2.2.2.2.3 "crit" # 2.2.2.2.4 "unknown" availability = [] - timeline_rows = [] - timeline_considered_duration = 0 # Note: in case of timeline, we have data from exacly one host/service for site_host, site_host_entry in by_host.iteritems(): for service, service_entry in site_host_entry.iteritems(): - states = {} + + # First compute timeline + timeline_rows = [] considered_duration = 0 for span in service_entry: state = span["state"] @@ -406,20 +446,32 @@ def do_render_availability(datasource, filterheaders, avoptions, only_sites, lim 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 + if s == "warn": + s = avoptions["state_grouping"]["warn"] + elif s == "unknown": + s = avoptions["state_grouping"]["unknown"] + elif s == "host_down": + s = avoptions["state_grouping"]["host_down"] + + considered_duration += span["duration"] + timeline_rows.append((span, s)) + + # Now merge consecutive rows with identical state + merge_timeline(timeline_rows) + # Melt down short intervals + if avoptions["short_intervals"]: + melt_short_intervals(timeline_rows, avoptions["short_intervals"]) + + # Condense into availability + states = {} + for span, s in timeline_rows: states.setdefault(s, 0) states[s] += span["duration"] - considered_duration += span["duration"] - if timeline: - timeline_rows.append((span, s)) - timeline_considered_duration = considered_duration + availability.append([site_host[0], site_host[1], service, states, considered_duration]) + # Prepare number format function from_time, until_time = range duration = until_time - from_time @@ -446,7 +498,7 @@ def do_render_availability(datasource, filterheaders, avoptions, only_sites, lim return "%02d:%02d:%02d" % (hours, minn, sec) if timeline: - render_timeline(timeline_rows, from_time, until_time, timeline_considered_duration, timeline, range_title, render_number) + render_timeline(timeline_rows, from_time, until_time, considered_duration, timeline, range_title, render_number) else: render_availability_table(availability, from_time, until_time, range_title, has_service, avoptions, render_number) @@ -455,9 +507,6 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, t html.write('<div class=info>%s</div>' % _("No information available")) return - # More rows with identical state - merge_timeline(timeline_rows) - # Timeformat: show date only if the displayed time range spans over # more than one day. format = "%H:%M:%S" @@ -526,8 +575,26 @@ def merge_timeline(entries): else: n += 1 +def melt_short_intervals(entries, duration): + n = 1 + need_merge = False + while n < len(entries) - 1: + if entries[n][0]["duration"] <= duration and \ + entries[n-1][1] == entries[n+1][1]: + entries[n] = (entries[n][0], entries[n-1][1]) + need_merge = True + n += 1 + + # Due to melting, we need to merge again + if need_merge: + merge_timeline(entries) + melt_short_intervals(entries, duration) def render_availability_table(availability, from_time, until_time, range_title, has_service, avoptions, render_number): + # Some columns might be unneeded due to state treatment options + sg = avoptions["state_grouping"] + sgs = [ sg["warn"], sg["unknown"], sg["host_down"] ] + # Render the stuff availability.sort() table.begin(_("Availability") + " " + range_title, css="availability") @@ -572,13 +639,9 @@ def render_availability_table(availability, from_time, until_time, range_title, continue elif sid == "in_downtime" and not avoptions["consider"]["downtime"]: continue - elif sid == "host_down" and not avoptions["consider"]["host_down"]: - continue elif sid == "unmonitored" and not avoptions["consider"]["unmonitored"]: continue - elif sid == "warn" and avoptions["state_grouping"]["warn_is_ok"]: - continue - elif sid == "unknown" and avoptions["state_grouping"]["unknown_is_crit"]: + elif sid in [ "warn", "unknown", "host_down" ] and sid not in sgs: continue number = states.get(sid, 0) if not number:

11 years, 7 months

Check_MK Git: check_mk: ValueSpec ListOfStrings: new parameter size

by Mathias Kettner

Module: check_mk Branch: master Commit: 7f05ebdfde631b31cd4d7668f6cdca58b0023837 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f05ebdfde631b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 8 22:28:53 2013 +0100 ValueSpec ListOfStrings: new parameter size --- web/htdocs/valuespec.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e8edbdf..e918901 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -541,7 +541,12 @@ class Filename(TextAscii): class ListOfStrings(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) - self._valuespec = kwargs.get("valuespec", TextAscii()) + if "valuespec" in kwargs: + self._valuespec = kwargs.get("valuespec") + elif "size" in kwargs: + self._valuespec = TextAscii(size=kwargs["size"]) + else: + self._valuespec = TextAscii() self._vertical = kwargs.get("orientation", "vertical") == "vertical" self._allow_empty = kwargs.get("allow_empty", True)

11 years, 7 months

Check_MK Git: check_mk: WATO BI: Code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 779a628d3e9610d0d9137687a628395673d5996f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=779a628d3e9610… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 9 18:45:56 2013 +0100 WATO BI: Code cleanup --- web/htdocs/wato.py | 340 +++++++++++++--------------------------------------- 1 files changed, 82 insertions(+), 258 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=779a628d3e…

11 years, 7 months

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