NAS-130691 / 25.04 / Alert Services - E-Mail - Incorrect description …

…of asn option (#10799)

* NAS-130691: Alert Services - E-Mail - Incorrect description of asn option

* NAS-130691: PR update

src/app/helptext/system/alert-service.ts

@@ -25,7 +25,8 @@ export const helptextAlertService = {
 
   AWSSNS_aws_secret_access_key_tooltip: T('Secret Access Key for the linked AWS account.'),
 
-  Mail_email_tooltip: T('Enter a valid email address to receive alerts from this system.'),
+  Mail_email_tooltip: T('Enter an email address to override the admin account’s default email. \
+ If left blank, the admin account’s email address will be used'),
 
   InfluxDB_host_tooltip: T('Enter the <a\
  href="https://docs.influxdata.com/influxdb/"\

src/app/pages/system/alert-service/alert-service/alert-service.component.html

@@ -41,7 +41,7 @@
         ></ix-select>
       </ix-fieldset>
 
-      <ix-fieldset [title]="'Authentication' | translate">
+      <ix-fieldset [title]="'Settings' | translate">
         <ng-container #alertServiceContainer></ng-container>
       </ix-fieldset>
 

src/app/pages/system/alert-service/alert-service/alert-services/email-service/email-service.component.html

@@ -2,7 +2,7 @@
   <ix-input
     formControlName="email"
     type="email"
-    [label]="'Email' | translate"
+    [label]="'Override Admin Email' | translate"
     [tooltip]="helptext.Mail_email_tooltip | translate"
   ></ix-input>
 </ng-container>

src/app/pages/system/alert-service/alert-service/alert-services/email-service/email-service.component.spec.ts

@@ -28,13 +28,13 @@ describe('EmailServiceComponent', () => {
 
     const values = await form.getValues();
     expect(values).toEqual({
-      Email: '[email protected]',
+      'Override Admin Email': '[email protected]',
     });
   });
 
   it('returns alert service form values when getSubmitAttributes is called', async () => {
     await form.fillForm({
-      Email: '[email protected]',
+      'Override Admin Email': '[email protected]',
     });
 
     const submittedValues = spectator.component.getSubmitAttributes();

src/assets/i18n/af.json

@@ -1642,7 +1642,6 @@
   "Enter a user to associate with this service. Keeping the default is recommended.": "",
   "Enter a username to register with this service.": "",
   "Enter a valid IPv4 address.": "",
-  "Enter a valid email address to receive alerts from this system.": "",
   "Enter a value in seconds for the the UPS to wait before initiating shutdown. Shutdown will not occur if power is restored while the timer is counting down. This value only applies when <b>Shutdown mode</b> is set to <i>UPS goes on battery</i>.": "",
   "Enter a value to use for the <a href=\"https://man7.org/linux/man-pages/man8/sysctl.8.html\" target=\"_blank\">sysctl</a> variable.": "",
   "Enter accounts that have administrative access. See <a href=\"https://linux.die.net/man/5/upsd.users\" target=\"_blank\">upsd.users(5)</a> for examples.": "",
@@ -1652,6 +1651,7 @@
   "Enter an alphanumeric encryption key. Only available when <i>Passphrase</i> is the chosen key format.": "",
   "Enter an alphanumeric name for the certificate. Underscore (_), and dash (-) characters are allowed.": "",
   "Enter an alphanumeric name for the virtual machine.": "",
+  "Enter an email address to override the admin account’s default email.  If left blank, the admin account’s email address will be used": "",
   "Enter an optimal number of threads used by the kernel NFS server.": "",
   "Enter any additional <a href=\"http://net-snmp.sourceforge.net/docs/man/snmpd.conf.html\" target=\"_blank\">snmpd.conf(5)</a> options. Add one option for each line.": "",
   "Enter any aliases, separated by spaces. Each alias can be up to 15 characters long.": "",
@@ -2979,6 +2979,7 @@
   "Outbound Network:": "",
   "Outgoing Mail Server": "",
   "Outgoing [{networkInterfaceName}]": "",
+  "Override Admin Email": "",
   "Overrides default directory creation mask of <i>0777</i>  which grants directory read, write and execute access for everybody.": "",
   "Overrides default file creation mask of <i>0666</i>  which creates files with read and write access for everybody.": "",
   "Overview": "",

src/assets/i18n/ar.json

@@ -1642,7 +1642,6 @@
   "Enter a user to associate with this service. Keeping the default is recommended.": "",
   "Enter a username to register with this service.": "",
   "Enter a valid IPv4 address.": "",
-  "Enter a valid email address to receive alerts from this system.": "",
   "Enter a value in seconds for the the UPS to wait before initiating shutdown. Shutdown will not occur if power is restored while the timer is counting down. This value only applies when <b>Shutdown mode</b> is set to <i>UPS goes on battery</i>.": "",
   "Enter a value to use for the <a href=\"https://man7.org/linux/man-pages/man8/sysctl.8.html\" target=\"_blank\">sysctl</a> variable.": "",
   "Enter accounts that have administrative access. See <a href=\"https://linux.die.net/man/5/upsd.users\" target=\"_blank\">upsd.users(5)</a> for examples.": "",
@@ -1652,6 +1651,7 @@
   "Enter an alphanumeric encryption key. Only available when <i>Passphrase</i> is the chosen key format.": "",
   "Enter an alphanumeric name for the certificate. Underscore (_), and dash (-) characters are allowed.": "",
   "Enter an alphanumeric name for the virtual machine.": "",
+  "Enter an email address to override the admin account’s default email.  If left blank, the admin account’s email address will be used": "",
   "Enter an optimal number of threads used by the kernel NFS server.": "",
   "Enter any additional <a href=\"http://net-snmp.sourceforge.net/docs/man/snmpd.conf.html\" target=\"_blank\">snmpd.conf(5)</a> options. Add one option for each line.": "",
   "Enter any aliases, separated by spaces. Each alias can be up to 15 characters long.": "",
@@ -2979,6 +2979,7 @@
   "Outbound Network:": "",
   "Outgoing Mail Server": "",
   "Outgoing [{networkInterfaceName}]": "",
+  "Override Admin Email": "",
   "Overrides default directory creation mask of <i>0777</i>  which grants directory read, write and execute access for everybody.": "",
   "Overrides default file creation mask of <i>0666</i>  which creates files with read and write access for everybody.": "",
   "Overview": "",

src/assets/i18n/ast.json

@@ -1642,7 +1642,6 @@
   "Enter a user to associate with this service. Keeping the default is recommended.": "",
   "Enter a username to register with this service.": "",
   "Enter a valid IPv4 address.": "",
-  "Enter a valid email address to receive alerts from this system.": "",
   "Enter a value in seconds for the the UPS to wait before initiating shutdown. Shutdown will not occur if power is restored while the timer is counting down. This value only applies when <b>Shutdown mode</b> is set to <i>UPS goes on battery</i>.": "",
   "Enter a value to use for the <a href=\"https://man7.org/linux/man-pages/man8/sysctl.8.html\" target=\"_blank\">sysctl</a> variable.": "",
   "Enter accounts that have administrative access. See <a href=\"https://linux.die.net/man/5/upsd.users\" target=\"_blank\">upsd.users(5)</a> for examples.": "",
@@ -1652,6 +1651,7 @@
   "Enter an alphanumeric encryption key. Only available when <i>Passphrase</i> is the chosen key format.": "",
   "Enter an alphanumeric name for the certificate. Underscore (_), and dash (-) characters are allowed.": "",
   "Enter an alphanumeric name for the virtual machine.": "",
+  "Enter an email address to override the admin account’s default email.  If left blank, the admin account’s email address will be used": "",
   "Enter an optimal number of threads used by the kernel NFS server.": "",
   "Enter any additional <a href=\"http://net-snmp.sourceforge.net/docs/man/snmpd.conf.html\" target=\"_blank\">snmpd.conf(5)</a> options. Add one option for each line.": "",
   "Enter any aliases, separated by spaces. Each alias can be up to 15 characters long.": "",
@@ -2979,6 +2979,7 @@
   "Outbound Network:": "",
   "Outgoing Mail Server": "",
   "Outgoing [{networkInterfaceName}]": "",
+  "Override Admin Email": "",
   "Overrides default directory creation mask of <i>0777</i>  which grants directory read, write and execute access for everybody.": "",
   "Overrides default file creation mask of <i>0666</i>  which creates files with read and write access for everybody.": "",
   "Overview": "",

src/assets/i18n/az.json

@@ -1642,7 +1642,6 @@
   "Enter a user to associate with this service. Keeping the default is recommended.": "",
   "Enter a username to register with this service.": "",
   "Enter a valid IPv4 address.": "",
-  "Enter a valid email address to receive alerts from this system.": "",
   "Enter a value in seconds for the the UPS to wait before initiating shutdown. Shutdown will not occur if power is restored while the timer is counting down. This value only applies when <b>Shutdown mode</b> is set to <i>UPS goes on battery</i>.": "",
   "Enter a value to use for the <a href=\"https://man7.org/linux/man-pages/man8/sysctl.8.html\" target=\"_blank\">sysctl</a> variable.": "",
   "Enter accounts that have administrative access. See <a href=\"https://linux.die.net/man/5/upsd.users\" target=\"_blank\">upsd.users(5)</a> for examples.": "",
@@ -1652,6 +1651,7 @@
   "Enter an alphanumeric encryption key. Only available when <i>Passphrase</i> is the chosen key format.": "",
   "Enter an alphanumeric name for the certificate. Underscore (_), and dash (-) characters are allowed.": "",
   "Enter an alphanumeric name for the virtual machine.": "",
+  "Enter an email address to override the admin account’s default email.  If left blank, the admin account’s email address will be used": "",
   "Enter an optimal number of threads used by the kernel NFS server.": "",
   "Enter any additional <a href=\"http://net-snmp.sourceforge.net/docs/man/snmpd.conf.html\" target=\"_blank\">snmpd.conf(5)</a> options. Add one option for each line.": "",
   "Enter any aliases, separated by spaces. Each alias can be up to 15 characters long.": "",
@@ -2979,6 +2979,7 @@
   "Outbound Network:": "",
   "Outgoing Mail Server": "",
   "Outgoing [{networkInterfaceName}]": "",
+  "Override Admin Email": "",
   "Overrides default directory creation mask of <i>0777</i>  which grants directory read, write and execute access for everybody.": "",
   "Overrides default file creation mask of <i>0666</i>  which creates files with read and write access for everybody.": "",
   "Overview": "",

src/assets/i18n/be.json

@@ -1642,7 +1642,6 @@
   "Enter a user to associate with this service. Keeping the default is recommended.": "",
   "Enter a username to register with this service.": "",
   "Enter a valid IPv4 address.": "",
-  "Enter a valid email address to receive alerts from this system.": "",
   "Enter a value in seconds for the the UPS to wait before initiating shutdown. Shutdown will not occur if power is restored while the timer is counting down. This value only applies when <b>Shutdown mode</b> is set to <i>UPS goes on battery</i>.": "",
   "Enter a value to use for the <a href=\"https://man7.org/linux/man-pages/man8/sysctl.8.html\" target=\"_blank\">sysctl</a> variable.": "",
   "Enter accounts that have administrative access. See <a href=\"https://linux.die.net/man/5/upsd.users\" target=\"_blank\">upsd.users(5)</a> for examples.": "",
@@ -1652,6 +1651,7 @@
   "Enter an alphanumeric encryption key. Only available when <i>Passphrase</i> is the chosen key format.": "",
   "Enter an alphanumeric name for the certificate. Underscore (_), and dash (-) characters are allowed.": "",
   "Enter an alphanumeric name for the virtual machine.": "",
+  "Enter an email address to override the admin account’s default email.  If left blank, the admin account’s email address will be used": "",
   "Enter an optimal number of threads used by the kernel NFS server.": "",
   "Enter any additional <a href=\"http://net-snmp.sourceforge.net/docs/man/snmpd.conf.html\" target=\"_blank\">snmpd.conf(5)</a> options. Add one option for each line.": "",
   "Enter any aliases, separated by spaces. Each alias can be up to 15 characters long.": "",
@@ -2979,6 +2979,7 @@
   "Outbound Network:": "",
   "Outgoing Mail Server": "",
   "Outgoing [{networkInterfaceName}]": "",
+  "Override Admin Email": "",
   "Overrides default directory creation mask of <i>0777</i>  which grants directory read, write and execute access for everybody.": "",
   "Overrides default file creation mask of <i>0666</i>  which creates files with read and write access for everybody.": "",
   "Overview": "",

src/assets/i18n/bg.json

@@ -1642,7 +1642,6 @@
   "Enter a user to associate with this service. Keeping the default is recommended.": "",
   "Enter a username to register with this service.": "",
   "Enter a valid IPv4 address.": "",
-  "Enter a valid email address to receive alerts from this system.": "",
   "Enter a value in seconds for the the UPS to wait before initiating shutdown. Shutdown will not occur if power is restored while the timer is counting down. This value only applies when <b>Shutdown mode</b> is set to <i>UPS goes on battery</i>.": "",
   "Enter a value to use for the <a href=\"https://man7.org/linux/man-pages/man8/sysctl.8.html\" target=\"_blank\">sysctl</a> variable.": "",
   "Enter accounts that have administrative access. See <a href=\"https://linux.die.net/man/5/upsd.users\" target=\"_blank\">upsd.users(5)</a> for examples.": "",
@@ -1652,6 +1651,7 @@
   "Enter an alphanumeric encryption key. Only available when <i>Passphrase</i> is the chosen key format.": "",
   "Enter an alphanumeric name for the certificate. Underscore (_), and dash (-) characters are allowed.": "",
   "Enter an alphanumeric name for the virtual machine.": "",
+  "Enter an email address to override the admin account’s default email.  If left blank, the admin account’s email address will be used": "",
   "Enter an optimal number of threads used by the kernel NFS server.": "",
   "Enter any additional <a href=\"http://net-snmp.sourceforge.net/docs/man/snmpd.conf.html\" target=\"_blank\">snmpd.conf(5)</a> options. Add one option for each line.": "",
   "Enter any aliases, separated by spaces. Each alias can be up to 15 characters long.": "",
@@ -2979,6 +2979,7 @@
   "Outbound Network:": "",
   "Outgoing Mail Server": "",
   "Outgoing [{networkInterfaceName}]": "",
+  "Override Admin Email": "",
   "Overrides default directory creation mask of <i>0777</i>  which grants directory read, write and execute access for everybody.": "",
   "Overrides default file creation mask of <i>0666</i>  which creates files with read and write access for everybody.": "",
   "Overview": "",

src/assets/i18n/bn.json

@@ -1642,7 +1642,6 @@
   "Enter a user to associate with this service. Keeping the default is recommended.": "",
   "Enter a username to register with this service.": "",
   "Enter a valid IPv4 address.": "",
-  "Enter a valid email address to receive alerts from this system.": "",
   "Enter a value in seconds for the the UPS to wait before initiating shutdown. Shutdown will not occur if power is restored while the timer is counting down. This value only applies when <b>Shutdown mode</b> is set to <i>UPS goes on battery</i>.": "",
   "Enter a value to use for the <a href=\"https://man7.org/linux/man-pages/man8/sysctl.8.html\" target=\"_blank\">sysctl</a> variable.": "",
   "Enter accounts that have administrative access. See <a href=\"https://linux.die.net/man/5/upsd.users\" target=\"_blank\">upsd.users(5)</a> for examples.": "",
@@ -1652,6 +1651,7 @@
   "Enter an alphanumeric encryption key. Only available when <i>Passphrase</i> is the chosen key format.": "",
   "Enter an alphanumeric name for the certificate. Underscore (_), and dash (-) characters are allowed.": "",
   "Enter an alphanumeric name for the virtual machine.": "",
+  "Enter an email address to override the admin account’s default email.  If left blank, the admin account’s email address will be used": "",
   "Enter an optimal number of threads used by the kernel NFS server.": "",
   "Enter any additional <a href=\"http://net-snmp.sourceforge.net/docs/man/snmpd.conf.html\" target=\"_blank\">snmpd.conf(5)</a> options. Add one option for each line.": "",
   "Enter any aliases, separated by spaces. Each alias can be up to 15 characters long.": "",
@@ -2979,6 +2979,7 @@
   "Outbound Network:": "",
   "Outgoing Mail Server": "",
   "Outgoing [{networkInterfaceName}]": "",
+  "Override Admin Email": "",
   "Overrides default directory creation mask of <i>0777</i>  which grants directory read, write and execute access for everybody.": "",
   "Overrides default file creation mask of <i>0666</i>  which creates files with read and write access for everybody.": "",
   "Overview": "",

src/assets/i18n/br.json

@@ -1642,7 +1642,6 @@
   "Enter a user to associate with this service. Keeping the default is recommended.": "",
   "Enter a username to register with this service.": "",
   "Enter a valid IPv4 address.": "",
-  "Enter a valid email address to receive alerts from this system.": "",
   "Enter a value in seconds for the the UPS to wait before initiating shutdown. Shutdown will not occur if power is restored while the timer is counting down. This value only applies when <b>Shutdown mode</b> is set to <i>UPS goes on battery</i>.": "",
   "Enter a value to use for the <a href=\"https://man7.org/linux/man-pages/man8/sysctl.8.html\" target=\"_blank\">sysctl</a> variable.": "",
   "Enter accounts that have administrative access. See <a href=\"https://linux.die.net/man/5/upsd.users\" target=\"_blank\">upsd.users(5)</a> for examples.": "",
@@ -1652,6 +1651,7 @@
   "Enter an alphanumeric encryption key. Only available when <i>Passphrase</i> is the chosen key format.": "",
   "Enter an alphanumeric name for the certificate. Underscore (_), and dash (-) characters are allowed.": "",
   "Enter an alphanumeric name for the virtual machine.": "",
+  "Enter an email address to override the admin account’s default email.  If left blank, the admin account’s email address will be used": "",
   "Enter an optimal number of threads used by the kernel NFS server.": "",
   "Enter any additional <a href=\"http://net-snmp.sourceforge.net/docs/man/snmpd.conf.html\" target=\"_blank\">snmpd.conf(5)</a> options. Add one option for each line.": "",
   "Enter any aliases, separated by spaces. Each alias can be up to 15 characters long.": "",
@@ -2979,6 +2979,7 @@
   "Outbound Network:": "",
   "Outgoing Mail Server": "",
   "Outgoing [{networkInterfaceName}]": "",
+  "Override Admin Email": "",
   "Overrides default directory creation mask of <i>0777</i>  which grants directory read, write and execute access for everybody.": "",
   "Overrides default file creation mask of <i>0666</i>  which creates files with read and write access for everybody.": "",
   "Overview": "",

src/assets/i18n/bs.json

@@ -1642,7 +1642,6 @@
   "Enter a user to associate with this service. Keeping the default is recommended.": "",
   "Enter a username to register with this service.": "",
   "Enter a valid IPv4 address.": "",
-  "Enter a valid email address to receive alerts from this system.": "",
   "Enter a value in seconds for the the UPS to wait before initiating shutdown. Shutdown will not occur if power is restored while the timer is counting down. This value only applies when <b>Shutdown mode</b> is set to <i>UPS goes on battery</i>.": "",
   "Enter a value to use for the <a href=\"https://man7.org/linux/man-pages/man8/sysctl.8.html\" target=\"_blank\">sysctl</a> variable.": "",
   "Enter accounts that have administrative access. See <a href=\"https://linux.die.net/man/5/upsd.users\" target=\"_blank\">upsd.users(5)</a> for examples.": "",
@@ -1652,6 +1651,7 @@
   "Enter an alphanumeric encryption key. Only available when <i>Passphrase</i> is the chosen key format.": "",
   "Enter an alphanumeric name for the certificate. Underscore (_), and dash (-) characters are allowed.": "",
   "Enter an alphanumeric name for the virtual machine.": "",
+  "Enter an email address to override the admin account’s default email.  If left blank, the admin account’s email address will be used": "",
   "Enter an optimal number of threads used by the kernel NFS server.": "",
   "Enter any additional <a href=\"http://net-snmp.sourceforge.net/docs/man/snmpd.conf.html\" target=\"_blank\">snmpd.conf(5)</a> options. Add one option for each line.": "",
   "Enter any aliases, separated by spaces. Each alias can be up to 15 characters long.": "",
@@ -2979,6 +2979,7 @@
   "Outbound Network:": "",
   "Outgoing Mail Server": "",
   "Outgoing [{networkInterfaceName}]": "",
+  "Override Admin Email": "",
   "Overrides default directory creation mask of <i>0777</i>  which grants directory read, write and execute access for everybody.": "",
   "Overrides default file creation mask of <i>0666</i>  which creates files with read and write access for everybody.": "",
   "Overview": "",