From 50fa5571aea80135648bb7e4b1229de7a035dc46 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Thu, 30 Aug 2018 23:42:22 +0200 Subject: [PATCH 1/2] [APM] Update Node.js onboarding instructions --- .../kibana/server/tutorials/apm/apm_client_instructions.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js b/src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js index 49c4b999af18e..9816728463fb1 100644 --- a/src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js +++ b/src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js @@ -30,10 +30,11 @@ export const createNodeClientInstructions = () => [ textPre: 'Agents are libraries that run inside of your application process.' + ' APM services are created programmatically based on the `serviceName`.' + - ' This agent supports Express, Koa, hapi, and custom Node.js.', + ' This agent supports a vararity of frameworks but can also be used with your custom stack.', commands: `// Add this to the VERY top of the first file loaded in your app var apm = require('elastic-apm-node').start({curlyOpen} - // Set required service name (allowed characters: a-z, A-Z, 0-9, -, _, and space) + // Overwrite service name from package.json + // Allowed characters: a-z, A-Z, 0-9, -, _, and space serviceName: '', // Use if APM Server requires a token From 864dd723cca5589a6505209f32b4fc91ff1e75cd Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Wed, 5 Sep 2018 15:54:07 +0200 Subject: [PATCH 2/2] docs: fix grammar --- .../kibana/server/tutorials/apm/apm_client_instructions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js b/src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js index 9816728463fb1..183cf26a6679e 100644 --- a/src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js +++ b/src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js @@ -33,7 +33,7 @@ export const createNodeClientInstructions = () => [ ' This agent supports a vararity of frameworks but can also be used with your custom stack.', commands: `// Add this to the VERY top of the first file loaded in your app var apm = require('elastic-apm-node').start({curlyOpen} - // Overwrite service name from package.json + // Override service name from package.json // Allowed characters: a-z, A-Z, 0-9, -, _, and space serviceName: '',