Module: check_mk
Branch: master
Commit: 4d366fdb36d8510710f0c85b3981cc97a412d025
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d366fdb36d851…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Fri Feb 12 08:33:31 2016 +0100
#2981 isc_dhcpd: added leases path /var/lib/dhcpd/dhcpd.leases for CentOS
---
.werks/2981 | 9 +++++++++
ChangeLog | 1 +
agents/plugins/isc_dhcpd | 6 +++++-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/.werks/2981 b/.werks/2981
new file mode 100644
index 0000000..658ef11
--- /dev/null
+++ b/.werks/2981
@@ -0,0 +1,9 @@
+Title: isc_dhcpd: added leases path /var/lib/dhcpd/dhcpd.leases for CentOS
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.7i4
+Date: 1455262300
+Class: feature
+
+
diff --git a/ChangeLog b/ChangeLog
index 8b2f8ab..633b151 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -116,6 +116,7 @@
* 3173 datapower_cpu datapower_fan datapower_fs datapower_ldrive datapower_mem
datapower_pdrive datapower_raid_bat datapower_tcp datapower_temp: Detect XI52 Model
* 2979 aruba_wlc_aps: new inventory plugin for Aruba Networks WLAN Controller which
displays name, group name, model, serial number and system location of all access points
of this WLC
* 2980 agent_ipmi_sensors: new special agent to monitor IPMI data via ipmi-sensors
(of freeipmi)...
+ * 2981 isc_dhcpd: added leases path /var/lib/dhcpd/dhcpd.leases for CentOS
* 2660 FIX: fixed windows agent using the wrong working directory...
* 2664 FIX: ps: Speedup in situation with many matching processes...
* 2661 FIX: windows agent: fixed incomplete process list...
diff --git a/agents/plugins/isc_dhcpd b/agents/plugins/isc_dhcpd
index 22482d6..297d328 100755
--- a/agents/plugins/isc_dhcpd
+++ b/agents/plugins/isc_dhcpd
@@ -9,7 +9,11 @@ for path in [ '/etc/dhcpd.conf', '/etc/dhcp/dhcpd.conf'
]:
break
leases_file = None
-for path in [ '/var/lib/dhcp/db/dhcpd.leases',
'/var/lib/dhcp/dhcpd.leases' ]:
+for path in [
+ '/var/lib/dhcp/db/dhcpd.leases',
+ '/var/lib/dhcp/dhcpd.leases',
+ '/var/lib/dhcpd/dhcpd.leases', # CentOS
+ ]:
if os.path.exists(path):
leases_file = path
break