diff --git a/packages/kbn-management/settings/setting_ids/index.ts b/packages/kbn-management/settings/setting_ids/index.ts index 94d56372a17c4..b914451abdb55 100644 --- a/packages/kbn-management/settings/setting_ids/index.ts +++ b/packages/kbn-management/settings/setting_ids/index.ts @@ -141,7 +141,7 @@ export const OBSERVABILITY_APM_ENABLE_SERVICE_INVENTORY_TABLE_SEARCH_BAR = 'observability:apmEnableServiceInventoryTableSearchBar'; export const OBSERVABILITY_LOGS_EXPLORER_ALLOWED_DATA_VIEWS_ID = 'observability:logsExplorer:allowedDataViews'; -export const OBSERVABILITY_APM_ENABLE_MULTI_SIGNAL = 'observability:apmEnableMultiSignal'; +export const OBSERVABILITY_ENTITY_CENTRIC_EXPERIENCE = 'observability:entityCentricExperience'; export const OBSERVABILITY_LOGS_DATA_ACCESS_LOG_SOURCES_ID = 'observability:logSources'; // Reporting settings diff --git a/packages/serverless/settings/observability_project/index.ts b/packages/serverless/settings/observability_project/index.ts index 0374fc9a6b6e8..00d9d7b6d544f 100644 --- a/packages/serverless/settings/observability_project/index.ts +++ b/packages/serverless/settings/observability_project/index.ts @@ -32,5 +32,5 @@ export const OBSERVABILITY_PROJECT_SETTINGS = [ settings.OBSERVABILITY_LOGS_EXPLORER_ALLOWED_DATA_VIEWS_ID, settings.OBSERVABILITY_APM_ENABLE_TABLE_SEARCH_BAR, settings.OBSERVABILITY_APM_ENABLE_SERVICE_INVENTORY_TABLE_SEARCH_BAR, - settings.OBSERVABILITY_APM_ENABLE_MULTI_SIGNAL, + settings.OBSERVABILITY_ENTITY_CENTRIC_EXPERIENCE, ]; diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts index 8285a0aee6b01..85aeb535bb83b 100644 --- a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts +++ b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts @@ -464,7 +464,7 @@ export const stackManagementSchema: MakeSchemaFrom = { type: 'boolean', _meta: { description: 'Non-default value of setting.' }, }, - 'observability:apmEnableMultiSignal': { + 'observability:entityCentricExperience': { type: 'boolean', _meta: { description: 'Non-default value of setting.' }, }, diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/types.ts b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts index 95c72298a9b0e..28f18e5e52fce 100644 --- a/src/plugins/kibana_usage_collection/server/collectors/management/types.ts +++ b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts @@ -163,7 +163,7 @@ export interface UsageStats { 'observability:apmTraceExplorerTab': boolean; 'observability:apmEnableCriticalPath': boolean; 'observability:apmEnableProfilingIntegration': boolean; - 'observability:apmEnableMultiSignal': boolean; + 'observability:entityCentricExperience': boolean; 'observability:profilingShowErrorFrames': boolean; 'securitySolution:enableGroupedNav': boolean; 'securitySolution:showRelatedIntegrations': boolean; diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json index 00c4a48da72fa..d36836e0f0747 100644 --- a/src/plugins/telemetry/schema/oss_plugins.json +++ b/src/plugins/telemetry/schema/oss_plugins.json @@ -10292,7 +10292,7 @@ "description": "Non-default value of setting." } }, - "observability:apmEnableMultiSignal": { + "observability:entityCentricExperience": { "type": "boolean", "_meta": { "description": "Non-default value of setting." diff --git a/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_groups_list/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_groups_list/index.tsx index e46a35e9bb0f8..b183688240813 100644 --- a/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_groups_list/index.tsx +++ b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_groups_list/index.tsx @@ -15,7 +15,7 @@ import { EuiLink, } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n-react'; -import { apmEnableMultiSignal } from '@kbn/observability-plugin/common'; +import { entityCentricExperience } from '@kbn/observability-plugin/common'; import { i18n } from '@kbn/i18n'; import { isEmpty, sortBy } from 'lodash'; import React, { useState, useCallback } from 'react'; @@ -33,7 +33,10 @@ const GET_STARTED_URL = 'https://www.elastic.co/guide/en/apm/get-started/current export function ServiceGroupsList() { const { core } = useApmPluginContext(); - const isMultiSignalEnabled = core.uiSettings.get(apmEnableMultiSignal, false); + const isEntityCentricExperienceEnabled = core.uiSettings.get( + entityCentricExperience, + false + ); const [filter, setFilter] = useState(''); @@ -138,7 +141,7 @@ export function ServiceGroupsList() { {i18n.translate('xpack.apm.serviceGroups.listDescription', { defaultMessage: 'Displayed service counts reflect the last 24 hours.', })} - {isMultiSignalEnabled && ( + {isEntityCentricExperienceEnabled && ( (apmEnableMultiSignal, false); + const isEntityCentricExperienceEnabled = core.uiSettings.get( + entityCentricExperience, + false + ); const tabs: ServiceGroupContextTab[] = [ { @@ -167,7 +170,7 @@ function useTabs(selectedTab: ServiceGroupContextTab['key']) { })} - {isMultiSignalEnabled && ( + {isEntityCentricExperienceEnabled && ( )} diff --git a/x-pack/plugins/observability_solution/observability/common/index.ts b/x-pack/plugins/observability_solution/observability/common/index.ts index 30765fed43e3d..07effc9293676 100644 --- a/x-pack/plugins/observability_solution/observability/common/index.ts +++ b/x-pack/plugins/observability_solution/observability/common/index.ts @@ -37,7 +37,7 @@ export { enableAwsLambdaMetrics, enableAgentExplorerView, apmEnableTableSearchBar, - apmEnableMultiSignal, + entityCentricExperience, apmAWSLambdaPriceFactor, apmAWSLambdaRequestCostPerMillion, apmEnableServiceMetrics, diff --git a/x-pack/plugins/observability_solution/observability/common/ui_settings_keys.ts b/x-pack/plugins/observability_solution/observability/common/ui_settings_keys.ts index 0049afae529ee..fe43cd30705db 100644 --- a/x-pack/plugins/observability_solution/observability/common/ui_settings_keys.ts +++ b/x-pack/plugins/observability_solution/observability/common/ui_settings_keys.ts @@ -26,7 +26,7 @@ export const enableInfrastructureContainerAssetView = export const enableAwsLambdaMetrics = 'observability:enableAwsLambdaMetrics'; export const enableAgentExplorerView = 'observability:apmAgentExplorerView'; export const apmEnableTableSearchBar = 'observability:apmEnableTableSearchBar'; -export const apmEnableMultiSignal = 'observability:apmEnableMultiSignal'; +export const entityCentricExperience = 'observability:entityCentricExperience'; export const apmEnableServiceInventoryTableSearchBar = 'observability:apmEnableServiceInventoryTableSearchBar'; export const apmAWSLambdaPriceFactor = 'observability:apmAWSLambdaPriceFactor'; diff --git a/x-pack/plugins/observability_solution/observability/server/ui_settings.ts b/x-pack/plugins/observability_solution/observability/server/ui_settings.ts index f5d87286d6844..faaa889185984 100644 --- a/x-pack/plugins/observability_solution/observability/server/ui_settings.ts +++ b/x-pack/plugins/observability_solution/observability/server/ui_settings.ts @@ -21,7 +21,7 @@ import { apmLabsButton, enableAgentExplorerView, apmEnableTableSearchBar, - apmEnableMultiSignal, + entityCentricExperience, enableAwsLambdaMetrics, apmAWSLambdaPriceFactor, apmAWSLambdaRequestCostPerMillion, @@ -342,14 +342,13 @@ export const uiSettings: Record = { requiresPageReload: true, type: 'boolean', }, - [apmEnableMultiSignal]: { + [entityCentricExperience]: { category: [observabilityFeatureId], - name: i18n.translate('xpack.observability.apmEnableMultiSignal', { - defaultMessage: 'Multi signal APM', + name: i18n.translate('xpack.observability.entityCentricExperience', { + defaultMessage: 'Entity-centric experience', }), - description: i18n.translate('xpack.observability.apmEnableMultiSignalDescription', { - defaultMessage: - '{technicalPreviewLabel} Enable the multi-signal feature in APM, which allows you to monitor services from logs and traces.', + description: i18n.translate('xpack.observability.entityCentricExperienceDescription', { + defaultMessage: '{technicalPreviewLabel} Promote entity-centric experience to users.', values: { technicalPreviewLabel: `[${technicalPreviewLabel}]`, },