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 #992 to 2.11] #1004

Merged
merged 2 commits into from
Apr 29, 2024
Merged

[Backport #992 to 2.11] #1004

merged 2 commits into from
Apr 29, 2024

Conversation

eirsep
Copy link
Member

@eirsep eirsep commented Apr 28, 2024

fix check for agg rules in detector trigger condition to create chained findings monitor (#992)

  • 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]>
Copy link
Collaborator

@goyamegh goyamegh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check why the CIs are failing.

@eirsep eirsep force-pushed the 2.11 branch 2 times, most recently from 68b7976 to 0ba2963 Compare April 28, 2024 21:24
@eirsep
Copy link
Member Author

eirsep commented Apr 29, 2024

Flaky tests unrelated to change

./gradlew  integTest   -Dtest.debug=1 -Dcluster.debug=1 -PcustomDistributionUrl=/opt/opensearch-min-2.11.1-SNAPSHOT-darwin-arm64.tar.gz --tests "org.opensearch.securityanalytics.resthandler.DetectorRestApiIT"
=======================================
OpenSearch Build Hamster says Hello!
  Gradle Version        : 8.2.1
  OS Info               : Mac OS X 14.3.1 (aarch64)
  JDK Version           : 17 (Amazon Corretto JDK)
  JAVA_HOME             : /Library/Java/JavaVirtualMachines/amazon-corretto-17.jdk/Contents/Home
  Random Testing Seed   : C35B93EB5B039C7E
  In FIPS 140 mode      : false
=======================================

> Task :integTest
OpenJDK 64-Bit Server VM warning: Ignoring option --illegal-access=warn; support was removed in 17.0

Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0.

You can use '--warning-mode all' to show the individual deprecation warnings and determine if they come from your own scripts or plugins.

For more on this, please refer to https://docs.gradle.org/8.2.1/userguide/command_line_interface.html#sec:command_line_warnings in the Gradle documentation.

BUILD SUCCESSFUL in 5m 13s
9 actionable tasks: 1 executed, 8 up-to-date

Signed-off-by: Surya Sashank Nistala <[email protected]>
@eirsep eirsep dismissed goyamegh’s stale review April 29, 2024 22:04

fixed CI. only failure is correlation engine flaky test

@eirsep eirsep merged commit c47d0c0 into opensearch-project:2.11 Apr 29, 2024
4 of 13 checks passed
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