Checkmk git commits October 2011

checkmk-commits@lists.checkmk.com

2 participants
109 discussions

Check_MK Git: check_mk: WATO: prohbit group rule if no groups defined

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 83f997615a0c00f21353f285045ca7b6d156ed18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83f997615a0c00… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 17:22:34 2011 +0100 WATO: prohbit group rule if no groups defined --- web/htdocs/wato.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ea364ff..5935911 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4283,7 +4283,8 @@ class ElementSelection(ValueSpec): if len(self._elements) > 0: return self._elements.keys()[0] else: - return "" + raise MKUserError(None, + _("There are not defined any elements for this selection yet.")) def render_input(self, varprefix, value): self.load_elements()

12 years, 7 months

Check_MK Git: check_mk: WATO: make plugins i18n-able

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3a116b8a31f3843ad0ca08903fc7d9e03482c8e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a116b8a31f384… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 09:08:13 2011 +0100 WATO: make plugins i18n-able --- modules/.f12 | 2 +- web/htdocs/index.py | 2 +- web/htdocs/wato.py | 272 ++++++++++++++++++++++++++------------------------- 3 files changed, 142 insertions(+), 134 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3a116b8a31…

12 years, 7 months

Check_MK Git: check_mk: WATO: make global variables also foldable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: aa6658f160f7c7f2ea69757fa7becb0df5df118e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa6658f160f7c7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 30 09:57:48 2011 +0100 WATO: make global variables also foldable --- web/htdocs/check_mk.css | 11 +++++++++++ web/htdocs/wato.py | 12 ++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 4a0bf53..da8e1c1 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -2303,6 +2303,17 @@ table.add_snapin i { width: 300px; } +/* Table in page "Global variables" */ +.wato table.data.globalvars { + width: 100%; +} +.wato table.data.globalvars td.title { + width: 430px; +} +.wato table.data.globalvars td.varname { + width: 300px; +} + /* ____ | _ \ _ __ ___ __ _ _ __ ___ ___ ___ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 379f3f6..a0aa49c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4563,9 +4563,9 @@ def mode_globalvars(phase): groupnames = g_configvar_groups.keys() groupnames.sort() - html.write("<table class=data>") for groupname in groupnames: - html.write("<tr><td colspan=5><h3>%s</h3></td></tr>\n" % groupname) + html.begin_foldable_container("globalvars", groupname, False, groupname, indent=False) + html.write('<table class="data globalvars">') html.write("<tr><th>" + _("Configuration variable") + "</th><th>" +_("Check_MK variable") + "</th><th>" + _("Default") + "</th><th>" + _("Your setting") + "</th><th></th></tr>\n") @@ -4585,8 +4585,8 @@ def mode_globalvars(phase): edit_url = make_link([("mode", "edit_configvar"), ("varname", varname)]) - html.write('<td><a href="%s">%s</a></td>' % (edit_url, valuespec.title())) - html.write('<td><tt>%s</tt></td>' % varname) + html.write('<td class=title><a href="%s">%s</a></td>' % (edit_url, valuespec.title())) + html.write('<td class=varname><tt>%s</tt></td>' % varname) if varname in current_settings: html.write('<td class=inherited>%s</td>' % valuespec.value_to_text(defaultvalue)) html.write('<td><b>%s</b></td>' % valuespec.value_to_text(current_settings[varname])) @@ -4602,7 +4602,8 @@ def mode_globalvars(phase): html.write("</td>") html.write('</tr>') - html.write("</table>") + html.write("</table>") + html.end_foldable_container() def mode_edit_configvar(phase): @@ -7157,7 +7158,6 @@ def mode_rulesets(phase): if something_shown: html.write("</table>") html.end_foldable_container() - html.write("<br>") html.begin_foldable_container("rulesets", groupname, False, groupname, indent=False) html.write('<table class="data rulesets">') html.write("<tr><th>" + _("Rule set") + "</th>"

12 years, 7 months

Check_MK Git: check_mk: WATO: improve form table layout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8ed858b3d6c6051337a3fcae0fd5e34a686d6526 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ed858b3d6c605… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 30 08:50:25 2011 +0100 WATO: improve form table layout --- web/htdocs/check_mk.css | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 9bab0e2..4a0bf53 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1924,9 +1924,14 @@ table.add_snapin i { } +.wato table.form { + width: 800px; +} + .wato table.form td.legend { border-right-style: none; padding-bottom: 8px; + width: 300px; } .wato table.form td.legend h3 {

12 years, 7 months

Check_MK Git: check_mk: Fix rule if_disable_if64_check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 90624e60d4bd44da15bada5db48437f1098af23d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90624e60d4bd44… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 30 08:50:51 2011 +0100 Fix rule if_disable_if64_check --- modules/check_mk.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index b962349..5162bd8 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -717,6 +717,12 @@ def get_single_oid(hostname, ipaddress, oid): return value def snmp_scan(hostname, ipaddress): + # Make hostname globally available for scan functions. + # This is rarely used, but e.g. the scan for if/if64 needs + # this to evaluate if_disabled_if64_checks. + global g_hostname + g_hostname = hostname + if opt_verbose: sys.stdout.write("Scanning host %s(%s) for SNMP checks..." % (hostname, ipaddress)) sys_descr = get_single_oid(hostname, ipaddress, ".1.3.6.1.2.1.1.1.0")

12 years, 7 months

Check_MK Git: check_mk: Fix syntax error in htdocs/views.py

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 21da8d174a473e4fd19997b0fc16c134ac4f10ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21da8d174a473e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 18:43:30 2011 +0200 Fix syntax error in htdocs/views.py --- web/htdocs/views.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 4885702..74e9fa0 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2263,7 +2263,7 @@ def register_hook(hook, func): if not hook in view_hooks: view_hooks[hook] = [] - if func not in view_hooks[hook] + if func not in view_hooks[hook]: view_hooks[hook].append(func) def execute_hooks(hook):

12 years, 7 months

Check_MK Git: check_mk: FIX: dashboard: ignore notification period

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9f2fcbf95edc05696efd58fb40192394490e2c24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f2fcbf95edc05… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 18:44:56 2011 +0200 FIX: dashboard: ignore notification period --- ChangeLog | 2 ++ web/plugins/views/dashboard.py | 10 +++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76fb053..dc5c0db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,8 @@ * FIX: filter for WATO file/folder was not always working. * Added filter for hard services states to search and service problems view + * FIX: dashboard problem views now ignore notification period, + just as tactical overview and normal problem views do 1.1.12: diff --git a/web/plugins/views/dashboard.py b/web/plugins/views/dashboard.py index e0da15c..3f107fb 100644 --- a/web/plugins/views/dashboard.py +++ b/web/plugins/views/dashboard.py @@ -35,12 +35,10 @@ multisite_builtin_views.update({ 'group_painters': [], 'hard_filters': ['host_scheduled_downtime_depth', 'summary_host', - 'host_in_notification_period', 'hoststate', 'host_acknowledged', ], 'hard_filtervars': [('is_host_scheduled_downtime_depth', '0'), - ('is_host_in_notification_period', '1'), ('hst0', ''), ('hst1', 'on'), ('hst2', 'on'), @@ -81,16 +79,14 @@ multisite_builtin_views.update({ 'browser_reload': 30, 'column_headers': 'pergroup', 'datasource': 'services', - 'description': 'All non-downtime, non-acknownledged services within notification period, used for the dashbaord', + 'description': 'All non-downtime, non-acknownledged services, used for the dashbaord', 'group_painters': [], - 'hard_filters': ['service_in_notification_period', - 'service_acknowledged', + 'hard_filters': ['service_acknowledged', 'svcstate', 'hoststate', 'summary_host', 'in_downtime'], - 'hard_filtervars': [('is_service_in_notification_period', '1'), - ('is_in_downtime', '0'), + 'hard_filtervars': [('is_in_downtime', '0'), ('is_service_acknowledged', '0'), ('st0', ''), ('st1', 'on'),

12 years, 7 months

Check_MK Git: check_mk: FIX: drbd: fixed inventory functions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 799352031e9e8a7b5d12bd203e267de08a6350f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=799352031e9e8a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 18:36:21 2011 +0200 FIX: drbd: fixed inventory functions --- ChangeLog | 1 + checks/drbd | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f09a6e..76fb053 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ * 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 + * FIX: drbd: fixed inventory functions Multisite: * FIX: finally fixed long-wanted "NagStaMon create hundreds diff --git a/checks/drbd b/checks/drbd index 1b58614..f7a07ee 100644 --- a/checks/drbd +++ b/checks/drbd @@ -168,7 +168,7 @@ drbd_cs_map = { 'VerifyS': 0, 'VerifyT': 0, } -def inventory_drbd(info): +def inventory_drbd(info, checktype): inventory = [] for line in info[2:]: if drbd_block_start_match.search(line[0]) > 0: @@ -326,7 +326,7 @@ def check_drbd_stats(item, params, info): return (3, "UNKNOWN - Undefined state") -check_info['drbd'] = (check_drbd_general, "DRBD %s status", 1, inventory_drbd) -check_info['drbd.net'] = (check_drbd_net, "DRBD %s net", 1, inventory_drbd) -check_info['drbd.disk'] = (check_drbd_disk, "DRBD %s disk", 1, inventory_drbd) -check_info['drbd.stats'] = (check_drbd_stats, "DRBD %s stats", 1, inventory_drbd) +check_info['drbd'] = (check_drbd_general, "DRBD %s status", 1, lambda info: inventory_drbd(info, "drbd")) +check_info['drbd.net'] = (check_drbd_net, "DRBD %s net", 1, lambda info: inventory_drbd(info, "drbd.net")) +check_info['drbd.disk'] = (check_drbd_disk, "DRBD %s disk", 1, lambda info: inventory_drbd(info, "drbd.disk")) +check_info['drbd.stats'] = (check_drbd_stats, "DRBD %s stats", 1, lambda info: inventory_drbd(info, "drbd.stats"))

12 years, 7 months

Check_MK Git: check_mk: Multisite: avoid duplicate hook registration

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9dd59ba7d578650c0fdc4d60ee6150d4048e0be9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9dd59ba7d57865… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 18:29:49 2011 +0200 Multisite: avoid duplicate hook registration --- web/htdocs/views.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index c5a5062..4885702 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2261,8 +2261,9 @@ def page_message_and_forward(message, default_url, addhtml=""): def register_hook(hook, func): if not hook in view_hooks: - view_hooks[hook] = [func] - else: + view_hooks[hook] = [] + + if func not in view_hooks[hook] view_hooks[hook].append(func) def execute_hooks(hook):

12 years, 7 months

Check_MK Git: check_mk: WATO: show rule icon only if a ruleset exists

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 008122e7a7f0396d1eea1c7d215028cf63399a77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=008122e7a7f039… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 18:26:44 2011 +0200 WATO: show rule icon only if a ruleset exists --- web/htdocs/wato.py | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c7ceda4..379f3f6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1825,17 +1825,17 @@ def show_service_table(hostname, firsttime): html.write("<td>") if checkgroup: varname = "checkgroup_parameters:" + checkgroup - url = make_link([("mode", "edit_ruleset"), - ("varname", varname), - ("host", hostname), - ("item", repr(item))]) - title = _("Edit rules for this check parameter") - rulespec = g_rulespecs.get(varname) - if rulespec: + if varname in g_rulespecs: + rulespec = g_rulespecs[varname] + url = make_link([("mode", "edit_ruleset"), + ("varname", varname), + ("host", hostname), + ("item", repr(item))]) + title = _("Edit rules for this check parameter") title = "Check parameters for this service: " + \ - rulespec["valuespec"].value_to_text(params) - html.write('<a href="%s"><img title="%s" class=icon src="images/icon_rulesets.png"></a>' % - (url, title)) + rulespec["valuespec"].value_to_text(params) + html.write('<a href="%s"><img title="%s" class=icon src="images/icon_rulesets.png"></a>' % + (url, title)) html.write("</td>")

12 years, 7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2011