Skip to content

Local serverless runs - set Elasticsearch project type#245113

Merged
pheyos merged 4 commits intoelastic:mainfrom
pheyos:set_svl_es_project_type
Dec 5, 2025
Merged

Local serverless runs - set Elasticsearch project type#245113
pheyos merged 4 commits intoelastic:mainfrom
pheyos:set_svl_es_project_type

Conversation

@pheyos
Copy link
Copy Markdown
Member

@pheyos pheyos commented Dec 3, 2025

Summary

This PR make sure we consistently set the Elasticsearch project type.
There's a priority order for selecting the value:

  1. If the Elasticsearch parameter serverless.project_type is already provided (like e.g. in this test config), we go with that value
  2. if that's not the case, we check the options for a provided esProjectType (typically comes from the CLI via yarn es serverless --projectType=X)
  3. If no Elasticsearch specific project type is provided, we fall back to determining it from the Kibana project type, where for most projects there's a 1:1 mapping - for the Kibana es project type we're defaulting to elasticsearch_general_purpose which should be in line with the behavior before this PR.

This change now requires to set the Elasticsearch project type correctly on the CLI, e.g.

yarn es serverless --projectType elasticsearch_general_purpose

the es Kibana project type is no longer accepted.

Other details

  • The yarn es serverless CLI still accepts the projectType parameter for the new esProjectType setting, so we're backwards compatible with any current usage
  • Value and type definitions for the project types and project tiers have been streamlined to avoid duplicated listing of entries
  • The Kibana workplaceai project type is now associated with the workplaceai Elasticsearch project type
  • We decided to keep the Scout runs as is for now (going with Kibana project types)

@pheyos pheyos self-assigned this Dec 3, 2025
@pheyos pheyos added release_note:skip Skip the PR/issue when compiling release notes backport:all-open Backport to all branches that could still receive a release labels Dec 3, 2025
@pheyos pheyos marked this pull request as ready for review December 4, 2025 08:10
@pheyos pheyos requested a review from a team as a code owner December 4, 2025 08:10
@pheyos pheyos requested a review from dmlemeshko December 4, 2025 08:11
Copy link
Copy Markdown
Contributor

@Samiul-TheSoccerFan Samiul-TheSoccerFan left a comment

Choose a reason for hiding this comment

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

Workplaceai related changes looks good to me

Copy link
Copy Markdown
Contributor

@jbudz jbudz left a comment

Choose a reason for hiding this comment

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

Do we need the backport:all-open? My expectation is that we only run serverless off main, although maybe it makes sense to avoid conflicts.

@pheyos pheyos added backport:skip This PR does not require backporting and removed backport:all-open Backport to all branches that could still receive a release labels Dec 5, 2025
@pheyos
Copy link
Copy Markdown
Member Author

pheyos commented Dec 5, 2025

Do we need the backport:all-open? My expectation is that we only run serverless off main, although maybe it makes sense to avoid conflicts.

Good point. We don't actually need this in older branches and I've adjusted the backport label accordingly.

@pheyos pheyos merged commit 5385f96 into elastic:main Dec 5, 2025
16 checks passed
@pheyos pheyos deleted the set_svl_es_project_type branch December 5, 2025 10:09
wildemat pushed a commit to wildemat/kibana that referenced this pull request Dec 5, 2025
## Summary

This PR make sure we consistently set the Elasticsearch project type.
There's a priority order for selecting the value:
1. If the Elasticsearch parameter `serverless.project_type` is already
provided (like e.g. in [this test
config](https://github.com/elastic/kibana/blob/main/x-pack/platform/test/serverless/functional/config.logs_essentials.base.ts#L21)),
we go with that value
2. if that's not the case, we check the options for a provided
`esProjectType` (typically comes from the CLI via `yarn es serverless
--projectType=X`)
3. If no Elasticsearch specific project type is provided, we fall back
to determining it from the Kibana project type, where for most projects
there's a 1:1 mapping - for the Kibana `es` project type we're
defaulting to `elasticsearch_general_purpose` which should be in line
with the behavior before this PR.

This change now requires to set the Elasticsearch project type correctly
on the CLI, e.g.
```
yarn es serverless --projectType elasticsearch_general_purpose
```
the `es` Kibana project type is no longer accepted.

### Other details
- The `yarn es serverless` CLI still accepts the `projectType` parameter
for the new `esProjectType` setting, so we're backwards compatible with
any current usage
- Value and type definitions for the project types and project tiers
have been streamlined to avoid duplicated listing of entries
- The Kibana `workplaceai` project type is now associated with the
`workplaceai` Elasticsearch project type
- We decided to keep the Scout runs as is for now (going with Kibana
project types)
JordanSh pushed a commit to JordanSh/kibana that referenced this pull request Dec 9, 2025
## Summary

This PR make sure we consistently set the Elasticsearch project type.
There's a priority order for selecting the value:
1. If the Elasticsearch parameter `serverless.project_type` is already
provided (like e.g. in [this test
config](https://github.com/elastic/kibana/blob/main/x-pack/platform/test/serverless/functional/config.logs_essentials.base.ts#L21)),
we go with that value
2. if that's not the case, we check the options for a provided
`esProjectType` (typically comes from the CLI via `yarn es serverless
--projectType=X`)
3. If no Elasticsearch specific project type is provided, we fall back
to determining it from the Kibana project type, where for most projects
there's a 1:1 mapping - for the Kibana `es` project type we're
defaulting to `elasticsearch_general_purpose` which should be in line
with the behavior before this PR.

This change now requires to set the Elasticsearch project type correctly
on the CLI, e.g.
```
yarn es serverless --projectType elasticsearch_general_purpose
```
the `es` Kibana project type is no longer accepted.

### Other details
- The `yarn es serverless` CLI still accepts the `projectType` parameter
for the new `esProjectType` setting, so we're backwards compatible with
any current usage
- Value and type definitions for the project types and project tiers
have been streamlined to avoid duplicated listing of entries
- The Kibana `workplaceai` project type is now associated with the
`workplaceai` Elasticsearch project type
- We decided to keep the Scout runs as is for now (going with Kibana
project types)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport:skip This PR does not require backporting release_note:skip Skip the PR/issue when compiling release notes v9.3.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants