Merge ~sajoupa/launchpad-mojo-specs:ps5 into launchpad-mojo-specs:master

[Laurent Sesquès]

[Colin Watson (cjwatson)]

review: Approve

diff --git a/lp-webhooks-proxy/bundle.yaml b/lp-webhooks-proxy/bundle.yaml
index d2bcd20..3ff0e1b 100644
--- a/lp-webhooks-proxy/bundle.yaml
+++ b/lp-webhooks-proxy/bundle.yaml
@@ -12,7 +12,7 @@
 {%- if stage_name == "production" %}
 {%-   set nagios_context = "lp-prodstack-webhooks-proxy" %}
 {%-   set nagios_hostgroups = "prodstack-lp" %}
-{%-   set nagios_master = "wekufe.canonical.com" %}
+{%-   set nagios_master = "wekufe.canonical.com,nagios.ps5.internal" %}
 {#-   localhost, ackee, loganberry #}
 {%-   set trusted_hosts = "127.0.0.0/8, 91.189.89.26, 91.189.90.37" %}
 {%- elif stage_name == "staging" %}
@@ -142,6 +142,7 @@ applications:
   nrpe:
     charm: cs:nrpe-73
     options:
+      export_nagios_definitions: true
       hostgroups: {{ nagios_hostgroups }}
       nagios_host_context: {{ nagios_context }}
       nagios_master: {{ nagios_master }}