Merge branch 'opensearch-project:main' into issue125-main

.github/workflows/cypress-workflow.yml

@@ -24,26 +24,6 @@ jobs:
         with:
           # TODO: Parse this from alerting plugin
           java-version: 14
-      # dependencies: OpenSearch
-      - name: Checkout OpenSearch
-        uses: actions/checkout@v2
-        with:
-          repository: opensearch-project/OpenSearch
-          path: OpenSearch
-          ref: '1.x'
-      - name: Build OpenSearch
-        working-directory: ./OpenSearch
-        run: ./gradlew publishToMavenLocal
-      # dependencies: common-utils
-      - name: Checkout common-utils
-        uses: actions/checkout@v2
-        with:
-          repository: opensearch-project/common-utils
-          path: common-utils
-          ref: 'main'
-      - name: Build common-utils
-        working-directory: ./common-utils
-        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
       - name: Checkout
         uses: actions/checkout@v2
         with:

.github/workflows/dco.yml

@@ -0,0 +1,18 @@
+name: Developer Certificate of Origin Check
+
+on: [pull_request]
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Get PR Commits
+        id: 'get-pr-commits'
+        uses: tim-actions/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: DCO Check
+        uses: tim-actions/[email protected]
+        with:
+          commits: ${{ steps.get-pr-commits.outputs.commits }}

CONTRIBUTING.md

@@ -1,4 +1,47 @@
-## Contributing to this Project
+## Contributing to OpenSearch
 
 OpenSearch is a community project that is built and maintained by people just like **you**.
 [This document](https://github.com/opensearch-project/.github/blob/main/CONTRIBUTING.md) explains how you can contribute to this and related projects.
+
+## Developer Certificate of Origin
+
+OpenSearch is an open source product released under the Apache 2.0 license (see either [the Apache](https://www.apache.org/licenses/LICENSE-2.0) site or the [LICENSE.txt file](https://github.com/opensearch-project/.github/blob/main/LICENSE.txt)). The Apache 2.0 license allows you to freely use, modify, distribute, and sell your own products that include Apache 2.0 licensed software.
+
+We respect intellectual property rights of others and we want to make sure all incoming contributions are correctly attributed and licensed. A Developer Certificate of Origin (DCO) is a lightweight mechanism to do that.
+
+The DCO is a declaration attached to every contribution made by every developer. In the commit message of the contribution, the developer simply adds a `Signed-off-by` statement and thereby agrees to the DCO, which you can find below or at [DeveloperCertificate.org](http://developercertificate.org/).
+````
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+have the right to submit it under the open source license
+indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the
+best of my knowledge, is covered under an appropriate open
+source license and I have the right under that license to
+submit that work with modifications, whether created in whole
+or in part by me, under the same open source license (unless
+I am permitted to submit under a different license), as
+Indicated in the file; or
+
+(c) The contribution was provided directly to me by some other
+person who certified (a), (b) or (c) and I have not modified
+it.
+
+(d) I understand and agree that this project and the contribution
+are public and that a record of the contribution (including
+all personal information I submit with it, including my
+sign-off) is maintained indefinitely and may be redistributed
+consistent with this project or the open source license(s)
+involved.
+````
+We require that every contribution to OpenSearch is signed with a Developer Certificate of Origin. Additionally, please use your real name. We do not accept anonymous contributors nor those utilizing pseudonyms.
+
+Each commit must include a DCO which looks like this
+````
+Signed-off-by: Jane Smith <[email protected]>
+````
+You may type this line on your own when writing your commit messages. However, if your user.name and user.email are set in your git configs, you can use `-s` or `–-signoff` to add the `Signed-off-by` line to the end of the commit message.

NOTICE

@@ -1,5 +1,5 @@
-OpenSearch
-Copyright 2021 OpenSearch Contributors
+OpenSearch (https://opensearch.org/)
+Copyright OpenSearch Contributors
 
 This product includes software developed by
 Elasticsearch (http://www.elastic.co).

README.md

@@ -48,4 +48,4 @@ This project is licensed under the [Apache v2.0 License](LICENSE).
 
 ## Copyright
 
-Copyright 2020-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright OpenSearch Contributors. See [NOTICE](NOTICE.txt) for details.

cypress/integration/bucket_level_monitor_spec.js

@@ -160,6 +160,7 @@ describe('Bucket-Level Monitors', () => {
       cy.get('[data-test-subj="extractionQueryCodeEditor"]').within(() => {
         // If possible, a data-test-subj attribute should be added to access the code editor input directly
         cy.get('.ace_text-input')
+          .focus()
           .clear({ force: true })
           .type(JSON.stringify(sampleAggregationQuery), {
             force: true,

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,

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",

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: {

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,
   };
 };

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),
   };
 }

release-notes/opensearch-alerting-dashboards-plugin.release-notes-1.2.0.0.md

@@ -0,0 +1,14 @@
+## Version 1.2.0.0 2021-11-04
+
+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))
+
+### Bug Fixes
+* Fixes flaky test and removes local publishing of plugin dependencies ([#135](https://github.com/opensearch-project/alerting-dashboards-plugin/pull/135))
+* Update copyright notice ([#140](https://github.com/opensearch-project/alerting-dashboards-plugin/pull/140))