Checkmk git commits June 2013

checkmk-commits@lists.checkmk.com

4 participants
186 discussions

Check_MK Git: check_mk: FIX: do validation of check items in rule editor

by Mathias Kettner

Module: check_mk Branch: master Commit: 2c072a36ef4920777e870d236d50360513b7207c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c072a36ef4920… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 26 09:41:11 2013 +0200 FIX: do validation of check items in rule editor --- ChangeLog | 1 + web/htdocs/wato.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 185d6f6..bca2cca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ WATO: * Allow to configure check-/retry_interval in second precision + * FIX: do validation of check items in rule editor Notifications: * Flexible Notification can now filter service levels diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 380508c..5a045b1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10654,7 +10654,9 @@ def get_rule_conditions(ruleset): itemspec = ListChoice(choices = itemenum, columns = 3) item_list = [ x+"$" for x in itemspec.from_html_vars("item") ] else: - item_list = ListOfStrings().from_html_vars("itemlist") + vs = ListOfStrings(valuespec = ruleset["itemspec"]) + item_list = vs.from_html_vars("itemlist") + vs.validate_value(item_list, "itemlist") if len(item_list) == 0: raise MKUserError("item_0", _("Please specify at least one %s or " @@ -11173,13 +11175,14 @@ g_rulespecs = {} g_rulespec_group = {} # for conveniant lookup g_rulespec_groups = [] # for keeping original order def register_rule(group, varname, valuespec = None, title = None, - help = None, itemtype = None, itemname = None, + help = None, itemspec = None, itemtype = None, itemname = None, itemhelp = None, itemenum = None, match = "first", optional = False): ruleset = { "group" : group, "varname" : varname, "valuespec" : valuespec, + "itemspec" : itemspec, # original item spec, e.g. if validation is needed "itemtype" : itemtype, # None, "service", "checktype" or "checkitem" "itemname" : itemname, # e.g. "mount point" "itemhelp" : itemhelp, # a description of the item, only rarely used @@ -11223,7 +11226,9 @@ def register_check_parameters(subgroup, checkgroup, title, valuespec, itemspec, varname = "checkgroup_parameters:%s" % checkgroup, title = title, valuespec = valuespec, - itemtype = itemtype, itemname = itemname, + itemspec = itemspec, + itemtype = itemtype, + itemname = itemname, itemhelp = itemhelp, itemenum = itemenum, match = matchtype)

11 years

Check_MK Git: check_mk: Updated man page

by Mathias Kettner

Module: check_mk Branch: master Commit: 9e7c91ca1275def84a6318eb2a9969c6870b42ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e7c91ca1275de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 25 18:13:10 2013 +0200 Updated man page --- checkman/winperf_tcp_conn | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/checkman/winperf_tcp_conn b/checkman/winperf_tcp_conn index 845821e..60597e4 100644 --- a/checkman/winperf_tcp_conn +++ b/checkman/winperf_tcp_conn @@ -5,16 +5,18 @@ author: Andreas Boesl (ab(a)mathias-kettner.de) license: GPL distribution: check_mk description: - This check monitors the number of established TCP connections on windows systems + This check monitors the number of established TCP connections on windows systems. In order + to use this check you need to activate the output of the TCP connection information in + {check_mk.ini}. You can do this by adding {counters = 638:tcp_conn} to the section {[winperf]}. perfdata: The number of established connections inventory: - If the windows agents has the section <<<winperf_tcp_conn>>>, then one check + If the windows agents has the section {<<<winperf_tcp_conn>>>}, then one check will be created - [parameters] -levels(dict from string to (int, int)): A python dictionary with the key ESTABLISHED and a pair of integers for warning and critical levels. If this state is not listed then the check will be always OK - +levels(dict from string to (int, int)): A python dictionary with the key + ESTABLISHED and a pair of integers for warning and critical levels. If this + state is not listed then the check will be always OK

11 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: a2efc038fc606a64d150547e61f2805f5cdd47cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2efc038fc606a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 25 18:13:13 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: 083ec51998e27a5c407fc7f35e918887fb3413bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=083ec51998e27a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 25 17:38:40 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years

Check_MK Git: check_mk: multsite views: rule editor icon for services

by Andreas Boesl

Module: check_mk Branch: master Commit: 09f7eaca27e98f0ba509612906044e30125f1da0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09f7eaca27e98f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 25 17:38:38 2013 +0200 multsite views: rule editor icon for services --- ChangeLog | 2 ++ web/htdocs/wato.py | 44 +++++++++++++++++++++------- web/plugins/icons/builtin.py | 21 +++++++++++++ web/plugins/wato/check_mk_configuration.py | 10 +++++++ 4 files changed, 67 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25abe3d..72e62e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,8 @@ * Rules: Renamed "Ignored services" to "Disabled services" Renamed "Ignored checks" to "Disabled checks" * Sorter Host IP address: fixed sorting, no longer uses str compare on ip + * Views: New: Draw rule editor icon in multisite views (default off) + Can be activated in global settings WATO: * Allow to configure check-/retry_interval in second precision diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2220a87..380508c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10052,7 +10052,7 @@ def mode_rulesets(phase): html.write('</div>') -def create_new_rule_form(rulespec, hostname = None, item = None): +def create_new_rule_form(rulespec, hostname = None, item = None, varname = None): html.begin_form("new_rule", add_transid = False) html.write('<table>') @@ -10077,13 +10077,24 @@ def create_new_rule_form(rulespec, hostname = None, item = None): html.select("rule_folder", folder_selection(g_root_folder)) html.write('</td></tr></table>\n') - html.hidden_field("varname", html.var("varname")) + html.hidden_field("varname", varname) html.hidden_field("mode", "new_rule") html.end_form() def mode_edit_ruleset(phase): varname = html.var("varname") - rulespec = g_rulespecs[varname] + + if html.var("check_command"): + check_command = html.var("check_command") + checks = check_mk_local_automation("get-check-information") + if check_command.startswith("check_mk-"): + check_command = check_command[9:] + varname = "checkgroup_parameters:" + checks[check_command].get("group","") + elif check_command.startswith("check_mk_active-"): + check_command = check_command[16:].split(" ")[0][:-1] + varname = "active_checks:" + check_command + + rulespec = g_rulespecs.get(varname) hostname = html.var("host", "") if html.has_var("item"): item = mk_eval(html.var("item")) @@ -10097,6 +10108,9 @@ def mode_edit_ruleset(phase): hostname = None # host not found. Should not happen if phase == "title": + if not rulespec: + text = html.var("service_description") or varname + return _("No available rule for service %s at host %s") % (text, hostname) title = rulespec["title"] if hostname: title += _(" for host %s") % hostname @@ -10106,18 +10120,23 @@ def mode_edit_ruleset(phase): elif phase == "buttons": global_buttons() - group = rulespec["group"].split("/")[0] - groupname = g_rulegroups[group][0] - html.context_button(groupname, - make_link([("mode", "rulesets"), ("group", group), ("host", hostname)]), "back") - html.context_button(_("Used Rulesets"), - make_link([("mode", "rulesets"), ("group", "used"), ("host", hostname)]), "usedrulesets") + if not rulespec: + html.context_button(_("All Rulesets"), make_link([("mode", "ruleeditor")]), "back") + else: + group = rulespec["group"].split("/")[0] + groupname = g_rulegroups[group][0] + html.context_button(groupname, + make_link([("mode", "rulesets"), ("group", group), ("host", hostname)]), "back") + html.context_button(_("Used Rulesets"), + make_link([("mode", "rulesets"), ("group", "used"), ("host", hostname)]), "usedrulesets") if hostname: html.context_button(_("Services"), make_link([("mode", "inventory"), ("host", hostname)]), "back") return elif phase == "action": + if not rulespec: + return # Folder for the rule actions is defined by _folder rule_folder = g_folders[html.var("_folder", html.var("folder"))] check_folder_permissions(rule_folder, "write", True) @@ -10168,6 +10187,11 @@ def mode_edit_ruleset(phase): _("Changed order of rules in ruleset %s") % rulespec["title"]) return + if not rulespec: + text = html.var("service_description") or varname + html.write("<div class=info>" + _("There are no rules availabe for %s.") % text + "</div>") + return + if not hostname: render_folder_path(keepvarnames = ["mode", "varname"]) @@ -10335,7 +10359,7 @@ def mode_edit_ruleset(phase): table.end() - create_new_rule_form(rulespec, hostname, item) + create_new_rule_form(rulespec, hostname, item, varname) def folder_selection(folder, depth=0): diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 8208221..c87343e 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -115,6 +115,27 @@ multisite_icons.append({ 'columns': [ 'active_checks_enabled' ], 'paint': paint_reschedule, }) + + +def paint_rule_editor(what, row, tags, custom_vars): + if config.may("wato.rulesets") and config.multisite_draw_ruleicon: + if what == 'service': + check_command = row["service_check_command"] + if check_command.startswith("check_mk-") or \ + check_command.startswith("check_mk_active-"): + url = html.makeuri_contextless( [("mode", "edit_ruleset"), + ("check_command", row["service_check_command"]), + ("service_description", row["service_description"]), + ("host", row["host_name"])], "wato.py") + title = _("Edit rule for %s") % check_command + return '<a href="%s"><img title="%s" class=icon src="images/icon_rulesets.png"></a>' % \ + (url, title) + +multisite_icons.append({ + 'service_columns': [ 'description', 'check_command', "host_name" ], + 'paint': paint_rule_editor, +}) + # +----------------------------------------------------------------------+ # | _ _ _ _ | # | / \ ___| | ___ __ _____ _| | ___ __| | __ _ ___ | diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 2ae1c3d..96766c6 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -219,6 +219,16 @@ register_configvar(group, domain = "multisite") register_configvar(group, + "multisite_draw_ruleicon", + Checkbox(title = _("Draw WATO rule editor icon for services"), + label = _("Draw rule editor icon"), + help = _("When enabled a rule editor icon is displayed for each " + "service in the multisite views. It is only displayed if the user " + "does have the permission to edit rules"), + default_value = False), + domain = "multisite") + +register_configvar(group, "wato_max_snapshots", Integer(title = _("Number of configuration snapshots to keep"), help = _("Whenever you successfully activate changes a snapshot of the configuration "

11 years

Check_MK Git: check_mk: Finished categorization of checks

by Mathias Kettner

11 years

Check_MK Git: check_mk: Further step in check catalog

by Mathias Kettner

11 years

Check_MK Git: check_mk: Added manpage catalog

by Mathias Kettner

Module: check_mk Branch: master Commit: cfa110dcef85c3ab803c8a03b379105e752a96d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfa110dcef85c3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 25 16:06:04 2013 +0200 Added manpage catalog --- modules/catalog.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/catalog.py b/modules/catalog.py new file mode 100644 index 0000000..5b5d103 --- /dev/null +++ b/modules/catalog.py @@ -0,0 +1,7 @@ +manpage_catalog_titles = { + "hw" : "Appliances, other dedicated Hardware", + "os" : "Operating Systems", + "app" : "Applications", + "generic" : "Generic check plugins", + "unsorted" : "Uncategorized", +}

11 years

Check_MK Git: check_mk: New man page browser for console (cmk -m)

by Mathias Kettner

Module: check_mk Branch: master Commit: 2be18b8ae61e5cdebc7cade433b17dd257c5b1c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2be18b8ae61e5c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 25 16:04:21 2013 +0200 New man page browser for console (cmk -m) --- ChangeLog | 1 + modules/check_mk.py | 218 ++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 183 insertions(+), 36 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2be18b8ae6…

11 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 67f71f47220c74b01e43e61d404c5e8ff6d1f257 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67f71f47220c74… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 25 16:04:22 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years

← Newer
1
2
3
4
5
6
7
8
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2013