Juju Charms Collection
conn-check package

Merge lp:~bloodearnest/charms/trusty/conn-check/nagios-module-typo-fixes into lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk

  1. Trusty Tahr (14.04)
  2. nagios-module-typo-fixes
  3. Merge into trunk
Proposed by Simon Davy
Status: Merged
Approved by: Wes Mason
Approved revision: 47
Merged at revision: 44
Proposed branch: lp:~bloodearnest/charms/trusty/conn-check/nagios-module-typo-fixes
Merge into: lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk
Diff against target: 46 lines (+6/-6)
3 files modified
playbook.yaml (+1/-2)
roles/nrpe-external-master/defaults/main.yaml (+1/-1)
roles/nrpe-external-master/library/nrpe (+4/-3)
To merge this branch: bzr merge lp:~bloodearnest/charms/trusty/conn-check/nagios-module-typo-fixes
Reviewer Review Type Date Requested Status
Wes Mason (community) Approve
Review via email: mp+265307@code.launchpad.net

Commit message

Fixes for the new nrpe role

Description of the change

Fixes for the new nrpe role

To post a comment you must log in.
Revision history for this message
Wes Mason (wesmason) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'playbook.yaml'
2--- playbook.yaml 2015-07-20 12:57:03 +0000
3+++ playbook.yaml 2015-07-20 18:54:01 +0000
4@@ -16,8 +16,7 @@
5
6 roles:
7 - role: nrpe-external-master
8- # use hostname for principle charm
9- nagios_hostname: "{{ relations['conn-check'][0]['__unit__']|replace('/', '=') }}"
10+ nagios_hostname: "{{ relations['conn-check'][0]['__unit__']|replace('/', '-') }}"
11 checks:
12 - name: click_updown_conn_check
13 command: "{{ env_dir }}/{{ revision }}/bin/conn-check --exclude-tags=no-nagios {{ args }} {{ config_path }}"
14
15=== modified file 'roles/nrpe-external-master/defaults/main.yaml'
16--- roles/nrpe-external-master/defaults/main.yaml 2015-07-20 12:57:03 +0000
17+++ roles/nrpe-external-master/defaults/main.yaml 2015-07-20 18:54:01 +0000
18@@ -1,3 +1,3 @@
19 nagios_context: "{{ relations['nrpe-external-master'][0].nagios_host_context }}"
20-nagios_hostname: "{{ local_unit|replace('/', '-')) }}"
21+nagios_hostname: "{{ local_unit|replace('/', '-') }}"
22 nagios_servicegroups: "{{ nagios_context }}"
23
24=== modified file 'roles/nrpe-external-master/library/nrpe'
25--- roles/nrpe-external-master/library/nrpe 2015-07-20 12:57:03 +0000
26+++ roles/nrpe-external-master/library/nrpe 2015-07-20 18:54:01 +0000
27@@ -22,8 +22,8 @@
28 # NRPE is hardcoded to pick up nagios_context from the charm config
29 charm_config = config()
30 charm_config["nagios_context"] = params['nagios_context']
31- charm_config["nagios_servicegroups"] = params['servicegroups']
32- hostname = "{}-{}".format(params['nagios_context'], params['hostname'])
33+ charm_config["nagios_servicegroups"] = params['nagios_servicegroups']
34+ hostname = "{}-{}".format(params['nagios_context'], params['nagios_hostname'])
35
36 try:
37 nrpe_compat = NRPE(hostname)
38@@ -34,7 +34,8 @@
39 )
40 nrpe_compat.write()
41 except Exception as e:
42- module.fail_json(msg=e.msg)
43+ import traceback
44+ module.fail_json(msg=e.message, traceback=traceback.format_exc())
45 else:
46 module.exit_json(changed=True)
47

Subscribers

People subscribed via source and target branches

to all changes: