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

[Backport 2.x] Added input validation, and fixed bug for cross cluster monitors. (#1510) #1515

Merged
merged 2 commits into from
Apr 13, 2024

Conversation

AWSHurneyt
Copy link
Collaborator

Issue #, if available:

Description of changes:
Manual backport of PR #1510

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.

…ensearch-project#1510)

* Fixed issue where InputService wouldn't wait for cluster metrics monitor to finish executing against all clusters.

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

* Added input validation for GetRemoteIndexes API, and added related unit and integration tests.

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

* Removed unused variable, and imports.

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

* Made initial call to GetRemoteIndexes API log INFO level to capture timestamp of incoming request.

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

* Fixed comment.

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

* Moved some regex to common utils.

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

* Renamed cross cluster monitor setting.

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

* Fixed import.

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

* Fixed import.

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

* Fixed ktlint error.

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

* Added null checks for health statuses.

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

* Wrapped Monitor.parse calls in AlertingExceptions so IllegalArgumentExceptions are wrapped in 4xx-level exceptions.

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

* Fixed merge error.

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

* Fixed test.

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

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
@AWSHurneyt
Copy link
Collaborator Author

The tests in this PR will fail until opensearch-project/common-utils#641 is merged.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
@AWSHurneyt
Copy link
Collaborator Author

The security tests are failing due to unrelated issues. They'll be fixed in a separate PR.
E.g., https://github.com/opensearch-project/alerting/pull/1511/checks

@AWSHurneyt AWSHurneyt merged commit 3f60cf1 into opensearch-project:2.x Apr 13, 2024
13 of 18 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 13, 2024
…r monitors. (#1510) (#1515)

* Added input validation, and fixed bug for cross cluster monitors. (#1510)

* Fixed issue where InputService wouldn't wait for cluster metrics monitor to finish executing against all clusters.

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

* Added input validation for GetRemoteIndexes API, and added related unit and integration tests.

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

* Removed unused variable, and imports.

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

* Made initial call to GetRemoteIndexes API log INFO level to capture timestamp of incoming request.

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

* Fixed comment.

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

* Moved some regex to common utils.

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

* Renamed cross cluster monitor setting.

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

* Fixed import.

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

* Fixed import.

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

* Fixed ktlint error.

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

* Added null checks for health statuses.

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

* Wrapped Monitor.parse calls in AlertingExceptions so IllegalArgumentExceptions are wrapped in 4xx-level exceptions.

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

* Fixed merge error.

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

* Fixed test.

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

---------

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

* Fixed test.

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

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit 3f60cf1)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AWSHurneyt pushed a commit that referenced this pull request Apr 13, 2024
…r monitors. (#1510) (#1515) (#1516)

* Added input validation, and fixed bug for cross cluster monitors. (#1510)

* Fixed issue where InputService wouldn't wait for cluster metrics monitor to finish executing against all clusters.



* Added input validation for GetRemoteIndexes API, and added related unit and integration tests.



* Removed unused variable, and imports.



* Made initial call to GetRemoteIndexes API log INFO level to capture timestamp of incoming request.



* Fixed comment.



* Moved some regex to common utils.



* Renamed cross cluster monitor setting.



* Fixed import.



* Fixed import.



* Fixed ktlint error.



* Added null checks for health statuses.



* Wrapped Monitor.parse calls in AlertingExceptions so IllegalArgumentExceptions are wrapped in 4xx-level exceptions.



* Fixed merge error.



* Fixed test.



---------



* Fixed test.



---------


(cherry picked from commit 3f60cf1)

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants