Merge pull request #2849 from freenas/FIX-36298

tkt-36298: New alert category (HA). Hide it in FreeNAS
truenas · Apr 6, 2019 · d97234a · d97234a
2 parents 7c1040b + 5e51bb1
commit d97234a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/middlewared/middlewared/alert/base.py b/src/middlewared/middlewared/alert/base.py
@@ -77,6 +77,7 @@ async def dismiss(self, alerts, alert):
 class AlertCategory(enum.Enum):
     CERTIFICATES = "CERTIFICATES"
     DIRECTORY_SERVICE = "DIRECTORY_SERVICE"
+    HA = "HA"
     HARDWARE = "HARDWARE"
     NETWORK = "NETWORK"
     REPORTING = "REPORTING"
@@ -89,6 +90,7 @@ class AlertCategory(enum.Enum):
 alert_category_names = {
     AlertCategory.CERTIFICATES: "Certificates",
     AlertCategory.DIRECTORY_SERVICE: "Directory Service",
+    AlertCategory.HA: "High-Availability",
     AlertCategory.HARDWARE: "Hardware",
     AlertCategory.NETWORK: "Network",
     AlertCategory.REPORTING: "Reporting",

diff --git a/src/middlewared/middlewared/alert/source/certificates.py b/src/middlewared/middlewared/alert/source/certificates.py
@@ -6,14 +6,14 @@
 class CertificateIsExpiringAlertClass(AlertClass):
     category = AlertCategory.CERTIFICATES
     level = AlertLevel.NOTICE
-    title = "Certificate is Expiring"
+    title = "Certificate Is Expiring"
     text = "Certificate %(name)r is expiring within %(days)d days."
 
 
 class CertificateIsExpiringSoonAlertClass(AlertClass):
     category = AlertCategory.CERTIFICATES
     level = AlertLevel.WARNING
-    title = "Certificate is Expiring Soon"
+    title = "Certificate Is Expiring Soon"
     text = "Certificate %(name)r is expiring within %(days)d days."
 
 

diff --git a/src/middlewared/middlewared/plugins/alert.py b/src/middlewared/middlewared/plugins/alert.py
@@ -175,6 +175,7 @@ async def list_categories(self):
                 )
             }
             for alert_category in AlertCategory
+            if any(alert_class.category == alert_category for alert_class in AlertClass.classes)
         ]
 
     @private