Skip to content

Commit

Permalink
[ObsUX][APM] Rename observability setting apmEnableMultiSignal to `…
Browse files Browse the repository at this point in the history
…entityCentricExperience` (elastic#188097)

Closes elastic/observability-dev#3731

## Summary

This PR rename `apmEnableMultiSignal` to `entityCentricExperience`

<img width="1834" alt="image"
src="https://github.com/elastic/kibana/assets/14139027/bc8dfcf6-f739-4215-9f68-47345fbdef5e">

Co-authored-by: Katerina <[email protected]>
  • Loading branch information
jennypavlova and kpatticha authored Jul 15, 2024
1 parent 385884d commit 9291a4f
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 20 deletions.
2 changes: 1 addition & 1 deletion packages/kbn-management/settings/setting_ids/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
];
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ export const stackManagementSchema: MakeSchemaFrom<UsageStats> = {
type: 'boolean',
_meta: { description: 'Non-default value of setting.' },
},
'observability:apmEnableMultiSignal': {
'observability:entityCentricExperience': {
type: 'boolean',
_meta: { description: 'Non-default value of setting.' },
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/telemetry/schema/oss_plugins.json
Original file line number Diff line number Diff line change
Expand Up @@ -10292,7 +10292,7 @@
"description": "Non-default value of setting."
}
},
"observability:apmEnableMultiSignal": {
"observability:entityCentricExperience": {
"type": "boolean",
"_meta": {
"description": "Non-default value of setting."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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<boolean>(apmEnableMultiSignal, false);
const isEntityCentricExperienceEnabled = core.uiSettings.get<boolean>(
entityCentricExperience,
false
);

const [filter, setFilter] = useState('');

Expand Down Expand Up @@ -138,7 +141,7 @@ export function ServiceGroupsList() {
{i18n.translate('xpack.apm.serviceGroups.listDescription', {
defaultMessage: 'Displayed service counts reflect the last 24 hours.',
})}
{isMultiSignalEnabled && (
{isEntityCentricExperienceEnabled && (
<FormattedMessage
id="xpack.apm.serviceGroups.onlyApm"
defaultMessage="Only showing services {link}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
EuiSkeletonTitle,
EuiIcon,
} from '@elastic/eui';
import { apmEnableMultiSignal } from '@kbn/observability-plugin/common';
import { entityCentricExperience } from '@kbn/observability-plugin/common';
import React from 'react';
import { i18n } from '@kbn/i18n';
import type { KibanaPageTemplateProps } from '@kbn/shared-ux-page-kibana-template';
Expand Down Expand Up @@ -154,7 +154,10 @@ function useTabs(selectedTab: ServiceGroupContextTab['key']) {
const router = useApmRouter();
const { query } = useAnyOfApmParams('/services', '/service-map');
const { core } = useApmPluginContext();
const isMultiSignalEnabled = core.uiSettings.get<boolean>(apmEnableMultiSignal, false);
const isEntityCentricExperienceEnabled = core.uiSettings.get<boolean>(
entityCentricExperience,
false
);

const tabs: ServiceGroupContextTab[] = [
{
Expand All @@ -167,7 +170,7 @@ function useTabs(selectedTab: ServiceGroupContextTab['key']) {
})}
</EuiFlexItem>
<EuiFlexItem grow={false}>
{isMultiSignalEnabled && (
{isEntityCentricExperienceEnabled && (
<TechnicalPreviewBadge icon="beaker" style={{ verticalAlign: 'middle' }} />
)}
</EuiFlexItem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export {
enableAwsLambdaMetrics,
enableAgentExplorerView,
apmEnableTableSearchBar,
apmEnableMultiSignal,
entityCentricExperience,
apmAWSLambdaPriceFactor,
apmAWSLambdaRequestCostPerMillion,
apmEnableServiceMetrics,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
apmLabsButton,
enableAgentExplorerView,
apmEnableTableSearchBar,
apmEnableMultiSignal,
entityCentricExperience,
enableAwsLambdaMetrics,
apmAWSLambdaPriceFactor,
apmAWSLambdaRequestCostPerMillion,
Expand Down Expand Up @@ -342,14 +342,13 @@ export const uiSettings: Record<string, UiSettings> = {
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: `<em>[${technicalPreviewLabel}]</em>`,
},
Expand Down

0 comments on commit 9291a4f

Please sign in to comment.