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

Temp refactor cluster metrics monitor suspendUntil() to get(). #1015

Merged
merged 6 commits into from
Jul 12, 2023

Conversation

AWSHurneyt
Copy link
Collaborator

@AWSHurneyt AWSHurneyt commented Jul 12, 2023

Issue #, if available:

Description of changes:

  1. Temp refactor cluster metrics monitor suspendUntil() to get().
  2. PR Implemented support for configuring a cluster metrics monitor to call cat/indices, and cat/shards. #992 had some ktlint errors that were not surfaced locally. Fixed those ktlint errors on main branch.

This PR does not need to be backported as the changes were included in the manual backports to the 2.x and 2.9 branches.

CheckList:

  • 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 AWSHurneyt changed the title Fixed cluster metrics ktlint errors on main branch. Temp refactor cluster metrics monitor suspendUntil() to get(). Jul 12, 2023
@codecov
Copy link

codecov bot commented Jul 12, 2023

Codecov Report

Merging #1015 (3eb7a41) into main (3911ca9) will decrease coverage by 1.62%.
The diff coverage is 56.49%.

@@             Coverage Diff              @@
##               main    #1015      +/-   ##
============================================
- Coverage     73.83%   72.21%   -1.62%     
  Complexity      113      113              
============================================
  Files           158      160       +2     
  Lines          9326    10294     +968     
  Branches       1365     1570     +205     
============================================
+ Hits           6886     7434     +548     
- Misses         1743     1961     +218     
- Partials        697      899     +202     
Impacted Files Coverage Δ
...ain/kotlin/org/opensearch/alerting/InputService.kt 89.88% <ø> (ø)
.../clusterMetricsMonitorHelpers/CatIndicesHelpers.kt 55.23% <55.23%> (ø)
...l/clusterMetricsMonitorHelpers/CatShardsHelpers.kt 57.00% <57.00%> (ø)
...lpers/SupportedClusterMetricsSettingsExtensions.kt 54.16% <71.87%> (ø)
...erting/settings/SupportedClusterMetricsSettings.kt 20.00% <100.00%> (+3.72%) ⬆️
.../kotlin/org/opensearch/alerting/util/IndexUtils.kt 78.33% <100.00%> (+0.36%) ⬆️

... and 5 files with indirect coverage changes

@eirsep eirsep merged commit dc22baa into opensearch-project:main Jul 12, 2023
10 of 16 checks passed
@AWSHurneyt
Copy link
Collaborator Author

For reference, the multi node tests started failing in PR #976 (comment). Continuing to investigate.

AWSHurneyt added a commit to AWSHurneyt/OpenSearch-Alerting that referenced this pull request Jul 12, 2023
…earch-project#1015)

* Implemented support for configuring a cluster metrics monitor to call cat/indices, and cat/shards.

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

* Fixed ktlint errors.

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

* Refactored executeTransportAction to use suspendUntil() instead of get() to receive responses.

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

* Fixed ktlint errors.

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

* Refactored API calls from suspendUntil() to get().

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

---------

Signed-off-by: AWSHurneyt <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants