Module: check_mk
Branch: master
Commit: a26e8fd40d76d12ad3c03af8c82a7137ba1ef0af
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a26e8fd40d76d1…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Dec 11 14:57:12 2013 +0100
FIX Avoid duplicate reading of configuration file on --create-rrd
The Check_MK Micro Core calls Check_MK with <tt>cmk --create-rrd
--keepalive</tt>.
That read in the configuration files (<tt>main.mk</tt> etc.) twice. This could
have
lead to various anomalities such as duplicate hosts when you have removed the
default <tt>all_hosts = </tt> from your <tt>main.mk</tt>. This has
been fixed now.
---
.werks/313 | 13 +++++++++++++
ChangeLog | 1 +
modules/check_mk.py | 3 ++-
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/.werks/313 b/.werks/313
new file mode 100644
index 0000000..2a04457
--- /dev/null
+++ b/.werks/313
@@ -0,0 +1,13 @@
+Title: Avoid duplicate reading of configuration file on --create-rrd
+Level: 1
+Component: core
+Class: fix
+State: unknown
+Version: 1.2.3i8
+Date: 1386770107
+Targetversion: future
+
+The Check_MK Micro Core calls Check_MK with <tt>cmk --create-rrd
--keepalive</tt>.
+That read in the configuration files (<tt>main.mk</tt> etc.) twice. This
could have
+lead to various anomalities such as duplicate hosts when you have removed the
+default <tt>all_hosts = </tt> from your <tt>main.mk</tt>. This
has been fixed now.
diff --git a/ChangeLog b/ChangeLog
index 4cdedaa..f45b32c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
1.2.3i8:
Core & Setup:
* 0087 FIX: Fixed possible locking issue when using datasource program with long
output...
+ * 0313 FIX: Avoid duplicate reading of configuration file on --create-rrd...
Checks & Agents:
* 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 1b56352..b515590 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -5524,7 +5524,8 @@ if __name__ == "__main__":
"cmc-file=", "browse-man", "list-man",
"update-dns-cache" ]
non_config_options = ['-L', '--list-checks', '-P',
'--package', '-M', '--notify',
- '--man', '-V', '--version'
,'-h', '--help', '--automation']
+ '--man', '-V', '--version'
,'-h', '--help', '--automation',
+ '--create-rrd' ]
try:
opts, args = getopt.getopt(sys.argv[1:], short_options, long_options)