Merge lp:~thedac/charms/precise/errors/fix-nagios into lp:~daisy-pluckers/charms/precise/errors/trunk

Proposed by David Ames
Status: Merged
Merged at revision: 44
Proposed branch: lp:~thedac/charms/precise/errors/fix-nagios
Merge into: lp:~daisy-pluckers/charms/precise/errors/trunk
Diff against target: 11 lines (+1/-1)
1 file modified
hooks/nrpe-external-master-relation-changed (+1/-1)
To merge this branch: bzr merge lp:~thedac/charms/precise/errors/fix-nagios
Reviewer Review Type Date Requested Status
Daisy Pluckers Pending
Review via email: mp+247059@code.launchpad.net

Description of the change

With django 1.6 we need to specify a hostname for the nagios check

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/nrpe-external-master-relation-changed'
2--- hooks/nrpe-external-master-relation-changed 2013-05-03 14:18:28 +0000
3+++ hooks/nrpe-external-master-relation-changed 2015-01-20 18:21:21 +0000
4@@ -9,7 +9,7 @@
5
6 export SERVICE_DESCRIPTION="Error tracker app server"
7 export NRPE_CMD_NAME="check_ue_error_app_${INSTANCE_TYPE}"
8-export NRPE_CMD="/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -p ${LISTEN_PORT} ${NRPE_URL_CHECK_PARAMS}"
9+export NRPE_CMD="/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -H localhost -p ${LISTEN_PORT} ${NRPE_URL_CHECK_PARAMS}"
10 cheetah fill --env -p templates/nrpe_cmd_file.tmpl > /etc/nagios/nrpe.d/${NRPE_CMD_NAME}.cfg
11 cheetah fill --env -p templates/nrpe_service_file.tmpl > /var/lib/nagios/export/service__${NAGIOS_HOSTNAME}_${NRPE_CMD_NAME}.cfg
12

Subscribers

People subscribed via source and target branches

to all changes: