feedback: enrich eventId (dedupe key) + fetch state from alert history

Author: wrn14897

packages/api/src/tasks/__tests__/checkAlerts.test.ts

@@ -312,6 +312,7 @@ describe('checkAlerts', () => {
         alertProvider,
         clickhouseClient: {} as any,
         metadata: {} as any,
+        state: 'ALERT',
         template: 'Custom body @webhook-My_Web', // partial name should work
         view: {
           ...defaultSearchView,
@@ -350,6 +351,7 @@ describe('checkAlerts', () => {
         alertProvider,
         clickhouseClient: {} as any,
         metadata: {} as any,
+        state: 'ALERT',
         template: 'Custom body @webhook-My_Web', // partial name should work
         view: {
           ...defaultSearchView,
@@ -410,6 +412,7 @@ describe('checkAlerts', () => {
         alertProvider,
         clickhouseClient: {} as any,
         metadata: {} as any,
+        state: 'ALERT',
         template: 'Custom body @webhook-{{attributes.webhookName}}', // partial name should work
         view: {
           ...defaultSearchView,
@@ -481,6 +484,7 @@ describe('checkAlerts', () => {
         alertProvider,
         clickhouseClient: {} as any,
         metadata: {} as any,
+        state: 'ALERT',
         template: `
 {{#is_match "attributes.k8s.pod.name" "otel-collector-123"}}
   Runbook URL: {{attributes.runbook.url}}
@@ -518,6 +522,7 @@ describe('checkAlerts', () => {
         alertProvider,
         clickhouseClient: {} as any,
         metadata: {} as any,
+        state: 'ALERT',
         template:
           '{{#is_match "attributes.host" "web"}} @webhook-My_Web {{/is_match}}', // partial name should work
         view: {

packages/api/src/tasks/checkAlerts.ts

@@ -157,14 +157,6 @@ export const processAlert = async (
 ) => {
   const { alert, source, previous } = details;
   try {
-    // Fetch full previous alert history to check state
-    let previousAlertHistory: IAlertHistory | null = null;
-    if (previous) {
-      previousAlertHistory = await AlertHistory.findOne({
-        alert: new mongoose.Types.ObjectId(alert.id),
-        createdAt: previous.createdAt,
-      });
-    }
     const windowSizeInMins = ms(alert.interval) / 60000;
     const nowInMinsRoundDown = roundDownToXMinutes(windowSizeInMins)(now);
     if (
@@ -383,7 +375,7 @@ export const processAlert = async (
 
     // Check if alert transitioned from ALERT to OK (resolved)
     if (
-      previousAlertHistory?.state === AlertState.ALERT &&
+      previous?.state === AlertState.ALERT &&
       history.state === AlertState.OK
     ) {
       logger.info({
@@ -440,6 +432,7 @@ export { handleSendGenericWebhook };
 export interface AggregatedAlertHistory {
   _id: ObjectId;
   createdAt: Date;
+  state: AlertState;
 }
 
 /**
@@ -470,11 +463,16 @@ export const getPreviousAlertHistories = async (
             createdAt: { $lte: now },
           },
         },
-        // Group by alert ID, taking the latest createdAt value for each group
+        // Sort by createdAt descending to get the latest first
+        {
+          $sort: { createdAt: -1 },
+        },
+        // Group by alert ID, taking the first (latest) values for each group
         {
           $group: {
             _id: '$alert',
-            createdAt: { $max: '$createdAt' },
+            createdAt: { $first: '$createdAt' },
+            state: { $first: '$state' },
           },
         },
       ]),

packages/api/src/tasks/template.ts

@@ -475,6 +475,10 @@ export const renderAlertTemplate = async ({
         const endTime = view.endTime.getTime();
         const eventId = objectHash({
           alertId: alert.id,
+          channel: {
+            type: channel.type,
+            id: channel.channel._id.toString(),
+          },
         });
 
         await notifyChannel({