Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

by Marcel Arentz

Module: check_mk Branch: master Commit: a7bfd9b465d11a9a11fe085436c8601e050e9eec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7bfd9b465d11a… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Sep 6 17:48:47 2017 +0200 added bug regarding user modification Change-Id: I891c6f85fd2821317004a4a2182b59379a465746 --- .bugs/2514 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2514 b/.bugs/2514 new file mode 100644 index 0000000..9984fbe8 --- /dev/null +++ b/.bugs/2514 @@ -0,0 +1,9 @@ +Title: WATO edit user: View not usable anymore if passwords do not match +Component: wato +State: open +Date: 2017-09-06 17:44:23 +Targetversion: 1.5.0 +Class: nastiness + +The "save"-Button and many options disappear if the entered password does +not match with it's repeated. All content after "Idle timeout" is gone.

7 years

5140 FIX WATO Web API: add_users/edit_users: now able to set password attribute

by Andreas Boesl

Module: check_mk Branch: master Commit: 2317b16588796dcaff2e89277f4952138cb93e2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2317b16588796d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 6 16:00:56 2017 +0200 5140 FIX WATO Web API: add_users/edit_users: now able to set password attribute Fixed incorrect processing of the password attribute. The Web API expects the password attribute as plain text and encrypts it subsequently. Change-Id: I621a871f4950af77582acef8239e8ae553556498 --- .werks/5140 | 11 +++++++++++ web/plugins/webapi/webapi.py | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/.werks/5140 b/.werks/5140 new file mode 100644 index 0000000..481b35f --- /dev/null +++ b/.werks/5140 @@ -0,0 +1,11 @@ +Title: WATO Web API: add_users/edit_users: now able to set password attribute +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1504706281 +Class: fix + +Fixed incorrect processing of the password attribute. +The Web API expects the password attribute as plain text and encrypts it subsequently. diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index c77b1f8..06c65a8 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -537,6 +537,7 @@ register_group_apis() # Otherwise, group_type is known in the global scope.. # | | # +----------------------------------------------------------------------+ + def action_get_all_users(request): validate_request_keys(request, []) all_users = userdb.load_users(lock = False) @@ -571,6 +572,10 @@ def action_add_users(request): new_user_objects = {} for user_id, values in users_from_request.items(): user_template = userdb.new_user_template("htpasswd") + if "password" in values: + values["password"] = userdb.encrypt_password(values["password"]) + values["serial"] = 1 + user_template.update(values) new_user_objects[user_id] = {"attributes": user_template, "is_new_user": True} @@ -609,6 +614,12 @@ def action_edit_users(request): if entry not in user_attrs: continue del user_attrs[entry] + + new_password = settings.get("set_attributes", {}).get("password") + if new_password: + user_attrs["password"] = userdb.encrypt_password(new_password) + user_attrs["serial"] = user_attrs.get("serial", 0) + 1 + edit_user_objects[user_id] = {"attributes": user_attrs, "is_new_user": False} watolib.edit_users(edit_user_objects)

7 years

Updated bug entries #2938

by Lars Michelsen

Module: check_mk Branch: master Commit: 3be3abcfc2c87ad018b8302e806ff0b4ebd9c0a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3be3abcfc2c87a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 6 08:37:32 2017 +0200 Updated bug entries #2938 Change-Id: I8cca54e9b16e5df8fb2a7fba0b030cc20a88a8c0 --- .bugs/2938 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.bugs/2938 b/.bugs/2938 index 9f20ff3..214be34 100644 --- a/.bugs/2938 +++ b/.bugs/2938 @@ -1,9 +1,9 @@ Title: Automatic baking agents options breaks activation of changes in distributed setups Component: wato -State: open +Class: bug +State: done Date: 2017-07-18 18:43:49 Targetversion: 1.2.8 -Class: bug If the option autimatic bake agents is activated in distributed setups, the agents will be build on slave sites. That will break the activation of @@ -12,3 +12,9 @@ changes on thsi slave site. This option should only applied to the master site and have to be ignored on slave sites. Workaround: Deactivate this option again. + +2017-09-06 08:37:30: changed state open -> done +Fixed for 1.4.0 and master. + +For 1.2.8 use the workaround to either disable this option at all or +disable the option in the site specific global settings for the slave sites.

7 years

5185 FIX Check_MK HW/SW Inventory: The service was executed too often by default

by Lars Michelsen

Module: check_mk Branch: master Commit: b0ae55862e694d25366bded09f1f6306b8dde5c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0ae55862e694d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 6 14:49:00 2017 +0200 5185 FIX Check_MK HW/SW Inventory: The service was executed too often by default Issue: The HW/SW inventory may produce a lot of load because of wrong scheduling. You may be affected by this bug in case you created your (master) site with 1.4.0b1 or newer. If you updated your site from older versions you are likely not affected. Slave sites that get their configuration from a master that is not affected will also not be affected, regardless of the version they were created with. When using the hardware software inventory the regular check "Check_MK HW/SW Inventory" on each host is executed too often by default. The expected behaviour is that the regular check interval of this service is 1 day. The bug we fixed now made the check being executed once a minute. In case you have the HW/SW inventory enabled for a lot of hosts, this could lead to significant load on your Check_MK server. Whether or not you have this issue can be checked on the "service detail" page of the "Check_MK HW/SW Inventory" service. Have a look at the "Service normal/retry check interval" column where you should see 86400s as first value (-> 1 day). If you see a value of 60s, you should fix the issue as follows. <ul> <li>Navigate to "WATO > Host & Service parameters > Monitoring configuration > Normal check interval for service checks".</li> <li>Create a new rule with the following settings:</li> <li>Description: Restrict HW/SW-Inventory to once a day</li> <li>Value: 1 day</li> <li>Services: <tt>Check_MK HW/SW Inventory$</tt></li> <li>Activate the changes via WATO</li> <li> After this you should check the service detail page again and see the 86400s interval. Even when you update your existing site to 1.4.0p11 or newer, you will have to apply the fix manually to existing installations when your installation is affected. Sites created with 1.4.0p11 or newer won't be affected. Change-Id: Iaf50c46d1c92a73e0051e35b1bba54508eab51f6 --- .werks/5185 | 43 +++++++++++++++++++++++++++++++++++++++++++ web/htdocs/wato.py | 8 +++++--- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/.werks/5185 b/.werks/5185 new file mode 100644 index 0000000..24a4591 --- /dev/null +++ b/.werks/5185 @@ -0,0 +1,43 @@ +Title: Check_MK HW/SW Inventory: The service was executed too often by default +Level: 2 +Component: inv +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1504701323 + +Issue: The HW/SW inventory may produce a lot of load because of wrong scheduling. + +You may be affected by this bug in case you created your (master) site with 1.4.0b1 +or newer. If you updated your site from older versions you are likely not affected. +Slave sites that get their configuration from a master that is not affected will also +not be affected, regardless of the version they were created with. + +When using the hardware software inventory the regular check "Check_MK HW/SW Inventory" +on each host is executed too often by default. The expected behaviour is that the regular +check interval of this service is 1 day. The bug we fixed now made the check being executed +once a minute. In case you have the HW/SW inventory enabled for a lot of hosts, this could +lead to significant load on your Check_MK server. + +Whether or not you have this issue can be checked on the "service detail" page of the +"Check_MK HW/SW Inventory" service. Have a look at the "Service normal/retry check interval" +column where you should see 86400s as first value (-> 1 day). If you see a value of 60s, you +should fix the issue as follows. + +<ul> +<li>Navigate to "WATO > Host & Service parameters > Monitoring configuration > Normal check +interval for service checks".</li> +<li>Create a new rule with the following settings:</li> +<li>Description: Restrict HW/SW-Inventory to once a day</li> +<li>Value: 1 day</li> +<li>Services: <tt>Check_MK HW/SW Inventory$</tt></li> +<li>Activate the changes via WATO</li> +<li> + +After this you should check the service detail page again and see the 86400s interval. + +Even when you update your existing site to 1.4.0p11 or newer, you will have to apply the fix +manually to existing installations when your installation is affected. +Sites created with 1.4.0p11 or newer won't be affected. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 08ffc9c..7501ad1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14765,9 +14765,11 @@ def create_sample_config(): ], # Interval for HW/SW-Inventory check - 'extra_service_conf:check_interval': [ - ( 1440, [], ALL_HOSTS, [ "Check_MK HW/SW Inventory$" ], {'description': u'Restrict HW/SW-Inventory to once a day'} ), - ], + 'extra_service_conf': { + 'check_interval': [ + ( 1440, [], ALL_HOSTS, [ "Check_MK HW/SW Inventory$" ], {'description': u'Restrict HW/SW-Inventory to once a day'} ), + ], + }, # Periodic service discovery 'periodic_discovery': [

7 years

Some minor code formating

by Lars Michelsen

Module: check_mk Branch: master Commit: adfc9a2a382d96ba8bd76e09c38055e2112dacf2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adfc9a2a382d96… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 6 10:58:55 2017 +0200 Some minor code formating Change-Id: Ie15da1b89a5169bc61f3aab43d180a26fceb4b35 --- .bugs/2513 | 7 +++++-- bin/mkbackup | 5 +---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.bugs/2513 b/.bugs/2513 index 13a06dc..e89b0ab 100644 --- a/.bugs/2513 +++ b/.bugs/2513 @@ -1,8 +1,11 @@ Title: faulty reference to php5 in debian 9 and nagvis Component: multisite -State: open +Class: bug +State: done Date: 2017-08-17 14:45:04 Targetversion: 1.2.8 -Class: bug php5-cgi reference is not available in Debian 9. It's just php-cgi or php7-cgi. + +2017-09-06 08:39:27: changed state open -> done +Has already been fixed. diff --git a/bin/mkbackup b/bin/mkbackup index 9513594..c33b562 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -167,7 +167,6 @@ def site_config_path(): def acquire_backup_lock(): global g_backup_lock_f lock_file_path = "/tmp/mkbackup.lock" - if not os.path.exists(lock_file_path): try: g_backup_lock_f = tempfile.NamedTemporaryFile(mode="a+", dir="/tmp", delete=False) @@ -190,6 +189,7 @@ def acquire_backup_lock(): cloexec_flag = fcntl.FD_CLOEXEC except AttributeError: cloexec_flag = 1 + fd = g_backup_lock_f.fileno() fcntl.fcntl(fd, fcntl.F_SETFD, fcntl.fcntl(fd, fcntl.F_GETFD) | cloexec_flag) @@ -672,7 +672,6 @@ def do_site_backup(opts, site=None, try_stop=True): raise MKGeneralException("Failed to backup site that only supports " "offline backup.") - raise MKGeneralException("Site backup failed: %s" % err) @@ -749,9 +748,7 @@ class MKBackupStream(object): while True: chunk, finished = self._read_chunk() - self._bytes_copied += len(chunk) - yield self._process_chunk(chunk) if finished and not self._is_alive():

7 years

Refactor Logger behind LoggerAdaptor

by Jukka Aro

Module: check_mk Branch: master Commit: 793f9337742f9f97136b27f9e245267c6cc26bbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=793f9337742f9f… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Jul 18 15:16:51 2017 +0200 Refactor Logger behind LoggerAdaptor Refactor all code using logging to use a Logger instance through the LoggerAdaptor interface. The purpose is to 1) enable testing by cutting dependencies by mocking the Logger. 2) later possibly replace the logger by a more sane solution, e.g. the Logger from enterprise CMC. Also refactor crash handling into CrashHandler class in order to manage dependency to Logger. Change-Id: I6a26f738125ff7b85bfaa44b6328831e7d8e9f11 --- agents/windows/Configuration.cc | 6 +- agents/windows/Configuration.h | 10 +- .../windows/{crashhandling.cc => CrashHandler.cc} | 63 +++++----- agents/windows/{crashhandling.h => CrashHandler.h} | 28 ++++- agents/windows/Environment.cc | 9 +- agents/windows/Environment.h | 10 +- agents/windows/EventLog.cc | 32 +++--- agents/windows/EventLog.h | 8 +- agents/windows/ExternalCmd.cc | 9 +- agents/windows/ExternalCmd.h | 7 +- agents/windows/IEventLog.cc | 11 +- agents/windows/IEventLog.h | 10 +- agents/windows/ListenSocket.cc | 18 +-- agents/windows/ListenSocket.h | 7 +- agents/windows/{logging.cc => Logger.cc} | 127 ++++++++++++--------- agents/windows/Logger.h | 82 +++++++++++++ agents/windows/{logging.h => LoggerAdaptor.h} | 36 ++++-- agents/windows/Makefile | 4 +- agents/windows/OHMMonitor.cc | 17 +-- agents/windows/OHMMonitor.h | 8 +- agents/windows/OutputProxy.cc | 22 ++-- agents/windows/OutputProxy.h | 9 +- agents/windows/PerfCounter.cc | 1 - agents/windows/Section.cc | 26 +++-- agents/windows/Section.h | 29 +++-- agents/windows/SectionManager.cc | 91 ++++++++------- agents/windows/SectionManager.h | 15 ++- agents/windows/Thread.cc | 11 +- agents/windows/Thread.h | 19 ++- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1340416 -> 1372160 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15809577 -> 17176174 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1340416 -> 1372160 bytes agents/windows/check_mk_agent.cc | 85 +++++++------- agents/windows/check_mk_agent.exe | Bin 1318400 -> 1354240 bytes agents/windows/check_mk_agent.msi | Bin 2928640 -> 2997248 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13668491 -> 14999417 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1318400 -> 1354240 bytes agents/windows/crash.exe | Bin 101624 -> 358864 bytes agents/windows/install_agent-64.exe | Bin 591884 -> 604756 bytes agents/windows/install_agent.exe | Bin 589468 -> 604190 bytes agents/windows/nowin.exe | Bin 103760 -> 361000 bytes agents/windows/sections/SectionCheckMK.cc | 71 +++++++----- agents/windows/sections/SectionCheckMK.h | 14 ++- agents/windows/sections/SectionCrashDebug.cc | 28 ++--- agents/windows/sections/SectionCrashDebug.h | 7 +- agents/windows/sections/SectionDF.cc | 8 +- agents/windows/sections/SectionDF.h | 9 +- agents/windows/sections/SectionEventlog.cc | 30 ++--- agents/windows/sections/SectionEventlog.h | 9 +- agents/windows/sections/SectionFileinfo.cc | 9 +- agents/windows/sections/SectionFileinfo.h | 7 +- agents/windows/sections/SectionGroup.cc | 13 +-- agents/windows/sections/SectionGroup.h | 8 +- agents/windows/sections/SectionLogwatch.cc | 49 ++++---- agents/windows/sections/SectionLogwatch.h | 9 +- agents/windows/sections/SectionMRPE.cc | 30 ++--- agents/windows/sections/SectionMRPE.h | 7 +- agents/windows/sections/SectionMem.cc | 9 +- agents/windows/sections/SectionMem.h | 7 +- agents/windows/sections/SectionOHM.cc | 22 ++-- agents/windows/sections/SectionOHM.h | 9 +- agents/windows/sections/SectionPS.cc | 28 ++--- agents/windows/sections/SectionPS.h | 7 +- agents/windows/sections/SectionPerfcounter.cc | 14 +-- agents/windows/sections/SectionPerfcounter.h | 7 +- agents/windows/sections/SectionPluginGroup.cc | 103 +++++++++++------ agents/windows/sections/SectionPluginGroup.h | 61 +++++++++- agents/windows/sections/SectionServices.cc | 12 +- agents/windows/sections/SectionServices.h | 8 +- agents/windows/sections/SectionSkype.cc | 16 +-- agents/windows/sections/SectionSkype.h | 7 +- agents/windows/sections/SectionSpool.cc | 23 ++-- agents/windows/sections/SectionSpool.h | 7 +- agents/windows/sections/SectionSystemtime.cc | 12 +- agents/windows/sections/SectionSystemtime.h | 8 +- agents/windows/sections/SectionUptime.cc | 12 +- agents/windows/sections/SectionUptime.h | 9 +- agents/windows/sections/SectionWMI.cc | 10 +- agents/windows/sections/SectionWMI.h | 7 +- agents/windows/sections/SectionWinperf.cc | 16 +-- agents/windows/sections/SectionWinperf.h | 8 +- agents/windows/types.h | 52 +-------- agents/windows/wmiHelper.cc | 4 +- 84 files changed, 923 insertions(+), 675 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=793f933774…

7 years

Fixed bash completion filename

by Lars Michelsen

Module: check_mk Branch: master Commit: cf882a9305b99bd8d992b09f6cae09d16905f09f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf882a9305b99b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 5 16:14:56 2017 +0200 Fixed bash completion filename Change-Id: I42be2004d9ebb9d95d63c0be3c39bde47c3f9fcd --- omd/debian/postinst.in | 2 +- omd/omd.spec.in | 2 +- omd/packages/omd/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/omd/debian/postinst.in b/omd/debian/postinst.in index 45388d6..a1fd761 100755 --- a/omd/debian/postinst.in +++ b/omd/debian/postinst.in @@ -45,7 +45,7 @@ case "$1" in update-alternatives --install /omd/versions/default \ omd /omd/versions/###OMD_VERSION### ###OMD_SERIAL### \ --slave /usr/bin/omd omd.bin /omd/versions/###OMD_VERSION###/bin/omd \ - --slave /etc/bash_completion.d/omd omd.bash_completion /omd/versions/###OMD_VERSION###/lib/omd/omd_bash_completion \ + --slave /etc/bash_completion.d/omd omd.bash_completion /omd/versions/###OMD_VERSION###/lib/omd/bash_completion \ --slave /usr/share/man/man8/omd.8.gz omd.man8 \ /omd/versions/###OMD_VERSION###/share/man/man8/omd.8.gz diff --git a/omd/omd.spec.in b/omd/omd.spec.in index eff9f5a..a70488e 100644 --- a/omd/omd.spec.in +++ b/omd/omd.spec.in @@ -81,7 +81,7 @@ ln -sfn "%{version}" /omd/versions/default ln -sfn /omd/versions/default/bin/omd /usr/bin/omd ln -sfn /omd/versions/default/share/man/man8/omd.8.gz /usr/share/man/man8/omd.8.gz ln -sfn /omd/versions/default/share/omd/apache.conf @APACHE_CONFDIR@/zzz_omd.conf -ln -sfn /omd/versions/default/lib/omd/omd_bash_completion /etc/bash_completion.d/omd +ln -sfn /omd/versions/default/lib/omd/bash_completion /etc/bash_completion.d/omd IS_SYSTEMD=0 if [ -d /usr/lib/systemd ] && which systemctl >/dev/null 2>&1; then diff --git a/omd/packages/omd/Makefile b/omd/packages/omd/Makefile index 0db60a7..1353e69 100644 --- a/omd/packages/omd/Makefile +++ b/omd/packages/omd/Makefile @@ -30,7 +30,7 @@ install: mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/omd install -m 644 init_profile $(DESTDIR)$(OMD_ROOT)/lib/omd/ install -m 755 port_is_used $(DESTDIR)$(OMD_ROOT)/lib/omd/ - install -m 644 omd_bash_completion $(DESTDIR)$(OMD_ROOT)/lib/omd/ + install -m 644 bash_completion $(DESTDIR)$(OMD_ROOT)/lib/omd/ mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/omd/scripts/post-create

7 years

5184 FIX Bake agents on restart only affects master sites now

by Lars Michelsen

Module: check_mk Branch: master Commit: 7fedcb2c0978bd7a35a1e4bf583cc70e77165353 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fedcb2c0978bd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 6 08:13:39 2017 +0200 5184 FIX Bake agents on restart only affects master sites now When enabling the global setting for baking agents during restrt of the monitoring core, the agents were baked on all sites in distributed setups. Since the agents are only deployed from the master site, the setting is now only affecting the master. Change-Id: Ia1fdfd324107ed9c395304b6e8d4fc6ee6a32f70 --- .werks/5184 | 13 +++++++++++++ cmk_base/default_config/base.py | 1 + web/htdocs/watolib.py | 7 ++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.werks/5184 b/.werks/5184 new file mode 100644 index 0000000..9e61c50 --- /dev/null +++ b/.werks/5184 @@ -0,0 +1,13 @@ +Title: Bake agents on restart only affects master sites now +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1504678337 +Class: fix + +When enabling the global setting for baking agents during restrt of the +monitoring core, the agents were baked on all sites in distributed setups. +Since the agents are only deployed from the master site, the setting is +now only affecting the master. diff --git a/cmk_base/default_config/base.py b/cmk_base/default_config/base.py index e78b6b9..3d64f51 100644 --- a/cmk_base/default_config/base.py +++ b/cmk_base/default_config/base.py @@ -160,6 +160,7 @@ ipaddresses = {} # mapping from hostname to IPv4 addres ipv6addresses = {} # mapping from hostname to IPv6 address only_hosts = None distributed_wato_site = None # used by distributed WATO +is_wato_slave_site = False extra_host_conf = {} extra_service_conf = {} extra_nagios_conf = "" diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 9f24526..ae05ecb 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3958,12 +3958,13 @@ def create_nagvis_backends(sites): store.save_file('%s/etc/nagvis/conf.d/cmk_backends.ini.php' % cmk.paths.omd_root, '\n'.join(cfg)) -def create_distributed_wato_file(siteid): +def create_distributed_wato_file(siteid, is_slave): output = wato_fileheader() output += ("# This file has been created by the master site\n" "# push the configuration to us. It makes sure that\n" "# we only monitor hosts that are assigned to our site.\n\n") output += "distributed_wato_site = '%s'\n" % siteid + output += "is_wato_slave_site = %r\n" % is_slave store.save_file(cmk.paths.check_mk_config_dir + "/distributed_wato.mk", output) @@ -3996,7 +3997,7 @@ def update_distributed_wato_file(sites): distributed = True if config.site_is_local(siteid): found_local = True - create_distributed_wato_file(siteid) + create_distributed_wato_file(siteid, is_slave=False) # Remove the distributed wato file # a) If there is no distributed WATO setup @@ -4302,7 +4303,7 @@ def automation_push_snapshot(): call_hook_snapshot_pushed() # Create rule making this site only monitor our hosts - create_distributed_wato_file(site_id) + create_distributed_wato_file(site_id, is_slave=True) except Exception, e: raise MKGeneralException(_("Failed to deploy configuration: \"%s\". " "Please note that the site configuration has been synchronized "

7 years

Timeperiod valuespec: Fixed exception on some WATO rules

by Andreas Boesl

Module: check_mk Branch: master Commit: 165e070c571ab525e4553083783c26d08bfde676 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=165e070c571ab5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 5 15:44:39 2017 +0200 Timeperiod valuespec: Fixed exception on some WATO rules Change-Id: I0892a1b000bbe88a5547848c9eec232a8f89cf74 --- web/htdocs/valuespec.py | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 8a8f283..b3397a1 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -4546,9 +4546,13 @@ class TimeperiodSelection(ElementSelection): class TimeperiodValuespec(ValueSpec): - tp_toggle_var = "tp_enabled" # Used by GUI switch - tp_default_value_key = "tp_default_value" # Used in value - tp_values_key = "tp_values" # Used in value + tp_toggle_var = "tp_toggle" # Used by GUI switch + tp_current_mode = "tp_active" # The actual set mode + # "0" - no timespecific settings + # "1" - timespecific settings active + + tp_default_value_key = "tp_default_value" # Used in valuespec + tp_values_key = "tp_values" # Used in valuespec def __init__(self, valuespec): @@ -4568,18 +4572,20 @@ class TimeperiodValuespec(ValueSpec): # The display mode differs when the valuespec is activated vars_copy = html.vars.copy() + + # The timeperiod mode can be set by either the GUI switch or by the value itself # GUI switch overrules the information stored in the value if html.has_var(self.tp_toggle_var): is_active = self._is_switched_on() else: is_active = self._is_active(value) - if is_active: - mode = _("Disable") - vars_copy[self.tp_toggle_var] = "0" - else: - mode = _("Enable") - vars_copy[self.tp_toggle_var] = "1" + # Set the actual used mode + html.hidden_field(self.tp_current_mode, "%d" % is_active) + + mode = _("Disable") if is_active else _("Enable") + vars_copy[self.tp_toggle_var] = "%d" % (not is_active) + toggle_url = html.makeuri(vars_copy.items()) html.buttonlink(toggle_url, _("%s timespecific parameters") % mode, style=["position: absolute", "right: 18px;"]) @@ -4602,18 +4608,16 @@ class TimeperiodValuespec(ValueSpec): def from_html_vars(self, varprefix): - parameters = self._get_timeperiod_valuespec().from_html_vars(varprefix) - - if parameters[self.tp_values_key]: - return parameters - elif parameters[self.tp_default_value_key]: - # If the tp_default_value has any meaningful set, return this - return parameters[self.tp_default_value_key] + if html.var(self.tp_current_mode) == "1": + # Fetch the timespecific settings + parameters = self._get_timeperiod_valuespec().from_html_vars(varprefix) + if parameters[self.tp_values_key]: + return parameters + else: + # Fall back to enclosed valuespec data when no timeperiod is set + return parameters[self.tp_default_value_key] else: - # -> Fall back to simple mode - # If the tp-valuespec provided no data, it may be really empty, or we simply used the wrong valuespec - # to collect the data. Try to fetch the data with the enclosed valuespec - # If the second collection result is also empty - no problem, they have the same datatype + # Fetch the data from the enclosed valuespec return self._enclosed_valuespec.from_html_vars(varprefix)

7 years

5188 Sending service metrics to Graphite/InfluxDB can now be fine-tuned

by Sven Panne

Module: check_mk Branch: master Commit: f8516e3da3b1e4c6310c8c2be065cf3d8a458e8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8516e3da3b1e4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Sep 5 11:42:09 2017 +0200 5188 Sending service metrics to Graphite/InfluxDB can now be fine-tuned Previously, there was a service rule to configure one of three levels of information to be sent to Graphite/InfluxDB: Send nothing, send only value, or send value/warn/crit/min/max. Now the rule is more fine-grained, so one can choose for each part of the metric if it should be sent or not. Furthermore, one can now send the unity of measurement, too. Change-Id: Ibc75ed41a256768e5f46674aff15f2be75db4aab --- .werks/5188 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.werks/5188 b/.werks/5188 new file mode 100644 index 0000000..e58ecd8 --- /dev/null +++ b/.werks/5188 @@ -0,0 +1,16 @@ +Title: Sending service metrics to Graphite/InfluxDB can now be fine-tuned +Level: 2 +Component: core +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1504617495 +Class: feature + +Previously, there was a service rule to configure one of three levels of +information to be sent to Graphite/InfluxDB: Send nothing, send only value, +or send value/warn/crit/min/max. + +Now the rule is more fine-grained, so one can choose for each part of the +metric if it should be sent or not. Furthermore, one can now send the unity +of measurement, too.

7 years

← Newer
1
...
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