-
Notifications
You must be signed in to change notification settings - Fork 104
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
Added support for "nested" mappings #645
Added support for "nested" mappings #645
Conversation
Signed-off-by: Petar Dzepina <[email protected]>
Signed-off-by: Petar Dzepina <[email protected]>
alerting/src/main/kotlin/org/opensearch/alerting/util/DocLevelMonitorQueries.kt
Show resolved
Hide resolved
client().admin().indices().putMapping( | ||
PutMappingRequest( | ||
index | ||
).source("test_alias.field_a", "type=alias,path=message") | ||
).get() | ||
client().admin().indices().putMapping( | ||
PutMappingRequest( | ||
index | ||
).source("test_alias2", "type=alias,path=test_field") | ||
).get() | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we make a new test for nested situation?
Codecov Report
@@ Coverage Diff @@
## main #645 +/- ##
============================================
- Coverage 76.37% 76.06% -0.32%
Complexity 116 116
============================================
Files 124 124
Lines 6443 6497 +54
Branches 942 960 +18
============================================
+ Hits 4921 4942 +21
- Misses 1040 1066 +26
- Partials 482 489 +7
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
The backport to
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.4 2.4
# Navigate to the new working tree
cd .worktrees/backport-2.4
# Create a new branch
git switch --create backport/backport-645-to-2.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 42abf4d2247e5629694dfd922cefcce23d4bd207
# Push it to GitHub
git push --set-upstream origin backport/backport-645-to-2.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.4 Then, create a pull request where the |
The backport to
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.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-645-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 42abf4d2247e5629694dfd922cefcce23d4bd207
# Push it to GitHub
git push --set-upstream origin backport/backport-645-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x Then, create a pull request where the |
The backport to
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.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-645-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 42abf4d2247e5629694dfd922cefcce23d4bd207
# Push it to GitHub
git push --set-upstream origin backport/backport-645-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x Then, create a pull request where the |
* example Signed-off-by: Petar Dzepina <[email protected]> * fixed updating mappings for queryIndex Signed-off-by: Petar Dzepina <[email protected]> Signed-off-by: Petar Dzepina <[email protected]> (cherry picked from commit 42abf4d)
* example Signed-off-by: Petar Dzepina <[email protected]> * fixed updating mappings for queryIndex Signed-off-by: Petar Dzepina <[email protected]> Signed-off-by: Petar Dzepina <[email protected]>
* example Signed-off-by: Petar Dzepina <[email protected]> * fixed updating mappings for queryIndex Signed-off-by: Petar Dzepina <[email protected]> Signed-off-by: Petar Dzepina <[email protected]>
* Added support for "nested" mappings (#645) * example Signed-off-by: Petar Dzepina <[email protected]> * fixed updating mappings for queryIndex Signed-off-by: Petar Dzepina <[email protected]> Signed-off-by: Petar Dzepina <[email protected]> * mappings traversal bug fix (#669) Signed-off-by: Petar Dzepina <[email protected]> Signed-off-by: Petar Dzepina <[email protected]>
* Added support for "nested" mappings (opensearch-project#645) * example Signed-off-by: Petar Dzepina <[email protected]> * fixed updating mappings for queryIndex Signed-off-by: Petar Dzepina <[email protected]> Signed-off-by: Petar Dzepina <[email protected]> * mappings traversal bug fix (opensearch-project#669) Signed-off-by: Petar Dzepina <[email protected]> Signed-off-by: Petar Dzepina <[email protected]>
* Added exception check once the .opendistro-alerting-config index is b… (#650) * 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 <[email protected]> * Formating of the file fixed Signed-off-by: Stevan Buzejic <[email protected]> Signed-off-by: Stevan Buzejic <[email protected]> * refactored DeleteMonitor Action to be synchronious (#628) (#630) * refactored DeleteMonitor Action to be synchronious Signed-off-by: Petar Dzepina <[email protected]> Signed-off-by: Petar Dzepina <[email protected]> Co-authored-by: Petar Dzepina <[email protected]> * [Backport 2.x] QueryIndex rollover when field mapping limit is reached (#729) Signed-off-by: Petar Dzepina <[email protected]> * Mappings fix backport 2.x (#730) * Added support for "nested" mappings (#645) * example Signed-off-by: Petar Dzepina <[email protected]> * fixed updating mappings for queryIndex Signed-off-by: Petar Dzepina <[email protected]> Signed-off-by: Petar Dzepina <[email protected]> * mappings traversal bug fix (#669) Signed-off-by: Petar Dzepina <[email protected]> Signed-off-by: Petar Dzepina <[email protected]> * Added unwrapping exception from core; added more debug logs (#728) Signed-off-by: Petar Dzepina <[email protected]> * Add DataSources test for future backports Signed-off-by: Ashish Agrawal <[email protected]> * fix percolator mapping error when having field name 'type' (#726) Signed-off-by: Raj Chakravarthi <[email protected]> * [BUG] ExecuteMonitor inserting metadata doc during dry run (#758) * execute monitor bugfix Signed-off-by: Petar Dzepina <[email protected]> * added IT Signed-off-by: Petar Dzepina <[email protected]> * fixed created retval when skipIndex=true Signed-off-by: Petar Dzepina <[email protected]> --------- Signed-off-by: Petar Dzepina <[email protected]> * fix for ERROR alert state generation in doc-level monitors (#768) Signed-off-by: Subhobrata Dey <[email protected]> * Adjusting max field index setting dynamically for query index (#776) * added adjusting max field index setting dynamicly for query index Signed-off-by: Petar Dzepina <[email protected]> * Multiple indices support in DocLevelMonitorInput (#784) Signed-off-by: Petar Dzepina <[email protected]> * Doc transform 2.x backport (#853) * conflict resovle - backport from main to 2.x Signed-off-by: Petar Dzepina <[email protected]> * fixed module class names Signed-off-by: Petar Dzepina <[email protected]> --------- Signed-off-by: Petar Dzepina <[email protected]> * Update config index schema if needed at the start of each monitor execution (#849) * Update config index schema if needed at the start of each monitor execution Signed-off-by: Ashish Agrawal <[email protected]> * Mappings parsing fix (#851) * fixed mappings parsing when field name named "properties" exists in mappings Signed-off-by: Petar Dzepina <[email protected]> * message typo fix Signed-off-by: Petar Dzepina <[email protected]> --------- Signed-off-by: Petar Dzepina <[email protected]> * [Backport 2.x] Notification security fix (#861) * Notification security fix (#852) * added injecting whole user object in threadContext before calling notification APIs so that backend roles are available to notification plugin Signed-off-by: Petar Dzepina <[email protected]> * compile fix Signed-off-by: Petar Dzepina <[email protected]> * refactored user_info injection to use InjectSecurity Signed-off-by: Petar Dzepina <[email protected]> * ktlint fix Signed-off-by: Petar Dzepina <[email protected]> --------- Signed-off-by: Petar Dzepina <[email protected]> (cherry picked from commit e0b7a5a) * remove unneeded import Signed-off-by: Ashish Agrawal <[email protected]> --------- Signed-off-by: Ashish Agrawal <[email protected]> Co-authored-by: Petar Dzepina <[email protected]> Co-authored-by: Ashish Agrawal <[email protected]> * Fixed a bug that prevented alerts from being generated for doc level monitors that use wildcard characters in index names. (#894) Signed-off-by: AWSHurneyt <[email protected]> * fixed security tests (#484) (#794) * fixed security tests Signed-off-by: Raj Chakravarthi <[email protected]> (cherry picked from commit c51940f) --------- Signed-off-by: Stevan Buzejic <[email protected]> Signed-off-by: Petar Dzepina <[email protected]> Signed-off-by: Ashish Agrawal <[email protected]> Signed-off-by: Raj Chakravarthi <[email protected]> Signed-off-by: Subhobrata Dey <[email protected]> Signed-off-by: AWSHurneyt <[email protected]> Co-authored-by: Stevan Buzejic <[email protected]> Co-authored-by: Surya Sashank Nistala <[email protected]> Co-authored-by: Petar Dzepina <[email protected]> Co-authored-by: RAJ CHAKRAVARTHI <[email protected]> Co-authored-by: Subhobrata Dey <[email protected]> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: AWSHurneyt <[email protected]> Co-authored-by: RAJ CHAKRAVARTHI <[email protected]>
Issue #, if available:
Description of changes:
Fixed bug where PUT _mapping against query index would fail in case of "nested" properties in index mappings
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.