Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

5515 Allow Configuration of TMPDIR environment variable in the context of Check_MK Agent

by Andreas Umbreit

Module: check_mk Branch: master Commit: 5d527294c092d833c5b667b33ed265b3fa9c898b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d527294c092d8… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Mon Oct 22 12:24:57 2018 +0200 5515 Allow Configuration of TMPDIR environment variable in the context of Check_MK Agent It is now possible so set the environment variable TMPDIR in the context of the execution of the Check_MK Agent. This can be configured within the Agent ruleset "Installation paths for agent files (Linux, UNIX). Some agent commands or plugins may follow the environment variable TMPDIR for storage of temporary files. For some reasons, you might want to adapt this path. Namely, the agent updater won't work with a "\tmp" dir that is mounted with a "noexec"-flag. Please note that the Check_MK Agent does no automatic cleaning on this custom path. (Jira: FEED-3010) Change-Id: I80b5fb36dda16a2c4d6e48a8f307bdfabae37cec --- .werks/5515 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.werks/5515 b/.werks/5515 new file mode 100644 index 0000000..0c3a5de --- /dev/null +++ b/.werks/5515 @@ -0,0 +1,19 @@ +Title: Allow Configuration of TMPDIR environment variable in the context of Check_MK Agent +Level: 1 +Component: agents +Class: feature +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1540199339 + +It is now possible so set the environment variable TMPDIR in the context of the execution +of the Check_MK Agent. This can be configured within the Agent ruleset "Installation paths +for agent files (Linux, UNIX). + + +Some agent commands or plugins may follow the environment variable TMPDIR for storage of +temporary files. For some reasons, you might want to adapt this path. Namely, the agent +updater won't work with a "\tmp" dir that is mounted with a "noexec"-flag. Please note +that the Check_MK Agent does no automatic cleaning on this custom path.

5 years, 8 months

FEED-3010: Add tempdir config to agent installation paths rule

by Andreas Umbreit

Module: check_mk Branch: master Commit: 60cedcd76b9c40649afec54d307a0f1c60704488 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60cedcd76b9c40… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Tue Oct 23 08:58:04 2018 +0200 FEED-3010: Add tempdir config to agent installation paths rule The environment variable TEMPDIR can now be set for agent execution within the ruleset "Installation paths for agent". The env var will also be set for the start-script of cmk-update-agent located at /usr/bin. The main reason for this config entry is that the user can workaround issues with running cmk-update-agent with the /tmp directory mounted using a noexec-flag. Change-Id: Iea2f4727b32303e66ed90b382b5b90f43689cda8 --- agents/check_mk_agent.aix | 3 +++ agents/check_mk_agent.freebsd | 2 ++ agents/check_mk_agent.hpux | 3 +++ agents/check_mk_agent.linux | 3 +++ agents/check_mk_agent.macosx | 3 +++ agents/check_mk_agent.netbsd | 3 +++ agents/check_mk_agent.openbsd | 3 +++ agents/check_mk_agent.openwrt | 3 +++ agents/check_mk_agent.solaris | 3 +++ 9 files changed, 26 insertions(+) diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 810060f..e067df4 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,6 +38,9 @@ export MK_LIBDIR=${MK_LIBDIR:-/usr/check_mk/lib} export MK_CONFDIR=${MK_CONFDIR:-/usr/check_mk/conf} export MK_VARDIR=${MK_VARDIR:-/tmp/check_mk} +# Optionally set a tempdir for all subsequent calls +#export TMPDIR= + # All executables in PLUGINSDIR will simply be executed and their # ouput appended to the output of the agent. Plugins define their own # sections and must output headers with '<<<' and '>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 33e3d8d..e097643 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -45,6 +45,8 @@ export MK_LIBDIR="/usr/local/lib/check_mk_agent" export MK_CONFDIR="/etc/check_mk" export MK_TMPDIR="/var/run/check_mk" +# Optionally set a tempdir for all subsequent calls +#export TMPDIR= # Make sure, locally installed binaries are found PATH=$PATH:/usr/local/bin:/usr/local/sbin diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 4fe3ddd..c364db5 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -29,6 +29,9 @@ export PATH=$PATH:/usr/sbin:/usr/bin:/usr/contrib/bin export MK_LIBDIR="/usr/lib/check_mk_agent" export MK_CONFDIR="/etc/check_mk" +# Optionally set a tempdir for all subsequent calls +#export TMPDIR= + # All executables in PLUGINSDIR will simply be executed and their # ouput appended to the output of the agent. Plugins define their own # sections and must output headers with '<<<' and '>>>' diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 13ee884..d8d92f8 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -32,6 +32,9 @@ export MK_LIBDIR=${MK_LIBDIR:-/usr/lib/check_mk_agent} export MK_CONFDIR=${MK_CONFDIR:-/etc/check_mk} export MK_VARDIR=${MK_VARDIR:-/var/lib/check_mk_agent} +# Optionally set a tempdir for all subsequent calls +#export TMPDIR= + # Provide information about the remote host. That helps when data # is being sent only once to each remote host. if [ "$REMOTE_HOST" ] ; then diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 95e5580..20bcfcc 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -34,6 +34,9 @@ unset LANG export MK_LIBDIR="/to/be/changed" export MK_CONFDIR="/to/be/changed" +# Optionally set a tempdir for all subsequent calls +#export TMPDIR= + # close standard input (for security reasons) and stderr if [ "$1" = -d ] then diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index bf60f7c..25b3b36 100755 --- a/agents/check_mk_agent.netbsd +++ b/agents/check_mk_agent.netbsd @@ -37,6 +37,9 @@ unset LANG export MK_LIBDIR="/change/me/" export MK_CONFDIR="/change/me" +# Optionally set a tempdir for all subsequent calls +#export TMPDIR= + # Make sure, locally installed binaries are found PATH=$PATH:/usr/pkg/bin diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index b8263c5..945ff5a 100755 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -37,6 +37,9 @@ unset LANG export MK_LIBDIR="/usr/lib/check_mk_agent" export MK_CONFDIR="/etc" +# Optionally set a tempdir for all subsequent calls +#export TMPDIR= + # Make sure, locally installed binaries are found PATH=$PATH:/usr/local/bin diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 8bba808..331b93c 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -32,6 +32,9 @@ export MK_LIBDIR="/usr/lib/check_mk_agent" export MK_CONFDIR="/etc/check_mk" export MK_VARDIR="/var/lib/check_mk_agent" +# Optionally set a tempdir for all subsequent calls +#export TMPDIR= + # Provide information about the remote host. That helps when data # is being sent only once to each remote host. if [ "$REMOTE_HOST" ] ; then diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 53062c5..5810ee2 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -32,6 +32,9 @@ export MK_LIBDIR=${MK_LIBDIR:-/usr/lib/check_mk_agent} export MK_CONFDIR=${MK_CONFDIR:-/etc/check_mk} export MK_VARDIR=${MK_VARDIR:-/var/lib/check_mk_agent} +# Optionally set a tempdir for all subsequent calls +#export TMPDIR= + # All executables in PLUGINSDIR will simply be executed and their # ouput appended to the output of the agent. Plugins define their own # sections and must output headers with '<<<' and '>>>'

5 years, 8 months

6844 FIX mknotifyd: Fixed parse exception when failed to open listen socket

by Lars Michelsen

Module: check_mk Branch: master Commit: 7d54a2b121d64a17cf2815442f71e6ebe9344419 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d54a2b121d64a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Oct 20 19:23:00 2018 +0200 6844 FIX mknotifyd: Fixed parse exception when failed to open listen socket When a mknotifyd instance fails to open it's listen socket the parse function of the check was unable to process the agent output of the mknotifyd. This resulted in a crash, e.g. during service discovery. Change-Id: I194ae70a2f7914750e9e96cb4a25c2c19e93f9eb --- .werks/6844 | 13 +++++++++++++ checks/mknotifyd | 6 ++++++ 2 files changed, 19 insertions(+) diff --git a/.werks/6844 b/.werks/6844 new file mode 100644 index 0000000..5f72064 --- /dev/null +++ b/.werks/6844 @@ -0,0 +1,13 @@ +Title: mknotifyd: Fixed parse exception when failed to open listen socket +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1540056102 + +When a mknotifyd instance fails to open it's listen socket the parse +function of the check was unable to process the agent output of the +mknotifyd. This resulted in a crash, e.g. during service discovery. diff --git a/checks/mknotifyd b/checks/mknotifyd index 9601903..924462f 100644 --- a/checks/mknotifyd +++ b/checks/mknotifyd @@ -87,6 +87,12 @@ def parse_mknotifyd(info): else: if value == "None": value = None + elif value and varname == "Listening FD": + # May be the listening FD number or an error message + try: + value = int(value.split()[0]) + except ValueError: + pass elif value and varname not in [ "Type", "State",

5 years, 8 months

Cleaned up picking issue of #6669

by Lars Michelsen

Module: check_mk Branch: master Commit: 713f4f753504ee07cf9d86f5150db95c36ca4ab6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=713f4f753504ee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 22 20:33:41 2018 +0200 Cleaned up picking issue of #6669 Change-Id: Id625212444e7678df52f081c37b6ece5acd672a1 --- cmk/gui/userdb.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py index 8b4c8ec..8f7317a 100644 --- a/cmk/gui/userdb.py +++ b/cmk/gui/userdb.py @@ -1158,13 +1158,10 @@ def save_connection_config(connections, base_dir=None): store.save_to_mk_file(os.path.join(base_dir, "user_connections.mk"), "user_connections", connections) - for connector_id, connector_class in user_connector_registry.items(): + for connector_class in user_connector_registry.values(): connector_class.config_changed() #. - - -#. # .-Hooks----------------------------------------------------------------. # | _ _ _ | # | | | | | ___ ___ | | _____ |

5 years, 8 months

6670 FIX SLA: Fixed exception in view when SLA had no service percentage requirement and result summary was shown

by Lars Michelsen

Module: check_mk Branch: master Commit: 011b5f8f2683d3d4828ab2cfcd9451f4ac532c03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=011b5f8f2683d3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 22 20:25:37 2018 +0200 6670 FIX SLA: Fixed exception in view when SLA had no service percentage requirement and result summary was shown Change-Id: I8f7e81f88fc22392718806d5a9f3159eaacc1468 --- .werks/6670 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/6670 b/.werks/6670 new file mode 100644 index 0000000..dc1decc --- /dev/null +++ b/.werks/6670 @@ -0,0 +1,11 @@ +Title: SLA: Fixed exception in view when SLA had no service percentage requirement and result summary was shown +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1540221771 + +

5 years, 8 months

added WK6669

by Andreas Boesl

Module: check_mk Branch: master Commit: 791d611d84799572d60800a2ad61ed0d45625838 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=791d611d847995… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Oct 22 16:22:22 2018 +0200 added WK6669 Change-Id: I31a5be36e05f9b1f8e4b967b9512761224f7d2c5 --- .werks/6669 | 15 +++++++ cmk/gui/plugins/userdb/ldap_connector.py | 71 ++++++++++++++++++++++++++++++-- cmk/gui/plugins/userdb/utils.py | 4 ++ cmk/gui/userdb.py | 3 ++ 4 files changed, 89 insertions(+), 4 deletions(-) diff --git a/.werks/6669 b/.werks/6669 new file mode 100644 index 0000000..314ec3b --- /dev/null +++ b/.werks/6669 @@ -0,0 +1,15 @@ +Title: LDAP connections: Improved performance for "Automatically discover LDAP server" +Level: 1 +Component: multisite +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1540209516 + +The discovery process for the fastet LDAP server could take a large amount of time. +The result of this discovery is now cached, which can considerably increase the performance +during user login and other ldap related queries. + + diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index b93d433..a359558 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -52,6 +52,7 @@ import os import time import copy import sys +import shutil # docs: http://www.python-ldap.org/doc/html/index.html import ldap @@ -254,6 +255,7 @@ class LDAPUserConnector(UserConnector): return conn, None except (ldap.SERVER_DOWN, ldap.TIMEOUT, ldap.LOCAL_ERROR, ldap.LDAPError), e: + self.clear_nearest_dc_cache() if type(e[0]) == dict: msg = e[0].get('info', e[0].get('desc', '')) else: @@ -262,6 +264,7 @@ class LDAPUserConnector(UserConnector): return None, "%s: %s" % (uri, msg) except MKLDAPException, e: + self.clear_nearest_dc_cache() return None, "%s" % e @@ -331,11 +334,17 @@ class LDAPUserConnector(UserConnector): def _discover_nearest_dc(self, domain): + cached_server = self._get_nearest_dc_from_cache() + if cached_server: + self._logger.info(_('Using cached DC %s') % cached_server) + return cached_server + import ad # pylint: disable=import-error locator = ad.Locator() locator.m_logger = self._logger try: server = locator.locate(domain) + self._cache_nearest_dc(server) self._logger.info(' DISCOVERY: Discovered server %r from %r' % (server, domain)) return server except Exception: @@ -345,6 +354,50 @@ class LDAPUserConnector(UserConnector): return domain + def _get_nearest_dc_from_cache(self): + try: + return file(self._nearest_dc_cache_filepath()).read() + except IOError: + pass + + + def _cache_nearest_dc(self, server): + self._logger.debug(_('Caching nearest DC %s') % server) + cmk.store.save_file(self._nearest_dc_cache_filepath(), server) + + + def clear_nearest_dc_cache(self): + if not self._uses_discover_nearest_server(): + return + + try: + os.unlink(self._nearest_dc_cache_filepath()) + except OSError: + pass + + def _nearest_dc_cache_filepath(self): + return os.path.join(self._ldap_caches_filepath(), "nearest_server.%s" % self.id()) + + + @classmethod + def _ldap_caches_filepath(cls): + return os.path.join(cmk.paths.tmp_dir, "ldap_caches") + + + @classmethod + def config_changed(cls): + cls.clear_all_ldap_caches() + + + @classmethod + def clear_all_ldap_caches(cls): + try: + shutil.rmtree(cls._ldap_caches_filepath()) + except OSError, e: + if e.errno != 2: + raise + + # Bind with the default credentials def _default_bind(self, conn): try: @@ -375,10 +428,8 @@ class LDAPUserConnector(UserConnector): def servers(self): - # 'directory_type': ('ad', {'connect_to': ('discover', {'domain': 'corp.de'})}), - connect_method, connect_params = self._config['directory_type'][1]["connect_to"] - - if connect_method == "discover": + connect_params = self._get_connect_params() + if self._uses_discover_nearest_server(): servers = [ self._discover_nearest_dc(connect_params["domain"]) ] else: servers = [ connect_params['server'] ] + connect_params.get('failover_servers', []) @@ -386,6 +437,16 @@ class LDAPUserConnector(UserConnector): return servers + def _uses_discover_nearest_server(self): + # 'directory_type': ('ad', {'connect_to': ('discover', {'domain': 'corp.de'})}), + return self._config['directory_type'][1]["connect_to"][0] == "discover" + + + def _get_connect_params(self): + # 'directory_type': ('ad', {'connect_to': ('discover', {'domain': 'corp.de'})}), + return self._config['directory_type'][1]["connect_to"][1] + + def use_ssl(self): return 'use_ssl' in self._config @@ -563,6 +624,8 @@ class LDAPUserConnector(UserConnector): 'incomplete results. You should change the scope of operation ' 'within the ldap or adapt the limit settings of the LDAP server.')) except (ldap.SERVER_DOWN, ldap.TIMEOUT, MKLDAPException), e: + self.clear_nearest_dc_cache() + last_exc = e if implicit_connect and tries_left: self._logger.info(' Received %r. Retrying with clean connection...' % e) diff --git a/cmk/gui/plugins/userdb/utils.py b/cmk/gui/plugins/userdb/utils.py index 6364b77..224114b 100644 --- a/cmk/gui/plugins/userdb/utils.py +++ b/cmk/gui/plugins/userdb/utils.py @@ -69,6 +69,10 @@ class UserConnector(object): raise NotImplementedError() + @classmethod + def config_changed(cls): + return + # # USERDB API METHODS # diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py index b5831f5..8b4c8ec 100644 --- a/cmk/gui/userdb.py +++ b/cmk/gui/userdb.py @@ -1158,6 +1158,9 @@ def save_connection_config(connections, base_dir=None): store.save_to_mk_file(os.path.join(base_dir, "user_connections.mk"), "user_connections", connections) + for connector_id, connector_class in user_connector_registry.items(): + connector_class.config_changed() + #.

5 years, 8 months

Cleaned up background job registration

by Lars Michelsen

Module: check_mk Branch: master Commit: 99fc83a9071e9277ea6531acff0901782749e31b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99fc83a9071e92… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 22 08:23:03 2018 +0200 Cleaned up background job registration * The background job plugins are now registered using our standard plugin registry * Simplified some subclass iteration on the way Change-Id: I641ee7a6d85ccc6ed3878959809b1b17267415b0 --- cmk/gui/gui_background_job.py | 27 +++++++++------------------ cmk/gui/plugins/cron/gui_background_job.py | 2 +- cmk/gui/plugins/wato/background_job.py | 14 +++----------- cmk/gui/userdb.py | 1 + cmk/gui/wato/__init__.py | 1 + cmk/gui/wato/pages/bulk_discovery.py | 2 ++ cmk/gui/wato/pages/host_rename.py | 3 +++ 7 files changed, 20 insertions(+), 30 deletions(-) diff --git a/cmk/gui/gui_background_job.py b/cmk/gui/gui_background_job.py index ada2388..937482d 100644 --- a/cmk/gui/gui_background_job.py +++ b/cmk/gui/gui_background_job.py @@ -36,6 +36,7 @@ import cmk.gui.sites as sites import cmk.gui.config as config import cmk.gui.log as log import cmk.gui.background_job as background_job +import cmk.gui.plugin_registry loaded_with_language = False def load_plugins(force): @@ -197,25 +198,18 @@ class GUIBackgroundJob(GUIBackgroundJobSnapshottedFunctions): return None - @classmethod - def get_concrete_subclasses(cls): - # Note: Due to the strange execfile plugin mechanism, there is a risk - # that a class gets declared multiple times. We always use the last - # declaration of the given class - classes = {} - for subclass in cls.__subclasses__(): # pylint: disable=no-member - classes[subclass.__name__] = subclass - all_subclasses = [] - for subclass in classes.values(): - # Concrete subclasses have an attribute job_prefix - if hasattr(subclass, "job_prefix"): - all_subclasses.append(subclass) - all_subclasses.extend(subclass.get_concrete_subclasses()) +class GUIBackgroundJobRegistry(cmk.gui.plugin_registry.ClassRegistry): + def plugin_base_class(self): + return GUIBackgroundJob + - return all_subclasses + def _register(self, plugin_class): + self._entries[plugin_class.__name__] = plugin_class +job_registry = GUIBackgroundJobRegistry() + # GUI pages are built in several phases, and each face can take a non-trivial # amount of time. Nevertheless, it is crucial to render a consistent state of @@ -277,9 +271,6 @@ class GUIBackgroundJobManager(background_job.BackgroundJobManager): def show_status_of_job_classes(self, job_classes, **kwargs): job_class_infos = {} for job_class in job_classes: - if not hasattr(job_class, "job_prefix"): - # Skip abstract classes - continue all_job_ids = self.get_all_job_ids(job_class) jobs_info = self._get_job_infos(all_job_ids) job_class_infos[job_class] = jobs_info diff --git a/cmk/gui/plugins/cron/gui_background_job.py b/cmk/gui/plugins/cron/gui_background_job.py index fd8cf10..f995ee3 100644 --- a/cmk/gui/plugins/cron/gui_background_job.py +++ b/cmk/gui/plugins/cron/gui_background_job.py @@ -32,7 +32,7 @@ from cmk.gui.log import logger from . import register_job def housekeeping(): - housekeep_classes = gui_background_job.GUIBackgroundJob.get_concrete_subclasses() + housekeep_classes = gui_background_job.job_registry.values() cmk.gui.background_job.BackgroundJobManager(logger).do_housekeeping(housekeep_classes) register_job(housekeeping) diff --git a/cmk/gui/plugins/wato/background_job.py b/cmk/gui/plugins/wato/background_job.py index 6f68ec5..e47a032 100644 --- a/cmk/gui/plugins/wato/background_job.py +++ b/cmk/gui/plugins/wato/background_job.py @@ -66,20 +66,12 @@ class ModeBackgroundJobsOverview(WatoMode): def page(self): job_manager = gui_background_job.GUIBackgroundJobManager() - jobs_running = False back_url = html.makeuri_contextless([("mode", "background_jobs_overview")]) - job_manager.show_status_of_job_classes(gui_background_job.GUIBackgroundJob.get_concrete_subclasses(), job_details_back_url=back_url) + job_manager.show_status_of_job_classes(gui_background_job.job_registry.values(), job_details_back_url=back_url) - for job_class in gui_background_job.GUIBackgroundJob.get_concrete_subclasses(): - if not hasattr(job_class, "job_prefix"): - # Skip abstract classes - continue - - if job_manager.get_running_job_ids(job_class): - jobs_running = True - - if jobs_running: + if any(job_manager.get_running_job_ids(c) + for c in gui_background_job.job_registry.values()): html.javascript("set_reload(0.8)") diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py index ba2cb15..b5831f5 100644 --- a/cmk/gui/userdb.py +++ b/cmk/gui/userdb.py @@ -1317,6 +1317,7 @@ def ajax_sync(): html.write('ERROR %s\n' % e) +(a)gui_background_job.job_registry.register class UserSyncBackgroundJob(gui_background_job.GUIBackgroundJob): job_prefix = "user_sync" gui_title = _("User synchronization") diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 8f6562d..8715412 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -2328,6 +2328,7 @@ class PageFetchAgentOutput(AgentOutputPage): +(a)gui_background_job.job_registry.register class FetchAgentOutputBackgroundJob(WatoBackgroundJob): job_prefix = "agent-output-" gui_title = _("Fetch agent output") diff --git a/cmk/gui/wato/pages/bulk_discovery.py b/cmk/gui/wato/pages/bulk_discovery.py index 9ff0949..88772a7 100644 --- a/cmk/gui/wato/pages/bulk_discovery.py +++ b/cmk/gui/wato/pages/bulk_discovery.py @@ -40,6 +40,7 @@ from cmk.gui.log import logger from cmk.gui.exceptions import MKUserError from cmk.gui.i18n import _ from cmk.gui.globals import html +import cmk.gui.gui_background_job as gui_background_job from cmk.gui.plugins.wato import ( WatoMode, @@ -51,6 +52,7 @@ DiscoveryTask = namedtuple("DiscoveryTask", ["site_id", "folder_path", "host_nam # TODO: This job should be executable multiple times at once +(a)gui_background_job.job_registry.register class BulkDiscoveryBackgroundJob(WatoBackgroundJob): job_prefix = "bulk_discovery" gui_title = _("Bulk Discovery") diff --git a/cmk/gui/wato/pages/host_rename.py b/cmk/gui/wato/pages/host_rename.py index c65e06a..81da4de 100644 --- a/cmk/gui/wato/pages/host_rename.py +++ b/cmk/gui/wato/pages/host_rename.py @@ -38,6 +38,7 @@ import cmk.gui.watolib as watolib import cmk.gui.userdb as userdb import cmk.gui.forms as forms import cmk.gui.background_job as background_job +import cmk.gui.gui_background_job as gui_background_job from cmk.gui.htmllib import HTML from cmk.gui.exceptions import MKUserError, MKGeneralException, MKAuthException from cmk.gui.i18n import _ @@ -65,6 +66,7 @@ from cmk.gui.plugins.wato import ( ) +(a)gui_background_job.job_registry.register class RenameHostsBackgroundJob(watolib.WatoBackgroundJob): gui_title = _("Host renaming") job_prefix = "rename-hosts" @@ -91,6 +93,7 @@ class RenameHostsBackgroundJob(watolib.WatoBackgroundJob): +(a)gui_background_job.job_registry.register class RenameHostBackgroundJob(RenameHostsBackgroundJob): def __init__(self, host, title=None): super(RenameHostBackgroundJob, self).__init__(title)

5 years, 8 months

6752 FIX New Theme: Make the reload Button for passive Checks in grayscale again

by Marcel Arentz

Module: check_mk Branch: master Commit: 4bd5107f0daa00be00ec3b294348f9a100154f0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bd5107f0daa00… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Oct 19 12:02:03 2018 +0200 6752 FIX New Theme: Make the reload Button for passive Checks in grayscale again The icon is in grayscale again for better highlighting, that this service is passive. Change-Id: I4788a0a9fce174b7ef6f53c143607cb13b057d3a --- .werks/6752 | 11 +++++++++++ web/htdocs/themes/facelift/images/icon_reload_cmk.png | Bin 1791 -> 1642 bytes 2 files changed, 11 insertions(+) diff --git a/.werks/6752 b/.werks/6752 new file mode 100644 index 0000000..e4fd83f --- /dev/null +++ b/.werks/6752 @@ -0,0 +1,11 @@ +Title: New Theme: Make the reload Button for passive Checks in grayscale again +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1539943179 +Class: fix + +The icon is in grayscale again for better highlighting, that this service +is passive. diff --git a/web/htdocs/themes/facelift/images/icon_reload_cmk.png b/web/htdocs/themes/facelift/images/icon_reload_cmk.png index acae853..d30aebb 100644 Binary files a/web/htdocs/themes/facelift/images/icon_reload_cmk.png and b/web/htdocs/themes/facelift/images/icon_reload_cmk.png differ

5 years, 8 months

Fixed broken snapin/minmax icon and simplified code

by Lars Michelsen

Module: check_mk Branch: master Commit: 0029b986739abe5e272443135f97b495a78e9a04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0029b986739abe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 22 07:34:22 2018 +0200 Fixed broken snapin/minmax icon and simplified code Change-Id: Iec80b3855df4dda0a99a5a8dcb50ff7f07652470 --- cmk/gui/sidebar.py | 8 ++------ web/htdocs/js/sidebar.js | 7 ++----- web/htdocs/sidebar.css | 8 +++++--- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/cmk/gui/sidebar.py b/cmk/gui/sidebar.py index 4c0850b..339409b 100644 --- a/cmk/gui/sidebar.py +++ b/cmk/gui/sidebar.py @@ -424,10 +424,8 @@ class SidebarRenderer(object): # When not permitted to open/close snapins, the snapins are always opened if snapin.visible == SnapinVisibility.OPEN or not config.user.may("general.configure_sidebar"): style = None - minimaxi = "mini" else: style = "display:none" - minimaxi = "maxi" toggle_url = "sidebar_openclose.py?name=%s&state=" % name @@ -443,10 +441,8 @@ class SidebarRenderer(object): if config.user.may("general.configure_sidebar"): # Icon for mini/maximizing - html.open_div(class_="minisnapin") - html.icon_button(url=None, title=_("Toggle this snapin"), icon="%ssnapin" % minimaxi, - onclick="toggle_sidebar_snapin(this, '%s')" % toggle_url) - html.close_div() + html.div("", class_="minisnapin", title=_("Toggle this snapin"), + onclick="toggle_sidebar_snapin(this, '%s')" % toggle_url) # Button for closing (removing) a snapin html.open_div(class_="closesnapin") diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 8cdfca9..4d03f28 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -651,19 +651,16 @@ function toggle_sidebar_snapin(oH2, url) { else if (child.tagName == 'DIV' && (child.className == 'head open' || child.className == "head closed")) var oHead = child; } - var oImgMini = oHead.childNodes[0].childNodes[0].childNodes[0]; // FIXME: Does oContent really exist? var closed = oContent.style.display == "none"; if (closed) { oContent.style.display = "block"; - oHead.className = "head open"; - oImgMini.src = "images/button_minisnapin.png"; + change_class(oHead, "closed", "open"); } else { oContent.style.display = "none"; - oHead.className = "head closed"; - oImgMini.src = "images/button_maxisnapin.png"; + change_class(oHead, "open", "closed"); } /* make this persistent -> save */ get_url(url + (closed ? "open" : "closed")); diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 606ba75..852b09a 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -252,11 +252,13 @@ div.snapin div.minisnapin { margin-top: 6px; line-height: 0px; height: 8px; + width: 8px; + cursor: pointer; + background-image: url("images/icon_minisnapin.png"); } -div.snapin div.minisnapin img { - width: 8px; - height: 8px; +div.snapin div.head.closed div.minisnapin { + background-image: url("images/icon_maxisnapin.png"); } div.snapin div.content {

5 years, 8 months

Fixed too much vertical space between view action fields

by Lars Michelsen

Module: check_mk Branch: master Commit: 206feecf2a51c33b68d52fe0ba9ef462c63e853f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=206feecf2a51c3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Oct 20 22:56:17 2018 +0200 Fixed too much vertical space between view action fields Change-Id: I094b014b82f1e644faac53d970c16f18279faf66 --- web/htdocs/themes/facelift/theme.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/themes/facelift/theme.css b/web/htdocs/themes/facelift/theme.css index c3cdfe3..63bbbda 100644 --- a/web/htdocs/themes/facelift/theme.css +++ b/web/htdocs/themes/facelift/theme.css @@ -517,7 +517,7 @@ table { margin: 4px !important; } table.nform hr { background-color: #cccfdb; - margin: 24px 0px; } + margin: 12px 0px; } table.nform td.legend { word-wrap: break-word; } table.nform .ruleset {

5 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2018