Skip to content

Conversation

sergey-tihon
Copy link
Contributor

@sergey-tihon sergey-tihon commented Mar 6, 2025

Copy link

@Mikep86 Mikep86 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to break this into two separate PRs. The search_inference_id was added in 8.16 (see #113051), but inference_id was made optional in 8.17.

Copy link

@Mikep86 Mikep86 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We discussed internally and we can merge this PR and make a separate one only for search_inference_id for 8.16

@pquentin pquentin changed the title feat: add search_inference_id property Add search_inference_id property Mar 11, 2025
@pquentin pquentin merged commit e4cedee into elastic:main Mar 11, 2025
14 of 15 checks passed
github-actions bot pushed a commit that referenced this pull request Mar 11, 2025
* feat: add search_inference_id property

* fix: run make

* Add descriptions for parameters

* Mark inference_id as optional

* Add inference_id server default

---------

Co-authored-by: Quentin Pradet <quentin.pradet@elastic.co>
(cherry picked from commit e4cedee)
Copy link
Contributor

The backport to 8.17 failed:

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

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-8.17 8.17
# Navigate to the new working tree
cd .worktrees/backport-8.17
# Create a new branch
git switch --create backport-3901-to-8.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e4cedeed985b83c9bea600012d0201ae2ab38b2d
# Push it to GitHub
git push --set-upstream origin backport-3901-to-8.17
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-8.17

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

github-actions bot pushed a commit that referenced this pull request Mar 11, 2025
* feat: add search_inference_id property

* fix: run make

* Add descriptions for parameters

* Mark inference_id as optional

* Add inference_id server default

---------

Co-authored-by: Quentin Pradet <quentin.pradet@elastic.co>
(cherry picked from commit e4cedee)
Copy link
Contributor

The backport to 9.0 failed:

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

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-9.0 9.0
# Navigate to the new working tree
cd .worktrees/backport-9.0
# Create a new branch
git switch --create backport-3901-to-9.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e4cedeed985b83c9bea600012d0201ae2ab38b2d
# Push it to GitHub
git push --set-upstream origin backport-3901-to-9.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-9.0

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

Mikep86 pushed a commit that referenced this pull request Mar 12, 2025
---------

Co-authored-by: Quentin Pradet <quentin.pradet@elastic.co>
(cherry picked from commit e4cedee)
Mikep86 pushed a commit that referenced this pull request Mar 12, 2025
* feat: add search_inference_id property

* fix: run make

* Add descriptions for parameters

* Mark inference_id as optional

* Add inference_id server default

---------

Co-authored-by: Quentin Pradet <quentin.pradet@elastic.co>
(cherry picked from commit e4cedee)
Mikep86 pushed a commit that referenced this pull request Mar 12, 2025
* feat: add search_inference_id property

* fix: run make

* Add descriptions for parameters

* Mark inference_id as optional

* Add inference_id server default

---------

Co-authored-by: Quentin Pradet <quentin.pradet@elastic.co>
(cherry picked from commit e4cedee)

Co-authored-by: Sergey Tihon <sergey.tihon@gmail.com>
Mikep86 pushed a commit that referenced this pull request Mar 12, 2025
* feat: add search_inference_id property

* fix: run make

* Add descriptions for parameters

* Mark inference_id as optional

* Add inference_id server default

---------

Co-authored-by: Quentin Pradet <quentin.pradet@elastic.co>
(cherry picked from commit e4cedee)

Co-authored-by: Sergey Tihon <sergey.tihon@gmail.com>
Mikep86 added a commit that referenced this pull request Mar 12, 2025
* feat: add search_inference_id property

* fix: run make

* Add descriptions for parameters

* Mark inference_id as optional

* Add inference_id server default

---------

Co-authored-by: Quentin Pradet <quentin.pradet@elastic.co>
(cherry picked from commit e4cedee)

Co-authored-by: Sergey Tihon <sergey.tihon@gmail.com>
Mikep86 added a commit that referenced this pull request Mar 12, 2025
---------

Co-authored-by: Quentin Pradet <quentin.pradet@elastic.co>
(cherry picked from commit e4cedee)

Co-authored-by: Sergey Tihon <sergey.tihon@gmail.com>
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