Merge ~xavpaice/charm-nrpe:lp-1659728 into ~nrpe-charmers/charm-nrpe:master

[Xav Paice]

return OK if nf_conntrack_max not present

Fixes: 1659728

[Paul Gear (paulgear)]

Handled in https://code.launchpad.net/~paulgear/nrpe-charm/+git/nrpe-charm/+merge/322170

Unmerged commits

740159c... by Xav Paice on 2017-02-19

[xavpaice] return OK if nf_conntrack_max not present

diff --git a/files/plugins/check_conntrack.sh b/files/plugins/check_conntrack.sh
index 0cfaf28..5aa1601 100755
--- a/files/plugins/check_conntrack.sh
+++ b/files/plugins/check_conntrack.sh
@@ -20,6 +20,11 @@ if ! lsmod | grep -q conntrack; then
     exit $STATE_OK
 fi
 
+if ! [ -f /proc/sys/net/netfilter/nf_conntrack_max ] ; then
+    echo "OK: no conntrack max present"
+    exit $STATE_OK
+fi
+
 max=$(sysctl net.netfilter.nf_conntrack_max | awk '{ print $3 }')
 current=$(sysctl net.netfilter.nf_conntrack_count | awk '{ print $3 }')