Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

Check_MK Git: check_mk: #1267 FIX Fixed confirm activating foreign changes dialog

by Bastian Kuhn

Module: check_mk Branch: master Commit: abdd3bb7df127a778e7adb38762dcd0b1233fe24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abdd3bb7df127a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 9 09:35:11 2015 +0200 #1267 FIX Fixed confirm activating foreign changes dialog The HTML Output is not longer displayed in the Browser --- .werks/1267 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/1267 b/.werks/1267 new file mode 100644 index 0000000..389daaa --- /dev/null +++ b/.werks/1267 @@ -0,0 +1,11 @@ +Title: Fixed confirm activating foreign changes dialog +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1436427244 + +The HTML Output is not longer displayed in the Browser + diff --git a/ChangeLog b/ChangeLog index 6a248a5..ba0baca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ * 2344 FIX: Improved validation of selected rules when editing BI aggregations... * 2346 FIX: Notifications: Fixed garbled page when switching on/off bulks/backlog/user rules * 2372 FIX: Avoid freezing WATO during bulk discovery if hosts do not respond in a timely manner + * 1267 FIX: Fixed confirm activating foreign changes dialog... Notifications: * 2313 FIX: notification bulking: fixed exception for plugins which are not configured with checkboxes, e.g. sms diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index aba0f43..7040c0d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4751,8 +4751,8 @@ def mode_changelog(phase): "discard if you proceed:") c = wato_confirm(title, - '<img class=foreignchanges src="images/icon_foreign_changes.png">' + text + table + - _("Do you really want to proceed?")) + HTML('<img class=foreignchanges src="images/icon_foreign_changes.png">' + text + table + + _("Do you really want to proceed?"))) if c == False: return "" elif not c:

9 years, 2 months

Check_MK Git: check_mk: metrics/check_mk.py: added metric info and perfometer 'smoke_perc'

by Simon Betz

Module: check_mk Branch: master Commit: ecf5a9251c38a6cb2444cd6cfef996d8f317a571 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecf5a9251c38a6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 9 09:00:42 2015 +0200 metrics/check_mk.py: added metric info and perfometer 'smoke_perc' --- web/plugins/metrics/check_mk.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 92e973d..761b3d4 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -827,6 +827,12 @@ metric_info["smoke_ppm"] = { "color" : "#60f088", } +metric_info["smoke_perc"] = { + "title" : _("Smoke"), + "unit" : "%", + "color" : "#60f088", +} + metric_info["deviation_calibration_point"] = { "title" : _("Deviation from calibration point"), "unit" : "%", @@ -2778,10 +2784,6 @@ check_metrics["check_mk-ipmi"] = { "ambient_temp" : { "name" : "temp" } } -check_metrics["check_mk-wagner_titanus_topsense.smoke"] = { - "smoke_perc" : { "name" : "smoke_ppm" } -} - check_metrics["check_mk-wagner_titanus_topsense.airflow_deviation"] = { "airflow_deviation" : { "name" : "deviation_airflow" } } @@ -3868,6 +3870,12 @@ perfometer_info.append({ perfometer_info.append({ "type" : "linear", + "segments" : [ "smoke_perc" ], + "total" : 100, +}) + +perfometer_info.append({ + "type" : "linear", "segments" : [ "deviation_calibration_point" ], "total" : 10, })

9 years, 2 months

Check_MK Git: check_mk: LDAP: additional encoding fixes; fixed group to role sync test

by Lars Michelsen

Module: check_mk Branch: master Commit: 8a3f8171c60903a159cb0442648c1e92ff8af473 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a3f8171c60903… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 8 16:02:26 2015 +0200 LDAP: additional encoding fixes; fixed group to role sync test --- web/htdocs/wato.py | 24 ++++++++++++++---------- web/plugins/userdb/ldap.py | 6 +++--- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0d1aff2..c08c906 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7753,7 +7753,7 @@ def mode_edit_ldap_connection(phase): msg = _('Found no group object for synchronization. Please check your filter settings.') except Exception, e: ldap_groups = None - msg = str(e) + msg = "%s" % e if 'successful bind must be completed' in msg: if not connection.has_bind_credentials_configured(): return (False, _('Please configure proper bind credentials.')) @@ -7772,15 +7772,19 @@ def mode_edit_ldap_connection(phase): connection.connect(enforce_new = True, enforce_server = address) num = 0 - for role_id, dn in active_plugins['groups_to_roles'].items(): - if isinstance(dn, str): - num += 1 - try: - ldap_groups = connection.get_groups(dn) - if not ldap_groups: - return False, _('Could not find the group specified for role %s') % role_id - except Exception, e: - return False, _('Error while fetching group for role %s: %s') % (role_id, str(e)) + for role_id, group_distinguished_names in active_plugins['groups_to_roles'].items(): + if type(group_distinguished_names) != list: + group_distinguished_names = [group_distinguished_names] + + for dn in group_distinguished_names: + if type(dn) in [ str, unicode ]: + num += 1 + try: + ldap_groups = connection.get_groups(dn) + if not ldap_groups: + return False, _('Could not find the group specified for role %s') % role_id + except Exception, e: + return False, _('Error while fetching group for role %s: %s') % (role_id, e) return True, _('Found all %d groups.') % num tests = [ diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index bd6318d..b56abb5 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -1335,7 +1335,7 @@ def ldap_convert_groups_to_roles(connection, plugin, params, user_id, ldap_user, for role_id, distinguished_names in params.items(): if type(distinguished_names) == list: groups_to_fetch += [ dn.lower() for dn in distinguished_names ] - elif type(distinguished_names) == str: + elif type(distinguished_names) in [ str, unicode ]: groups_to_fetch.append(distinguished_names.lower()) ldap_groups = dict(connection.group_members(groups_to_fetch, @@ -1355,7 +1355,7 @@ def ldap_convert_groups_to_roles(connection, plugin, params, user_id, ldap_user, distinguished_names = [distinguished_names] for dn in distinguished_names: - if not isinstance(dn, str): + if type(dn) not in [ str, unicode ]: continue # skip non configured ones (old valuespecs allowed None) dn = dn.lower() # lower case matching for DNs! @@ -1469,7 +1469,7 @@ def synchronize_profile_to_sites(user_id, profile): try: result = wato.push_user_profile_to_site(site, user_id, profile) except Exception, e: - result = str(e) + result = "%s" % e if result == True: num_succeeded += 1

9 years, 2 months

Check_MK Git: check_mk: The Check_MK LDAP integration can now deal with LDAP directories which use special characters

by Lars Michelsen

Module: check_mk Branch: master Commit: e7a2987e1f430fd1ca9dd387b64f373b1e568db4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7a2987e1f430f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 8 15:43:46 2015 +0200 The Check_MK LDAP integration can now deal with LDAP directories which use special characters like german umlauts e.g. in OU (Organisational Unit) names in the LDAP directory. Previous version simply did not allow to configure such DNs (Distinguished Names) as user or group DNs. Conflicts: ChangeLog web/plugins/userdb/ldap.py --- .werks/2396 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 2 +- web/htdocs/wato.py | 2 +- web/plugins/userdb/ldap.py | 13 +++++++++++-- 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.werks/2396 b/.werks/2396 new file mode 100644 index 0000000..3e14d8c --- /dev/null +++ b/.werks/2396 @@ -0,0 +1,12 @@ +Title: LDAP: Fixed handling of LDAP trees having special chars in the path (e.g. in OU names) +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1436362239 + +The Check_MK LDAP integration can now deal with LDAP directories which use special characters +like german umlauts e.g. in OU (Organisational Unit) names in the LDAP directory. Previous +version simply did not allow to configure such DNs (Distinguished Names) as user or group DNs. diff --git a/ChangeLog b/ChangeLog index 6a248a5..62aa62e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,6 +55,7 @@ * 2380 FIX: Custom Host Notes painter was showing service notes when used in service based views * 2393 FIX: Fixed exception "user_confdir" not set in case of exceptions during login * 1263 FIX: Fixed handling of urls in views... + * 2396 FIX: LDAP: Fixed handling of LDAP trees having special chars in the path (e.g. in OU names)... WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 1373c81..ef6e5fe 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3148,7 +3148,7 @@ class Transform(ValueSpec): self._valuespec.validate_value(self.forth(value), varprefix) ValueSpec.custom_validate(self, value, varprefix) -class LDAPDistinguishedName(TextAscii): +class LDAPDistinguishedName(TextUnicode): def __init__(self, **kwargs): TextAscii.__init__(self, **kwargs) self.enforce_suffix = kwargs.get('enforce_suffix') diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4cd28c7..0d1aff2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7722,7 +7722,7 @@ def mode_edit_ldap_connection(phase): msg = _('Found no user object for synchronization. Please check your filter settings.') except Exception, e: ldap_users = None - msg = str(e) + msg = "%s" % e if 'successful bind must be completed' in msg: if not connection.has_bind_credentials_configured(): return (False, _('Please configure proper bind credentials.')) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 97e3249..bd6318d 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -115,9 +115,11 @@ ldap_umlaut_translation = { ord(u'æ'): u'ae', } + class MKLDAPException(MKGeneralException): pass + def ldap_test_module(): try: ldap @@ -125,6 +127,13 @@ def ldap_test_module(): raise MKLDAPException(_("The python module python-ldap seems to be missing. You need to " "install this extension to make the LDAP user connector work.")) + +def make_utf8(x): + if type(x) == unicode: + return x.encode('utf-8') + else: + return x + #. # .--UserConnector-------------------------------------------------------. # | _ _ ____ _ | @@ -430,7 +439,7 @@ class LDAPUserConnector(UserConnector): try: search_func = self._config.get('page_size') \ and self.ldap_paged_async_search or self.ldap_async_search - for dn, obj in search_func(base, self.ldap_get_scope(scope), filt, columns): + for dn, obj in search_func(make_utf8(base), self.ldap_get_scope(scope), make_utf8(filt), columns): if dn is None: continue # skip unwanted answers new_obj = {} @@ -454,7 +463,7 @@ class LDAPUserConnector(UserConnector): last_exc = e if tries_left: self.log(' Received %r. Retrying with clean connection...' % e) - ldap_disconnect() + self.disconnect() time.sleep(0.5) else: self.log(' Giving up.')

9 years, 2 months

Check_MK Git: check_mk: Small internal code cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: de07849c1b1df0dc7f120430bf636578a4f1ab39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de07849c1b1df0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 8 15:15:45 2015 +0200 Small internal code cleanup --- web/htdocs/wato.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index aba0f43..4cd28c7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1694,6 +1694,17 @@ def move_folder(what_folder, target_folder): new_dir = folder_dir(target_folder) shutil.move(old_dir, new_dir) +def delete_folder(folder): + parent_folder = folder[".parent"] + + mark_affected_sites_dirty(parent_folder) + del parent_folder[".folders"][folder[".name"]] + folder_path = folder_dir(folder) + shutil.rmtree(folder_path) + log_pending(AFFECTED, folder, "delete-folder", + _("Deleted empty folder %s")% folder_path) + call_hook_folder_deleted(folder) + def delete_folder_after_confirm(del_folder): msg = _("Do you really want to delete the folder %s?") % del_folder["title"] if not config.wato_hide_filenames: @@ -1704,13 +1715,7 @@ def delete_folder_after_confirm(del_folder): c = wato_confirm(_("Confirm folder deletion"), msg) if c: - mark_affected_sites_dirty(g_folder) - del g_folder[".folders"][del_folder[".name"]] - folder_path = folder_dir(del_folder) - shutil.rmtree(folder_path) - log_pending(AFFECTED, del_folder, "delete-folder", - _("Deleted empty folder %s")% folder_dir(del_folder)) - call_hook_folder_deleted(del_folder) + delete_folder(del_folder) return "folder" elif c == False: # not yet confirmed return ""

9 years, 2 months

Check_MK Git: check_mk: #1266 FIX cisco_mem_asa: Special memory check for cisco asa devices.

by Bastian Kuhn

Module: check_mk Branch: master Commit: 8deb50c3f9e60dc8fac89b77a69b2af4d75d27b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8deb50c3f9e60d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 8 14:09:21 2015 +0200 #1266 FIX cisco_mem_asa: Special memory check for cisco asa devices. The normal cisco_memory check now ignores Cisco Adaptive Security Appliances because of a bug in the firmware: http://www.cisco.com/c/en/us/support/docs/security/asa-5500-x-series-next-g… Instead, this check will appear. The name wont change and you don't loose any history, but a re discovery is needed. This check only ignores the MEMPOOL_GLOBAL_SHARED pool. --- .werks/1266 | 12 +++++++++ ChangeLog | 2 ++ checkman/cisco_mem_asa | 12 +++++++++ checks/cisco_mem | 44 +++----------------------------- checks/cisco_mem.include | 63 ++++++++++++++++++++++++++++++++++++++++++++++ checks/cisco_mem_asa | 45 +++++++++++++++++++++++++++++++++ 6 files changed, 137 insertions(+), 41 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8deb50c3f9…

9 years, 2 months

Check_MK Git: check_mk: #1265 FIX check_mk_agent.aix:

by Bastian Kuhn

Filesystem Section now ignores cdrfs filesystems Message-ID: <559d0b37.1Bd9t1KqA0VEQEkP%bk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 5fe20c5ebb9d28f001cf9e7ccb09ac43c4fce69d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fe20c5ebb9d28… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jul 7 17:43:58 2015 +0200 #1265 FIX check_mk_agent.aix: Filesystem Section now ignores cdrfs filesystems --- .werks/1265 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.aix | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/1265 b/.werks/1265 new file mode 100644 index 0000000..2617532 --- /dev/null +++ b/.werks/1265 @@ -0,0 +1,9 @@ +Title: check_mk_agent.aix: Filesystem Section now ignores cdrfs filesystems +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1436283800 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 4bcd8bf..3c37aa5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ * 2394 FIX: megaraid_ldisks: Is now supporting LSI CacheCade drives * 2449 FIX: db2_mem: Fixed scaling of perfdata... * 1264 FIX: ad_replication: Fixed handling of agent output without Destination DC entry + * 1265 FIX: check_mk_agent.aix: Filesystem Section now ignores cdrfs filesystems Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 01c7c85..4e536aa 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -124,7 +124,7 @@ echo Hostname: $(hostname) echo '<<<df>>>' if [ -x /usr/opt/freeware/bin/df ] ; then - excludefs="-x smbfs -x cifs -x iso9660 -x udf -x nfsv4 -x nfs -x mvfs -x zfs" + excludefs="-x smbfs -x cifs -x iso9660 -x udf -x nfsv4 -x nfs -x mvfs -x zfs -x cdrfs" /usr/opt/freeware/bin/df -PTlk $excludefs | sed 1d else df -kP | sed 's/ / - /' | grep -v ^/proc | grep -v ^Filesystem | grep -v :

9 years, 2 months

Check_MK Git: check_mk: Added a ToDo for redundant network routes

by Sven Rueß

Module: check_mk Branch: master Commit: 53ce459ba62d01c7b281df5dd5284817c757b34d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53ce459ba62d01… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Jul 8 11:35:57 2015 +0200 Added a ToDo for redundant network routes --- .bugs/2352 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2352 b/.bugs/2352 new file mode 100644 index 0000000..3d1926f --- /dev/null +++ b/.bugs/2352 @@ -0,0 +1,10 @@ +Title: Better support for redundant network routes +Component: wato +State: open +Date: 2015-07-08 11:24:29 +Targetversion: future +Class: todo + +Customer Polizei Niedersachen requests a better support for redundant network routes in our product. +It shouldb be possible to configure the parents relationship and the fallback route. Errors and notifications +have to take care about the relation of the redundant network routes. \ No newline at end of file

9 years, 2 months

Check_MK Git: check_mk: Reserved 5 bug IDS

by Sven Rueß

Module: check_mk Branch: master Commit: 6e4b403c24fd133708969801b7d237e902050262 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e4b403c24fd13… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Jul 8 11:24:13 2015 +0200 Reserved 5 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 680676a..da79784 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2352 +2357

9 years, 2 months

Check_MK Git: check_mk: Added draft of code indenting script

by Mathias Kettner

Module: check_mk Branch: master Commit: 5bb81552428f7524997b96d3aef33be7364453e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bb81552428f75… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 8 10:17:01 2015 +0200 Added draft of code indenting script --- doc/helpers/fix_newlines_before_def | 43 +++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/doc/helpers/fix_newlines_before_def b/doc/helpers/fix_newlines_before_def new file mode 100755 index 0000000..e039433 --- /dev/null +++ b/doc/helpers/fix_newlines_before_def @@ -0,0 +1,43 @@ +#!/usr/bin/python + +# Tries to enforce exactly two newlines before a function definition. +# Beware: This is not yet optimal. Do not use it yet. + +import sys, os, re + + +if "--debug" in sys.argv: + opt_debug = True + sys.argv.remove("--debug") +else: + opt_debug = False + + +def main(): + for filename in sys.argv[1:]: + try: + sys.stdout.write("%s..." % filename) + sys.stdout.flush() + something_changed = cleanup_indentation_style(filename) + sys.stdout.write(something_changed and "done.\n" or "unchanged.\n") + + except Exception, e: + sys.stdout.write("ERROR: %s\n" % e) + if opt_debug: + raise + + +def cleanup_indentation_style(filename): + content = file(filename).read() + new_content = content + new_content = fix_two_empty_lines_before_indented_commented_def(new_content) + if new_content != content: + file(filename, "w").write(new_content) + return True + else: + return False + +def fix_two_empty_lines_before_indented_commented_def(content): + return re.sub(r"\n+(([ \t]*#[^\n]*\n)*)(\s*)def ", r"\n\n\n\1\3def ", content) + +main()

9 years, 2 months

← Newer
1
...
17
18
19
20
21
22
23
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015