Module: check_mk
Branch: master
Commit: 6213efd0b5afd3beebe12fdb074d49b3cbfacce8
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6213efd0b5afd3…
Author: Moritz Kiemer <mo(a)mathias-kettner.de>
Date: Wed Apr 3 12:01:50 2019 +0200
7390 FIX ipmi_sensors: Stop flooding syslog if no IPMI devices are present
In case no IPMI device was present on a system, the system log was flooded
with error messages.
We no longer call ipmi-sensors if no IPMI devices are found. Considered IPMI
devices are all that match "/dev/ipmi*" (in particular /dev/ipmi0, /dev/ipmi/0
and /dev/ipmidev/0).
CMK-1884
Change-Id: I3a49a4e0ca3c609bff513a60442bb38e1c76cf2a
---
.werks/7390 | 14 ++++++++++++++
agents/check_mk_agent.linux | 2 +-
agents/check_mk_agent.openwrt | 2 +-
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/.werks/7390 b/.werks/7390
new file mode 100644
index 0000000..4d15b3b
--- /dev/null
+++ b/.werks/7390
@@ -0,0 +1,14 @@
+Title: ipmi_sensors: Stop flooding syslog if no IPMI devices are present
+Level: 1
+Component: checks
+Compatible: compat
+Edition: cre
+Version: 1.6.0i1
+Date: 1554283471
+Class: fix
+
+In case no IPMI device was present on a system, the system log was flooded
+with error messages.
+We no longer call ipmi-sensors if no IPMI devices are found. Considered IPMI
+devices are all that match "/dev/ipmi*" (in particular /dev/ipmi0, /dev/ipmi/0
+and /dev/ipmidev/0).
diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux
index b93d76d..b787fd1 100755
--- a/agents/check_mk_agent.linux
+++ b/agents/check_mk_agent.linux
@@ -571,7 +571,7 @@ fi
# IPMI data via ipmi-sensors (of freeipmi). Please make sure, that if you
# have installed freeipmi that IPMI is really support by your hardware.
-if type ipmi-sensors >/dev/null
+if (type ipmi-sensors && ls /dev/ipmi*) &>/dev/null
then
echo '<<<ipmi_sensors>>>'
# Newer ipmi-sensors version have new output format; Legacy format can be used
diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt
index 6661bf5..8deb826 100755
--- a/agents/check_mk_agent.openwrt
+++ b/agents/check_mk_agent.openwrt
@@ -410,7 +410,7 @@ fi
# IPMI data via ipmi-sensors (of freeipmi). Please make sure, that if you
# have installed freeipmi that IPMI is really support by your hardware.
-if type ipmi-sensors >/dev/null
+if (type ipmi-sensors && ls /dev/ipmi*) &>/dev/null
then
echo '<<<ipmi_sensors>>>'
# Newer ipmi-sensors version have new output format; Legacy format can be used