Juju Charms Collection
solr-jetty package

Merge lp:~thedac/charms/precise/solr-jetty/nagios-fix into lp:~charmers/charms/precise/solr-jetty/trunk

  1. Precise Pangolin (12.04)
  2. nagios-fix
  3. Merge into trunk
Proposed by David Ames
Status: Merged
Approved by: Matthew Wedgwood
Approved revision: 20
Merged at revision: 17
Proposed branch: lp:~thedac/charms/precise/solr-jetty/nagios-fix
Merge into: lp:~charmers/charms/precise/solr-jetty/trunk
Diff against target: 64 lines (+15/-3)
5 files modified
.bzrignore (+1/-0)
config.yaml (+4/-0)
hooks/config-changed (+8/-0)
hooks/nrpe-external-master-relation-changed (+2/-2)
revision (+0/-1)
To merge this branch: bzr merge lp:~thedac/charms/precise/solr-jetty/nagios-fix
Reviewer Review Type Date Requested Status
Matthew Wedgwood (community) Approve
Review via email: mp+163586@code.launchpad.net

Description of the change

Add missing nagios_context variable

To post a comment you must log in.
lp:~thedac/charms/precise/solr-jetty/nagios-fix updated
18. By David Ames

Missing single quote

19. By David Ames

Force an nrpe-external-master relation changed hook run if relation exists

20. By David Ames

Done' run nrpe-external-master unless /var/lib/nagios/export directory exists

21. By David Ames

bzr ignore revision file

Revision history for this message
Matthew Wedgwood (mew) wrote :

Looks good. Thanks for the fixes.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file '.bzrignore'
2--- .bzrignore 1970-01-01 00:00:00 +0000
3+++ .bzrignore 2013-05-13 21:35:27 +0000
4@@ -0,0 +1,1 @@
5+revision
6
7=== modified file 'config.yaml'
8--- config.yaml 2013-04-23 16:40:03 +0000
9+++ config.yaml 2013-05-13 21:35:27 +0000
10@@ -25,6 +25,10 @@
11 default: ""
12 type: string
13 description: Name of nagios service group. Used by nrpe-external-master.
14+ nagios_context:
15+ default: ""
16+ type: string
17+ description: Staging or Production. Used by nrpe-external-master.
18 check_url:
19 default: ""
20 type: string
21
22=== modified file 'hooks/config-changed'
23--- hooks/config-changed 2013-04-23 16:40:03 +0000
24+++ hooks/config-changed 2013-05-13 21:35:27 +0000
25@@ -58,3 +58,11 @@
26 if [[ "$EPHEMERAL" != 'True' ]]; then
27 /usr/bin/python scripts/mount-volume.py
28 fi
29+
30+# If nrpe-external-master relation exists update it
31+NRPE_RELATION=$(relation-ids nrpe-external-master)
32+if [ -n "$NRPE_RELATION" ]; then
33+ if [ -d /var/lib/nagios/export ]; then
34+ hooks/nrpe-external-master-relation-changed
35+ fi
36+fi
37
38=== modified file 'hooks/nrpe-external-master-relation-changed'
39--- hooks/nrpe-external-master-relation-changed 2013-04-22 20:19:35 +0000
40+++ hooks/nrpe-external-master-relation-changed 2013-05-13 21:35:27 +0000
41@@ -1,7 +1,7 @@
42 #!/bin/bash
43 set -eux
44
45-NAGIOS_CONTEXT=$(config-get nagios-context)
46+NAGIOS_CONTEXT=$(config-get nagios_context)
47 NAGIOS_HOSTNAME="${NAGIOS_CONTEXT}-${JUJU_UNIT_NAME//\//-}"
48 INSTANCE_TYPE=$(config-get instance_type)
49 SERVICE_GROUP=$(config-get nagios_service_group)
50@@ -9,7 +9,7 @@
51 CHECK_REGEX=$(config-get check_regex)
52
53 NRPE_CHECK="# Solr Jetty ${INSTANCE_TYPE}
54-command[check_solr_jetty_${INSTANCE_TYPE}]=/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -p 8080 -e ' 200 OK' --url='${CHECK_URL} --regex='${CHECK_REGEX}'"
55+command[check_solr_jetty_${INSTANCE_TYPE}]=/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -p 8080 -e ' 200 OK' --url='${CHECK_URL}' --regex='${CHECK_REGEX}'"
56
57 echo "$NRPE_CHECK" > /etc/nagios/nrpe.d/check_solr_jetty_${INSTANCE_TYPE}.cfg
58
59
60=== removed file 'revision'
61--- revision 2013-04-24 18:05:23 +0000
62+++ revision 1970-01-01 00:00:00 +0000
63@@ -1,1 +0,0 @@
64-3

Subscribers

People subscribed via source and target branches

to all changes: