OU-1040: feat/absolute start dates

web/src/components/Incidents/AlertsChart/AlertsChart.tsx

@@ -32,6 +32,7 @@ import {
   generateDateArray,
   generateAlertsDateArray,
   getCurrentTime,
+  roundTimestampToFiveMinutes,
 } from '../utils';
 import { dateTimeFormatter, timeFormatter } from '../../console/utils/datetime';
 import { useTranslation } from 'react-i18next';
@@ -160,7 +161,11 @@ const AlertsChart = ({ theme }: { theme: 'light' | 'dark' }) => {
                     if (datum.nodata) {
                       return '';
                     }
-                    const startDate = dateTimeFormatter(i18n.language).format(new Date(datum.y0));
+                    const startDate = dateTimeFormatter(i18n.language).format(
+                      new Date(
+                        roundTimestampToFiveMinutes(datum.startDate.getTime() / 1000) * 1000,
+                      ),
+                    );
                     const endDate =
                       datum.alertstate === 'firing'
                         ? '---'

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

@@ -28,11 +28,13 @@ import {
 } from '@patternfly/react-tokens';
 import '../incidents-styles.css';
 import { IncidentsTooltip } from '../IncidentsTooltip';
-import { Incident } from '../model';
+import { Incident, IncidentsTimestamps } from '../model';
 import {
   calculateIncidentsChartDomain,
   createIncidentsChartBars,
   generateDateArray,
+  matchTimestampMetricForIncident,
+  roundTimestampToFiveMinutes,
 } from '../utils';
 import { dateTimeFormatter, timeFormatter } from '../../console/utils/datetime';
 import { useTranslation } from 'react-i18next';
@@ -56,6 +58,7 @@ const formatComponentList = (componentList: string[] | undefined): string => {
 
 const IncidentsChart = ({
   incidentsData,
+  incidentsTimestamps,
   chartDays,
   theme,
   selectedGroupId,
@@ -64,6 +67,7 @@ const IncidentsChart = ({
   lastRefreshTime,
 }: {
   incidentsData: Array<Incident>;
+  incidentsTimestamps: IncidentsTimestamps;
   chartDays: number;
   theme: 'light' | 'dark';
   selectedGroupId: string;
@@ -79,6 +83,20 @@ const IncidentsChart = ({
     [chartDays, currentTime],
   );
 
+  // enrich incidentsData with first_timestamp from timestamp metric
+  incidentsData = incidentsData.map((incident) => {
+    // find the matched timestamp for the incident
+    const matchedMinTimestamp = matchTimestampMetricForIncident(
+      incident,
+      incidentsTimestamps.minOverTime,
+    );
+
+    return {
+      ...incident,
+      firstTimestamp: parseInt(matchedMinTimestamp?.value?.[1] ?? '0'),
+    };
+  });
+
   const { t, i18n } = useTranslation(process.env.I18N_NAMESPACE);
 
   const chartData = useMemo(() => {
@@ -175,7 +193,11 @@ const IncidentsChart = ({
                     if (datum.nodata) {
                       return '';
                     }
-                    const startDate = dateTimeFormatter(i18n.language).format(new Date(datum.y0));
+                    const startDate = dateTimeFormatter(i18n.language).format(
+                      new Date(
+                        roundTimestampToFiveMinutes(datum.startDate.getTime() / 1000) * 1000,
+                      ),
+                    );
                     const endDate = datum.firing
                       ? '---'
                       : dateTimeFormatter(i18n.language).format(new Date(datum.y));

web/src/components/Incidents/IncidentsDetailsRowTable.tsx

@@ -11,6 +11,7 @@ import { Alert, IncidentsDetailsAlert } from './model';
 import { IncidentAlertStateIcon } from './IncidentAlertStateIcon';
 import { useMemo } from 'react';
 import { DataTestIDs } from '../data-test';
+import { roundTimestampToFiveMinutes } from './utils';
 
 interface IncidentsDetailsRowTableProps {
   alerts: Alert[];
@@ -24,10 +25,11 @@ const IncidentsDetailsRowTable = ({ alerts }: IncidentsDetailsRowTableProps) =>
   const sortedAndMappedAlerts = useMemo(() => {
     if (alerts && alerts.length > 0) {
       return [...alerts]
-        .sort(
-          (a: IncidentsDetailsAlert, b: IncidentsDetailsAlert) =>
-            a.alertsStartFiring - b.alertsStartFiring,
-        )
+        .sort((a: IncidentsDetailsAlert, b: IncidentsDetailsAlert) => {
+          const aStart = a.firstTimestamp > 0 ? a.firstTimestamp : a.alertsStartFiring;
+          const bStart = b.firstTimestamp > 0 ? b.firstTimestamp : b.alertsStartFiring;
+          return aStart - bStart;
+        })
         .map((alertDetails: IncidentsDetailsAlert, rowIndex) => {
           return (
             <Tr key={rowIndex}>
@@ -45,13 +47,27 @@ const IncidentsDetailsRowTable = ({ alerts }: IncidentsDetailsRowTableProps) =>
                 <SeverityBadge severity={alertDetails.severity} />
               </Td>
               <Td dataLabel="expanded-details-firingstart">
-                <Timestamp timestamp={alertDetails.alertsStartFiring * 1000} />
+                <Timestamp
+                  timestamp={
+                    roundTimestampToFiveMinutes(
+                      alertDetails.firstTimestamp > 0
+                        ? alertDetails.firstTimestamp
+                        : alertDetails.alertsStartFiring,
+                    ) * 1000
+                  }
+                />
               </Td>
               <Td dataLabel="expanded-details-firingend">
                 {!alertDetails.resolved ? (
                   '---'
                 ) : (
-                  <Timestamp timestamp={alertDetails.alertsEndFiring * 1000} />
+                  <Timestamp
+                    timestamp={
+                      (alertDetails.lastTimestamp > 0
+                        ? alertDetails.lastTimestamp
+                        : alertDetails.alertsEndFiring) * 1000
+                    }
+                  />
                 )}
               </Td>
               <Td dataLabel="expanded-details-alertstate">

web/src/components/Incidents/IncidentsPage.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import { useMemo, useState, useEffect, useCallback } from 'react';
 import { useSafeFetch } from '../console/utils/safe-fetch-hook';
-import { createAlertsQuery, fetchDataForIncidentsAndAlerts } from './api';
+import { createAlertsQuery, fetchDataForIncidentsAndAlerts, fetchInstantData } from './api';
 import { useTranslation } from 'react-i18next';
 import {
   Bullseye,
@@ -46,7 +46,9 @@ import {
   setAlertsAreLoading,
   setAlertsData,
   setAlertsTableData,
+  setAlertsTimestamps,
   setFilteredIncidentsData,
+  setIncidentsTimestamps,
   setIncidentPageFilterType,
   setIncidents,
   setIncidentsActiveFilters,
@@ -146,6 +148,10 @@ const IncidentsPage = () => {
     (state: MonitoringState) => state.plugins.mcp.incidentsData.filteredIncidentsData,
   );
 
+  const incidentsTimestamps = useSelector(
+    (state: MonitoringState) => state.plugins.mcp.incidentsData.incidentsTimestamps,
+  );
+
   const selectedGroupId = incidentsActiveFilters.groupId?.[0] ?? undefined;
 
   const incidentPageFilterTypeSelected = useSelector(
@@ -229,49 +235,74 @@ const IncidentsPage = () => {
   }, [incidentsActiveFilters.days]);
 
   useEffect(() => {
-    (async () => {
-      const currentTime = incidentsLastRefreshTime;
-      Promise.all(
-        timeRanges.map(async (range) => {
-          const response = await fetchDataForIncidentsAndAlerts(
-            safeFetch,
-            range,
-            createAlertsQuery(incidentForAlertProcessing),
-          );
-          return response.data.result;
-        }),
-      )
-        .then((results) => {
-          const prometheusResults = results.flat();
-          const alerts = convertToAlerts(
-            prometheusResults,
-            incidentForAlertProcessing,
-            currentTime,
-          );
+    // Guard: don't process if no incidents selected or timeRanges not ready
+    if (incidentForAlertProcessing.length === 0 || timeRanges.length === 0) {
+      return;
+    }
+
+    const currentTime = incidentsLastRefreshTime;
+
+    // Fetch timestamps and alerts in parallel, but wait for both before processing
+    const timestampsPromise = Promise.all(
+      ['min_over_time(timestamp(ALERTS{alertstate="firing"})[15d:5m])'].map(async (query) => {
+        const response = await fetchInstantData(safeFetch, query);
+        return response.data.result;
+      }),
+    );
+
+    const alertsPromise = Promise.all(
+      timeRanges.map(async (range) => {
+        const response = await fetchDataForIncidentsAndAlerts(
+          safeFetch,
+          range,
+          createAlertsQuery(incidentForAlertProcessing),
+        );
+        return response.data.result;
+      }),
+    );
+
+    Promise.all([timestampsPromise, alertsPromise])
+      .then(([timestampsResults, alertsResults]) => {
+        // Dispatch timestamps to store
+        const fetchedAlertsTimestamps = {
+          minOverTime: timestampsResults[0],
+        };
+        dispatch(
+          setAlertsTimestamps({
+            alertsTimestamps: fetchedAlertsTimestamps,
+          }),
+        );
+
+        const prometheusResults = alertsResults.flat();
+        const alerts = convertToAlerts(
+          prometheusResults,
+          incidentForAlertProcessing,
+          currentTime,
+          fetchedAlertsTimestamps,
+        );
+        dispatch(
+          setAlertsData({
+            alertsData: alerts,
+          }),
+        );
+        if (rules && alerts) {
           dispatch(
-            setAlertsData({
-              alertsData: alerts,
+            setAlertsTableData({
+              alertsTableData: groupAlertsForTable(alerts, rules),
             }),
           );
-          if (rules && alerts) {
-            dispatch(
-              setAlertsTableData({
-                alertsTableData: groupAlertsForTable(alerts, rules),
-              }),
-            );
-          }
-          if (!isEmpty(filteredData)) {
-            dispatch(setAlertsAreLoading({ alertsAreLoading: false }));
-          } else {
-            dispatch(setAlertsAreLoading({ alertsAreLoading: true }));
-          }
-        })
-        .catch((err) => {
-          // eslint-disable-next-line no-console
-          console.log(err);
-        });
-    })();
-  }, [incidentForAlertProcessing]);
+        }
+        if (!isEmpty(filteredData)) {
+          dispatch(setAlertsAreLoading({ alertsAreLoading: false }));
+        } else {
+          dispatch(setAlertsAreLoading({ alertsAreLoading: true }));
+        }
+      })
+      .catch((err) => {
+        // eslint-disable-next-line no-console
+        console.log(err);
+      });
+  }, [incidentForAlertProcessing, timeRanges, rules]);
 
   useEffect(() => {
     if (!isInitialized) return;
@@ -294,14 +325,34 @@ const IncidentsPage = () => {
       ? `cluster_health_components_map{group_id='${selectedGroupId}'}`
       : 'cluster_health_components_map';
 
-    Promise.all(
+    // Fetch timestamps and incidents in parallel, but wait for both before processing
+    const timestampsPromise = Promise.all(
+      ['min_over_time(timestamp(cluster_health_components_map)[15d:5m])'].map(async (query) => {
+        const response = await fetchInstantData(safeFetch, query);
+        return response.data.result;
+      }),
+    );
+
+    const incidentsPromise = Promise.all(
       calculatedTimeRanges.map(async (range) => {
         const response = await fetchDataForIncidentsAndAlerts(safeFetch, range, incidentsQuery);
         return response.data.result;
       }),
-    )
-      .then((results) => {
-        const prometheusResults = results.flat();
+    );
+
+    Promise.all([timestampsPromise, incidentsPromise])
+      .then(([timestampsResults, incidentsResults]) => {
+        // Dispatch timestamps to store
+        const fetchedTimestamps = {
+          minOverTime: timestampsResults[0],
+        };
+        dispatch(
+          setIncidentsTimestamps({
+            incidentsTimestamps: fetchedTimestamps,
+          }),
+        );
+
+        const prometheusResults = incidentsResults.flat();
         const incidents = convertToIncidents(prometheusResults, currentTime);
 
         // Update the raw, unfiltered incidents state
@@ -317,7 +368,10 @@ const IncidentsPage = () => {
         setIncidentsAreLoading(false);
 
         if (isGroupSelected) {
-          setIncidentForAlertProcessing(processIncidentsForAlerts(prometheusResults));
+          // Use fetchedTimestamps directly instead of stale closure value
+          setIncidentForAlertProcessing(
+            processIncidentsForAlerts(prometheusResults, fetchedTimestamps),
+          );
           dispatch(setAlertsAreLoading({ alertsAreLoading: true }));
         } else {
           closeDropDownFilters();
@@ -638,6 +692,7 @@ const IncidentsPage = () => {
                 <StackItem>
                   <IncidentsChart
                     incidentsData={filteredData}
+                    incidentsTimestamps={incidentsTimestamps}
                     chartDays={timeRanges.length}
                     theme={theme}
                     selectedGroupId={selectedGroupId}

web/src/components/Incidents/IncidentsTable.tsx

@@ -20,6 +20,7 @@ import { GroupedAlertStateIcon } from './IncidentAlertStateIcon';
 
 import { GroupedAlert } from './model';
 import { DataTestIDs } from '../data-test';
+import { roundTimestampToFiveMinutes } from './utils';
 
 export const IncidentsTable = () => {
   const { t } = useTranslation(process.env.I18N_NAMESPACE);
@@ -95,7 +96,7 @@ export const IncidentsTable = () => {
     if (!alert.alertsExpandedRowData || alert.alertsExpandedRowData.length === 0) {
       return 0;
     }
-    return Math.min(...alert.alertsExpandedRowData.map((alertData) => alertData.alertsStartFiring));
+    return Math.min(...alert.alertsExpandedRowData.map((alertData) => alertData.firstTimestamp));
   };
 
   if (isEmpty(alertsTableData) || alertsAreLoading || isEmpty(incidentsActiveFilters.groupId)) {
@@ -180,7 +181,9 @@ export const IncidentsTable = () => {
                       )}
                     </Td>
                     <Td dataLabel={columnNames.startDate}>
-                      <Timestamp timestamp={getMinStartDate(alert) * 1000} />
+                      <Timestamp
+                        timestamp={roundTimestampToFiveMinutes(getMinStartDate(alert)) * 1000}
+                      />
                     </Td>
                     <Td
                       dataLabel={columnNames.state}