Merge lp:~verterok/charms/trusty/conn-check/fix-nrpe-check-hostname into lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk

[Guillermo Gonzalez]

Use nagios_hostname value from the relation when configuring nrpe checks.

Use nagios_hostname value from the relation when configuring nrpe checks.

Also had to fix the nrpe library in the nrpe-external-master role to only concatenate the context when is not already in the hostname (in our case the context is already in the hostname).

Wasn't sure about that change, but check the roles git branch and the nrpe role there is quite different from the one using in conn-check

[Guillermo Gonzalez (verterok)]

Done: https://code.launchpad.net/~verterok/charms/trusty/logstash-forwarder/set-nrpe-hostname-from-relation/+merge/272614

[Guillermo Gonzalez (verterok)]

sorry, wrong MP :p

[Wes Mason (wesmason)]

lgtm

review: Approve

=== modified file 'playbook.yaml'
--- playbook.yaml	2015-08-11 14:57:30 +0000
+++ playbook.yaml	2015-09-26 21:58:25 +0000
@@ -16,7 +16,7 @@
 
   roles:
    - role: nrpe-external-master
-     nagios_hostname: "{{ relations['conn-check'][0]['__unit__']|replace('/', '-') }}"
+     nagios_hostname: "{{ relations['nrpe-external-master'][0]['nagios_hostname'] }}"
      checks:
         - name: "{{ nagios_check_name }}"
           command: "{{ env_dir }}/{{ revision }}/bin/conn-check --exclude-tags=no-nagios {{ args }} {{ config_path }}"

=== modified file 'roles/nrpe-external-master/library/nrpe'
--- roles/nrpe-external-master/library/nrpe	2015-07-20 16:16:54 +0000
+++ roles/nrpe-external-master/library/nrpe	2015-09-26 21:58:25 +0000
@@ -24,6 +24,8 @@
     charm_config["nagios_context"] = params['nagios_context']
     charm_config["nagios_servicegroups"] = params['nagios_servicegroups']
     hostname = "{}-{}".format(params['nagios_context'], params['nagios_hostname'])
+    if params['nagios_context'] in params['nagios_hostname']:
+        hostname = params['nagios_hostname']
 
     try:
         nrpe_compat = NRPE(hostname)