feat: handle the case of no matchingIncident found

Author: rioloc

web/src/components/Incidents/processAlerts.spec.ts

@@ -319,8 +319,6 @@ describe('convertToAlerts', () => {
             alertname: 'Alert2',
             namespace: 'ns2',
             severity: 'warning',
-            component: 'comp2',
-            layer: 'layer2',
             name: 'name2',
             alertstate: 'firing',
           },
@@ -331,8 +329,6 @@ describe('convertToAlerts', () => {
             alertname: 'Alert1',
             namespace: 'ns1',
             severity: 'critical',
-            component: 'comp1',
-            layer: 'layer1',
             name: 'name1',
             alertstate: 'firing',
           },
@@ -343,13 +339,17 @@ describe('convertToAlerts', () => {
       const incidents: Array<Partial<Incident>> = [
         {
           group_id: 'incident1',
+          component: 'comp1',
+          layer: 'layer1',
           src_alertname: 'Alert1',
           src_namespace: 'ns1',
           src_severity: 'critical',
           values: [[nowSeconds - 3600, '2']],
         },
         {
           group_id: 'incident2',
+          component: 'comp2',
+          layer: 'layer2',
           src_alertname: 'Alert2',
           src_namespace: 'ns2',
           src_severity: 'warning',
@@ -370,8 +370,6 @@ describe('convertToAlerts', () => {
             alertname: 'Alert1',
             namespace: 'ns1',
             severity: 'critical',
-            component: 'comp1',
-            layer: 'layer1',
             name: 'name1',
             alertstate: 'firing',
           },
@@ -382,8 +380,6 @@ describe('convertToAlerts', () => {
             alertname: 'Alert2',
             namespace: 'ns2',
             severity: 'warning',
-            component: 'comp2',
-            layer: 'layer2',
             name: 'name2',
             alertstate: 'firing',
           },
@@ -415,8 +411,6 @@ describe('convertToAlerts', () => {
             alertname: 'TestAlert',
             namespace: 'test-namespace',
             severity: 'critical',
-            component: 'test-component',
-            layer: 'test-layer',
             name: 'test',
             alertstate: 'firing',
           },
@@ -430,6 +424,8 @@ describe('convertToAlerts', () => {
           src_alertname: 'TestAlert',
           src_namespace: 'test-namespace',
           src_severity: 'critical',
+          component: 'test-component',
+          layer: 'test-layer',
           silenced: true,
           values: [[nowSeconds, '2']],
         },
@@ -447,8 +443,6 @@ describe('convertToAlerts', () => {
             alertname: 'TestAlert',
             namespace: 'test-namespace',
             severity: 'critical',
-            component: 'test-component',
-            layer: 'test-layer',
             name: 'test',
             alertstate: 'firing',
           },
@@ -462,6 +456,8 @@ describe('convertToAlerts', () => {
           src_alertname: 'DifferentAlert',
           src_namespace: 'different-namespace',
           src_severity: 'warning',
+          component: 'test-component',
+          layer: 'test-layer',
           values: [[nowSeconds, '1']],
         },
       ];
@@ -480,8 +476,6 @@ describe('convertToAlerts', () => {
             alertname: 'TestAlert',
             namespace: 'test-namespace',
             severity: 'critical',
-            component: 'test-component',
-            layer: 'test-layer',
             name: 'test',
             alertstate: 'firing',
           },
@@ -499,6 +493,8 @@ describe('convertToAlerts', () => {
           src_alertname: 'TestAlert',
           src_namespace: 'test-namespace',
           src_severity: 'critical',
+          component: 'test-component',
+          layer: 'test-layer',
           silenced: false,
           values: [[nowSeconds - 600, '2']],
         },
@@ -527,8 +523,6 @@ describe('convertToAlerts', () => {
             alertname: 'MyAlert',
             namespace: 'my-namespace',
             severity: 'warning',
-            component: 'my-component',
-            layer: 'my-layer',
             name: 'my-name',
             alertstate: 'firing',
           },
@@ -542,6 +536,8 @@ describe('convertToAlerts', () => {
           src_alertname: 'MyAlert',
           src_namespace: 'my-namespace',
           src_severity: 'warning',
+          component: 'my-component',
+          layer: 'my-layer',
           values: [[nowSeconds, '1']],
         },
       ];
@@ -566,7 +562,6 @@ describe('deduplicateAlerts', () => {
           metric: {
             alertname: 'Alert1',
             namespace: 'ns1',
-            component: 'comp1',
             severity: 'critical',
             alertstate: 'resolved',
           },
@@ -576,7 +571,6 @@ describe('deduplicateAlerts', () => {
           metric: {
             alertname: 'Alert2',
             namespace: 'ns2',
-            component: 'comp2',
             severity: 'warning',
             alertstate: 'firing',
           },
@@ -597,7 +591,6 @@ describe('deduplicateAlerts', () => {
           metric: {
             alertname: 'Alert1',
             namespace: 'ns1',
-            component: 'comp1',
             severity: 'critical',
             alertstate: 'firing',
           },
@@ -610,7 +603,6 @@ describe('deduplicateAlerts', () => {
           metric: {
             alertname: 'Alert1',
             namespace: 'ns1',
-            component: 'comp1',
             severity: 'critical',
             alertstate: 'firing',
           },
@@ -632,7 +624,6 @@ describe('deduplicateAlerts', () => {
           metric: {
             alertname: 'Alert1',
             namespace: 'ns1',
-            component: 'comp1',
             severity: 'critical',
             alertstate: 'firing',
           },
@@ -642,7 +633,6 @@ describe('deduplicateAlerts', () => {
           metric: {
             alertname: 'Alert2',
             namespace: 'ns1',
-            component: 'comp1',
             severity: 'critical',
             alertstate: 'firing',
           },
@@ -660,7 +650,6 @@ describe('deduplicateAlerts', () => {
           metric: {
             alertname: 'Alert1',
             namespace: 'ns1',
-            component: 'comp1',
             severity: 'critical',
             alertstate: 'firing',
           },
@@ -670,7 +659,6 @@ describe('deduplicateAlerts', () => {
           metric: {
             alertname: 'Alert1',
             namespace: 'ns1',
-            component: 'comp1',
             severity: 'warning',
             alertstate: 'firing',
           },
@@ -690,7 +678,6 @@ describe('deduplicateAlerts', () => {
           metric: {
             alertname: 'Alert1',
             namespace: 'ns1',
-            component: 'comp1',
             severity: 'critical',
             alertstate: 'firing',
           },

web/src/components/Incidents/processAlerts.ts

@@ -261,12 +261,15 @@ export function convertToAlerts(
       const firstTimestamp = paddedValues[0][0];
       lastTimestamp = paddedValues[paddedValues.length - 1][0];
 
+      // TODO Evaluate if the alert should be skipped in the case of:
+      // - No matching incident found
+
       return {
         alertname: alert.metric.alertname,
         namespace: alert.metric.namespace,
         severity: alert.metric.severity as Severity,
-        component: matchingIncident.component,
-        layer: matchingIncident.layer,
+        component: matchingIncident?.component ?? 'Others', // Default to 'Others' if no matching incident found
+        layer: matchingIncident?.layer ?? 'Others', // Default to 'Others' if no matching incident found
         name: alert.metric.name,
         alertstate: resolved ? 'resolved' : 'firing',
         values: paddedValues,