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.5] Manually backported PRs 418, 471, 576, and 584. #623

Merged
merged 5 commits into from
Jun 8, 2023

Conversation

AWSHurneyt
Copy link
Collaborator

Description

Manually backported PRs #418, #471, #576, and #584.

Issues Resolved

[List any issues this PR will resolve]

Check List

  • 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.

AWSHurneyt and others added 5 commits June 8, 2023 12:30
…project#576) (opensearch-project#579)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit 3812055)

Co-authored-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
…ct#418) (opensearch-project#481)

* show required field mappings only for enabled rules

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* updated mock custom rule to match mapping in backend

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit 1bbc4c5)

Co-authored-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
…pensearch-project#604)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit c280bad)

Co-authored-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
@codecov
Copy link

codecov bot commented Jun 8, 2023

Codecov Report

Merging #623 (dfca48b) into 2.5 (28b310f) will decrease coverage by 0.04%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##              2.5     #623      +/-   ##
==========================================
- Coverage   15.55%   15.52%   -0.04%     
==========================================
  Files         111      111              
  Lines        2963     2982      +19     
  Branches      459      465       +6     
==========================================
+ Hits          461      463       +2     
- Misses       2463     2480      +17     
  Partials       39       39              

see 8 files with indirect coverage changes

@AWSHurneyt AWSHurneyt marked this pull request as ready for review June 8, 2023 20:21
@AWSHurneyt AWSHurneyt merged commit 308b283 into opensearch-project:2.5 Jun 8, 2023
7 of 8 checks passed
amsiglan pushed a commit that referenced this pull request Mar 16, 2024
* [FEATURE] Provide empty states for Findings and Alerts page #471 (#494) (#519)

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

* fixed recent alerts & finding order; count for pie chart (#576) (#579)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit 3812055)

Co-authored-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* Show required field mappings only for enabled rules (#418) (#481)

* show required field mappings only for enabled rules

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* updated mock custom rule to match mapping in backend

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit 1bbc4c5)

Co-authored-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Resolved merge conflicts after cherry-picking PR 418.

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

* use user provided end date for x-axis calc (#584) (#604)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit c280bad)

Co-authored-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

cr: https://code.amazon.com/reviews/CR-93561817
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.

None yet

3 participants