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

2.4 mappings backport #673

Closed
wants to merge 19 commits into from

Conversation

petardz
Copy link
Contributor

@petardz petardz commented Nov 9, 2022

Issue #, if available:

Description of changes:

CheckList:
[ ] 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.

opensearch-trigger-bot bot and others added 19 commits October 18, 2022 14:26
…ensearch-project#608) (opensearch-project#609)

* suport fetching alerts by alert ids in Get Alerts Action

* acknowledge alerts from custom alerts index
Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
(cherry picked from commit 3c74744)

Co-authored-by: Surya Sashank Nistala <snistala@amazon.com>
Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

(cherry picked from commit 996190e)

Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
…ate as AckAlertRequest (opensearch-project#618) (opensearch-project#619)

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

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

Co-authored-by: Surya Sashank Nistala <snistala@amazon.com>
)

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>
(cherry picked from commit 7546b00)

Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
…rces (opensearch-project#626) (opensearch-project#627)

* in case of custom indices, allow moving alerts to history index

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* empty commit

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* added IT for custom datasources alert ack

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>
(cherry picked from commit 0740d9b)

Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
…t#628) (opensearch-project#630)

* refactored DeleteMonitor Action to be synchronious

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>
Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
… action on the same node (opensearch-project#631) (opensearch-project#639)

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>
…oject#641) (opensearch-project#642)

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

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

Co-authored-by: Surya Sashank Nistala <snistala@amazon.com>
opensearch-project#643)

* Support specify backend roles for monitors

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
(cherry picked from commit f986238)

Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
…earch-project#651)

* bucket level monitor findings

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

* add test to verify bucket level monitor findings

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

* added tests. fixed document ids in bucket level monitor findings

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

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

Co-authored-by: Surya Sashank Nistala <snistala@amazon.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
(cherry picked from commit bb84683)

Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

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

Co-authored-by: Surya Sashank Nistala <snistala@amazon.com>
opensearch-project#650) (opensearch-project#657)

* Added exception check once the .opendistro-alerting-config index is being created

During .opendistro-alerting-config index creation, if ResourceAlreadyExists exception is being raised, the flow will check first if the index is in yellow state and then it will re-try to index monitor

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* Formating of the file fixed

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>
(cherry picked from commit ceff609)

Co-authored-by: Stevan Buzejic <30922513+stevanbz@users.noreply.github.com>
…ct#665)

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>
…search-project#666) (opensearch-project#668)

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

Co-authored-by: Surya Sashank Nistala <snistala@amazon.com>
Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>
@petardz petardz requested a review from a team November 9, 2022 21:46
@codecov-commenter
Copy link

Codecov Report

Merging #673 (3411c6b) into 2.4 (bf63b34) will decrease coverage by 0.09%.
The diff coverage is 80.00%.

@@             Coverage Diff              @@
##                2.4     #673      +/-   ##
============================================
- Coverage     76.17%   76.08%   -0.10%     
  Complexity      116      116              
============================================
  Files           124      124              
  Lines          6591     6615      +24     
  Branches        975      981       +6     
============================================
+ Hits           5021     5033      +12     
- Misses         1074     1087      +13     
+ Partials        496      495       -1     
Impacted Files Coverage Δ
...opensearch/alerting/util/DocLevelMonitorQueries.kt 80.35% <80.00%> (+0.81%) ⬆️
...ing/model/destination/DestinationContextFactory.kt 75.00% <0.00%> (-3.58%) ⬇️
.../alerting/transport/TransportIndexMonitorAction.kt 59.94% <0.00%> (-2.64%) ⬇️
.../kotlin/org/opensearch/alerting/util/IndexUtils.kt 70.83% <0.00%> (-2.09%) ⬇️
...destinationmigration/DestinationConversionUtils.kt 68.88% <0.00%> (-1.12%) ⬇️
...pensearch/percolator/PercolatorFieldMapperExt.java 76.33% <0.00%> (+1.78%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@lezzago
Copy link
Member

lezzago commented Jan 6, 2023

Closing as this PR has been merged: #674

@lezzago lezzago closed this Jan 6, 2023
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