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

Handle Doc level query 'fields' param for query string query #1240

Merged
merged 1 commit into from
Oct 9, 2023

Conversation

eirsep
Copy link
Member

@eirsep eirsep commented Oct 7, 2023

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.

Signed-off-by: Surya Sashank Nistala <[email protected]>
@lezzago lezzago merged commit 6f29716 into opensearch-project:main Oct 9, 2023
13 of 14 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/alerting/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/alerting/backport-2.x
# Create a new branch
git switch --create backport-1240-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6f29716e4ded4c4493795c02b2d5da97e7c8f1ee
# Push it to GitHub
git push --set-upstream origin backport-1240-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport-1240-to-2.x.

jowg-amazon pushed a commit to jowg-amazon/alerting that referenced this pull request Oct 23, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.11 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/alerting/backport-2.11 2.11
# Navigate to the new working tree
pushd ../.worktrees/alerting/backport-2.11
# Create a new branch
git switch --create backport-1240-to-2.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6f29716e4ded4c4493795c02b2d5da97e7c8f1ee
# Push it to GitHub
git push --set-upstream origin backport-1240-to-2.11
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting/backport-2.11

Then, create a pull request where the base branch is 2.11 and the compare/head branch is backport-1240-to-2.11.

jowg-amazon pushed a commit to jowg-amazon/alerting that referenced this pull request Oct 23, 2023
Signed-off-by: Surya Sashank Nistala <[email protected]>
(cherry picked from commit 6f29716)
jowg-amazon pushed a commit to jowg-amazon/alerting that referenced this pull request Oct 24, 2023
Signed-off-by: Surya Sashank Nistala <[email protected]>
(cherry picked from commit 6f29716)
jowg-amazon pushed a commit to jowg-amazon/alerting that referenced this pull request Oct 24, 2023
jowg-amazon pushed a commit to jowg-amazon/alerting that referenced this pull request Oct 24, 2023
bowenlan-amzn pushed a commit that referenced this pull request Oct 24, 2023
* fix constructor (#1240)

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fixed errors

Signed-off-by: Joanne Wang <[email protected]>

* add nested fields param mapping findings index for doc level queries (#1276)

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>
Signed-off-by: Joanne Wang <[email protected]>
Co-authored-by: Surya Sashank Nistala <[email protected]>
bowenlan-amzn pushed a commit that referenced this pull request Oct 24, 2023
* fix constructor (#1240)

Signed-off-by: Surya Sashank Nistala <[email protected]>

* fixed errors

Signed-off-by: Joanne Wang <[email protected]>

* add nested fields param mapping findings index for doc level queries (#1276)

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>
Signed-off-by: Joanne Wang <[email protected]>
Co-authored-by: Surya Sashank Nistala <[email protected]>
eirsep added a commit to eirsep/alerting that referenced this pull request Nov 28, 2023
This reverts commit 6f29716.

Signed-off-by: Surya Sashank Nistala <[email protected]>
eirsep added a commit to eirsep/alerting that referenced this pull request Nov 28, 2023
eirsep added a commit that referenced this pull request Nov 28, 2023
)

This reverts commit c00c86d.

Signed-off-by: Surya Sashank Nistala <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants