Merge ~paulgear/prometheus-pushgateway-charm/+git/prometheus-pushgateway-charm:master into ~stub/prometheus-pushgateway-charm:master

[Paul Gear]

[Haw Loeung (hloeung)]

LGTM, +1

review: Approve

diff --git a/config.yaml b/config.yaml
index 95d6a06..cc95499 100644
--- a/config.yaml
+++ b/config.yaml
@@ -18,4 +18,21 @@ options:
     default: ""
     type: string
     description: |
-        The minimum interval at which to write out the persistence file. Prometheus defalt is 5m0s
+        The minimum interval at which to write out the persistence file.
+        Prometheus' default is 5m0s.
+  nagios_context:
+    default: "juju"
+    type: string
+    description: |
+        Used by the nrpe subordinate charms.
+        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: ""
+    type: string
+    description: |
+        A comma-separated list of nagios servicegroups.
+        If left empty, the nagios_context will be used as the servicegroup
diff --git a/metadata.yaml b/metadata.yaml
index a273a24..6086bca 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -1,6 +1,6 @@
 name: prometheus-pushgateway
 summary: Prometheus pushgateway
-maintainer: JuanJo Ciarlante <JuanJo.Ciarlante@localhost>
+maintainer: Prometheus Charmers <[e-mail]>
 description: |
     The Prometheus Pushgateway exists to allow ephemeral and batch jobs to
     expose their metrics to Prometheus. Since these kinds of jobs may not
diff --git a/templates/etc_default_prometheus-pushgateway.j2 b/templates/etc_default_prometheus-pushgateway.j2
index 08dedad..9baf262 100644
--- a/templates/etc_default_prometheus-pushgateway.j2
+++ b/templates/etc_default_prometheus-pushgateway.j2
@@ -8,7 +8,7 @@ ARGS="
 "
 
 ######################################################################################
-# WARNINIG: Due to snap confinement the following options should not be set by hand: #
+# WARNING: Due to snap confinement, the following options should not be set by hand: #
 ######################################################################################
 #  -persistence.file string