Merge bootstack-ops:create-nagios-config into bootstack-ops:master

[Jill Rouleau]

[Benjamin Kaehne (ben-kaehne)]

Looks good jillr. Approved for merging.

[Alvaro Uria (aluria)]

review: Approve (lgtm)

diff --git a/ops-bundle.yaml b/ops-bundle.yaml
index 6994893..08a1293 100644
--- a/ops-bundle.yaml
+++ b/ops-bundle.yaml
@@ -1,4 +1,7 @@
 config: &OPS_CLUSTER ["lxc:infra=0", "lxc:infra=1", "lxc:infra=2"]
+config: &MONITORING ["lxc:infra=2"]
+
+inherits: ops-secrets
 
 logging:
   services:
@@ -38,6 +41,61 @@ logging:
         - [rsyslog-elasticsearch, openstack-dashboard]
         - [rsyslog-elasticsearch, rabbitmq-server]
         - [rsyslog-elasticsearch, swift-proxy]
-        - [rsyslog-elasticsearch, ubuntu-nagios]
+        - [rsyslog-elasticsearch, nagios]
         - [rsyslog-elasticsearch, infra]
         - [rsyslog-elasticsearch, os-hosts]
+
+monitoring:
+  services:
+    nrpe:
+
+      charm: cs:nrpe
+
+    nagios:
+      charm: cs:nagios
+      num_units: 1
+      to: *MONITORING
+      options:
+        enable_livestatus: true
+        enable_pagerduty: true
+
+    thruk-agent:
+      charm: thruk-agent
+      series: trusty
+      branch: lp:~canonical-bootstack/charms/trusty/thruk-agent/trunk
+      num_units: 1
+      to: *MONITORING
+
+  relations:
+    - [nrpe, "ceilometer:nrpe-external-master"]
+    - [nrpe, "ceph:nrpe-external-master"]
+    - [nrpe, "ceph-osd:nrpe-external-master"]
+    - [nrpe, "cinder:nrpe-external-master"]
+    - [nrpe, "elasticsearch:nrpe-external-master"]
+    - [nrpe, "glance:nrpe-external-master"]
+    - [nrpe, "glance-simplestreams-sync:nrpe-external-master"]
+    - [nrpe, "heat:nrpe-external-master"]
+    - [nrpe, "keystone:nrpe-external-master"]
+    - [nrpe, "mongodb:nrpe-external-master"]
+    - [nrpe, "mysql:nrpe-external-master"]
+    - [nrpe, "ncc-memcached:nrpe-external-master"]
+    - [nrpe, "neutron-api:nrpe-external-master"]
+    - [nrpe, "neutron-gateway:nrpe-external-master"]
+    - [nrpe, "nova-cloud-controller:nrpe-external-master"]
+    - [nrpe, "openstack-dashboard:nrpe-external-master"]
+    - [nrpe, "ops-postgresql:nrpe-external-master"]
+    - [nrpe, "rabbitmq-server:nrpe-external-master"]
+    - [nrpe, "swift-proxy:nrpe-external-master"]
+    - [nrpe, "swift-storage-z1:nrpe-external-master"]
+    - [nrpe, "swift-storage-z2:nrpe-external-master"]
+    - [nrpe, "swift-storage-z3:nrpe-external-master"]
+    - [nrpe, "infra:nrpe-external-master"]
+    - [nrpe, "nova-compute:nrpe-external-master"]
+    - [nrpe, "os-cs:nrpe-external-master"]
+    - [nrpe, "os-hosts:nrpe-external-master"]
+    - ["nrpe:monitors", "nagios:monitors"]
+    - [nagios, thruk-agent]
+    - ["nagios:juju-info", "thruk-agent:general-info"]
+    - [nrpe, "thruk-agent:nrpe-external-master"]
+
+# vim: si et sw=2 ts=2
diff --git a/ops-secrets.yaml b/ops-secrets.yaml
new file mode 100644
index 0000000..9d1d3a9
--- /dev/null
+++ b/ops-secrets.yaml
@@ -0,0 +1,8 @@
+ops-secrets:
+  services:
+    nagios:
+      options:
+        pagerduty_key: XXXXXXXXXXXXX
+        nagios_host_context: CUSTOMER_NAME
+
+# vim: si et sw=2 ts=2