Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

4913 FIX oracle_tablespaces: A service will now go indeed to warn only if left space is below the warn level

by Marcel Arentz

Module: check_mk Branch: master Commit: d7ca7f54d3ea3d0488d014c578891eed83e4714f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7ca7f54d3ea3d… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jul 6 11:29:55 2017 +0200 4913 FIX oracle_tablespaces: A service will now go indeed to warn only if left space is below the warn level Before the state already changed if the left space has been equal to a threshold level. Change-Id: I60af03f489f72522fbbb7657605a34a371ca41eb --- .werks/4913 | 10 ++++++++++ checks/oracle_tablespaces | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/4913 b/.werks/4913 new file mode 100644 index 0000000..7882374 --- /dev/null +++ b/.werks/4913 @@ -0,0 +1,10 @@ +Title: oracle_tablespaces: A service will now go indeed to warn only if left space is below the warn level +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499333114 +Class: fix + +Before the state already changed if the left space has been equal to a threshold level. diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index a2a9a5b..581b09e 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -345,9 +345,9 @@ def check_oracle_tablespaces(item, params, parsed): if ts_status != "READONLY" and ts_type == 'PERMANENT': status = 0 - if crit is not None and free_space <= crit: + if crit is not None and free_space < crit: status = 2 - elif warn is not None and free_space <= warn: + elif warn is not None and free_space < warn: status = 1 if status:

6 years, 12 months

updated title of werk

by Marcel Arentz

Module: check_mk Branch: master Commit: 9957a35be39a67fd074cf9ac28fbaaf3c488f9ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9957a35be39a67… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jul 6 11:31:15 2017 +0200 updated title of werk Change-Id: I5ccebcc9516fafef3ead93388ef875acc368493a --- .werks/4913 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/4913 b/.werks/4913 index 7882374..ae8773d 100644 --- a/.werks/4913 +++ b/.werks/4913 @@ -1,4 +1,4 @@ -Title: oracle_tablespaces: A service will now go indeed to warn only if left space is below the warn level +Title: oracle_tablespaces: A service will now indeed change state only if left space is below a threshold level Level: 1 Component: checks Compatible: compat

6 years, 12 months

4949 FIX Fixed grouping by host-/servicegroup in availability views

by Lars Michelsen

Module: check_mk Branch: master Commit: b8cf042bafe40e6bb8d831609b79ffd774ec2a06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8cf042bafe40e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 6 10:33:52 2017 +0200 4949 FIX Fixed grouping by host-/servicegroup in availability views Change-Id: Ice1f538e511c9d55dc62c3947db71bae4d39729e --- .werks/4949 | 11 +++++++++++ web/htdocs/availability.py | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/4949 b/.werks/4949 new file mode 100644 index 0000000..d1f47b9 --- /dev/null +++ b/.werks/4949 @@ -0,0 +1,11 @@ +Title: Fixed grouping by host-/servicegroup in availability views +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1499329958 + + diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 05932c8..243c0d9 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -703,6 +703,9 @@ def filter_groups_of_entries(context, avoptions, spans): # They need to be able to filter the list of all groups. # TODO: Negated filters are not handled here. :( if group_by == "service_groups": + if "servicegroups" not in context and "optservicegroup" not in context: + return + # Extract from context: # 'servicegroups': {'servicegroups': 'cpu|disk', 'neg_servicegroups': 'off'}, # 'optservicegroup': {'optservice_group': '', 'neg_optservice_group': 'off'}, @@ -721,7 +724,9 @@ def filter_groups_of_entries(context, avoptions, spans): only_groups.add(group_name) elif group_by == "host_groups": - html.log(repr(context)) + if "hostgroups" not in context and "opthostgroup" not in context: + return + negated = context.get("hostgroups", {}).get("neg_hostgroups") == "on" if negated: return

6 years, 12 months

obsolete bugreport

by Marcel Arentz

Module: check_mk Branch: master Commit: c900c4aab9e7b20a9a9f39b0f620b092bfaf5f5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c900c4aab9e7b2… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Jul 5 15:23:45 2017 +0200 obsolete bugreport Change-Id: Iaaa6f73404c611ac731326957ab643128e021afc --- .bugs/2512 | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/.bugs/2512 b/.bugs/2512 deleted file mode 100644 index 4e563af..0000000 --- a/.bugs/2512 +++ /dev/null @@ -1,22 +0,0 @@ -Title: failed service discovery in rare situations -Component: checks -State: open -Date: 2017-07-04 15:21:44 -Targetversion: 1.5.0 -Class: bug - -Situation: -In rare situation the service discovery will fail and discover no new snmp checks. Even if these are correctly implemented and the services are discovered on a different check_mk site. -This behaviour is rare and possibly hard to reproduce. Several different forms has been discovered: -1. Services are not discovered on commandline (cmk -IIv hostname) but in WATO Service Discovery. -2. Services are not discovered on cmd and not in WATO Service Discovery. The Discovery Check of the hosts see the missing services. -3. Nothing is discovered except forcing the check plugin with --checks=pluginname - -In some cases a workaround can be to discover the services in WATO. After that the discovery on cmd is working again. This is not working all the time. - -To reproduce the first occurance of this bug: - -cmk --flush hostname -cmk -IIv - -There is no known way to reproduce the third occurance nor to get it working again.

6 years, 12 months

by Sven Rueß

Module: check_mk Branch: master Commit: c5a953b98fda986c3decaa2243c702663a03038f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5a953b98fda98… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Jul 5 14:13:26 2017 +0200 new bug related to mknotify with distributed monitoring Change-Id: I1f7d9e8751b18df74e79cf70d276b10a824cc862 --- .bugs/2927 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/2927 b/.bugs/2927 new file mode 100644 index 0000000..b4c6228 --- /dev/null +++ b/.bugs/2927 @@ -0,0 +1,12 @@ +Title: mknotify with distributed monitoring +Component: wato +State: open +Date: 2017-07-05 14:08:01 +Targetversion: 1.4.0 +Class: bug + +If you set up a distributed monitoring environment with a central notification instance on master site. +After activating mknotifyd and activate the listener port on the master, this setting will automatically +synchronized to all slave sites. A user have to modify each sitespecific global settings to deactivate +the listener and add the connection to the master. +This global setting should not be synchronized to all slaves.

6 years, 12 months

Reserved 1 bug IDS

by Sven Rueß

Module: check_mk Branch: master Commit: 7123a89a9845068ad2fd05dab78909e0b15e1791 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7123a89a984506… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Jul 5 14:07:37 2017 +0200 Reserved 1 bug IDS Change-Id: Ia8fdc806555f0e4552456c6a30234ad0390779b4 --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index f13fcba..9b0efd1 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2927 +2928

6 years, 12 months

added help text

by Andreas Boesl

Module: check_mk Branch: master Commit: e911e2188103e7dc225031be5b8d15fa09abe2aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e911e2188103e7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jul 5 13:46:00 2017 +0200 added help text Change-Id: Ic20bf5a039c26d88b7dff1f8091bb769a5843850 --- web/htdocs/wato.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 482c1c8..73d4176 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9902,12 +9902,13 @@ class ModeEditSite(ModeSites): else: html.write_text(self._site_id) + html.help(_("The site ID must be identical (case sensitive) with the instance's exact name.")) # Alias forms.section(_("Alias")) html.text_input("alias", self._site.get("alias", ""), size = 60) if not self._new: html.set_focus("alias") - html.help(_("An alias or description of the site")) + html.help(_("An alias or description of the site.")) def _page_livestatus_settings(self):

6 years, 12 months

4843 FIX Windows Agent / logfile monitoring: fixed agent crash when * was used as file wildcard

by Andreas Boesl

Module: check_mk Branch: master Commit: 414b31d6f11b8794548031b74006d4d11a2dd500 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=414b31d6f11b87… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jul 5 13:07:20 2017 +0200 4843 FIX Windows Agent / logfile monitoring: fixed agent crash when * was used as file wildcard Change-Id: I2465c7892e782ef6308403d2a574b08c289785a5 --- .werks/4843 | 10 ++++++++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1340416 -> 1340416 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15823789 -> 15823789 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1340416 -> 1340416 bytes agents/windows/check_mk_agent.exe | Bin 1318400 -> 1318400 bytes agents/windows/check_mk_agent.msi | Bin 2928640 -> 2928640 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13682205 -> 13682205 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1318400 -> 1318400 bytes agents/windows/crash.exe | Bin 358864 -> 101624 bytes agents/windows/install_agent-64.exe | Bin 591866 -> 591911 bytes agents/windows/install_agent.exe | Bin 589524 -> 589544 bytes agents/windows/nowin.exe | Bin 361000 -> 103760 bytes agents/windows/plugins/mk_jolokia.exe | Bin 10106761 -> 10106761 bytes agents/windows/sections/SectionLogwatch.cc | 5 +++-- 15 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/4843 b/.werks/4843 new file mode 100644 index 0000000..8428051 --- /dev/null +++ b/.werks/4843 @@ -0,0 +1,10 @@ +Title: Windows Agent / logfile monitoring: fixed agent crash when * was used as file wildcard +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499252787 +Class: fix + + diff --git a/agents/windows/build_version b/agents/windows/build_version index f06c1c5..295764c 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2806 +2836 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 55424fc..4c75bb0 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index 24c8ff0..fe982f8 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 909f567..c3d42ad 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index e2dd34d..7a9e5d3 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 28b83e5..9ce298d 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 6193098..909710a 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 06b2cc2..5552095 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 6fec41a..94ff8c7 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index d127af0..e123e9c 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index c0f102b..382e26f 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 8139799..a9cca69 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/agents/windows/plugins/mk_jolokia.exe b/agents/windows/plugins/mk_jolokia.exe index 2fdcbfc..b39cc0d 100755 Binary files a/agents/windows/plugins/mk_jolokia.exe and b/agents/windows/plugins/mk_jolokia.exe differ diff --git a/agents/windows/sections/SectionLogwatch.cc b/agents/windows/sections/SectionLogwatch.cc index 2242e6a..685f8b0 100644 --- a/agents/windows/sections/SectionLogwatch.cc +++ b/agents/windows/sections/SectionLogwatch.cc @@ -122,8 +122,9 @@ std::vector<SectionLogwatch::FileEntryType> SectionLogwatch::globMatches( bool more = h != INVALID_HANDLE_VALUE; while (more) { - matches.push_back( - std::make_pair(path + data.cFileName, data.ftLastWriteTime)); + if (!(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) // Skip directories + matches.push_back( + std::make_pair(path + data.cFileName, data.ftLastWriteTime)); more = FindNextFile(h, &data); } FindClose(h);

6 years, 12 months

Fixed hw/sw inventory plugins that use check includes

by Lars Michelsen

Module: check_mk Branch: master Commit: 435ac3e8e68947bfd39b41f9af789d556670fc5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=435ac3e8e68947… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 5 13:09:26 2017 +0200 Fixed hw/sw inventory plugins that use check includes Change-Id: I30313094553479c6061a068a00dfb30665c39819 --- cmk_base/checks.py | 4 ++-- cmk_base/inventory_plugins.py | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cmk_base/checks.py b/cmk_base/checks.py index 1c578de..c23cbb6 100644 --- a/cmk_base/checks.py +++ b/cmk_base/checks.py @@ -115,7 +115,7 @@ def load_checks(filelist): continue # skip already loaded files (e.g. from local) try: - check_context = _new_check_context(f) + check_context = new_check_context() known_vars = check_context.keys() known_checks = check_info.keys() @@ -177,7 +177,7 @@ def load_checks(filelist): # Constructs a new check context dictionary. It contains the whole check API. -def _new_check_context(check_file_path): +def new_check_context(): # Add the data structures where the checks register with Check_MK context = { "check_info" : check_info, diff --git a/cmk_base/inventory_plugins.py b/cmk_base/inventory_plugins.py index 22ccaf5..20118ed 100644 --- a/cmk_base/inventory_plugins.py +++ b/cmk_base/inventory_plugins.py @@ -112,6 +112,11 @@ def load_plugin_includes(check_file_path, plugin_context): if not os.path.exists(include_file_path): include_file_path = checks.check_include_file_path(include_file_name) + # In case a check include file is used the plugin context needs to be + # prepared with a check plugin context + for key, val in checks.new_check_context().items(): + plugin_context.setdefault(key, val) + try: execfile(include_file_path, plugin_context) except Exception, e:

6 years, 12 months

Removed deprecated function

by Lars Michelsen

Module: check_mk Branch: master Commit: e760d2cf3e9849dbaa40ad4ab19e24e43bfa2acc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e760d2cf3e9849… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 5 13:04:51 2017 +0200 Removed deprecated function Change-Id: Ifbff2d483a732b13b1f558561cd12c68e74ad980 --- cmk_base/checks.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cmk_base/checks.py b/cmk_base/checks.py index 53a72fb..1c578de 100644 --- a/cmk_base/checks.py +++ b/cmk_base/checks.py @@ -287,10 +287,6 @@ def check_variable_names(): return _check_variables.keys() -def get_include_context(include_file_name): - return _include_contexts[include_file_name] - - # Some variables are accessed from the generic Check_MK code. E.g. during # constructing the parameters of a check before executing the check function, # or during loading of the configuration and the autochecks.

6 years, 12 months

← Newer
1
...
22
23
24
25
26
27
28
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017