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

Backports #992 to 2.x #1002

Merged
merged 1 commit into from
Apr 27, 2024
Merged

Backports #992 to 2.x #1002

merged 1 commit into from
Apr 27, 2024

Conversation

eirsep
Copy link
Member

@eirsep eirsep commented Apr 27, 2024

Backports #992 to 2.x

  • remove chekc for agg rules in detector trigger condition to create bucket level monitor

  • add agg rules tags in chained monitor query to match trigger condition of detector

  • fix check to evaluate agg rules present when creating chained findings monitor

  • fix tests where check on group by trigger existed earlier

  • fix race condition while creating first monitor

  • add test to verify detector trigger function for aggregation rules

  • revert step listener change


Description

[Describe what this change achieves]

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • 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.

…eate chained findings monitor (opensearch-project#992)

* remove chekc for agg rules in detector trigger condition to create bucket level monitor

Signed-off-by: Surya Sashank Nistala <[email protected]>

* add agg rules tags in chained monitor query to match trigger condition of detector

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix check to evaluate agg rules present when creating chained findings monitor

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix tests where check on group by trigger existed earlier

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fix race condition while creating first monitor

Signed-off-by: Surya Sashank Nistala <[email protected]>

* add test to verify detector trigger function for aggregation rules

Signed-off-by: Surya Sashank Nistala <[email protected]>

* revert step listener change

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>
@eirsep eirsep merged commit 07bf73f into opensearch-project:2.x Apr 27, 2024
11 of 16 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.11 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.11 2.11
# Navigate to the new working tree
cd .worktrees/backport-2.11
# Create a new branch
git switch --create backport/backport-1002-to-2.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 07bf73fedfc2ebef6bdc1f6dbfa842bb9b8b5a05
# Push it to GitHub
git push --set-upstream origin backport/backport-1002-to-2.11
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.11

Then, create a pull request where the base branch is 2.11 and the compare/head branch is backport/backport-1002-to-2.11.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.12 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.12 2.12
# Navigate to the new working tree
cd .worktrees/backport-2.12
# Create a new branch
git switch --create backport/backport-1002-to-2.12
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 07bf73fedfc2ebef6bdc1f6dbfa842bb9b8b5a05
# Push it to GitHub
git push --set-upstream origin backport/backport-1002-to-2.12
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.12

Then, create a pull request where the base branch is 2.12 and the compare/head branch is backport/backport-1002-to-2.12.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 27, 2024
…eate chained findings monitor (#992) (#1002)

* remove chekc for agg rules in detector trigger condition to create bucket level monitor

* add agg rules tags in chained monitor query to match trigger condition of detector

* fix check to evaluate agg rules present when creating chained findings monitor

* fix tests where check on group by trigger existed earlier

* fix race condition while creating first monitor

* add test to verify detector trigger function for aggregation rules

* revert step listener change

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>
(cherry picked from commit 07bf73f)
eirsep added a commit that referenced this pull request Apr 29, 2024
…eate chained findings monitor (#992) (#1002) (#1003)

* remove chekc for agg rules in detector trigger condition to create bucket level monitor

* add agg rules tags in chained monitor query to match trigger condition of detector

* fix check to evaluate agg rules present when creating chained findings monitor

* fix tests where check on group by trigger existed earlier

* fix race condition while creating first monitor

* add test to verify detector trigger function for aggregation rules

* revert step listener change

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>
(cherry picked from commit 07bf73f)

Co-authored-by: Surya Sashank Nistala <[email protected]>
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.

3 participants