adding default message

elastic · Sep 30, 2020 · f9bd3c4 · f9bd3c4
1 parent 14c7a5e
commit f9bd3c4
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 0 deletions.
diff --git a/x-pack/plugins/apm/public/components/alerting/register_apm_alerts.ts b/x-pack/plugins/apm/public/components/alerting/register_apm_alerts.ts
@@ -23,6 +23,17 @@ export function registerApmAlerts(
       errors: [],
     }),
     requiresAppContext: true,
+    defaultActionMessage: i18n.translate(
+      'xpack.apm.alertTypes.errorCount.defaultActionMessage',
+      {
+        defaultMessage: `\\{\\{alertName\\}\\} alert is firing for the following configuration:
+
+- Service name: \\{\\{context.serviceName\\}\\}
+- Environment: \\{\\{context.environment\\}\\}
+- Triggered value: \\{\\{context.triggerValue\\}\\}
+- Threshold: \\{\\{context.threshold\\}\\}`,
+      }
+    ),
   });
 
   alertTypeRegistry.register({
@@ -38,6 +49,18 @@ export function registerApmAlerts(
       errors: [],
     }),
     requiresAppContext: true,
+    defaultActionMessage: i18n.translate(
+      'xpack.apm.alertTypes.transactionDuration.defaultActionMessage',
+      {
+        defaultMessage: `\\{\\{alertName\\}\\} alert is firing for the following configuration:
+
+- Service name: \\{\\{context.serviceName\\}\\}
+- Type: \\{\\{context.transactionType\\}\\}
+- Environment: \\{\\{context.environment\\}\\}
+- Triggered value: \\{\\{context.triggerValue\\}\\}
+- Threshold: \\{\\{context.threshold\\}\\}`,
+      }
+    ),
   });
 
   alertTypeRegistry.register({
@@ -53,6 +76,18 @@ export function registerApmAlerts(
       errors: [],
     }),
     requiresAppContext: true,
+    defaultActionMessage: i18n.translate(
+      'xpack.apm.alertTypes.transactionErrorRate.defaultActionMessage',
+      {
+        defaultMessage: `\\{\\{alertName\\}\\} alert is firing for the following configuration:
+
+- Service name: \\{\\{context.serviceName\\}\\}
+- Type: \\{\\{context.transactionType\\}\\}
+- Environment: \\{\\{context.environment\\}\\}
+- Triggered value: \\{\\{context.triggerValue\\}\\}
+- Threshold: \\{\\{context.threshold\\}\\}`,
+      }
+    ),
   });
 
   alertTypeRegistry.register({
@@ -68,5 +103,16 @@ export function registerApmAlerts(
       errors: [],
     }),
     requiresAppContext: true,
+    defaultActionMessage: i18n.translate(
+      'xpack.apm.alertTypes.transactionDurationAnomaly.defaultActionMessage',
+      {
+        defaultMessage: `\\{\\{alertName\\}\\} alert is firing for the following configuration:
+
+- Service name: \\{\\{context.serviceName\\}\\}
+- Type: \\{\\{context.transactionType\\}\\}
+- Environment: \\{\\{context.environment\\}\\}
+- Threshold: \\{\\{context.threshold\\}\\}`,
+      }
+    ),
   });
 }
diff --git a/...ck/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.test.ts b/...ck/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.test.ts
@@ -223,11 +223,13 @@ describe('Transaction duration anomaly alert', () => {
         serviceName: 'foo',
         transactionType: 'type-foo',
         environment: 'production',
+        threshold: 'minor',
       });
       expect(scheduleActions).toHaveBeenCalledWith('threshold_met', {
         serviceName: 'bar',
         transactionType: 'type-bar',
         environment: 'production',
+        threshold: 'minor',
       });
     });
 
@@ -305,21 +307,25 @@ describe('Transaction duration anomaly alert', () => {
         serviceName: 'foo',
         transactionType: undefined,
         environment: 'production',
+        threshold: 'minor',
       });
       expect(scheduleActions).toHaveBeenCalledWith('threshold_met', {
         serviceName: 'bar',
         transactionType: undefined,
         environment: 'production',
+        threshold: 'minor',
       });
       expect(scheduleActions).toHaveBeenCalledWith('threshold_met', {
         serviceName: 'foo',
         transactionType: undefined,
         environment: 'testing',
+        threshold: 'minor',
       });
       expect(scheduleActions).toHaveBeenCalledWith('threshold_met', {
         serviceName: 'bar',
         transactionType: undefined,
         environment: 'testing',
+        threshold: 'minor',
       });
     });
   });

diff --git a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.ts
@@ -61,6 +61,7 @@ export function registerTransactionDurationAnomalyAlertType({
         apmActionVariables.serviceName,
         apmActionVariables.transactionType,
         apmActionVariables.environment,
+        apmActionVariables.threshold,
       ],
     },
     producer: 'apm',
@@ -196,6 +197,7 @@ export function registerTransactionDurationAnomalyAlertType({
             serviceName,
             environment,
             transactionType,
+            threshold: selectedOption?.label,
           });
         }