Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:separate-nagios-checks-by-role into ubuntu-mirror-charm:master

[Paul Collins]

include mirror name (e.g. "archive.ubuntu.com") in the service description

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Thomas Cuthbert (tcuthbert)]

+1

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 8f29538c905cd862a21dc0cd7bf4917a1c2b841c

diff --git a/hooks/hooks.py b/hooks/hooks.py
index 577fbff..b95c327 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -622,7 +622,7 @@ def configure_nrpe():
                 wanted_checks.append(checkfile)
 
                 # Nagios config file
-                tmpl_data["description"] = "%s %s" % (check_details["desc"], hostname)
+                tmpl_data["description"] = "%s for %s on %s" % (check_details["desc"], mirror["name"], hostname)
                 tmpl_data["check_command"] = "check_nrpe!%s_%s" % (check, mirror["name"])
                 tmpl_data["servicegroup"] = conf.nagios_servicegroup()
                 if check_details["type"] == "critical":
@@ -633,6 +633,8 @@ def configure_nrpe():
                 tmplfile = "nagios-config.tmpl"
                 file_from_template(tmplfile, configpath, tmpl_data)
                 wanted_checks.append(checkfile)
+    else:
+        log("CHARM: No role assigned to {}; not configuring Nagios checks".format(hostname))
 
     # Clear out any old role checks
     # Making (fairly) sure we only touch files we manage