Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

Use the new --no-tmpfs option to start without a tmpfs

by Lars Michelsen

Module: check_mk Branch: master Commit: 6daf3ced5295fbead23f931af1373ea8ed04e91f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6daf3ced5295fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 14 19:45:54 2018 +0200 Use the new --no-tmpfs option to start without a tmpfs Change-Id: I1f972f2d6ee7a9a4a5268de08220153c14ea8b57 --- docker/docker-entrypoint.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 314c075..d334c62 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -30,10 +30,9 @@ fi # Create the site in case it does not exist if [ ! -d "/opt/omd/sites/$CMK_SITE_ID" ] ; then echo "### CREATING SITE '$CMK_SITE_ID'" - omd create -u 1000 -g 1000 "$CMK_SITE_ID" + omd create --no-tmpfs -u 1000 -g 1000 "$CMK_SITE_ID" omd config "$CMK_SITE_ID" set APACHE_TCP_ADDR 0.0.0.0 omd config "$CMK_SITE_ID" set APACHE_TCP_PORT 5000 - omd config "$CMK_SITE_ID" set TMPFS off if [ "$CMK_LIVESTATUS_TCP" = "on" ]; then omd config "$CMK_SITE_ID" set LIVESTATUS_TCP on

5 years, 11 months

Add handling of website packages to docker README

by Lars Michelsen

Module: check_mk Branch: master Commit: c45e841fd27e29778c45bfb51fbd7b370a5c593f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c45e841fd27e29… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 14 19:43:42 2018 +0200 Add handling of website packages to docker README Change-Id: I8ebc4cce07462802f0919a9d72d4bc878f5e8b5b --- docker/README.asciidoc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docker/README.asciidoc b/docker/README.asciidoc index 0cecede..1950f83 100644 --- a/docker/README.asciidoc +++ b/docker/README.asciidoc @@ -55,6 +55,23 @@ e.g. during update. |`--restart always` | Always restart the container if it stops. |======================================================================= +[[use-packages-from-our-website]] +Use packages from our Website +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +You may want to use the officially released images from your website, +which you can find on the download page of each version as of version +1.5.0p5. + +Download the file to your docker node and execute the load command: + +.... +docker load -i ~/Downloads/check-mk-enterprise-docker-1.5.0p5.tar.gz +.... + +After a successful import you can start creating containers using the +image `checkmk/check-mk-enterprise:1.5.0p5`. + [[listen-on-http-https-standard-ports]] Listen on HTTP / HTTPS standard ports ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

5 years, 11 months

synchronize_profile_to_sites: Cleanup access to private _logger member

by Lars Michelsen

Module: check_mk Branch: master Commit: 3450067b561a0951394eb222b7982d0f0c6ef1af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3450067b561a09… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 8 08:51:36 2018 +0200 synchronize_profile_to_sites: Cleanup access to private _logger member Change-Id: Ib292a11151bd77eaaad37a6523473514cf6bcf5e --- cmk/gui/plugins/userdb/ldap_connector.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index 7e8e088..40446aa 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -1085,7 +1085,7 @@ class LDAPUserConnector(UserConnector): # Synchronize new user profile to remote sites if needed if pw_changed and not changed and config.has_wato_slave_sites(): - synchronize_profile_to_sites(self, user_id, user) + synchronize_profile_to_sites(self._logger, user_id, user) if changed: for key, (old_value, new_value) in sorted(changed.items()): @@ -1884,15 +1884,17 @@ ldap_attribute_plugins['groups_to_roles'] = { # Hopefully we have no large bulks of users changing their passwords at the same # time. In this case the implementation does not scale well. We would need to # change this to some kind of profile bulk sync per site. -def synchronize_profile_to_sites(connection, user_id, profile): +# TODO: Should we move this to watolib? +def synchronize_profile_to_sites(logger, user_id, profile): import cmk.gui.sites as sites import cmk.gui.watolib as watolib # TODO: Cleanup + # TODO: We only need to do this for login sites! remote_sites = [(site_id, config.site(site_id)) for site_id in config.sitenames() if not config.site_is_local(site_id) ] - connection._logger.info('Credentials changed: %s. Trying to sync to %d sites' % + logger.info('Credentials changed: %s. Trying to sync to %d sites' % (user_id, len(remote_sites))) num_disabled = 0 @@ -1920,11 +1922,11 @@ def synchronize_profile_to_sites(connection, user_id, profile): num_succeeded += 1 else: num_failed += 1 - connection._logger.info(' FAILED [%s]: %s' % (site_id, result)) + logger.info(' FAILED [%s]: %s' % (site_id, result)) # Add pending entry to make sync possible later for admins if config.wato_enabled: watolib.add_change("edit-users", _('Password changed (sync failed: %s)') % result, add_user=False, sites=[site_id], need_restart=False) - connection._logger.info(' Disabled: %d, Succeeded: %d, Failed: %d' % + logger.info(' Disabled: %d, Succeeded: %d, Failed: %d' % (num_disabled, num_succeeded, num_failed))

5 years, 11 months

Removed useless check (ldap is always available these days)

by Lars Michelsen

Module: check_mk Branch: master Commit: d51babb5f5fa257ad7b8e1613373a72a31c42cae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d51babb5f5fa25… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 3 07:44:53 2018 +0200 Removed useless check (ldap is always available these days) Change-Id: I830e632cd0ee5b84e1ba74959fa9521befe1d330 --- cmk/gui/plugins/userdb/ldap_connector.py | 10 ---------- cmk/gui/wato/__init__.py | 2 -- 2 files changed, 12 deletions(-) diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index 26c5792..92f3132 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -108,14 +108,6 @@ class MKLDAPException(MKGeneralException): pass -def ldap_test_module(): - try: - ldap - except: - raise MKLDAPException(_("The python module python-ldap seems to be missing. You need to " - "install this extension to make the LDAP user connector work.")) - - #. # .--UserConnector-------------------------------------------------------. # | _ _ ____ _ | @@ -281,8 +273,6 @@ class LDAPUserConnector(UserConnector): else: self._logger.info('LDAP CONNECT - Connecting...') - ldap_test_module() - # Some major config var validations if not self._config['user_dn']: diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 474c151..681679e 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -6467,8 +6467,6 @@ class ModeLDAPConfig(LDAPMode): def page(self): - cmk.gui.plugins.userdb.ldap_connector.ldap_test_module() - table.begin() for index, connection in enumerate(userdb.load_connection_config()): table.row()

5 years, 11 months

Mark internal methods with underscore; Removed some unused code

by Lars Michelsen

Module: check_mk Branch: master Commit: 69fc8c7d47557cde3accf3fbe44c33c41173b915 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69fc8c7d47557c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 3 08:15:18 2018 +0200 Mark internal methods with underscore; Removed some unused code Change-Id: I6fb9b66639ec86aa3c54aeffcf673b0f146ff4a7 --- cmk/gui/plugins/userdb/ldap_connector.py | 217 ++++++++++++--------------- tests/unit/web/test_userdb_ldap_connector.py | 16 ++ 2 files changed, 116 insertions(+), 117 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=69fc8c7d47…

5 years, 11 months

LDAP: Moved ldap connection valuespec to dedicated valuespec class

by Lars Michelsen

Module: check_mk Branch: master Commit: 1dd950564f2338a7066b85b5cfa5f276427d6328 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dd950564f2338… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 9 08:46:52 2018 +0200 LDAP: Moved ldap connection valuespec to dedicated valuespec class Change-Id: I9b72684564577b9c9ae1346d6aa48fedaed7372a --- cmk/gui/wato/__init__.py | 196 ++++++++++++++++++++++++++++------------------- 1 file changed, 117 insertions(+), 79 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1dd950564f…

5 years, 11 months

Moved LDAPConnectionValuespec to ldap connector module

by Lars Michelsen

Module: check_mk Branch: master Commit: 3e03b53a21bb09a112d3ece8bda8190e2c02f6e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e03b53a21bb09… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 9 08:59:14 2018 +0200 Moved LDAPConnectionValuespec to ldap connector module Change-Id: I17837693648f4c7626b616ef2df1a0bac5ece64f --- cmk/gui/plugins/userdb/ldap_connector.py | 438 +++++++++++++++++++++++++++++++ cmk/gui/wato/__init__.py | 422 +---------------------------- 2 files changed, 439 insertions(+), 421 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3e03b53a21…

5 years, 11 months

6430 FIX LDAP: Sync detected password changes only to login sites

by Lars Michelsen

Module: check_mk Branch: master Commit: ec75090ee1ab5a7ef996a8125fd147bd4be6ba7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec75090ee1ab5a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 8 08:55:09 2018 +0200 6430 FIX LDAP: Sync detected password changes only to login sites This is a minor performance improvement. The number of destination sites a user profile is synchronized to in case a password change is detected in LDAP is reduced to the sites where access to the GUI is allowed. Change-Id: I7a088fe629a9ade5318ed22669c79edcb7a2506b --- .werks/6430 | 12 ++++++++++++ cmk/gui/plugins/userdb/ldap_connector.py | 4 +--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/6430 b/.werks/6430 new file mode 100644 index 0000000..0c81e7c --- /dev/null +++ b/.werks/6430 @@ -0,0 +1,12 @@ +Title: LDAP: Sync detected password changes only to login sites +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1533711208 +Class: fix + +This is a minor performance improvement. The number of destination sites +a user profile is synchronized to in case a password change is detected +in LDAP is reduced to the sites where access to the GUI is allowed. diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index 40446aa..f66cce8 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -1889,10 +1889,8 @@ def synchronize_profile_to_sites(logger, user_id, profile): import cmk.gui.sites as sites import cmk.gui.watolib as watolib # TODO: Cleanup - # TODO: We only need to do this for login sites! remote_sites = [(site_id, config.site(site_id)) - for site_id in config.sitenames() - if not config.site_is_local(site_id) ] + for site_id in config.get_login_sites() ] logger.info('Credentials changed: %s. Trying to sync to %d sites' % (user_id, len(remote_sites)))

5 years, 11 months

Add missing log_level setting during tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 05c4737253cc2bd43a1e83a39cc7c8547b492248 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05c4737253cc2b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 26 10:38:39 2018 +0200 Add missing log_level setting during tests Change-Id: If9df26967f3c2291c044a79db076e1d5b106bf26 --- cmk/ec/main.py | 3 ++- tests/testlib/__init__.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index d5970e0..01fbf07 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -3917,9 +3917,10 @@ def load_configuration(settings, logger, slave_status): levels = config["log_level"] logger.setLevel(levels["cmk.mkeventd"]) logger.getChild("EventServer").setLevel(levels["cmk.mkeventd.EventServer"]) + if "cmk.mkeventd.EventServer.snmp" in levels: + logger.getChild("EventServer.snmp").setLevel(levels["cmk.mkeventd.EventServer.snmp"]) logger.getChild("EventStatus").setLevel(levels["cmk.mkeventd.EventStatus"]) logger.getChild("StatusServer").setLevel(levels["cmk.mkeventd.StatusServer"]) - logger.getChild("EventServer.snmp").setLevel(levels["cmk.mkeventd.EventServer.snmp"]) logger.getChild("lock").setLevel(levels["cmk.mkeventd.lock"]) # Are we a replication slave? Parts of the configuration diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 8c4f081..8e54bc7 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -662,6 +662,7 @@ class Site(object): "log_level = %r\n" % { 'cmk.mkeventd': 10, 'cmk.mkeventd.EventServer': 10, + 'cmk.mkeventd.EventServer.snmp': 10, 'cmk.mkeventd.EventStatus': 10, 'cmk.mkeventd.StatusServer': 10, 'cmk.mkeventd.lock': 20

5 years, 11 months

6718 FIX Fixed invalid exception handling when unable to initialize the Event Console

by Lars Michelsen

Module: check_mk Branch: master Commit: 2690c6bad2d2880206ecfb049f9e9211395dfe7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2690c6bad2d288… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 26 09:40:17 2018 +0200 6718 FIX Fixed invalid exception handling when unable to initialize the Event Console When an exception occurs before the configuration was read during initialization of the Event Console a subsequent exception could occur during shutdown of the Event Console process. The exception message looked like this: local variable 'pid_path' referenced before assignment Change-Id: Ie7f4aabef74eb3e450b5cd2b8ce0572aa5a49e8f --- .werks/6718 | 15 +++++++++++++++ cmk/ec/main.py | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/6718 b/.werks/6718 new file mode 100644 index 0000000..d50da38 --- /dev/null +++ b/.werks/6718 @@ -0,0 +1,15 @@ +Title: Fixed invalid exception handling when unable to initialize the Event Console +Level: 1 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1537947519 + +When an exception occurs before the configuration was read during initialization +of the Event Console a subsequent exception could occur during shutdown of the +Event Console process. The exception message looked like this: + +local variable 'pid_path' referenced before assignment diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 20ab2d7..d5970e0 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -3971,6 +3971,7 @@ def main(): pathlib.Path(cmk.paths.default_config_dir), sys.argv) + pid_path = None try: cmk.log.open_log(sys.stderr) cmk.log.set_verbosity(settings.options.verbosity) @@ -4072,7 +4073,7 @@ def main(): bail_out(logger, traceback.format_exc()) finally: - if cmk.store.have_lock(str(pid_path)): + if pid_path and cmk.store.have_lock(str(pid_path)): try: pid_path.unlink() except OSError:

5 years, 11 months

← Newer
1
...
5
6
7
8
9
10
11
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018