Module: check_mk
Branch: master
Commit: 346de9c89356d5f2efee59e8b568ce278d2b7d13
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=346de9c89356d5…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Oct 18 21:30:40 2013 -0400
FIX: nfsexports: also support systems with rpcbind instead of portmap
---
.bugs/1035 | 6 ++++--
ChangeLog | 1 +
agents/plugins/nfsexports | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.bugs/1035 b/.bugs/1035
index 0edf0e9..fe438e3 100644
--- a/.bugs/1035
+++ b/.bugs/1035
@@ -1,9 +1,9 @@
Title: make nfsexports plugin work with rpcbind too
Component: checks
-State: open
+Class: nastiness
+State: done
Date: 2013-08-27 10:31:53
Targetversion: 1.2.3
-Class: nastiness
today i added the nfsexports plugin to my check_mk_agent and wondered
why it doesn't find any exports.
@@ -41,3 +41,5 @@ index 185de07..d5ca96d 100755
# any exports or have running daemons? then look for registered exports
if [[ $EXPORTS ]]; then
-- 1.8.1.2
+
+2013-10-18 21:30:00: changed state open -> done
diff --git a/ChangeLog b/ChangeLog
index 694411f..86f6dc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,6 +58,7 @@
* FIX: logwatch.ec: No longer forwards "I" lines to event console
* FIX: check_dns: default to querying the host itself
* FIX: ps: do not output perfdata of CPU averaging (use ps.perf for that)
+ * FIX: nfsexports: also support systems with rpcbind instead of portmap
WATO:
* You can now have site-specific global settings when using
diff --git a/agents/plugins/nfsexports b/agents/plugins/nfsexports
index 185de07..39ba2bc 100755
--- a/agents/plugins/nfsexports
+++ b/agents/plugins/nfsexports
@@ -7,7 +7,7 @@
if [ -r /etc/exports ]; then
EXPORTS=$(grep -v -e ^# -e ^$ /etc/exports)
fi
-pgrep portmap 1>/dev/null && pgrep rpc.mountd 1>/dev/null &&
DAEMONS="ok"
+pgrep '(portmap|rpcbind)' >/dev/null && pgrep rpc.mountd >/dev/null
&& DAEMONS="ok"
# any exports or have running daemons? then look for registered exports
if [[ $EXPORTS ]]; then
@@ -15,4 +15,4 @@ if [[ $EXPORTS ]]; then
if [[ $DAEMONS ]]; then
waitmax 3 showmount --no-headers -e
fi
-fi
+fi