Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64271 discussions

Check_MK Git: check_mk: WATO: site configuration, new attriute replication priority

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7dad0356fbe1769e8d48b496b4c09a9204a50417 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7dad0356fbe176… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 8 19:19:14 2012 +0200 WATO: site configuration, new attriute replication priority --- web/htdocs/wato.py | 69 +++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 49 insertions(+), 20 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 78e73ed..efdcc1d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3322,7 +3322,7 @@ def mode_changelog(phase): html.write("<h3>%s</h3>" % _("Distributed WATO - replication status")) repstatus = load_replication_status() sites = config.allsites().items() - sites.sort(cmp = lambda a,b: cmp(a[1].get("alias",a[0]), b[1].get("alias", b[0]))) + sort_sites(sites) html.write("<table class=data>") html.write("<tr class=dualheader>") html.write("<th rowspan=2>%s</th>" % _("ID") + @@ -6022,6 +6022,23 @@ def find_usage_of_timeperiod(tpname): # | Mode for managing sites. | # '----------------------------------------------------------------------' +# Sort given sites argument by peer/local, followed by slaves +def sort_sites(sites): + def custom_sort(a,b): + if a[1].get("replication","") == b[1].get("replication"): + # Compare by alias + if a[1].get("alias") == b[1].get("alias"): + return 0 + elif a[1].get("alias") > b[1].get("alias"): + return 1 + else: + return -1 + elif a[1].get("replication","") == "slave" and b[1].get("replication") != "slave": + return 1 + elif a[1].get("replication","") != "slave" and b[1].get("replication") == "slave": + return -1 + sites.sort(cmp = custom_sort) + def mode_sites(phase): if phase == "title": return _("Multisite connections") @@ -6172,7 +6189,7 @@ def mode_sites(phase): odd = "even" entries = sites.items() - entries.sort(cmp = lambda a, b: cmp(a[1].get("alias"), b[1].get("alias"))) + sort_sites(entries) for id, site in entries: odd = odd == "odd" and "even" or "odd" html.write('<tr class="data %s0">' % odd) @@ -6219,9 +6236,9 @@ def mode_sites(phase): if site.get("replication") == "slave": repl = _("Slave") elif site.get("replication") == "peer": - repl = _("Peer") + repl = _("Peer") + _(" - Priority %s") % site.get("repl_priority",0) else: - repl = "" + repl = _("Local - Priority %s") % site.get("repl_priority",0) html.write("<td>%s</td>" % repl) # Login-Button for Replication @@ -6351,6 +6368,14 @@ def mode_edit_site(phase): repl = None if repl: new_site["replication"] = repl + + # Replication Priority + if not repl or repl != "slave": + try: + new_site["repl_priority"] = int(html.var("repl_priority", 0)) + except: + raise MKUserError("repl_priority", _("Replication Priority '%s' is not a valid number.") % html.var("repl_priority","")) + multisiteurl = html.var("multisiteurl", "").strip() if repl: if not multisiteurl: @@ -6549,6 +6574,14 @@ def mode_edit_site(phase): html.radiobutton("replication", "peer", site.get("replication") == "peer", _("Peer: synchronize configuration with this site")) html.write("<br>") html.radiobutton("replication", "slave", site.get("replication") == "slave", _("Slave: push configuration to this site")) + + html.write("<br><br>") + html.write("<b>%s</b><br><i>%s</i><br>" % ( + _("Peer replication priority"), + _("The replication priority is used to determine the master site from the available peers and local sites.<br>" + "The site with the highest number takes precedence."))) + html.number_input("repl_priority", site.get("repl_priority", 0), size=2) + html.write("<br><br>") html.write("<b>%s</b><br><i>%s</i><br>" % ( _("Multisite-URL of remote site upto and including <tt>/check_mk/</tt>"), @@ -7007,27 +7040,21 @@ def preferred_peer(): local_site = None best_peer = None best_working_peer = None + for site_id, site in config.allsites().items(): if site.get("replication") == "slave": continue # Ignore slave sites - if site_is_local(site_id): - if best_peer == None or site_id < best_peer["id"]: - best_peer = site - if best_working_peer == None or site_id < best_working_peer["id"]: - best_working_peer = site - local_site = site - - # Is the a member of the peer group? - elif site.get("replication") == "peer": - if best_peer == None or site_id < best_peer["id"]: - best_peer = site - - ss = html.site_status.get(site_id, {}) - status = ss.get("state", "unknown") - if status == "online" and ( - best_working_peer == None or site_id < best_working_peer): + if best_peer == None or site.get("repl_priority",0) > best_peer.get("repl_priority",0) or (site_id < best_peer["id"] and site.get("repl_priority",0) == best_peer.get("repl_priority",0)): + best_peer = site + if site_is_local(site_id): best_working_peer = site + local_site = site + else: + ss = html.site_status.get(site_id, {}) + status = ss.get("state", "unknown") + if status == "online": + best_working_peer = site if best_working_peer: # Good if best_working_peer == local_site: @@ -7040,6 +7067,8 @@ def preferred_peer(): return None # no peer, not even a local site... + + def do_peer_redirect(peer): if is_distributed(): current_mode = html.var("mode") or "main"

12 years, 4 months

Check_MK Git: check_mk: FIX: fix missing variable curdir in lib.py

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f4f73851aba9cfe2cd68f88fe7e7afffee08e262 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4f73851aba9cf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 8 18:52:45 2012 +0200 FIX: fix missing variable curdir in lib.py --- web/htdocs/lib.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index f59c3b3..fa5a58f 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -88,7 +88,7 @@ def make_nagios_directories(name): # be happy if someone already created the path if e.errno != errno.EEXIST: raise - if tail == curdir: # xxx/newdir/. exists if xxx/newdir exists + if tail == ".": # xxx/newdir/. exists if xxx/newdir exists return make_nagios_directory(name)

12 years, 4 months

Check_MK Git: check_mk: Fix styling of main menu

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 746f7af85d7dd88133a4814d096965006f916463 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=746f7af85d7dd8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 8 18:47:24 2012 +0200 Fix styling of main menu --- web/htdocs/wato.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 271cdf0..25fab38 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -662,6 +662,7 @@ form#form_timeperiod td.vlof_content { position: relative; margin: 0px -1px -1px 0px; left: -2px; + text-decoration: none; } .wato div.mainmenu a:hover { background-image: url("images/wato_mainmenu_button_hi.png");

12 years, 4 months

Check_MK Git: check_mk: Minor layout fix

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ec09e9a4c2068c774a0de698b58d7ef5467d3161 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec09e9a4c2068c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 8 16:51:20 2012 +0200 Minor layout fix --- web/htdocs/wato.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index a9377cf..271cdf0 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -787,7 +787,7 @@ div.varname { overflow: hidden; } .wato .globalvars td.left { - width: 345px; + width: 339px; overflow: hidden; white-space: nowrap; }

12 years, 4 months

Check_MK Git: check_mk: WATO: new layout of global settings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: da1e20462cff76016e228481832319f2fd04cf72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da1e20462cff76… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 8 16:50:09 2012 +0200 WATO: new layout of global settings --- ChangeLog | 1 + .../images/button_snapin_greyswitch_off_hi.png | Bin 0 -> 1080 bytes .../images/button_snapin_greyswitch_off_lo.png | Bin 0 -> 998 bytes .../images/button_snapin_greyswitch_on_hi.png | Bin 0 -> 1134 bytes .../images/button_snapin_greyswitch_on_lo.png | Bin 0 -> 1147 bytes web/htdocs/wato.css | 37 +++++++ web/htdocs/wato.py | 99 +++++++++++--------- 7 files changed, 92 insertions(+), 45 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=da1e20462c…

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0683

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 67a1811bc26880da15607702885723c236f277c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67a1811bc26880… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 8 16:21:01 2012 +0200 Updated bug entries #0683 --- .bugs/683 | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/.bugs/683 b/.bugs/683 new file mode 100644 index 0000000..b0b7fc2 --- /dev/null +++ b/.bugs/683 @@ -0,0 +1,8 @@ +Title: Checkboxes (Multiselect) not working on IE +Component: multisite +State: open +Date: 2012-05-08 16:20:24 +Targetversion: 1.2.0 +Class: bug + +Seems to be in WATO and also in Multisite views

12 years, 4 months

Check_MK Git: check_mk: WATO: hide check_mk variable names per default

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 64ed22a5234bc794fe68308c466b524bca62f2c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64ed22a5234bc7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 8 16:18:00 2012 +0200 WATO: hide check_mk variable names per default --- ChangeLog | 1 + web/htdocs/config.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ef4523..53623bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * ps and ps.perf configurable via WATO now (without inventory) * New layout of main menu and a couple of other similar menus * New layout of ruleset overviews + * Hide check_mk variable names per default now (change via global settings) * FIX: honor folder-permissions when creating, deleting and modifiying rules * FIX: detect non-local site even if unix: is being used diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 89b9de4..b50f942 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -552,7 +552,7 @@ def load_default_values(into): into["wato_aux_tags"] = [] into["wato_hide_filenames"] = True into["wato_hide_hosttags"] = False - into["wato_hide_varnames"] = False + into["wato_hide_varnames"] = True into["wato_max_snapshots"] = 50 into["wato_num_hostspecs"] = 12 into["wato_num_itemspecs"] = 15

12 years, 4 months

Check_MK Git: check_mk: WATO: relayout of ruleset overview

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2b83fd6a08160a800d91085a164a7598f96aa0b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b83fd6a08160a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 8 16:18:23 2012 +0200 WATO: relayout of ruleset overview --- web/htdocs/wato.css | 5 +++++ web/htdocs/wato.py | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 11c01de..6a2891c 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -760,6 +760,11 @@ form#form_timeperiod td.vlof_content { text-align: right; } +/* Page edit_ruleset */ +div.varname { + color: white; + font-family: monospace, sans-serif; +} diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 10855d7..796e2b3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9230,16 +9230,13 @@ def mode_rulesets(phase): html.write('<div class=ruleset><div class=text>') html.write('<a class=title><a href="%s">%s</a>' % (view_url, rulespec["title"])) html.write('<span class=dots>%s</span></div>' % ("." * 100)) - # if not config.wato_hide_varnames: - # display_varname = ':' in varname and '%s["%s"]' % tuple(varname.split(":")) or varname - # html.write('<td class=varname><tt>%s</tt></td>' % display_varname) if num_local_rules: if only_host: title = _("There are %d rules explicitely listing this host." % num_local_rules) else: title = _("There are %d rules defined in the current folder." % num_local_rules) - html.write('<img title="%s" align=absmiddle class=icon src="images/icon_localrule.png"> ' % - title) + # html.write('<img title="%s" align=absmiddle class=icon src="images/icon_localrule.png"> ' % + # title) html.write('<div class=rulecount title="%s">%d</div>' % (title, num_rules)) html.write('</div>') @@ -9380,6 +9377,9 @@ def mode_edit_ruleset(phase): render_folder_path(keepvarnames = ["mode", "varname"]) html.write("<h3>" + rulespec["title"] + "</h3>") + if not config.wato_hide_varnames: + display_varname = ':' in varname and '%s["%s"]' % tuple(varname.split(":")) or varname + html.write('<div class=varname>%s</div>' % display_varname) if rulespec["help"]: html.write("<div class=info>%s</div>" % rulespec["help"])

12 years, 4 months

Check_MK Git: check_mk: WATO: New layout of ruleset overviews

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 20fbe0272f35e52229130af2efd0b98c755cec38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20fbe0272f35e5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 8 16:13:08 2012 +0200 WATO: New layout of ruleset overviews --- ChangeLog | 1 + web/htdocs/wato.css | 61 +++++++++++++++++++++++----- web/htdocs/wato.py | 57 ++++++++------------------ web/plugins/wato/check_mk_configuration.py | 2 +- web/plugins/wato/check_parameters.py | 8 ++-- 5 files changed, 74 insertions(+), 55 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07b85f9..7ef4523 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ WATO: * ps and ps.perf configurable via WATO now (without inventory) * New layout of main menu and a couple of other similar menus + * New layout of ruleset overviews * FIX: honor folder-permissions when creating, deleting and modifiying rules * FIX: detect non-local site even if unix: is being used diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 085882e..11c01de 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -226,6 +226,9 @@ Boston, MA 02110-1301 USA. } .wato h3 { margin-bottom: 2px; + color: white; + font-size: 13pt; + font-weight: normal; } /* host validation error */ @@ -680,19 +683,17 @@ form#form_timeperiod td.vlof_content { font-weight: bold; position: absolute; left: 72px; - top: 15px; + top: 14px; } .wato div.mainmenu div.help { position: absolute; left: 72px; - top: 33px; + top: 32px; width: 237px; overflow: hidden; } - - /* Special styles for roles editor (permissions) */ .wato table.form table.permissions { border-collapse: collapse; @@ -714,17 +715,55 @@ form#form_timeperiod td.vlof_content { width: 120px; } -/* Table in page "Rulesets" */ -.wato table.data.rulesets { - width: 849px; +/* page "Rulesets" */ +.wato .rulesets { + background-color: #eeeeee; + padding: 3px 5px; + width: 100%; + /* box-shadow: 0px 0px 2.5px #888; */ } -.wato table.data.rulesets td.title { - width: 430px; + +.wato .rulesets div.ruleset { + float: left; + margin-right: 20px; } -.wato table.data.rulesets td.varname { - width: 300px; + +.wato .rulesets div.ruleset div.text { + width: 276px; + padding-right: 3px; + overflow: hidden; + float: left; +} +.wato .rulesets div.ruleset div { + height: 16px; } +.wato .rulesets div.ruleset a { + text-decoration: none; + color: black; + white-space: nowrap; + margin-right: 3px; +} + +.wato .rulesets div.ruleset a:hover { + text-decoration: underline; +} + +.wato .rulesets div.ruleset .dots { + color: #888; + overflow: hidden; +} + +.wato .rulesets div.ruleset div.rulecount { + width: 16px; + float: left; + text-align: right; +} + + + + + /* Table in page "Global variables" */ .wato table.data.globalvars { width: 100%; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 852612c..10855d7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9159,22 +9159,6 @@ def mode_rulesets(phase): if help: html.write("<div class=info>%s</div>" % help) - # html.begin_form("local") - # html.checkbox("local", False, onclick="form.submit();") - # if only_host: - # html.write(" " + _("show only rulesets that contain rules explicitely listing the host <b>%s</b>." % - # only_host)) - # else: - # html.write(" " + _("Show only rulesets that contain rules in the current folder.")) - # html.write(' <img align=absbottom class=icon src="images/icon_localrule.png"> ') - # html.hidden_fields() - # html.end_form() - # html.write("<br>") - - # Load all rules from all folders. Hope this doesn't take too much time. - # We need this information only for displaying the number of rules in - # each set. - if only_local and not only_host: all_rulesets = {} rs = load_rulesets(g_folder) @@ -9223,37 +9207,32 @@ def mode_rulesets(phase): if not title_shown: if something_shown: - html.write("</table>") - if do_folding: - html.end_foldable_container() + html.write("</td></tr></table>") + # if do_folding: + # html.end_foldable_container() if '/' in groupname: subgroupname = groupname.split("/", 1)[1] else: subgroupname = groupname - if do_folding: - html.begin_foldable_container("rulesets", groupname, False, subgroupname, indent=False) - html.write('<table class="data rulesets">') - html.write("<tr><th>" + _("Rule set") + "</th>") - if not config.wato_hide_varnames: - html.write("<th>" + _("Check_MK Variable") + "</th>") - html.write("<th>" + _("Rules") + "</th></tr>\n") - odd = "even" + # if do_folding: + # html.begin_foldable_container("rulesets", groupname, False, subgroupname, indent=False) + html.write("<h3>%s</h3>" % subgroupname) + html.write('<table class="rulesets"><tr><td>') title_shown = True something_shown = True - odd = odd == "odd" and "even" or "odd" - html.write('<tr class="data %s0">' % odd) url_vars = [("mode", "edit_ruleset"), ("varname", varname)] if only_host: url_vars.append(("host", only_host)) view_url = make_link(url_vars) - html.write('<td class=title><a href="%s">%s</a></td>' % (view_url, rulespec["title"])) - display_varname = ':' in varname and '%s["%s"]' % tuple(varname.split(":")) or varname - if not config.wato_hide_varnames: - html.write('<td class=varname><tt>%s</tt></td>' % display_varname) - html.write('<td class=number>') + html.write('<div class=ruleset><div class=text>') + html.write('<a class=title><a href="%s">%s</a>' % (view_url, rulespec["title"])) + html.write('<span class=dots>%s</span></div>' % ("." * 100)) + # if not config.wato_hide_varnames: + # display_varname = ':' in varname and '%s["%s"]' % tuple(varname.split(":")) or varname + # html.write('<td class=varname><tt>%s</tt></td>' % display_varname) if num_local_rules: if only_host: title = _("There are %d rules explicitely listing this host." % num_local_rules) @@ -9261,13 +9240,13 @@ def mode_rulesets(phase): title = _("There are %d rules defined in the current folder." % num_local_rules) html.write('<img title="%s" align=absmiddle class=icon src="images/icon_localrule.png"> ' % title) - html.write("%d</td>" % num_rules) - html.write('</tr>') + html.write('<div class=rulecount title="%s">%d</div>' % (title, num_rules)) + html.write('</div>') if something_shown: - html.write("</table>") - if do_folding: - html.end_foldable_container() + html.write("</td></tr></table>") + # if do_folding: + # html.end_foldable_container() else: if only_host: diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 60206b6..e26e47e 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -968,7 +968,7 @@ register_rule(group, register_rule(group, "usewalk_hosts", - title = _("Hosts that simulate SNMP by using a stored SNMP walk"), + title = _("Simulating SNMP by using a stored SNMP walk"), help = _("This ruleset helps in test and development. You can create stored SNMP " "walks on the command line with cmk --snmpwalk HOSTNAME. A host that " "is configured with this ruleset will then use the information from that " diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 1cedfdf..4893395 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1089,7 +1089,7 @@ checkgroups.append(( checkgroups.append(( subgroup_hardware, "hw_errors", - _("Simple checks for BIOS/Hardware errors without parameters"), + _("Simple checks for BIOS/Hardware errors"), None, None, None)) @@ -1190,7 +1190,7 @@ checkgroups.append(( checkgroups.append(( subgroup_environment, "room_temperature", - _("Room temperature (e.g. external thermal sensors in datacenters)"), + _("Room temperature (external thermal sensors)"), Tuple( help = _("Temperature levels for external thermometers that are used " "for monitoring the temperature of a datacenter. An example " @@ -1207,7 +1207,7 @@ checkgroups.append(( checkgroups.append(( subgroup_environment, "hw_temperature", - _("Hardware temperature (CPU, Memory, Mainboard, etc.)"), + _("Hardware temperature (CPU, Memory, etc.)"), Tuple( help = _("Temperature levels for internal sensors found in many appliances, " "switches, routers, mainboards and other devices. "), @@ -1235,7 +1235,7 @@ checkgroups.append(( checkgroups.append(( subgroup_ps, "wmic_process", - _("Memory and CPU consumption of processes on Windows (via WMI)"), + _("Memory and CPU of processes on Windows"), Tuple( elements = [ TextAscii(

12 years, 4 months

Check_MK Git: check_mk: Fixed layout of BI state filters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2e8c478acd264d60039ac7b78c697cda15c8263f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e8c478acd264d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 8 14:33:37 2012 +0200 Fixed layout of BI state filters --- web/plugins/views/bi.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 0985208..1475d34 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -585,17 +585,22 @@ class BIStatusFilter(Filter): def filter(self, tablename): return "" + def double_height(self): + return self.column == "aggr_assumed_state" + def display(self): if html.var("filled_in"): defval = "" else: defval = "on" - for varend, text in [('0', 'OK'), ('1', 'WARN'), ('2', 'CRIT'), ('3', 'UNKNOWN'), ('-1', 'PENDING'), ('n', 'unset')]: + for varend, text in [('0', 'OK'), ('1', 'WARN'), ('2', 'CRIT'), + ('3', 'UNKN'), ('-1', 'PENDING'), ('n', _('no assumed state set'))]: if self.code != 'a' and varend == 'n': continue # no unset for read and effective state + if varend == 'n': + html.write("<br>") var = self.prefix + varend - html.checkbox(var, defval) - html.write(" %s " % text) + html.checkbox(var, defval, label = text) def filter_table(self, rows): jeaders = []

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits