Checkmk git commits July 2013

checkmk-commits@lists.checkmk.com

4 participants
235 discussions

Check_MK Git: check_mk: Fixed dimensions of nagvis icon

by Lars Michelsen

Module: check_mk Branch: master Commit: e59d32ec1f001be3b4c4db2c45be636838d930ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e59d32ec1f001b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 9 10:04:47 2013 +0200 Fixed dimensions of nagvis icon --- web/htdocs/images/icon_nagvis.png | Bin 6073 -> 7189 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_nagvis.png b/web/htdocs/images/icon_nagvis.png index 455ead1..54564d6 100644 Binary files a/web/htdocs/images/icon_nagvis.png and b/web/htdocs/images/icon_nagvis.png differ

10 years, 12 months

Check_MK Git: check_mk: WATO rule icon: fix case where there is no item

by Mathias Kettner

Module: check_mk Branch: master Commit: 7e0184a7d584f5935f8adbdcf863748f8e4fd7a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e0184a7d584f5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 8 13:46:17 2013 +0200 WATO rule icon: fix case where there is no item --- web/htdocs/wato.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c475d1f..4746507 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10080,7 +10080,10 @@ def mode_edit_ruleset(phase): descr_pattern = checks[check_command]["service_description"].replace("%s", "(.*)") matcher = re.search(descr_pattern, html.var("service_description")) if matcher: - item = matcher.group(1) + try: + item = matcher.group(1) + except: + item = None elif check_command.startswith("check_mk_active-"): check_command = check_command[16:].split(" ")[0][:-1] varname = "active_checks:" + check_command

10 years, 12 months

Check_MK Git: check_mk: Showing view title in view deletion confirm message

by Lars Michelsen

Module: check_mk Branch: master Commit: 794e3eb7e01f244931d62049b0a9127751cc0c0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=794e3eb7e01f24… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 8 13:45:13 2013 +0200 Showing view title in view deletion confirm message --- web/htdocs/views.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 77edcde..c980681 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -340,11 +340,13 @@ def page_edit_views(msg=None): load_views() # Deletion of views - delname = html.var("_delete") - if delname and html.confirm(_("Please confirm the deletion of the view <tt>%s</tt>.") % delname): - del html.multisite_views[(config.user_id, delname)] - save_views(config.user_id) - html.reload_sidebar(); + delname = html.var("_delete") + if delname: + deltitle = html.multisite_views[(config.user_id, delname)]['title'] + if html.confirm(_("Please confirm the deletion of the view \"%s\".") % deltitle): + del html.multisite_views[(config.user_id, delname)] + save_views(config.user_id) + html.reload_sidebar() html.begin_form("create_view", "edit_view.py")

10 years, 12 months

Check_MK Git: check_mk: wato users: Using dynamic field names to prevent autocompletion of passwords in chrome

by Lars Michelsen

Module: check_mk Branch: master Commit: 8cf1ec8162e1890a1c570f9128b9bb7e81cc2f0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cf1ec8162e189… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 8 13:35:26 2013 +0200 wato users: Using dynamic field names to prevent autocompletion of passwords in chrome --- web/htdocs/wato.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8d69a4f..c475d1f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8063,8 +8063,10 @@ def mode_edit_user(phase): user = users.get(cloneid, userdb.new_user_template('htpasswd')) else: user = userdb.new_user_template('htpasswd') + pw_suffix = 'new' else: user = users.get(userid, userdb.new_user_template('htpasswd')) + pw_suffix = userid # Returns true if an attribute is locked and should be read only. Is only # checked when modifying an existing user @@ -8121,8 +8123,8 @@ def mode_edit_user(phase): increase_serial = True # password changed, reflect in auth serial else: - password = html.var("password", '').strip() - password2 = html.var("password2", '').strip() + password = html.var("password_" + pw_suffix, '').strip() + password2 = html.var("password2_" + pw_suffix, '').strip() # Detect switch back from automation to password if "automation_secret" in new_user: @@ -8269,9 +8271,9 @@ def mode_edit_user(phase): _("Normal user login with password")) html.write("<ul><table><tr><td>%s</td><td>" % _("password:")) if not is_locked('password'): - html.password_input("password", autocomplete="off") + html.password_input("password_" + pw_suffix, autocomplete="off") html.write("</td></tr><tr><td>%s</td><td>" % _("repeat:")) - html.password_input("password2", autocomplete="off") + html.password_input("password2_" + pw_suffix, autocomplete="off") html.write(" (%s)" % _("optional")) else: html.write('<i>%s</i>' % _('The password can not be changed (It is locked by the user connector).'))

10 years, 12 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 2f87c5bfb7df6c3b3b1397485934c622ac6d92c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f87c5bfb7df6c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 8 13:36:59 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

10 years, 12 months

Check_MK Git: check_mk: Better icon for CSV download

by Mathias Kettner

Module: check_mk Branch: master Commit: 7821b36ceadd3bcae5304150eea75949924af3a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7821b36ceadd3b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 8 13:28:15 2013 +0200 Better icon for CSV download --- web/htdocs/htmllib.py | 6 +++--- web/htdocs/images/icon_download_csv.png | Bin 0 -> 3890 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 33dfd4b..91027bd 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -790,9 +790,9 @@ class html: ("index.py?" + self.urlencode_vars([("start_url", self.makeuri([]))]), _("URL to this page including sidebar")) if self.myfile == "view": - h += '<a target="_top" href="%s"><img class=statusicon src="images/status_frameurl.png" title="%s"></a>\n' % \ - (self.makeuri([("output_format", "json_export")]), _("Export as JSON")) - h += '<a target="_top" href="%s"><img class=statusicon src="images/status_frameurl.png" title="%s"></a>\n' % \ + # h += '<a target="_top" href="%s"><img class=statusicon src="images/status_frameurl.png" title="%s"></a>\n' % \ + # (self.makeuri([("output_format", "json_export")]), _("Export as JSON")) + h += '<a target="_top" href="%s"><img class=statusicon src="images/icon_download_csv.png" title="%s"></a>\n' % \ (self.makeuri([("output_format", "csv_export")]), _("Export as CSV")) for img, tooltip in self.status_icons.items(): diff --git a/web/htdocs/images/icon_download_csv.png b/web/htdocs/images/icon_download_csv.png new file mode 100644 index 0000000..14a73cf Binary files /dev/null and b/web/htdocs/images/icon_download_csv.png differ

10 years, 12 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 69a59fd9fbfe0e30f070e30a10d3745f436d6df1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69a59fd9fbfe0e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 8 13:26:31 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

10 years, 12 months

Check_MK Git: check_mk: Fixed bug

by Lars Michelsen

Module: check_mk Branch: master Commit: 9017795942f3fad166ff0a7ae9f60244ca8e4df5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9017795942f3fa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 8 13:26:28 2013 +0200 Fixed bug --- web/htdocs/lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 8eab33a..2be7458 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -288,7 +288,7 @@ def release_lock(path): for lock_path, fd in g_aquired_locks: if lock_path == path: fcntl.flock(fd, fcntl.LOCK_UN) - fd.close() + os.close(fd) g_aquired_locks.remove((lock_path, fd)) g_locked_paths.remove(path)

10 years, 12 months

Check_MK Git: check_mk: Small cleanup of mysql.connections

by Mathias Kettner

Module: check_mk Branch: master Commit: be1d36d8de250e36bc2fb46c33b2b41d061a4f3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be1d36d8de250e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 8 13:15:37 2013 +0200 Small cleanup of mysql.connections --- checkman/mysql.connections | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/checkman/mysql.connections b/checkman/mysql.connections index 409fdf6..a47e1ad 100644 --- a/checkman/mysql.connections +++ b/checkman/mysql.connections @@ -5,25 +5,26 @@ author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk description: - This check allows tracking of connection usage for a MySQL database. + This check allows the tracking of connection usage for a MySQL database. Therefore it queries the maximum number of connections that have been in use simultaneously since the server started and the maximum number of possible parallel connections. From these both it calculates the maximum usage level of these connections in percent - and matches the given {WARN} and {CRIT} thresholds against it. + and matches the specified {WARN} and {CRIT} thresholds against it. This check needs the agent plugin {mk_mysql} to be installed. Further details about this plugin and monitoring of MySQL can be found in the Check_MK online documentation in the article "Monitoring MySQL with Check_MK". -inventory: +inventory: On each host where the agent plugin {mk_mysql} is being installed and the MySQL daemon is running one service is being generated. [parameters] -perc_used: (warn, crit) +parameters (dict): A dictionary with currentl just one possible key: {"perc_used"}. This + is a pair if two floating point numbers: {warn} (float): The maximum connection usage (in percent) that triggers a {WARN} state. @@ -31,4 +32,4 @@ perc_used: (warn, crit) {crit} (float): The maximum connection usage (in percent) that triggers a {CRIT} state. - If perc_used is not set, the check always returns {OK} state. + If {perc_used} is not set, the check always returns {OK} state.

10 years, 12 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 8011f7c01f1687852b0d0d5f31ad0170ba77cba6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8011f7c01f1687… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 8 13:13:21 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

10 years, 12 months

← Newer
1
...
11
12
13
14
15
16
17
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2013