Skip to content

[Logs Essentials] Set tier for local ES test cluster #224428

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.

Sign up for GitHub

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

Merged
pheyos merged 3 commits into from
Jun 19, 2025
Merged

[Logs Essentials] Set tier for local ES test cluster #224428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fda0834
[Logs Essentials] Set tier for local ES test cluster
pheyos Jun 18, 2025
3b94a1a
Merge branch 'main' into logs_essentials_es_settings
pheyos Jun 19, 2025
f3e61dc
Comments for es server args
pheyos Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions x-pack/test/api_integration/deployment_agnostic/default_configs/serverless.config.base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,12 @@ export function createServerlessTestConfig<T extends DeploymentAgnosticCommonSer
? ['xpack.security.authc.native_roles.enabled=true']
: []),
...esServerArgsFromController[options.serverlessProject],
...(options.tier && options.tier === 'oblt_logs_essentials'
? [
'serverless.project_type=observability',
'serverless.observability.tier=logs_essentials',
]
: []),
],
},
kbnTestServer: {
Expand Down
8 changes: 7 additions & 1 deletion x-pack/test_serverless/api_integration/test_suites/observability/config.logs_essentials.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@ export default createTestConfig({
services: { ...apmServices, ...datasetQualityServices },

// include settings from elasticsearch controller
esServerArgs: ['xpack.ml.dfa.enabled=false'],
esServerArgs: [
// ML data frame analytics is not available in observability projects
'xpack.ml.dfa.enabled=false',
// logs essentials tier configuration
'serverless.project_type=observability',
'serverless.observability.tier=logs_essentials',
],
kbnServerArgs: [
// defined in MKI control plane
'--xpack.uptime.service.manifestUrl=mockDevUrl',
Expand Down
8 changes: 7 additions & 1 deletion x-pack/test_serverless/functional/test_suites/observability/config.logs_essentials.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ export default createTestConfig({
suiteTags: { exclude: ['skipSvlOblt'] },

// include settings from elasticsearch controller
esServerArgs: ['xpack.ml.dfa.enabled=false'],
esServerArgs: [
// ML data frame analytics is not available in observability projects
'xpack.ml.dfa.enabled=false',
Comment thread
csr marked this conversation as resolved.
// logs essentials tier configuration
'serverless.project_type=observability',
'serverless.observability.tier=logs_essentials',
],
kbnServerArgs: [
'--xpack.dataUsage.enabled=true',
'--xpack.dataUsage.enableExperimental=[]',
Expand Down