Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-picking commits for 1.3 release from main to 1.x #345

Merged
merged 6 commits into from
Mar 11, 2022

Conversation

AWSHurneyt
Copy link
Collaborator

Issue #, if available:
#314

Description of changes:
Cherry-picking commits df65ffc through 9487c00 from opensearch-project/alerting/main to opensearch-project/alerting/1.x.

CheckList:
[x] Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

AWSHurneyt and others added 6 commits March 10, 2022 16:46
* Added support for JDK 8 and 14.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added support for JDK 8 and 14.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
* Added 1.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 1.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Annie Lee <leeyun@amazon.com>
…) (opensearch-project#342)

* Implemented support for LocalUriInput monitors.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored feature naming convention from LocalUriInput to ClusterMetricsInput. Added Cluster Metrics as a new monitor type to align with frontend experience.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed ktlint errors.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Implemented randomClusterMetricsMonitor test helper, and refactored tests accordingly.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Renamed some assets to align with the new name for this feature.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored cluster metrics feature to remove support for Cat repositories API.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored supported JSON payload to return all response fields.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored nodes stats request object to return all metrics.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored nodes stats request object to return all metrics.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Removing unused connectionTimeout and socketTimeout params.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
* Added 1.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 1.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added cluster metrics monitor to release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
…supported JDKs. (opensearch-project#338)

* Added support for JDK 8 and 14.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added support for JDK 8 and 14.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated DEVELOPER_GUIDE.md to reference changes to the supported JDKs.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added additional release note.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated DEVELOPER_GUIDE.md to reference changes to the supported JDKs.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated DEVELOPER_GUIDE.md to reference changes to the supported JDKs.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated workflows to build using JDK 11.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Removing redundant JDK setup step.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed guide wording.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed guide wording.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Reverted bwc workflow JDK.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
@AWSHurneyt AWSHurneyt requested review from rishabhmaurya, annie3431 and a team March 11, 2022 00:51
@codecov-commenter
Copy link

codecov-commenter commented Mar 11, 2022

Codecov Report

Merging #345 (3b5799e) into 1.x (cfdbe73) will decrease coverage by 0.20%.
The diff coverage is 70.91%.

Impacted file tree graph

@@             Coverage Diff              @@
##                1.x     #345      +/-   ##
============================================
- Coverage     78.46%   78.26%   -0.21%     
- Complexity      214      265      +51     
============================================
  Files           173      176       +3     
  Lines          6975     7223     +248     
  Branches        916      960      +44     
============================================
+ Hits           5473     5653     +180     
- Misses         1011     1069      +58     
- Partials        491      501      +10     
Impacted Files Coverage Δ
...erting/settings/SupportedClusterMetricsSettings.kt 19.51% <19.51%> (ø)
.../util/SupportedClusterMetricsSettingsExtensions.kt 35.41% <35.41%> (ø)
...ain/kotlin/org/opensearch/alerting/InputService.kt 88.57% <75.00%> (+0.69%) ⬆️
...in/kotlin/org/opensearch/alerting/model/Monitor.kt 88.67% <85.71%> (-0.29%) ⬇️
...nsearch/alerting/core/model/ClusterMetricsInput.kt 95.30% <95.30%> (ø)
...n/kotlin/org/opensearch/alerting/AlertingPlugin.kt 94.73% <100.00%> (+0.03%) ⬆️
...lerting/transport/TransportExecuteMonitorAction.kt 71.11% <0.00%> (-2.23%) ⬇️
.../alerting/transport/TransportIndexMonitorAction.kt 59.52% <0.00%> (+0.47%) ⬆️
.../kotlin/org/opensearch/alerting/core/JobSweeper.kt 72.00% <0.00%> (+0.50%) ⬆️
... and 2 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cfdbe73...3b5799e. Read the comment docs.

@AWSHurneyt AWSHurneyt merged commit 8f72b8b into opensearch-project:1.x Mar 11, 2022
AWSHurneyt added a commit to AWSHurneyt/OpenSearch-Alerting that referenced this pull request Mar 11, 2022
…roject#345)

* Added support for JDK 8 and 14. (opensearch-project#335)

* Added support for JDK 8 and 14.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added support for JDK 8 and 14.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 1.3 release notes. (opensearch-project#336)

* Added 1.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 1.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Add backport and auto delete workflow (opensearch-project#339)

Signed-off-by: Annie Lee <leeyun@amazon.com>

* Implemented support for ClusterMetrics monitors (opensearch-project#221) (opensearch-project#342)

* Implemented support for LocalUriInput monitors.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored feature naming convention from LocalUriInput to ClusterMetricsInput. Added Cluster Metrics as a new monitor type to align with frontend experience.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed ktlint errors.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Implemented randomClusterMetricsMonitor test helper, and refactored tests accordingly.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Renamed some assets to align with the new name for this feature.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored cluster metrics feature to remove support for Cat repositories API.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored supported JSON payload to return all response fields.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored nodes stats request object to return all metrics.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored nodes stats request object to return all metrics.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Removing unused connectionTimeout and socketTimeout params.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added cluster metrics monitor to release notes. (opensearch-project#343)

* Added 1.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 1.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added cluster metrics monitor to release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated DEVELOPER_GUIDE.md and workflows to reference changes to the supported JDKs. (opensearch-project#338)

* Added support for JDK 8 and 14.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added support for JDK 8 and 14.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated DEVELOPER_GUIDE.md to reference changes to the supported JDKs.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added additional release note.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated DEVELOPER_GUIDE.md to reference changes to the supported JDKs.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated DEVELOPER_GUIDE.md to reference changes to the supported JDKs.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated workflows to build using JDK 11.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Removing redundant JDK setup step.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed guide wording.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed guide wording.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Reverted bwc workflow JDK.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

Co-authored-by: Annie Lee <leeyun@amazon.com>
AWSHurneyt added a commit that referenced this pull request Mar 11, 2022
* Add 1.2.4.0 release notes (#282)

* Add 1.2.4.0 release notes

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

* Commented out flaky test in favor of known issue to unblock build (#331) (#332) (#333)

* Commented out flaky test in favor of known issue #300 to unblock build process.

Signed-off-by: Saurabh Singh <sisurab@amazon.com>

* Commenting out another test

Signed-off-by: Aditya Jindal <aditjind@amazon.com>

Co-authored-by: Saurabh Singh <sisurab@amazon.com>
Co-authored-by: Aditya Jindal <aditjind@amazon.com>

Co-authored-by: Saurabh Singh <sisurab@amazon.com>
Co-authored-by: Aditya Jindal <13850971+aditjind@users.noreply.github.com>

Co-authored-by: Saurabh Singh <sisurab@amazon.com>
Co-authored-by: Aditya Jindal <13850971+aditjind@users.noreply.github.com>

* Cherry-picking commits for 1.3 release from main to 1.x (#345)

* Added support for JDK 8 and 14. (#335)

* Added support for JDK 8 and 14.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added support for JDK 8 and 14.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 1.3 release notes. (#336)

* Added 1.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 1.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Add backport and auto delete workflow (#339)

Signed-off-by: Annie Lee <leeyun@amazon.com>

* Implemented support for ClusterMetrics monitors (#221) (#342)

* Implemented support for LocalUriInput monitors.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored feature naming convention from LocalUriInput to ClusterMetricsInput. Added Cluster Metrics as a new monitor type to align with frontend experience.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed ktlint errors.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Implemented randomClusterMetricsMonitor test helper, and refactored tests accordingly.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Renamed some assets to align with the new name for this feature.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored cluster metrics feature to remove support for Cat repositories API.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored supported JSON payload to return all response fields.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored nodes stats request object to return all metrics.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored nodes stats request object to return all metrics.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Removing unused connectionTimeout and socketTimeout params.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added cluster metrics monitor to release notes. (#343)

* Added 1.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 1.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added cluster metrics monitor to release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated DEVELOPER_GUIDE.md and workflows to reference changes to the supported JDKs. (#338)

* Added support for JDK 8 and 14.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added support for JDK 8 and 14.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated DEVELOPER_GUIDE.md to reference changes to the supported JDKs.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added additional release note.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated DEVELOPER_GUIDE.md to reference changes to the supported JDKs.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated DEVELOPER_GUIDE.md to reference changes to the supported JDKs.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated workflows to build using JDK 11.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Removing redundant JDK setup step.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed guide wording.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed guide wording.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Reverted bwc workflow JDK.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

Co-authored-by: Annie Lee <leeyun@amazon.com>

Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: Saurabh Singh <getsaurabh02@gmail.com>
Co-authored-by: Saurabh Singh <sisurab@amazon.com>
Co-authored-by: Aditya Jindal <13850971+aditjind@users.noreply.github.com>
Co-authored-by: Annie Lee <leeyun@amazon.com>
AWSHurneyt added a commit to AWSHurneyt/OpenSearch-Alerting that referenced this pull request Mar 30, 2022
…roject#345)

* Added support for JDK 8 and 14. (opensearch-project#335)

* Added support for JDK 8 and 14.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added support for JDK 8 and 14.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 1.3 release notes. (opensearch-project#336)

* Added 1.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 1.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Add backport and auto delete workflow (opensearch-project#339)

Signed-off-by: Annie Lee <leeyun@amazon.com>

* Implemented support for ClusterMetrics monitors (opensearch-project#221) (opensearch-project#342)

* Implemented support for LocalUriInput monitors.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored feature naming convention from LocalUriInput to ClusterMetricsInput. Added Cluster Metrics as a new monitor type to align with frontend experience.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed ktlint errors.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Implemented randomClusterMetricsMonitor test helper, and refactored tests accordingly.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Renamed some assets to align with the new name for this feature.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored cluster metrics feature to remove support for Cat repositories API.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored supported JSON payload to return all response fields.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored nodes stats request object to return all metrics.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Refactored nodes stats request object to return all metrics.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Removing unused connectionTimeout and socketTimeout params.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added cluster metrics monitor to release notes. (opensearch-project#343)

* Added 1.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 1.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added cluster metrics monitor to release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated DEVELOPER_GUIDE.md and workflows to reference changes to the supported JDKs. (opensearch-project#338)

* Added support for JDK 8 and 14.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added support for JDK 8 and 14.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated DEVELOPER_GUIDE.md to reference changes to the supported JDKs.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added additional release note.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated DEVELOPER_GUIDE.md to reference changes to the supported JDKs.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated DEVELOPER_GUIDE.md to reference changes to the supported JDKs.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated workflows to build using JDK 11.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Removing redundant JDK setup step.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed guide wording.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Fixed guide wording.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Reverted bwc workflow JDK.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

Co-authored-by: Annie Lee <leeyun@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants