Skip to content

Backport 2.9 fixes#936

Closed
riysaxen-amzn wants to merge 8 commits into2.9from
backport-2.9-fixes
Closed

Backport 2.9 fixes#936
riysaxen-amzn wants to merge 8 commits into2.9from
backport-2.9-fixes

Conversation

@riysaxen-amzn
Copy link
Copy Markdown
Collaborator

Description

Backport PR

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.

eirsep and others added 7 commits March 18, 2024 12:25
* fix detector writeTo() method missing fields

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* fix test

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

---------

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
# Conflicts:
#	src/main/java/org/opensearch/securityanalytics/model/Detector.java
* Allow deletion of custom log type if custom rule index is missing

Signed-off-by: Megha Goyal <goyamegh@amazon.com>

* Allow custom log type name to be updated when custom rule index is missing

Signed-off-by: Megha Goyal <goyamegh@amazon.com>

* Adding changes for detector index missing

Signed-off-by: Megha Goyal <goyamegh@amazon.com>

* Update log type when detector index is missing

Signed-off-by: Megha Goyal <goyamegh@amazon.com>

---------

Signed-off-by: Megha Goyal <goyamegh@amazon.com>
* Refactor invocation of Action listeners in correlations

Signed-off-by: Megha Goyal <goyamegh@amazon.com>

* Close hanging tasks in correlations workflow

Signed-off-by: Megha Goyal <goyamegh@amazon.com>

* Logging finding id and monitor id in error logs

Signed-off-by: Megha Goyal <goyamegh@amazon.com>

---------

Signed-off-by: Megha Goyal <goyamegh@amazon.com>
… mapping view API (#786) (#788)

* field mapping changes

Signed-off-by: Joanne Wang <jowg@amazon.com>

* add integ test

Signed-off-by: Joanne Wang <jowg@amazon.com>

* turn unmappedfieldaliases as set and add integ test

Signed-off-by: Joanne Wang <jowg@amazon.com>

* add comments

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix integ tests

Signed-off-by: Joanne Wang <jowg@amazon.com>

* moved logic to method for better readability

Signed-off-by: Joanne Wang <jowg@amazon.com>

---------

Signed-off-by: Joanne Wang <jowg@amazon.com>
* Reinstating more leaks plugged-in for correlations workflows

Signed-off-by: Megha Goyal <goyamegh@amazon.com>

* Add search timeouts to all correlation searches

Signed-off-by: Megha Goyal <goyamegh@amazon.com>

* Fix logging and exception messages

Signed-off-by: Megha Goyal <goyamegh@amazon.com>

* Change search timeout to 30 seconds

Signed-off-by: Megha Goyal <goyamegh@amazon.com>

---------

Signed-off-by: Megha Goyal <goyamegh@amazon.com>
* add logic and integ tests to not add duplicate to log-types-config index

Signed-off-by: Joanne Wang <jowg@amazon.com>

* change naming for existingFieldMapping and change contains to equals

Signed-off-by: Joanne Wang <jowg@amazon.com>

---------

Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
@codecov
Copy link
Copy Markdown

codecov bot commented Mar 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 25.66%. Comparing base (e44e5d4) to head (e44e5d4).

❗ Current head e44e5d4 differs from pull request most recent head 2a0a60b. Consider uploading reports for the commit 2a0a60b to get more accurate results

Additional details and impacted files
@@            Coverage Diff            @@
##                2.9     #936   +/-   ##
=========================================
  Coverage     25.66%   25.66%           
  Complexity      950      950           
=========================================
  Files           252      252           
  Lines         10854    10854           
  Branches       1204     1204           
=========================================
  Hits           2786     2786           
  Misses         7824     7824           
  Partials        244      244           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
@riysaxen-amzn
Copy link
Copy Markdown
Collaborator Author

some changes in this PR need to not to go in 2.9

@riysaxen-amzn riysaxen-amzn deleted the backport-2.9-fixes branch March 18, 2024 21:51
riysaxen-amzn pushed a commit to riysaxen-amzn/security-analytics that referenced this pull request Mar 25, 2024
…to fix regression. Metadata is required for correct query index clean up (opensearch-project#931) (opensearch-project#936)

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
(cherry picked from commit 5e2312d7a6afdf35dc39534723df1947592e01ec)

Co-authored-by: Surya Sashank Nistala <snistala@amazon.com>
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.

4 participants