Merge lp:~thedac/charms/precise/nrpe-external-master/one-to-many into lp:charms/nrpe-external-master

[David Ames]

Allow one nrpe-external-master to many service charms

Allow one nrpe-external-master to many service charms

[lp:~thedac/charms/precise/nrpe-external-master/one-to-many]

25. By David Ames on 2013-08-29

[dames,trivial] Add empty relation variable for non-relation hooks

26. By David Ames on 2013-08-30

[rfinnie,r=dames] Allow charms without an nrpe-external-master hook to get the basic checks

[Tom Haddon (mthaddon)]

Looks good.

review: Approve

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2012-11-26 04:29:01 +0000
+++ hooks/config-changed	2013-08-30 23:20:16 +0000
@@ -53,7 +53,21 @@
 #------------------------------------------------------
 # Host check
 #------------------------------------------------------
-export NAGIOS_HOSTNAME="$(config-get nagios_host_context)-$(relation-list -r $(relation-ids nrpe-external-master))"
+# Handle nrpe-external-master one to many
+# The relation that is set will have the relation information
+# others will be blank
+RELATION=''
+RELATION_IDS=$(relation-ids nrpe-external-master)
+for id in $RELATION_IDS; do
+    RELATION=$(relation-list -r $id)
+    if [ -n "$RELATION" ]; then
+        break
+    fi
+done
+if [ -z "$RELATION" ]; then
+    RELATION="$JUJU_UNIT_NAME"
+fi
+export NAGIOS_HOSTNAME="$(config-get nagios_host_context)-${RELATION}"
 export NAGIOS_HOSTNAME=${NAGIOS_HOSTNAME//\//-}
 export IPADDRESS=$(unit-get private-address)
 export HOSTCHECK_INHERIT=$(config-get hostcheck_inherit)

=== modified file 'revision'
--- revision	2012-10-26 07:10:22 +0000
+++ revision	2013-08-30 23:20:16 +0000
@@ -1,1 +1,1 @@
-5
+7