Merge lp:~daniel-thewatkins/charms/trusty/ubuntu-repository-cache/nrpe-servicegroups into lp:charms/trusty/ubuntu-repository-cache

[Dan Watkins]

[Dan Watkins (daniel-thewatkins)]

This turned out to be pretty painless, because we had already pulled in a charmhelpers that supports it as part of a different change.

[Robert C Jennings (rcj)]

One comment on update_checks()

[Robert C Jennings (rcj)]

Re-reading the code, I see that you added the service.update_checks() to the 'config-changed' hook which is absolutely correct.

review: Approve

[Marco Ceppi (marcoceppi)]

LGTM

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-03-27 20:24:30 +0000
+++ config.yaml	2015-10-20 11:31:49 +0000
@@ -28,11 +28,17 @@
     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.
+      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
   apache2_server_tokens:
     type: string
     description: |

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-06-08 16:17:55 +0000
+++ hooks/hooks.py	2015-10-20 11:31:49 +0000
@@ -46,6 +46,7 @@
 
     LOG('Config changed for %s' % SERVICE)
     service.render_configs()
+    service.update_checks()
 
 
 @HOOKS.hook('upgrade-charm')