Merge pull request #581 from falox/render-short-events

OU-1011: Render short-lived incidents and alerts

Author: openshift-merge-bot[bot]

web/src/components/Incidents/IncidentsChart/IncidentsChart.tsx

@@ -26,7 +26,11 @@ import {
 import '../incidents-styles.css';
 import { IncidentsTooltip } from '../IncidentsTooltip';
 import { Incident } from '../model';
-import { calculateChartDomain, createIncidentsChartBars, generateDateArray } from '../utils';
+import {
+  calculateIncidentsChartDomain,
+  createIncidentsChartBars,
+  generateDateArray,
+} from '../utils';
 import { dateTimeFormatter } from '../../console/utils/datetime';
 import { useTranslation } from 'react-i18next';
 import { DataTestIDs } from '../../data-test';
@@ -202,7 +206,7 @@ const IncidentsChart = ({
                 tickLabelComponent={
                   <ChartLabel style={{ fill: theme === 'light' ? '#1b1d21' : '#e0e0e0' }} />
                 }
-                domain={calculateChartDomain(dateValues, chartData)}
+                domain={calculateIncidentsChartDomain(dateValues)}
               />
               <ChartGroup horizontal data-test={DataTestIDs.IncidentsChart.ChartBars}>
                 {chartData.map((bar) => {

web/src/components/Incidents/IncidentsPage.tsx

@@ -25,7 +25,7 @@ import { Helmet } from 'react-helmet';
 import { IncidentsTable } from './IncidentsTable';
 import {
   getIncidentsTimeRanges,
-  processIncidents,
+  convertToIncidents,
   processIncidentsForAlerts,
 } from './processIncidents';
 import {
@@ -37,7 +37,7 @@ import {
   parseUrlParams,
   updateBrowserUrl,
 } from './utils';
-import { groupAlertsForTable, processAlerts } from './processAlerts';
+import { groupAlertsForTable, convertToAlerts } from './processAlerts';
 import { CompressArrowsAltIcon, CompressIcon, FilterIcon } from '@patternfly/react-icons';
 import { useDispatch, useSelector } from 'react-redux';
 import {
@@ -251,10 +251,10 @@ const IncidentsPage = () => {
         }),
       )
         .then((results) => {
-          const aggregatedData = results.flat();
+          const prometheusResults = results.flat();
           dispatch(
             setAlertsData({
-              alertsData: processAlerts(aggregatedData, incidentForAlertProcessing),
+              alertsData: convertToAlerts(prometheusResults, incidentForAlertProcessing),
             }),
           );
           if (!isEmpty(filteredData)) {
@@ -304,23 +304,23 @@ const IncidentsPage = () => {
       }),
     )
       .then((results) => {
-        const aggregatedData = results.flat();
-        const processedIncidents = processIncidents(aggregatedData);
+        const prometheusResults = results.flat();
+        const incidents = convertToIncidents(prometheusResults);
 
         // Update the raw, unfiltered incidents state
-        dispatch(setIncidents({ incidents: processedIncidents }));
+        dispatch(setIncidents({ incidents }));
 
-        // Now, dispatch the filtered data based on the full incidents list
+        // Filter the incidents and dispatch
         dispatch(
           setFilteredIncidentsData({
-            filteredIncidentsData: filterIncident(incidentsActiveFilters, processedIncidents),
+            filteredIncidentsData: filterIncident(incidentsActiveFilters, incidents),
           }),
         );
 
         setIncidentsAreLoading(false);
 
         if (isGroupSelected) {
-          setIncidentForAlertProcessing(processIncidentsForAlerts(aggregatedData));
+          setIncidentForAlertProcessing(processIncidentsForAlerts(prometheusResults));
           // Only set loading if we don't already have data to show
           if (isEmpty(alertsData)) {
             dispatch(setAlertsAreLoading({ alertsAreLoading: true }));

web/src/components/Incidents/model.ts

@@ -30,9 +30,6 @@ export type Metric = {
 };
 
 export type ProcessedIncident = Incident & {
-  informative: boolean;
-  critical: boolean;
-  warning: boolean;
   resolved: boolean;
   firing: boolean;
 };