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

chore(deps): upgrade @elastic/elasticsearch #163822

Merged
merged 4 commits into from
Aug 16, 2023

Conversation

afharo
Copy link
Member

@afharo afharo commented Aug 14, 2023

Summary

Upgrades the Elasticsearch client to the latest to take advantage of the changes in elastic/elastic-transport-js#69

For maintainers

@afharo afharo added Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc Team:Security Team focused on: Auth, Users, Roles, Spaces, Audit Logging, and more! release_note:skip Skip the PR/issue when compiling release notes backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) labels Aug 14, 2023
@afharo afharo self-assigned this Aug 14, 2023
@afharo afharo force-pushed the upgrade-elasticsearch-js branch from f829f28 to da26748 Compare August 14, 2023 15:21
@afharo afharo marked this pull request as ready for review August 14, 2023 16:06
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-core (Team:Core)

@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-security (Team:Security)

@afharo afharo requested a review from azasypkin August 14, 2023 16:07
Copy link
Member

@azasypkin azasypkin left a comment

Choose a reason for hiding this comment

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

LGTM, just one nit, thanks!

version "8.3.2"
resolved "https://registry.yarnpkg.com/@elastic/transport/-/transport-8.3.2.tgz#295e91f43e3a60a839f998ac3090a83ddb441592"
integrity sha512-ZiBYRVPj6pwYW99fueyNU4notDf7ZPs7Ix+4T1btIJsKJmeaORIItIfs+0O7KV4vV+DcvyMhkY1FXQx7kQOODw==
"@elastic/transport@^8.3.3":
Copy link
Member

Choose a reason for hiding this comment

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

nit: it looks like we need to join this declaration with the declaration above as they are semver-compatible (@elastic/transport@^8.3.1). Yarn sometimes cannot do this automatically, so we need to manually remove declarations from yarn.lock and re-run yarn kbn bootstrap.

"@elastic/transport@^8.3.1", "@elastic/transport@^8.3.3":
  version "8.3.3"

Copy link
Member Author

Choose a reason for hiding this comment

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

Good catch! Done in bdeaf61 (#163822)

@afharo afharo enabled auto-merge (squash) August 16, 2023 07:42
@afharo
Copy link
Member Author

afharo commented Aug 16, 2023

@elasticmachine merge upstream

@afharo
Copy link
Member Author

afharo commented Aug 16, 2023

@elasticmachine merge upstream

@afharo afharo merged commit 5d2571a into elastic:main Aug 16, 2023
@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @afharo

@afharo afharo deleted the upgrade-elasticsearch-js branch August 16, 2023 11:09
@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
8.9 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 163822

Questions ?

Please refer to the Backport tool documentation

@afharo
Copy link
Member Author

afharo commented Aug 16, 2023

💚 All backports created successfully

Status Branch Result
8.9

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

hop-dev pushed a commit to hop-dev/kibana that referenced this pull request Aug 16, 2023
afharo added a commit to afharo/kibana that referenced this pull request Aug 17, 2023
afharo added a commit that referenced this pull request Aug 17, 2023
# Backport

This will backport the following commits from `main` to `8.9`:
- [chore(deps): upgrade `@elastic/elasticsearch`
(#163822)](#163822)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Alejandro Fernández
Haro","email":"alejandro.haro@elastic.co"},"sourceCommit":{"committedDate":"2023-08-16T11:09:52Z","message":"chore(deps):
upgrade `@elastic/elasticsearch`
(#163822)","sha":"5d2571abd5681615f648086d3d0132f5a12f2058","branchLabelMapping":{"^v8.10.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Core","Team:Security","release_note:skip","backport:prev-minor","v8.10.0"],"number":163822,"url":"https://github.com/elastic/kibana/pull/163822","mergeCommit":{"message":"chore(deps):
upgrade `@elastic/elasticsearch`
(#163822)","sha":"5d2571abd5681615f648086d3d0132f5a12f2058"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.10.0","labelRegex":"^v8.10.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/163822","number":163822,"mergeCommit":{"message":"chore(deps):
upgrade `@elastic/elasticsearch`
(#163822)","sha":"5d2571abd5681615f648086d3d0132f5a12f2058"}}]}]
BACKPORT-->

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
@mistic
Copy link
Member

mistic commented Aug 17, 2023

This pr didn't make it into the build candidate for v8.9.1. Updating the labels.

@mistic mistic added v8.9.2 and removed v8.9.1 labels Aug 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) release_note:skip Skip the PR/issue when compiling release notes Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc Team:Security Team focused on: Auth, Users, Roles, Spaces, Audit Logging, and more! v8.9.2 v8.10.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants