[FEATURE] Add composite monitor type opensearch-project#573

Signed-off-by: Jovan Cvetkovic <[email protected]>
jovancacvetkovic · Jun 18, 2023 · f6b39fe · f6b39fe
1 parent 567db1d
commit f6b39fe
Show file tree

Hide file tree

Showing 18 changed files with 151 additions and 25 deletions.
diff --git a/public/pages/CreateMonitor/components/AssociateMonitors/AssociateMonitors.tsx b/public/pages/CreateMonitor/components/AssociateMonitors/AssociateMonitors.tsx
@@ -7,7 +7,7 @@ import React, { Fragment } from 'react';
 import { EuiSpacer, EuiText } from '@elastic/eui';
 import MonitorsList from './components/MonitorsList';
 
-const AssociateMonitors = ({ monitors, options, history }) => {
+const AssociateMonitors = ({ monitors, options, history, values }) => {
   const onUpdate = () => {};
 
   return (
@@ -21,7 +21,7 @@ const AssociateMonitors = ({ monitors, options, history }) => {
 
       <EuiSpacer size="m" />
 
-      <MonitorsList monitors={monitors} options={options} history={history} />
+      <MonitorsList monitors={monitors} options={options} history={history} values={values} />
     </Fragment>
   );
 };

diff --git a/public/pages/CreateMonitor/components/AssociateMonitors/components/MonitorsList.tsx b/public/pages/CreateMonitor/components/AssociateMonitors/components/MonitorsList.tsx
@@ -20,9 +20,10 @@ import {
   FormikFormRow,
 } from '../../../../../components/FormControls';
 
-const MonitorsList = ({ monitors = [], options = [] }) => {
+const MonitorsList = ({ monitors = [], options = [], values }) => {
   const [selectedOptions, setSelectedOptions] = useState({});
   const [monitorOptions, setMonitorOptions] = useState([]);
+
   const [monitorFields, setMonitorFields] = useState<number[]>(
     _.reduce(
       monitors.length ? monitors : [0, 1],
@@ -41,9 +42,11 @@ const MonitorsList = ({ monitors = [], options = [] }) => {
     }));
     setMonitorOptions(newOptions);
 
-    let newSelected = monitors.length ? monitors : [];
-    setSelectedOptions(Object.assign({}, newSelected));
-  }, []);
+    // let newSelected = monitors.length ? monitors : [];
+    // setSelectedOptions(Object.assign({}, newSelected));
+
+    // _.set(values, 'associatedMonitors', Object.values(newSelected));
+  }, [monitors, options, values]);
 
   const onChange = (options, monitorIdx, form) => {
     let newSelected = {
@@ -72,7 +75,6 @@ const MonitorsList = ({ monitors = [], options = [] }) => {
   const onBlur = (monitorIdx, form) => {
     form.setFieldTouched('associatedMonitors', true);
     form.setFieldTouched(`associatedMonitor_${monitorIdx}`, true);
-
     form.setFieldValue('associatedMonitors', Object.values(selectedOptions));
     form.setFieldError('associatedMonitors', validate());
   };

diff --git a/public/pages/CreateMonitor/containers/CreateMonitor/CreateMonitor.js b/public/pages/CreateMonitor/containers/CreateMonitor/CreateMonitor.js
@@ -306,6 +306,7 @@ export default class CreateMonitor extends Component {
               <EuiSpacer />
 
               <WorkflowDetails
+                values={values}
                 history={history}
                 isAd={values.searchType === SEARCH_TYPE.AD}
                 isComposite={values.monitor_type === MONITOR_TYPE.COMPOSITE_LEVEL}

diff --git a/public/pages/CreateMonitor/containers/CreateMonitor/utils/monitorToFormik.js b/public/pages/CreateMonitor/containers/CreateMonitor/utils/monitorToFormik.js
@@ -8,9 +8,11 @@ import { FORMIK_INITIAL_DOCUMENT_LEVEL_QUERY_VALUES, FORMIK_INITIAL_VALUES } fro
 import { SEARCH_TYPE, INPUTS_DETECTOR_ID, MONITOR_TYPE } from '../../../../../utils/constants';
 import { OPERATORS_MAP } from '../../../components/MonitorExpressions/expressions/utils/constants';
 import {
+  COMPOSITE_INPUT_FIELD,
   DOC_LEVEL_INPUT_FIELD,
   QUERY_STRING_QUERY_OPERATORS,
 } from '../../../components/DocumentLevelMonitorQueries/utils/constants';
+import { formikToCompositeInput, formikToCompositeUiMetadata } from './formikToMonitor';
 
 // Convert Monitor JSON to Formik values used in UI forms
 export default function monitorToFormik(monitor) {
@@ -38,6 +40,8 @@ export default function monitorToFormik(monitor) {
         };
       case MONITOR_TYPE.DOC_LEVEL:
         return docLevelInputToFormik(monitor);
+      case MONITOR_TYPE.COMPOSITE_LEVEL:
+        return { inputs: _.get(monitor, 'inputs[0].composite_input.sequence.delegates', []) };
       default:
         return {
           index: indicesToFormik(inputs[0].search.indices),

diff --git a/public/pages/CreateMonitor/containers/WorkflowDetails/WorkflowDetails.tsx b/public/pages/CreateMonitor/containers/WorkflowDetails/WorkflowDetails.tsx
@@ -9,15 +9,15 @@ import Schedule from '../../components/Schedule';
 import AssociateMonitors from '../../components/AssociateMonitors/AssociateMonitors';
 import { EuiSpacer } from '@elastic/eui';
 
-const WorkflowDetails = ({ isAd, isComposite, httpClient, history }) => {
+const WorkflowDetails = ({ isAd, isComposite, httpClient, history, values }) => {
   const [selectedMonitors, setSelectedMonitors] = useState([]);
   const [monitorOptions, setMonitorOptions] = useState([]);
 
   const getMonitors = async () => {
     const response = await httpClient.get('../api/alerting/monitors', {
       query: {
         from: 0,
-        size: 5000,
+        size: 1000,
         search: '',
         sortField: 'name',
         sortDirection: 'desc',
@@ -37,8 +37,15 @@ const WorkflowDetails = ({ isAd, isComposite, httpClient, history }) => {
   useEffect(() => {
     getMonitors().then((monitors) => {
       setMonitorOptions(monitors);
+
+      // const getMonitorById = (id) => monitors.find((mon) => mon.monitor_id === id);
+      // const newSelectedMonitors = values.inputs.map((monitor) => ({
+      //   value: monitor.monitor_id,
+      //   label: getMonitorById(monitor.monitor_id)?.monitor_name,
+      // }));
+      // setSelectedMonitors(newSelectedMonitors);
     });
-  }, []);
+  }, [values]);
 
   return (
     <ContentPanel
@@ -59,6 +66,7 @@ const WorkflowDetails = ({ isAd, isComposite, httpClient, history }) => {
             monitors={selectedMonitors}
             options={monitorOptions}
             history={history}
+            values={values}
           />
         </Fragment>
       )}

diff --git a/public/pages/CreateTrigger/components/ExpressionQuery/ExpressionQuery.js b/public/pages/CreateTrigger/components/ExpressionQuery/ExpressionQuery.js
@@ -23,6 +23,7 @@ const ExpressionQuery = ({
   const [usedExpressions, setUsedExpressions] = useState([]);
 
   useEffect(() => {
+    debugger;
     let expressions = [];
     if (value?.length) {
       let values = [...value];

diff --git a/public/pages/CreateTrigger/containers/CreateTrigger/utils/constants.js b/public/pages/CreateTrigger/containers/CreateTrigger/utils/constants.js
@@ -9,7 +9,7 @@ export const TRIGGER_TYPE = {
   ALERT_TRIGGER: 'alerting_trigger',
   QUERY_LEVEL: 'query_level_trigger',
   DOC_LEVEL: 'document_level_trigger',
-  COMPOSITE_LEVEL: 'composite_level_trigger',
+  COMPOSITE_LEVEL: 'chained_alert_trigger',
 };
 
 export const FORMIK_INITIAL_BUCKET_SELECTOR_VALUES = {

diff --git a/public/pages/CreateTrigger/containers/CreateTrigger/utils/triggerToFormik.js b/public/pages/CreateTrigger/containers/CreateTrigger/utils/triggerToFormik.js
@@ -35,6 +35,8 @@ export function triggerDefinitionToFormik(trigger, monitor) {
       return bucketLevelTriggerToFormik(trigger, monitor);
     case MONITOR_TYPE.DOC_LEVEL:
       return documentLevelTriggerToFormik(trigger, monitor);
+    case MONITOR_TYPE.COMPOSITE_LEVEL:
+      return compositeTriggerToFormik(trigger, monitor);
     default:
       return queryLevelTriggerToFormik(trigger, monitor);
   }
@@ -216,6 +218,30 @@ export function documentLevelTriggerToFormik(trigger, monitor) {
   };
 }
 
+export function compositeTriggerToFormik(trigger, monitor) {
+  const {
+    id,
+    name,
+    severity,
+    condition: { script },
+    actions,
+    minTimeBetweenExecutions,
+    rollingWindowSize,
+  } = trigger[TRIGGER_TYPE.COMPOSITE_LEVEL];
+  const triggerUiMetadata = _.get(monitor, `ui_metadata.triggers[${name}]`);
+  return {
+    ..._.cloneDeep(FORMIK_INITIAL_TRIGGER_VALUES),
+    id,
+    name,
+    severity,
+    script,
+    actions: getExecutionPolicyActions(actions),
+    minTimeBetweenExecutions,
+    rollingWindowSize,
+    triggerConditions: triggerUiMetadata,
+  };
+}
+
 export function getExecutionPolicyActions(actions) {
   const executionPolicyPath = 'action_execution_policy.action_execution_scope';
   return _.cloneDeep(actions).map((action) => {

diff --git a/...pages/CreateTrigger/containers/DefineCompositeLevelTrigger/DefineCompositeLevelTrigger.js b/...pages/CreateTrigger/containers/DefineCompositeLevelTrigger/DefineCompositeLevelTrigger.js
@@ -93,7 +93,6 @@ class DefineCompositeLevelTrigger extends Component {
           monitor_id: monitor.value,
         }))
       : [];
-
     return (
       <ContentPanel
         title={'Alert trigger'}

diff --git a/...ic/pages/CreateTrigger/containers/DefineCompositeLevelTrigger/NotificationConfigDialog.js b/...ic/pages/CreateTrigger/containers/DefineCompositeLevelTrigger/NotificationConfigDialog.js
@@ -41,21 +41,39 @@ const NotificationConfigDialog = ({
     ...initialActionValues,
   });
 
-  console.log('Initial actions', action);
   const sendTestMessage = async (index) => {
-    let testTrigger = _.cloneDeep(
-      formikToTrigger(triggerValues, monitor.ui_metadata)[triggerIndex]
-    );
+    const mon = _.cloneDeep(monitor);
+    const tv = _.cloneDeep(triggerValues);
+    let testTrigger = _.cloneDeep(formikToTrigger(tv, mon.ui_metadata)[triggerIndex]);
 
+    testTrigger = {
+      ...testTrigger,
+      name: _.get(tv, 'triggerDefinitions[0].name', ''),
+      severity: _.get(tv, 'triggerDefinitions[0].severity', ''),
+    };
     const action = _.get(testTrigger, `chained_alert_trigger.actions[${index}]`);
     const condition = {
       ..._.get(testTrigger, 'chained_alert_trigger.condition'),
       script: { lang: 'painless', source: 'return true' },
     };
-    _.set(testTrigger, 'actions', [action]);
-    _.set(testTrigger, 'condition', condition);
 
-    const testMonitor = { ...monitor, triggers: [{ ...testTrigger }] };
+    let triggers = _.cloneDeep(testTrigger);
+
+    delete triggers.chained_alert_trigger;
+    delete triggers.min_time_between_executions;
+    delete triggers.rolling_window_size;
+
+    _.set(triggers, 'actions', [action]);
+    _.set(triggers, 'condition', condition);
+
+    const testMonitor = { ...monitor, triggers: [{ ...triggers }] };
+
+    // clean up actions and triggers
+    delete testMonitor.enabled_time;
+    delete testMonitor.last_update_time;
+    delete testMonitor.schema_version;
+    delete testMonitor.ui_metadata.composite_input;
+    delete testMonitor.ui_metadata.monitor_type;
 
     try {
       const response = await httpClient.post('../api/alerting/monitors/_execute', {
@@ -78,7 +96,6 @@ const NotificationConfigDialog = ({
     }
   };
 
-  console.log('ACTION', action);
   return (
     <EuiModal onClose={() => closeModal()}>
       <EuiModalHeader>

diff --git a/public/pages/CreateTrigger/containers/DefineCompositeLevelTrigger/TriggerNotifications.js b/public/pages/CreateTrigger/containers/DefineCompositeLevelTrigger/TriggerNotifications.js
@@ -40,7 +40,7 @@ const TriggerNotifications = ({
     setActions(newActions);
 
     getChannels().then((channels) => setOptions(channels));
-  }, []);
+  }, [triggerValues]);
 
   const getChannels = async () => {
     const hasNotificationPlugin = plugins.indexOf(OS_NOTIFICATION_PLUGIN) !== -1;

diff --git a/...pages/CreateTrigger/containers/DefineCompositeLevelTrigger/TriggerNotificationsContent.js b/...pages/CreateTrigger/containers/DefineCompositeLevelTrigger/TriggerNotificationsContent.js
@@ -9,6 +9,7 @@ import { FormikComboBox } from '../../../../components/FormControls';
 import NotificationConfigDialog from './NotificationConfigDialog';
 import _ from 'lodash';
 import { FORMIK_INITIAL_ACTION_VALUES } from '../../utils/constants';
+import { NOTIFY_OPTIONS_VALUES } from '../../components/Action/actions/Message';
 
 const TriggerNotificationsContent = ({
   channel,
@@ -33,6 +34,9 @@ const TriggerNotificationsContent = ({
         lang: 'mustache',
         source: 'Monitor {{ctx.monitor.name}} triggered an alert {{ctx.trigger.name}}',
       },
+      action_execution_policy: {
+        action_execution_scope: NOTIFY_OPTIONS_VALUES.PER_ALERT,
+      },
     });
   };
 

diff --git a/public/pages/MonitorDetails/containers/MonitorDetails.js b/public/pages/MonitorDetails/containers/MonitorDetails.js
@@ -72,6 +72,8 @@ export default class MonitorDetails extends Component {
     };
   }
 
+  isWorkflow = () => new URLSearchParams(this.props.location.search).get('type') === 'workflow';
+
   componentDidMount() {
     this.getMonitor(this.props.match.params.monitorId);
   }
@@ -112,7 +114,7 @@ export default class MonitorDetails extends Component {
   getMonitor = (id) => {
     const { httpClient } = this.props;
     httpClient
-      .get(`../api/alerting/monitors/${id}`)
+      .get(`../api/alerting/${this.isWorkflow() ? 'workflows' : 'monitors'}/${id}`)
       .then((resp) => {
         const {
           ok,
@@ -450,9 +452,8 @@ export default class MonitorDetails extends Component {
             <EuiTabs>{this.renderTableTabs()}</EuiTabs>
             {this.state.tabContent}
           </div>
-        ) : (
-          this.renderAlertsTable()
-        )}
+        ) : // this.renderAlertsTable()
+        null}
 
         {isJsonModalOpen && (
           <EuiOverlayMask>

diff --git a/public/pages/MonitorDetails/containers/Triggers/Triggers.js b/public/pages/MonitorDetails/containers/Triggers/Triggers.js
@@ -24,6 +24,8 @@ export function getUnwrappedTriggers(monitor) {
         return trigger[TRIGGER_TYPE.BUCKET_LEVEL];
       case MONITOR_TYPE.DOC_LEVEL:
         return trigger[TRIGGER_TYPE.DOC_LEVEL];
+      case MONITOR_TYPE.COMPOSITE_LEVEL:
+        return trigger[TRIGGER_TYPE.COMPOSITE_LEVEL];
       default:
         return trigger[TRIGGER_TYPE.QUERY_LEVEL];
     }

diff --git a/server/clusters/alerting/alertingPlugin.js b/server/clusters/alerting/alertingPlugin.js
@@ -9,6 +9,7 @@ import {
   DESTINATION_BASE_API,
   EMAIL_ACCOUNT_BASE_API,
   EMAIL_GROUP_BASE_API,
+  WORKFLOW_BASE_API,
 } from '../../services/utils/constants';
 
 export default function alertingPlugin(Client, config, components) {
@@ -25,6 +26,19 @@ export default function alertingPlugin(Client, config, components) {
     method: 'GET',
   });
 
+  alerting.getWorkflow = ca({
+    url: {
+      fmt: `${API_ROUTE_PREFIX}/workflows/<%=monitorId%>`,
+      req: {
+        monitorId: {
+          type: 'string',
+          required: true,
+        },
+      },
+    },
+    method: 'GET',
+  });
+
   alerting.getMonitor = ca({
     url: {
       fmt: `${MONITOR_BASE_API}/<%=monitorId%>`,

diff --git a/server/routes/monitors.js b/server/routes/monitors.js
@@ -68,6 +68,18 @@ export default function (services, router) {
     monitorService.executeMonitor
   );
 
+  router.get(
+    {
+      path: '/api/alerting/workflows/{id}',
+      validate: {
+        params: schema.object({
+          id: schema.string(),
+        }),
+      },
+    },
+    monitorService.getWorkflow
+  );
+
   router.get(
     {
       path: '/api/alerting/monitors/{id}',

diff --git a/server/services/MonitorService.js b/server/services/MonitorService.js
@@ -146,6 +146,40 @@ export default class MonitorService {
     }
   };
 
+  getWorkflow = async (context, req, res) => {
+    try {
+      const { id } = req.params;
+      const params = { monitorId: id };
+      const { callAsCurrentUser } = await this.esDriver.asScoped(req);
+      const getResponse = await callAsCurrentUser('alerting.getWorkflow', params);
+      const monitor = _.get(getResponse, 'workflow', null);
+      const version = _.get(getResponse, '_version', null);
+      const ifSeqNo = _.get(getResponse, '_seq_no', null);
+      const ifPrimaryTerm = _.get(getResponse, '_primary_term', null);
+      monitor.monitor_type = monitor.workflow_type;
+
+      return res.ok({
+        body: {
+          ok: true,
+          resp: monitor,
+          activeCount: 0,
+          dayCount: 0,
+          version,
+          ifSeqNo,
+          ifPrimaryTerm,
+        },
+      });
+    } catch (err) {
+      console.error('Alerting - MonitorService - getMonitor:', err);
+      return res.ok({
+        body: {
+          ok: false,
+          resp: err.message,
+        },
+      });
+    }
+  };
+
   updateMonitor = async (context, req, res) => {
     try {
       const { id } = req.params;