Implemented cross-cluster monitor support #584
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: AWSHurneyt <[email protected]>
AWSHurneyt
requested review from
lezzago,
qreshi,
bowenlan-amzn,
rishabhmaurya,
getsaurabh02,
eirsep and
sbcd90
as code owners
1 task
Signed-off-by: AWSHurneyt <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>
eirsep
reviewed
Feb 6, 2024
| @@ -43,6 +43,7 @@ data class Alert( | |||
| val aggregationResultBucket: AggregationResultBucket? = null, | |||
| val executionId: String? = null, | |||
| val associatedAlertIds: List<String>, | |||
| val clusters: List<String>? = null, | |||
There was a problem hiding this comment.
will this break security analytics constructor?? if yes, plz create PR for that too
There was a problem hiding this comment.
what is stored here? can you share an example list of opensource clusters?
There was a problem hiding this comment.
should this be called clusterNames or clusterIds
There was a problem hiding this comment.
Created this PR to update SAP opensearch-project/security-analytics#837
eirsep
requested changes
Feb 6, 2024
| @@ -43,6 +43,7 @@ data class Alert( | |||
| val aggregationResultBucket: AggregationResultBucket? = null, | |||
| val executionId: String? = null, | |||
| val associatedAlertIds: List<String>, | |||
| val clusters: List<String>? = null, | |||
There was a problem hiding this comment.
plz udpate the alert parsing unit tests to account for this field
eirsep
requested changes
Feb 6, 2024
| @@ -43,6 +43,7 @@ data class Alert( | |||
| val aggregationResultBucket: AggregationResultBucket? = null, | |||
| val executionId: String? = null, | |||
| val associatedAlertIds: List<String>, | |||
| val clusters: List<String>? = null, | |||
There was a problem hiding this comment.
should this be called clusterNames or clusterIds
| @@ -74,6 +75,7 @@ data class ClusterMetricsInput( | |||
| .field(PATH_FIELD, path) | |||
| .field(PATH_PARAMS_FIELD, pathParams) | |||
| .field(URL_FIELD, url) | |||
| .field(CLUSTERS_FIELD, clusters) | |||
There was a problem hiding this comment.
same.. update parsing tests for clusterMetricsInput model or plz add a test if non-existent
5 tasks
Signed-off-by: AWSHurneyt <[email protected]>
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #584 +/- ##
============================================
- Coverage 74.25% 74.13% -0.13%
- Complexity 884 890 +6
============================================
Files 133 133
Lines 5791 5822 +31
Branches 708 714 +6
============================================
+ Hits 4300 4316 +16
- Misses 1181 1194 +13
- Partials 310 312 +2 ☔ View full report in Codecov by Sentry. |
praveensameneni
approved these changes
Feb 6, 2024
eirsep
approved these changes
Feb 6, 2024
sbcd90
approved these changes
Feb 6, 2024
|
The backport to To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/common-utils/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/common-utils/backport-2.x
# Create a new branch
git switch --create backport-584-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0c23cc5b594be2d057d3e0e079596686ef703a80
# Push it to GitHub
git push --set-upstream origin backport-584-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/common-utils/backport-2.xThen, create a pull request where the |
5 tasks
AWSHurneyt
added a commit
that referenced
this pull request
Feb 6, 2024
* Added clusters field to support cross cluster cluster metrics monitors. Signed-off-by: AWSHurneyt <[email protected]> * Fixed writeTo. Signed-off-by: AWSHurneyt <[email protected]> * Updated tests. Signed-off-by: AWSHurneyt <[email protected]> * Updated tests. Signed-off-by: AWSHurneyt <[email protected]> --------- Signed-off-by: AWSHurneyt <[email protected]>
1 task
1 task
AWSHurneyt
added a commit
to AWSHurneyt/common-utils
that referenced
this pull request
Apr 12, 2024
…roject#584 (opensearch-project#586) * Added clusters field to support cross cluster cluster metrics monitors. Signed-off-by: AWSHurneyt <[email protected]> * Fixed writeTo. Signed-off-by: AWSHurneyt <[email protected]> * Updated tests. Signed-off-by: AWSHurneyt <[email protected]> * Updated tests. 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Added
clustersfield to support cross-cluster cluster metrics monitors.Documentation PR for reference opensearch-project/documentation-website#6350
Issues Resolved
opensearch-project/alerting-dashboards-plugin#796
Check List
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.