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

[Tom Haddon]

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

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

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 102

=== modified file 'charm-testing/grafana/deploy'
--- charm-testing/grafana/deploy	2017-09-11 11:14:27 +0000
+++ charm-testing/grafana/deploy	2018-04-04 16:59:02 +0000
@@ -15,6 +15,11 @@
                 ssl_chainlocation: ssl-cert-snakeoil.crt
                 ssl_keylocation: ssl-cert-snakeoil.key
                 ssl_certlocation: ssl-cert-snakeoil.crt
+        apache2-nrpe:
+            charm: nrpe
+            options:
+                swap: '-w 90% -c 75% -n OK'
+                load: '-w 10,10,10 -c 20,20,20'
         prometheus:
             num_units: 1
             charm: prometheus
@@ -61,7 +66,7 @@
         - ["telegraf:juju-info", "apache2"]
         - ["telegraf:juju-info", "prometheus:juju-info"]
         - ["telegraf:juju-info", "grafana"]
-        - ["nrpe:local-monitors", "apache2:local-monitors"]
+        - ["apache2-nrpe:local-monitors", "apache2:local-monitors"]
         - ["nrpe", "prometheus"]
         - ["nrpe", "grafana"]