{i18n.translate('xpack.apm.servicesTable.7xUpgradeServerMessage', { defaultMessage: `Upgrading from a pre-7.x version? Make sure you've also upgraded - your APM server instance(s) to at least 7.0.` + your APM Server instance(s) to at least 7.0.` })}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/NoServicesMessage.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/NoServicesMessage.test.tsx.snap
index 209b88f73b9e2..227becb9a9c4f 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/NoServicesMessage.test.tsx.snap
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/NoServicesMessage.test.tsx.snap
@@ -19,7 +19,7 @@ exports[`NoServicesMessage status: pending and historicalDataFound: false 1`] =
Upgrading from a pre-7.x version? Make sure you've also upgraded
- your APM server instance(s) to at least 7.0.
+ your APM Server instance(s) to at least 7.0.
You may also have old data that needs to be migrated.
@@ -64,7 +64,7 @@ exports[`NoServicesMessage status: success and historicalDataFound: false 1`] =
Upgrading from a pre-7.x version? Make sure you've also upgraded
- your APM server instance(s) to at least 7.0.
+ your APM Server instance(s) to at least 7.0.
You may also have old data that needs to be migrated.
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap
index d85c83661ea49..dd0c50af2b03f 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap
@@ -72,7 +72,7 @@ NodeList [
>
Upgrading from a pre-7.x version? Make sure you've also upgraded
- your APM server instance(s) to at least 7.0.
+ your APM Server instance(s) to at least 7.0.
You may also have old data that needs to be migrated.
diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap
index 365d8838a24a6..0c585bec22f6c 100644
--- a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap
@@ -2,11 +2,6 @@
exports[`settingDefinitions should have correct default values 1`] = `
Array [
- Object {
- "key": "active",
- "type": "boolean",
- "validationName": "(\\"true\\" | \\"false\\")",
- },
Object {
"key": "api_request_size",
"type": "bytes",
@@ -105,6 +100,11 @@ Array [
"validationError": "Please specify an integer and a unit",
"validationName": "durationRt",
},
+ Object {
+ "key": "recording",
+ "type": "boolean",
+ "validationName": "(\\"true\\" | \\"false\\")",
+ },
Object {
"key": "server_timeout",
"type": "duration",
diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts
index b83c03c543295..6a0e2d65d1949 100644
--- a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts
@@ -13,21 +13,6 @@ import { RawSettingDefinition } from './types';
* Settings added here will show up in the UI and will be validated on the client and server
*/
export const generalSettings: RawSettingDefinition[] = [
- // Active
- {
- key: 'active',
- type: 'boolean',
- defaultValue: 'true',
- label: i18n.translate('xpack.apm.agentConfig.active.label', {
- defaultMessage: 'Active'
- }),
- description: i18n.translate('xpack.apm.agentConfig.active.description', {
- defaultMessage:
- 'A boolean specifying if the agent should be active or not.\nWhen active, the agent instruments incoming HTTP requests, tracks errors and collects and sends metrics.\nWhen inactive, the agent works as a noop, not collecting data and not communicating with the APM Server.\nAs this is a reversible switch, agent threads are not being killed when inactivated, but they will be \nmostly idle in this state, so the overhead should be negligible.\n\nYou can use this setting to dynamically disable Elastic APM at runtime.'
- }),
- excludeAgents: ['js-base', 'rum-js', 'python', 'dotnet']
- },
-
// API Request Size
{
key: 'api_request_size',
@@ -40,7 +25,7 @@ export const generalSettings: RawSettingDefinition[] = [
'xpack.apm.agentConfig.apiRequestSize.description',
{
defaultMessage:
- 'The maximum total compressed size of the request body which is sent to the APM server intake api via a chunked encoding (HTTP streaming).\nNote that a small overshoot is possible.\n\nAllowed byte units are `b`, `kb` and `mb`. `1kb` is equal to `1024b`.'
+ 'The maximum total compressed size of the request body which is sent to the APM Server intake api via a chunked encoding (HTTP streaming).\nNote that a small overshoot is possible.\n\nAllowed byte units are `b`, `kb` and `mb`. `1kb` is equal to `1024b`.'
}
),
excludeAgents: ['js-base', 'rum-js', 'dotnet']
@@ -121,6 +106,20 @@ export const generalSettings: RawSettingDefinition[] = [
excludeAgents: ['js-base', 'rum-js', 'python']
},
+ // Recording
+ {
+ key: 'recording',
+ type: 'boolean',
+ defaultValue: 'true',
+ label: i18n.translate('xpack.apm.agentConfig.recording.label', {
+ defaultMessage: 'Recording'
+ }),
+ description: i18n.translate('xpack.apm.agentConfig.recording.description', {
+ defaultMessage:
+ 'When recording, the agent instruments incoming HTTP requests, tracks errors, and collects and sends metrics. When inactive, the agent works as a noop, not collecting data and not communicating with the APM Server except for polling for updated configuration. As this is a reversible switch, agent threads are not being killed when inactivated, but they will be mostly idle in this state, so the overhead should be negligible. You can use this setting to dynamically control whether Elastic APM is enabled or disabled.'
+ })
+ },
+
// SERVER_TIMEOUT
{
key: 'server_timeout',
@@ -133,7 +132,7 @@ export const generalSettings: RawSettingDefinition[] = [
'xpack.apm.agentConfig.serverTimeout.description',
{
defaultMessage:
- 'If a request to the APM server takes longer than the configured timeout,\nthe request is cancelled and the event (exception or transaction) is discarded.\nSet to 0 to disable timeouts.\n\nWARNING: If timeouts are disabled or set to a high value, your app could experience memory issues if the APM server times out.'
+ 'If a request to the APM Server takes longer than the configured timeout,\nthe request is cancelled and the event (exception or transaction) is discarded.\nSet to 0 to disable timeouts.\n\nWARNING: If timeouts are disabled or set to a high value, your app could experience memory issues if the APM Server times out.'
}
),
includeAgents: ['nodejs', 'java', 'go']
diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts
index fe55442324c92..b0255d2d828bb 100644
--- a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts
@@ -43,12 +43,12 @@ describe('filterByAgent', () => {
describe('options per agent', () => {
it('go', () => {
expect(getSettingKeysForAgent('go')).toEqual([
- 'active',
'api_request_size',
'api_request_time',
'capture_body',
'capture_headers',
'log_level',
+ 'recording',
'server_timeout',
'span_frames_min_duration',
'stack_trace_limit',
@@ -59,7 +59,6 @@ describe('filterByAgent', () => {
it('java', () => {
expect(getSettingKeysForAgent('java')).toEqual([
- 'active',
'api_request_size',
'api_request_time',
'capture_body',
@@ -72,6 +71,7 @@ describe('filterByAgent', () => {
'profiling_inferred_spans_included_classes',
'profiling_inferred_spans_min_duration',
'profiling_inferred_spans_sampling_interval',
+ 'recording',
'server_timeout',
'span_frames_min_duration',
'stack_trace_limit',
@@ -88,24 +88,26 @@ describe('filterByAgent', () => {
it('js-base', () => {
expect(getSettingKeysForAgent('js-base')).toEqual([
+ 'recording',
'transaction_sample_rate'
]);
});
it('rum-js', () => {
expect(getSettingKeysForAgent('rum-js')).toEqual([
+ 'recording',
'transaction_sample_rate'
]);
});
it('nodejs', () => {
expect(getSettingKeysForAgent('nodejs')).toEqual([
- 'active',
'api_request_size',
'api_request_time',
'capture_body',
'capture_headers',
'log_level',
+ 'recording',
'server_timeout',
'stack_trace_limit',
'transaction_max_spans',
@@ -119,6 +121,7 @@ describe('filterByAgent', () => {
'api_request_time',
'capture_body',
'capture_headers',
+ 'recording',
'span_frames_min_duration',
'transaction_max_spans',
'transaction_sample_rate'
@@ -130,6 +133,7 @@ describe('filterByAgent', () => {
'capture_body',
'capture_headers',
'log_level',
+ 'recording',
'span_frames_min_duration',
'stack_trace_limit',
'transaction_max_spans',
@@ -139,12 +143,12 @@ describe('filterByAgent', () => {
it('ruby', () => {
expect(getSettingKeysForAgent('ruby')).toEqual([
- 'active',
'api_request_size',
'api_request_time',
'capture_body',
'capture_headers',
'log_level',
+ 'recording',
'span_frames_min_duration',
'transaction_max_spans',
'transaction_sample_rate'
@@ -155,6 +159,7 @@ describe('filterByAgent', () => {
expect(getSettingKeysForAgent(undefined)).toEqual([
'capture_body',
'capture_headers',
+ 'recording',
'transaction_max_spans',
'transaction_sample_rate'
]);
diff --git a/x-pack/plugins/apm/server/tutorial/instructions/apm_agent_instructions.ts b/x-pack/plugins/apm/server/tutorial/instructions/apm_agent_instructions.ts
index 6169c63a47edb..4525732818e2a 100644
--- a/x-pack/plugins/apm/server/tutorial/instructions/apm_agent_instructions.ts
+++ b/x-pack/plugins/apm/server/tutorial/instructions/apm_agent_instructions.ts
@@ -437,7 +437,7 @@ export const createJsAgentInstructions = (apmServerUrl = '') => [
title: i18n.translate(
'xpack.apm.tutorial.jsClient.enableRealUserMonitoring.title',
{
- defaultMessage: 'Enable Real User Monitoring support in APM server'
+ defaultMessage: 'Enable Real User Monitoring support in APM Server'
}
),
textPre: i18n.translate(