Skip to content

Commit 1f8df66

Browse files
committed
PR feedback
1 parent 8506fef commit 1f8df66

File tree

4 files changed

+32
-28
lines changed

4 files changed

+32
-28
lines changed

x-pack/plugins/monitoring/public/components/apm/instance/instance.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,22 @@ import { FormattedMessage } from '@kbn/i18n/react';
2121

2222
export function ApmServerInstance({ summary, metrics, ...props }) {
2323
const seriesToShow = [
24+
metrics.apm_requests,
2425
metrics.apm_responses_valid,
25-
metrics.apm_responses_errors,
2626

27-
metrics.apm_output_events_rate_success,
28-
metrics.apm_output_events_rate_failure,
27+
metrics.apm_responses_errors,
28+
metrics.apm_acm_request_count,
2929

3030
metrics.apm_acm_response,
3131
metrics.apm_acm_response_errors,
32-
metrics.apm_acm_request_count,
3332

34-
metrics.apm_requests,
35-
metrics.apm_transformations,
33+
metrics.apm_output_events_rate_success,
34+
metrics.apm_output_events_rate_failure,
3635

36+
metrics.apm_transformations,
3737
metrics.apm_cpu,
38-
metrics.apm_memory,
3938

39+
metrics.apm_memory,
4040
metrics.apm_os_load,
4141
];
4242

x-pack/plugins/monitoring/public/components/apm/instances/instances.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {
1515
EuiPageContent,
1616
EuiSpacer,
1717
EuiScreenReaderOnly,
18+
EuiPanel,
1819
} from '@elastic/eui';
1920
import { Status } from './status';
2021
import { formatMetric } from '../../../lib/format_number';
@@ -154,7 +155,9 @@ export function ApmServerInstances({ apms, setupMode }) {
154155
</h1>
155156
</EuiScreenReaderOnly>
156157
<EuiPageContent>
157-
<Status stats={data.stats} />
158+
<EuiPanel>
159+
<Status stats={data.stats} />
160+
</EuiPanel>
158161
<EuiSpacer size="m" />
159162
{setupModeCallout}
160163
<EuiMonitoringTable

x-pack/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x-pack/plugins/monitoring/server/lib/metrics/apm/metrics.js

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ export const metrics = {
458458
defaultMessage: 'Count',
459459
}),
460460
description: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.countDescription', {
461-
defaultMessage: 'fill in',
461+
defaultMessage: 'HTTP requests responded to by APM Server',
462462
}),
463463
}),
464464
apm_acm_response_errors_count: new ApmEventsRateClusterMetric({
@@ -470,7 +470,7 @@ export const metrics = {
470470
defaultMessage: 'Error Count',
471471
}),
472472
description: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.errorCountDescription', {
473-
defaultMessage: 'fill in',
473+
defaultMessage: 'HTTP errors count',
474474
}),
475475
}),
476476
apm_acm_response_valid_ok: new ApmEventsRateClusterMetric({
@@ -482,7 +482,7 @@ export const metrics = {
482482
defaultMessage: 'OK',
483483
}),
484484
description: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.validOkDescription', {
485-
defaultMessage: 'fill in',
485+
defaultMessage: '200 OK response count',
486486
}),
487487
}),
488488
apm_acm_response_valid_notmodified: new ApmEventsRateClusterMetric({
@@ -496,7 +496,7 @@ export const metrics = {
496496
description: i18n.translate(
497497
'xpack.monitoring.metrics.apm.acmResponse.validNotModifiedDescription',
498498
{
499-
defaultMessage: 'fill in',
499+
defaultMessage: '304 Not modified response count',
500500
}
501501
),
502502
}),
@@ -511,7 +511,7 @@ export const metrics = {
511511
description: i18n.translate(
512512
'xpack.monitoring.metrics.apm.acmResponse.errors.forbiddenDescription',
513513
{
514-
defaultMessage: 'fill in',
514+
defaultMessage: 'Forbidden HTTP requests rejected count',
515515
}
516516
),
517517
}),
@@ -526,7 +526,7 @@ export const metrics = {
526526
description: i18n.translate(
527527
'xpack.monitoring.metrics.apm.acmResponse.errors.unauthorizedDescription',
528528
{
529-
defaultMessage: 'fill in',
529+
defaultMessage: 'Unauthorized HTTP requests rejected count',
530530
}
531531
),
532532
}),
@@ -541,7 +541,8 @@ export const metrics = {
541541
description: i18n.translate(
542542
'xpack.monitoring.metrics.apm.acmResponse.errors.unavailableDescription',
543543
{
544-
defaultMessage: 'fill in',
544+
defaultMessage:
545+
'Unavailable HTTP response count. Possible misconfiguration or unsupported version of Kibana',
545546
}
546547
),
547548
}),
@@ -556,7 +557,7 @@ export const metrics = {
556557
description: i18n.translate(
557558
'xpack.monitoring.metrics.apm.acmResponse.errors.methodDescription',
558559
{
559-
defaultMessage: 'fill in',
560+
defaultMessage: 'HTTP requests rejected due to incorrect HTTP method',
560561
}
561562
),
562563
}),
@@ -571,7 +572,7 @@ export const metrics = {
571572
description: i18n.translate(
572573
'xpack.monitoring.metrics.apm.acmResponse.errors.invalidqueryDescription',
573574
{
574-
defaultMessage: 'fill in',
575+
defaultMessage: 'Invalid HTTP query',
575576
}
576577
),
577578
}),
@@ -584,7 +585,7 @@ export const metrics = {
584585
defaultMessage: 'Count',
585586
}),
586587
description: i18n.translate('xpack.monitoring.metrics.apm.acmRequest.countTitleDescription', {
587-
defaultMessage: 'fill in',
588+
defaultMessage: 'HTTP Requests received by agent configuration managemen',
588589
}),
589590
}),
590591
};

0 commit comments

Comments
 (0)