refactor ppl alerting apis to v1 endpoints (#1378)

* refactor ppl alerting apis to v1 endpoints

Signed-off-by: KashKondaka <37753523+KashKondaka@users.noreply.github.com>

* fix monitor index unit test

Signed-off-by: KashKondaka <37753523+KashKondaka@users.noreply.github.com>

* react 18

Signed-off-by: KashKondaka <37753523+KashKondaka@users.noreply.github.com>

* update to 3.5

Signed-off-by: KashKondaka <37753523+KashKondaka@users.noreply.github.com>

* update open search version to 3.5 in workflow

Signed-off-by: KashKondaka <37753523+KashKondaka@users.noreply.github.com>

---------

Signed-off-by: KashKondaka <37753523+KashKondaka@users.noreply.github.com>

Author: KashKondaka

.github/workflows/verify-binary-installation.yml

@@ -2,7 +2,7 @@ name: 'Install Dashboards with Plugin via Binary'
 
 on: [push, pull_request]
 env:
-  OPENSEARCH_VERSION: '3.0.0-alpha1'
+  OPENSEARCH_VERSION: '3.5.0'
   CI: 1
   # avoid warnings like "tput: No value for $TERM and no -T specified"
   TERM: xterm

package.json

@@ -28,22 +28,23 @@
   },
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.22.9",
+    "@cfaester/enzyme-adapter-react-18": "^0.8.0",
     "@elastic/elastic-eslint-config-kibana": "link:../../packages/opensearch-eslint-config-opensearch-dashboards",
     "@elastic/eslint-import-resolver-kibana": "link:../../packages/osd-eslint-import-resolver-opensearch-dashboards",
+    "@types/react": "^18.2.0",
     "cypress": "^13.6.0",
     "husky": "^8.0.0",
-    "lint-staged": "^10.2.0",
-    "@types/react": "^18.2.0"
+    "lint-staged": "^10.2.0"
   },
   "dependencies": {
     "@reduxjs/toolkit": "^1.6.1",
     "brace": "0.11.1",
     "formik": "^2.2.6",
     "lodash": "^4.17.21",
+    "prettier": "^2.1.1",
     "query-string": "^6.13.2",
     "react-redux": "^8.1.0",
-    "react-vis": "^1.8.1",
-    "prettier": "^2.1.1"
+    "react-vis": "^1.8.1"
   },
   "resolutions": {
     "ansi-regex": "^5.0.1",

public/components/AlertInsight/AlertInsight.tsx

@@ -45,16 +45,9 @@ export const AlertInsight: React.FC<AlertInsightProps> = (props: AlertInsightPro
     viewMode = 'classic',
   } = props;
 
-  const isPplMonitorAlert =
-    viewMode === 'new' ||
-    Boolean(alert?.monitor_v2_id || alert?.trigger_v2_id || alert?.monitor_v2_name);
+  const isPplMonitorAlert = viewMode === 'new';
 
   if (isPplMonitorAlert) {
-    console.log('[AlertInsight] skipping v1 monitor fetch for PPL alert', {
-      viewMode,
-      alertId,
-      hasV2Fields: Boolean(alert?.monitor_v2_id || alert?.trigger_v2_id || alert?.monitor_v2_name),
-    });
     return children;
   }
 

public/components/Breadcrumbs/Breadcrumbs.js

@@ -142,13 +142,7 @@ const fetchMonitorName = async (id, legacyResource, dataSourceQueryObj, httpClie
 };
 
 const extractMonitorNameFromV2 = (payload = {}) => {
-  const pplMonitor =
-    payload?.monitor_v2?.ppl_monitor ??
-    payload?.monitor?.ppl_monitor ??
-    payload?.ppl_monitor ??
-    null;
-
-  const name = pplMonitor?.name ?? payload?.monitor?.name ?? payload?.name ?? null;
+  const name = payload?.name ?? payload?.monitor?.name ?? null;
   return { name };
 };
 

public/components/Flyout/flyouts/components/AlertsDashboardFlyoutComponentPpl.js

@@ -135,8 +135,8 @@ export default class AlertsDashboardFlyoutComponentPpl extends Component {
       }
 
       const payload = resp.resp || resp;
-      const alertsArray = Array.isArray(payload?.alerts_v2) ? payload.alerts_v2 : [];
-      const totalCountRaw = payload?.total_alerts_v2;
+      const alertsArray = Array.isArray(payload?.alerts) ? payload.alerts : [];
+      const totalCountRaw = payload?.totalAlerts;
       const totalCount = Number.isFinite(Number(totalCountRaw))
         ? Number(totalCountRaw)
         : alertsArray.length;
@@ -145,7 +145,7 @@ export default class AlertsDashboardFlyoutComponentPpl extends Component {
         alertState && alertState !== 'ALL' ? String(alertState).toUpperCase() : undefined;
 
       const filteredAlerts = alertsArray
-        .filter((alert) => alert.trigger_v2_id === triggerID)
+        .filter((alert) => alert.trigger_id === triggerID)
         .filter((alert) => {
           if (!stateFilter) return true;
           const stateValue = String(alert?.state || '').toUpperCase();
@@ -156,7 +156,7 @@ export default class AlertsDashboardFlyoutComponentPpl extends Component {
         const direction = sortDirection === 'asc' ? 1 : -1;
 
         if (sortField === 'start_time') {
-          return (Number(a?.triggered_time) - Number(b?.triggered_time)) * direction;
+          return (Number(a?.start_time) - Number(b?.start_time)) * direction;
         }
 
         const valueA = _.get(a, sortField);
@@ -217,7 +217,7 @@ export default class AlertsDashboardFlyoutComponentPpl extends Component {
   };
 
   renderQueryResultsPreview = (alert) => {
-    const results = alert?.query_results;
+    const results = alert?.ppl_query_results;
     const schema = Array.isArray(results?.schema) ? results.schema : [];
     const dataRows = Array.isArray(results?.datarows) ? results.datarows : [];
 
@@ -234,7 +234,7 @@ export default class AlertsDashboardFlyoutComponentPpl extends Component {
   };
 
   getItemId = (alert) => {
-    const version = alert?.monitor_v2_version ?? alert?.version ?? '';
+    const version = alert?.version ?? '';
     return `${alert.id}-${version}`;
   };
 
@@ -251,7 +251,7 @@ export default class AlertsDashboardFlyoutComponentPpl extends Component {
       totalAlerts,
     } = this.state;
 
-    const { monitor = {}, monitor_id, monitor_name, trigger_name, start_time } = this.props;
+    const { monitor_id, monitor_name, trigger_name, start_time } = this.props;
 
     const pageSizeToUse = size > 0 ? size : DEFAULT_PAGE_SIZE;
     const displayedAlerts = alerts.slice(
@@ -260,20 +260,17 @@ export default class AlertsDashboardFlyoutComponentPpl extends Component {
     );
     const firstAlert = alerts[0] || {};
 
-    const severity =
-      normalizePPLSeverity(firstAlert?.severity) ||
-      normalizePPLSeverity(_.get(monitor, 'triggers[0].severity')) ||
-      firstAlert?.severity;
+    const severity = normalizePPLSeverity(firstAlert?.severity) || firstAlert?.severity;
 
-    const condition = firstAlert?.query || monitor?.query || DEFAULT_EMPTY_DATA;
+    const condition = firstAlert?.ppl_query || DEFAULT_EMPTY_DATA;
 
     const monitorUrl = monitor_id ? `#/monitors/${monitor_id}` : '#/monitors';
 
     const severityDisplay = getSeverityText(severity) || severity || DEFAULT_EMPTY_DATA;
 
     const columns = [
       {
-        field: 'triggered_time',
+        field: 'start_time',
         name: 'Alert triggered time',
         sortable: true,
         dataType: 'date',
@@ -286,12 +283,13 @@ export default class AlertsDashboardFlyoutComponentPpl extends Component {
         },
       },
       {
-        field: 'query_results',
+        field: 'ppl_query_results',
         name: '',
         align: 'right',
         render: (_value, item) => {
           const hasResults =
-            Array.isArray(item?.query_results?.datarows) && item.query_results.datarows.length;
+            Array.isArray(item?.ppl_query_results?.datarows) &&
+            item.ppl_query_results.datarows.length;
           if (!hasResults) {
             return (
               <EuiText size="s" color="subdued">

public/pages/CreateMonitor/containers/CreateMonitor/utils/pplAlertingHelpers.js

@@ -124,8 +124,8 @@ export const getInitialValues = ({
     const isPpl =
       initialValues?.query_language === 'ppl' ||
       monitorToEdit?.query_language === 'ppl' ||
-      !!monitorToEdit?.ppl_monitor ||
-      !!monitorToEdit?.monitor_v2?.ppl_monitor;
+      monitorToEdit?.monitor_type === 'ppl_monitor' ||
+      !!monitorToEdit?.ppl_monitor;
     initialValues.monitor_mode = isPpl ? 'ppl' : 'legacy';
     if (isPpl) {
       initialValues.searchType = 'query';

public/pages/CreateMonitor/containers/CreateMonitor/utils/pplAlertingMonitorToFormik.js

@@ -18,12 +18,7 @@ export default function pplAlertingMonitorToFormik(monitorIn) {
   const formikValues = _.cloneDeep(FORMIK_INITIAL_VALUES);
   if (!monitorIn) return formikValues;
 
-  const monitor =
-    monitorIn?.monitor_v2?.ppl_monitor ||
-    monitorIn?.monitorV2?.ppl_monitor ||
-    monitorIn?.ppl_monitor ||
-    monitorIn ||
-    {};
+  const monitor = monitorIn?.ppl_monitor || monitorIn || {};
   if (!monitor || Object.keys(monitor).length === 0) return formikValues;
 
   let cronExpression = formikValues.cronExpression;

public/pages/Dashboard/containers/Dashboard.test.js

@@ -48,7 +48,7 @@ describe('Dashboard', () => {
       ok: true,
       alerts: [],
       totalAlerts: 0,
-      resp: { total_alerts_v2: 0, alerts: [] },
+      resp: { totalAlerts: 0, alerts: [] },
     });
   });
 

public/pages/Dashboard/containers/DashboardPpl.js

@@ -219,21 +219,15 @@ export default class DashboardPpl extends Component {
         let rawAlerts = [];
         let totalFromServer;
 
-        const alertsArray = payload?.alerts_v2 || payload?.alertV2s;
+        const alertsArray = payload?.alerts;
         if (Array.isArray(alertsArray)) {
           rawAlerts = alertsArray.map((a) => ({
             ...a,
-            monitor_id: a.monitor_v2_id,
-            monitor_name: a.monitor_v2_name,
-            trigger_id: a.trigger_v2_id,
-            version: a.monitor_v2_version ?? a.version,
-            monitorVersion: a.monitor_v2_version,
-            start_time: a.triggered_time,
-            trigger_name: a.trigger_v2_name,
-            end_time: a.expiration_time,
+            start_time: a.start_time || a.triggered_time,
+            end_time: a.end_time || a.expiration_time,
             state: a.state || 'ACTIVE',
           }));
-          totalFromServer = payload.total_alerts_v2 ?? payload.totalAlertV2s ?? rawAlerts.length;
+          totalFromServer = payload.totalAlerts ?? rawAlerts.length;
         }
 
         if (Array.isArray(monitorIds) && monitorIds.length) {
@@ -245,7 +239,7 @@ export default class DashboardPpl extends Component {
           .toLowerCase();
         const matchesSearch = (a) => {
           if (!q) return true;
-          const triggerName = a.trigger_name || a.trigger_v2_name || a.triggerName || '';
+          const triggerName = a.trigger_name || a.triggerName || '';
           const normalizedTrigger = String(triggerName).trim().toLowerCase();
           return normalizedTrigger.startsWith(q);
         };
@@ -279,7 +273,7 @@ export default class DashboardPpl extends Component {
         );
 
         const dir = sortDirection === 'asc' ? 1 : -1;
-        const sortFieldEffective = sortField === 'start_time' ? 'triggered_time' : sortField;
+        const sortFieldEffective = sortField;
         const val = (obj) => _.get(obj, sortFieldEffective);
         filtered = filtered.sort((a, b) => {
           const av = val(a);
@@ -304,9 +298,9 @@ export default class DashboardPpl extends Component {
           const alertsByTriggers = groupAlertsByTrigger(filtered, true).map((row) => {
             const latest = _.maxBy(
               row.alerts || [],
-              (a) => (a && (a.triggered_time ?? a.start_time)) || 0
+              (a) => (a && (a.start_time ?? a.triggered_time)) || 0
             );
-            const ts = latest?.triggered_time ?? latest?.start_time ?? null;
+            const ts = latest?.start_time ?? latest?.triggered_time ?? null;
             return { ...row, lastTriggeredTime: ts };
           });
           this.setState(

public/pages/Dashboard/utils/tableUtilsPpl.js

@@ -215,8 +215,8 @@ export const alertColumnsPpl = (
         }
         let value = timestamp;
         if (value == null && Array.isArray(row?.alerts) && row.alerts.length) {
-          const newest = _.maxBy(row.alerts, (a) => (a?.triggered_time ?? a?.start_time) || 0);
-          value = newest?.triggered_time ?? newest?.start_time ?? null;
+          const newest = _.maxBy(row.alerts, (a) => (a?.start_time ?? a?.triggered_time) || 0);
+          value = newest?.start_time ?? newest?.triggered_time ?? null;
         }
         return renderUtcTime(value);
       },