Module: check_mk
Branch: master
Commit: 87e1a9478523104f164c085094e6b4f515c28018
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87e1a947852310…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Apr 19 16:46:35 2016 +0200
3416 FIX Avoid warning in cmc.log when rescheduling non-existing discovery check
This avoids the folloing message:
F+:var/log/cmc.log
2016-04-19 13:49:24 [4] Ignoring command SCHEDULE_FORCED_SVC_CHECK;10.1.1.199;Check_MK
Discovery;1461066564: invalid parameters
F-:
---
.werks/3416 | 13 +++++++++++++
ChangeLog | 1 +
modules/check_mk.py | 5 +++++
3 files changed, 19 insertions(+)
diff --git a/.werks/3416 b/.werks/3416
new file mode 100644
index 0000000..d660dfd
--- /dev/null
+++ b/.werks/3416
@@ -0,0 +1,13 @@
+Title: Avoid warning in cmc.log when rescheduling non-existing discovery check
+Level: 1
+Component: core
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.9i1
+Date: 1461077110
+
+This avoids the folloing message:
+F+:var/log/cmc.log
+2016-04-19 13:49:24 [4] Ignoring command SCHEDULE_FORCED_SVC_CHECK;10.1.1.199;Check_MK
Discovery;1461066564: invalid parameters
+F-:
diff --git a/ChangeLog b/ChangeLog
index dafbd35..0346a79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@
* 3349 FIX: Added rule to disable Inline-SNMP per host...
* 3123 FIX: fix for temperature services discovered pre-1.2.8 that caused errors on
writing configuration
* 3385 FIX: Fixed not updated discovery service after grouped auto discovery...
+ * 3416 FIX: Avoid warning in cmc.log when rescheduling non-existing discovery
check...
Checks & Agents:
* 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an
Aruba Network WLAN Controller
diff --git a/modules/check_mk.py b/modules/check_mk.py
index bff1197..f50ac70 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -1505,6 +1505,11 @@ def schedule_inventory_check(hostname):
else:
# TODO: Remove this old name handling one day
command = "SCHEDULE_FORCED_SVC_CHECK;%s;Check_MK inventory;%d" %
(hostname, now)
+
+ # Ignore missing check and avoid warning in cmc.log
+ if monitoring_core == "cmc":
+ command += ";TRY"
+
s.send("COMMAND [%d] %s\n" % (now, command))
except Exception, e:
if opt_debug: