Checkmk git commits December 2012

checkmk-commits@lists.checkmk.com

3 participants
128 discussions

Check_MK Git: check_mk: Minor layout fix - avoid white vertical bar

by Mathias Kettner

Module: check_mk Branch: master Commit: 317293221f2d431f7dbb7fb9225031040f969bf9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=317293221f2d43… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 17:57:31 2012 +0100 Minor layout fix - avoid white vertical bar --- web/htdocs/pages.css | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 49ba189..f60cc62 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -66,6 +66,8 @@ body.main { font-family: arial, helvetica, sans-serif; font-size: 9pt; margin: 0; + /* avoid white background shining through in case of unaligned image in zoomed browser view */ + background-color: #426D8A; } body.main div.main {

11 years, 8 months

Check_MK Git: check_mk: Better title name for rule editor

by Mathias Kettner

Module: check_mk Branch: master Commit: b6a679b829311c7e8a2d436b8bafb89eec80cf27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6a679b829311c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 17:57:41 2012 +0100 Better title name for rule editor --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d0ee0f4..5945f47 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9423,7 +9423,7 @@ def mode_ruleeditor(phase): if only_host: return _("Rules effective on host ") + only_host else: - return _("Configuration of Hosts and Services (Ruleeditor)") + return _("Rule-Based Configuration of Host & Service Parameters") elif phase == "buttons": global_buttons()

11 years, 8 months

Check_MK Git: check_mk: WATO: fix exception due to folder locks ( seen in random host generation)

by Mathias Kettner

Module: check_mk Branch: master Commit: d3fbd8487012cbb9d0d33f3ada690e88400b5660 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3fbd8487012cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 18:21:34 2012 +0100 WATO: fix exception due to folder locks (seen in random host generation) --- web/htdocs/wato.py | 62 ++++++++++++++++++++++++++-------------------------- 1 files changed, 31 insertions(+), 31 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d3fbd84870…

11 years, 8 months

Check_MK Git: check_mk: Prevent selection of text in view option dials

by Mathias Kettner

Module: check_mk Branch: master Commit: 36bbe48992dda960fafc50b7388b152eb55312a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36bbe48992dda9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 18:18:46 2012 +0100 Prevent selection of text in view option dials --- web/htdocs/js/checkmk.js | 10 ++++++++++ web/htdocs/views.css | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index c6744ce..015a91c 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1686,6 +1686,8 @@ function view_toggle_form(oButton, idForm) { // used for refresh und num_columns function view_dial_option(oDiv, viewname, option, choices) { + // prevent double click from select text + make_unselectable(oDiv); var new_choice = choices[0]; // in case not contained in choices for (var c=0; c<choices.length; c++) { choice = choices[c]; @@ -1724,6 +1726,14 @@ function turn_dial(option, text, way) { oDiv.style.top = (way * 1.3) + "px"; } + +function make_unselectable(elem) { + elem.onselectstart = function() { return false; }; + elem.style.MozUserSelect = "none"; + elem.style.KhtmlUserSelect = "none"; + elem.unselectable = "on"; +} + /* Switch number of view columns, refresh and checkboxes. If the choices are missing, we do a binary toggle. */ gColumnSwitchTimeout = null; diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 60ce869..728da06 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -200,6 +200,7 @@ div.optiondial div { text-align: center; } + div.optiondial.num_columns { width: 21px; margin-right: 6px;

11 years, 8 months

Check_MK Git: check_mk: Cleanup layout of ruleset editor

by Mathias Kettner

Module: check_mk Branch: master Commit: 27921c333e2570fc2342027f928f5dd6aa87a900 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27921c333e2570… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 13:52:50 2012 +0100 Cleanup layout of ruleset editor --- web/htdocs/check_mk.css | 10 +++ web/htdocs/pages.css | 2 +- web/htdocs/table.py | 31 ++++++++-- web/htdocs/valuespec.py | 4 +- web/htdocs/wato.css | 10 +++- web/htdocs/wato.py | 150 +++++++++++++++++++++++------------------------ 6 files changed, 120 insertions(+), 87 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=27921c333e…

11 years, 8 months

Check_MK Git: check_mk: WATO: removed mostly useless "Home"

by Mathias Kettner

icon from rule editor Message-ID: <50d98aea.UrXVdGu+GTD478Mm%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 51e4ab29ecad555c9cff993008f6206037f8ea04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51e4ab29ecad55… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 12:15:09 2012 +0100 WATO: removed mostly useless "Home" icon from rule editor --- web/htdocs/wato.py | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index cf5f598..548c510 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9781,7 +9781,6 @@ def mode_edit_ruleset(phase): "<th>" + _("Folder") + "</th>" "<th>" + _("Value") + "</th>" "<th>" + _("Conditions") + "</th>" - "<th></th>" # Several icons "</tr>\n") odd = "odd" @@ -9921,19 +9920,6 @@ def mode_edit_ruleset(phase): render_conditions(rulespec, tag_specs, host_list, item_list, varname, folder) html.write("</td>") - # Icons - html.write("<td>") - # "this folder" - if not hostname and folder == g_folder: - title = _("This rule is defined in the current folder.") - html.write('<img title="%s" class=icon src="images/icon_localrule.png">' % title) - elif hostname and hostname in host_list: - title = _("This rule contains an exception for the host %s." % hostname) - html.write('<img title="%s" class=icon src="images/icon_localrule.png">' % title) - else: - html.write('<img src="images/icon_trans.png" class=icon>') - - html.write("</td>") rel_rulenr += 1 html.write('</table>')

11 years, 8 months

Check_MK Git: check_mk: Reverse order of Condition, Value and General options in rule editor

by Mathias Kettner

Module: check_mk Branch: master Commit: 18047e65fa54d31d70af24a3a5cb820c91c1b6a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18047e65fa54d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 12:15:47 2012 +0100 Reverse order of Condition, Value and General options in rule editor --- ChangeLog | 1 + web/htdocs/wato.py | 56 ++++++++++++++++++------------------ web/plugins/wato/active_checks.py | 4 +- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index aef65b6..b44c6c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,7 @@ * The rules formular now uses POST as transaction method * Modularized the authentication and user management code * Default config: add contact group 'all' and put all hosts into it + * Reverse order of Condition, Value and General options in rule editor Event Console: * FIX: fix exception in rules that use facility local7 diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 548c510..1bc25e3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9382,7 +9382,7 @@ def change_host_tags_in_rules(folder, operations, mode): # '----------------------------------------------------------------------' vs_rule_options = Dictionary( - title = _("General options"), + title = _("Additional options"), optional_keys = False, render = "form", elements = [ @@ -9397,7 +9397,7 @@ vs_rule_options = Dictionary( ), ( "docu_url", TextAscii( - title = _("Docu-URL"), + title = _("Documentation-URL"), help = _("An optional URL pointing to documentation or any other page. This will be displayed " "as an icon <img class=icon src='images/button_url_lo.png'> and open a new page when clicked. " "You can use either global URLs (beginning with <tt>http://</tt>), absolute local urls " @@ -10271,7 +10271,7 @@ def mode_edit_rule(phase, new = False): if phase == "action": if html.check_transaction(): - # General options + # Additional options rule_options = vs_rule_options.from_html_vars("options") vs_rule_options.validate_value(rule_options, "options") @@ -10322,34 +10322,10 @@ def mode_edit_rule(phase, new = False): return ("edit_ruleset", _("%s rule in ruleset '%s' in folder %s") % (new and _("Created new") or _("Edited"), rulespec["title"], new_rule_folder["title"])) - html.help(rulespec["help"]) + html.write("<div class=info>" + rulespec["help"] + "</div>") html.begin_form("rule_editor", method="POST") - # Rule Options - vs_rule_options.render_input("options", rule_options) - - # Value - forms.header(_("Value")) - if valuespec: - value = rule[0] - forms.section() - try: - valuespec.validate_datatype(value, "ve") - valuespec.render_input("ve", value) - except: - if config.debug: - raise - valuespec.render_input("ve", valuespec.default_value()) - - valuespec.set_focus("ve") - else: - forms.section("") - for posneg, img in [ ("positive", "yes"), ("negative", "no")]: - val = img == "yes" - html.write('<img class=ruleyesno align=top src="images/rule_%s.png"> ' % img) - html.radiobutton("value", img, value == val, _("Make the outcome of the ruleset <b>%s</b><br>") % posneg) - # Conditions forms.header(_("Conditions")) @@ -10438,6 +10414,30 @@ def mode_edit_rule(phase, new = False): "For example C:\\\\tmp\\\\message.log")) html.write("</div>") + # Value + forms.header(_("Value")) + if valuespec: + value = rule[0] + forms.section() + try: + valuespec.validate_datatype(value, "ve") + valuespec.render_input("ve", value) + except: + if config.debug: + raise + valuespec.render_input("ve", valuespec.default_value()) + + valuespec.set_focus("ve") + else: + forms.section("") + for posneg, img in [ ("positive", "yes"), ("negative", "no")]: + val = img == "yes" + html.write('<img class=ruleyesno align=top src="images/rule_%s.png"> ' % img) + html.radiobutton("value", img, value == val, _("Make the outcome of the ruleset <b>%s</b><br>") % posneg) + + # Addiitonal rule options + vs_rule_options.render_input("options", rule_options) + forms.end() html.button("save", _("Save")) html.hidden_fields() diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 5bba69a..676d3ce 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -33,8 +33,8 @@ register_rule(group, "active_checks:dns", Tuple( title = _("Check DNS service"), - help = _("Check optain an IP address for a host or domain" - "It uses <tt>check_dns</tt> from standard plugins."), + help = _("Check the resultion of a hostname into an IP address by a DNS server. " + "This check uses <tt>check_dns</tt> from the standard Nagios plugins."), elements = [ TextAscii(title = _("Hostname"), allow_empty = False, help = _('The name or address you want to query')),

11 years, 8 months

Check_MK Git: check_mk: WATO: remove trivial docu_url when saving

by Mathias Kettner

Module: check_mk Branch: master Commit: 17ac1741006370922b9ce4c33e3d6ccdb60a1515 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17ac1741006370… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 12:01:50 2012 +0100 WATO: remove trivial docu_url when saving --- web/htdocs/wato.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 89189e5..cf5f598 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10086,16 +10086,20 @@ def construct_rule(ruleset, value, tag_specs, host_list, item_list, rule_options if item_list != None: rule.append(item_list) - # Append rule options, but only if they are not trivial + # Append rule options, but only if they are not trivial. That way we + # keep as close as possible to the original Check_MK in rules.mk so that + # command line users will feel at home... ro = {} if rule_options.get("disabled"): ro["disabled"] = True if rule_options.get("comment"): ro["comment"] = rule_options["comment"] + if rule_options.get("docu_url"): + ro["docu_url"] = rule_options["docu_url"] # Preserve other keys that we do not know of for k,v in rule_options.items(): - if k not in [ "disabled", "comment"] : + if k not in [ "disabled", "comment", "docu_url"]: ro[k] = v if ro: rule.append(ro)

11 years, 8 months

Check_MK Git: check_mk: Default config: add contact group 'all' and put all hosts into it

by Mathias Kettner

Module: check_mk Branch: master Commit: fe3238c26a4a257b872e5736b9834446b2bb65a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe3238c26a4a25… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 11:28:53 2012 +0100 Default config: add contact group 'all' and put all hosts into it --- ChangeLog | 3 ++- web/htdocs/wato.py | 43 ++++++++++++++++++++++++++++++++----------- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea48465..aef65b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,7 +48,6 @@ users using the form based authentication with LDAP. It is also possible to synchronize some attributes like mail addresses, names and roles from LDAP into multisite. - * Modularized the authentication and user management code in WATO * Restructured cookie auth cookies (all auth cookies will be invalid after update -> all users have to login again) * Modularized login and cookie validation @@ -76,6 +75,8 @@ * FIX: Persisting changing of folder titles when only the title has changed * Add: Creating a new rule immediately opens its edit formular * The rules formular now uses POST as transaction method + * Modularized the authentication and user management code + * Default config: add contact group 'all' and put all hosts into it Event Console: * FIX: fix exception in rules that use facility local7 diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 08cb129..f8e0342 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5653,7 +5653,8 @@ def mode_groups(phase, what): global_buttons() html.context_button(_("New group"), make_link([("mode", "edit_%s_group" % what)]), "new") if what == "contact": - pass + html.context_button(_("Rules"), make_link([("mode", "rulesets"), + ("filled_in", "search"), ("search", "contact group")]), "rulesets") else: varname = what + "_groups" html.context_button(_("Rules"), make_link([("mode", "edit_ruleset"), ("varname", varname)]), "rulesets") @@ -10950,14 +10951,22 @@ def page_user_profile(): # | Functions for creating an example configuration | # '----------------------------------------------------------------------' -# Create a very basic sample configuration, but only if no host tags -# or rules have been defined *ever*. +# Create a very basic sample configuration, but only if none of the +# files that we will create already exists. That is e.g. the case +# after an update from an older version where no sample config had +# been created. def create_sample_config(): if os.path.exists(multisite_dir + "hosttags.mk") \ - or os.path.exists(root_dir + "rules.mk"): + or os.path.exists(root_dir + "rules.mk") \ + or os.path.exists(root_dir + "groups.mk"): return - # Example values for host tags + # A contact group where everyone is member of + groups = { + "contact" : { 'all', u'Everybody' }, + } + + # Basic setting of host tags wato_host_tags = \ [('agent', u'Agent type', @@ -10984,17 +10993,29 @@ def create_sample_config(): save_hosttags(wato_host_tags, wato_aux_tags) - # Example values for rules + # Rules that match the upper host tag definition rulesets = { + # Make the tag 'offline' remove hosts from the monitoring 'only_hosts': [ - (['!offline'], ['@all'])], - 'ping_levels': [ + (['!offline'], ['@all'], + {'comment': u'Do not monitor hosts with the tag "offline"'})], + + # Rule for WAN hosts with adapted PING levels + 'ping_levels': [ ({'loss': (80.0, 100.0), 'packets': 6, 'rta': (1500.0, 3000.0), - 'timeout': 20}, ['wan'], ['@all'])], - 'bulkwalk_hosts': [ - (['!snmp-v1'], ['@all'])], + 'timeout': 20}, ['wan'], ['@all'], + {'comment': u'Allow longer round trip times when pinging WAN hosts'})], + + # All hosts should use SNMP v2c if not specially tagged + 'bulkwalk_hosts': [ + (['!snmp-v1'], ['@all'], {'comment': u'Hosts with the tag "snmp-v1" must not use bulkwalk'})], + + # Put all hosts and the contact group 'all' + 'host_contactgroups': [ + ('all', [], ALL_HOSTS, {'comment': u'Put all hosts into the contact group "all"'} ), + ] } save_rulesets(g_root_folder, rulesets)

11 years, 8 months

Check_MK Git: check_mk: Disable notification per default for new users

by Mathias Kettner

Module: check_mk Branch: master Commit: 0b6b8004d58cf66de4e9cb20b5d55243b70518a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b6b8004d58cf6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 11:48:12 2012 +0100 Disable notification per default for new users Now you can edit and save omdadmin without an error message or changing something of the status quo --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index aa84a62..a7a229a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8148,7 +8148,7 @@ def mode_edit_user(phase): forms.header(_("Notifications"), isopen=False) forms.section(_("Enabling"), simple=True) - html.checkbox("notifications_enabled", user.get("notifications_enabled", True), + html.checkbox("notifications_enabled", user.get("notifications_enabled", False), label = _("enable notifications")) html.help(_("Notifications are sent out " "when the status of a host or service changes."))

11 years, 8 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2012