support creating monitor for anomaly detector with custom result index (

opensearch-project#143) (opensearch-project#147) * support creating monitor for anomaly detector with custom result index Signed-off-by: Yaliang Wu <[email protected]> * add release note Signed-off-by: Yaliang Wu <[email protected]>
annie3431 · Nov 9, 2021 · ddaf063 · ddaf063
1 parent 90b9dc6
commit ddaf063
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 1 deletion.
diff --git a/public/pages/CreateMonitor/containers/AnomalyDetectors/AnomalyDetectors.js b/public/pages/CreateMonitor/containers/AnomalyDetectors/AnomalyDetectors.js
@@ -58,6 +58,7 @@ class AnomalyDetectors extends React.Component {
             value: detector.id,
             features: detector.featureAttributes,
             interval: detector.detectionInterval,
+            resultIndex: detector.resultIndex,
           }));
         this.setState({ detectorOptions });
       } else {
@@ -111,6 +112,7 @@ class AnomalyDetectors extends React.Component {
                 interval: 2 * get(options, '0.interval.period.interval'),
                 unit: get(options, '0.interval.period.unit', 'MINUTES').toUpperCase(),
               });
+              form.setFieldValue('adResultIndex', get(options, '0.resultIndex'));
             },
             singleSelection: { asPlaintext: true },
             isClearable: false,

diff --git a/public/pages/CreateMonitor/containers/CreateMonitor/__snapshots__/CreateMonitor.test.js.snap b/public/pages/CreateMonitor/containers/CreateMonitor/__snapshots__/CreateMonitor.test.js.snap
@@ -11,6 +11,7 @@ exports[`CreateMonitor renders 1`] = `
   <Formik
     initialValues={
       Object {
+        "adResultIndex": undefined,
         "aggregationType": "count",
         "aggregations": Array [],
         "bucketUnitOfTime": "h",

diff --git a/public/pages/CreateMonitor/containers/CreateMonitor/utils/formikToMonitor.js b/public/pages/CreateMonitor/containers/CreateMonitor/utils/formikToMonitor.js
@@ -60,7 +60,8 @@ export function formikToInputs(values) {
 export function formikToSearch(values) {
   const isAD = values.searchType === SEARCH_TYPE.AD;
   let query = isAD ? formikToAdQuery(values) : formikToQuery(values);
-  const indices = isAD ? ['.opendistro-anomaly-results*'] : formikToIndices(values);
+  const adResultIndex = _.get(values, 'adResultIndex', '.opendistro-anomaly-results*');
+  const indices = isAD ? [adResultIndex] : formikToIndices(values);
 
   return {
     search: {

diff --git a/public/pages/CreateMonitor/containers/CreateMonitor/utils/monitorQueryParams.js b/public/pages/CreateMonitor/containers/CreateMonitor/utils/monitorQueryParams.js
@@ -35,5 +35,6 @@ export const initializeFromQueryParams = (queryParams) => {
       queryParams.interval && queryParams.unit
         ? { interval: parseInt(queryParams.interval), unit: queryParams.unit }
         : undefined,
+    adResultIndex: queryParams.adResultIndex || undefined,
   };
 };
diff --git a/public/pages/CreateMonitor/containers/CreateMonitor/utils/monitorToFormik.js b/public/pages/CreateMonitor/containers/CreateMonitor/utils/monitorToFormik.js
@@ -66,6 +66,7 @@ export default function monitorToFormik(monitor) {
 
     detectorId: isAD ? _.get(inputs, INPUTS_DETECTOR_ID) : undefined,
     index: inputs[0].search.indices.map((index) => ({ label: index })),
+    adResultIndex: isAD ? _.get(inputs, '0.search.indices.0') : undefined,
     query: JSON.stringify(inputs[0].search.query, null, 4),
   };
 }
diff --git a/release-notes/opensearch-alerting-dashboards-plugin.release-notes-1.2.0.0.md b/release-notes/opensearch-alerting-dashboards-plugin.release-notes-1.2.0.0.md
@@ -2,6 +2,9 @@
 
 Compatible with OpenSearch Dashboards 1.2.0
 
+### Features
+* support creating monitor for anomaly detector with custom result index ([#143](https://github.com/opensearch-project/alerting-dashboards-plugin/pull/143))
+
 ### Maintenance
 * Bumps version to 1.2 ([#128](https://github.com/opensearch-project/alerting-dashboards-plugin/pull/128))
 * Added 1.2 release notes. ([#141](https://github.com/opensearch-project/alerting-dashboards-plugin/pull/141))