Merge ~brad-marshall/charm-prometheus-ceph-exporter/+git/prometheus-ceph-exporter-charm:add-nem-interface into ~prometheus-charmers/charm-prometheus-ceph-exporter/+git/prometheus-ceph-exporter-charm:master

[Brad Marshall]

Added nrpe-external-master interface and a http check

[James Hebden (ec0)]

review: Approve

diff --git a/config.yaml b/config.yaml
index 4cf7a63..afca810 100644
--- a/config.yaml
+++ b/config.yaml
@@ -7,3 +7,17 @@ options:
     description: Daemon arguments to pass to the exporter.
     type: string
     default: ""
+  nagios_context:
+    default: "juju"
+    type: string
+    description: |
+      A string that will be prepended to instance name to set the host name
+      in nagios. So for instance the hostname would be something like:
+          juju-myservice-0
+      If you're running multiple environments with the same services in them
+      this allows you to differentiate between them.
+  nagios_servicegroups:
+    default: "juju"
+    type: string
+    description: |
+      Comma separated list of nagios servicegroups for the graphite check
diff --git a/layer.yaml b/layer.yaml
index 96ddd93..0cb8df6 100644
--- a/layer.yaml
+++ b/layer.yaml
@@ -1,4 +1,4 @@
-includes: ['layer:basic', 'interface:http', 'layer:snap', 'interface:ceph-client']
+includes: ['layer:basic', 'interface:http', 'layer:snap', 'interface:ceph-client', 'interface:nrpe-external-master']
 repo: 'https://git.launchpad.net/prometheus-ceph-exporter-charm'
 ignore: ['.*.swp' ]
 options:
diff --git a/metadata.yaml b/metadata.yaml
index 55f3cf5..11d8741 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -7,6 +7,7 @@ description: |
 tags:
   - monitoring
   - prometheus
+  - ceph
 series:
   - xenial
   - trusty
@@ -14,6 +15,9 @@ subordinate: false
 provides:
   ceph-exporter:
     interface: http
+  nrpe-external-master:
+    interface: nrpe-external-master
+    scope: container
 requires:
   ceph:
     interface: ceph-client
diff --git a/reactive/prometheus-ceph-exporter.py b/reactive/prometheus-ceph-exporter.py
index 9d6fb73..91de7cc 100644
--- a/reactive/prometheus-ceph-exporter.py
+++ b/reactive/prometheus-ceph-exporter.py
@@ -21,6 +21,7 @@ from charms.reactive import (
     when, when_any, set_state, remove_state
 )
 from charms.reactive.helpers import any_file_changed, data_changed
+from charmhelpers.contrib.charmsupport import nrpe
 # from charms.layer import snap
 
 from charmhelpers.fetch import (
@@ -121,3 +122,14 @@ def restart_ceph_exporter():
 @when('ceph-exporter.available')  # Relation name is "ceph-exporter"
 def configure_ceph_exporter_relation(target):
     target.configure(PORT_DEF)
+
+
+@when('nrpe-external-master.available')
+def update_nrpe_config(svc):
+    hostname = nrpe.get_nagios_hostname()
+    nrpe_setup = nrpe.NRPE(hostname=hostname)
+    nrpe_setup.add_check('prometheus_ceph_exporter_http',
+                         'Prometheus Ceph Exporter HTTP check',
+                         'check_http -I 127.0.0.1 -p {} -u /metrics'.format(PORT_DEF)
+                         )
+    nrpe_setup.write()