NRPE Charm

Merge ~xavpaice/charm-nrpe:fix_conntrack into ~nrpe-charmers/charm-nrpe:master

  1. Git
  2. lp:~xavpaice/charm-nrpe
  3. fix_conntrack
  4. Merge into master
Proposed by Xav Paice
Status: Merged
Approved by: James Hebden
Approved revision: dc1e367461b64c94f9fbe381c1c31d82af732f59
Merge reported by: Xav Paice
Merged at revision: dc1e367461b64c94f9fbe381c1c31d82af732f59
Proposed branch: ~xavpaice/charm-nrpe:fix_conntrack
Merge into: ~nrpe-charmers/charm-nrpe:master
Diff against target: 16 lines (+5/-0)
1 file modified
files/plugins/check_conntrack.sh (+5/-0)
Reviewer Review Type Date Requested Status
James Hebden (community) Approve
Review via email: mp+328285@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Hebden (ec0) wrote :

LGTM. If the conntrack /proc entries aren't there, as observed in LXD containers, there's not much to do anyhow.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/files/plugins/check_conntrack.sh b/files/plugins/check_conntrack.sh
2index 1f08075..98ba54b 100755
3--- a/files/plugins/check_conntrack.sh
4+++ b/files/plugins/check_conntrack.sh
5@@ -20,6 +20,11 @@ if ! lsmod | grep -q conntrack; then
6 exit $STATE_OK
7 fi
8
9+if ! [ -e /proc/sys/net/netfilter/nf_conntrack_max ]; then
10+ echo "OK: conntrack not available"
11+ exit $STATE_OK
12+fi
13+
14 max=$(sysctl net.netfilter.nf_conntrack_max 2>/dev/null | awk '{ print $3 }')
15 if [ -z "$max" ]; then
16 echo "UNKNOWN: unable to retrieve value of net.netfilter.nf_conntrack_max"

Subscribers

People subscribed via source and target branches