Module: check_mk
Branch: master
Commit: 41fe8bb48ee0dd4f42a754866177f8732cc21a41
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41fe8bb48ee0dd…
Author: Jukka Aro <ja(a)mathias-kettner.de>
Date: Mon Jan 8 13:54:45 2018 +0100
Windows agent: use RAII through std::vector for logfiles
* Do not store manually heap-allocated objects in std::vector as
std::vector already knows how to use the heap (better than you do)
;-)
* Use RAII through std::vector in order to empty SectionLogwatch
destructor.
* Favour std::string for ugly strdup'd heap-allocated char arrays.
Change-Id: I9174163ae8afa874c0e9ab0f3a46ebe6b2de6f66
---
agents/windows/build_version | 2 +-
agents/windows/sections/SectionLogwatch.cc | 515 +++++++++++++----------------
agents/windows/sections/SectionLogwatch.h | 71 ++--
agents/windows/types.h | 36 +-
4 files changed, 300 insertions(+), 324 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=41fe8bb48e…
Module: check_mk
Branch: master
Commit: 352295a532f8bffb032a4f3642da50f87c9f2678
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=352295a532f8bf…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Tue Jan 9 12:10:53 2018 +0100
Added a TODO.
Change-Id: I003429abb5d12e1b888bb4e4bbd110abf2ac8c59
---
livestatus/src/module.cc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc
index 16c1bd2..2634abf 100644
--- a/livestatus/src/module.cc
+++ b/livestatus/src/module.cc
@@ -516,6 +516,9 @@ int broker_program(int event_type __attribute__((__unused__)),
return 0;
}
+// TODO(sp) This looks a bit obscure: We do not check if the downtime is active
+// and if it is the right downtime. Furthermore, we only retrieve and log one
+// downtime, even if the current object is in several downtimes at once.
const char *get_downtime_comment(char *host_name, char *svc_desc) {
char *comment;
int matches = 0;
Module: check_mk
Branch: master
Commit: 7e417ce41ec0bc40b17cb3c2250160f1f37039c0
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e417ce41ec0bc…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Jan 9 11:47:55 2018 +0100
5595 FIX Fixed "Events of monitored host" view showing events not related to the wanted host
Change-Id: I3fa90451ebe35f36c71301a611ed8d5035fcc186
---
.werks/5595 | 11 +++++++++++
web/htdocs/views.py | 5 ++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/.werks/5595 b/.werks/5595
new file mode 100644
index 0000000..7af4590
--- /dev/null
+++ b/.werks/5595
@@ -0,0 +1,11 @@
+Title: Fixed "Events of monitored host" view showing events not related to the wanted host
+Level: 1
+Component: ec
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.5.0i3
+Date: 1515494847
+
+
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 4ec808f..659f07d 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -1510,10 +1510,13 @@ def show_view(view, show_heading = False, show_buttons = True,
# events is always empty since the single context filter "host" is sending a "host_name = ..."
# filter to livestatus which is not matching a "unrelated event". Instead the filter event_host
# needs to be used.
+ # But this may only be done for the unrelated events view. The "ec_events_of_monhost" view still
+ # needs the filter. :-/
# Another idea: We could change these views to non single context views, but then we would not
# be able to show the buttons to other host related views, which is also bad. So better stick
# with the current mode.
- if view["datasource"] in [ "mkeventd_events", "mkeventd_history" ] and "host" in view["single_infos"]:
+ if view["datasource"] in [ "mkeventd_events", "mkeventd_history" ] \
+ and "host" in view["single_infos"] and view["name"] != "ec_events_of_monhost":
# Remove the original host name filter
use_filters = [ f for f in use_filters if f.name != "host" ]
Module: check_mk
Branch: master
Commit: 0461e2cf3e22a81cde15fd88d9c6ea4f5de248a5
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0461e2cf3e22a8…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Jan 9 08:01:22 2018 +0100
Updated bug entries #2971
Change-Id: Ib4c3bde273aaee6cadaf993ae505fa98f6b4f99c
---
.bugs/2971 | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
diff --git a/.bugs/2971 b/.bugs/2971
index 8e05192..38062f8 100644
--- a/.bugs/2971
+++ b/.bugs/2971
@@ -14,3 +14,58 @@ To reproduce the bug:
- Activate Changes
It seems, that the autochecks.mk is not updated, if the agent_data of a host is not reachable.
+
+-------- LM
+
+The error is:
+
+Failed: Error creating configuration: Invalid entry '({'deferred': (10, 20)}, [], ['@all'], [''])' in host configuration list: must have 2 or 3 entries (on host oldstable, checktype postfix_mailq)
+
+Traceback (most recent call last):
+ File "/omd/sites/oldstable/share/check_mk/modules/check_mk.py", line 4722, in <module>
+ do_restart()
+ File "/omd/sites/oldstable/share/check_mk/modules/check_mk.py", line 3861, in do_restart
+ do_create_config(with_agents=True)
+ File "/omd/sites/oldstable/share/check_mk/modules/check_mk.py", line 3745, in do_create_config
+ create_core_config()
+ File "/omd/sites/oldstable/share/check_mk/modules/check_mk.py", line 2870, in create_core_config
+ do_create_cmc_config(opt_cmc_relfilename)
+ File "/omd/sites/oldstable/share/check_mk/modules/cmc.py", line 140, in do_create_cmc_config
+ hosts_config = _measure_time(cmc_all_hosts)
+ File "/omd/sites/oldstable/share/check_mk/modules/cmc.py", line 172, in _measure_time
+ result = func(*args, **kwargs)
+ File "/omd/sites/oldstable/share/check_mk/modules/cmc.py", line 418, in cmc_all_hosts
+ hosts_config = cmc_hosts() + cmc_shadow_hosts()
+ File "/omd/sites/oldstable/share/check_mk/modules/cmc.py", line 434, in cmc_hosts
+ con += cmc_host(hostname)
+ File "/omd/sites/oldstable/share/check_mk/modules/cmc.py", line 593, in cmc_host
+ con += cmc_services(hostname, tags, attrs, macros, contactlist_id)
+ File "/omd/sites/oldstable/share/check_mk/modules/cmc.py", line 626, in cmc_services
+ host_checks = get_check_table(hostname, remove_duplicates=True).items()
+ File "/omd/sites/oldstable/share/check_mk/modules/check_mk.py", line 1997, in get_check_table
+ for entry in read_autochecks_of(hostname, world):
+ File "/omd/sites/oldstable/share/check_mk/modules/discovery.py", line 1279, in read_autochecks_of
+ autochecks.append((check_type, item, compute_check_parameters(hostname, check_type, item, parameters)))
+ File "/omd/sites/oldstable/share/check_mk/modules/check_mk.py", line 4512, in compute_check_parameters
+ entries = get_checkgroup_parameters(host, checktype, item)
+ File "/omd/sites/oldstable/share/check_mk/modules/check_mk.py", line 4548, in get_checkgroup_parameters
+ raise MKGeneralException(str(e) + " (on host %s, checktype %s)" % (host, checktype))
+cmk.exceptions.MKGeneralException: Invalid entry '({'deferred': (10, 20)}, [], ['@all'], [''])' in host configuration list: must have 2 or 3 entries (on host oldstable, checktype postfix_mailq)
+
+The problem here is that the check is using the new ruleset which is a service
+ruleset instead of a host ruleset (like the old one).
+
+This is no configuration warning but an exception which prevents activation of
+the configuration.
+
+Updating the autochecks would solve the problem, but that is not possible in
+this situation because of the unreachable host).
+
+Possible workaround: Remove the autochecks of this host from var/check_mk/autochecks/[host].mk and
+re-discover it once it's reachable again.
+
+----
+
+We could fix this by making read_autochecks_of() skip these invalid autochecks
+with a configuration warning. Together with the hint that a rediscover might
+solve the situation.
Module: check_mk
Branch: master
Commit: 36abc033cf795bc5e03ea822fedf4c3abcef8d26
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36abc033cf795b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Jan 8 16:59:15 2018 +0100
Updated bug entries
Change-Id: I0d25c3dc242a41dc86b1a4ef83c8397075eb44bd
---
.bugs/2553 | 4 ++--
.bugs/2844 | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.bugs/2553 b/.bugs/2553
index 2b1abcc..71c1f2d 100644
--- a/.bugs/2553
+++ b/.bugs/2553
@@ -2,7 +2,7 @@ Title: Matching of Texts in EC inconsistent if no regexes are used
Component: ec
State: open
Date: 2017-01-25 14:13:01
-Targetversion: 1.4.0
+Targetversion: 1.5.0
Class: bug
The matching if "app" and "ap[p]" differ - but shouldn't. The EC uses
@@ -16,5 +16,5 @@ in order to stay compabible and fix the problem anyway.
---
-This also affects 1.2.8 and possibly older version, but we won't change
+This also affects 1.4.0, 1.2.8 and possibly older version, but we won't change
it in this old versions.
diff --git a/.bugs/2844 b/.bugs/2844
index 4860695..c3baf4c 100644
--- a/.bugs/2844
+++ b/.bugs/2844
@@ -2,7 +2,7 @@ Title: Translation of "Line" is problematic
Component: web
State: open
Date: 2017-02-21 10:33:50
-Targetversion: 1.4.0
+Targetversion: 1.5.0
Class: bug
"Line" needs to be translated into "Zeile" and into "Linie" (Graphing)