Merge lp:~mthaddon/mojo/grafana-nagios-checks into lp:mojo/mojo-specs

Proposed by Tom Haddon on 2018-04-04
Status: Merged
Approved by: Jamon Camisso on 2018-04-04
Approved revision: 102
Merged at revision: 102
Proposed branch: lp:~mthaddon/mojo/grafana-nagios-checks
Merge into: lp:mojo/mojo-specs
Diff against target: 23 lines (+6/-1)
1 file modified
charm-testing/grafana/deploy (+6/-1)
To merge this branch: bzr merge lp:~mthaddon/mojo/grafana-nagios-checks
Reviewer Review Type Date Requested Status
Mojo Maintainers 2018-04-04 Pending
Review via email: mp+342677@code.launchpad.net

Commit message

charm-testing/grafana: Create separate nrpe application for apache and bump load thresholds

Description of the change

charm-testing/grafana: Create separate nrpe application for apache and bump load thresholds

To post a comment you must log in.

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Change successfully merged at revision 102

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charm-testing/grafana/deploy'
2--- charm-testing/grafana/deploy 2017-09-11 11:14:27 +0000
3+++ charm-testing/grafana/deploy 2018-04-04 16:59:02 +0000
4@@ -15,6 +15,11 @@
5 ssl_chainlocation: ssl-cert-snakeoil.crt
6 ssl_keylocation: ssl-cert-snakeoil.key
7 ssl_certlocation: ssl-cert-snakeoil.crt
8+ apache2-nrpe:
9+ charm: nrpe
10+ options:
11+ swap: '-w 90% -c 75% -n OK'
12+ load: '-w 10,10,10 -c 20,20,20'
13 prometheus:
14 num_units: 1
15 charm: prometheus
16@@ -61,7 +66,7 @@
17 - ["telegraf:juju-info", "apache2"]
18 - ["telegraf:juju-info", "prometheus:juju-info"]
19 - ["telegraf:juju-info", "grafana"]
20- - ["nrpe:local-monitors", "apache2:local-monitors"]
21+ - ["apache2-nrpe:local-monitors", "apache2:local-monitors"]
22 - ["nrpe", "prometheus"]
23 - ["nrpe", "grafana"]
24

Subscribers

People subscribed via source and target branches

to all changes: