Checkmk git commits June 2013

checkmk-commits@lists.checkmk.com

4 participants
186 discussions

Check_MK Git: check_mk: Fix encoding problem in notify keepalive

by Mathias Kettner

Module: check_mk Branch: master Commit: dea9ef5f9eb470594bf78c7f331f3418b73487ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dea9ef5f9eb470… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 21 09:27:26 2013 +0200 Fix encoding problem in notify keepalive --- modules/notify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/notify.py b/modules/notify.py index 2bc9257..1ba3024 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -391,7 +391,7 @@ def notify_get_context(): try: for line in this_part.split('\n'): varname, value = line.strip().split("=", 1) - context[varname] = value + context[varname] = value.decode("utf-8") except Exception, e: # line without '=' ignored or alerted if opt_debug: raise

11 years, 3 months

Check_MK Git: check_mk: hwg_temp: WATO rule, man page, pnp graph, Perf-O-Meter

by Mathias Kettner

Module: check_mk Branch: master Commit: a47f9808dc2703a34980b5be42c107a90634a77e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a47f9808dc2703… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 20 17:36:18 2013 +0200 hwg_temp: WATO rule, man page, pnp graph, Perf-O-Meter --- ChangeLog | 2 ++ checkman/hwg_temp | 22 +++++++++++++++++++++ checks/hwg_temp | 37 ++++++++++++++++++++--------------- pnp-templates/check_mk-hwg_temp.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 5 files changed, 47 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index e450226..14fa65c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,8 @@ was misleading for different agent versions on multiple nodes) * job check: better handling of unexpected agent output * lnx_thermal: Added check for linux thermal sensors (e.g. acpi) + * hwg_temp: Make WATO-Rule "Room Temperature" match, add man page, graph + and Perf-O-Meter Multisite: * User accounts can now be locked after a specified amount of auth diff --git a/checkman/hwg_temp b/checkman/hwg_temp new file mode 100644 index 0000000..ffd294f --- /dev/null +++ b/checkman/hwg_temp @@ -0,0 +1,22 @@ +title: HWg-STE Ethernet thermometer +agents: snmp +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check monitors the environmental temperature via a + HWg-STE Ethernet thermometer. + +item: + The name of the sensor "a string". + +perfdata: + One variable: the current temperature. + +inventory: + All available temperature sensors are automatically inventorized. + +[parameters] +warn(int): Warning level for the temperature. +crit(int): Critical level for the temperature. + diff --git a/checks/hwg_temp b/checks/hwg_temp index 02e382b..3704b64 100644 --- a/checks/hwg_temp +++ b/checks/hwg_temp @@ -24,8 +24,13 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + hwg_temp_defaultlevels = (23, 25) +def inventory_hwg_temp(info): + return [ (line[0], "hwg_temp_defaultlevels" ) for line in info if int(line[2]) != 0] + + def check_hwg_temp(item, params, info): warn, crit = params status_text = { @@ -67,24 +72,24 @@ def check_hwg_temp(item, params, info): return (3, "Sensor %s not found in SNMP data %s" % (item) ) check_info['hwg_temp'] = { - "check_function" : check_hwg_temp, - "inventory_function" : lambda info: [ (line[0], hwg_temp_defaultlevels ) for line in info if int(line[2]) != 0] , - "service_description" : "Temperature %s", - "has_perfdata" : True, + "check_function" : check_hwg_temp, + "inventory_function" : inventory_hwg_temp, + "service_description" : "Temperature %s", + "has_perfdata" : True, "snmp_info" : (".1.3.6.1.4.1.21796.4.1.3", [# sensors index (1-2) - "1.1", - # sensor name string - "1.2", - # unit state: 0=Invalid, 1=Normal, 2=OutOfRangeLo, 3=OutOfRangeHi, 4=AlarmLo, 5=AlarmHi - "1.3", - # current value string - "1.4", - # current value*10 integer - "1.5", - # sensor unit integer 0=unknown, 1=°C, 2=°F, 3=°K, 4=% - "1.7", + "1.1", + # sensor name string + "1.2", + # unit state: 0=Invalid, 1=Normal, 2=OutOfRangeLo, 3=OutOfRangeHi, 4=AlarmLo, 5=AlarmHi + "1.3", + # current value string + "1.4", + # current value*10 integer + "1.5", + # sensor unit integer 0=unknown, 1=°C, 2=°F, 3=°K, 4=% + "1.7", ]), "snmp_scan_function" : lambda oid: "hwg" in oid(".1.3.6.1.2.1.1.1.0").lower(), - "group" : "hw_temperature", + "group" : "room_temperature", } diff --git a/pnp-templates/check_mk-hwg_temp.php b/pnp-templates/check_mk-hwg_temp.php new file mode 120000 index 0000000..a7f1e24 --- /dev/null +++ b/pnp-templates/check_mk-hwg_temp.php @@ -0,0 +1 @@ +check_mk-cmctc.temp.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index efdeed5..047bf6b 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -275,6 +275,7 @@ perfometers["check_mk-hp_proliant_temp"] = perfometer_temperature perfometers["check_mk-akcp_sensor_temp"] = perfometer_temperature perfometers["check_mk-fsc_temp"] = perfometer_temperature perfometers["check_mk-viprinet_temp"] = perfometer_temperature +perfometers["check_mk-hwg_temp"] = perfometer_temperature def perfometer_blower(row, check_command, perf_data): rpm = saveint(perf_data[0][1])

11 years, 3 months

Check_MK Git: check_mk: Fix syntax error in lnx_thermal, rename check file

by Mathias Kettner

Module: check_mk Branch: master Commit: 0295e28db5d8ee458140b5d96a24b536f19d2723 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0295e28db5d8ee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 20 17:35:58 2013 +0200 Fix syntax error in lnx_thermal, rename check file --- checks/{thermal => lnx_thermal} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/thermal b/checks/lnx_thermal similarity index 96% rename from checks/thermal rename to checks/lnx_thermal index b22a849..8e9a595 100644 --- a/checks/thermal +++ b/checks/lnx_thermal @@ -63,8 +63,8 @@ def check_lnx_thermal(item, params, info): return (3, 'No data found for sensor "thermal_zone%s"' % item) check_info['lnx_thermal'] = { - "inventory_function" : inventory_thermal, - "check_function" : check_thermal, + "inventory_function" : inventory_lnx_thermal, + "check_function" : check_lnx_thermal, "service_description" : "Temperature %s", "has_perfdata" : True, }

11 years, 3 months

Check_MK Git: check_mk: FIX: fix layout of Auxiliary tags table

by Mathias Kettner

Module: check_mk Branch: master Commit: 1665adcdcc7fab977e9b39910bd5b8ae6961712b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1665adcdcc7fab… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 20 16:18:30 2013 +0200 FIX: fix layout of Auxiliary tags table Conflicts: ChangeLog --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index f05de5c..e450226 100644 --- a/ChangeLog +++ b/ChangeLog @@ -204,6 +204,10 @@ * FIX: Fixed missing roles in auth.php (in some cases) which resulted in non visible pnp graphs and missing nagvis permissions + WATO: + * FIX: fix layout of Auxiliary tags table + + 1.2.2p2: Core: * FIX: livecheck: fixed handling of one-line plugin outputs and missing \n

11 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0894

by Mathias Kettner

Module: check_mk Branch: master Commit: 0ecbf4501cb359618911ee1199b131a26d9c10de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ecbf4501cb359… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 20 16:13:37 2013 +0200 Updated bug entries #0894 --- .bugs/894 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/894 b/.bugs/894 new file mode 100644 index 0000000..ec9bede --- /dev/null +++ b/.bugs/894 @@ -0,0 +1,9 @@ +Title: never read automation_secret.mk from Multisite +Component: multisite +State: open +Date: 2013-06-20 16:12:17 +Targetversion: future +Class: nastiness + +That file should be "write only" from the point of view of Multisite +and only be read by external skripts.

11 years, 3 months

Check_MK Git: check_mk: Optical cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 1fb62eda1a0f841cf4726ae9ef3cf03311db30da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fb62eda1a0f84… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 20 16:00:30 2013 +0200 Optical cleanup --- modules/check_mk_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 7d795fb..ab590f1 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1649,7 +1649,7 @@ def check_timeperiod(timeperiod): s.connect(livestatus_unix_socket) # We just get the currently inactive timeperiods. All others # (also non-existing) are considered to be active - s.send("GET timeperiods\nColumns:name\nFilter: in = 0\n") + s.send("GET timeperiods\nColumns: name\nFilter: in = 0\n") s.shutdown(socket.SHUT_WR) g_inactive_timerperiods = s.recv(10000000).splitlines() except Exception, e:

11 years, 3 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: a5337fc7f7dcee86ff6195a28c55d8e4ebf79a11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5337fc7f7dcee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 20 16:00:33 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: updated changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: 2a5da2ab900d3c5aab71aa72eabc2a3514f5ac72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a5da2ab900d3c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 20 15:07:13 2013 +0200 updated changelog --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 318118c..f05de5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -201,6 +201,8 @@ Multisite: * FIX: LDAP: Disabling use of referrals in active directory configuration + * FIX: Fixed missing roles in auth.php (in some cases) which resulted in + non visible pnp graphs and missing nagvis permissions 1.2.2p2: Core:

11 years, 3 months

Check_MK Git: check_mk: auth.php: adding info which hook generated the file

by Lars Michelsen

Module: check_mk Branch: master Commit: 22b00f07d59158e1b342ba4bf9b2a825325380ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22b00f07d59158… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 20 15:03:24 2013 +0200 auth.php: adding info which hook generated the file --- web/plugins/userdb/hook_auth.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/web/plugins/userdb/hook_auth.py b/web/plugins/userdb/hook_auth.py index 4ac39ab..977a8ac 100644 --- a/web/plugins/userdb/hook_auth.py +++ b/web/plugins/userdb/hook_auth.py @@ -85,12 +85,13 @@ def format_php(data, lvl = 1): return s -def create_php_file(users, role_permissions, folder_permissions): +def create_php_file(callee, users, role_permissions, folder_permissions): # Set a language for all users for username in users: users[username].setdefault('language', config.default_language) file(g_auth_base_dir + '/auth.php', 'w').write('''<?php +// Created by Multisite UserDB Hook (%s) global $mk_users, $mk_roles, $mk_folders; $mk_users = %s; $mk_roles = %s; @@ -181,13 +182,13 @@ function may($username, $need_permission) { } ?> -''' % (format_php(users), format_php(role_permissions), format_php(folder_permissions))) +''' % (callee, format_php(users), format_php(role_permissions), format_php(folder_permissions))) -def create_auth_file(users): +def create_auth_file(callee, users): make_nagios_directory(g_auth_base_dir) import wato # HACK: cleanup! - create_php_file(users, config.get_role_permissions(), wato.get_folder_permissions_of_users(users)) + create_php_file(callee, users, config.get_role_permissions(), wato.get_folder_permissions_of_users(users)) -hooks.register('users-saved', create_auth_file) -hooks.register('roles-saved', lambda x: create_auth_file(load_users())) -hooks.register('activate-changes', lambda x: create_auth_file(load_users())) +hooks.register('users-saved', lambda users: create_auth_file("users-saved", users)) +hooks.register('roles-saved', lambda x: create_auth_file("roles-saved", load_users())) +hooks.register('activate-changes', lambda x: create_auth_file("activate-changes", load_users()))

11 years, 3 months

Check_MK Git: check_mk: auth.php: always adding roles - as expected

by Lars Michelsen

Module: check_mk Branch: master Commit: 26e013e91b0609925a359f2ea49411ec2dede7ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26e013e91b0609… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 20 15:06:23 2013 +0200 auth.php: always adding roles - as expected --- web/htdocs/config.py | 7 +++++++ web/htdocs/userdb.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 25dfd8d..027ec51 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -328,6 +328,13 @@ def get_role_permissions(): # Loop all permissions # and for each permission loop all roles # and check wether it has the permission or not + + # Make sure, builtin roles are present, even if not modified + # and saved with WATO. + for br in builtin_role_ids: + if br not in roles: + roles[br] = {} + roleids = roles.keys() for perm in permissions_by_order: for role_id in roleids: diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 5063b53..f864524 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -583,7 +583,7 @@ def general_page_hook(): # This is a good place to replace old api based files in the future. auth_php = defaults.var_dir + '/wato/auth/auth.php' if not os.path.exists(auth_php) or os.path.getsize(auth_php) == 0: - create_auth_file(load_users()) + create_auth_file("page_hook", load_users()) # Create initial auth.serials file, same issue as auth.php above serials_file = '%s/auth.serials' % os.path.dirname(defaults.htpasswd_file)

11 years, 3 months

← Newer
1
...
6
7
8
9
10
11
12
...
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