Merge lp:~verterok/charms/trusty/conn-check/fix-nrpe-check-hostname into lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk
Proposed by
Guillermo Gonzalez
Status: | Merged |
---|---|
Approved by: | Guillermo Gonzalez |
Approved revision: | 49 |
Merged at revision: | 47 |
Proposed branch: | lp:~verterok/charms/trusty/conn-check/fix-nrpe-check-hostname |
Merge into: | lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk |
Diff against target: |
25 lines (+3/-1) 2 files modified
playbook.yaml (+1/-1) roles/nrpe-external-master/library/nrpe (+2/-0) |
To merge this branch: | bzr merge lp:~verterok/charms/trusty/conn-check/fix-nrpe-check-hostname |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Wes Mason (community) | Approve | ||
Review via email: mp+272523@code.launchpad.net |
Commit message
Use nagios_hostname value from the relation when configuring nrpe checks.
Description of the change
Use nagios_hostname value from the relation when configuring nrpe checks.
Also had to fix the nrpe library in the nrpe-external-
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
To post a comment you must log in.
Done: https:/ /code.launchpad .net/~verterok/ charms/ trusty/ logstash- forwarder/ set-nrpe- hostname- from-relation/ +merge/ 272614