diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 8443bfd320ebd..6a14bf64c950f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1843,7 +1843,7 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security /config/serverless.es.yml @elastic/kibana-core @elastic/kibana-security @elastic/search-kibana /config/serverless.oblt.yml @elastic/kibana-core @elastic/kibana-security @elastic/observability-ui /config/serverless.oblt.complete.yml @elastic/kibana-core @elastic/observability-ui -/config/serverless.oblt.essentials.yml @elastic/kibana-core @elastic/observability-ui +/config/serverless.oblt.logs_essentials.yml @elastic/kibana-core @elastic/observability-ui /config/serverless.security.yml @elastic/kibana-core @elastic/security-solution @elastic/kibana-security /config/serverless.security.search_ai_lake.yml @elastic/security-solution @elastic/kibana-security /config/serverless.security.essentials.yml @elastic/security-solution @elastic/kibana-security diff --git a/.gitignore b/.gitignore index 3665a9a2fdeac..ad67b268d095f 100644 --- a/.gitignore +++ b/.gitignore @@ -66,7 +66,7 @@ webpackstats.json !/config/serverless.es.yml !/config/serverless.oblt.yml !/config/serverless.oblt.complete.yml -!/config/serverless.oblt.essentials.yml +!/config/serverless.oblt.logs_essentials.yml !/config/serverless.security.yml !/config/serverless.security.essentials.yml !/config/serverless.security.complete.yml diff --git a/config/serverless.oblt.essentials.yml b/config/serverless.oblt.logs_essentials.yml similarity index 100% rename from config/serverless.oblt.essentials.yml rename to config/serverless.oblt.logs_essentials.yml diff --git a/config/serverless.oblt.yml b/config/serverless.oblt.yml index 025ebc68002b3..bbb786322a0f2 100644 --- a/config/serverless.oblt.yml +++ b/config/serverless.oblt.yml @@ -4,17 +4,14 @@ pricing.tiers.enabled: true pricing.tiers.products: - name: observability - tier: complete - -## Disable plugins -enterpriseSearch.enabled: false -xpack.cloudSecurityPosture.enabled: false -xpack.uptime.enabled: true -xpack.securitySolution.enabled: false -xpack.search.notebooks.enabled: false -xpack.searchPlayground.enabled: false -xpack.searchInferenceEndpoints.enabled: false -xpack.searchSynonyms.enabled: false + tier: complete # Accepted values for this tier are: complete, logs_essentials + +# Make sure the plugins belonging to this project type are loaded +plugins.allowlistPluginGroups: ['platform', 'observability'] + +# Disabled Observability plugins +xpack.ux.enabled: false +xpack.legacy_uptime.enabled: false xpack.features.overrides: ### Dashboards feature should be moved from Analytics category to the Observability one. diff --git a/src/cli/serve/compile_config_stack.test.js b/src/cli/serve/compile_config_stack.test.js index a5a3453ccb4c2..726531affc0a4 100644 --- a/src/cli/serve/compile_config_stack.test.js +++ b/src/cli/serve/compile_config_stack.test.js @@ -255,7 +255,7 @@ describe('pricing tiers configuration', () => { pricing: { tiers: { enabled: true, - products: [{ name: 'observability', tier: 'essentials' }], + products: [{ name: 'observability', tier: 'logs_essentials' }], }, }, serverless: 'oblt', @@ -270,7 +270,7 @@ describe('pricing tiers configuration', () => { 'serverless.yml', 'serverless.oblt.yml', 'kibana.yml', - 'serverless.oblt.essentials.yml', + 'serverless.oblt.logs_essentials.yml', ]); }); @@ -318,7 +318,7 @@ describe('pricing tiers configuration', () => { pricing: { tiers: { enabled: true, - products: [{ name: 'observability', tier: 'essentials' }], + products: [{ name: 'observability', tier: 'logs_essentials' }], }, }, }, @@ -328,7 +328,7 @@ describe('pricing tiers configuration', () => { 'serverless.yml', 'serverless.oblt.yml', 'kibana.yml', - 'serverless.oblt.essentials.yml', + 'serverless.oblt.logs_essentials.yml', ]); }); @@ -371,7 +371,7 @@ describe('pricing tiers configuration', () => { pricing: { tiers: { enabled: false, - products: [{ name: 'observability', tier: 'essentials' }], + products: [{ name: 'observability', tier: 'logs_essentials' }], }, }, serverless: 'oblt', @@ -413,7 +413,7 @@ describe('pricing tiers configuration', () => { enabled: true, products: [ { name: 'observability', tier: 'complete' }, - { name: 'observability', tier: 'essentials' }, + { name: 'observability', tier: 'logs_essentials' }, ], }, }, diff --git a/src/core/packages/pricing/common/src/pricing_tiers_config.ts b/src/core/packages/pricing/common/src/pricing_tiers_config.ts index 7f72097a29f54..7ff2a96c00ca5 100644 --- a/src/core/packages/pricing/common/src/pricing_tiers_config.ts +++ b/src/core/packages/pricing/common/src/pricing_tiers_config.ts @@ -18,7 +18,7 @@ import { TypeOf, offeringBasedSchema, schema } from '@kbn/config-schema'; export const pricingProductsSchema = schema.oneOf([ schema.object({ name: schema.literal('observability'), - tier: schema.oneOf([schema.literal('complete'), schema.literal('essentials')]), + tier: schema.oneOf([schema.literal('complete'), schema.literal('logs_essentials')]), }), schema.object({ name: schema.literal('ai_soc'),