Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:remove-critical-servicegroup-handling into ubuntu-mirror-charm:master

[Paul Collins]

remove nagios_critical_servicegroup etc. - we now manage this completely via nagios and nagiprom

[🤖 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)]

LGTM +!

review: Approve

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

Change successfully merged at revision 449e0fa23706c13141f1f361938ec4bb6630a8a6

diff --git a/config.yaml b/config.yaml
index bd8370e..3413e3c 100644
--- a/config.yaml
+++ b/config.yaml
@@ -447,10 +447,6 @@ options:
     default: ""
     type: string
     description: "If set, this is the Nagios servicegroup for alerts.  If unset, an appropriate one will be chosen"
-  nagios_critical_servicegroup:
-    default: ""
-    type: string
-    description: "If set, this is an additional Nagios servicegroup for critical alerts."
   package_status:
     default: "install"
     type: "string"
diff --git a/hooks/Config.py b/hooks/Config.py
index 80afdc9..60c9928 100755
--- a/hooks/Config.py
+++ b/hooks/Config.py
@@ -160,9 +160,6 @@ class Config:
             raise KeyError
         return mirror_userinfo
 
-    def nagios_critical_servicegroup(self):
-        return str(config("nagios_critical_servicegroup"))
-
     def nagios_host_context(self):
         return self.relation_data()["nagios_host_context"]
 
diff --git a/hooks/hooks.py b/hooks/hooks.py
index b95c327..93b4229 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -570,14 +570,12 @@ def configure_nrpe():
     nagios_etcdir = "/etc/nagios/nrpe.d"
     nagios_exportdir = "/var/lib/nagios/export"
 
-    role_checks = {"check_virthost": {"desc": "Check apache virthost",
-                                      "type": "normal"},
-                   "check_mirror": {"desc": "GPG signature",
-                                    "type": "critical"},
-                   "check_updates": {"desc": "Mirror update status",
-                                     "type": "normal"},
-                   "check_rsync": {"desc": "Rsync processes",
-                                   "type": "normal"}}
+    role_checks = {
+        "check_virthost": {"desc": "Check apache virthost"},
+        "check_mirror": {"desc": "GPG signature"},
+        "check_updates": {"desc": "Mirror update status"},
+        "check_rsync": {"desc": "Rsync processes"}
+    }
 
     # No nagios dirs probably means no nagios, so don't bother with the rest
     if not (os.path.isdir(nagios_etcdir) and os.path.isdir(nagios_exportdir)):
@@ -625,9 +623,6 @@ def configure_nrpe():
                 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":
-                    if conf.nagios_critical_servicegroup():
-                        tmpl_data["servicegroup"] += ", " + conf.nagios_critical_servicegroup()
                 checkfile = "service__%s_%s_%s.cfg" % (conf.nagios_hostname(), check, mirror["name"])
                 configpath = os.path.join(nagios_exportdir, checkfile)
                 tmplfile = "nagios-config.tmpl"
@@ -672,7 +667,7 @@ def configure_nrpe():
                 tmpl_data["nagios_hostname"] = conf.nagios_hostname()
                 tmpl_data["description"] = "Disk space on /srv"
                 tmpl_data["check_command"] = "check_nrpe!check_disk_srv"
-                tmpl_data["servicegroup"] = conf.nagios_critical_servicegroup()
+                tmpl_data["servicegroup"] = conf.nagios_servicegroup()
                 tmplfile = "nagios-config.tmpl"
                 file_from_template(tmplfile, configpath, tmpl_data)
 
@@ -722,7 +717,6 @@ def configure_extra_mirrors():
         settings["parent_unit_name"] = local_unit()
     if conf.nagios_relation_ok():
         settings["nagios_servicegroup"] = conf.nagios_servicegroup()
-        settings["nagios_critical_servicegroup"] = conf.nagios_critical_servicegroup()
     # Base64 everything
     encoded = {}
     for d in settings:
@@ -780,6 +774,7 @@ def configure_user():
         if not os.path.isdir(mirror_userinfo.pw_dir):
             mkdir(mirror_userinfo.pw_dir, owner=conf.mirror_user())
 
+
 def configure_directories():
     if not os.path.isdir("/srv/ftp.root"):
         mkdir("/srv/ftp.root")