NAS-132331 / 25.04 / Replace "SCALE" as product type in alerts

src/freenas/usr/local/bin/pkg_mgmt_disabled

@@ -2,6 +2,6 @@
 
 echo "Package management tools are disabled on TrueNAS appliances."
 echo
-echo "Attempting to update SCALE with apt or methods other than the SCALE web"
+echo "Attempting to update TrueNAS with apt or methods other than the TrueNAS web"
 echo "interface can result in a nonfunctional system."
 exit 1

src/freenas/usr/local/libexec/disable-rootfs-protection

@@ -122,7 +122,7 @@ if __name__ == '__main__':
     # environment.
     if rv.stdout.decode().strip() != 'on' and not args.force:
         with Client() as c:
-            if c.call('system.product_type') == ProductType.SCALE_ENTERPRISE:
+            if c.call('system.product_type') == ProductType.ENTERPRISE:
                 print((
                     'Root filesystem protections may not be administratively disabled '
                     'on Enterprise-licensed TrueNAS products. Circumventing this '

src/middlewared/middlewared/alert/base.py

@@ -71,7 +71,7 @@ class AlertClass(metaclass=AlertClassMeta):
     text = None
 
     exclude_from_list = False
-    products = ("CORE", "ENTERPRISE", ProductType.SCALE, ProductType.SCALE_ENTERPRISE)
+    products = (ProductType.COMMUNITY_EDITION, ProductType.ENTERPRISE)
     proactive_support = False
     proactive_support_notify_gone = False
 
@@ -310,7 +310,7 @@ class AlertSource:
 
     schedule = IntervalSchedule(timedelta())
 
-    products = ("CORE", "ENTERPRISE", ProductType.SCALE, ProductType.SCALE_ENTERPRISE)
+    products = (ProductType.COMMUNITY_EDITION, ProductType.ENTERPRISE)
     failover_related = False
     run_on_backup_node = True
 

src/middlewared/middlewared/alert/source/auth.py

@@ -39,7 +39,7 @@ def audit_entry_to_msg(entry):
 class AdminSessionAlertSource(AlertSource):
     schedule = CrontabSchedule(hour=1)  # every 24 hours
     run_on_backup_node = True
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
     async def check(self):
         now = int(time())

src/middlewared/middlewared/alert/source/cores.py

@@ -1,4 +1,5 @@
 from middlewared.alert.base import AlertClass, AlertCategory, AlertLevel, AlertSource, Alert
+from middlewared.utils import ProductType
 
 
 class CoreFilesArePresentAlertClass(AlertClass):
@@ -12,11 +13,11 @@ class CoreFilesArePresentAlertClass(AlertClass):
         "and attach the core files and debug. After creating the ticket, the core files can be removed "
         "from the system by opening shell and entering 'rm /var/db/system/cores/*'."
     )
-    products = ("SCALE",)
+    products = (ProductType.COMMUNITY_EDITION,)
 
 
 class CoreFilesArePresentAlertSource(AlertSource):
-    products = ("SCALE",)
+    products = (ProductType.COMMUNITY_EDITION,)
 
     async def should_alert(self, core):
         if core["corefile"] != "present" or not core["unit"]:

src/middlewared/middlewared/alert/source/enclosure_status.py

@@ -31,19 +31,19 @@ class EnclosureUnhealthyAlertClass(AlertClass):
     level = AlertLevel.CRITICAL
     title = "Enclosure Status Is Not Healthy"
     text = 'Enclosure (%s): Element "%s" is reporting a status of "%s" with a value of "%s". (raw value "%s")'
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class EnclosureHealthyAlertClass(AlertClass):
     category = AlertCategory.HARDWARE
     level = AlertLevel.INFO
     title = "Enclosure Status Is Healthy"
     text = "Enclosure (%s) is healthy."
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class EnclosureStatusAlertSource(AlertSource):
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
     failover_related = True
     run_on_backup_node = False
     bad = ("critical", "noncritical", "unknown", "unrecoverable")

src/middlewared/middlewared/alert/source/failover.py

@@ -15,43 +15,43 @@ class FailoverInterfaceNotFoundAlertClass(AlertClass):
     level = AlertLevel.CRITICAL
     title = 'Failover Internal Interface Not Found'
     text = 'Failover internal interface not found. Contact support.'
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class TrueNASVersionsMismatchAlertClass(AlertClass):
     category = AlertCategory.HA
     level = AlertLevel.CRITICAL
     title = 'TrueNAS Software Versions Must Match Between Storage Controllers'
     text = 'TrueNAS software versions must match between storage controllers.'
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class FailoverStatusCheckFailedAlertClass(AlertClass):
     category = AlertCategory.HA
     level = AlertLevel.CRITICAL
     title = 'Failed to Check Failover Status with the Other Controller'
     text = 'Failed to check failover status with the other controller: %s.'
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class FailoverFailedAlertClass(AlertClass):
     category = AlertCategory.HA
     level = AlertLevel.CRITICAL
     title = 'Failover Failed'
     text = 'Failover failed. Check /var/log/failover.log on both controllers.'
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class VRRPStatesDoNotAgreeAlertClass(AlertClass):
     category = AlertCategory.HA
     level = AlertLevel.CRITICAL
     title = 'Controllers VRRP States Do Not Agree'
     text = 'Controllers VRRP states do not agree: %(error)s.'
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class FailoverAlertSource(AlertSource):
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
     failover_related = True
     run_on_backup_node = False
 

src/middlewared/middlewared/alert/source/failover_disks.py

@@ -15,19 +15,19 @@ class DisksAreNotPresentOnStandbyNodeAlertClass(AlertClass):
     level = AlertLevel.CRITICAL
     title = TITLE + 'Standby Storage Controller'
     text = TEXT + 'active storage controller but missing on standby storage controller.'
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class DisksAreNotPresentOnActiveNodeAlertClass(AlertClass):
     category = AlertCategory.HA
     level = AlertLevel.CRITICAL
     title = TITLE + 'Active Storage Controller'
     text = TEXT + 'standby storage controller but missing on active storage controller.'
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class FailoverDisksAlertSource(AlertSource):
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
     failover_related = True
     run_on_backup_node = False
 

src/middlewared/middlewared/alert/source/failover_interfaces.py

@@ -12,11 +12,11 @@ class NoCriticalFailoverInterfaceFoundAlertClass(AlertClass):
     level = AlertLevel.CRITICAL
     title = 'At Least 1 Network Interface Is Required To Be Marked Critical For Failover'
     text = 'At least 1 network interface is required to be marked critical for failover.'
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class FailoverCriticalAlertSource(AlertSource):
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
     failover_related = True
     run_on_backup_node = False
 

src/middlewared/middlewared/alert/source/failover_nics.py

@@ -15,19 +15,19 @@ class NetworkCardsMismatchOnStandbyNodeAlertClass(AlertClass):
     level = AlertLevel.CRITICAL
     title = TITLE + 'Standby Storage Controller'
     text = TEXT + 'active storage controller but missing on standby storage controller.'
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class NetworkCardsMismatchOnActiveNodeAlertClass(AlertClass):
     category = AlertCategory.HA
     level = AlertLevel.CRITICAL
     title = TITLE + 'Active Storage Controller'
     text = TEXT + 'standby storage controller but missing on active storage controller.'
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class FailoverNetworkCardsAlertSource(AlertSource):
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
     failover_related = True
     run_on_backup_node = False
 

src/middlewared/middlewared/alert/source/failover_remote_inaccessible.py

@@ -15,13 +15,13 @@ class FailoverRemoteSystemInaccessibleAlertClass(AlertClass):
     level = AlertLevel.CRITICAL
     title = 'Other Controller is Inaccessible'
     text = 'Other TrueNAS controller is inaccessible. Contact support. Incident ID: %s.'
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
     proactive_support = True
     proactive_support_notify_gone = True
 
 
 class FailoverRemoteSystemInaccessibleAlertSource(AlertSource):
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
     failover_related = True
     run_on_backup_node = False
 

src/middlewared/middlewared/alert/source/failover_sync.py

@@ -18,7 +18,7 @@ class FailoverSyncFailedAlertClass(AlertClass, SimpleOneShotAlertClass):
         "the standby storage controller but failed. Use Sync to Peer on the "
         "System/Failover page to try and perform a manual sync."
     )
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
     async def create(self, args):
         return Alert(FailoverSyncFailedAlertClass, {'mins': args['mins']})
@@ -37,7 +37,7 @@ class FailoverKeysSyncFailedAlertClass(AlertClass, SimpleOneShotAlertClass):
         "The automatic synchronization of encryption passphrases with the standby "
         "controller has failed. Please go to System > Failover and manually sync to peer."
     )
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class FailoverKMIPKeysSyncFailedAlertClass(AlertClass, OneShotAlertClass):
@@ -50,7 +50,7 @@ class FailoverKMIPKeysSyncFailedAlertClass(AlertClass, OneShotAlertClass):
         "The automatic synchronization of KMIP keys with the standby "
         "controller has failed due to %(error)s. Please go to System > Failover and manually sync to peer."
     )
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
     async def create(self, args):
         return Alert(FailoverKMIPKeysSyncFailedAlertClass, args)

src/middlewared/middlewared/alert/source/jbof.py

@@ -26,35 +26,35 @@ class JBOFRedfishCommAlertClass(AlertClass):
     level = AlertLevel.CRITICAL
     title = 'Failed to Communicate with JBOF'
     text = 'JBOF: "%(desc)s" (%(ip1)s/%(ip2)s) Failed to communicate with redfish interface.'
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class JBOFInvalidDataAlertClass(AlertClass):
     category = AlertCategory.HARDWARE
     level = AlertLevel.CRITICAL
     title = 'JBOF has invalid data'
     text = 'JBOF: "%(desc)s" (%(ip1)s/%(ip2)s) does not provide valid data for: %(keys)s'
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class JBOFElementWarningAlertClass(AlertClass):
     category = AlertCategory.HARDWARE
     level = AlertLevel.WARNING
     title = 'JBOF element non-critical'
     text = 'JBOF: "%(desc)s" (%(ip1)s/%(ip2)s) %(etype)s %(key)s is noncritical: %(value)s'
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class JBOFElementCriticalAlertClass(AlertClass):
     category = AlertCategory.HARDWARE
     level = AlertLevel.CRITICAL
     title = 'JBOF element critical'
     text = 'JBOF: "%(desc)s" (%(ip1)s/%(ip2)s) %(etype)s %(key)s is critical: %(value)s'
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class JBOFAlertSource(AlertSource):
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
     run_on_backup_node = False
     schedule = IntervalSchedule(datetime.timedelta(minutes=5))
 

src/middlewared/middlewared/alert/source/legacy_mini_bmc.py

@@ -13,11 +13,11 @@ class TrueNASMiniBMCAlertClass(AlertClass):
         f"<a href=\"{URL}\" target=\"_blank\">"
         "ASRock Rack C2750D4I BMC Watchdog Issue</a> for details."
     )
-    products = (ProductType.SCALE,)
+    products = (ProductType.COMMUNITY_EDITION,)
 
 
 class TrueNASMiniBMCAlertSource(AlertSource):
-    products = (ProductType.SCALE,)
+    products = (ProductType.COMMUNITY_EDITION,)
 
     async def check(self):
         dmi = await self.middleware.call("system.dmidecode_info")

src/middlewared/middlewared/alert/source/license_status.py

@@ -18,27 +18,27 @@ class LicenseAlertClass(AlertClass):
     level = AlertLevel.CRITICAL
     title = "TrueNAS License Issue"
     text = "%s"
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class LicenseIsExpiringAlertClass(AlertClass):
     category = AlertCategory.SYSTEM
     level = AlertLevel.WARNING
     title = "TrueNAS License Is Expiring"
     text = "%s"
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class LicenseHasExpiredAlertClass(AlertClass):
     category = AlertCategory.SYSTEM
     level = AlertLevel.CRITICAL
     title = "TrueNAS License Has Expired"
     text = "%s"
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
 
 
 class LicenseStatusAlertSource(ThreadedAlertSource):
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
     run_on_backup_node = False
     schedule = IntervalSchedule(timedelta(hours=24))
 

src/middlewared/middlewared/alert/source/memory_errors.py

@@ -14,7 +14,7 @@ class MemoryErrorsAlertClass(AlertClass):
     level = AlertLevel.WARNING
     title = 'Uncorrected Memory Errors Detected'
     text = '%(count)d total uncorrected errors detected for %(loc)s.'
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
     proactive_support = True
 
 
@@ -23,7 +23,7 @@ class MemorySizeMismatchAlertClass(AlertClass):
     level = AlertLevel.WARNING
     title = 'Memory Size Mismatch Detected'
     text = 'Memory size on this controller %(r1)s doesn\'t match other controller %(r2)s'
-    products = (ProductType.SCALE_ENTERPRISE,)
+    products = (ProductType.ENTERPRISE,)
     proactive_support = True