Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: da7511ced139e04977f9cedb0b9791820176fcc7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da7511ced139e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 12:45:20 2016 +0100 Changed url in tests Change-Id: I2ec9364fbb8a0bff6e19c3c20abca646700c7977 --- tests/web/classes.py | 2 +- tests/web/test_auto_sidebar.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/web/classes.py b/tests/web/classes.py index 5fd1b53..895e8ab 100644 --- a/tests/web/classes.py +++ b/tests/web/classes.py @@ -119,7 +119,7 @@ class DeprecatedRenderer(object): onclick="toggle_help()", style="display:none", ty="icon", cssclass=cssclass) self.write("%s</td></tr></table>" % - _("<a class=head_logo href=\"http://mathias-kettner.de\">" + _("<a class=head_logo href=\"https://mathias-kettner.com\">" "<img src=\"images/logo_cmk_small.png\"/></a>")) self.write("<hr class=\"header\">\n") if self.enable_debug: diff --git a/tests/web/test_auto_sidebar.py b/tests/web/test_auto_sidebar.py index 17a0d94..ab32ffe 100644 --- a/tests/web/test_auto_sidebar.py +++ b/tests/web/test_auto_sidebar.py @@ -158,12 +158,12 @@ def test_2(): old.write('<div id="messages" style="display:none;">') old.write('</div>') old.write("<div class=copyright>%s</div>\n" % - _("© <a target=\"_blank\" href=\"http://mathias-kettner.de\">Mathias Kettner</a>")) + _("© <a target=\"_blank\" href=\"https://mathias-kettner.com\">Mathias Kettner</a>")) old.write('</div>') new.open_div(style="display:none;", id_="messages") new.close_div() new.open_div(class_=["copyright"]) - new.write(_("© " + new.render_a("Mathias Kettner", target="_blank", href="http://mathias-kettner.de"))) + new.write(_("© " + new.render_a("Mathias Kettner", target="_blank", href="https://mathias-kettner.com"))) new.close_div() new.close_div()

7 years, 6 months

Changed links to mathias-kettner.de to mathias-kettner.com (+HTTPS)

by Lars Michelsen

Module: check_mk Branch: master Commit: 5ab59dab738f41142e999de303c876173dbf8d8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ab59dab738f41… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 12:29:53 2016 +0100 Changed links to mathias-kettner.de to mathias-kettner.com (+HTTPS) Change-Id: I53547d55b99717843eb42a79ed6c3b013251ee7a --- web/htdocs/htmllib.py | 2 +- web/htdocs/login.py | 4 ++-- web/htdocs/mobile.py | 2 +- web/htdocs/sidebar.py | 2 +- web/htdocs/wato.py | 10 +++++----- web/plugins/dashboard/dashlets.py | 10 +++++----- web/plugins/sidebar/shipped.py | 8 ++++---- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9a3ed16..4347c6c 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1025,7 +1025,7 @@ class HTMLCheck_MK(HTMLGenerator): self.icon_button(None, _("Toggle context help texts"), "help", id="helpbutton", onclick="toggle_help()", style="display:none", ty="icon", cssclass=cssclass) - self.open_a(href="http://mathias-kettner.de", class_="head_logo") + self.open_a(href="https://mathias-kettner.com", class_="head_logo") self.img(src="images/logo_cmk_small.png") self.close_a() self.close_td() diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 3ba592c..b1fb539 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -446,9 +446,9 @@ def normal_login_page(called_directly = True): html.write("</div>\n") html.write('<div id="foot">Version: %s - © ' - '<a href="http://mathias-kettner.de">Mathias Kettner</a><br /><br />' % cmk.__version__) + '<a href="https://mathias-kettner.com">Mathias Kettner</a><br /><br />' % cmk.__version__) html.write(_('You can use, modify and distribute Check_MK under the terms of the <a href="%s">' - 'GNU GPL Version 2</a>.') % "http://mathias-kettner.de/gpl.html") + 'GNU GPL Version 2</a>.') % "https://mathias-kettner.com/gpl.html") html.write("</div>\n") html.set_focus('_username') diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index aadd4fe..c76d8c4 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -186,7 +186,7 @@ def page_login(): html.write('<div id="loginfoot">') html.write('<img class="logomk" src="images/logo_cmk_small.png">') html.write('<div class="copyright">%s</div>' % - _("© <a target=\"_blank\" href=\"http://mathias-kettner.de\">Mathias Kettner</a>")) + _("© <a target=\"_blank\" href=\"https://mathias-kettner.com\">Mathias Kettner</a>")) html.write('</div>') jqm_page_footer() mobile_html_foot() diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 83509ec..da1d326 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -246,7 +246,7 @@ def sidebar_foot(): html.close_div() html.open_div(class_=["copyright"]) - html.write("© " + html.render_a("Mathias Kettner", target="_blank", href="http://mathias-kettner.de")) + html.write("© " + html.render_a("Mathias Kettner", target="_blank", href="https://mathias-kettner.com")) html.close_div() html.close_div() diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b6f83da..4a3c3d2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5610,7 +5610,7 @@ def vs_ldap_connection(new, connection_id): "the certificates of the LDAP server. This is normally done via system wide " "configuration of the CA certificate which signed the certificate of the LDAP " "server. Please refer to the <a target=\"_blank\" " - "href=\"http://mathias-kettner.de/checkmk_multisite_ldap_integration.html\">" + "href=\"https://mathias-kettner.com/checkmk_multisite_ldap_integration.html\">" "documentation</a> for details."), value = True, totext = _("Encrypt the network connection using SSL."), @@ -5935,7 +5935,7 @@ def mode_edit_ldap_connection(phase): 'the page reload, you should see the results of the test here.'), _('If you need help during configuration or experience problems, please refer ' 'to the Multisite <a target="_blank" ' - 'href="http://mathias-kettner.de/checkmk_multisite_ldap_integration.html">' + 'href="https://mathias-kettner.com/checkmk_multisite_ldap_integration.html">' 'LDAP Documentation</a>.')))) else: def test_connect(connection, address): @@ -9377,7 +9377,7 @@ def mode_edit_site(phase): "situations but locks a number of threads in the Livestatus module of the target site.")) # URL-Prefix - docu_url = "http://mathias-kettner.de/checkmk_multisite_modproxy.html" + docu_url = "https://mathias-kettner.com/checkmk_multisite_modproxy.html" forms.section(_("URL prefix")) html.text_input("url_prefix", site.get("url_prefix", ""), size = 60) html.help(_("The URL prefix will be prepended to links of addons like PNP4Nagios " @@ -9389,7 +9389,7 @@ def mode_edit_site(phase): "The prefix should end with a slash. Omit the <tt>/pnp4nagios/</tt> from the prefix.") % docu_url) # Status-Host - docu_url = "http://mathias-kettner.de/checkmk_multisite_statushost.html" + docu_url = "https://mathias-kettner.com/checkmk_multisite_statushost.html" forms.section(_("Status host")) sh = site.get("status_host") @@ -13738,7 +13738,7 @@ def select_language(user): 'Note: currently Multisite is internationalized ' 'but comes without any actual localisations (translations). If you want to ' 'create you own translation, you find <a href="%(url)s">documentation online</a>.') % - { "url" : "http://mathias-kettner.de/checkmk_multisite_i18n.html"} ) + { "url" : "https://mathias-kettner.com/checkmk_multisite_i18n.html"} ) def user_profile_async_replication_page(): html.header(_('Replicate new User Profile'), diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 2aa9b87..b7ccf58 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -49,7 +49,7 @@ def dashlet_overview(nr, dashlet): html.open_table(class_="dashlet_overview") html.open_tr() html.open_td(valign="top") - html.open_a(href="http://mathias-kettner.de/check_mk.html") + html.open_a(href="https://mathias-kettner.com/check_mk.html") html.img("images/check_mk.trans.120.png", style="margin-right: 30px;") html.close_a() html.close_td() @@ -57,9 +57,9 @@ def dashlet_overview(nr, dashlet): html.open_td() html.h2("Check_MK Multisite") html.write_html('Welcome to Check_MK Multisite. If you want to learn more about Multisite, please visit ' - 'our <a href="http://mathias-kettner.de/checkmk_multisite.html">online documentation</a>. ' - 'Multisite is part of <a href="http://mathias-kettner.de/check_mk.html">Check_MK</a> - an Open Source ' - 'project by <a href="http://mathias-kettner.de">Mathias Kettner</a>.') + 'our <a href="https://mathias-kettner.com/checkmk_multisite.html">online documentation</a>. ' + 'Multisite is part of <a href="https://mathias-kettner.com/check_mk.html">Check_MK</a> - an Open Source ' + 'project by <a href="https://mathias-kettner.com">Mathias Kettner</a>.') html.close_td() html.close_tr() @@ -86,7 +86,7 @@ dashlet_types["overview"] = { # '----------------------------------------------------------------------' def dashlet_mk_logo(nr, dashlet): - html.open_a(href="http://mathias-kettner.de/check_mk.html") + html.open_a(href="https://mathias-kettner.com/check_mk.html") html.img("images/check_mk.trans.120.png", style="margin-right: 30px;") html.close_a() diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 387485f..f719061 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -48,10 +48,10 @@ import cmk.store as store def render_about(): html.write(_("Version: ") + cmk.__version__) html.open_ul() - bulletlink(_("Homepage"), "http://mathias-kettner.de/check_mk.html") - bulletlink(_("Documentation"), "http://mathias-kettner.de/checkmk.html") - bulletlink(_("Download"), "http://mathias-kettner.de/check_mk_download.html") - bulletlink("Mathias Kettner", "http://mathias-kettner.de") + bulletlink(_("Homepage"), "https://mathias-kettner.com/check_mk.html") + bulletlink(_("Documentation"), "https://mathias-kettner.com/checkmk.html") + bulletlink(_("Download"), "https://mathias-kettner.com/check_mk_download.html") + bulletlink("Mathias Kettner", "https://mathias-kettner.com") html.close_ul() sidebar_snapins["about"] = {

7 years, 6 months

4222 FIX Services of host page: Fixed encoding issue for hosts with umlauts in alias

by Lars Michelsen

Module: check_mk Branch: master Commit: 4528dce3bb7ff3817cb561a4df283a9677d8e4ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4528dce3bb7ff3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 11:57:40 2016 +0100 4222 FIX Services of host page: Fixed encoding issue for hosts with umlauts in alias Change-Id: I920541afd5372e886859e7fee2b22e11ea3f4517 --- .werks/4222 | 9 +++++++++ ChangeLog | 2 +- modules/automation.py | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/4222 b/.werks/4222 new file mode 100644 index 0000000..4eb289d --- /dev/null +++ b/.werks/4222 @@ -0,0 +1,9 @@ +Title: Services of host page: Fixed encoding issue for hosts with umlauts in alias +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1482490622 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index ad9906f..03819ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ * 4146 FIX: Fixed broken "Global settings" when having the Event Console disabled via "omd config" * 4218 FIX: Disabling replication with a site did not clear the changes for this site (1.4.0i3 regression) * 4221 FIX: Fixed "analyse parameters" page for services with umlauts in names + * 4222 FIX: Services of host page: Fixed encoding issue for hosts with umlauts in alias Notifications: * 4197 FIX: Fix sending notification to global fallback email address @@ -51,7 +52,6 @@ NOTE: Please refer to the migration notes! - 1.4.0i3: Core & Setup: * 3978 FIX: mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...')... diff --git a/modules/automation.py b/modules/automation.py index e18c2e1..48ff0b0 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -1067,7 +1067,7 @@ def replace_core_macros(hostname, commandline): get_host_attributes(hostname, tags_of_host(hostname))) load_resource_file(macros) for varname, value in macros.items(): - commandline = commandline.replace(varname, str(value)) + commandline = commandline.replace(varname, "%s" % value) return commandline

7 years, 6 months

testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: ad2508bedb30bc39dbcdd46457b85c3142093092 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad2508bedb30bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 11:46:09 2016 +0100 testcommit Change-Id: Ic681c018d450c8dbd8593b05cb1690f99fbcf6d9 --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index b05e768..ad9906f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ NOTE: Please refer to the migration notes! + 1.4.0i3: Core & Setup: * 3978 FIX: mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...')...

7 years, 6 months

testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 13f5f25d0f431fa89eb2c1b5bfab37e065f8dd00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13f5f25d0f431f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 11:40:20 2016 +0100 testcommit Change-Id: I64fcbc2ac5554d164220f0be3169792dfade7a55 --- ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ad9906f..b05e768 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,7 +51,6 @@ NOTE: Please refer to the migration notes! - 1.4.0i3: Core & Setup: * 3978 FIX: mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...')...

7 years, 6 months

testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 3830808c74d864fc176be55bdb2eebf3706685c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3830808c74d864… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 11:37:37 2016 +0100 testcommit Change-Id: I8e2a506bb31a02dabb6f777b46151dc96e8141f0 --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index b05e768..ad9906f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ NOTE: Please refer to the migration notes! + 1.4.0i3: Core & Setup: * 3978 FIX: mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...')...

7 years, 6 months

Added todo

by Lars Michelsen

Module: check_mk Branch: master Commit: cf944bf34adbcc8a13c6c635e23fd2dd169a90ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf944bf34adbcc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 11:02:19 2016 +0100 Added todo Change-Id: I7e374472ef2538576f33b4d4ccaba35d1f6fbd23 --- web/htdocs/htmllib.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 39911b2..9a3ed16 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -28,6 +28,9 @@ # # Notes for future rewrite: # +# - Find all call sites which do something like "int(html.var(...))" +# and replace it with html.get_integer_input(...) +# # - Make clear which functions return values and which write out values # render_*, add_*, write_* (e.g. icon() -> outputs directly, # render_icon() -> returns icon

7 years, 6 months

Refactored load_users/save_users to use store persistance functions

by Lars Michelsen

Module: check_mk Branch: master Commit: 2aeb472a302561a5b14e7496f5bdc74440c8fcb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2aeb472a302561… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 11:22:23 2016 +0100 Refactored load_users/save_users to use store persistance functions Change-Id: Ib3676dd4857df3576ccc8764c72d7cd11fa927ae --- web/htdocs/userdb.py | 72 ++++++++-------------------------------------------- 1 file changed, 11 insertions(+), 61 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 27c5fef..0d8ebd6 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -492,12 +492,9 @@ def load_users(lock = False): filename = root_dir + "contacts.mk" if lock: - # Make sure that the file exists without modifying it, *if* it exists - # to be able to lock and realease the file properly. # Note: the lock will be released on next save_users() call or at # end of page request automatically. - file(filename, "a") - aquire_lock(filename) + store.aquire_lock(filename) if html.is_cached('users'): return html.get_cached('users') @@ -505,37 +502,11 @@ def load_users(lock = False): # First load monitoring contacts from Check_MK's world. If this is # the first time, then the file will be empty, which is no problem. # Execfile will the simply leave contacts = {} unchanged. - try: - vars = { "contacts" : {} } - execfile(filename, vars, vars) - contacts = vars["contacts"] - except IOError: - contacts = {} # a not existing file is ok, start with empty data - except Exception, e: - if config.debug: - raise MKGeneralException(_("Cannot read configuration file %s: %s") % - (filename, e)) - else: - logger(LOG_ERR, 'load_users: Problem while loading contacts (%s - %s). ' - 'Initializing structure...' % (filename, e)) - contacts = {} + contacts = store.load_from_mk_file(filename, "contacts", {}) - # Now add information about users from the Web world + # Now load information about users from the GUI config world filename = multisite_dir + "users.mk" - try: - vars = { "multisite_users" : {} } - execfile(filename, vars, vars) - users = vars["multisite_users"] - except IOError: - users = {} # not existing is ok -> empty structure - except Exception, e: - if config.debug: - raise MKGeneralException(_("Cannot read configuration file %s: %s") % - (filename, e)) - else: - logger(LOG_ERR, 'load_users: Problem while loading users (%s - %s). ' - 'Initializing structure...' % (filename, e)) - users = {} + users = store.load_from_mk_file(multisite_dir + "users.mk", "multisite_users", {}) # Merge them together. Monitoring users not known to Multisite # will be added later as normal users. @@ -738,39 +709,19 @@ def save_users(profiles): # Check_MK's monitoring contacts - filename = root_dir + "contacts.mk.new" - out = create_user_file(filename, "w") - out.write("# Written by Multisite UserDB\n# encoding: utf-8\n\n") - out.write("contacts.update(\n%s\n)\n" % pprint.pformat(contacts)) - out.close() - os.rename(filename, filename[:-4]) + store.save_to_mk_file(root_dir + "contacts.mk", "contacts", contacts) - # Users with passwords for Multisite - filename = multisite_dir + "users.mk.new" - make_nagios_directory(multisite_dir) - out = create_user_file(filename, "w") - out.write("# Written by Multisite UserDB\n# encoding: utf-8\n\n") - out.write("multisite_users = \\\n%s\n" % pprint.pformat(users)) - out.close() - os.rename(filename, filename[:-4]) + # GUI specific user configuration + store.save_to_mk_file(multisite_dir + "users.mk", "multisite_users", users) # Execute user connector save hooks hook_save(profiles) # Write out the users serials - serials_file = '%s/auth.serials.new' % os.path.dirname(cmk.paths.htpasswd_file) - rename_file = True - try: - out = create_user_file(serials_file, "w") - except: - rename_file = False - out = create_user_file(serials_file[:-4], "w") - + serials = "" for user_id, user in profiles.items(): - out.write('%s:%d\n' % (make_utf8(user_id), user.get('serial', 0))) - out.close() - if rename_file: - os.rename(serials_file, serials_file[:-4]) + serials += '%s:%d\n' % (make_utf8(user_id), user.get('serial', 0)) + store.save_file('%s/auth.serials' % os.path.dirname(cmk.paths.htpasswd_file), serials) # Write user specific files for user_id, user in profiles.items(): @@ -780,8 +731,7 @@ def save_users(profiles): # authentication secret for local processes auth_file = user_dir + "/automation.secret" if "automation_secret" in user: - with create_user_file(auth_file, "w") as f: - f.write("%s\n" % user["automation_secret"]) + store.save_file(auth_file, "%s\n" % user["automation_secret"]) else: remove_user_file(auth_file)

7 years, 6 months

htmllib: New generic helper for processing integers from request vars: get_integer_input()

by Lars Michelsen

Module: check_mk Branch: master Commit: 06817e9f7c254cf1522d0f5ba52b48573536cf76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06817e9f7c254c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 10:53:19 2016 +0100 htmllib: New generic helper for processing integers from request vars: get_integer_input() Change-Id: I320a89767697f6fe45ad70cf134d064208d5919e --- web/htdocs/htmllib.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 423d334..39911b2 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1458,6 +1458,14 @@ class html(DeprecationWrapper): raise MKUserError(varname, _("The given text is wrong encoded. " "You need to provide a UTF-8 encoded text.")) + def get_integer_input(self, varname): + try: + return int(self.var(varname)) + except TypeError: + raise MKUserError(varname, _("The parameter \"%s\" is missing.") % varname) + except ValueError: + raise MKUserError(varname, _("The parameter \"%s\" is not an integer.") % varname) + def var(self, varname, deflt = None): return self.vars.get(varname, deflt)

7 years, 6 months

Fixed analyse ruleset of custom checks after recent refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 5b453b687f527878bef6d5f63baf281967a93128 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b453b687f5278… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 10:45:00 2016 +0100 Fixed analyse ruleset of custom checks after recent refactoring Change-Id: I1511a1dafef3b7147c0eaa48376cbeffe791e231 --- web/htdocs/wato.py | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 22e4ae1..b6f83da 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2234,33 +2234,23 @@ def mode_object_parameters(phase): elif origin == "classic": rule_nr = serviceinfo["rule_nr"] - rule = all_rulesets["custom_checks"][rule_nr] - - # Find relative rule number in folder - old_folder = None - rel_nr = -1 - for nr, r in enumerate(all_rulesets["custom_checks"]): - if old_folder != r[0]: - old_folder = r[0] - rel_nr = -1 - rel_nr += 1 - if nr == rule_nr: - break + rules = all_rulesets.get("custom_checks").get_rules() + rule_folder, rule_index, rule = rules[rule_nr] url = folder_preserving_link([('mode', 'edit_ruleset'), ('varname', "custom_checks"), ('host', hostname)]) forms.section('<a href="%s">%s</a>' % (url, _("Command Line"))) url = folder_preserving_link([ ('mode', 'edit_rule'), ('varname', "custom_checks"), - ('rule_folder', rule[0].path()), - ('rulenr', rel_nr), + ('rule_folder', rule_folder.path()), + ('rulenr', rule_index), ('host', hostname)]) html.open_table(class_="setting") html.open_tr() html.open_td(class_="reason") - html.a("%s %d %s %s" % (_("Rule"), rel_nr + 1, _("in"), rule[0].title()), href=url) + html.a("%s %d %s %s" % (_("Rule"), rule_index + 1, _("in"), rule_folder.title()), href=url) html.close_td() html.open_td(class_=["settingvalue", "used"]) if "command_line" in serviceinfo:

7 years, 6 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016