Checkmk git commits October 2011

checkmk-commits@lists.checkmk.com

2 participants
109 discussions

Check_MK Git: check_mk: WATO: fix typo in help text

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8afb7d8c59f71767eb6eed158e6f5d3820fdb782 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8afb7d8c59f717… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 18:23:09 2011 +0200 WATO: fix typo in help text --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index cdd9aac..355b91b 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -459,7 +459,7 @@ register_rule(group, title = _("Enable/disable notifications for hosts"), help = _("This setting allows you to disable notifications about problems of a " "host completely. Per default all notifications are enabled. Sometimes " - "it is more conveniant to just disable notifications then to remove a " + "it is more convenient to just disable notifications then to remove a " "host completely from the monitoring. Note: this setting has no effect " "on the notifications of service problems of a host."), choices = [ ("1", _("Enable host notifications")),

12 years, 11 months

Check_MK Git: check_mk: WATO: make button from services to folder

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7461e340f30487ae2bc9292f011f09df4eb340ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7461e340f30487… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 18:19:33 2011 +0200 WATO: make button from services to folder --- web/htdocs/wato.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c96dfe7..c7ceda4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1714,6 +1714,8 @@ def mode_inventory(phase, firsttime): elif phase == "buttons": host_status_button(hostname, "host") + html.context_button(_("Folder"), + make_link([("mode", "folder")]), "back") html.context_button(_("Host properties"), make_link([("mode", "edithost"), ("host", hostname)]), "back") html.context_button(_("Full Scan"), html.makeuri([("_scan", "yes")]))

12 years, 11 months

Check_MK Git: check_mk: WATO: avoid duplicate WATO filter

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7c718443afcb92640fdfc820000e696e53f328df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c718443afcb92… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 18:04:21 2011 +0200 WATO: avoid duplicate WATO filter --- web/plugins/views/wato.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/wato.py b/web/plugins/views/wato.py index 63efdcf..8b69d31 100644 --- a/web/plugins/views/wato.py +++ b/web/plugins/views/wato.py @@ -93,4 +93,5 @@ class FilterWatoFile(Filter): return self.path_to_tree.get(current) declare_filter(10, FilterWatoFile()) -ubiquitary_filters.append("wato_folder") # show in all views +if "wato_folder" not in ubiquitary_filters: + ubiquitary_filters.append("wato_folder") # show in all views

12 years, 11 months

Check_MK Git: check_mk: WATO: check for duplicate timeperiod names

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e354584d1b994a39fe125fee4ea675de9dc54307 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e354584d1b994a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 17:59:49 2011 +0200 WATO: check for duplicate timeperiod names --- web/htdocs/wato.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b000a14..c96dfe7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5165,6 +5165,10 @@ def mode_edit_timeperiod(phase): raise MKUserError("name", _("Please specify a name of the new timeperiod.")) if not re.match("^[-a-z0-9A-Z_]*$", name): raise MKUserError("name", _("Invalid timeperiod name. Only the characters a-z, A-Z, 0-9, _ and - are allowed.")) + if name in timeperiods: + raise MKUserError("name", _("This name is already being used by another timeperiod.")) + if name == "7X24": + raise MKUserError("name", _("The time period name 7X24 cannot be used. It is always autmatically defined.")) timeperiods[name] = timeperiod log_pending(None, "edit-timeperiods", _("Created new time period %s" % name)) else: @@ -5183,6 +5187,7 @@ def mode_edit_timeperiod(phase): html.write("</td><td class=content>") if new: html.text_input("name") + html.set_focus("name") else: html.write(name) html.write("</td></tr>") @@ -5196,6 +5201,8 @@ def mode_edit_timeperiod(phase): html.write(_("Alias") + "<br><i>" + _("A description of the timeperiod</i>")) html.write("</td><td class=content>") html.text_input("alias", alias, size = 50) + if not new: + html.set_focus("alias") html.write("</td></tr>") # Week days

12 years, 11 months

Check_MK Git: check_mk: WATO: always also show id in dropdowns

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d71ec29bdc7d8af88b340ce1a3b75894e0177b7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d71ec29bdc7d8a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 17:41:44 2011 +0200 WATO: always also show id in dropdowns --- web/htdocs/wato.py | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index afac92e..b000a14 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1863,7 +1863,7 @@ def mode_search(phase): return _("Search for hosts in %s and below" % (g_folder["title"])) elif phase == "buttons": - html.context_button(_("Back"), make_link_to([("mode", "folder")], g_folder), "back") + html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") elif phase == "action": pass @@ -2092,7 +2092,7 @@ def mode_bulk_inventory(phase): return _("Bulk service detection (inventory)") elif phase == "buttons": - html.context_button(_("Back"), make_link([("mode", "folder")]), "back") + html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") return elif phase == "action": @@ -2178,7 +2178,7 @@ def mode_bulk_edit(phase): return _("Bulk edit hosts") elif phase == "buttons": - html.context_button(_("Back"), make_link([("mode", "folder")]), "back") + html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") return elif phase == "action": @@ -2230,7 +2230,7 @@ def mode_bulk_cleanup(phase): return _("Bulk removal of explicit attributes") elif phase == "buttons": - html.context_button(_("Back"), make_link([("mode", "folder")]), "back") + html.context_button(_("Folder"), make_link([("mode", "folder")]), "back") return elif phase == "action": @@ -4835,7 +4835,7 @@ def mode_edit_group(phase, what): return _("Edit contact group") elif phase == "buttons": - html.context_button(_("Back"), make_link([("mode", "%s_groups" % what)]), "back") + html.context_button(_("All groups"), make_link([("mode", "%s_groups" % what)]), "back") return all_groups = load_group_information() @@ -4932,7 +4932,7 @@ class GroupSelection(ElementSelection): all_groups = load_group_information() this_group = all_groups.get(self._what, {}) # replace the title with the key if the title is empty - return dict([ (k, t or k) for (k, t) in this_group.items() ]) + return dict([ (k, t and ("%s - %s" % (k,t)) or k) for (k, t) in this_group.items() ]) class CheckTypeGroupSelection(ElementSelection): @@ -5114,7 +5114,7 @@ def mode_edit_timeperiod(phase): return _("Edit time period") elif phase == "buttons": - html.context_button(_("Back"), make_link([("mode", "timeperiods")]), "back") + html.context_button(_("All Timeperiods"), make_link([("mode", "timeperiods")]), "back") return timeperiods = load_timeperiods() @@ -5257,7 +5257,7 @@ class TimeperiodSelection(ElementSelection): def get_elements(self): timeperiods = load_timeperiods() - elements = dict([ (name, tp.get("alias", name)) for (name, tp) in timeperiods.items() ]) + elements = dict([ (name, "%s - %s" % (name, tp["alias"])) for (name, tp) in timeperiods.items() ]) return elements # +----------------------------------------------------------------------+ @@ -5361,7 +5361,7 @@ def mode_edit_site(phase): return _("Edit site connection %s" % siteid) elif phase == "buttons": - html.context_button(_("Back"), make_link([("mode", "sites")]), "back") + html.context_button(_("All Sites"), make_link([("mode", "sites")]), "back") return if new: @@ -5761,7 +5761,7 @@ def mode_edit_user(phase): return _("Edit user %s" % userid) elif phase == "buttons": - html.context_button(_("Back"), make_link([("mode", "users")]), "back") + html.context_button(_("All Users"), make_link([("mode", "users")]), "back") return if new: @@ -5924,7 +5924,7 @@ def mode_edit_user(phase): for role_id, role in entries: html.checkbox("role_" + role_id, role_id in user.get("roles", [])) url = make_link([("mode", "edit_role"), ("edit", role_id)]) - html.write(" <a href='%s'>%s</a> (%s)<br>" % (url, role["alias"], role_id)) + html.write("%s - <a href='%s'>%s</a><br>" % (role_id, url, role["alias"])) html.write("</td></tr>") # Contact groups @@ -5950,7 +5950,8 @@ def mode_edit_user(phase): if not alias: alias = gid html.checkbox("cg_" + gid, gid in user.get("contactgroups", [])) - html.write(" " + alias + "<br>") + url = make_link([("mode", "edit_contact_group"), ("edit", gid)]) + html.write(" %s - <a href=\"%s\">%s</a><br>" % (gid, url, alias)) html.write("</td></tr>") @@ -5968,8 +5969,8 @@ def mode_edit_user(phase): html.write(_("Notification time period<br><i>Only during this time period the " "user will get notifications about host or service alerts.")) html.write("</td><td class=content>") - choices = [ ( "24X7", _("Always")) ] + \ - [ ( id, tp["alias"]) for (id, tp) in timeperiods.items() ] + choices = [ ( "24X7", _("24X7 - Always")) ] + \ + [ ( id, "%s - %s" % (id, tp["alias"])) for (id, tp) in timeperiods.items() ] html.sorted_select("notification_period", choices, user.get("notification_period")) html.write("</td></tr>") @@ -6288,7 +6289,7 @@ def mode_edit_role(phase): return _("Edit user role %s" % id) elif phase == "buttons": - html.context_button(_("Back"), make_link([("mode", "roles")]), "back") + html.context_button(_("All Roles"), make_link([("mode", "roles")]), "back") return roles = load_roles() @@ -6595,7 +6596,7 @@ def mode_edit_hosttag(phase): return _("Edit tag group") elif phase == "buttons": - html.context_button(_("Back"), make_link([("mode", "hosttags")]), "back") + html.context_button(_("All Hosttags"), make_link([("mode", "hosttags")]), "back") return hosttags = load_hosttags()

12 years, 11 months

Check_MK Git: check_mk: WATO: make parsing of time periods more conveniant

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5a52add8771c9b1c48e3055f1e1c048a5b631db9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a52add8771c9b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 17:27:17 2011 +0200 WATO: make parsing of time periods more conveniant --- web/htdocs/wato.py | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7b6f936..afac92e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5082,16 +5082,27 @@ def mode_edit_timeperiod(phase): begin = "00:00" if not end: end = "24:00" - for what, bound in [ ("from", begin), ("to", end) ]: - if not valid_bound(bound): - raise MKUserError(vp + what, - _("Invalid time format '<tt>%s</tt>', please use <tt>24:00</tt> format.") % bound) + + begin, end = [ parse_bound(w, b) for (w,b) in [ ("from", begin), ("to", end) ]] ranges.append((begin, end)) return ranges - def valid_bound(bound): - return re.match("^(24|[0-1][0-9]|2[0-3]):[0-5][0-9]$", bound) + def parse_bound(what, bound): + # Fully specified + if re.match("^(24|[0-1][0-9]|2[0-3]):[0-5][0-9]$", bound): + return bound + # only hours + try: + b = int(bound) + if b <= 24 and b >= 0: + return "%02d:00" % b + except: + pass + + raise MKUserError(vp + what, + _("Invalid time format '<tt>%s</tt>', please use <tt>24:00</tt> format.") % bound) + name = html.var("edit") # missing -> new group new = name == None

12 years, 11 months

Check_MK Git: check_mk: WATO: remove duplicate rule for mailqueue

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f6f8c0b39921ff2cff2385ea79739820a8925438 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6f8c0b39921ff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 11:45:51 2011 +0200 WATO: remove duplicate rule for mailqueue --- web/plugins/wato/check_parameters.py | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index cf747f3..b818d16 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -379,16 +379,6 @@ checkgroups.append(( None, None)) checkgroups.append(( - "mailqueue_length", - _("Number of mails in outgoing mail queue"), - Tuple( - help = _("This levels is applied to the number of Email that are currently in the outgoing mail queue."), - elements = [ - Integer(title = _("Warning at"), label = _("mails")), - Integer(title = _("Critical at"), label = _("mails"))]), - None, None)) - -checkgroups.append(( "uptime", _("Display the system's uptime as a check"), None,

12 years, 11 months

Check_MK Git: check_mk: WATO: rule editor: add titles to host tags

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 209496b8b52fc387af3ffba734856a9d3bb9afd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=209496b8b52fc3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 11:44:38 2011 +0200 WATO: rule editor: add titles to host tags --- web/htdocs/js/wato.js | 9 +++++++ web/htdocs/wato.py | 63 +++++++++++++++++++++++++++++++----------------- 2 files changed, 50 insertions(+), 22 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index f10930f..0480f9b 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -84,6 +84,15 @@ function wato_toggle_dropdown(oDropdown, divid) { oDiv = null; } +function wato_toggle_dropdownn(oDropdown, divid) { + var oDiv = document.getElementById(divid); + if (oDropdown.value == "ignore") + oDiv.style.display = "none"; + else + oDiv.style.display = ""; + oDiv = null; +} + // ---------------------------------------------------------------------------- diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b0827fe..7b6f936 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4432,9 +4432,9 @@ class ElementSelection(ValueSpec): self.load_elements() if len(self._elements) == 0: raise MKUserError(varprefix, - _("You cannot save this rule. There are not defined any elements for this selection yet." % self._what)) + _("You cannot save this rule. There are not defined any elements for this selection yet.")) if value not in self._elements: - raise MKUserError(varprefix, _("%s is not an existing element in this selection.") % (value, self._what)) + raise MKUserError(varprefix, _("%s is not an existing element in this selection.") % (value,)) def validate_datatype(self, value, varprefix): if type(value) != str: @@ -7830,29 +7830,48 @@ def mode_edit_rule(phase): html.write(_("You have not configured any host tags. If you work with rules " "you should better do so and add a <tt>wato_host_tags = ..</tt> " "to your <tt>multisite.mk</tt>. You will find an example there.")) - for id, title, tags in config.wato_host_tags: - default_tag = None - ignore = True - for t in tag_specs: - if t[0] == '!': - n = True - t = t[1:] + else: + html.write("<table>") + for id, title, tags in config.wato_host_tags: + html.write("<tr><td>%s:  </td>" % title) + default_tag = None + ignore = True + for t in tag_specs: + if t[0] == '!': + n = True + t = t[1:] + else: + n = False + if t in [ x[0] for x in tags]: + ignore = False + negate = n + if ignore: + deflt = "ignore" + elif negate: + deflt = "isnot" + else: + deflt = "is" + + html.write("<td>") + html.select("tag_" + id, [ + ("ignore", _("ignore")), + ("is", _("is")), + ("isnot", _("isnot"))], deflt, + onchange="wato_toggle_dropdownn(this, 'tag_sel_%s');" % id) + html.write("</td><td>") + if html.form_submitted(): + div_is_open = html.var("tag_" + id) != "ignore" else: - n = False - if t in [ x[0] for x in tags]: - ignore = False - negate = n - - html.radiobutton("tag_" + id, "ignore", ignore, _("ignore")) - html.write(" ") - html.radiobutton("tag_" + id, "is", not ignore and not negate, _("is")) - html.write(" ") - html.radiobutton("tag_" + id, "isnot", not ignore and negate, _("is not")) - html.write(" ") - html.select("tagvalue_" + id, [t[0:2] for t in tags if t[0] != None], deflt=default_tag) - html.write("<br>") + div_is_open = deflt != "ignore" + html.write('<div id="tag_sel_%s" style="white-space: nowrap; %s">' % ( + id, not div_is_open and "display: none;" or "")) + html.select("tagvalue_" + id, [t[0:2] for t in tags if t[0] != None], deflt=default_tag) + html.write("</div>") + html.write("</td></tr>") + html.write("</table>") html.write("</td></tr>") + # Explicit hosts / ALL_HOSTS html.write("<tr><td class=legend>") html.write(_("Explicit hosts"))

12 years, 11 months

Check_MK Git: check_mk: Multisite: fix function-context button returning None

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6bb01eb841b398dd42e3739c12a1e3e2d6531b81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6bb01eb841b398… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 11:24:04 2011 +0200 Multisite: fix function-context button returning None --- web/htdocs/wato.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 113a6c9..b0827fe 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -372,6 +372,8 @@ def page_handler(): if inmode == current_mode: if hasattr(target, '__call__'): target = target() + if not target: + continue if '/' == target[0] or target.startswith('../') or '://' in target: html.context_button(buttontext, target) else:

12 years, 11 months

Check_MK Git: check_mk: Fixed ChangeLog, moved message to 1.1.12p1

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e25e677bce3ac4f008757e8d798ee37ac60d0e90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e25e677bce3ac4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 11:04:47 2011 +0200 Fixed ChangeLog, moved message to 1.1.12p1 --- ChangeLog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16aec47..7f09a6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,8 +26,6 @@ Multisite: * FIX: Fixed encoding problem when opening dashboard - * FIX: Added id parameter to render_statistics() method to allow more than - one pie dashlet for host/service stats 1.1.12p1: @@ -35,6 +33,8 @@ * FIX: mk_oracle now also detects XE databases * FIX: printer_alerts: handle 0-entries of Brother printers * FIX: printer_supply: fix Perf-O-Meter if no max known + * FIX: Added id parameter to render_statistics() method to allow more than + one pie dashlet for host/service stats Multisite: * FIX: finally fixed long-wanted "NagStaMon create hundreds

12 years, 11 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2011