Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64359 discussions

Check_MK Git: check_mk: Better title for PNP graph of mysql_capacity

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 000dd1d85756fc5d1964fbe89d500e3f3f7f6d8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=000dd1d85756fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 20 10:27:22 2012 +0200 Better title for PNP graph of mysql_capacity --- pnp-templates/check_mk-mysql_capacity.php | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pnp-templates/check_mk-mysql_capacity.php b/pnp-templates/check_mk-mysql_capacity.php index ee8d070..5c142e5 100644 --- a/pnp-templates/check_mk-mysql_capacity.php +++ b/pnp-templates/check_mk-mysql_capacity.php @@ -26,12 +26,10 @@ # Cut the relevant bits from the Nagios Service Description. # This is a little complicated. -$item = substr($servicedesc, 14); -$item = str_replace("_Size", "", $item); -$dbname = $item; +$servicedesc = str_replace("_", " ", $servicedesc); -$opt[1] = "--lower=0 --upper=".($CRIT[1]+10)." --vertical-label \"Bytes\" --title \"MySQL DB $dbname Size\" "; +$opt[1] = "--lower=0 --upper=".($CRIT[1]+10)." --vertical-label \"Bytes\" --title \"$servicedesc\" "; # Paint nice gradient using MySQLs colours. $def[1] = rrd::def("var1", $RRDFILE[1], $DS[1], "MAX") . rrd::gradient('var1', '015a84', 'e97b00', 'Database Size', 50)

12 years, 2 months

Check_MK Git: check_mk: mysql_capacity: cleaned up check,

by git＠mathias-kettner.de

levels are in MB now 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: fb0e8bf7c91b0e29ff7b495b1509dae025597abd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb0e8bf7c91b0e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 20 10:18:19 2012 +0200 mysql_capacity: cleaned up check, levels are in MB now --- ChangeLog | 2 + checkman/mysql_capacity | 37 ++++++++++++++++++--- checks/mysql_capacity | 45 +++++++++++++++++--------- pnp-templates/check_mk-mysql_capacity.php | 50 ++++++++++++++++++++++++++++- web/plugins/perfometer/check_mk.py | 14 ++++++++ web/plugins/wato/check_parameters.py | 27 +++++++++++++-- 6 files changed, 148 insertions(+), 27 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fb0e8bf7c9…

12 years, 2 months

Check_MK Git: check_mk: WATO: allow @ in user names

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 777a4a6264b3e08c9ddffff3d8bb68794fe80975 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=777a4a6264b3e0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 20 09:46:41 2012 +0200 WATO: allow @ in user names --- web/htdocs/wato.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3fe4de2..cd81da8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7531,8 +7531,8 @@ def mode_edit_user(phase): id = html.var("userid").strip() if new and id in users: raise MKUserError("userid", _("This username is already being used by another user.")) - if not re.match("^[-a-z0-9A-Z_\.]+$", id): - raise MKUserError("userid", _("The username must consist only of letters, digit and the underscore.")) + if not re.match("^[-a-z0-9A-Z_\.@]+$", id): + raise MKUserError("userid", _("The username must consist only of letters, digits, <tt>@</tt>, <tt>_</tt> or colon.")) if new: new_user = {}

12 years, 2 months

Check_MK Git: check_mk: Remote unneccesary call to load_plugins

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 14e56e47ae178990658af4bf0bec6a6f615e4237 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14e56e47ae1789… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 20 09:41:14 2012 +0200 Remote unneccesary call to load_plugins --- web/htdocs/login.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 88ebbc1..b75bf55 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -214,7 +214,6 @@ def normal_login_page(called_directly = True): auth_php = defaults.var_dir + '/wato/auth/auth.php' if not os.path.exists(auth_php) or os.path.getsize(auth_php) == 0: import wato - wato.load_plugins() wato.create_auth_file(wato.load_users()) html.set_render_headfoot(False)

12 years, 2 months

Check_MK Git: check_mk: Fix problem in auth. php after prefixing permissions with general.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fb753c68610b40eb57056f8a5fbc46ff9a0088e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb753c68610b40… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 20 09:40:07 2012 +0200 Fix problem in auth.php after prefixing permissions with general. --- web/htdocs/index.py | 6 +++++- web/plugins/wato/auth.py | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 29f6a5f..ccd09e5 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -228,6 +228,11 @@ def handler(req, profiling = True): os.chmod(profilefile + ".py", 0755) return apache.OK + # Make sure all plugins are avaiable as early as possible. At least + # we need the plugins (i.e. the permissions declared in these) at the + # time before the first login for generating auth.php. + load_all_plugins() + # Detect mobile devices if html.has_var("mobile"): html.mobile = not not html.var("mobile") @@ -247,7 +252,6 @@ def handler(req, profiling = True): # here. Automation calls bybass the normal authentication stuff if req.myfile == "automation": try: - load_all_plugins() handler() except Exception, e: html.write(str(e)) diff --git a/web/plugins/wato/auth.py b/web/plugins/wato/auth.py index 5a0e450..de524f3 100644 --- a/web/plugins/wato/auth.py +++ b/web/plugins/wato/auth.py @@ -59,17 +59,17 @@ g_auth_base_dir = defaults.var_dir + '/wato/auth' -def parse_php(data, lvl = 1): +def format_php(data, lvl = 1): s = '' if isinstance(data, tuple) or isinstance(data, list): s += 'array(\n' for item in data: - s += ' ' * lvl + parse_php(item, lvl + 1) + ',\n' + s += ' ' * lvl + format_php(item, lvl + 1) + ',\n' s += ' ' * (lvl - 1) + ')' elif isinstance(data, dict): s += 'array(\n' for key, val in data.iteritems(): - s += ' ' * lvl + parse_php(key, lvl + 1) + ' => ' + parse_php(val, lvl + 1) + ',\n' + s += ' ' * lvl + format_php(key, lvl + 1) + ' => ' + format_php(val, lvl + 1) + ',\n' s += ' ' * (lvl - 1) + ')' elif isinstance(data, str): s += '\'%s\'' % data.replace('\'', '\\\'') @@ -181,7 +181,7 @@ function may($username, $need_permission) { } ?> -''' % (parse_php(users), parse_php(role_permissions), parse_php(folder_permissions))) +''' % (format_php(users), format_php(role_permissions), format_php(folder_permissions))) def create_auth_file(users): make_nagios_directory(g_auth_base_dir)

12 years, 2 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 63d492cab30c6edc2ecd7b7601b13345a2e03d74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63d492cab30c6e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 20 09:40:31 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 2 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ed2db6855981c97e554840c0c00b162fefa04194 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed2db6855981c9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 20 08:32:47 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 2 months

Check_MK Git: check_mk: Added missing image

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b0b9453b5b1b9f97a4b99e126e15b3fdeb2ad53e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0b9453b5b1b9f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 20 08:32:43 2012 +0200 Added missing image --- web/htdocs/images/icon_matrix.png | Bin 0 -> 4708 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_matrix.png b/web/htdocs/images/icon_matrix.png new file mode 100644 index 0000000..40f1169 Binary files /dev/null and b/web/htdocs/images/icon_matrix.png differ

12 years, 2 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4058cfec895a898837cfb26e95a9ff24be7d4ad0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4058cfec895a89… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 19 09:42:51 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 2 months

Check_MK Git: check_mk: FIX: megaraid_pdisks: handle case where no enclosure device exists

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 20e084bc9c5f9083b7f8029fd3f31f50291678cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20e084bc9c5f90… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 19 09:42:49 2012 +0200 FIX: megaraid_pdisks: handle case where no enclosure device exists --- ChangeLog | 1 + checks/megaraid_pdisks | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9208421..13742d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ Checks & Agents: * mssql_backup: Fixed problems with datetime/timezone calculations * New Checks for Siemens Blades (BX600) + * FIX: megaraid_pdisks: handle case where no enclosure device exists WATO: * FIX: remove line about number of rules in rule set overview diff --git a/checks/megaraid_pdisks b/checks/megaraid_pdisks index 6ce5d3d..53abb49 100644 --- a/checks/megaraid_pdisks +++ b/checks/megaraid_pdisks @@ -54,6 +54,7 @@ def megaraid_pdisks_parse(info): current_adapter = adapters[0] return_var = [] adapter = 0 + enclosure_devid = 0 for line in info: if line[0] == 'adapter': current_adapter = {} @@ -65,7 +66,12 @@ def megaraid_pdisks_parse(info): current_adapter = adapters[int(line[1][1:])] # Raute weglassen adapter = int(line[1][1:]) elif line[0] == "Enclosure" and line[1] == "Device": - enclosure_devid = int(line[-1]) + try: + enclosure_devid = int(line[-1]) + except: # no enclosure device + enclosure_devid = 0 + adapters[adapter][0] = 0 + elif line[0] == "Slot": slot = int(line[-1]) elif line[0] == "Firmware" and line[1] == "state:":

12 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits