Skip to content

Commit 4fd84d5

Browse files
kibanamachineformgeistbmorelli25
authored
[APM] Settings: Update layout and update/add descriptions (#94398) (#94743)
* [APM] Align naming * [APM] Add agent config description * [APM] Update layout and styles * [APM] Update text styles and spacing * [APM] Updating styles and layout * [APM] Update layout and styles * [APM] Update description * [APM] Update layout and styles * [APM] Update i18n name * [APM] Add i18n description * [APM] Update layout and styles * Update x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/index.tsx Co-authored-by: Brandon Morelli <[email protected]> * [APM] Update agent config description * Update x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/index.tsx Co-authored-by: Brandon Morelli <[email protected]> * [APM] Remove empty state description Not needed as we have a description by the main title * [APM] Remove unneeded translations Co-authored-by: Kibana Machine <[email protected]> Co-authored-by: Brandon Morelli <[email protected]> Co-authored-by: Casper Hübertz <[email protected]> Co-authored-by: Brandon Morelli <[email protected]>
1 parent 3eddd31 commit 4fd84d5

File tree

10 files changed

+32
-32
lines changed

10 files changed

+32
-32
lines changed

x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,7 @@ export function AgentConfigurationCreateEdit({
123123

124124
<EuiText size="s">
125125
{i18n.translate('xpack.apm.agentConfig.newConfig.description', {
126-
defaultMessage: `This allows you to fine-tune your agent configuration directly in
127-
Kibana. Best of all, changes are automatically propagated to your APM
128-
agents so there’s no need to redeploy.`,
126+
defaultMessage: `Fine-tune your agent configuration from within the APM app. Changes are automatically propagated to your APM agents, so there’s no need to redeploy.`,
129127
})}
130128
</EuiText>
131129

x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/List/index.tsx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,6 @@ export function AgentConfigurationList({ status, data, refetch }: Props) {
6161
)}
6262
</h2>
6363
}
64-
body={
65-
<p>
66-
{i18n.translate('xpack.apm.agentConfig.configTable.emptyPromptText', {
67-
defaultMessage:
68-
"Let's change that! You can fine-tune agent configuration directly from Kibana without having to redeploy. Get started by creating your first configuration.",
69-
})}
70-
</p>
71-
}
7264
actions={
7365
<EuiToolTip
7466
content={

x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/index.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
EuiPanel,
1414
EuiSpacer,
1515
EuiTitle,
16+
EuiText,
1617
} from '@elastic/eui';
1718
import { i18n } from '@kbn/i18n';
1819
import { isEmpty } from 'lodash';
@@ -42,15 +43,21 @@ export function AgentConfigurations() {
4243
<EuiTitle size="l">
4344
<h1>
4445
{i18n.translate('xpack.apm.agentConfig.titleText', {
45-
defaultMessage: 'Agent remote configuration',
46+
defaultMessage: 'Agent central configuration',
4647
})}
4748
</h1>
4849
</EuiTitle>
50+
<EuiSpacer size="s" />
51+
<EuiText color="subdued">
52+
{i18n.translate('xpack.apm.settings.agentConfig.descriptionText', {
53+
defaultMessage: `Fine-tune your agent configuration from within the APM app. Changes are automatically propagated to your APM agents, so there’s no need to redeploy.`,
54+
})}
55+
</EuiText>
4956
<EuiSpacer size="l" />
5057
<EuiPanel>
5158
<EuiFlexGroup alignItems="center">
5259
<EuiFlexItem grow={false}>
53-
<EuiTitle>
60+
<EuiTitle size="s">
5461
<h2>
5562
{i18n.translate(
5663
'xpack.apm.agentConfig.configurationsPanelTitle',

x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ export function ApmIndices() {
178178
})}
179179
</h1>
180180
</EuiTitle>
181-
<EuiSpacer size="l" />
182-
<EuiText>
181+
<EuiSpacer size="s" />
182+
<EuiText color="subdued">
183183
{i18n.translate('xpack.apm.settings.apmIndices.description', {
184184
defaultMessage: `The APM UI uses index patterns to query your APM indices. If you've customized the index names that APM Server writes events to, you may need to update these patterns for the APM UI to work. Settings here take precedence over those set in kibana.yml.`,
185185
})}

x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import {
99
EuiFlexGroup,
1010
EuiFlexItem,
1111
EuiPanel,
12-
EuiSpacer,
1312
EuiTitle,
1413
EuiText,
14+
EuiSpacer,
1515
} from '@elastic/eui';
1616
import { i18n } from '@kbn/i18n';
1717
import { isEmpty } from 'lodash';
@@ -82,14 +82,14 @@ export function CustomLinkOverview() {
8282
/>
8383
)}
8484
<EuiPanel>
85-
<EuiFlexGroup alignItems="center">
85+
<EuiFlexGroup gutterSize="none" alignItems="center">
8686
<EuiFlexItem grow={false}>
87-
<EuiFlexGroup alignItems="center">
87+
<EuiFlexGroup alignItems="center" gutterSize="none">
8888
<EuiFlexItem grow={false}>
89-
<EuiTitle>
89+
<EuiTitle size="s">
9090
<EuiFlexGroup
9191
alignItems="center"
92-
gutterSize="s"
92+
gutterSize="none"
9393
responsive={false}
9494
>
9595
<EuiFlexItem grow={false}>
@@ -117,11 +117,11 @@ export function CustomLinkOverview() {
117117
</EuiFlexItem>
118118
)}
119119
</EuiFlexGroup>
120-
<EuiSpacer size="l" />
121-
<EuiText>
120+
<EuiSpacer size="xs" />
121+
<EuiText color="subdued" size="s">
122122
{i18n.translate('xpack.apm.settings.customizeUI.customLink.info', {
123123
defaultMessage:
124-
'These links will be shown in the Actions context menu for transactions.',
124+
'These links will be shown in the Actions context menu in selected areas of the app, e.g. by the transactions detail.',
125125
})}
126126
</EuiText>
127127
{hasValidLicense ? (

x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/index.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import React from 'react';
9-
import { EuiTitle, EuiSpacer } from '@elastic/eui';
9+
import { EuiTitle, EuiSpacer, EuiText } from '@elastic/eui';
1010
import { i18n } from '@kbn/i18n';
1111
import { CustomLinkOverview } from './CustomLink';
1212

@@ -15,11 +15,17 @@ export function CustomizeUI() {
1515
<>
1616
<EuiTitle size="l">
1717
<h1>
18-
{i18n.translate('xpack.apm.settings.customizeApp', {
18+
{i18n.translate('xpack.apm.settings.customizeApp.title', {
1919
defaultMessage: 'Customize app',
2020
})}
2121
</h1>
2222
</EuiTitle>
23+
<EuiSpacer size="s" />
24+
<EuiText color="subdued">
25+
{i18n.translate('xpack.apm.settings.customizeApp.description', {
26+
defaultMessage: `Extend the APM app experience with the following settings.`,
27+
})}
28+
</EuiText>
2329
<EuiSpacer size="l" />
2430
<CustomLinkOverview />
2531
</>

x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ export function AnomalyDetection() {
7373
})}
7474
</h1>
7575
</EuiTitle>
76-
<EuiSpacer size="l" />
77-
<EuiText>
76+
<EuiSpacer size="s" />
77+
<EuiText color="subdued">
7878
{i18n.translate('xpack.apm.settings.anomalyDetection.descriptionText', {
7979
defaultMessage: `Machine Learning's anomaly detection integration enables application health status indicators for services in each configured environment by identifying anomalies in latency.`,
8080
})}

x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/jobs_list.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export function JobsList({ data, status, onAddEnvironments }: Props) {
6969
<EuiPanel>
7070
<EuiFlexGroup>
7171
<EuiFlexItem>
72-
<EuiTitle>
72+
<EuiTitle size="s">
7373
<h2>
7474
{i18n.translate(
7575
'xpack.apm.settings.anomalyDetection.jobList.environments',
@@ -91,8 +91,7 @@ export function JobsList({ data, status, onAddEnvironments }: Props) {
9191
</EuiButton>
9292
</EuiFlexItem>
9393
</EuiFlexGroup>
94-
<EuiSpacer size="l" />
95-
<EuiText>
94+
<EuiText size="s" color="subdued">
9695
<FormattedMessage
9796
id="xpack.apm.settings.anomalyDetection.jobList.mlDescriptionText"
9897
defaultMessage="To add anomaly detection to a new environment, create a machine learning job. Existing machine learning jobs can be managed in {mlJobsLink}."

x-pack/plugins/translations/translations/ja-JP.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4986,7 +4986,6 @@
49864986
"xpack.apm.agentConfig.configTable.appliedTooltipMessage": "1 つ以上のエージェントにより適用されました",
49874987
"xpack.apm.agentConfig.configTable.configTable.failurePromptText": "エージェントの構成一覧を取得できませんでした。ユーザーに十分なパーミッションがない可能性があります。",
49884988
"xpack.apm.agentConfig.configTable.createConfigButtonLabel": "構成の作成",
4989-
"xpack.apm.agentConfig.configTable.emptyPromptText": "変更しましょう。Kibana からエージェント構成を直接的に微調整できます。再展開する必要はありません。まず、最初の構成を作成します。",
49904989
"xpack.apm.agentConfig.configTable.emptyPromptTitle": "構成が見つかりません。",
49914990
"xpack.apm.agentConfig.configTable.environmentColumnLabel": "サービス環境",
49924991
"xpack.apm.agentConfig.configTable.lastUpdatedColumnLabel": "最終更新",

x-pack/plugins/translations/translations/zh-CN.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5013,7 +5013,6 @@
50135013
"xpack.apm.agentConfig.configTable.appliedTooltipMessage": "已至少由一个代理应用",
50145014
"xpack.apm.agentConfig.configTable.configTable.failurePromptText": "无法获取代理配置列表。您的用户可能没有足够的权限。",
50155015
"xpack.apm.agentConfig.configTable.createConfigButtonLabel": "创建配置",
5016-
"xpack.apm.agentConfig.configTable.emptyPromptText": "让我们改动一下!可以直接从 Kibana 微调代理配置,无需重新部署。首先创建您的第一个配置。",
50175016
"xpack.apm.agentConfig.configTable.emptyPromptTitle": "未找到任何配置。",
50185017
"xpack.apm.agentConfig.configTable.environmentColumnLabel": "服务环境",
50195018
"xpack.apm.agentConfig.configTable.lastUpdatedColumnLabel": "上次更新时间",

0 commit comments

Comments
 (0)