Skip to content

Commit

Permalink
PR feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisronline committed Jun 17, 2020
1 parent 8506fef commit 1f8df66
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@ import { FormattedMessage } from '@kbn/i18n/react';

export function ApmServerInstance({ summary, metrics, ...props }) {
const seriesToShow = [
metrics.apm_requests,
metrics.apm_responses_valid,
metrics.apm_responses_errors,

metrics.apm_output_events_rate_success,
metrics.apm_output_events_rate_failure,
metrics.apm_responses_errors,
metrics.apm_acm_request_count,

metrics.apm_acm_response,
metrics.apm_acm_response_errors,
metrics.apm_acm_request_count,

metrics.apm_requests,
metrics.apm_transformations,
metrics.apm_output_events_rate_success,
metrics.apm_output_events_rate_failure,

metrics.apm_transformations,
metrics.apm_cpu,
metrics.apm_memory,

metrics.apm_memory,
metrics.apm_os_load,
];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
EuiPageContent,
EuiSpacer,
EuiScreenReaderOnly,
EuiPanel,
} from '@elastic/eui';
import { Status } from './status';
import { formatMetric } from '../../../lib/format_number';
Expand Down Expand Up @@ -154,7 +155,9 @@ export function ApmServerInstances({ apms, setupMode }) {
</h1>
</EuiScreenReaderOnly>
<EuiPageContent>
<Status stats={data.stats} />
<EuiPanel>
<Status stats={data.stats} />
</EuiPanel>
<EuiSpacer size="m" />
{setupModeCallout}
<EuiMonitoringTable
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 11 additions & 10 deletions x-pack/plugins/monitoring/server/lib/metrics/apm/metrics.js
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ export const metrics = {
defaultMessage: 'Count',
}),
description: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.countDescription', {
defaultMessage: 'fill in',
defaultMessage: 'HTTP requests responded to by APM Server',
}),
}),
apm_acm_response_errors_count: new ApmEventsRateClusterMetric({
Expand All @@ -470,7 +470,7 @@ export const metrics = {
defaultMessage: 'Error Count',
}),
description: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.errorCountDescription', {
defaultMessage: 'fill in',
defaultMessage: 'HTTP errors count',
}),
}),
apm_acm_response_valid_ok: new ApmEventsRateClusterMetric({
Expand All @@ -482,7 +482,7 @@ export const metrics = {
defaultMessage: 'OK',
}),
description: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.validOkDescription', {
defaultMessage: 'fill in',
defaultMessage: '200 OK response count',
}),
}),
apm_acm_response_valid_notmodified: new ApmEventsRateClusterMetric({
Expand All @@ -496,7 +496,7 @@ export const metrics = {
description: i18n.translate(
'xpack.monitoring.metrics.apm.acmResponse.validNotModifiedDescription',
{
defaultMessage: 'fill in',
defaultMessage: '304 Not modified response count',
}
),
}),
Expand All @@ -511,7 +511,7 @@ export const metrics = {
description: i18n.translate(
'xpack.monitoring.metrics.apm.acmResponse.errors.forbiddenDescription',
{
defaultMessage: 'fill in',
defaultMessage: 'Forbidden HTTP requests rejected count',
}
),
}),
Expand All @@ -526,7 +526,7 @@ export const metrics = {
description: i18n.translate(
'xpack.monitoring.metrics.apm.acmResponse.errors.unauthorizedDescription',
{
defaultMessage: 'fill in',
defaultMessage: 'Unauthorized HTTP requests rejected count',
}
),
}),
Expand All @@ -541,7 +541,8 @@ export const metrics = {
description: i18n.translate(
'xpack.monitoring.metrics.apm.acmResponse.errors.unavailableDescription',
{
defaultMessage: 'fill in',
defaultMessage:
'Unavailable HTTP response count. Possible misconfiguration or unsupported version of Kibana',
}
),
}),
Expand All @@ -556,7 +557,7 @@ export const metrics = {
description: i18n.translate(
'xpack.monitoring.metrics.apm.acmResponse.errors.methodDescription',
{
defaultMessage: 'fill in',
defaultMessage: 'HTTP requests rejected due to incorrect HTTP method',
}
),
}),
Expand All @@ -571,7 +572,7 @@ export const metrics = {
description: i18n.translate(
'xpack.monitoring.metrics.apm.acmResponse.errors.invalidqueryDescription',
{
defaultMessage: 'fill in',
defaultMessage: 'Invalid HTTP query',
}
),
}),
Expand All @@ -584,7 +585,7 @@ export const metrics = {
defaultMessage: 'Count',
}),
description: i18n.translate('xpack.monitoring.metrics.apm.acmRequest.countTitleDescription', {
defaultMessage: 'fill in',
defaultMessage: 'HTTP Requests received by agent configuration managemen',
}),
}),
};

0 comments on commit 1f8df66

Please sign in to comment.