requested changes done #78148

Author: dB2510

x-pack/plugins/stack_alerts/server/alert_types/index_threshold/action_context.ts

@@ -29,8 +29,6 @@ export interface BaseActionContext extends AlertInstanceContext {
   value: number;
   // the function that is used
   function: string;
-  // the time window for aggregation
-  window: string;
 }
 
 export function addMessages(
@@ -46,6 +44,7 @@ export function addMessages(
     },
   });
 
+  const window = `${params.timeWindowSize}${params.timeWindowUnit}`;
   const message = i18n.translate(
     'xpack.stackAlerts.indexThreshold.alertTypeContextMessageDescription',
     {
@@ -56,7 +55,7 @@ export function addMessages(
         group: baseContext.group,
         value: baseContext.value,
         function: baseContext.function,
-        window: baseContext.window,
+        window,
         date: baseContext.date,
       },
     }

x-pack/plugins/stack_alerts/server/alert_types/index_threshold/alert_type.ts

@@ -86,14 +86,7 @@ export function getAlertType(service: Service): AlertType<Params, {}, {}, Action
   const actionVariableContextFunctionLabel = i18n.translate(
     'xpack.stackAlerts.indexThreshold.actionVariableContextFunctionLabel',
     {
-      defaultMessage: 'A string formatted values combining threshold comparator and threshold',
-    }
-  );
-
-  const actionVariableContextWindowLabel = i18n.translate(
-    'xpack.stackAlerts.indexThreshold.actionVariableContextWindowLabel',
-    {
-      defaultMessage: 'A string formatted values combining time window size and time window unit',
+      defaultMessage: 'A string describing the threshold comparator and threshold',
     }
   );
 
@@ -122,7 +115,6 @@ export function getAlertType(service: Service): AlertType<Params, {}, {}, Action
         { name: 'date', description: actionVariableContextDateLabel },
         { name: 'value', description: actionVariableContextValueLabel },
         { name: 'function', description: actionVariableContextFunctionLabel },
-        { name: 'window', description: actionVariableContextWindowLabel },
       ],
       params: [
         { name: 'threshold', description: actionVariableContextThresholdLabel },
@@ -179,14 +171,11 @@ export function getAlertType(service: Service): AlertType<Params, {}, {}, Action
       const agg = params.aggField ? `${params.aggType}(${params.aggField})` : `${params.aggType}`;
       const humanFn = `${agg} ${params.thresholdComparator} ${params.threshold.join(',')}`;
 
-      const window = `${params.timeWindowSize}${params.timeWindowUnit}`;
-
       const baseContext: BaseActionContext = {
         date,
         group: instanceId,
         value,
         function: humanFn,
-        window,
       };
       const actionContext = addMessages(options, baseContext, params);
       const alertInstance = options.services.alertInstanceFactory(instanceId);

x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/index.ts

@@ -20,7 +20,7 @@ export function getAlertType(): AlertTypeModel<IndexThresholdAlertParams, Alerts
     defaultActionMessage: i18n.translate(
       'xpack.triggersActionsUI.builtin_alert_types.threshold.alertDefaultActionMessage',
       {
-        defaultMessage: `alert \\{\\{alertName\\}\\} group \\{\\{context.group\\}\\} value \\{\\{context.value\\}\\} exceeded threshold \\{\\{context.function\\}\\} over \\{\\{context.window\\}\\} on \\{\\{context.date\\}\\}`,
+        defaultMessage: `alert \\{\\{alertName\\}\\} group \\{\\{context.group\\}\\} value \\{\\{context.value\\}\\} exceeded threshold \\{\\{context.function\\}\\} over \\{\\{params.timeWindowSize\\}\\}\\{\\{params.timeWindowUnit\\}\\} on \\{\\{context.date\\}\\}`,
       }
     ),
     requiresAppContext: false,