Merge lp:~pedronis/charms/trusty/tanuki-spec-manager/use-nagios-ep into lp:~tanuki/charms/trusty/tanuki-spec-manager/trunk

Proposed by Samuele Pedroni
Status: Merged
Approved by: Guillermo Gonzalez
Approved revision: 17
Merge reported by: Samuele Pedroni
Merged at revision: not available
Proposed branch: lp:~pedronis/charms/trusty/tanuki-spec-manager/use-nagios-ep
Merge into: lp:~tanuki/charms/trusty/tanuki-spec-manager/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/actions.py (+1/-1)
To merge this branch: bzr merge lp:~pedronis/charms/trusty/tanuki-spec-manager/use-nagios-ep
Reviewer Review Type Date Requested Status
Celso Providelo (community) Approve
Review via email: mp+267636@code.launchpad.net

Commit message

use /nagios for nagios check

Description of the change

use /nagios for nagios check

To post a comment you must log in.
Revision history for this message
Celso Providelo (cprov) wrote :

Thanks, Samuele.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/actions.py'
2--- hooks/actions.py 2015-08-04 13:25:45 +0000
3+++ hooks/actions.py 2015-08-11 09:52:37 +0000
4@@ -211,7 +211,7 @@
5 nrpe_compat.add_check(
6 shortname="check_app_http",
7 description="Check app http",
8- check_cmd="/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -p 8000 -e ' 200 OK' -u '/'",
9+ check_cmd="/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -p 8000 -e ' 200 OK' -u '/nagios'",
10 )
11
12 nrpe_compat.write()

Subscribers

People subscribed via source and target branches

to all changes: