Juju Charms Collection
tanuki-result-enum-api package

Merge lp:~thomir-deactivatedaccount/charms/trusty/tanuki-result-enum-api/trunk-nagios into lp:~tanuki/charms/trusty/tanuki-result-enum-api/trunk

  1. Trusty Tahr (14.04)
  2. trunk-nagios
  3. Merge into trunk
Proposed by Thomi Richards
Status: Merged
Approved by: Thomi Richards
Approved revision: 19
Merged at revision: 19
Proposed branch: lp:~thomir-deactivatedaccount/charms/trusty/tanuki-result-enum-api/trunk-nagios
Merge into: lp:~tanuki/charms/trusty/tanuki-result-enum-api/trunk
Diff against target: 14 lines (+2/-2)
1 file modified
hooks/actions.py (+2/-2)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/charms/trusty/tanuki-result-enum-api/trunk-nagios
Reviewer Review Type Date Requested Status
Bret Barker (community) Approve
Review via email: mp+269681@code.launchpad.net

Commit message

Update nagios endpoint & check message.

Description of the change

Update nagios endpoint & check message.

Needs to land together with https://code.launchpad.net/~thomir/tanuki-result-enumerator/trunk-decompose-nagios/+merge/269680

To post a comment you must log in.
Revision history for this message
Bret Barker (noise) wrote :

LGTM

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-14 14:25:37 +0000
3+++ hooks/actions.py 2015-08-31 21:25:23 +0000
4@@ -203,8 +203,8 @@
5
6 nrpe_compat.add_check(
7 shortname="check_app_http",
8- description="Check app http",
9- check_cmd="/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -p 8000 -e ' 200 OK' -u '/nagios'",
10+ description="App or app mongodb connection check",
11+ check_cmd="/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -p 8000 -e ' 200 OK' -u '/nagios/mongodb'",
12 )
13
14 nrpe_compat.write()

Subscribers

People subscribed via source and target branches

to all changes: