From 6df80e3148b295ba1a1341b8f237a848bcf6cb13 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Mon, 26 Aug 2019 16:04:34 +0200 Subject: [PATCH 01/26] Add new APM metrics and modify existing metrics --- .../components/apm/instance/instance.js | 10 +- .../public/components/apm/overview/index.js | 10 +- .../server/lib/metrics/apm/metrics.js | 176 ++++++++++++++++-- .../routes/api/v1/apm/metric_set_overview.js | 64 +++++-- 4 files changed, 223 insertions(+), 37 deletions(-) diff --git a/x-pack/legacy/plugins/monitoring/public/components/apm/instance/instance.js b/x-pack/legacy/plugins/monitoring/public/components/apm/instance/instance.js index cb7187a8c0753..ab9f3ff5832cc 100644 --- a/x-pack/legacy/plugins/monitoring/public/components/apm/instance/instance.js +++ b/x-pack/legacy/plugins/monitoring/public/components/apm/instance/instance.js @@ -21,13 +21,17 @@ import { FormattedMessage } from '@kbn/i18n/react'; export function ApmServerInstance({ summary, metrics, ...props }) { const seriesToShow = [ - metrics.apm_responses_valid, - metrics.apm_responses_errors, + metrics.apm_server_responses_valid, + metrics.apm_server_responses_errors, + + metrics.apm_acm_responses_valid, + metrics.apm_acm_responses_errors, metrics.apm_output_events_rate_success, metrics.apm_output_events_rate_failure, - metrics.apm_requests, + metrics.apm_server_requests, + metrics.apm_acm_requests, metrics.apm_transformations, metrics.apm_cpu, diff --git a/x-pack/legacy/plugins/monitoring/public/components/apm/overview/index.js b/x-pack/legacy/plugins/monitoring/public/components/apm/overview/index.js index c053edc805611..1223906f9fb8c 100644 --- a/x-pack/legacy/plugins/monitoring/public/components/apm/overview/index.js +++ b/x-pack/legacy/plugins/monitoring/public/components/apm/overview/index.js @@ -21,13 +21,17 @@ import { FormattedMessage } from '@kbn/i18n/react'; export function ApmOverview({ stats, metrics, ...props }) { const seriesToShow = [ - metrics.apm_responses_valid, - metrics.apm_responses_errors, + metrics.apm_server_responses_valid, + metrics.apm_server_responses_errors, + + metrics.apm_acm_responses_valid, + metrics.apm_acm_responses_errors, metrics.apm_output_events_rate_success, metrics.apm_output_events_rate_failure, - metrics.apm_requests, + metrics.apm_server_requests, + metrics.apm_acm_requests, metrics.apm_transformations, metrics.apm_cpu, diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js index db2eae591f359..eb0596b0d08cc 100644 --- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js +++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js @@ -133,7 +133,7 @@ export const metrics = { units: 'B', }), - apm_requests: new ApmEventsRateClusterMetric({ + apm_server_requests: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.request.count', title: i18n.translate('xpack.monitoring.metrics.apm.requestsTitle', { defaultMessage: 'Request Count Intake API', @@ -145,8 +145,20 @@ export const metrics = { defaultMessage: 'HTTP Requests received by server', }), }), + apm_acm_requests: new ApmEventsRateClusterMetric({ + field: 'beats_stats.metrics.apm-server.acm.request.count', + title: i18n.translate('xpack.monitoring.metrics.apm.acm.requestsTitle', { + defaultMessage: 'Requests Agent Configuration Management', + }), + label: i18n.translate('xpack.monitoring.metrics.apm.acm.requests.requestedLabel', { + defaultMessage: 'Requested' + }), + description: i18n.translate('xpack.monitoring.metrics.apm.acm.requests.requestedDescription', { + defaultMessage: 'HTTP Requests received by ACM' + }) + }), - apm_responses_count: new ApmEventsRateClusterMetric({ + apm_server_responses_count: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.count', title: i18n.translate('xpack.monitoring.metrics.apm.responseCountTitle', { defaultMessage: 'Response Count Intake API', @@ -158,7 +170,44 @@ export const metrics = { defaultMessage: 'HTTP Requests responded to by server', }), }), - apm_responses_valid_ok: new ApmEventsRateClusterMetric({ + apm_server_responses_errors_count: new ApmEventsRateClusterMetric({ + field: 'beats_stats.metrics.apm-server.server.response.errors.count', + title: i18n.translate('xpack.monitoring.metrics.apm.server.errorsCountTitle', { + defaultMessage: 'Errors' + }), + label: i18n.translate('xpack.monitoring.metrics.apm.server.errorsCount.totalLabel', { + defaultMessage: 'Errors' + }), + description: i18n.translate('xpack.monitoring.metrics.apm.server.errorsCount.totalDescription', { + defaultMessage: 'Errors' + }) + }), + + apm_acm_responses_count: new ApmEventsRateClusterMetric({ + field: 'beats_stats.metrics.apm-server.acm.response.count', + title: i18n.translate('xpack.monitoring.metrics.apm.acmResponseCountTitle', { + defaultMessage: 'Response Count Agent Configuration Management' + }), + label: i18n.translate('xpack.monitoring.metrics.apm.acmResponseCount.totalLabel', { + defaultMessage: 'Total' + }), + description: i18n.translate('xpack.monitoring.metrics.apm.acmResponseCount.totalDescription', { + defaultMessage: 'HTTP Requests responded to by server' + }) + }), + apm_acm_responses_errors_count: new ApmEventsRateClusterMetric({ + field: 'beats_stats.metrics.apm-server.acm.response.errors.count', + title: i18n.translate('xpack.monitoring.metrics.apm.acm.errorsCountTitle', { + defaultMessage: 'Errors' + }), + label: i18n.translate('xpack.monitoring.metrics.apm.acm.errorCount.totalLabel', { + defaultMessage: 'Errors' + }), + description: i18n.translate('xpack.monitoring.metrics.apm.acm.ErrorsCount.totalDescription', { + defaultMessage: 'HTTP Errors' + }) + }), + apm_server_responses_valid_ok: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.valid.ok', title: i18n.translate('xpack.monitoring.metrics.apm.response.okTitle', { defaultMessage: 'Ok', @@ -170,7 +219,31 @@ export const metrics = { defaultMessage: '200 OK response count', }), }), - apm_responses_valid_accepted: new ApmEventsRateClusterMetric({ + apm_acm_responses_valid_ok: new ApmEventsRateClusterMetric({ + field: 'beats_stats.metrics.apm-server.acm.response.valid.ok', + title: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.okTitle', { + defaultMessage: 'Ok' + }), + label: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.okLabel', { + defaultMessage: 'Ok' + }), + description: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.okDescription', { + defaultMessage: '200 OK response count' + }) + }), + apm_acm_responses_valid_notmodified: new ApmEventsRateClusterMetric({ + field: 'beats_stats.metrics.apm-server.acm.response.valid.notmodified', + title: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.okTitle', { + defaultMessage: 'Not modified' + }), + label: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.okLabel', { + defaultMessage: 'Not modified' + }), + description: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.okDescription', { + defaultMessage: 'Not modified' + }) + }), + apm_server_responses_valid_accepted: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.valid.accepted', title: i18n.translate('xpack.monitoring.metrics.apm.response.acceptedTitle', { defaultMessage: 'Accepted', @@ -182,7 +255,19 @@ export const metrics = { defaultMessage: 'HTTP Requests successfully reporting new events', }), }), - apm_responses_errors_toolarge: new ApmEventsRateClusterMetric({ + apm_responses_valid_accepted_acm: new ApmEventsRateClusterMetric({ + field: 'beats_stats.metrics.apm-server.acm.response.valid.accepted', + title: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.acceptedTitle', { + defaultMessage: 'Accepted' + }), + label: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.acceptedLabel', { + defaultMessage: 'Accepted' + }), + description: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.acceptedDescription', { + defaultMessage: 'HTTP Requests successfully reporting new events' + }) + }), + apm_server_responses_errors_toolarge: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.toolarge', title: i18n.translate('xpack.monitoring.metrics.apm.responseErrorsTitle', { defaultMessage: 'Response Errors Intake API', @@ -197,7 +282,7 @@ export const metrics = { } ), }), - apm_responses_errors_validate: new ApmEventsRateClusterMetric({ + apm_server_responses_errors_validate: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.validate', title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.validateTitle', { defaultMessage: 'Validate', @@ -209,7 +294,7 @@ export const metrics = { defaultMessage: 'HTTP Requests rejected due to payload validation error', }), }), - apm_responses_errors_method: new ApmEventsRateClusterMetric({ + apm_server_responses_errors_method: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.method', title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.methodTitle', { defaultMessage: 'Method', @@ -221,7 +306,7 @@ export const metrics = { defaultMessage: 'HTTP Requests rejected due to incorrect HTTP method', }), }), - apm_responses_errors_unauthorized: new ApmEventsRateClusterMetric({ + apm_server_responses_errors_unauthorized: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.unauthorized', title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.unauthorizedTitle', { defaultMessage: 'Unauthorized', @@ -236,7 +321,7 @@ export const metrics = { } ), }), - apm_responses_errors_ratelimit: new ApmEventsRateClusterMetric({ + apm_server_responses_errors_ratelimit: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.ratelimit', title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.rateLimitTitle', { defaultMessage: 'Rate limit', @@ -251,7 +336,7 @@ export const metrics = { } ), }), - apm_responses_errors_queue: new ApmEventsRateClusterMetric({ + apm_server_responses_errors_queue: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.queue', title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.queueTitle', { defaultMessage: 'Queue', @@ -263,7 +348,7 @@ export const metrics = { defaultMessage: 'HTTP Requests rejected to due internal queue filling up', }), }), - apm_responses_errors_decode: new ApmEventsRateClusterMetric({ + apm_server_responses_errors_decode: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.decode', title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.decodeTitle', { defaultMessage: 'Decode', @@ -276,7 +361,7 @@ export const metrics = { 'HTTP Requests rejected to due decoding errors - invalid json, incorrect data type for entity', }), }), - apm_responses_errors_forbidden: new ApmEventsRateClusterMetric({ + apm_server_responses_errors_forbidden: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.forbidden', title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.forbiddenTitle', { defaultMessage: 'Forbidden', @@ -291,7 +376,7 @@ export const metrics = { } ), }), - apm_responses_errors_concurrency: new ApmEventsRateClusterMetric({ + apm_server_responses_errors_concurrency: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.concurrency', title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.concurrencyTitle', { defaultMessage: 'Concurrency', @@ -306,7 +391,7 @@ export const metrics = { } ), }), - apm_responses_errors_closed: new ApmEventsRateClusterMetric({ + apm_server_responses_errors_closed: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.closed', title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.closedTitle', { defaultMessage: 'Closed', @@ -318,7 +403,7 @@ export const metrics = { defaultMessage: 'HTTP Requests rejected during server shutdown', }), }), - apm_responses_errors_internal: new ApmEventsRateClusterMetric({ + apm_server_responses_errors_internal: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.internal', title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.internalTitle', { defaultMessage: 'Internal', @@ -331,6 +416,67 @@ export const metrics = { }), }), + apm_acm_responses_errors_forbidden: new ApmEventsRateClusterMetric({ + field: 'beats_stats.metrics.apm-server.acm.response.errors.forbidden', + title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.acmForbiddenTitle', { + defaultMessage: 'Response Errors Agent Configuration Management' + }), + label: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.acmForbiddenLabel', { + defaultMessage: 'Forbidden' + }), + description: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.acmForbiddenDescription', { + defaultMessage: 'Forbidden HTTP Requests rejected - CORS violation, disabled enpoint' + }) + }), + apm_acm_responses_errors_unauthorized: new ApmEventsRateClusterMetric({ + field: 'beats_stats.metrics.apm-server.acm.response.errors.forbidden', + title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.acmUnauthorizedTitle', { + defaultMessage: 'Unauthorized' + }), + label: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.acmUnauthorizedLabel', { + defaultMessage: 'Unauthorized' + }), + description: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.acmForbiddenDescription', { + defaultMessage: 'Forbidden HTTP Requests rejected - CORS violation, disabled enpoint' + }) + }), + apm_acm_responses_errors_unavailable: new ApmEventsRateClusterMetric({ + field: 'beats_stats.metrics.apm-server.acm.response.errors.unavailable', + title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.acmUnavailableTitle', { + defaultMessage: 'Unavailable' + }), + label: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.acmUnavailableLabel', { + defaultMessage: 'Unavailable' + }), + description: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.acmUnavailableDescription', { + defaultMessage: 'Unavailable HTTP Responses' + }) + }), + apm_acm_responses_errors_method: new ApmEventsRateClusterMetric({ + field: 'beats_stats.metrics.apm-server.acm.response.errors.method', + title: i18n.translate('xpack.monitoring.metrics.apm.acmResponseErrors.methodTitle', { + defaultMessage: 'Method' + }), + label: i18n.translate('xpack.monitoring.metrics.apm.acmResponseErrors.methodLabel', { + defaultMessage: 'Method' + }), + description: i18n.translate('xpack.monitoring.metrics.apm.acmResponseErrors.methodDescription', { + defaultMessage: 'HTTP Requests rejected due to incorrect HTTP method' + }) + }), + apm_acm_responses_errors_invalid_query: new ApmEventsRateClusterMetric({ + field: 'beats_stats.metrics.apm-server.acm.response.errors.invalidquery', + title: i18n.translate('xpack.monitoring.metrics.apm.acmResponseErrors.invalidQueryTitle', { + defaultMessage: 'Invalid Query' + }), + label: i18n.translate('xpack.monitoring.metrics.apm.acmResponseErrors.invalidQueryLabel', { + defaultMessage: 'Invalid Query' + }), + description: i18n.translate('xpack.monitoring.metrics.apm.acmResponseErrors.invalidQueryDescription', { + defaultMessage: 'HTTP invalid query' + }) + }), + apm_processor_transaction_transformations: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.processor.transaction.transformations', title: i18n.translate('xpack.monitoring.metrics.apm.processedEventsTitle', { diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js index 9ce96d386ae2f..9a5d82e6b12d7 100644 --- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js +++ b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js @@ -26,29 +26,61 @@ export const metricSet = [ name: 'apm_output_events_rate_failure', }, { - keys: ['apm_responses_count', 'apm_responses_valid_ok', 'apm_responses_valid_accepted'], - name: 'apm_responses_valid', + keys: [ + 'apm_server_responses_count', + 'apm_server_responses_valid_ok', + 'apm_server_responses_valid_accepted', + 'apm_server_responses_errors_count', + ], + name: 'apm_server_responses_valid' + }, + { + keys: [ + 'apm_acm_responses_count', + 'apm_acm_responses_valid_notmodified', + 'apm_acm_responses_valid_ok', + 'apm_acm_responses_errors_count' + ], + name: 'apm_acm_responses_valid' }, { keys: [ // 'apm_responses_count', - 'apm_responses_errors_toolarge', - 'apm_responses_errors_validate', - 'apm_responses_errors_method', - 'apm_responses_errors_unauthorized', - 'apm_responses_errors_ratelimit', - 'apm_responses_errors_queue', - 'apm_responses_errors_decode', - 'apm_responses_errors_forbidden', - 'apm_responses_errors_concurrency', - 'apm_responses_errors_closed', - 'apm_responses_errors_internal', + 'apm_server_responses_errors_toolarge', + 'apm_server_responses_errors_validate', + 'apm_server_responses_errors_method', + 'apm_server_responses_errors_unauthorized', + 'apm_server_responses_errors_ratelimit', + 'apm_server_responses_errors_queue', + 'apm_server_responses_errors_decode', + 'apm_server_responses_errors_forbidden', + 'apm_server_responses_errors_concurrency', + 'apm_server_responses_errors_closed', + 'apm_server_responses_errors_internal', + ], + name: 'apm_server_responses_errors' + }, + { + keys: [ + 'apm_acm_responses_errors_forbidden', + 'apm_acm_responses_errors_unauthorized', + 'apm_acm_responses_errors_unavailable', + 'apm_acm_responses_errors_method', + 'apm_acm_responses_errors_invalid_query', + ], + name: 'apm_acm_responses_errors' + }, + { + keys: [ + 'apm_server_requests' ], - name: 'apm_responses_errors', + name: 'apm_server_requests' }, { - keys: ['apm_requests'], - name: 'apm_requests', + keys: [ + 'apm_acm_requests' + ], + name: 'apm_acm_requests' }, { keys: [ From f4d77f0a21dff55b662b738f955d8f320a0f2a2f Mon Sep 17 00:00:00 2001 From: Mike Place Date: Mon, 26 Aug 2019 17:04:35 +0200 Subject: [PATCH 02/26] Reorder APM graphs --- .../public/components/apm/instance/instance.js | 10 +++++----- .../monitoring/public/components/apm/overview/index.js | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/x-pack/legacy/plugins/monitoring/public/components/apm/instance/instance.js b/x-pack/legacy/plugins/monitoring/public/components/apm/instance/instance.js index ab9f3ff5832cc..371beb1bccb29 100644 --- a/x-pack/legacy/plugins/monitoring/public/components/apm/instance/instance.js +++ b/x-pack/legacy/plugins/monitoring/public/components/apm/instance/instance.js @@ -21,18 +21,18 @@ import { FormattedMessage } from '@kbn/i18n/react'; export function ApmServerInstance({ summary, metrics, ...props }) { const seriesToShow = [ + metrics.apm_server_requests, metrics.apm_server_responses_valid, metrics.apm_server_responses_errors, - - metrics.apm_acm_responses_valid, - metrics.apm_acm_responses_errors, + metrics.apm_transformations, metrics.apm_output_events_rate_success, metrics.apm_output_events_rate_failure, - metrics.apm_server_requests, metrics.apm_acm_requests, - metrics.apm_transformations, + + metrics.apm_acm_responses_valid, + metrics.apm_acm_responses_errors, metrics.apm_cpu, metrics.apm_memory, diff --git a/x-pack/legacy/plugins/monitoring/public/components/apm/overview/index.js b/x-pack/legacy/plugins/monitoring/public/components/apm/overview/index.js index 1223906f9fb8c..6af153be454fa 100644 --- a/x-pack/legacy/plugins/monitoring/public/components/apm/overview/index.js +++ b/x-pack/legacy/plugins/monitoring/public/components/apm/overview/index.js @@ -21,18 +21,18 @@ import { FormattedMessage } from '@kbn/i18n/react'; export function ApmOverview({ stats, metrics, ...props }) { const seriesToShow = [ + metrics.apm_server_requests, metrics.apm_server_responses_valid, metrics.apm_server_responses_errors, - - metrics.apm_acm_responses_valid, - metrics.apm_acm_responses_errors, + metrics.apm_transformations, metrics.apm_output_events_rate_success, metrics.apm_output_events_rate_failure, - metrics.apm_server_requests, metrics.apm_acm_requests, - metrics.apm_transformations, + + metrics.apm_acm_responses_valid, + metrics.apm_acm_responses_errors, metrics.apm_cpu, metrics.apm_memory, From b94472196db962b47686c625512a5e799ed74a62 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Mon, 26 Aug 2019 17:08:05 +0200 Subject: [PATCH 03/26] Consistent titles --- .../legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js index eb0596b0d08cc..1bbb4fce3a393 100644 --- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js +++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js @@ -148,7 +148,7 @@ export const metrics = { apm_acm_requests: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.request.count', title: i18n.translate('xpack.monitoring.metrics.apm.acm.requestsTitle', { - defaultMessage: 'Requests Agent Configuration Management', + defaultMessage: 'Requests Count Agent Configuration Management', }), label: i18n.translate('xpack.monitoring.metrics.apm.acm.requests.requestedLabel', { defaultMessage: 'Requested' From 8d0b091750fd5bd0fec1fb79cf72a1dfe949e6ac Mon Sep 17 00:00:00 2001 From: Mike Place Date: Mon, 26 Aug 2019 17:53:43 +0200 Subject: [PATCH 04/26] Consistent scheme for lables, descriptions, and titles --- .../server/lib/metrics/apm/metrics.js | 265 +++++++++--------- 1 file changed, 126 insertions(+), 139 deletions(-) diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js index 1bbb4fce3a393..235a4a49d1a2c 100644 --- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js +++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js @@ -138,12 +138,12 @@ export const metrics = { title: i18n.translate('xpack.monitoring.metrics.apm.requestsTitle', { defaultMessage: 'Request Count Intake API', }), - label: i18n.translate('xpack.monitoring.metrics.apm.requests.requestedLabel', { - defaultMessage: 'Requested', - }), - description: i18n.translate('xpack.monitoring.metrics.apm.requests.requestedDescription', { - defaultMessage: 'HTTP Requests received by server', + label: i18n.translate('xpack.monitoring.metrics.apm.requests.server.requestedLabel', { + defaultMessage: 'Requested' }), + description: i18n.translate('xpack.monitoring.metrics.apm.requests.server.requestedDescription', { + defaultMessage: 'HTTP Requests received by server' + }) }), apm_acm_requests: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.request.count', @@ -160,15 +160,15 @@ export const metrics = { apm_server_responses_count: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.count', - title: i18n.translate('xpack.monitoring.metrics.apm.responseCountTitle', { - defaultMessage: 'Response Count Intake API', - }), - label: i18n.translate('xpack.monitoring.metrics.apm.responseCount.totalLabel', { - defaultMessage: 'Total', + title: i18n.translate('xpack.monitoring.metrics.apm.server.responseCountTitle', { + defaultMessage: 'Response Count Intake API' }), - description: i18n.translate('xpack.monitoring.metrics.apm.responseCount.totalDescription', { - defaultMessage: 'HTTP Requests responded to by server', + label: i18n.translate('xpack.monitoring.metrics.apm.server.responseCount.totalLabel', { + defaultMessage: 'Total' }), + description: i18n.translate('xpack.monitoring.metrics.apm.server.responseCount.totalDescription', { + defaultMessage: 'HTTP Requests responded to by server' + }) }), apm_server_responses_errors_count: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.count', @@ -188,10 +188,10 @@ export const metrics = { title: i18n.translate('xpack.monitoring.metrics.apm.acmResponseCountTitle', { defaultMessage: 'Response Count Agent Configuration Management' }), - label: i18n.translate('xpack.monitoring.metrics.apm.acmResponseCount.totalLabel', { + label: i18n.translate('xpack.monitoring.metrics.apm.acm.responseCount.totalLabel', { defaultMessage: 'Total' }), - description: i18n.translate('xpack.monitoring.metrics.apm.acmResponseCount.totalDescription', { + description: i18n.translate('xpack.monitoring.metrics.apm.acm.responseCount.totalDescription', { defaultMessage: 'HTTP Requests responded to by server' }) }), @@ -209,180 +209,167 @@ export const metrics = { }), apm_server_responses_valid_ok: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.valid.ok', - title: i18n.translate('xpack.monitoring.metrics.apm.response.okTitle', { - defaultMessage: 'Ok', - }), - label: i18n.translate('xpack.monitoring.metrics.apm.response.okLabel', { - defaultMessage: 'Ok', + title: i18n.translate('xpack.monitoring.metrics.apm.server.response.okTitle', { + defaultMessage: 'Ok' }), - description: i18n.translate('xpack.monitoring.metrics.apm.response.okDescription', { - defaultMessage: '200 OK response count', + label: i18n.translate('xpack.monitoring.metrics.apm.server.response.okLabel', { + defaultMessage: 'Ok' }), + description: i18n.translate('xpack.monitoring.metrics.apm.server.response.okDescription', { + defaultMessage: '200 OK response count' + }) }), apm_acm_responses_valid_ok: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.valid.ok', - title: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.okTitle', { + title: i18n.translate('xpack.monitoring.metrics.apm.acm.response.okTitle', { defaultMessage: 'Ok' }), - label: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.okLabel', { + label: i18n.translate('xpack.monitoring.metrics.apm.acm.response.okLabel', { defaultMessage: 'Ok' }), - description: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.okDescription', { + description: i18n.translate('xpack.monitoring.metrics.apm.acm.response.okDescription', { defaultMessage: '200 OK response count' }) }), apm_acm_responses_valid_notmodified: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.valid.notmodified', - title: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.okTitle', { + title: i18n.translate('xpack.monitoring.metrics.apm.acm.response.okTitle', { defaultMessage: 'Not modified' }), - label: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.okLabel', { + label: i18n.translate('xpack.monitoring.metrics.apm.acm.response.okLabel', { defaultMessage: 'Not modified' }), - description: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.okDescription', { + description: i18n.translate('xpack.monitoring.metrics.apm.acm.response.okDescription', { defaultMessage: 'Not modified' }) }), apm_server_responses_valid_accepted: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.valid.accepted', - title: i18n.translate('xpack.monitoring.metrics.apm.response.acceptedTitle', { - defaultMessage: 'Accepted', - }), - label: i18n.translate('xpack.monitoring.metrics.apm.response.acceptedLabel', { - defaultMessage: 'Accepted', + title: i18n.translate('xpack.monitoring.metrics.apm.server.response.acceptedTitle', { + defaultMessage: 'Accepted' }), - description: i18n.translate('xpack.monitoring.metrics.apm.response.acceptedDescription', { - defaultMessage: 'HTTP Requests successfully reporting new events', + label: i18n.translate('xpack.monitoring.metrics.apm.server.response.acceptedLabel', { + defaultMessage: 'Accepted' }), + description: i18n.translate('xpack.monitoring.metrics.apm.server.response.acceptedDescription', { + defaultMessage: 'HTTP Requests successfully reporting new events' + }) }), apm_responses_valid_accepted_acm: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.valid.accepted', - title: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.acceptedTitle', { + title: i18n.translate('xpack.monitoring.metrics.apm.acm.response.acceptedTitle', { defaultMessage: 'Accepted' }), - label: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.acceptedLabel', { + label: i18n.translate('xpack.monitoring.metrics.apm.acm.response.acceptedLabel', { defaultMessage: 'Accepted' }), - description: i18n.translate('xpack.monitoring.metrics.apm.acmResponse.acceptedDescription', { + description: i18n.translate('xpack.monitoring.metrics.apm.acm.response.acceptedDescription', { defaultMessage: 'HTTP Requests successfully reporting new events' }) }), apm_server_responses_errors_toolarge: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.toolarge', - title: i18n.translate('xpack.monitoring.metrics.apm.responseErrorsTitle', { - defaultMessage: 'Response Errors Intake API', + title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrorsTitle', { + defaultMessage: 'Response Errors Intake API' }), - label: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.tooLargeLabelTitle', { - defaultMessage: 'Too large', + label: i18n.translate('xpack.monitoring.metrics.apm.sever.responseErrors.tooLargeLabelTitle', { + defaultMessage: 'Too large' }), - description: i18n.translate( - 'xpack.monitoring.metrics.apm.responseErrors.tooLargeLabelDescription', - { - defaultMessage: 'HTTP Requests rejected due to excessive payload size', - } - ), + description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.tooLargeLabelDescription', { + defaultMessage: 'HTTP Requests rejected due to excessive payload size' + }) }), apm_server_responses_errors_validate: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.validate', - title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.validateTitle', { - defaultMessage: 'Validate', - }), - label: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.validateLabel', { - defaultMessage: 'Validate', + title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.validateTitle', { + defaultMessage: 'Validate' }), - description: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.validateDescription', { - defaultMessage: 'HTTP Requests rejected due to payload validation error', + label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.validateLabel', { + defaultMessage: 'Validate' }), + description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.validateDescription', { + defaultMessage: 'HTTP Requests rejected due to payload validation error' + }) }), apm_server_responses_errors_method: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.method', - title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.methodTitle', { - defaultMessage: 'Method', - }), - label: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.methodLabel', { - defaultMessage: 'Method', + title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.methodTitle', { + defaultMessage: 'Method' }), - description: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.methodDescription', { - defaultMessage: 'HTTP Requests rejected due to incorrect HTTP method', + label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.methodLabel', { + defaultMessage: 'Method' }), + description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.methodDescription', { + defaultMessage: 'HTTP Requests rejected due to incorrect HTTP method' + }) }), apm_server_responses_errors_unauthorized: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.unauthorized', - title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.unauthorizedTitle', { - defaultMessage: 'Unauthorized', + title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.unauthorizedTitle', { + defaultMessage: 'Unauthorized' }), - label: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.unauthorizedLabel', { - defaultMessage: 'Unauthorized', + label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.unauthorizedLabel', { + defaultMessage: 'Unauthorized' }), - description: i18n.translate( - 'xpack.monitoring.metrics.apm.responseErrors.unauthorizedDescription', - { - defaultMessage: 'HTTP Requests rejected due to invalid secret token', - } - ), + description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.unauthorizedDescription', { + defaultMessage: 'HTTP Requests rejected due to invalid secret token' + }) }), apm_server_responses_errors_ratelimit: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.ratelimit', - title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.rateLimitTitle', { - defaultMessage: 'Rate limit', + title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.rateLimitTitle', { + defaultMessage: 'Rate limit' }), - label: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.rateLimitLabel', { - defaultMessage: 'Rate limit', + label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.rateLimitLabel', { + defaultMessage: 'Rate limit' }), - description: i18n.translate( - 'xpack.monitoring.metrics.apm.responseErrors.rateLimitDescription', - { - defaultMessage: 'HTTP Requests rejected to due excessive rate limit', - } - ), + description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.rateLimitDescription', { + defaultMessage: 'HTTP Requests rejected to due excessive rate limit' + }) }), apm_server_responses_errors_queue: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.queue', - title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.queueTitle', { - defaultMessage: 'Queue', - }), - label: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.queueLabel', { - defaultMessage: 'Queue', + title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.queueTitle', { + defaultMessage: 'Queue' }), - description: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.queueDescription', { - defaultMessage: 'HTTP Requests rejected to due internal queue filling up', + label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.queueLabel', { + defaultMessage: 'Queue' }), + description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.queueDescription', { + defaultMessage: 'HTTP Requests rejected to due internal queue filling up' + }) }), apm_server_responses_errors_decode: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.decode', - title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.decodeTitle', { - defaultMessage: 'Decode', + title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.decodeTitle', { + defaultMessage: 'Decode' }), - label: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.decodeLabel', { - defaultMessage: 'Decode', - }), - description: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.decodeDescription', { - defaultMessage: - 'HTTP Requests rejected to due decoding errors - invalid json, incorrect data type for entity', + label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.decodeLabel', { + defaultMessage: 'Decode' }), + description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.decodeDescription', { + defaultMessage: 'HTTP Requests rejected to due decoding errors - invalid json, incorrect data type for entity' + }) }), apm_server_responses_errors_forbidden: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.forbidden', - title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.forbiddenTitle', { - defaultMessage: 'Forbidden', + title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.forbiddenTitle', { + defaultMessage: 'Forbidden' }), - label: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.forbiddenLabel', { - defaultMessage: 'Forbidden', + label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.forbiddenLabel', { + defaultMessage: 'Forbidden' }), - description: i18n.translate( - 'xpack.monitoring.metrics.apm.responseErrors.forbiddenDescription', - { - defaultMessage: 'Forbidden HTTP Requests rejected - CORS violation, disabled enpoint', - } - ), + description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.forbiddenDescription', { + defaultMessage: 'Forbidden HTTP Requests rejected - CORS violation, disabled enpoint' + }) }), apm_server_responses_errors_concurrency: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.concurrency', - title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.concurrencyTitle', { - defaultMessage: 'Concurrency', + title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.concurrencyTitle', { + defaultMessage: 'Concurrency' }), - label: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.concurrencyLabel', { - defaultMessage: 'Concurrency', + label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.concurrencyLabel', { + defaultMessage: 'Concurrency' }), description: i18n.translate( 'xpack.monitoring.metrics.apm.responseErrors.concurrencyDescription', @@ -393,86 +380,86 @@ export const metrics = { }), apm_server_responses_errors_closed: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.closed', - title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.closedTitle', { - defaultMessage: 'Closed', - }), - label: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.closedLabel', { - defaultMessage: 'Closed', + title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.closedTitle', { + defaultMessage: 'Closed' }), - description: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.closedDescription', { - defaultMessage: 'HTTP Requests rejected during server shutdown', + label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.closedLabel', { + defaultMessage: 'Closed' }), + description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.closedDescription', { + defaultMessage: 'HTTP Requests rejected during server shutdown' + }) }), apm_server_responses_errors_internal: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.internal', - title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.internalTitle', { - defaultMessage: 'Internal', - }), - label: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.internalLabel', { - defaultMessage: 'Internal', + title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.internalTitle', { + defaultMessage: 'Internal' }), - description: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.internalDescription', { - defaultMessage: 'HTTP Requests rejected due to a miscellaneous internal error', + label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.internalLabel', { + defaultMessage: 'Internal' }), + description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.internalDescription', { + defaultMessage: 'HTTP Requests rejected due to a miscellaneous internal error' + }) }), apm_acm_responses_errors_forbidden: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.errors.forbidden', - title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.acmForbiddenTitle', { + title: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmForbiddenTitle', { defaultMessage: 'Response Errors Agent Configuration Management' }), - label: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.acmForbiddenLabel', { + label: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmForbiddenLabel', { defaultMessage: 'Forbidden' }), - description: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.acmForbiddenDescription', { + description: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmForbiddenDescription', { defaultMessage: 'Forbidden HTTP Requests rejected - CORS violation, disabled enpoint' }) }), apm_acm_responses_errors_unauthorized: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.errors.forbidden', - title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.acmUnauthorizedTitle', { + title: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmUnauthorizedTitle', { defaultMessage: 'Unauthorized' }), - label: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.acmUnauthorizedLabel', { + label: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmUnauthorizedLabel', { defaultMessage: 'Unauthorized' }), - description: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.acmForbiddenDescription', { + description: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmForbiddenDescription', { defaultMessage: 'Forbidden HTTP Requests rejected - CORS violation, disabled enpoint' }) }), apm_acm_responses_errors_unavailable: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.errors.unavailable', - title: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.acmUnavailableTitle', { + title: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmUnavailableTitle', { defaultMessage: 'Unavailable' }), - label: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.acmUnavailableLabel', { + label: i18n.translate('xpack.monitoring.metrics.acm.apm.responseErrors.acmUnavailableLabel', { defaultMessage: 'Unavailable' }), - description: i18n.translate('xpack.monitoring.metrics.apm.responseErrors.acmUnavailableDescription', { + description: i18n.translate('xpack.monitoring.metrics.acm.apm.responseErrors.acmUnavailableDescription', { defaultMessage: 'Unavailable HTTP Responses' }) }), apm_acm_responses_errors_method: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.errors.method', - title: i18n.translate('xpack.monitoring.metrics.apm.acmResponseErrors.methodTitle', { + title: i18n.translate('xpack.monitoring.metrics.apm.server.acmResponseErrors.methodTitle', { defaultMessage: 'Method' }), - label: i18n.translate('xpack.monitoring.metrics.apm.acmResponseErrors.methodLabel', { + label: i18n.translate('xpack.monitoring.metrics.apm.server.acmResponseErrors.methodLabel', { defaultMessage: 'Method' }), - description: i18n.translate('xpack.monitoring.metrics.apm.acmResponseErrors.methodDescription', { + description: i18n.translate('xpack.monitoring.metrics.apm.server.acmResponseErrors.methodDescription', { defaultMessage: 'HTTP Requests rejected due to incorrect HTTP method' }) }), apm_acm_responses_errors_invalid_query: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.errors.invalidquery', - title: i18n.translate('xpack.monitoring.metrics.apm.acmResponseErrors.invalidQueryTitle', { + title: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.invalidQueryTitle', { defaultMessage: 'Invalid Query' }), - label: i18n.translate('xpack.monitoring.metrics.apm.acmResponseErrors.invalidQueryLabel', { + label: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.invalidQueryLabel', { defaultMessage: 'Invalid Query' }), - description: i18n.translate('xpack.monitoring.metrics.apm.acmResponseErrors.invalidQueryDescription', { + description: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.invalidQueryDescription', { defaultMessage: 'HTTP invalid query' }) }), From 2f73c97ef2bce598912c737334f3caf45cedec8f Mon Sep 17 00:00:00 2001 From: Mike Place Date: Mon, 26 Aug 2019 21:30:43 +0200 Subject: [PATCH 05/26] Fix dups in internationalization strings --- .../monitoring/server/lib/metrics/apm/metrics.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js index 235a4a49d1a2c..3551ca0e09f70 100644 --- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js +++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js @@ -221,22 +221,22 @@ export const metrics = { }), apm_acm_responses_valid_ok: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.valid.ok', - title: i18n.translate('xpack.monitoring.metrics.apm.acm.response.okTitle', { + title: i18n.translate('xpack.monitoring.metrics.apm.acm.response.validOk.okTitle', { defaultMessage: 'Ok' }), - label: i18n.translate('xpack.monitoring.metrics.apm.acm.response.okLabel', { + label: i18n.translate('xpack.monitoring.metrics.apm.acm.response.validOk.okLabel', { defaultMessage: 'Ok' }), - description: i18n.translate('xpack.monitoring.metrics.apm.acm.response.okDescription', { + description: i18n.translate('xpack.monitoring.metrics.apm.acm.response.validOk.okDescription', { defaultMessage: '200 OK response count' }) }), apm_acm_responses_valid_notmodified: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.valid.notmodified', - title: i18n.translate('xpack.monitoring.metrics.apm.acm.response.okTitle', { + title: i18n.translate('xpack.monitoring.metrics.apm.acm.response.validNotModified.okTitle', { defaultMessage: 'Not modified' }), - label: i18n.translate('xpack.monitoring.metrics.apm.acm.response.okLabel', { + label: i18n.translate('xpack.monitoring.metrics.apm.acm.response.validNotModified.okLabel', { defaultMessage: 'Not modified' }), description: i18n.translate('xpack.monitoring.metrics.apm.acm.response.okDescription', { From d79d0c5040df2a065e8159b2c1c64c01d63de1fd Mon Sep 17 00:00:00 2001 From: Mike Place Date: Mon, 26 Aug 2019 21:36:02 +0200 Subject: [PATCH 06/26] Resolve field differences in APM test --- .../apis/monitoring/apm/fixtures/cluster.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json index aa9e4cc125a90..c152a31eec90d 100644 --- a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json +++ b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json @@ -290,7 +290,7 @@ [1535723940000, 0] ] }], - "apm_responses_valid": [{ + "apm_server_responses_valid": [{ "bucket_size": "30 seconds", "timeRange": { "min": 1535720389104, @@ -360,7 +360,7 @@ [1535723940000, 2] ] }], - "apm_responses_errors": [{ + "apm_server_responses_errors": [{ "bucket_size": "30 seconds", "timeRange": { "min": 1535720389104, @@ -614,7 +614,7 @@ [1535723940000, 0] ] }], - "apm_requests": [{ + "apm_server_requests": [{ "bucket_size": "30 seconds", "timeRange": { "min": 1535720389104, From 3be0ca09e96c8efc45c39984160e53d2b4a9ebf6 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Tue, 27 Aug 2019 14:37:23 +0200 Subject: [PATCH 07/26] Various test and fixture updates --- .../routes/api/v1/apm/metric_set_instance.js | 42 +- .../apis/monitoring/apm/fixtures/cluster.json | 2072 +++++++++++------ .../monitoring/apm/fixtures/instance.json | 2072 +++++++++++------ .../setup/collection/fixtures/detect_apm.json | 4 +- 4 files changed, 2789 insertions(+), 1401 deletions(-) diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js index 9ce96d386ae2f..77e57f562d90a 100644 --- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js +++ b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js @@ -26,29 +26,41 @@ export const metricSet = [ name: 'apm_output_events_rate_failure', }, { - keys: ['apm_responses_count', 'apm_responses_valid_ok', 'apm_responses_valid_accepted'], - name: 'apm_responses_valid', + keys: [ + 'apm_server_responses_count', + 'apm_server_responses_valid_ok', + 'apm_server_responses_valid_accepted' + ], + name: 'apm_server_responses_valid' }, { keys: [ // 'apm_responses_count', - 'apm_responses_errors_toolarge', - 'apm_responses_errors_validate', - 'apm_responses_errors_method', - 'apm_responses_errors_unauthorized', - 'apm_responses_errors_ratelimit', - 'apm_responses_errors_queue', - 'apm_responses_errors_decode', - 'apm_responses_errors_forbidden', - 'apm_responses_errors_concurrency', - 'apm_responses_errors_closed', - 'apm_responses_errors_internal', + 'apm_server_responses_errors_toolarge', + 'apm_server_responses_errors_validate', + 'apm_server_responses_errors_method', + 'apm_server_responses_errors_unauthorized', + 'apm_server_responses_errors_ratelimit', + 'apm_server_responses_errors_queue', + 'apm_server_responses_errors_decode', + 'apm_server_responses_errors_forbidden', + 'apm_server_responses_errors_concurrency', + 'apm_server_responses_errors_closed', + 'apm_server_responses_errors_internal', ], name: 'apm_responses_errors', }, { - keys: ['apm_requests'], - name: 'apm_requests', + keys: [ + 'apm_server_requests' + ], + name: 'apm_server_requests' + }, + { + keys: [ + 'apm_acm_requests' + ], + name: 'apm_acm_requests' }, { keys: [ diff --git a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json index c152a31eec90d..44f3328c61f30 100644 --- a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json +++ b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json @@ -9,727 +9,1415 @@ "timeOfLastEvent": "2018-08-31T13:59:21.201Z" }, "metrics": { - "apm_cpu": [{ - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + "apm_cpu": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.beat.cpu.total.value", + "metricAgg": "max", + "label": "Total", + "title": "CPU Utilization", + "description": "Percentage of CPU time spent executing (user+kernel mode) for the APM process", + "units": "%", + "format": "0.[00]", + "hasCalculation": true, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0.1 + ], + [ + 1535723940000, + 0.26666666666666666 + ] + ] + } + ], + "apm_os_load": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.system.load.1", + "metricAgg": "max", + "label": "1m", + "title": "System Load", + "description": "Load average over the last 1 minute", + "units": "", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": false + }, + "data": [ + [ + 1535723880000, + 1.37 + ], + [ + 1535723910000, + 1.01 + ], + [ + 1535723940000, + 0.61 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.beat.cpu.total.value", - "metricAgg": "max", - "label": "Total", - "title": "CPU Utilization", - "description": "Percentage of CPU time spent executing (user+kernel mode) for the APM process", - "units": "%", - "format": "0.[00]", - "hasCalculation": true, - "isDerivative": true + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.system.load.5", + "metricAgg": "max", + "label": "5m", + "title": "System Load", + "description": "Load average over the last 5 minutes", + "units": "", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": false + }, + "data": [ + [ + 1535723880000, + 1.72 + ], + [ + 1535723910000, + 1.6 + ], + [ + 1535723940000, + 1.45 + ] + ] }, - "data": [ - [1535723880000, null], - [1535723910000, 0.1], - [1535723940000, 0.26666666666666666] - ] - }], - "apm_os_load": [{ - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.system.load.15", + "metricAgg": "max", + "label": "15m", + "title": "System Load", + "description": "Load average over the last 15 minutes", + "units": "", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": false + }, + "data": [ + [ + 1535723880000, + 2.5 + ], + [ + 1535723910000, + 2.43 + ], + [ + 1535723940000, + 2.35 + ] + ] + } + ], + "apm_memory": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.beat.memstats.memory_alloc", + "metricAgg": "max", + "label": "Allocated Memory", + "title": "Memory", + "description": "Allocated memory", + "units": "B", + "format": "0,0.0 b", + "hasCalculation": false, + "isDerivative": false + }, + "data": [ + [ + 1535723880000, + 4660952 + ], + [ + 1535723910000, + 3888048 + ], + [ + 1535723940000, + 3445920 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.system.load.1", - "metricAgg": "max", - "label": "1m", - "title": "System Load", - "description": "Load average over the last 1 minute", - "units": "", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": false + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.beat.memstats.rss", + "metricAgg": "max", + "label": "Process Total", + "title": "Memory", + "description": "Resident set size of memory reserved by the APM service from the OS", + "units": "B", + "format": "0,0.0 b", + "hasCalculation": false, + "isDerivative": false + }, + "data": [ + [ + 1535723880000, + 10866688 + ], + [ + 1535723910000, + 11456512 + ], + [ + 1535723940000, + 12095488 + ] + ] }, - "data": [ - [1535723880000, 1.37], - [1535723910000, 1.01], - [1535723940000, 0.61] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.beat.memstats.gc_next", + "metricAgg": "max", + "label": "GC Next", + "title": "Memory", + "description": "Limit of allocated memory at which garbage collection will occur", + "units": "B", + "format": "0,0.0 b", + "hasCalculation": false, + "isDerivative": false + }, + "data": [ + [ + 1535723880000, + 5212816 + ], + [ + 1535723910000, + 4996912 + ], + [ + 1535723940000, + 4886176 + ] + ] + } + ], + "apm_output_events_rate_success": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.libbeat.output.events.total", + "metricAgg": "max", + "label": "Total", + "title": "Output Events Rate", + "description": "Events processed by the output (including retries)", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 18 + ], + [ + 1535723940000, + 12 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.system.load.5", - "metricAgg": "max", - "label": "5m", - "title": "System Load", - "description": "Load average over the last 5 minutes", - "units": "", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": false + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.libbeat.output.events.active", + "metricAgg": "max", + "label": "Active", + "title": "Output Active Events Rate", + "description": "Events processed by the output (including retries)", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + null + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, 1.72], - [1535723910000, 1.6], - [1535723940000, 1.45] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.libbeat.output.events.acked", + "metricAgg": "max", + "label": "Acked", + "title": "Output Acked Events Rate", + "description": "Events processed by the output (including retries)", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 18 + ], + [ + 1535723940000, + 12 + ] + ] + } + ], + "apm_output_events_rate_failure": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.libbeat.output.events.failed", + "metricAgg": "max", + "label": "Failed", + "title": "Output Failed Events Rate", + "description": "Events processed by the output (including retries)", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.system.load.15", - "metricAgg": "max", - "label": "15m", - "title": "System Load", - "description": "Load average over the last 15 minutes", - "units": "", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": false + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.libbeat.output.events.dropped", + "metricAgg": "max", + "label": "Dropped", + "title": "Output Dropped Events Rate", + "description": "Events processed by the output (including retries)", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] + } + ], + "apm_server_responses_valid": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.count", + "metricAgg": "max", + "label": "Total", + "title": "Response Count Intake API", + "description": "HTTP Requests responded to by server", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 84 + ], + [ + 1535723940000, + 84 + ] + ] }, - "data": [ - [1535723880000, 2.5], - [1535723910000, 2.43], - [1535723940000, 2.35] - ] - }], - "apm_memory": [{ - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.valid.ok", + "metricAgg": "max", + "label": "Ok", + "title": "Ok", + "description": "200 OK response count", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 80 + ], + [ + 1535723940000, + 82 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.beat.memstats.memory_alloc", - "metricAgg": "max", - "label": "Allocated Memory", - "title": "Memory", - "description": "Allocated memory", - "units": "B", - "format": "0,0.0 b", - "hasCalculation": false, - "isDerivative": false + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.valid.accepted", + "metricAgg": "max", + "label": "Accepted", + "title": "Accepted", + "description": "HTTP Requests successfully reporting new events", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 4 + ], + [ + 1535723940000, + 2 + ] + ] }, - "data": [ - [1535723880000, 4660952], - [1535723910000, 3888048], - [1535723940000, 3445920] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.count", + "metricAgg": "max", + "label": "Errors", + "title": "Errors", + "description": "Errors", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] + } + ], + "apm_acm_responses_valid": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.response.count", + "metricAgg": "max", + "label": "Total", + "title": "Response Count Agent Configuration Management", + "description": "HTTP Requests responded to by server", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.beat.memstats.rss", - "metricAgg": "max", - "label": "Process Total", - "title": "Memory", - "description": "Resident set size of memory reserved by the APM service from the OS", - "units": "B", - "format": "0,0.0 b", - "hasCalculation": false, - "isDerivative": false + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.response.valid.notmodified", + "metricAgg": "max", + "label": "Not modified", + "title": "Not modified", + "description": "Not modified", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, 10866688], - [1535723910000, 11456512], - [1535723940000, 12095488] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.response.valid.ok", + "metricAgg": "max", + "label": "Ok", + "title": "Ok", + "description": "200 OK response count", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.beat.memstats.gc_next", - "metricAgg": "max", - "label": "GC Next", - "title": "Memory", - "description": "Limit of allocated memory at which garbage collection will occur", - "units": "B", - "format": "0,0.0 b", - "hasCalculation": false, - "isDerivative": false + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.response.errors.count", + "metricAgg": "max", + "label": "Errors", + "title": "Errors", + "description": "HTTP Errors", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] + } + ], + "apm_server_responses_errors": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.toolarge", + "metricAgg": "max", + "label": "Too large", + "title": "Response Errors Intake API", + "description": "HTTP Requests rejected due to excessive payload size", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, 5212816], - [1535723910000, 4996912], - [1535723940000, 4886176] - ] - }], - "apm_output_events_rate_success": [{ - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.validate", + "metricAgg": "max", + "label": "Validate", + "title": "Validate", + "description": "HTTP Requests rejected due to payload validation error", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.libbeat.output.events.total", - "metricAgg": "max", - "label": "Total", - "title": "Output Events Rate", - "description": "Events processed by the output (including retries)", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.method", + "metricAgg": "max", + "label": "Method", + "title": "Method", + "description": "HTTP Requests rejected due to incorrect HTTP method", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, null], - [1535723910000, 18], - [1535723940000, 12] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.unauthorized", + "metricAgg": "max", + "label": "Unauthorized", + "title": "Unauthorized", + "description": "HTTP Requests rejected due to invalid secret token", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.libbeat.output.events.active", - "metricAgg": "max", - "label": "Active", - "title": "Output Active Events Rate", - "description": "Events processed by the output (including retries)", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.ratelimit", + "metricAgg": "max", + "label": "Rate limit", + "title": "Rate limit", + "description": "HTTP Requests rejected to due excessive rate limit", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, null], - [1535723910000, null], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.queue", + "metricAgg": "max", + "label": "Queue", + "title": "Queue", + "description": "HTTP Requests rejected to due internal queue filling up", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.libbeat.output.events.acked", - "metricAgg": "max", - "label": "Acked", - "title": "Output Acked Events Rate", - "description": "Events processed by the output (including retries)", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.decode", + "metricAgg": "max", + "label": "Decode", + "title": "Decode", + "description": "HTTP Requests rejected to due decoding errors - invalid json, incorrect data type for entity", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, null], - [1535723910000, 18], - [1535723940000, 12] - ] - }], - "apm_output_events_rate_failure": [{ - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.forbidden", + "metricAgg": "max", + "label": "Forbidden", + "title": "Forbidden", + "description": "Forbidden HTTP Requests rejected - CORS violation, disabled enpoint", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.libbeat.output.events.failed", - "metricAgg": "max", - "label": "Failed", - "title": "Output Failed Events Rate", - "description": "Events processed by the output (including retries)", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.concurrency", + "metricAgg": "max", + "label": "Concurrency", + "title": "Concurrency", + "description": "HTTP Requests rejected due to overall concurrency limit breach", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.closed", + "metricAgg": "max", + "label": "Closed", + "title": "Closed", + "description": "HTTP Requests rejected during server shutdown", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.libbeat.output.events.dropped", - "metricAgg": "max", - "label": "Dropped", - "title": "Output Dropped Events Rate", - "description": "Events processed by the output (including retries)", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.internal", + "metricAgg": "max", + "label": "Internal", + "title": "Internal", + "description": "HTTP Requests rejected due to a miscellaneous internal error", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] + } + ], + "apm_acm_responses_errors": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.response.errors.forbidden", + "metricAgg": "max", + "label": "Forbidden", + "title": "Response Errors Agent Configuration Management", + "description": "Forbidden HTTP Requests rejected - CORS violation, disabled enpoint", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }], - "apm_server_responses_valid": [{ - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.response.errors.forbidden", + "metricAgg": "max", + "label": "Unauthorized", + "title": "Unauthorized", + "description": "Forbidden HTTP Requests rejected - CORS violation, disabled enpoint", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.count", - "metricAgg": "max", - "label": "Total", - "title": "Response Count Intake API", - "description": "HTTP Requests responded to by server", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.response.errors.unavailable", + "metricAgg": "max", + "label": "Unavailable", + "title": "Unavailable", + "description": "Unavailable HTTP Responses", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, null], - [1535723910000, 84], - [1535723940000, 84] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.response.errors.method", + "metricAgg": "max", + "label": "Method", + "title": "Method", + "description": "HTTP Requests rejected due to incorrect HTTP method", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.valid.ok", - "metricAgg": "max", - "label": "Ok", - "title": "Ok", - "description": "200 OK response count", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.response.errors.invalidquery", + "metricAgg": "max", + "label": "Invalid Query", + "title": "Invalid Query", + "description": "HTTP invalid query", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] + } + ], + "apm_server_requests": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.request.count", + "metricAgg": "max", + "label": "Requested", + "title": "Requests Count Intake API", + "description": "HTTP Requests received by server", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 84 + ], + [ + 1535723940000, + 84 + ] + ] + } + ], + "apm_acm_requests": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.request.count", + "metricAgg": "max", + "label": "Requested", + "title": "Requests Count Agent Configuration Management", + "description": "HTTP Requests received by ACM", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] + } + ], + "apm_transformations": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.processor.transaction.transformations", + "metricAgg": "max", + "label": "Transaction", + "title": "Processed Events", + "description": "Transaction events processed", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 6 + ], + [ + 1535723940000, + 4 + ] + ] }, - "data": [ - [1535723880000, null], - [1535723910000, 80], - [1535723940000, 82] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.processor.span.transformations", + "metricAgg": "max", + "label": "Span", + "title": "Transformations", + "description": "Span events processed", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 12 + ], + [ + 1535723940000, + 8 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.valid.accepted", - "metricAgg": "max", - "label": "Accepted", - "title": "Accepted", - "description": "HTTP Requests successfully reporting new events", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.processor.error.transformations", + "metricAgg": "max", + "label": "Error", + "title": "Transformations", + "description": "Error events processed", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, null], - [1535723910000, 4], - [1535723940000, 2] - ] - }], - "apm_server_responses_errors": [{ - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.toolarge", - "metricAgg": "max", - "label": "Too large", - "title": "Response Errors Intake API", - "description": "HTTP Requests rejected due to excessive payload size", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.validate", - "metricAgg": "max", - "label": "Validate", - "title": "Validate", - "description": "HTTP Requests rejected due to payload validation error", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.method", - "metricAgg": "max", - "label": "Method", - "title": "Method", - "description": "HTTP Requests rejected due to incorrect HTTP method", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.unauthorized", - "metricAgg": "max", - "label": "Unauthorized", - "title": "Unauthorized", - "description": "HTTP Requests rejected due to invalid secret token", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.ratelimit", - "metricAgg": "max", - "label": "Rate limit", - "title": "Rate limit", - "description": "HTTP Requests rejected to due excessive rate limit", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.queue", - "metricAgg": "max", - "label": "Queue", - "title": "Queue", - "description": "HTTP Requests rejected to due internal queue filling up", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.decode", - "metricAgg": "max", - "label": "Decode", - "title": "Decode", - "description": "HTTP Requests rejected to due decoding errors - invalid json, incorrect data type for entity", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.forbidden", - "metricAgg": "max", - "label": "Forbidden", - "title": "Forbidden", - "description": "Forbidden HTTP Requests rejected - CORS violation, disabled enpoint", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.concurrency", - "metricAgg": "max", - "label": "Concurrency", - "title": "Concurrency", - "description": "HTTP Requests rejected due to overall concurrency limit breach", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.closed", - "metricAgg": "max", - "label": "Closed", - "title": "Closed", - "description": "HTTP Requests rejected during server shutdown", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.internal", - "metricAgg": "max", - "label": "Internal", - "title": "Internal", - "description": "HTTP Requests rejected due to a miscellaneous internal error", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }], - "apm_server_requests": [{ - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.request.count", - "metricAgg": "max", - "label": "Requested", - "title": "Request Count Intake API", - "description": "HTTP Requests received by server", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 84], - [1535723940000, 84] - ] - }], - "apm_transformations": [{ - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.processor.transaction.transformations", - "metricAgg": "max", - "label": "Transaction", - "title": "Processed Events", - "description": "Transaction events processed", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 6], - [1535723940000, 4] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.processor.span.transformations", - "metricAgg": "max", - "label": "Span", - "title": "Transformations", - "description": "Span events processed", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 12], - [1535723940000, 8] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.processor.error.transformations", - "metricAgg": "max", - "label": "Error", - "title": "Transformations", - "description": "Error events processed", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.processor.metric.transformations", - "metricAgg": "max", - "label": "Metric", - "title": "Transformations", - "description": "Metric events processed", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }] + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.processor.metric.transformations", + "metricAgg": "max", + "label": "Metric", + "title": "Transformations", + "description": "Metric events processed", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] + } + ] } } diff --git a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json index abcbf7557234d..57ef73750d722 100644 --- a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json +++ b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json @@ -1,727 +1,1415 @@ { "metrics": { - "apm_cpu": [{ - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + "apm_cpu": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.beat.cpu.total.value", + "metricAgg": "max", + "label": "Total", + "title": "CPU Utilization", + "description": "Percentage of CPU time spent executing (user+kernel mode) for the APM process", + "units": "%", + "format": "0.[00]", + "hasCalculation": true, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0.13333333333333333 + ], + [ + 1535723940000, + 0.3 + ] + ] + } + ], + "apm_os_load": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.system.load.1", + "metricAgg": "max", + "label": "1m", + "title": "System Load", + "description": "Load average over the last 1 minute", + "units": "", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": false + }, + "data": [ + [ + 1535723880000, + 1.37 + ], + [ + 1535723910000, + 1.01 + ], + [ + 1535723940000, + 0.61 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.beat.cpu.total.value", - "metricAgg": "max", - "label": "Total", - "title": "CPU Utilization", - "description": "Percentage of CPU time spent executing (user+kernel mode) for the APM process", - "units": "%", - "format": "0.[00]", - "hasCalculation": true, - "isDerivative": true + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.system.load.5", + "metricAgg": "max", + "label": "5m", + "title": "System Load", + "description": "Load average over the last 5 minutes", + "units": "", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": false + }, + "data": [ + [ + 1535723880000, + 1.72 + ], + [ + 1535723910000, + 1.6 + ], + [ + 1535723940000, + 1.45 + ] + ] }, - "data": [ - [1535723880000, null], - [1535723910000, 0.13333333333333333], - [1535723940000, 0.3] - ] - }], - "apm_os_load": [{ - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.system.load.15", + "metricAgg": "max", + "label": "15m", + "title": "System Load", + "description": "Load average over the last 15 minutes", + "units": "", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": false + }, + "data": [ + [ + 1535723880000, + 2.5 + ], + [ + 1535723910000, + 2.43 + ], + [ + 1535723940000, + 2.35 + ] + ] + } + ], + "apm_memory": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.beat.memstats.memory_alloc", + "metricAgg": "max", + "label": "Allocated Memory", + "title": "Memory", + "description": "Allocated memory", + "units": "B", + "format": "0,0.0 b", + "hasCalculation": false, + "isDerivative": false + }, + "data": [ + [ + 1535723880000, + 4421336 + ], + [ + 1535723910000, + 3888048 + ], + [ + 1535723940000, + 3087640 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.system.load.1", - "metricAgg": "max", - "label": "1m", - "title": "System Load", - "description": "Load average over the last 1 minute", - "units": "", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": false + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.beat.memstats.rss", + "metricAgg": "max", + "label": "Process Total", + "title": "Memory", + "description": "Resident set size of memory reserved by the APM service from the OS", + "units": "B", + "format": "0,0.0 b", + "hasCalculation": false, + "isDerivative": false + }, + "data": [ + [ + 1535723880000, + 10260480 + ], + [ + 1535723910000, + 11456512 + ], + [ + 1535723940000, + 12095488 + ] + ] }, - "data": [ - [1535723880000, 1.37], - [1535723910000, 1.01], - [1535723940000, 0.61] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.beat.memstats.gc_next", + "metricAgg": "max", + "label": "GC Next", + "title": "Memory", + "description": "Limit of allocated memory at which garbage collection will occur", + "units": "B", + "format": "0,0.0 b", + "hasCalculation": false, + "isDerivative": false + }, + "data": [ + [ + 1535723880000, + 4996912 + ], + [ + 1535723910000, + 4996912 + ], + [ + 1535723940000, + 4886176 + ] + ] + } + ], + "apm_output_events_rate_success": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.libbeat.output.events.total", + "metricAgg": "max", + "label": "Total", + "title": "Output Events Rate", + "description": "Events processed by the output (including retries)", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 6 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.system.load.5", - "metricAgg": "max", - "label": "5m", - "title": "System Load", - "description": "Load average over the last 5 minutes", - "units": "", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": false + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.libbeat.output.events.active", + "metricAgg": "max", + "label": "Active", + "title": "Output Active Events Rate", + "description": "Events processed by the output (including retries)", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, 1.72], - [1535723910000, 1.6], - [1535723940000, 1.45] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.libbeat.output.events.acked", + "metricAgg": "max", + "label": "Acked", + "title": "Output Acked Events Rate", + "description": "Events processed by the output (including retries)", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 6 + ], + [ + 1535723940000, + 0 + ] + ] + } + ], + "apm_output_events_rate_failure": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.libbeat.output.events.failed", + "metricAgg": "max", + "label": "Failed", + "title": "Output Failed Events Rate", + "description": "Events processed by the output (including retries)", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.system.load.15", - "metricAgg": "max", - "label": "15m", - "title": "System Load", - "description": "Load average over the last 15 minutes", - "units": "", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": false + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.libbeat.output.events.dropped", + "metricAgg": "max", + "label": "Dropped", + "title": "Output Dropped Events Rate", + "description": "Events processed by the output (including retries)", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] + } + ], + "apm_server_responses_valid": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.count", + "metricAgg": "max", + "label": "Total", + "title": "Response Count Intake API", + "description": "HTTP Requests responded to by server", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 42 + ], + [ + 1535723940000, + 42 + ] + ] }, - "data": [ - [1535723880000, 2.5], - [1535723910000, 2.43], - [1535723940000, 2.35] - ] - }], - "apm_memory": [{ - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.valid.ok", + "metricAgg": "max", + "label": "Ok", + "title": "Ok", + "description": "200 OK response count", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 40 + ], + [ + 1535723940000, + 42 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.beat.memstats.memory_alloc", - "metricAgg": "max", - "label": "Allocated Memory", - "title": "Memory", - "description": "Allocated memory", - "units": "B", - "format": "0,0.0 b", - "hasCalculation": false, - "isDerivative": false + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.valid.accepted", + "metricAgg": "max", + "label": "Accepted", + "title": "Accepted", + "description": "HTTP Requests successfully reporting new events", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 2 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, 4421336], - [1535723910000, 3888048], - [1535723940000, 3087640] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.count", + "metricAgg": "max", + "label": "Errors", + "title": "Errors", + "description": "Errors", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] + } + ], + "apm_acm_responses_valid": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.response.count", + "metricAgg": "max", + "label": "Total", + "title": "Response Count Agent Configuration Management", + "description": "HTTP Requests responded to by server", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.beat.memstats.rss", - "metricAgg": "max", - "label": "Process Total", - "title": "Memory", - "description": "Resident set size of memory reserved by the APM service from the OS", - "units": "B", - "format": "0,0.0 b", - "hasCalculation": false, - "isDerivative": false + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.response.valid.notmodified", + "metricAgg": "max", + "label": "Not modified", + "title": "Not modified", + "description": "Not modified", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, 10260480], - [1535723910000, 11456512], - [1535723940000, 12095488] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.response.valid.ok", + "metricAgg": "max", + "label": "Ok", + "title": "Ok", + "description": "200 OK response count", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.beat.memstats.gc_next", - "metricAgg": "max", - "label": "GC Next", - "title": "Memory", - "description": "Limit of allocated memory at which garbage collection will occur", - "units": "B", - "format": "0,0.0 b", - "hasCalculation": false, - "isDerivative": false + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.response.errors.count", + "metricAgg": "max", + "label": "Errors", + "title": "Errors", + "description": "HTTP Errors", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] + } + ], + "apm_server_responses_errors": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.toolarge", + "metricAgg": "max", + "label": "Too large", + "title": "Response Errors Intake API", + "description": "HTTP Requests rejected due to excessive payload size", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, 4996912], - [1535723910000, 4996912], - [1535723940000, 4886176] - ] - }], - "apm_output_events_rate_success": [{ - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.validate", + "metricAgg": "max", + "label": "Validate", + "title": "Validate", + "description": "HTTP Requests rejected due to payload validation error", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.libbeat.output.events.total", - "metricAgg": "max", - "label": "Total", - "title": "Output Events Rate", - "description": "Events processed by the output (including retries)", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.method", + "metricAgg": "max", + "label": "Method", + "title": "Method", + "description": "HTTP Requests rejected due to incorrect HTTP method", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, null], - [1535723910000, 6], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.unauthorized", + "metricAgg": "max", + "label": "Unauthorized", + "title": "Unauthorized", + "description": "HTTP Requests rejected due to invalid secret token", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.libbeat.output.events.active", - "metricAgg": "max", - "label": "Active", - "title": "Output Active Events Rate", - "description": "Events processed by the output (including retries)", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.ratelimit", + "metricAgg": "max", + "label": "Rate limit", + "title": "Rate limit", + "description": "HTTP Requests rejected to due excessive rate limit", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.queue", + "metricAgg": "max", + "label": "Queue", + "title": "Queue", + "description": "HTTP Requests rejected to due internal queue filling up", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.libbeat.output.events.acked", - "metricAgg": "max", - "label": "Acked", - "title": "Output Acked Events Rate", - "description": "Events processed by the output (including retries)", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.decode", + "metricAgg": "max", + "label": "Decode", + "title": "Decode", + "description": "HTTP Requests rejected to due decoding errors - invalid json, incorrect data type for entity", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, null], - [1535723910000, 6], - [1535723940000, 0] - ] - }], - "apm_output_events_rate_failure": [{ - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.forbidden", + "metricAgg": "max", + "label": "Forbidden", + "title": "Forbidden", + "description": "Forbidden HTTP Requests rejected - CORS violation, disabled enpoint", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.libbeat.output.events.failed", - "metricAgg": "max", - "label": "Failed", - "title": "Output Failed Events Rate", - "description": "Events processed by the output (including retries)", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.concurrency", + "metricAgg": "max", + "label": "Concurrency", + "title": "Concurrency", + "description": "HTTP Requests rejected due to overall concurrency limit breach", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.closed", + "metricAgg": "max", + "label": "Closed", + "title": "Closed", + "description": "HTTP Requests rejected during server shutdown", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.libbeat.output.events.dropped", - "metricAgg": "max", - "label": "Dropped", - "title": "Output Dropped Events Rate", - "description": "Events processed by the output (including retries)", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.response.errors.internal", + "metricAgg": "max", + "label": "Internal", + "title": "Internal", + "description": "HTTP Requests rejected due to a miscellaneous internal error", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] + } + ], + "apm_acm_responses_errors": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.response.errors.forbidden", + "metricAgg": "max", + "label": "Forbidden", + "title": "Response Errors Agent Configuration Management", + "description": "Forbidden HTTP Requests rejected - CORS violation, disabled enpoint", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }], - "apm_responses_valid": [{ - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.response.errors.forbidden", + "metricAgg": "max", + "label": "Unauthorized", + "title": "Unauthorized", + "description": "Forbidden HTTP Requests rejected - CORS violation, disabled enpoint", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.count", - "metricAgg": "max", - "label": "Total", - "title": "Response Count Intake API", - "description": "HTTP Requests responded to by server", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.response.errors.unavailable", + "metricAgg": "max", + "label": "Unavailable", + "title": "Unavailable", + "description": "Unavailable HTTP Responses", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, null], - [1535723910000, 42], - [1535723940000, 42] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.response.errors.method", + "metricAgg": "max", + "label": "Method", + "title": "Method", + "description": "HTTP Requests rejected due to incorrect HTTP method", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.valid.ok", - "metricAgg": "max", - "label": "Ok", - "title": "Ok", - "description": "200 OK response count", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.response.errors.invalidquery", + "metricAgg": "max", + "label": "Invalid Query", + "title": "Invalid Query", + "description": "HTTP invalid query", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] + } + ], + "apm_server_requests": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.server.request.count", + "metricAgg": "max", + "label": "Requested", + "title": "Requests Count Intake API", + "description": "HTTP Requests received by server", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 42 + ], + [ + 1535723940000, + 42 + ] + ] + } + ], + "apm_acm_requests": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.acm.request.count", + "metricAgg": "max", + "label": "Requested", + "title": "Requests Count Agent Configuration Management", + "description": "HTTP Requests received by ACM", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] + } + ], + "apm_transformations": [ + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.processor.transaction.transformations", + "metricAgg": "max", + "label": "Transaction", + "title": "Processed Events", + "description": "Transaction events processed", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 2 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, null], - [1535723910000, 40], - [1535723940000, 42] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.processor.span.transformations", + "metricAgg": "max", + "label": "Span", + "title": "Transformations", + "description": "Span events processed", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 4 + ], + [ + 1535723940000, + 0 + ] + ] }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.valid.accepted", - "metricAgg": "max", - "label": "Accepted", - "title": "Accepted", - "description": "HTTP Requests successfully reporting new events", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.processor.error.transformations", + "metricAgg": "max", + "label": "Error", + "title": "Transformations", + "description": "Error events processed", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] }, - "data": [ - [1535723880000, null], - [1535723910000, 2], - [1535723940000, 0] - ] - }], - "apm_responses_errors": [{ - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.toolarge", - "metricAgg": "max", - "label": "Too large", - "title": "Response Errors Intake API", - "description": "HTTP Requests rejected due to excessive payload size", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.validate", - "metricAgg": "max", - "label": "Validate", - "title": "Validate", - "description": "HTTP Requests rejected due to payload validation error", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.method", - "metricAgg": "max", - "label": "Method", - "title": "Method", - "description": "HTTP Requests rejected due to incorrect HTTP method", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.unauthorized", - "metricAgg": "max", - "label": "Unauthorized", - "title": "Unauthorized", - "description": "HTTP Requests rejected due to invalid secret token", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.ratelimit", - "metricAgg": "max", - "label": "Rate limit", - "title": "Rate limit", - "description": "HTTP Requests rejected to due excessive rate limit", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.queue", - "metricAgg": "max", - "label": "Queue", - "title": "Queue", - "description": "HTTP Requests rejected to due internal queue filling up", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.decode", - "metricAgg": "max", - "label": "Decode", - "title": "Decode", - "description": "HTTP Requests rejected to due decoding errors - invalid json, incorrect data type for entity", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.forbidden", - "metricAgg": "max", - "label": "Forbidden", - "title": "Forbidden", - "description": "Forbidden HTTP Requests rejected - CORS violation, disabled enpoint", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.concurrency", - "metricAgg": "max", - "label": "Concurrency", - "title": "Concurrency", - "description": "HTTP Requests rejected due to overall concurrency limit breach", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.closed", - "metricAgg": "max", - "label": "Closed", - "title": "Closed", - "description": "HTTP Requests rejected during server shutdown", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.response.errors.internal", - "metricAgg": "max", - "label": "Internal", - "title": "Internal", - "description": "HTTP Requests rejected due to a miscellaneous internal error", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }], - "apm_requests": [{ - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.server.request.count", - "metricAgg": "max", - "label": "Requested", - "title": "Request Count Intake API", - "description": "HTTP Requests received by server", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 42], - [1535723940000, 42] - ] - }], - "apm_transformations": [{ - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.processor.transaction.transformations", - "metricAgg": "max", - "label": "Transaction", - "title": "Processed Events", - "description": "Transaction events processed", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 2], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.processor.span.transformations", - "metricAgg": "max", - "label": "Span", - "title": "Transformations", - "description": "Span events processed", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 4], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.processor.error.transformations", - "metricAgg": "max", - "label": "Error", - "title": "Transformations", - "description": "Error events processed", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }, { - "bucket_size": "30 seconds", - "timeRange": { - "min": 1535720389104, - "max": 1535723989104 - }, - "metric": { - "app": "apm", - "field": "beats_stats.metrics.apm-server.processor.metric.transformations", - "metricAgg": "max", - "label": "Metric", - "title": "Transformations", - "description": "Metric events processed", - "units": "/m", - "format": "0,0.[00]", - "hasCalculation": false, - "isDerivative": true - }, - "data": [ - [1535723880000, null], - [1535723910000, 0], - [1535723940000, 0] - ] - }] + { + "bucket_size": "30 seconds", + "timeRange": { + "min": 1535720389104, + "max": 1535723989104 + }, + "metric": { + "app": "apm", + "field": "beats_stats.metrics.apm-server.processor.metric.transformations", + "metricAgg": "max", + "label": "Metric", + "title": "Transformations", + "description": "Metric events processed", + "units": "/m", + "format": "0,0.[00]", + "hasCalculation": false, + "isDerivative": true + }, + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + 0 + ], + [ + 1535723940000, + 0 + ] + ] + } + ] }, "apmSummary": { "uuid": "9b16f434-2092-4983-a401-80a2b61c79d6", diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_apm.json b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_apm.json index d8852f9555ac1..8d600d603bf72 100644 --- a/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_apm.json +++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/fixtures/detect_apm.json @@ -15,7 +15,7 @@ "totalUniquePartiallyMigratedCount": 0, "totalUniqueInternallyCollectedCount": 0, "detected": { - "mightExist": false + "mightExist": true }, "byUuid": {} }, @@ -25,7 +25,7 @@ "totalUniquePartiallyMigratedCount": 0, "totalUniqueInternallyCollectedCount": 0, "detected": { - "mightExist": false + "mightExist": true }, "byUuid": {} }, From fc7b79952538b48205376fcbebf48446b8edc854 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Mon, 23 Sep 2019 09:42:04 +0200 Subject: [PATCH 08/26] Correct naming in fixtures --- .../api_integration/apis/monitoring/apm/fixtures/cluster.json | 2 +- .../api_integration/apis/monitoring/apm/fixtures/instance.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json index 44f3328c61f30..e611ec5a443cd 100644 --- a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json +++ b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json @@ -1227,7 +1227,7 @@ "field": "beats_stats.metrics.apm-server.server.request.count", "metricAgg": "max", "label": "Requested", - "title": "Requests Count Intake API", + "title": "Request Count Intake API", "description": "HTTP Requests received by server", "units": "/m", "format": "0,0.[00]", diff --git a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json index 57ef73750d722..33824a20e0b9a 100644 --- a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json +++ b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json @@ -1218,7 +1218,7 @@ "field": "beats_stats.metrics.apm-server.server.request.count", "metricAgg": "max", "label": "Requested", - "title": "Requests Count Intake API", + "title": "Request Count Intake API", "description": "HTTP Requests received by server", "units": "/m", "format": "0,0.[00]", From 204e55337f99b37f2638b546393c1c92004ba3a3 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Tue, 24 Sep 2019 15:22:09 +0200 Subject: [PATCH 09/26] Change forbidden field to unathorized, per review feedback --- .../legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js index 3551ca0e09f70..196feb5645f5e 100644 --- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js +++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js @@ -416,7 +416,7 @@ export const metrics = { }) }), apm_acm_responses_errors_unauthorized: new ApmEventsRateClusterMetric({ - field: 'beats_stats.metrics.apm-server.acm.response.errors.forbidden', + field: 'beats_stats.metrics.apm-server.acm.response.errors.unauthorized', title: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmUnauthorizedTitle', { defaultMessage: 'Unauthorized' }), From 67228b669591bd9315dc1628f4d9b389d8eb54f6 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Tue, 24 Sep 2019 17:04:06 +0200 Subject: [PATCH 10/26] Change default message per review comment --- .../legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js index 196feb5645f5e..180f9675579ac 100644 --- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js +++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js @@ -270,7 +270,7 @@ export const metrics = { apm_server_responses_errors_toolarge: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.toolarge', title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrorsTitle', { - defaultMessage: 'Response Errors Intake API' + defaultMessage: 'Too large' }), label: i18n.translate('xpack.monitoring.metrics.apm.sever.responseErrors.tooLargeLabelTitle', { defaultMessage: 'Too large' From 6addd47ed4b38faad6f40b819cce8fbc764a349a Mon Sep 17 00:00:00 2001 From: Mike Place Date: Tue, 24 Sep 2019 17:16:37 +0200 Subject: [PATCH 11/26] Change title per review --- .../legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js index 180f9675579ac..a1c13a125a938 100644 --- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js +++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js @@ -360,7 +360,7 @@ export const metrics = { defaultMessage: 'Forbidden' }), description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.forbiddenDescription', { - defaultMessage: 'Forbidden HTTP Requests rejected - CORS violation, disabled enpoint' + defaultMessage: 'Forbidden HTTP Requests' }) }), apm_server_responses_errors_concurrency: new ApmEventsRateClusterMetric({ From c8d3de885b101ee462e8cfcfe66b9aa3ffafe5f3 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Tue, 24 Sep 2019 17:18:08 +0200 Subject: [PATCH 12/26] Review feedback --- .../plugins/monitoring/server/lib/metrics/apm/metrics.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js index a1c13a125a938..b7b808c096243 100644 --- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js +++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js @@ -406,13 +406,13 @@ export const metrics = { apm_acm_responses_errors_forbidden: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.errors.forbidden', title: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmForbiddenTitle', { - defaultMessage: 'Response Errors Agent Configuration Management' + defaultMessage: 'Forbidden HTTP requests' }), label: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmForbiddenLabel', { defaultMessage: 'Forbidden' }), description: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmForbiddenDescription', { - defaultMessage: 'Forbidden HTTP Requests rejected - CORS violation, disabled enpoint' + defaultMessage: 'Forbidden HTTP Requests rejected' }) }), apm_acm_responses_errors_unauthorized: new ApmEventsRateClusterMetric({ From d13f9d191871bc2dbdfe63111abca2e6bc4fad2b Mon Sep 17 00:00:00 2001 From: Mike Place Date: Tue, 24 Sep 2019 17:48:28 +0200 Subject: [PATCH 13/26] Change message to review comment --- .../legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js index b7b808c096243..a436470230d4e 100644 --- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js +++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js @@ -436,7 +436,7 @@ export const metrics = { defaultMessage: 'Unavailable' }), description: i18n.translate('xpack.monitoring.metrics.acm.apm.responseErrors.acmUnavailableDescription', { - defaultMessage: 'Unavailable HTTP Responses' + defaultMessage: 'Unavailable HTTP Responses. Possible misconfiguration, or unavailable/unsupported version of Kibana.' }) }), apm_acm_responses_errors_method: new ApmEventsRateClusterMetric({ From 7e6646c0b77560dcef6684626f99823c32460ad4 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Tue, 24 Sep 2019 17:55:17 +0200 Subject: [PATCH 14/26] Remove CORS mention per review --- .../legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js index a436470230d4e..f883d162896a6 100644 --- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js +++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js @@ -424,7 +424,7 @@ export const metrics = { defaultMessage: 'Unauthorized' }), description: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmForbiddenDescription', { - defaultMessage: 'Forbidden HTTP Requests rejected - CORS violation, disabled enpoint' + defaultMessage: 'Forbidden HTTP Requests rejected' }) }), apm_acm_responses_errors_unavailable: new ApmEventsRateClusterMetric({ From 4a9075ce03fb82cf3cc4ffb46064a367e9ab1cd5 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Tue, 24 Sep 2019 17:56:43 +0200 Subject: [PATCH 15/26] Set proper message --- .../legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js index f883d162896a6..ceec4695f9e1d 100644 --- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js +++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js @@ -424,7 +424,7 @@ export const metrics = { defaultMessage: 'Unauthorized' }), description: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmForbiddenDescription', { - defaultMessage: 'Forbidden HTTP Requests rejected' + defaultMessage: 'Unauthorized HTTP Requests rejected' }) }), apm_acm_responses_errors_unavailable: new ApmEventsRateClusterMetric({ From e269087924304ea1ceb51ec80abe50e5b8979e75 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Tue, 24 Sep 2019 18:02:16 +0200 Subject: [PATCH 16/26] review comment --- .../legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js index ceec4695f9e1d..21e421b906573 100644 --- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js +++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js @@ -150,7 +150,7 @@ export const metrics = { title: i18n.translate('xpack.monitoring.metrics.apm.acm.requestsTitle', { defaultMessage: 'Requests Count Agent Configuration Management', }), - label: i18n.translate('xpack.monitoring.metrics.apm.acm.requests.requestedLabel', { + label: i18n.translate('xpack.monitoring.metrics.apm.acm.request.requestedLabel', { defaultMessage: 'Requested' }), description: i18n.translate('xpack.monitoring.metrics.apm.acm.requests.requestedDescription', { From b7178a440f58c1eb7ea40109771da11690413aaa Mon Sep 17 00:00:00 2001 From: Mike Place Date: Tue, 24 Sep 2019 18:40:06 +0200 Subject: [PATCH 17/26] Review feedback --- .../monitoring/public/components/apm/overview/index.js | 4 ++-- .../server/routes/api/v1/apm/metric_set_overview.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x-pack/legacy/plugins/monitoring/public/components/apm/overview/index.js b/x-pack/legacy/plugins/monitoring/public/components/apm/overview/index.js index 6af153be454fa..c58ba3c4ea9f8 100644 --- a/x-pack/legacy/plugins/monitoring/public/components/apm/overview/index.js +++ b/x-pack/legacy/plugins/monitoring/public/components/apm/overview/index.js @@ -22,7 +22,7 @@ import { FormattedMessage } from '@kbn/i18n/react'; export function ApmOverview({ stats, metrics, ...props }) { const seriesToShow = [ metrics.apm_server_requests, - metrics.apm_server_responses_valid, + metrics.apm_server_responses, metrics.apm_server_responses_errors, metrics.apm_transformations, @@ -31,7 +31,7 @@ export function ApmOverview({ stats, metrics, ...props }) { metrics.apm_acm_requests, - metrics.apm_acm_responses_valid, + metrics.apm_acm_responses, metrics.apm_acm_responses_errors, metrics.apm_cpu, diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js index 9a5d82e6b12d7..f8c0b27be6fb6 100644 --- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js +++ b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js @@ -32,7 +32,7 @@ export const metricSet = [ 'apm_server_responses_valid_accepted', 'apm_server_responses_errors_count', ], - name: 'apm_server_responses_valid' + name: 'apm_server_responses' }, { keys: [ @@ -41,7 +41,7 @@ export const metricSet = [ 'apm_acm_responses_valid_ok', 'apm_acm_responses_errors_count' ], - name: 'apm_acm_responses_valid' + name: 'apm_acm_responses' }, { keys: [ From c67b509eeb3a092364d60a7e41bbacfc015d19ec Mon Sep 17 00:00:00 2001 From: Mike Place Date: Tue, 24 Sep 2019 18:51:18 +0200 Subject: [PATCH 18/26] Update snapshot --- .../__snapshots__/metrics.test.js.snap | 526 +++++++++++++++++- 1 file changed, 509 insertions(+), 17 deletions(-) diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap b/x-pack/legacy/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap index 7b401e5275e22..0f1b825b03f85 100644 --- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap +++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap @@ -2,6 +2,416 @@ exports[`Metrics should export metric objects that match a snapshot 1`] = ` Object { + "apm_acm_requests": ApmEventsRateClusterMetric { + "aggs": Object { + "beats_uuids": Object { + "aggs": Object { + "event_rate_per_beat": Object { + "max": Object { + "field": "beats_stats.metrics.apm-server.acm.request.count", + }, + }, + }, + "terms": Object { + "field": "beats_stats.beat.uuid", + "size": 10000, + }, + }, + "event_rate": Object { + "sum_bucket": Object { + "buckets_path": "beats_uuids>event_rate_per_beat", + "gap_policy": "skip", + }, + }, + "metric_deriv": Object { + "derivative": Object { + "buckets_path": "event_rate", + "gap_policy": "skip", + "unit": "1m", + }, + }, + }, + "app": "apm", + "derivative": true, + "description": "HTTP Requests received by ACM", + "field": "beats_stats.metrics.apm-server.acm.request.count", + "format": "0,0.[00]", + "label": "Requested", + "metricAgg": "max", + "timestampField": "beats_stats.timestamp", + "title": "Requests Count Agent Configuration Management", + "units": "/m", + "uuidField": "cluster_uuid", + }, + "apm_acm_responses_count": ApmEventsRateClusterMetric { + "aggs": Object { + "beats_uuids": Object { + "aggs": Object { + "event_rate_per_beat": Object { + "max": Object { + "field": "beats_stats.metrics.apm-server.acm.response.count", + }, + }, + }, + "terms": Object { + "field": "beats_stats.beat.uuid", + "size": 10000, + }, + }, + "event_rate": Object { + "sum_bucket": Object { + "buckets_path": "beats_uuids>event_rate_per_beat", + "gap_policy": "skip", + }, + }, + "metric_deriv": Object { + "derivative": Object { + "buckets_path": "event_rate", + "gap_policy": "skip", + "unit": "1m", + }, + }, + }, + "app": "apm", + "derivative": true, + "description": "HTTP Requests responded to by server", + "field": "beats_stats.metrics.apm-server.acm.response.count", + "format": "0,0.[00]", + "label": "Total", + "metricAgg": "max", + "timestampField": "beats_stats.timestamp", + "title": "Response Count Agent Configuration Management", + "units": "/m", + "uuidField": "cluster_uuid", + }, + "apm_acm_responses_errors_count": ApmEventsRateClusterMetric { + "aggs": Object { + "beats_uuids": Object { + "aggs": Object { + "event_rate_per_beat": Object { + "max": Object { + "field": "beats_stats.metrics.apm-server.acm.response.errors.count", + }, + }, + }, + "terms": Object { + "field": "beats_stats.beat.uuid", + "size": 10000, + }, + }, + "event_rate": Object { + "sum_bucket": Object { + "buckets_path": "beats_uuids>event_rate_per_beat", + "gap_policy": "skip", + }, + }, + "metric_deriv": Object { + "derivative": Object { + "buckets_path": "event_rate", + "gap_policy": "skip", + "unit": "1m", + }, + }, + }, + "app": "apm", + "derivative": true, + "description": "HTTP Errors", + "field": "beats_stats.metrics.apm-server.acm.response.errors.count", + "format": "0,0.[00]", + "label": "Errors", + "metricAgg": "max", + "timestampField": "beats_stats.timestamp", + "title": "Errors", + "units": "/m", + "uuidField": "cluster_uuid", + }, + "apm_acm_responses_errors_forbidden": ApmEventsRateClusterMetric { + "aggs": Object { + "beats_uuids": Object { + "aggs": Object { + "event_rate_per_beat": Object { + "max": Object { + "field": "beats_stats.metrics.apm-server.acm.response.errors.forbidden", + }, + }, + }, + "terms": Object { + "field": "beats_stats.beat.uuid", + "size": 10000, + }, + }, + "event_rate": Object { + "sum_bucket": Object { + "buckets_path": "beats_uuids>event_rate_per_beat", + "gap_policy": "skip", + }, + }, + "metric_deriv": Object { + "derivative": Object { + "buckets_path": "event_rate", + "gap_policy": "skip", + "unit": "1m", + }, + }, + }, + "app": "apm", + "derivative": true, + "description": "Forbidden HTTP Requests rejected", + "field": "beats_stats.metrics.apm-server.acm.response.errors.forbidden", + "format": "0,0.[00]", + "label": "Forbidden", + "metricAgg": "max", + "timestampField": "beats_stats.timestamp", + "title": "Forbidden HTTP requests", + "units": "/m", + "uuidField": "cluster_uuid", + }, + "apm_acm_responses_errors_invalid_query": ApmEventsRateClusterMetric { + "aggs": Object { + "beats_uuids": Object { + "aggs": Object { + "event_rate_per_beat": Object { + "max": Object { + "field": "beats_stats.metrics.apm-server.acm.response.errors.invalidquery", + }, + }, + }, + "terms": Object { + "field": "beats_stats.beat.uuid", + "size": 10000, + }, + }, + "event_rate": Object { + "sum_bucket": Object { + "buckets_path": "beats_uuids>event_rate_per_beat", + "gap_policy": "skip", + }, + }, + "metric_deriv": Object { + "derivative": Object { + "buckets_path": "event_rate", + "gap_policy": "skip", + "unit": "1m", + }, + }, + }, + "app": "apm", + "derivative": true, + "description": "HTTP invalid query", + "field": "beats_stats.metrics.apm-server.acm.response.errors.invalidquery", + "format": "0,0.[00]", + "label": "Invalid Query", + "metricAgg": "max", + "timestampField": "beats_stats.timestamp", + "title": "Invalid Query", + "units": "/m", + "uuidField": "cluster_uuid", + }, + "apm_acm_responses_errors_method": ApmEventsRateClusterMetric { + "aggs": Object { + "beats_uuids": Object { + "aggs": Object { + "event_rate_per_beat": Object { + "max": Object { + "field": "beats_stats.metrics.apm-server.acm.response.errors.method", + }, + }, + }, + "terms": Object { + "field": "beats_stats.beat.uuid", + "size": 10000, + }, + }, + "event_rate": Object { + "sum_bucket": Object { + "buckets_path": "beats_uuids>event_rate_per_beat", + "gap_policy": "skip", + }, + }, + "metric_deriv": Object { + "derivative": Object { + "buckets_path": "event_rate", + "gap_policy": "skip", + "unit": "1m", + }, + }, + }, + "app": "apm", + "derivative": true, + "description": "HTTP Requests rejected due to incorrect HTTP method", + "field": "beats_stats.metrics.apm-server.acm.response.errors.method", + "format": "0,0.[00]", + "label": "Method", + "metricAgg": "max", + "timestampField": "beats_stats.timestamp", + "title": "Method", + "units": "/m", + "uuidField": "cluster_uuid", + }, + "apm_acm_responses_errors_unauthorized": ApmEventsRateClusterMetric { + "aggs": Object { + "beats_uuids": Object { + "aggs": Object { + "event_rate_per_beat": Object { + "max": Object { + "field": "beats_stats.metrics.apm-server.acm.response.errors.unauthorized", + }, + }, + }, + "terms": Object { + "field": "beats_stats.beat.uuid", + "size": 10000, + }, + }, + "event_rate": Object { + "sum_bucket": Object { + "buckets_path": "beats_uuids>event_rate_per_beat", + "gap_policy": "skip", + }, + }, + "metric_deriv": Object { + "derivative": Object { + "buckets_path": "event_rate", + "gap_policy": "skip", + "unit": "1m", + }, + }, + }, + "app": "apm", + "derivative": true, + "description": "Unauthorized HTTP Requests rejected", + "field": "beats_stats.metrics.apm-server.acm.response.errors.unauthorized", + "format": "0,0.[00]", + "label": "Unauthorized", + "metricAgg": "max", + "timestampField": "beats_stats.timestamp", + "title": "Unauthorized", + "units": "/m", + "uuidField": "cluster_uuid", + }, + "apm_acm_responses_errors_unavailable": ApmEventsRateClusterMetric { + "aggs": Object { + "beats_uuids": Object { + "aggs": Object { + "event_rate_per_beat": Object { + "max": Object { + "field": "beats_stats.metrics.apm-server.acm.response.errors.unavailable", + }, + }, + }, + "terms": Object { + "field": "beats_stats.beat.uuid", + "size": 10000, + }, + }, + "event_rate": Object { + "sum_bucket": Object { + "buckets_path": "beats_uuids>event_rate_per_beat", + "gap_policy": "skip", + }, + }, + "metric_deriv": Object { + "derivative": Object { + "buckets_path": "event_rate", + "gap_policy": "skip", + "unit": "1m", + }, + }, + }, + "app": "apm", + "derivative": true, + "description": "Unavailable HTTP Responses. Possible misconfiguration, or unavailable/unsupported version of Kibana.", + "field": "beats_stats.metrics.apm-server.acm.response.errors.unavailable", + "format": "0,0.[00]", + "label": "Unavailable", + "metricAgg": "max", + "timestampField": "beats_stats.timestamp", + "title": "Unavailable", + "units": "/m", + "uuidField": "cluster_uuid", + }, + "apm_acm_responses_valid_notmodified": ApmEventsRateClusterMetric { + "aggs": Object { + "beats_uuids": Object { + "aggs": Object { + "event_rate_per_beat": Object { + "max": Object { + "field": "beats_stats.metrics.apm-server.acm.response.valid.notmodified", + }, + }, + }, + "terms": Object { + "field": "beats_stats.beat.uuid", + "size": 10000, + }, + }, + "event_rate": Object { + "sum_bucket": Object { + "buckets_path": "beats_uuids>event_rate_per_beat", + "gap_policy": "skip", + }, + }, + "metric_deriv": Object { + "derivative": Object { + "buckets_path": "event_rate", + "gap_policy": "skip", + "unit": "1m", + }, + }, + }, + "app": "apm", + "derivative": true, + "description": "Not modified", + "field": "beats_stats.metrics.apm-server.acm.response.valid.notmodified", + "format": "0,0.[00]", + "label": "Not modified", + "metricAgg": "max", + "timestampField": "beats_stats.timestamp", + "title": "Not modified", + "units": "/m", + "uuidField": "cluster_uuid", + }, + "apm_acm_responses_valid_ok": ApmEventsRateClusterMetric { + "aggs": Object { + "beats_uuids": Object { + "aggs": Object { + "event_rate_per_beat": Object { + "max": Object { + "field": "beats_stats.metrics.apm-server.acm.response.valid.ok", + }, + }, + }, + "terms": Object { + "field": "beats_stats.beat.uuid", + "size": 10000, + }, + }, + "event_rate": Object { + "sum_bucket": Object { + "buckets_path": "beats_uuids>event_rate_per_beat", + "gap_policy": "skip", + }, + }, + "metric_deriv": Object { + "derivative": Object { + "buckets_path": "event_rate", + "gap_policy": "skip", + "unit": "1m", + }, + }, + }, + "app": "apm", + "derivative": true, + "description": "200 OK response count", + "field": "beats_stats.metrics.apm-server.acm.response.valid.ok", + "format": "0,0.[00]", + "label": "Ok", + "metricAgg": "max", + "timestampField": "beats_stats.timestamp", + "title": "Ok", + "units": "/m", + "uuidField": "cluster_uuid", + }, "apm_cpu_total": ApmCpuUtilizationMetric { "app": "apm", "calculation": [Function], @@ -424,7 +834,48 @@ Object { "units": "/m", "uuidField": "cluster_uuid", }, - "apm_requests": ApmEventsRateClusterMetric { + "apm_responses_valid_accepted_acm": ApmEventsRateClusterMetric { + "aggs": Object { + "beats_uuids": Object { + "aggs": Object { + "event_rate_per_beat": Object { + "max": Object { + "field": "beats_stats.metrics.apm-server.acm.response.valid.accepted", + }, + }, + }, + "terms": Object { + "field": "beats_stats.beat.uuid", + "size": 10000, + }, + }, + "event_rate": Object { + "sum_bucket": Object { + "buckets_path": "beats_uuids>event_rate_per_beat", + "gap_policy": "skip", + }, + }, + "metric_deriv": Object { + "derivative": Object { + "buckets_path": "event_rate", + "gap_policy": "skip", + "unit": "1m", + }, + }, + }, + "app": "apm", + "derivative": true, + "description": "HTTP Requests successfully reporting new events", + "field": "beats_stats.metrics.apm-server.acm.response.valid.accepted", + "format": "0,0.[00]", + "label": "Accepted", + "metricAgg": "max", + "timestampField": "beats_stats.timestamp", + "title": "Accepted", + "units": "/m", + "uuidField": "cluster_uuid", + }, + "apm_server_requests": ApmEventsRateClusterMetric { "aggs": Object { "beats_uuids": Object { "aggs": Object { @@ -465,7 +916,7 @@ Object { "units": "/m", "uuidField": "cluster_uuid", }, - "apm_responses_count": ApmEventsRateClusterMetric { + "apm_server_responses_count": ApmEventsRateClusterMetric { "aggs": Object { "beats_uuids": Object { "aggs": Object { @@ -506,7 +957,7 @@ Object { "units": "/m", "uuidField": "cluster_uuid", }, - "apm_responses_errors_closed": ApmEventsRateClusterMetric { + "apm_server_responses_errors_closed": ApmEventsRateClusterMetric { "aggs": Object { "beats_uuids": Object { "aggs": Object { @@ -547,7 +998,7 @@ Object { "units": "/m", "uuidField": "cluster_uuid", }, - "apm_responses_errors_concurrency": ApmEventsRateClusterMetric { + "apm_server_responses_errors_concurrency": ApmEventsRateClusterMetric { "aggs": Object { "beats_uuids": Object { "aggs": Object { @@ -588,7 +1039,48 @@ Object { "units": "/m", "uuidField": "cluster_uuid", }, - "apm_responses_errors_decode": ApmEventsRateClusterMetric { + "apm_server_responses_errors_count": ApmEventsRateClusterMetric { + "aggs": Object { + "beats_uuids": Object { + "aggs": Object { + "event_rate_per_beat": Object { + "max": Object { + "field": "beats_stats.metrics.apm-server.server.response.errors.count", + }, + }, + }, + "terms": Object { + "field": "beats_stats.beat.uuid", + "size": 10000, + }, + }, + "event_rate": Object { + "sum_bucket": Object { + "buckets_path": "beats_uuids>event_rate_per_beat", + "gap_policy": "skip", + }, + }, + "metric_deriv": Object { + "derivative": Object { + "buckets_path": "event_rate", + "gap_policy": "skip", + "unit": "1m", + }, + }, + }, + "app": "apm", + "derivative": true, + "description": "Errors", + "field": "beats_stats.metrics.apm-server.server.response.errors.count", + "format": "0,0.[00]", + "label": "Errors", + "metricAgg": "max", + "timestampField": "beats_stats.timestamp", + "title": "Errors", + "units": "/m", + "uuidField": "cluster_uuid", + }, + "apm_server_responses_errors_decode": ApmEventsRateClusterMetric { "aggs": Object { "beats_uuids": Object { "aggs": Object { @@ -629,7 +1121,7 @@ Object { "units": "/m", "uuidField": "cluster_uuid", }, - "apm_responses_errors_forbidden": ApmEventsRateClusterMetric { + "apm_server_responses_errors_forbidden": ApmEventsRateClusterMetric { "aggs": Object { "beats_uuids": Object { "aggs": Object { @@ -660,7 +1152,7 @@ Object { }, "app": "apm", "derivative": true, - "description": "Forbidden HTTP Requests rejected - CORS violation, disabled enpoint", + "description": "Forbidden HTTP Requests", "field": "beats_stats.metrics.apm-server.server.response.errors.forbidden", "format": "0,0.[00]", "label": "Forbidden", @@ -670,7 +1162,7 @@ Object { "units": "/m", "uuidField": "cluster_uuid", }, - "apm_responses_errors_internal": ApmEventsRateClusterMetric { + "apm_server_responses_errors_internal": ApmEventsRateClusterMetric { "aggs": Object { "beats_uuids": Object { "aggs": Object { @@ -711,7 +1203,7 @@ Object { "units": "/m", "uuidField": "cluster_uuid", }, - "apm_responses_errors_method": ApmEventsRateClusterMetric { + "apm_server_responses_errors_method": ApmEventsRateClusterMetric { "aggs": Object { "beats_uuids": Object { "aggs": Object { @@ -752,7 +1244,7 @@ Object { "units": "/m", "uuidField": "cluster_uuid", }, - "apm_responses_errors_queue": ApmEventsRateClusterMetric { + "apm_server_responses_errors_queue": ApmEventsRateClusterMetric { "aggs": Object { "beats_uuids": Object { "aggs": Object { @@ -793,7 +1285,7 @@ Object { "units": "/m", "uuidField": "cluster_uuid", }, - "apm_responses_errors_ratelimit": ApmEventsRateClusterMetric { + "apm_server_responses_errors_ratelimit": ApmEventsRateClusterMetric { "aggs": Object { "beats_uuids": Object { "aggs": Object { @@ -834,7 +1326,7 @@ Object { "units": "/m", "uuidField": "cluster_uuid", }, - "apm_responses_errors_toolarge": ApmEventsRateClusterMetric { + "apm_server_responses_errors_toolarge": ApmEventsRateClusterMetric { "aggs": Object { "beats_uuids": Object { "aggs": Object { @@ -871,11 +1363,11 @@ Object { "label": "Too large", "metricAgg": "max", "timestampField": "beats_stats.timestamp", - "title": "Response Errors Intake API", + "title": "Too large", "units": "/m", "uuidField": "cluster_uuid", }, - "apm_responses_errors_unauthorized": ApmEventsRateClusterMetric { + "apm_server_responses_errors_unauthorized": ApmEventsRateClusterMetric { "aggs": Object { "beats_uuids": Object { "aggs": Object { @@ -916,7 +1408,7 @@ Object { "units": "/m", "uuidField": "cluster_uuid", }, - "apm_responses_errors_validate": ApmEventsRateClusterMetric { + "apm_server_responses_errors_validate": ApmEventsRateClusterMetric { "aggs": Object { "beats_uuids": Object { "aggs": Object { @@ -957,7 +1449,7 @@ Object { "units": "/m", "uuidField": "cluster_uuid", }, - "apm_responses_valid_accepted": ApmEventsRateClusterMetric { + "apm_server_responses_valid_accepted": ApmEventsRateClusterMetric { "aggs": Object { "beats_uuids": Object { "aggs": Object { @@ -998,7 +1490,7 @@ Object { "units": "/m", "uuidField": "cluster_uuid", }, - "apm_responses_valid_ok": ApmEventsRateClusterMetric { + "apm_server_responses_valid_ok": ApmEventsRateClusterMetric { "aggs": Object { "beats_uuids": Object { "aggs": Object { From fa726c85db2b317ba7688d8daac48fadd9574bfa Mon Sep 17 00:00:00 2001 From: Mike Place Date: Tue, 24 Sep 2019 19:43:20 +0200 Subject: [PATCH 19/26] Correct duplicate description --- .../legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js index 21e421b906573..9e27b7ef1db8c 100644 --- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js +++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js @@ -423,7 +423,7 @@ export const metrics = { label: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmUnauthorizedLabel', { defaultMessage: 'Unauthorized' }), - description: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmForbiddenDescription', { + description: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmUnauthorizedDescription', { defaultMessage: 'Unauthorized HTTP Requests rejected' }) }), From a34efe46dbb69bd2472a343cd0e8629e9585b9bf Mon Sep 17 00:00:00 2001 From: Mike Place Date: Wed, 25 Sep 2019 13:14:58 +0200 Subject: [PATCH 20/26] Adjust fixture --- .../apis/monitoring/apm/fixtures/cluster.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json index e611ec5a443cd..a195b4a839217 100644 --- a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json +++ b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json @@ -415,7 +415,7 @@ ] } ], - "apm_server_responses_valid": [ + "apm_server_responses": [ { "bucket_size": "30 seconds", "timeRange": { @@ -549,7 +549,7 @@ ] } ], - "apm_acm_responses_valid": [ + "apm_acm_responses": [ { "bucket_size": "30 seconds", "timeRange": { @@ -695,7 +695,7 @@ "field": "beats_stats.metrics.apm-server.server.response.errors.toolarge", "metricAgg": "max", "label": "Too large", - "title": "Response Errors Intake API", + "title": "Too large", "description": "HTTP Requests rejected due to excessive payload size", "units": "/m", "format": "0,0.[00]", @@ -927,7 +927,7 @@ "metricAgg": "max", "label": "Forbidden", "title": "Forbidden", - "description": "Forbidden HTTP Requests rejected - CORS violation, disabled enpoint", + "description": "Forbidden HTTP Requests", "units": "/m", "format": "0,0.[00]", "hasCalculation": false, @@ -1060,8 +1060,8 @@ "field": "beats_stats.metrics.apm-server.acm.response.errors.forbidden", "metricAgg": "max", "label": "Forbidden", - "title": "Response Errors Agent Configuration Management", - "description": "Forbidden HTTP Requests rejected - CORS violation, disabled enpoint", + "title": "Forbidden HTTP requests", + "description": "Forbidden HTTP Requests rejected", "units": "/m", "format": "0,0.[00]", "hasCalculation": false, @@ -1090,11 +1090,11 @@ }, "metric": { "app": "apm", - "field": "beats_stats.metrics.apm-server.acm.response.errors.forbidden", + "field": "beats_stats.metrics.apm-server.acm.response.errors.unauthorized", "metricAgg": "max", "label": "Unauthorized", "title": "Unauthorized", - "description": "Forbidden HTTP Requests rejected - CORS violation, disabled enpoint", + "description": "Unauthorized HTTP Requests rejected", "units": "/m", "format": "0,0.[00]", "hasCalculation": false, @@ -1127,7 +1127,7 @@ "metricAgg": "max", "label": "Unavailable", "title": "Unavailable", - "description": "Unavailable HTTP Responses", + "description": "Unavailable HTTP Responses. Possible misconfiguration, or unavailable/unsupported version of Kibana.", "units": "/m", "format": "0,0.[00]", "hasCalculation": false, From 207824423ca82cbc9e15aba9e68c0e9f993ae706 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Thu, 26 Sep 2019 15:42:43 +0200 Subject: [PATCH 21/26] Update instance fixture --- .../apis/monitoring/apm/fixtures/instance.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json index 33824a20e0b9a..54d6069352279 100644 --- a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json +++ b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json @@ -406,7 +406,7 @@ ] } ], - "apm_server_responses_valid": [ + "apm_server_responses": [ { "bucket_size": "30 seconds", "timeRange": { @@ -540,7 +540,7 @@ ] } ], - "apm_acm_responses_valid": [ + "apm_acm_responses": [ { "bucket_size": "30 seconds", "timeRange": { @@ -686,7 +686,7 @@ "field": "beats_stats.metrics.apm-server.server.response.errors.toolarge", "metricAgg": "max", "label": "Too large", - "title": "Response Errors Intake API", + "title": "Too large", "description": "HTTP Requests rejected due to excessive payload size", "units": "/m", "format": "0,0.[00]", @@ -918,7 +918,7 @@ "metricAgg": "max", "label": "Forbidden", "title": "Forbidden", - "description": "Forbidden HTTP Requests rejected - CORS violation, disabled enpoint", + "description": "Forbidden HTTP Requests", "units": "/m", "format": "0,0.[00]", "hasCalculation": false, @@ -1051,8 +1051,8 @@ "field": "beats_stats.metrics.apm-server.acm.response.errors.forbidden", "metricAgg": "max", "label": "Forbidden", - "title": "Response Errors Agent Configuration Management", - "description": "Forbidden HTTP Requests rejected - CORS violation, disabled enpoint", + "title": "Forbidden HTTP requests", + "description": "Forbidden HTTP Requests rejected", "units": "/m", "format": "0,0.[00]", "hasCalculation": false, @@ -1081,11 +1081,11 @@ }, "metric": { "app": "apm", - "field": "beats_stats.metrics.apm-server.acm.response.errors.forbidden", + "field": "beats_stats.metrics.apm-server.acm.response.errors.unauthorized", "metricAgg": "max", "label": "Unauthorized", "title": "Unauthorized", - "description": "Forbidden HTTP Requests rejected - CORS violation, disabled enpoint", + "description": "Unauthorized HTTP Requests rejected", "units": "/m", "format": "0,0.[00]", "hasCalculation": false, @@ -1118,7 +1118,7 @@ "metricAgg": "max", "label": "Unavailable", "title": "Unavailable", - "description": "Unavailable HTTP Responses", + "description": "Unavailable HTTP Responses. Possible misconfiguration, or unavailable/unsupported version of Kibana.", "units": "/m", "format": "0,0.[00]", "hasCalculation": false, From cf9df91551a5ae86be71243d898d968c67880f8e Mon Sep 17 00:00:00 2001 From: Mike Place Date: Tue, 1 Oct 2019 15:52:24 +0200 Subject: [PATCH 22/26] Review feedback --- config/kibana.yml | 4 ++-- .../lib/metrics/__test__/__snapshots__/metrics.test.js.snap | 6 +++--- .../plugins/monitoring/server/lib/metrics/apm/metrics.js | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/kibana.yml b/config/kibana.yml index 0780841ca057e..0f33370f5605c 100644 --- a/config/kibana.yml +++ b/config/kibana.yml @@ -40,8 +40,8 @@ # the username and password that the Kibana server uses to perform maintenance on the Kibana # index at startup. Your Kibana users still need to authenticate with Elasticsearch, which # is proxied through the Kibana server. -#elasticsearch.username: "kibana" -#elasticsearch.password: "pass" +elasticsearch.username: "elastic" +elasticsearch.password: "changeme" # Enables SSL and paths to the PEM-format SSL certificate and SSL key files, respectively. # These settings enable SSL for outgoing requests from the Kibana server to the browser. diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap b/x-pack/legacy/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap index 0f1b825b03f85..995ba760c1f8c 100644 --- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap +++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap @@ -39,7 +39,7 @@ Object { "label": "Requested", "metricAgg": "max", "timestampField": "beats_stats.timestamp", - "title": "Requests Count Agent Configuration Management", + "title": "Request Count Agent Configuration Management", "units": "/m", "uuidField": "cluster_uuid", }, @@ -162,7 +162,7 @@ Object { "label": "Forbidden", "metricAgg": "max", "timestampField": "beats_stats.timestamp", - "title": "Forbidden HTTP requests", + "title": "Response Errors Agent Configuration Management", "units": "/m", "uuidField": "cluster_uuid", }, @@ -1363,7 +1363,7 @@ Object { "label": "Too large", "metricAgg": "max", "timestampField": "beats_stats.timestamp", - "title": "Too large", + "title": "Response Errors Intake API", "units": "/m", "uuidField": "cluster_uuid", }, diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js index 9e27b7ef1db8c..55b295df8f470 100644 --- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js +++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js @@ -148,7 +148,7 @@ export const metrics = { apm_acm_requests: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.request.count', title: i18n.translate('xpack.monitoring.metrics.apm.acm.requestsTitle', { - defaultMessage: 'Requests Count Agent Configuration Management', + defaultMessage: 'Request Count Agent Configuration Management', }), label: i18n.translate('xpack.monitoring.metrics.apm.acm.request.requestedLabel', { defaultMessage: 'Requested' @@ -270,7 +270,7 @@ export const metrics = { apm_server_responses_errors_toolarge: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.toolarge', title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrorsTitle', { - defaultMessage: 'Too large' + defaultMessage: 'Response Errors Intake API' }), label: i18n.translate('xpack.monitoring.metrics.apm.sever.responseErrors.tooLargeLabelTitle', { defaultMessage: 'Too large' @@ -406,7 +406,7 @@ export const metrics = { apm_acm_responses_errors_forbidden: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.errors.forbidden', title: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmForbiddenTitle', { - defaultMessage: 'Forbidden HTTP requests' + defaultMessage: 'Response Errors Agent Configuration Management' }), label: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmForbiddenLabel', { defaultMessage: 'Forbidden' From a8020e6de9c7a48cab5e58c5abd06626cbea2cc3 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Wed, 2 Oct 2019 11:08:59 +0200 Subject: [PATCH 23/26] Fix broken graphs --- .../monitoring/public/components/apm/instance/instance.js | 4 ++-- .../server/routes/api/v1/apm/metric_set_instance.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x-pack/legacy/plugins/monitoring/public/components/apm/instance/instance.js b/x-pack/legacy/plugins/monitoring/public/components/apm/instance/instance.js index 371beb1bccb29..ec713a5b385df 100644 --- a/x-pack/legacy/plugins/monitoring/public/components/apm/instance/instance.js +++ b/x-pack/legacy/plugins/monitoring/public/components/apm/instance/instance.js @@ -22,7 +22,7 @@ import { FormattedMessage } from '@kbn/i18n/react'; export function ApmServerInstance({ summary, metrics, ...props }) { const seriesToShow = [ metrics.apm_server_requests, - metrics.apm_server_responses_valid, + metrics.apm_server_responses, metrics.apm_server_responses_errors, metrics.apm_transformations, @@ -31,7 +31,7 @@ export function ApmServerInstance({ summary, metrics, ...props }) { metrics.apm_acm_requests, - metrics.apm_acm_responses_valid, + metrics.apm_acm_responses, metrics.apm_acm_responses_errors, metrics.apm_cpu, diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js index 77e57f562d90a..13d3e8757221f 100644 --- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js +++ b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js @@ -31,7 +31,7 @@ export const metricSet = [ 'apm_server_responses_valid_ok', 'apm_server_responses_valid_accepted' ], - name: 'apm_server_responses_valid' + name: 'apm_server_responses' }, { keys: [ From f0283b3c8a2aaf7ba4a981750824f73396305f78 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Wed, 2 Oct 2019 13:57:35 +0200 Subject: [PATCH 24/26] Update test fixtures --- .../apis/monitoring/apm/fixtures/cluster.json | 6 +++--- .../apis/monitoring/apm/fixtures/instance.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json index a195b4a839217..6eaeff51e5a9d 100644 --- a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json +++ b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json @@ -695,7 +695,7 @@ "field": "beats_stats.metrics.apm-server.server.response.errors.toolarge", "metricAgg": "max", "label": "Too large", - "title": "Too large", + "title": "Response Errors Intake API", "description": "HTTP Requests rejected due to excessive payload size", "units": "/m", "format": "0,0.[00]", @@ -1060,7 +1060,7 @@ "field": "beats_stats.metrics.apm-server.acm.response.errors.forbidden", "metricAgg": "max", "label": "Forbidden", - "title": "Forbidden HTTP requests", + "title": "Response Errors Agent Configuration Management", "description": "Forbidden HTTP Requests rejected", "units": "/m", "format": "0,0.[00]", @@ -1262,7 +1262,7 @@ "field": "beats_stats.metrics.apm-server.acm.request.count", "metricAgg": "max", "label": "Requested", - "title": "Requests Count Agent Configuration Management", + "title": "Request Count Agent Configuration Management", "description": "HTTP Requests received by ACM", "units": "/m", "format": "0,0.[00]", diff --git a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json index 54d6069352279..2bad9b611cb4a 100644 --- a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json +++ b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json @@ -686,7 +686,7 @@ "field": "beats_stats.metrics.apm-server.server.response.errors.toolarge", "metricAgg": "max", "label": "Too large", - "title": "Too large", + "title": "Response Errors Intake API", "description": "HTTP Requests rejected due to excessive payload size", "units": "/m", "format": "0,0.[00]", @@ -1051,7 +1051,7 @@ "field": "beats_stats.metrics.apm-server.acm.response.errors.forbidden", "metricAgg": "max", "label": "Forbidden", - "title": "Forbidden HTTP requests", + "title": "Response Errors Agent Configuration Management", "description": "Forbidden HTTP Requests rejected", "units": "/m", "format": "0,0.[00]", @@ -1253,7 +1253,7 @@ "field": "beats_stats.metrics.apm-server.acm.request.count", "metricAgg": "max", "label": "Requested", - "title": "Requests Count Agent Configuration Management", + "title": "Request Count Agent Configuration Management", "description": "HTTP Requests received by ACM", "units": "/m", "format": "0,0.[00]", From 010d6dff712541736cc651a1f21e8e4e32250f22 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Fri, 4 Oct 2019 11:35:09 +0200 Subject: [PATCH 25/26] Correct mistaken commit to kibana.yml --- config/kibana.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/kibana.yml b/config/kibana.yml index 0f33370f5605c..0780841ca057e 100644 --- a/config/kibana.yml +++ b/config/kibana.yml @@ -40,8 +40,8 @@ # the username and password that the Kibana server uses to perform maintenance on the Kibana # index at startup. Your Kibana users still need to authenticate with Elasticsearch, which # is proxied through the Kibana server. -elasticsearch.username: "elastic" -elasticsearch.password: "changeme" +#elasticsearch.username: "kibana" +#elasticsearch.password: "pass" # Enables SSL and paths to the PEM-format SSL certificate and SSL key files, respectively. # These settings enable SSL for outgoing requests from the Kibana server to the browser. From 53d211666c6551dd106c893380fedbde004f77a5 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Fri, 17 Jan 2020 10:54:45 +0100 Subject: [PATCH 26/26] Lint fixes --- .../server/lib/metrics/apm/metrics.js | 305 +++++++++++------- .../routes/api/v1/apm/metric_set_instance.js | 16 +- .../routes/api/v1/apm/metric_set_overview.js | 22 +- 3 files changed, 197 insertions(+), 146 deletions(-) diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js index 55b295df8f470..883bfccd63405 100644 --- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js +++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js @@ -139,11 +139,14 @@ export const metrics = { defaultMessage: 'Request Count Intake API', }), label: i18n.translate('xpack.monitoring.metrics.apm.requests.server.requestedLabel', { - defaultMessage: 'Requested' + defaultMessage: 'Requested', }), - description: i18n.translate('xpack.monitoring.metrics.apm.requests.server.requestedDescription', { - defaultMessage: 'HTTP Requests received by server' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.apm.requests.server.requestedDescription', + { + defaultMessage: 'HTTP Requests received by server', + } + ), }), apm_acm_requests: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.request.count', @@ -151,225 +154,259 @@ export const metrics = { defaultMessage: 'Request Count Agent Configuration Management', }), label: i18n.translate('xpack.monitoring.metrics.apm.acm.request.requestedLabel', { - defaultMessage: 'Requested' + defaultMessage: 'Requested', }), description: i18n.translate('xpack.monitoring.metrics.apm.acm.requests.requestedDescription', { - defaultMessage: 'HTTP Requests received by ACM' - }) + defaultMessage: 'HTTP Requests received by ACM', + }), }), apm_server_responses_count: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.count', title: i18n.translate('xpack.monitoring.metrics.apm.server.responseCountTitle', { - defaultMessage: 'Response Count Intake API' + defaultMessage: 'Response Count Intake API', }), label: i18n.translate('xpack.monitoring.metrics.apm.server.responseCount.totalLabel', { - defaultMessage: 'Total' + defaultMessage: 'Total', }), - description: i18n.translate('xpack.monitoring.metrics.apm.server.responseCount.totalDescription', { - defaultMessage: 'HTTP Requests responded to by server' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.apm.server.responseCount.totalDescription', + { + defaultMessage: 'HTTP Requests responded to by server', + } + ), }), apm_server_responses_errors_count: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.count', title: i18n.translate('xpack.monitoring.metrics.apm.server.errorsCountTitle', { - defaultMessage: 'Errors' + defaultMessage: 'Errors', }), label: i18n.translate('xpack.monitoring.metrics.apm.server.errorsCount.totalLabel', { - defaultMessage: 'Errors' + defaultMessage: 'Errors', }), - description: i18n.translate('xpack.monitoring.metrics.apm.server.errorsCount.totalDescription', { - defaultMessage: 'Errors' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.apm.server.errorsCount.totalDescription', + { + defaultMessage: 'Errors', + } + ), }), apm_acm_responses_count: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.count', title: i18n.translate('xpack.monitoring.metrics.apm.acmResponseCountTitle', { - defaultMessage: 'Response Count Agent Configuration Management' + defaultMessage: 'Response Count Agent Configuration Management', }), label: i18n.translate('xpack.monitoring.metrics.apm.acm.responseCount.totalLabel', { - defaultMessage: 'Total' + defaultMessage: 'Total', }), description: i18n.translate('xpack.monitoring.metrics.apm.acm.responseCount.totalDescription', { - defaultMessage: 'HTTP Requests responded to by server' - }) + defaultMessage: 'HTTP Requests responded to by server', + }), }), apm_acm_responses_errors_count: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.errors.count', title: i18n.translate('xpack.monitoring.metrics.apm.acm.errorsCountTitle', { - defaultMessage: 'Errors' + defaultMessage: 'Errors', }), label: i18n.translate('xpack.monitoring.metrics.apm.acm.errorCount.totalLabel', { - defaultMessage: 'Errors' + defaultMessage: 'Errors', }), description: i18n.translate('xpack.monitoring.metrics.apm.acm.ErrorsCount.totalDescription', { - defaultMessage: 'HTTP Errors' - }) + defaultMessage: 'HTTP Errors', + }), }), apm_server_responses_valid_ok: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.valid.ok', title: i18n.translate('xpack.monitoring.metrics.apm.server.response.okTitle', { - defaultMessage: 'Ok' + defaultMessage: 'Ok', }), label: i18n.translate('xpack.monitoring.metrics.apm.server.response.okLabel', { - defaultMessage: 'Ok' + defaultMessage: 'Ok', }), description: i18n.translate('xpack.monitoring.metrics.apm.server.response.okDescription', { - defaultMessage: '200 OK response count' - }) + defaultMessage: '200 OK response count', + }), }), apm_acm_responses_valid_ok: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.valid.ok', title: i18n.translate('xpack.monitoring.metrics.apm.acm.response.validOk.okTitle', { - defaultMessage: 'Ok' + defaultMessage: 'Ok', }), label: i18n.translate('xpack.monitoring.metrics.apm.acm.response.validOk.okLabel', { - defaultMessage: 'Ok' + defaultMessage: 'Ok', }), description: i18n.translate('xpack.monitoring.metrics.apm.acm.response.validOk.okDescription', { - defaultMessage: '200 OK response count' - }) + defaultMessage: '200 OK response count', + }), }), apm_acm_responses_valid_notmodified: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.valid.notmodified', title: i18n.translate('xpack.monitoring.metrics.apm.acm.response.validNotModified.okTitle', { - defaultMessage: 'Not modified' + defaultMessage: 'Not modified', }), label: i18n.translate('xpack.monitoring.metrics.apm.acm.response.validNotModified.okLabel', { - defaultMessage: 'Not modified' + defaultMessage: 'Not modified', }), description: i18n.translate('xpack.monitoring.metrics.apm.acm.response.okDescription', { - defaultMessage: 'Not modified' - }) + defaultMessage: 'Not modified', + }), }), apm_server_responses_valid_accepted: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.valid.accepted', title: i18n.translate('xpack.monitoring.metrics.apm.server.response.acceptedTitle', { - defaultMessage: 'Accepted' + defaultMessage: 'Accepted', }), label: i18n.translate('xpack.monitoring.metrics.apm.server.response.acceptedLabel', { - defaultMessage: 'Accepted' + defaultMessage: 'Accepted', }), - description: i18n.translate('xpack.monitoring.metrics.apm.server.response.acceptedDescription', { - defaultMessage: 'HTTP Requests successfully reporting new events' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.apm.server.response.acceptedDescription', + { + defaultMessage: 'HTTP Requests successfully reporting new events', + } + ), }), apm_responses_valid_accepted_acm: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.valid.accepted', title: i18n.translate('xpack.monitoring.metrics.apm.acm.response.acceptedTitle', { - defaultMessage: 'Accepted' + defaultMessage: 'Accepted', }), label: i18n.translate('xpack.monitoring.metrics.apm.acm.response.acceptedLabel', { - defaultMessage: 'Accepted' + defaultMessage: 'Accepted', }), description: i18n.translate('xpack.monitoring.metrics.apm.acm.response.acceptedDescription', { - defaultMessage: 'HTTP Requests successfully reporting new events' - }) + defaultMessage: 'HTTP Requests successfully reporting new events', + }), }), apm_server_responses_errors_toolarge: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.toolarge', title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrorsTitle', { - defaultMessage: 'Response Errors Intake API' + defaultMessage: 'Response Errors Intake API', }), label: i18n.translate('xpack.monitoring.metrics.apm.sever.responseErrors.tooLargeLabelTitle', { - defaultMessage: 'Too large' + defaultMessage: 'Too large', }), - description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.tooLargeLabelDescription', { - defaultMessage: 'HTTP Requests rejected due to excessive payload size' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.apm.server.responseErrors.tooLargeLabelDescription', + { + defaultMessage: 'HTTP Requests rejected due to excessive payload size', + } + ), }), apm_server_responses_errors_validate: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.validate', title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.validateTitle', { - defaultMessage: 'Validate' + defaultMessage: 'Validate', }), label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.validateLabel', { - defaultMessage: 'Validate' + defaultMessage: 'Validate', }), - description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.validateDescription', { - defaultMessage: 'HTTP Requests rejected due to payload validation error' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.apm.server.responseErrors.validateDescription', + { + defaultMessage: 'HTTP Requests rejected due to payload validation error', + } + ), }), apm_server_responses_errors_method: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.method', title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.methodTitle', { - defaultMessage: 'Method' + defaultMessage: 'Method', }), label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.methodLabel', { - defaultMessage: 'Method' + defaultMessage: 'Method', }), - description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.methodDescription', { - defaultMessage: 'HTTP Requests rejected due to incorrect HTTP method' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.apm.server.responseErrors.methodDescription', + { + defaultMessage: 'HTTP Requests rejected due to incorrect HTTP method', + } + ), }), apm_server_responses_errors_unauthorized: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.unauthorized', title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.unauthorizedTitle', { - defaultMessage: 'Unauthorized' + defaultMessage: 'Unauthorized', }), label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.unauthorizedLabel', { - defaultMessage: 'Unauthorized' + defaultMessage: 'Unauthorized', }), - description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.unauthorizedDescription', { - defaultMessage: 'HTTP Requests rejected due to invalid secret token' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.apm.server.responseErrors.unauthorizedDescription', + { + defaultMessage: 'HTTP Requests rejected due to invalid secret token', + } + ), }), apm_server_responses_errors_ratelimit: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.ratelimit', title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.rateLimitTitle', { - defaultMessage: 'Rate limit' + defaultMessage: 'Rate limit', }), label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.rateLimitLabel', { - defaultMessage: 'Rate limit' + defaultMessage: 'Rate limit', }), - description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.rateLimitDescription', { - defaultMessage: 'HTTP Requests rejected to due excessive rate limit' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.apm.server.responseErrors.rateLimitDescription', + { + defaultMessage: 'HTTP Requests rejected to due excessive rate limit', + } + ), }), apm_server_responses_errors_queue: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.queue', title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.queueTitle', { - defaultMessage: 'Queue' + defaultMessage: 'Queue', }), label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.queueLabel', { - defaultMessage: 'Queue' + defaultMessage: 'Queue', }), - description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.queueDescription', { - defaultMessage: 'HTTP Requests rejected to due internal queue filling up' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.apm.server.responseErrors.queueDescription', + { + defaultMessage: 'HTTP Requests rejected to due internal queue filling up', + } + ), }), apm_server_responses_errors_decode: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.decode', title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.decodeTitle', { - defaultMessage: 'Decode' + defaultMessage: 'Decode', }), label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.decodeLabel', { - defaultMessage: 'Decode' + defaultMessage: 'Decode', }), - description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.decodeDescription', { - defaultMessage: 'HTTP Requests rejected to due decoding errors - invalid json, incorrect data type for entity' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.apm.server.responseErrors.decodeDescription', + { + defaultMessage: + 'HTTP Requests rejected to due decoding errors - invalid json, incorrect data type for entity', + } + ), }), apm_server_responses_errors_forbidden: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.forbidden', title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.forbiddenTitle', { - defaultMessage: 'Forbidden' + defaultMessage: 'Forbidden', }), label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.forbiddenLabel', { - defaultMessage: 'Forbidden' + defaultMessage: 'Forbidden', }), - description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.forbiddenDescription', { - defaultMessage: 'Forbidden HTTP Requests' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.apm.server.responseErrors.forbiddenDescription', + { + defaultMessage: 'Forbidden HTTP Requests', + } + ), }), apm_server_responses_errors_concurrency: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.concurrency', title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.concurrencyTitle', { - defaultMessage: 'Concurrency' + defaultMessage: 'Concurrency', }), label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.concurrencyLabel', { - defaultMessage: 'Concurrency' + defaultMessage: 'Concurrency', }), description: i18n.translate( 'xpack.monitoring.metrics.apm.responseErrors.concurrencyDescription', @@ -381,87 +418,109 @@ export const metrics = { apm_server_responses_errors_closed: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.closed', title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.closedTitle', { - defaultMessage: 'Closed' + defaultMessage: 'Closed', }), label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.closedLabel', { - defaultMessage: 'Closed' + defaultMessage: 'Closed', }), - description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.closedDescription', { - defaultMessage: 'HTTP Requests rejected during server shutdown' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.apm.server.responseErrors.closedDescription', + { + defaultMessage: 'HTTP Requests rejected during server shutdown', + } + ), }), apm_server_responses_errors_internal: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.server.response.errors.internal', title: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.internalTitle', { - defaultMessage: 'Internal' + defaultMessage: 'Internal', }), label: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.internalLabel', { - defaultMessage: 'Internal' + defaultMessage: 'Internal', }), - description: i18n.translate('xpack.monitoring.metrics.apm.server.responseErrors.internalDescription', { - defaultMessage: 'HTTP Requests rejected due to a miscellaneous internal error' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.apm.server.responseErrors.internalDescription', + { + defaultMessage: 'HTTP Requests rejected due to a miscellaneous internal error', + } + ), }), apm_acm_responses_errors_forbidden: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.errors.forbidden', title: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmForbiddenTitle', { - defaultMessage: 'Response Errors Agent Configuration Management' + defaultMessage: 'Response Errors Agent Configuration Management', }), label: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmForbiddenLabel', { - defaultMessage: 'Forbidden' + defaultMessage: 'Forbidden', }), - description: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmForbiddenDescription', { - defaultMessage: 'Forbidden HTTP Requests rejected' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.apm.acm.responseErrors.acmForbiddenDescription', + { + defaultMessage: 'Forbidden HTTP Requests rejected', + } + ), }), apm_acm_responses_errors_unauthorized: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.errors.unauthorized', title: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmUnauthorizedTitle', { - defaultMessage: 'Unauthorized' + defaultMessage: 'Unauthorized', }), label: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmUnauthorizedLabel', { - defaultMessage: 'Unauthorized' + defaultMessage: 'Unauthorized', }), - description: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmUnauthorizedDescription', { - defaultMessage: 'Unauthorized HTTP Requests rejected' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.apm.acm.responseErrors.acmUnauthorizedDescription', + { + defaultMessage: 'Unauthorized HTTP Requests rejected', + } + ), }), apm_acm_responses_errors_unavailable: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.errors.unavailable', title: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.acmUnavailableTitle', { - defaultMessage: 'Unavailable' + defaultMessage: 'Unavailable', }), label: i18n.translate('xpack.monitoring.metrics.acm.apm.responseErrors.acmUnavailableLabel', { - defaultMessage: 'Unavailable' + defaultMessage: 'Unavailable', }), - description: i18n.translate('xpack.monitoring.metrics.acm.apm.responseErrors.acmUnavailableDescription', { - defaultMessage: 'Unavailable HTTP Responses. Possible misconfiguration, or unavailable/unsupported version of Kibana.' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.acm.apm.responseErrors.acmUnavailableDescription', + { + defaultMessage: + 'Unavailable HTTP Responses. Possible misconfiguration, or unavailable/unsupported version of Kibana.', + } + ), }), apm_acm_responses_errors_method: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.errors.method', title: i18n.translate('xpack.monitoring.metrics.apm.server.acmResponseErrors.methodTitle', { - defaultMessage: 'Method' + defaultMessage: 'Method', }), label: i18n.translate('xpack.monitoring.metrics.apm.server.acmResponseErrors.methodLabel', { - defaultMessage: 'Method' + defaultMessage: 'Method', }), - description: i18n.translate('xpack.monitoring.metrics.apm.server.acmResponseErrors.methodDescription', { - defaultMessage: 'HTTP Requests rejected due to incorrect HTTP method' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.apm.server.acmResponseErrors.methodDescription', + { + defaultMessage: 'HTTP Requests rejected due to incorrect HTTP method', + } + ), }), apm_acm_responses_errors_invalid_query: new ApmEventsRateClusterMetric({ field: 'beats_stats.metrics.apm-server.acm.response.errors.invalidquery', title: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.invalidQueryTitle', { - defaultMessage: 'Invalid Query' + defaultMessage: 'Invalid Query', }), label: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.invalidQueryLabel', { - defaultMessage: 'Invalid Query' + defaultMessage: 'Invalid Query', }), - description: i18n.translate('xpack.monitoring.metrics.apm.acm.responseErrors.invalidQueryDescription', { - defaultMessage: 'HTTP invalid query' - }) + description: i18n.translate( + 'xpack.monitoring.metrics.apm.acm.responseErrors.invalidQueryDescription', + { + defaultMessage: 'HTTP invalid query', + } + ), }), apm_processor_transaction_transformations: new ApmEventsRateClusterMetric({ diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js index 13d3e8757221f..bc85299954949 100644 --- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js +++ b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js @@ -29,9 +29,9 @@ export const metricSet = [ keys: [ 'apm_server_responses_count', 'apm_server_responses_valid_ok', - 'apm_server_responses_valid_accepted' + 'apm_server_responses_valid_accepted', ], - name: 'apm_server_responses' + name: 'apm_server_responses', }, { keys: [ @@ -51,16 +51,12 @@ export const metricSet = [ name: 'apm_responses_errors', }, { - keys: [ - 'apm_server_requests' - ], - name: 'apm_server_requests' + keys: ['apm_server_requests'], + name: 'apm_server_requests', }, { - keys: [ - 'apm_acm_requests' - ], - name: 'apm_acm_requests' + keys: ['apm_acm_requests'], + name: 'apm_acm_requests', }, { keys: [ diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js index f8c0b27be6fb6..642f30d864ba1 100644 --- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js +++ b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js @@ -32,16 +32,16 @@ export const metricSet = [ 'apm_server_responses_valid_accepted', 'apm_server_responses_errors_count', ], - name: 'apm_server_responses' + name: 'apm_server_responses', }, { keys: [ 'apm_acm_responses_count', 'apm_acm_responses_valid_notmodified', 'apm_acm_responses_valid_ok', - 'apm_acm_responses_errors_count' + 'apm_acm_responses_errors_count', ], - name: 'apm_acm_responses' + name: 'apm_acm_responses', }, { keys: [ @@ -58,7 +58,7 @@ export const metricSet = [ 'apm_server_responses_errors_closed', 'apm_server_responses_errors_internal', ], - name: 'apm_server_responses_errors' + name: 'apm_server_responses_errors', }, { keys: [ @@ -68,19 +68,15 @@ export const metricSet = [ 'apm_acm_responses_errors_method', 'apm_acm_responses_errors_invalid_query', ], - name: 'apm_acm_responses_errors' + name: 'apm_acm_responses_errors', }, { - keys: [ - 'apm_server_requests' - ], - name: 'apm_server_requests' + keys: ['apm_server_requests'], + name: 'apm_server_requests', }, { - keys: [ - 'apm_acm_requests' - ], - name: 'apm_acm_requests' + keys: ['apm_acm_requests'], + name: 'apm_acm_requests', }, { keys: [