Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: fd6a129329276880bf2c86e39b4ca6be5171bd3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd6a1293292768… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 7 13:37:52 2017 +0200 Updated bug entries #2950 Change-Id: I99ac9f8fd55956cb45b1877de7bb390ee59433cc --- .bugs/2950 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.bugs/2950 b/.bugs/2950 new file mode 100644 index 0000000..62ed1b1 --- /dev/null +++ b/.bugs/2950 @@ -0,0 +1,14 @@ +Title: LDAP: Once synced contact groups can not be deleted anymore +Component: wato +State: open +Date: 2017-09-07 13:35:22 +Targetversion: 1.5.0 +Class: bug + +When using the LDAP sync to manage users and contact group memberships one needs to create +the contact groups to be synced from LDAP manually. From the first sync after creation the +group memberships are synchronized by the LDAP sync. Since the membership attribute of +all LDAP users is locked, it is not possible remove the assignment to the group. This makes +it impossible to delete the group while there are LDAP users for this group. + +It should be possible to delete the group after confirming a warning message.

7 years

5198 FIX Delete contact groups: Fixed error message when users have no alias

by Lars Michelsen

Module: check_mk Branch: master Commit: 3df24a62f7bdc38610065b0241c44b02d883ee82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3df24a62f7bdc3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 7 13:35:11 2017 +0200 5198 FIX Delete contact groups: Fixed error message when users have no alias The error message that prevents the deletion of a contact group when it is assigned to a user could contain the text "User: None" when a user had no alias set. In case there is no alias for the user it shows the user ID now. Change-Id: Ic16c4697d4d670af3e260072eaffe72d585887ae --- .werks/5198 | 13 +++++++++++++ web/htdocs/watolib.py | 5 ++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/5198 b/.werks/5198 new file mode 100644 index 0000000..be00eb6 --- /dev/null +++ b/.werks/5198 @@ -0,0 +1,13 @@ +Title: Delete contact groups: Fixed error message when users have no alias +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1504784015 + +The error message that prevents the deletion of a contact group when it is +assigned to a user could contain the text "User: None" when a user had no +alias set. In case there is no alias for the user it shows the user ID now. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 7398d0e..d53d07b 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -8555,11 +8555,10 @@ def find_usages_of_contact_group(name): # Is the contactgroup assigned to a user? users = userdb.load_users() entries = users.items() - entries.sort(cmp = lambda a, b: cmp(a[1].get("alias"), b[1].get("alias"))) - for userid, user in entries: + for userid, user in sorted(entries, key=lambda x: x[1].get("alias", x[0])): cgs = user.get("contactgroups", []) if name in cgs: - used_in.append(('%s: %s' % (_('User'), user.get('alias')), + used_in.append(('%s: %s' % (_('User'), user.get('alias', userid)), folder_preserving_link([('mode', 'edit_user'), ('edit', userid)]))) global_config = load_configuration_settings()

7 years

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: c09ff26808255a04c85812fd9f296db68c6db1b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c09ff26808255a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 7 13:33:23 2017 +0200 Reserved 20 Werk IDS Change-Id: I95b4e57517072ce87375a58c6c0511cd1d6ca437 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index acd8018..85cac58 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5198 +5218

7 years

Reserved 20 bug IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 7f655f10903b701b58435bf242b34e234105f37c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f655f10903b70… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 7 13:14:16 2017 +0200 Reserved 20 bug IDS Change-Id: If0fcfce9921f9712b1e077536653bfd03977c0ea --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 41ecbe3..af7b0ba 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2950 +2970

7 years

5187 FIX WATO sync: Improved error message in case a target site is not running

by Lars Michelsen

Module: check_mk Branch: master Commit: a5ad24371c34ace9f6fa6ec5f364fa09bc864770 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5ad24371c34ac… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 7 10:56:53 2017 +0200 5187 FIX WATO sync: Improved error message in case a target site is not running Change-Id: Ica6e675377995ebf16160670072ca24030fd84d1 --- .werks/5187 | 10 ++++++++++ web/htdocs/watolib.py | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/5187 b/.werks/5187 new file mode 100644 index 0000000..d63288c --- /dev/null +++ b/.werks/5187 @@ -0,0 +1,10 @@ +Title: WATO sync: Improved error message in case a target site is not running +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1504774581 +Class: fix + + diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 992ddca..7398d0e 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4055,8 +4055,12 @@ def get_url(url, insecure, auth=None, data=None, files=None): if response.status_code == 401: raise MKUserError("_passwd", _("Authentication failed. Invalid login/password.")) + + elif response.status_code == 503 and "Site Not Started" in response.text: + raise MKUserError(None, _("Site is not running")) + elif response.status_code != 200: - raise MKUserError("_passwd", _("HTTP Error - %d: %s") % + raise MKUserError(None, _("HTTP Error - %d: %s") % (response.status_code, response.text)) return response.text

7 years

Fixed recently introduced issue activating EC changes

by Lars Michelsen

Module: check_mk Branch: master Commit: 20d3ea93eb72c6206266ff5054185043b102e9b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20d3ea93eb72c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 7 10:53:44 2017 +0200 Fixed recently introduced issue activating EC changes Change-Id: Ie2884e3e7a5d63c542b497975535bd4b29976e47 --- web/htdocs/watolib.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index ae05ecb..992ddca 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -5216,6 +5216,9 @@ class ActivateChangesSite(multiprocessing.Process, ActivateChanges): # Detach from parent (apache) -> Remain running when apache is restarted os.setsid() + # Cleanup existing livestatus connections (may be opened later when needed) + sites.disconnect() + # Cleanup ressources of the apache for x in range(3, 256): try:

7 years

5186 FIX Improved error handling when receiving broken SNMP traps

by Lars Michelsen

Module: check_mk Branch: master Commit: 5eafb64b5247bb68c6a22329e232b1cc2ebffae4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5eafb64b5247bb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 7 10:49:39 2017 +0200 5186 FIX Improved error handling when receiving broken SNMP traps Made it easier to analyze SNMP trap translation issues. By default only a single line is logged to the mkeventd.log. When you enable debug logging in the Event Console settings, you'll see more details about the trap in the mkeventd.log. Change-Id: Ib03c9ed9614fef3b61747e694d76c282aaa01e2e --- .werks/5186 | 13 +++++++++++++ bin/mkeventd | 14 +++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.werks/5186 b/.werks/5186 new file mode 100644 index 0000000..ef82032 --- /dev/null +++ b/.werks/5186 @@ -0,0 +1,13 @@ +Title: Improved error handling when receiving broken SNMP traps +Level: 1 +Component: ec +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1504774062 +Class: fix + +Made it easier to analyze SNMP trap translation issues. By default +only a single line is logged to the mkeventd.log. When you enable +debug logging in the Event Console settings, you'll see more details +about the trap in the mkeventd.log. diff --git a/bin/mkeventd b/bin/mkeventd index 183ad89..e753e84 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -1543,7 +1543,7 @@ class EventServer(object): # Convert pysnmp datatypes to simply handable ones - def snmptrap_translate_varbinds(self, var_bind_list): + def snmptrap_translate_varbinds(self, ipaddress, var_bind_list): var_binds = [] if self._mib_resolver is None: self.logger.warning('Failed to translate OIDs, no modules loaded (see above)') @@ -1573,9 +1573,12 @@ class EventServer(object): var_binds.append((translated_oid, translated_value)) - except SmiError as e: - # Failed to translate? add untranslated - self.logger.exception('Failed to translate OID %s: %s' % (oid.prettyPrint(), e)) + except (SmiError, ValueConstraintError) as e: + self.logger.warning('Failed to translate OID %s (in trap from %s): %s (enable debug logging for details)' % + (oid.prettyPrint(), ipaddress, e)) + self.logger.debug('Failed trap var binds:\n%s' % "\n".join([ "%s: %r" % e for e in var_bind_list ])) + self.logger.debug(traceback.format_exc()) + var_binds.append((str(oid), str(value))) # add untranslated return var_binds @@ -1597,7 +1600,7 @@ class EventServer(object): self.log_snmptrap_details(context_engine_id, context_name, var_binds, ipaddress) if snmptrap_translation_enabled(): - trap = self.snmptrap_translate_varbinds(var_binds) + trap = self.snmptrap_translate_varbinds(ipaddress, var_binds) else: trap = self.snmptrap_convert_var_binds(var_binds) @@ -4901,6 +4904,7 @@ try: from pysnmp.smi.view import MibViewController from pysnmp.smi.rfc1902 import ObjectType, ObjectIdentity from pysnmp.smi.error import SmiError + from pyasn1.error import ValueConstraintError if not g_pipe_path: bail_out("Please specify the path to the pipe (using -P).")

7 years

Ensure etc/bash_completion.d always exists in new sites

by Lars Michelsen

Module: check_mk Branch: master Commit: 6682263ffb0a0481966e222a4623fdca019e81fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6682263ffb0a04… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 7 10:03:55 2017 +0200 Ensure etc/bash_completion.d always exists in new sites Change-Id: Icba1d54e289e7d4bc00327983ce03ca0db11a722 --- omd/packages/omd/skel/etc/bash_completion.d/.gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/omd/packages/omd/skel/etc/bash_completion.d/.gitignore b/omd/packages/omd/skel/etc/bash_completion.d/.gitignore new file mode 100644 index 0000000..e69de29

7 years

Fixed loading of bash completion scripts.

by Sven Panne

Module: check_mk Branch: master Commit: 33b47d928e439db4dec3fe8f058f5063d9157ac0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33b47d928e439d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Sep 7 08:53:58 2017 +0200 Fixed loading of bash completion scripts. Change-Id: Ic229e36ec9dcf39a2ae14eaf25d1858cb1213208 --- omd/packages/omd/skel/.bashrc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/omd/packages/omd/skel/.bashrc b/omd/packages/omd/skel/.bashrc index 84047bc..5301c5a 100644 --- a/omd/packages/omd/skel/.bashrc +++ b/omd/packages/omd/skel/.bashrc @@ -25,8 +25,14 @@ if [ "$PS1" ]; then . /etc/bash_completion # Load site specific bash completions - for file in $OMD_ROOT/etc/bash_completion.d/*; do - . $file; - done + j="$OMD_ROOT/etc/bash_completion.d" + if [ -d "$j" -a -r "$j" -a -x "$j" ]; then + for i in $(LC_ALL=C command ls "$j"); do + i="$j/$i" + [ -f $i -a -r $i ] && . "$i" + done + unset i + fi + unset j fi fi

7 years

Updated bug entries #2556

by Lars Michelsen

Module: check_mk Branch: master Commit: 439108d16b12b31989bf84fa6a3871696c8e2371 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=439108d16b12b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 6 16:41:18 2017 +0200 Updated bug entries #2556 Change-Id: I63e5589148a7c65de89cdcbfc12819596f533824 --- .bugs/2556 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2556 b/.bugs/2556 index 0015600..34f30d3 100644 --- a/.bugs/2556 +++ b/.bugs/2556 @@ -1,9 +1,9 @@ Title: Rework setting of environment variables in whole OMD context Component: core -State: open +Class: bug +State: closed Date: 2017-06-12 09:45:35 Targetversion: 1.5.0 -Class: bug Environment variables should only be set in ~/.profile and will then be inherited by all sub- and subsubprocesses. It @@ -21,3 +21,6 @@ All variables should be set just in two places: All other scripts such auch etc/init.d/* should simply rely on correct inheritance. + +2017-09-06 16:40:51: changed state open -> closed +duplicate of #2906. Closing this one.

7 years

← Newer
1
...
18
19
20
21
22
23
24
25
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2017