Local serverless runs - set Elasticsearch project type#245113
Merged
pheyos merged 4 commits intoelastic:mainfrom Dec 5, 2025
Merged
Local serverless runs - set Elasticsearch project type#245113pheyos merged 4 commits intoelastic:mainfrom
pheyos merged 4 commits intoelastic:mainfrom
Conversation
dmlemeshko
reviewed
Dec 4, 2025
dmlemeshko
reviewed
Dec 4, 2025
Samiul-TheSoccerFan
approved these changes
Dec 4, 2025
Contributor
Samiul-TheSoccerFan
left a comment
There was a problem hiding this comment.
Workplaceai related changes looks good to me
jbudz
approved these changes
Dec 4, 2025
Member
Author
Good point. We don't actually need this in older branches and I've adjusted the backport label accordingly. |
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)
This was referenced Dec 5, 2025
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)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR make sure we consistently set the Elasticsearch project type.
There's a priority order for selecting the value:
serverless.project_typeis already provided (like e.g. in this test config), we go with that valueesProjectType(typically comes from the CLI viayarn es serverless --projectType=X)esproject type we're defaulting toelasticsearch_general_purposewhich 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.
the
esKibana project type is no longer accepted.Other details
yarn es serverlessCLI still accepts theprojectTypeparameter for the newesProjectTypesetting, so we're backwards compatible with any current usageworkplaceaiproject type is now associated with theworkplaceaiElasticsearch project type