Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

Check_MK Git: check_mk: #2145 FIX LDAP-Sync: Handling user ids with special characters more user friendly

by Lars Michelsen

Module: check_mk Branch: master Commit: ae7080734c23a13bb51b0032f779042b833a0725 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae7080734c23a1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 17 10:10:23 2015 +0100 #2145 FIX LDAP-Sync: Handling user ids with special characters more user friendly At the moment the Check_MK GUI does not allow to use special characters like german umlauts in the user ID. By default the LDAP sync pluginn tries to replace these umlauts with some similar characters, or if enabled, it tries to skip these users during sync. But if a user ID contains other special characters, which are not handled by the LDAP code, this could result in exceptions after synchronising such users. We improved the handling of those users to skip them silently during synchronisation. If you miss some users, just enable the diagnostic log and have a look at the LDAP debug log (located in <tt>var/check_mk/web/ldap-debug.log</tt> in OMD sites) and search for <tt>Skipped user: ...</tt> entries. If you need these users within Check_MK please let us know, we will add the needed umlauts to the translation map. For future innovation releases we plan to make such special characters usable in user IDs, then this translation map will not be needed anymore. --- .werks/2145 | 27 +++++++++++++++++++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 48 ++++++++++++++++++++++++++------------------ 3 files changed, 56 insertions(+), 20 deletions(-) diff --git a/.werks/2145 b/.werks/2145 new file mode 100644 index 0000000..67a69cd --- /dev/null +++ b/.werks/2145 @@ -0,0 +1,27 @@ +Title: LDAP-Sync: Handling user ids with special characters more user friendly +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1426583054 + +At the moment the Check_MK GUI does not allow to use special characters like +german umlauts in the user ID. By default the LDAP sync pluginn tries to +replace these umlauts with some similar characters, or if enabled, it tries +to skip these users during sync. + +But if a user ID contains other special characters, which are not handled by +the LDAP code, this could result in exceptions after synchronising such users. + +We improved the handling of those users to skip them silently during +synchronisation. If you miss some users, just enable the diagnostic log and +have a look at the LDAP debug log (located in <tt>var/check_mk/web/ldap-debug.log</tt> +in OMD sites) and search for <tt>Skipped user: ...</tt> entries. If you need +these users within Check_MK please let us know, we will add the needed umlauts +to the translation map. + +For future innovation releases we plan to make such special characters usable +in user IDs, then this translation map will not be needed anymore. + diff --git a/ChangeLog b/ChangeLog index bef1923..3d78848 100644 --- a/ChangeLog +++ b/ChangeLog @@ -311,6 +311,7 @@ * 2054 FIX: Sidebar snapin "Tree of folders": fixed exception when using localized default value... * 2090 FIX: Fixed errors when editing / rendering custom url dashlets in some cases... * 2092 FIX: Dashboards: Possible to configure an empty custom title + * 2145 FIX: LDAP-Sync: Handling user ids with special characters more user friendly... WATO: * 1760 Added search form to manual checks page diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 3ba6bed..0704fa4 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -92,6 +92,20 @@ ldap_filter_map = { }, } +# All these characters are replaced from user ids by default. Check_MK +# currently does not support special characters in user ids, so users +# not matching this specification are cleaned up with this map. When the +# user accounts still do not match the specification, they are skipped. +ldap_umlaut_translation = { + ord(u'ü'): u'ue', + ord(u'ö'): u'oe', + ord(u'ä'): u'ae', + ord(u'ß'): u'ss', + ord(u'Ü'): u'UE', + ord(u'Ö'): u'OE', + ord(u'Ä'): u'AE', +} + #. # .-General LDAP code----------------------------------------------------. # | _ ____ _ ____ | @@ -106,6 +120,8 @@ ldap_filter_map = { def ldap_log(s): if config.ldap_debug_log is not None: + if type(s) == unicode: + s = s.encode('utf-8') file(ldap_replace_macros(config.ldap_debug_log), "a").write('%s %s\n' % (time.strftime('%Y-%m-%d %H:%M:%S'), s)) @@ -414,29 +430,21 @@ def ldap_rewrite_user_id(user_id): user_id = user_id.lower() umlauts = config.ldap_userspec.get('user_id_umlauts', 'replace') - new = "" - for c in user_id: - if c == u'ü': - new += 'ue' - elif c == u'ö': - new += 'oe' - elif c == u'ä': - new += 'ae' - elif c == u'ß': - new += 'ss' - elif c == u'Ü': - new += 'UE' - elif c == u'Ö': - new += 'OE' - elif c == u'Ä': - new += 'AE' - else: - new += c + new_user_id = user_id.translate(ldap_umlaut_translation) + if umlauts == 'replace': - user_id = new - elif umlauts == 'skip' and user_id != new: + user_id = new_user_id + elif umlauts == 'skip' and user_id != new_user_id: return None # This makes the user being skipped + # Now check whether or not the user id matches our specification + try: + str(user_id) + except UnicodeEncodeError: + # Skipping this user: not all "bad" characters were replaced before + ldap_log('Skipped user: %s (contains not allowed special characters)' % user_id) + return None + return user_id def ldap_user_id_attr():

9 years, 6 months

Check_MK Git: check_mk: Trivial code change in metrics, import time

by Mathias Kettner

Module: check_mk Branch: master Commit: 1ee650a535abb83fd34bb9b8a6297d444275e36d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ee650a535abb8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 17 09:55:17 2015 +0100 Trivial code change in metrics, import time --- web/htdocs/metrics.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index e96d65f..3a35665 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -33,7 +33,7 @@ # unit_name: The ID of a unit, e.g. "%" # unit: The definition-dict of a unit like in unit_info -import math +import math, time import config, defaults from lib import * @@ -667,7 +667,6 @@ def page_pnp_template(): html.write(output) - def render_pnp_graph(graph, translated_metrics): graph_title = None

9 years, 6 months

Check_MK Git: check_mk: #2144 FIX Fixed exception in inventory GUI when trying to render dates of inventorized exe files

by Lars Michelsen

Module: check_mk Branch: master Commit: 050d2bd2656fec7354e971817486389d6c1ffdb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=050d2bd2656fec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 16 16:18:17 2015 +0100 #2144 FIX Fixed exception in inventory GUI when trying to render dates of inventorized exe files Till this change the agent provided the installation dates of the exe files in a localized format (depending on the system locale config). The new agent is now providing a non localized format which can easily be parsed by the check. Not parsed installation dates lead to exceptions in the GUI when showing the inventorized information of a host. --- .werks/2144 | 15 +++++++++++++++ ChangeLog | 1 + agents/windows/plugins/mk_inventory.ps1 | 3 ++- inventory/win_exefiles | 11 +++++++++-- 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.werks/2144 b/.werks/2144 new file mode 100644 index 0000000..91d05d3 --- /dev/null +++ b/.werks/2144 @@ -0,0 +1,15 @@ +Title: Fixed exception in inventory GUI when trying to render dates of inventorized exe files +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1426518769 + +Till this change the agent provided the installation dates of the exe files in a localized +format (depending on the system locale config). The new agent is now providing a non +localized format which can easily be parsed by the check. + +Not parsed installation dates lead to exceptions in the GUI when showing the inventorized +information of a host. diff --git a/ChangeLog b/ChangeLog index 0b22b7d..bef1923 100644 --- a/ChangeLog +++ b/ChangeLog @@ -259,6 +259,7 @@ * 1895 FIX: temperature.include: Fixed Fahrenheit handling... * 2097 FIX: apc_symmetra: Fixed false alert during self test... * 2143 FIX: Solaris-Agent: Fixed broken zfsget checks on solaris 10 + * 2144 FIX: Fixed exception in inventory GUI when trying to render dates of inventorized exe files... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/windows/plugins/mk_inventory.ps1 b/agents/windows/plugins/mk_inventory.ps1 index 0a11313..6c71525 100644 --- a/agents/windows/plugins/mk_inventory.ps1 +++ b/agents/windows/plugins/mk_inventory.ps1 @@ -2,6 +2,8 @@ $delay = 14400 # execute agent only every $delay seconds $exe_paths = @("c:\Program Files (x86)") +[System.Threading.Thread]::CurrentThread.CurrentCulture = [Globalization.CultureInfo]::InvariantCulture +[System.Threading.Thread]::CurrentThread.CurrentUICulture = [Globalization.CultureInfo]::InvariantCulture [Console]::OutputEncoding = [System.Text.Encoding]::UTF8 write-output "" # workaround to prevent the byte order mark to be at the beginning of the first section $name = (Get-Item env:\Computername).Value @@ -17,7 +19,6 @@ if (!$agent_dir) { $timestamp = $agent_dir + "\timestamp."+ $remote_host - # does $timestamp exist? If (Test-Path $timestamp){ $filedate = (ls $timestamp).LastWriteTime diff --git a/inventory/win_exefiles b/inventory/win_exefiles index 4641532..b5d1862 100644 --- a/inventory/win_exefiles +++ b/inventory/win_exefiles @@ -35,13 +35,20 @@ def inv_win_exefiles(info): paclist = inv_tree("software.packages:") for full_name, write_time, size, description, product_version, product_name in info: parts = full_name.split('\\') - # 14.02.2014 23:12:04 + # Since 1.2.6p1 the agent always provides a date format of "04/18/2003 18:06:32". + # Old agent versions provided localized date formats which lead to problems here + # when none of the implemented parsers matches. We keep the existing parsers for + # compatibility, all users with yet unhandled formats should update the agent to + # solve the problems. if re.match("^\d{2}\.\d{2}\.20\d{2} \d{2}:\d{2}:\d{2}", write_time): install_date = int(time.mktime(time.strptime(write_time, "%d.%m.%Y %H:%M:%S"))) elif re.match("^\d{1,2}/\d{1,2}/20\d{2} \d{1,2}:\d{2}:\d{2} (AM|PM)", write_time): install_date = int(time.mktime(time.strptime(write_time, "%m/%d/%Y %H:%M:%S %p"))) + elif re.match("^\d{1,2}/\d{1,2}/20\d{2} \d{1,2}:\d{2}:\d{2}", write_time): + # This is the 1.2.6p1 new default date + install_date = int(time.mktime(time.strptime(write_time, "%m/%d/%Y %H:%M:%S"))) else: - install_date = write_time + install_date = None # need to return 0 to not break the painter which assumes an int entry = { "name" : parts[-1],

9 years, 6 months

Check_MK Git: check_mk: siemens_plc_temp: Dealing with new data format of special agent

by Lars Michelsen

Module: check_mk Branch: master Commit: e342f0ef67a08a00f32f76fc6a7824e93d327af5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e342f0ef67a08a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 16 14:42:51 2015 +0100 siemens_plc_temp: Dealing with new data format of special agent --- checks/siemens_plc | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/checks/siemens_plc b/checks/siemens_plc index ead6e0c..88eaacf 100644 --- a/checks/siemens_plc +++ b/checks/siemens_plc @@ -25,20 +25,20 @@ # Boston, MA 02110-1301 USA. # <<<siemens_plc>>> -# hours Gesamt 123 -# hours Fahren 56 -# hours Hub 48 -# temp Extern 18.7000007629 -# temp RBG_SCH1 21.2999992371 -# temp RBG_SCH2 22.5 -# None Fahren 31450 -# None Hub 8100 -# None LAM 5002 -# hours LAM1 13 -# None Lastzyklen 78 -# None LAM1_Zyklen 115 -# hours Service 109 -# hours Serviceintervall 700 +# 192.168.0.20 hours Gesamt 123 +# 192.168.0.20 hours Fahren 56 +# 192.168.0.20 hours Hub 48 +# 192.168.0.20 temp Extern 18.7000007629 +# 192.168.0.20 temp RBG_SCH1 21.2999992371 +# 192.168.0.20 temp RBG_SCH2 22.5 +# 192.168.0.20 None Fahren 31450 +# 192.168.0.20 None Hub 8100 +# 192.168.0.20 None LAM 5002 +# 192.168.0.20 hours LAM1 13 +# 192.168.0.20 None Lastzyklen 78 +# 192.168.0.20 None LAM1_Zyklen 115 +# 192.168.0.20 hours Service 109 +# 192.168.0.20 hours Serviceintervall 700 factory_settings["siemens_plc_temp_default_levels"] = { "levels" : (70, 80), @@ -46,12 +46,12 @@ factory_settings["siemens_plc_temp_default_levels"] = { } def inventory_siemens_plc_temp(info): - return [ (l[1], {}) for l in info if l[0] == "temp" ] + return [ (l[2], {}) for l in info if l[1] == "temp" ] def check_siemens_plc_temp(item, params, info): for line in info: - if line[0] == "temp" and line[1] == item: + if line[1] == "temp" and line[2] == item: temp = float(line[-1]) return check_temperature(temp, params)

9 years, 6 months

Check_MK Git: check_mk: agent_siemens_plc: Providing info about source device to checks

by Lars Michelsen

Module: check_mk Branch: master Commit: 6cef852474d64c9d0ca362345dab146a6ab47bb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cef852474d64c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 16 14:41:18 2015 +0100 agent_siemens_plc: Providing info about source device to checks --- agents/special/agent_siemens_plc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/special/agent_siemens_plc b/agents/special/agent_siemens_plc index 3503954..46f6874 100755 --- a/agents/special/agent_siemens_plc +++ b/agents/special/agent_siemens_plc @@ -177,7 +177,7 @@ for device in devices: data_offset = addresses[db_number][0] data = client.db_read(db_number, address-data_offset, size) value = parse_func(data, 0) - sys.stdout.write("%s %s %s\n" % (valuetype, ident, value)) + sys.stdout.write("%s %s %s %s\n" % (device['host_address'], valuetype, ident, value)) except: if opt_debug: raise

9 years, 6 months

Check_MK Git: check_mk: agent_siemens_plc: Can now communicate with multiple PLCs at once

by Lars Michelsen

Module: check_mk Branch: master Commit: 3b5e53b05289a731d4bc044fe99ef05745fde71b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b5e53b05289a7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 16 14:33:56 2015 +0100 agent_siemens_plc: Can now communicate with multiple PLCs at once --- agents/special/agent_siemens_plc | 131 ++++++++++++++++++------------- checks/agent_siemens_plc | 15 ++-- web/plugins/wato/datasource_programs.py | 98 +++++++++++++++++------ 3 files changed, 162 insertions(+), 82 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3b5e53b052…

9 years, 6 months

Check_MK Git: check_mk: Updated bug entries #2291

by Lars Michelsen

Module: check_mk Branch: master Commit: 921b51d6ae7727d2475165fd2210ad9d190a4d42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=921b51d6ae7727… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 16 12:04:45 2015 +0100 Updated bug entries #2291 --- .bugs/2291 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.bugs/2291 b/.bugs/2291 new file mode 100644 index 0000000..62df69c --- /dev/null +++ b/.bugs/2291 @@ -0,0 +1,7 @@ +Title: make rrdcached TIMEOUT configurable via WATO (and increase default) +Component: wato +State: open +Date: 2015-03-16 12:04:14 +Targetversion: 1.2.7 +Class: todo +

9 years, 6 months

Check_MK Git: check_mk: #2139 FIX Fix exception in Event Console when archiving events with match groups and non ASCII characters

by Mathias Kettner

Module: check_mk Branch: master Commit: 3c5e3976bfa688a534f1e5ca027a33d85e0454af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c5e3976bfa688… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 16 13:41:45 2015 +0100 #2139 FIX Fix exception in Event Console when archiving events with match groups and non ASCII characters --- .werks/2139 | 9 +++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/2139 b/.werks/2139 new file mode 100644 index 0000000..7471521 --- /dev/null +++ b/.werks/2139 @@ -0,0 +1,9 @@ +Title: Fix exception in Event Console when archiving events with match groups and non ASCII characters +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1426509629 + diff --git a/ChangeLog b/ChangeLog index e86bb36..0b22b7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -390,6 +390,7 @@ * 1861 FIX: exception in mkeventd when archiving certain event log lines * 1865 FIX: mkeventd: fixed exception when executing a shell script as action * 2133 FIX: Fix visualization of global EC setting for Rule Optimizer... + * 2139 FIX: Fix exception in Event Console when archiving events with match groups and non ASCII characters HW/SW-Inventory: * 1846 Keep track of changes of software and hardware... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 65fd75a..aa00f3e 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -681,7 +681,7 @@ def quote_tab(col): if type(col) in [ float, int ]: return str(col) elif type(col) in [ tuple, list ]: - col = "\1" + "\1".join(map(str, col)) + col = "\1" + "\1".join(map(to_utf8, col)) elif col == None: col = "\2"

9 years, 6 months

Check_MK Git: check_mk: Fixed naming in wato rule

by Bastian Kuhn

Module: check_mk Branch: master Commit: 888b278b5169ec89d1fad59881d6af7f6ff9a5df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=888b278b5169ec… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Mar 16 13:39:57 2015 +0100 Fixed naming in wato rule --- web/plugins/wato/check_parameters.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index db68d9a..dff4572 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4055,24 +4055,24 @@ register_check_parameters( Tuple( title = _("Levels for Datafiles"), elements = [ - Filesize(title = _("Warning at or above")), - Filesize(title = _("Critical at or above")), + Filesize(title = _("Warning at")), + Filesize(title = _("Critical at")), ] )), ("log_files", Tuple( title = _("Levels for Logfiles"), elements = [ - Filesize(title = _("Warning at or above")), - Filesize(title = _("Critical at or above")), + Filesize(title = _("Warning at")), + Filesize(title = _("Critical at")), ] )), ("log_files_used", Tuple( title = _("Levels for used Logfiles"), elements = [ - Filesize(title = _("Warning at or above")), - Filesize(title = _("Critical at or above")), + Filesize(title = _("Warning at")), + Filesize(title = _("Critical at")), ] )), ]

9 years, 6 months

Check_MK Git: check_mk: Fixed naming in wato rule

by Bastian Kuhn

Module: check_mk Branch: master Commit: ac08d388172d5fc93cc133fbffe55a733fed33a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac08d388172d5f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Mar 16 12:41:23 2015 +0100 Fixed naming in wato rule --- web/plugins/wato/check_parameters.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 76af3a3..db68d9a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4055,24 +4055,24 @@ register_check_parameters( Tuple( title = _("Levels for Datafiles"), elements = [ - Filesize(title = _("Warning if above")), - Filesize(title = _("Critical if above")), + Filesize(title = _("Warning at or above")), + Filesize(title = _("Critical at or above")), ] )), ("log_files", Tuple( title = _("Levels for Logfiles"), elements = [ - Filesize(title = _("Warning if above")), - Filesize(title = _("Critical if above")), + Filesize(title = _("Warning at or above")), + Filesize(title = _("Critical at or above")), ] )), ("log_files_used", Tuple( title = _("Levels for used Logfiles"), elements = [ - Filesize(title = _("Warning if above")), - Filesize(title = _("Critical if above")), + Filesize(title = _("Warning at or above")), + Filesize(title = _("Critical at or above")), ] )), ]

9 years, 6 months

← Newer
1
...
14
15
16
17
18
19
20
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2015