diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0355845c36e17..0508e80c7fdbf 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1950,7 +1950,7 @@ src/platform/plugins/shared/discover/public/context_awareness/profile_providers/ /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 8f10aa09c1860..672cb98250ce6 100644 --- a/.gitignore +++ b/.gitignore @@ -67,7 +67,7 @@ webpackstats.json !/config/serverless.chat.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 e1b606945ac98..6cd84a568de3e 100644 --- a/config/serverless.oblt.yml +++ b/config/serverless.oblt.yml @@ -4,7 +4,7 @@ pricing.tiers.enabled: true pricing.tiers.products: - name: observability - tier: complete + 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'] diff --git a/src/cli/serve/compile_config_stack.test.js b/src/cli/serve/compile_config_stack.test.js index a41833499bab6..960298f9c7db4 100644 --- a/src/cli/serve/compile_config_stack.test.js +++ b/src/cli/serve/compile_config_stack.test.js @@ -202,7 +202,7 @@ describe('pricing tiers configuration', () => { pricing: { tiers: { enabled: true, - products: [{ name: 'observability', tier: 'essentials' }], + products: [{ name: 'observability', tier: 'logs_essentials' }], }, }, serverless: 'oblt', @@ -217,7 +217,7 @@ describe('pricing tiers configuration', () => { 'serverless.yml', 'serverless.oblt.yml', 'kibana.yml', - 'serverless.oblt.essentials.yml', + 'serverless.oblt.logs_essentials.yml', ]); }); @@ -264,7 +264,7 @@ describe('pricing tiers configuration', () => { pricing: { tiers: { enabled: true, - products: [{ name: 'observability', tier: 'essentials' }], + products: [{ name: 'observability', tier: 'logs_essentials' }], }, }, }, @@ -274,7 +274,7 @@ describe('pricing tiers configuration', () => { 'serverless.yml', 'serverless.oblt.yml', 'kibana.yml', - 'serverless.oblt.essentials.yml', + 'serverless.oblt.logs_essentials.yml', ]); }); @@ -316,7 +316,7 @@ describe('pricing tiers configuration', () => { pricing: { tiers: { enabled: false, - products: [{ name: 'observability', tier: 'essentials' }], + products: [{ name: 'observability', tier: 'logs_essentials' }], }, }, serverless: 'oblt', @@ -358,7 +358,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'),