Merge lp:~deej/charms/xenial/errors/nrpe-relation-data into lp:~daisy-pluckers/charms/xenial/errors/trunk

[David Lawson]

[deej] Use nrpe relation data to set hostname and default service group

[deej] Use nrpe relation data to set hostname and default service group

[Brian Murray (brian-murray)]

review: Approve

=== modified file 'hooks/nrpe-external-master-relation-changed'
--- hooks/nrpe-external-master-relation-changed	2015-01-20 18:14:09 +0000
+++ hooks/nrpe-external-master-relation-changed	2018-09-05 03:07:27 +0000
@@ -1,10 +1,17 @@
 #!/bin/bash
 set -eux
 . hooks/common
-export NAGIOS_HOSTNAME="ue-${REGION}-et-${JUJU_UNIT_NAME//\//-}"
+relation_id=$(relation-ids nrpe-external-master)
+if [ -z "$relation_id" ]; then
+    echo "No nrpe-external-master relation yet. Skipping nrpe setup"
+    return 0
+fi
+relation_unit=$(relation-list -r $relation_id)
+nagios_host_context=$(relation-get -r $relation_id nagios_host_context $relation_unit)
+export NAGIOS_HOSTNAME=$(relation-get -r $relation_id nagios_hostname $relation_unit)
 
 export INSTANCE_TYPE
-export NAGIOS_SERVICEGROUP="ue-${REGION}-et"
+export NAGIOS_SERVICEGROUP=$nagios_host_context
 export PROJECT="UE"
 
 export SERVICE_DESCRIPTION="Error tracker app server"