Skip to content

Commit

Permalink
Cherry-picking commits from main to 1.x branch for 1.2 release (opens…
Browse files Browse the repository at this point in the history
…earch-project#142)

* Fixes flaky test and removes local publishing of plugin dependencies (opensearch-project#135)

* Fixes 'bucket level monitor can be created by extraction query' flaky test

* Removes local publishing of plugin dependencies for github cypress tests

Signed-off-by: Clay Downs <[email protected]>

* Update copyright notice (opensearch-project#140)

Signed-off-by: Mohammad Qureshi <[email protected]>

* Added 1.2 release notes. (opensearch-project#141)

* Added badges to the package README, and the Uploads coverage job to the unit tests workflow.

* Removing code coverage upload token.

* Added 1.2 release notes. Signed-off-by: Thomas Hurney <[email protected]>

Signed-off-by: AWSHurneyt <[email protected]>

* Added 1.2 release notes. Signed-off-by: Thomas Hurney <[email protected]>

Signed-off-by: AWSHurneyt <[email protected]>

* Updated 1.2 release notes. Signed-off-by: Thomas Hurney <[email protected]>

Signed-off-by: AWSHurneyt <[email protected]>

Co-authored-by: Clay Downs <[email protected]>
Co-authored-by: Mohammad Qureshi <[email protected]>
  • Loading branch information
3 people committed Mar 11, 2022
1 parent ce7872d commit 58f6f0e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 21 deletions.
20 changes: 0 additions & 20 deletions .github/workflows/cypress-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
1 change: 1 addition & 0 deletions cypress/integration/bucket_level_monitor_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## Version 1.2.0.0 2021-11-04

Compatible with OpenSearch Dashboards 1.2.0

### 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))

0 comments on commit 58f6f0e

Please sign in to comment.