Module: check_mk
Branch: master
Commit: a11781a83e4175632684c972f3381e118a80d31d
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a11781a83e4175…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Oct 5 11:40:20 2015 +0200
#2647 FIX Fix crash of CMC in case of duplicate host
In certain situtations when you have a non-valid configuration (e.g. a duplicate
host) than the Check_MK Micro Core would not be able to start correctly due to
a problem in the handling of errors in the RRD creation helper. This has been
fixed.
---
.werks/1723 | 2 +-
.werks/2647 | 12 ++++++++++++
ChangeLog | 1 +
modules/check_mk.py | 2 +-
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/.werks/1723 b/.werks/1723
index d5e4dcc..048e175 100644
--- a/.werks/1723
+++ b/.werks/1723
@@ -1,4 +1,4 @@
-Title: New check API function get_average() as more intelligent replacement for
get_counter()
+Title: New check API function get_rate() as more intelligent replacement for
get_counter()
Level: 2
Component: core
Compatible: compat
diff --git a/.werks/2647 b/.werks/2647
new file mode 100644
index 0000000..83f72d5
--- /dev/null
+++ b/.werks/2647
@@ -0,0 +1,12 @@
+Title: Fix crash of CMC in case of duplicate host
+Level: 1
+Component: core
+Compatible: compat
+Version: 1.2.7i3
+Date: 1444037957
+Class: fix
+
+In certain situtations when you have a non-valid configuration (e.g. a duplicate
+host) than the Check_MK Micro Core would not be able to start correctly due to
+a problem in the handling of errors in the RRD creation helper. This has been
+fixed.
diff --git a/ChangeLog b/ChangeLog
index c7ff3fc..0c5702e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
* 2430 FIX: Fixed crash with availability queries when using nagios as core...
* 2643 FIX: Fix spurious CRIT status on check on mknotifyd...
* 2617 FIX: Improved error handling in case of agent error but piggyback data
available
+ * 2647 FIX: Fix crash of CMC in case of duplicate host...
Checks & Agents:
* 2312 New checks for EMC VPLEX: emc_vplex_cpu, emc_vplex_director_stats,
emc_vplex_if, emc_vplex_volumes...
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 1118770..7bef583 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -6036,7 +6036,7 @@ try:
read_config_files(with_conf_d=True, validate_hosts=False)
sys.exit(do_notify(args))
elif o == '--create-rrd':
- read_config_files(with_conf_d=True)
+ read_config_files(with_conf_d=True, validate_hosts=False)
execfile(modules_dir + "/rrd.py")
do_create_rrd(args)
done = True