feat: several further simplifications

dirac.cfg

@@ -272,8 +272,7 @@ Registry
     # Admin group
     lhcb_admin
     {
-      Properties = AlarmsManagement # Allow to set notifications and manage alarms
-      Properties += ServiceAdministrator # DIRAC Service Administrator
+      Properties = ServiceAdministrator # DIRAC Service Administrator
       Properties += CSAdministrator # possibility to edit the Configuration Service
       Properties += JobAdministrator # Job Administrator can manipulate everybody's jobs
       Properties += FullDelegation # Allow getting full delegated proxies

docs/source/AdministratorGuide/Configuration/ConfReference/Systems/Framework/Services/index.rst

@@ -34,6 +34,5 @@ Services associated with Framework system are:
 .. toctree::
    :maxdepth: 2
 
-   Notification/index
    SystemAdministrator/index
    UserProfileManager/index

docs/source/AdministratorGuide/Configuration/ConfReference/Tips/Authorization/index.rst

@@ -11,8 +11,6 @@ are showed in the next table:
 +----------------------------+------------------------------------------------------------------+-------------+
 | *AccountingMonitor*        | Allow access to accounting data for all groups                   |             |
 +----------------------------+------------------------------------------------------------------+-------------+
-| *AlarmsManagement*         | Allow to set notifications and manage alarms                     |             |
-+----------------------------+------------------------------------------------------------------+-------------+
 | *CSAdministrator*          | CS Administrator - possibility to edit the Configuration Service |             |
 +----------------------------+------------------------------------------------------------------+-------------+
 | *FileCatalogManagement*    | Allow FC Management                                              |             |

docs/source/AdministratorGuide/Systems/Framework/Notification/index.rst

@@ -5,7 +5,7 @@ The Framework/Notification service
 ==================================
 
 
-The Framework/Notification service is responsible for notification, like as send mail, sms or alarm window on DIRAC portal.
+The Framework/Notification service is responsible for sending mail.
 Send an email with supplied body to the specified address using the Mail utility.
 Emails with the same address, subject, and content are only sent once every 24h.
 

docs/source/AdministratorGuide/Systems/ResourceStatus/monitoring.rst

@@ -146,7 +146,6 @@ Actions
 DIRAC.RSS has the following actions:
 
 * **EmailAction** : sends an email notification
-* **SMSAction** : sends a sms notification ( not certified yet ).
 * **LogStatusAction** : updates the <element>Status table with the new computed status
 * **LogPolicyResultAction** : updates the PolicyResult table with the results of the policies in singlePolicyResults.
 

docs/source/AdministratorGuide/Tutorials/basicTutoSetup.rst

@@ -320,8 +320,7 @@ The Configuration service will serve the content of the file ``/opt/dirac/etc/My
       dirac_admin
       {
         Users = ciuser
-        Properties = AlarmsManagement
-        Properties += ServiceAdministrator
+        Properties = ServiceAdministrator
         Properties += CSAdministrator
         Properties += JobAdministrator
         Properties += FullDelegation

docs/source/AdministratorGuide/Tutorials/managingIdentities.rst

@@ -96,7 +96,7 @@ If you use a proxy with the ``ProxyManagement`` permission, like the ``dirac_adm
   rfc          : True
   path         : /tmp/x509up_u501
   username     : ciuser
-  properties   : AlarmsManagement, ServiceAdministrator, CSAdministrator, JobAdministrator, FullDelegation, ProxyManagement, Operator
+  properties   : ServiceAdministrator, CSAdministrator, JobAdministrator, FullDelegation, ProxyManagement, Operator
   [diracuser@dirac-tuto ~]$ dirac-admin-get-proxy ciuser dirac_user
   Proxy downloaded to /home/diracuser/proxy.ciuser.dirac_user
 

docs/source/DeveloperGuide/AddingNewComponents/dirac.cfg.basic.example

@@ -72,7 +72,6 @@ Registry
       Properties += Operator
       Properties += CSAdministrator
       Properties += ProductionManagement
-      Properties += AlarmsManagement
       Properties += TrustedHost
       Properties += SiteManager
     }
@@ -84,7 +83,6 @@ Registry
       Properties += Operator
       Properties += CSAdministrator
       Properties += ProductionManagement
-      Properties += AlarmsManagement
       Properties += TrustedHost
       Properties += SiteManager
     }

src/DIRAC/Core/Security/Properties.py

@@ -52,8 +52,6 @@ class SecurityProperty(str, Enum):
     PPG_AUTHORITY = "PPGAuthority"
     #: Allow Bookkeeping Management
     BOOKKEEPING_MANAGEMENT = "BookkeepingManagement"
-    #: Allow to set notifications and manage alarms
-    ALARMS_MANAGEMENT = "AlarmsManagement"
     #: Allow FC Management - FC root user
     FC_MANAGEMENT = "FileCatalogManagement"
     #: Allow staging files
@@ -152,6 +150,5 @@ def __call__(self, properties: list[SecurityProperty]) -> bool:
 PRODUCTION_MANAGEMENT = SecurityProperty.PRODUCTION_MANAGEMENT.value
 PPG_AUTHORITY = SecurityProperty.PPG_AUTHORITY.value
 BOOKKEEPING_MANAGEMENT = SecurityProperty.BOOKKEEPING_MANAGEMENT.value
-ALARMS_MANAGEMENT = SecurityProperty.ALARMS_MANAGEMENT.value
 FC_MANAGEMENT = SecurityProperty.FC_MANAGEMENT.value
 STAGE_ALLOWED = SecurityProperty.STAGE_ALLOWED.value

src/DIRAC/FrameworkSystem/Client/ComponentInstaller.py

@@ -78,7 +78,6 @@
 )
 from DIRAC.Core.Base.private.ModuleLoader import ModuleLoader
 from DIRAC.Core.Security.Properties import (
-    ALARMS_MANAGEMENT,
     CS_ADMINISTRATOR,
     FULL_DELEGATION,
     JOB_ADMINISTRATOR,
@@ -423,7 +422,6 @@ def _getCentralCfg(self, installCfg):
         hostDN = self.localCfg.getOption(cfgInstallPath("HostDN"), "")
         defaultGroupName = self.localCfg.getOption(cfgInstallPath("DefaultGroupName"), "dirac_user")
         adminGroupProperties = [
-            ALARMS_MANAGEMENT,
             SERVICE_ADMINISTRATOR,
             CS_ADMINISTRATOR,
             JOB_ADMINISTRATOR,

src/DIRAC/FrameworkSystem/ConfigTemplate.cfg

@@ -140,10 +140,8 @@ Services
   Notification
   {
     Port = 9154
-    SMSSwitch = sms.switch.ch
     Authorization
     {
-      Default = AlarmsManagement
       sendMail = authenticated
     }
   }
@@ -152,10 +150,8 @@ Services
   TornadoNotification
   {
     Protocol = https
-    SMSSwitch = sms.switch.ch
     Authorization
     {
-      Default = AlarmsManagement
       sendMail = authenticated
     }
   }

src/DIRAC/FrameworkSystem/Service/NotificationHandler.py

@@ -1,16 +1,5 @@
 """ The Notification service provides a toolkit to contact people via email
-    (eventually SMS etc.) to trigger some actions.
-
-    The original motivation for this is due to some sites restricting the
-    sending of email but it is useful for e.g. crash reports to get to their
-    destination.
-
-    Another use-case is for users to request an email notification for the
-    completion of their jobs.  When output data files are uploaded to the
-    Grid, an email could be sent by default with the metadata of the file.
-
-    It can also be used to set alarms to be promptly forwarded to those
-    subscribing to them.
+    to trigger some actions.
 """
 from DIRAC import S_OK, gConfig
 from DIRAC.ConfigurationSystem.Client import PathFinder

src/DIRAC/Interfaces/API/DiracAdmin.py

@@ -796,8 +796,7 @@ def sendMail(self, address, subject, body, fromAddress=None, localAttempt=True,
         """
         Send mail to specified address with body.
         """
-        notification = NotificationClient()
-        return notification.sendMail(address, subject, body, fromAddress, localAttempt, html)
+        return NotificationClient().sendMail(address, subject, body, fromAddress, localAttempt, html)
 
 
 # EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#EOF#

tests/Jenkins/utilities.sh

@@ -586,7 +586,7 @@ diracUserAndGroup() {
     exit 1
   fi
 
-  if ! dirac-admin-add-group -G prod -U adminusername,ciuser,trialUser -P Operator,FullDelegation,ProxyManagement,ServiceAdministrator,JobAdministrator,CSAdministrator,AlarmsManagement,FileCatalogManagement,SiteManager,NormalUser,ProductionManagement VO=vo "${DEBUG}"; then
+  if ! dirac-admin-add-group -G prod -U adminusername,ciuser,trialUser -P Operator,FullDelegation,ProxyManagement,ServiceAdministrator,JobAdministrator,CSAdministrator,FileCatalogManagement,SiteManager,NormalUser,ProductionManagement VO=vo "${DEBUG}"; then
     echo 'ERROR: dirac-admin-add-group failed' >&2
     exit 1
   fi