Merge lp:~chris-gondolin/charms/precise/nrpe-external-master/trunk into lp:charms/nrpe-external-master

[Chris Stratford]

Added a nagios_hostname_type option. If set to "unit" (the default) the nagios hostname follows the usual Juju unit naming scheme (i.e. <juju-context>-<charm-name>-<unit-number>). If set to "host" the nagios hostname is the server's full hostname.

Both nagios_hostname and nagios_host_context are now exported to any relations, allowing other charms to have a consistent hostname, rather than forcing each one to figure out which hostname to report in its checks.

The merge proposal is the correct way around this time.

[Charles Butler (lazypower)]

+1 LGTM

review: Approve

[lp:~chris-gondolin/charms/precise/nrpe-external-master/trunk]

29. By Liam Young on 2014-03-11

[chris-gondolin,r=lazypower] Added a nagios_hostname_type config option to decide whether to use Juju unit-style hostname or the real FQDN (useful for MaaS servers)

=== modified file 'config.yaml'
--- config.yaml	2013-10-15 11:41:03 +0000
+++ config.yaml	2014-02-26 11:09:24 +0000
@@ -16,6 +16,13 @@
             juju-postgresql-0
         If you're running multiple environments with the same services in them
         this allows you to differentiate between them.
+  nagios_hostname_type:
+    default: "unit"
+    type: string
+    description: |
+        Determines whether a server is identified by its unit name or
+        host name.  If you're in a virtual environment, "unit" is
+        probably best.  If you're using MaaS, you may prefer "host".
   disk_root:
     default: "-u GB -w 25% -c 20% -K 5%"
     type: string

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2014-02-07 11:30:53 +0000
+++ hooks/config-changed	2014-02-26 11:09:24 +0000
@@ -22,6 +22,7 @@
 
 export NAGIOS_MASTER=$(config-get nagios_master)
 export SERVER_PORT=$(config-get server_port)
+export NAGIOS_HOSTNAME_TYPE=$(config-get nagios_hostname_type)
 cheetah fill --env --oext compiled templates/nrpe.cfg.tmpl
 cp templates/nrpe.cfg.compiled /etc/nagios/nrpe.cfg
 if [[ -d /etc/rsyncd.d ]]; then
@@ -82,8 +83,17 @@
 if [ -z "$RELATION" ]; then
     RELATION="$JUJU_UNIT_NAME"
 fi
-export NAGIOS_HOSTNAME="$(config-get nagios_host_context)-${RELATION}"
-export NAGIOS_HOSTNAME=${NAGIOS_HOSTNAME//\//-}
+if [ "$NAGIOS_HOSTNAME_TYPE" = "host" ]; then
+    export NAGIOS_HOSTNAME=$(hostname --fqdn)
+else
+    export NAGIOS_HOSTNAME="$(config-get nagios_host_context)-${RELATION}"
+    export NAGIOS_HOSTNAME=${NAGIOS_HOSTNAME//\//-}
+fi
+RELATION_IDS=$(relation-ids nrpe-external-master)
+for id in $RELATION_IDS; do
+    relation-set -r $id nagios_hostname=${NAGIOS_HOSTNAME}
+    relation-set -r $id nagios_host_context=$(config-get nagios_host_context)
+done
 export IPADDRESS=$(get_ipaddress $(unit-get private-address))
 export HOSTCHECK_INHERIT=$(config-get hostcheck_inherit)
 export HOSTGROUPS=$(config-get hostgroups)

=== modified file 'metadata.yaml'
--- metadata.yaml	2012-10-02 19:33:44 +0000
+++ metadata.yaml	2014-02-26 11:09:24 +0000
@@ -19,6 +19,7 @@
   nrpe-external-master:
     interface: nrpe-external-master
     scope: container
+    sets: [nagios_hostname, nagios_host_context]
   general-info:
     interface: juju-info
     scope: container