Merge lp:~brad-marshall/charms/trusty/nrpe-external-master/add-network-ns-check into lp:charms/nrpe-external-master

[Brad Marshall]

Add a nrpe check that tests each network namespace to ensure its responding.

[lp:~brad-marshall/charms/trusty/nrpe-external-master/add-network-ns-check]

39. By Brad Marshall on 2014-11-20

[bradm] Removed logic to check if there are no namespaces, this is just checking if what is there is working

40. By Brad Marshall on 2014-11-20

[bradm] Add an update of the locally provided checks to config-changed hook, and a upgrade-charm hook that points to config-changed.

[JuanJo Ciarlante (jjo)]

Please see inline comment below, LGTM afterwards.

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-10335-results

review: Needs Fixing (automated testing)

[Marco Ceppi (marcoceppi)]

While the tests produced "failure" they were for timeouts during deployments. This LGTM as long as jjo's comments are addressed

[lp:~brad-marshall/charms/trusty/nrpe-external-master/add-network-ns-check]

41. By Brad Marshall on 2014-11-20

[bradm] Tweaked logic on the error conditions a bit, and fixed the return message for the case where we have no namespaces defined.

42. By Brad Marshall on 2014-11-21

[bradm] Fixed if statement

[Charles Butler (lazypower)]

The tests ran fine for me, and the merge looks solid.

Thanks for the contribution brad-marshall!

review: Approve

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-10703-results

review: Needs Fixing (automated testing)

=== added file 'files/check_netns.sh'
--- files/check_netns.sh	1970-01-01 00:00:00 +0000
+++ files/check_netns.sh	2014-11-21 00:37:51 +0000
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# Copyright (c) 2014 Canonical, Ltd
+# Author: Brad Marshall <[e-mail]>
+
+# Checks if a network namespace is responding by doing an ip a in each one.
+
+. /usr/lib/nagios/plugins/utils.sh
+
+netnsok=()
+netnscrit=()
+
+for ns in $(ip netns list); do
+    output=$(ip netns exec $ns ip a 2>/dev/null)
+    err=$?
+    if [ $err -eq 0 ]; then
+        netnsok=("${netnsok[@]}" $ns)
+    else
+        netnscrit=("${netnscrit[@]}" $ns)
+    fi
+done
+
+if [ ${#netnscrit[@]} -eq 0 ]; then
+    if [ ${#netnsok[@]} -eq 0 ]; then
+        echo "OK: no namespaces defined"
+        exit $STATE_OK
+    else
+        echo "OK: ${netnsok[@]} are responding"
+        exit $STATE_OK
+    fi
+else
+    echo "CRIT: ${netnscrit[@]} aren't responding"
+    exit $STATE_CRIT
+fi
+

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2014-11-06 07:40:09 +0000
+++ hooks/config-changed	2014-11-21 00:37:51 +0000
@@ -30,6 +30,8 @@
 mkdir -p /etc/rsync-juju.d
 cp templates/rsyncd.conf.compiled /etc/rsync-juju.d/010-nrpe-external-master.conf
 
+cp files/check_* /usr/local/lib/nagios/plugins/
+
 #-----------------------------------------------------
 # Standard Checks
 #-----------------------------------------------------

=== added symlink 'hooks/upgrade-charm'
=== target is u'config-changed'