From 5c3601ec9a6ef1075dd14a473ae503f82d735662 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Mon, 26 Oct 2020 15:45:10 -0700 Subject: [PATCH 01/12] [CI] Enables APM collection Signed-off-by: Tyler Smalley --- src/dev/ci_setup/setup_env.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dev/ci_setup/setup_env.sh b/src/dev/ci_setup/setup_env.sh index 5dac270239c4a..8f7776a1a24e6 100644 --- a/src/dev/ci_setup/setup_env.sh +++ b/src/dev/ci_setup/setup_env.sh @@ -27,6 +27,7 @@ export FORCE_COLOR=1 ### APM tracking ### export ELASTIC_APM_ENVIRONMENT=ci +export ELASTIC_APM_ACTIVE=true ### ### check that we seem to be in a kibana project From 32887385486dd96ba2067b4af45251191b9a2bd1 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Mon, 16 Nov 2020 08:59:12 -0800 Subject: [PATCH 02/12] Skip Security Endpoint test Signed-off-by: Tyler Smalley --- .../security_solution_endpoint/apps/endpoint/resolver.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/resolver.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/resolver.ts index d49f5bf17aab1..d838f57378fc3 100644 --- a/x-pack/test/security_solution_endpoint/apps/endpoint/resolver.ts +++ b/x-pack/test/security_solution_endpoint/apps/endpoint/resolver.ts @@ -194,7 +194,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { await (await testSubjects.find('resolver:graph-controls:zoom-in')).click(); }); - it('Check Related Events for event.file Node', async () => { + // SKIP: https://github.com/elastic/kibana/issues/83446 + it.skip('Check Related Events for event.file Node', async () => { const expectedData = [ '17 authentication', '1 registry', @@ -206,7 +207,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); }); - describe('Resolver Tree events', function () { + // SKIP: https://github.com/elastic/kibana/issues/83446 + describe.skip('Resolver Tree events', function () { const expectedData = [ '17 authentication', '1 registry', From c7ee2203e4ca8b56274068805caffbd18b22c068 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Mon, 23 Nov 2020 16:26:28 -0800 Subject: [PATCH 03/12] Updates token Signed-off-by: Tyler Smalley --- packages/kbn-apm-config-loader/src/config.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/kbn-apm-config-loader/src/config.ts b/packages/kbn-apm-config-loader/src/config.ts index a611e205ec83a..b1d55dbe86a77 100644 --- a/packages/kbn-apm-config-loader/src/config.ts +++ b/packages/kbn-apm-config-loader/src/config.ts @@ -31,14 +31,14 @@ const getDefaultConfig = (isDistributable: boolean): ApmAgentConfig => { active: process.env.ELASTIC_APM_ACTIVE || false, environment: process.env.ELASTIC_APM_ENVIRONMENT || process.env.NODE_ENV || 'development', - serverUrl: 'https://b1e3b4b4233e44cdad468c127d0af8d8.apm.europe-west1.gcp.cloud.es.io:443', + serverUrl: 'https://38b80fbd79fb4c91bae06b4642d4d093.apm.us-east-1.aws.cloud.es.io', // The secretToken below is intended to be hardcoded in this file even though // it makes it public. This is not a security/privacy issue. Normally we'd // instead disable the need for a secretToken in the APM Server config where // the data is transmitted to, but due to how it's being hosted, it's easier, // for now, to simply leave it in. - secretToken: '2OyjjaI6RVkzx2O5CV', + secretToken: 'ZQHYvrmXEx04ozge8F', logUncaughtExceptions: true, globalLabels: {}, From d93b0a7880078f9ebef2b6971c8a3e994a1644b1 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Tue, 24 Nov 2020 22:10:01 -0800 Subject: [PATCH 04/12] Enable APM for FTR only Signed-off-by: Tyler Smalley --- src/dev/ci_setup/setup_env.sh | 1 - test/scripts/jenkins_ci_group.sh | 1 + test/scripts/jenkins_xpack_ci_group.sh | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dev/ci_setup/setup_env.sh b/src/dev/ci_setup/setup_env.sh index 8f7776a1a24e6..5dac270239c4a 100644 --- a/src/dev/ci_setup/setup_env.sh +++ b/src/dev/ci_setup/setup_env.sh @@ -27,7 +27,6 @@ export FORCE_COLOR=1 ### APM tracking ### export ELASTIC_APM_ENVIRONMENT=ci -export ELASTIC_APM_ACTIVE=true ### ### check that we seem to be in a kibana project diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index f9e9d40cd8b0d..de2c025e2ca42 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -4,6 +4,7 @@ source test/scripts/jenkins_test_setup_oss.sh if [[ -z "$CODE_COVERAGE" ]]; then echo " -> Running functional and api tests" + export ELASTIC_APM_ACTIVE=true checks-reporter-with-killswitch "Functional tests / Group ${CI_GROUP}" \ node scripts/functional_tests \ diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh index 648605135b359..bbcb4794468b8 100755 --- a/test/scripts/jenkins_xpack_ci_group.sh +++ b/test/scripts/jenkins_xpack_ci_group.sh @@ -5,6 +5,7 @@ source test/scripts/jenkins_test_setup_xpack.sh if [[ -z "$CODE_COVERAGE" ]]; then echo " -> Running functional and api tests" + export ELASTIC_APM_ACTIVE=true checks-reporter-with-killswitch "X-Pack Chrome Functional tests / Group ${CI_GROUP}" \ node scripts/functional_tests \ --debug --bail \ From f380562e4a83ba73a619753e497d2226b1ab1107 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Mon, 30 Nov 2020 22:45:35 -0800 Subject: [PATCH 05/12] Set sample rate Signed-off-by: Tyler Smalley --- test/scripts/jenkins_ci_group.sh | 1 - test/scripts/jenkins_xpack_ci_group.sh | 1 - vars/kibanaPipeline.groovy | 5 ++++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index de2c025e2ca42..f9e9d40cd8b0d 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -4,7 +4,6 @@ source test/scripts/jenkins_test_setup_oss.sh if [[ -z "$CODE_COVERAGE" ]]; then echo " -> Running functional and api tests" - export ELASTIC_APM_ACTIVE=true checks-reporter-with-killswitch "Functional tests / Group ${CI_GROUP}" \ node scripts/functional_tests \ diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh index bbcb4794468b8..648605135b359 100755 --- a/test/scripts/jenkins_xpack_ci_group.sh +++ b/test/scripts/jenkins_xpack_ci_group.sh @@ -5,7 +5,6 @@ source test/scripts/jenkins_test_setup_xpack.sh if [[ -z "$CODE_COVERAGE" ]]; then echo " -> Running functional and api tests" - export ELASTIC_APM_ACTIVE=true checks-reporter-with-killswitch "X-Pack Chrome Functional tests / Group ${CI_GROUP}" \ node scripts/functional_tests \ --debug --bail \ diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy index 0051293704717..9b4ea1688dcc0 100644 --- a/vars/kibanaPipeline.groovy +++ b/vars/kibanaPipeline.groovy @@ -89,6 +89,7 @@ def withFunctionalTestEnv(List additionalEnvs = [], Closure closure) { def esTransportPort = "61${parallelId}3" def fleetPackageRegistryPort = "61${parallelId}4" def alertingProxyPort = "61${parallelId}5" + def sampleRate = githubPr.isPr() ? "0.1" : "1.0"; withEnv([ "CI_GROUP=${parallelId}", @@ -101,7 +102,9 @@ def withFunctionalTestEnv(List additionalEnvs = [], Closure closure) { "TEST_ES_TRANSPORT_PORT=${esTransportPort}", "KBN_NP_PLUGINS_BUILT=true", "FLEET_PACKAGE_REGISTRY_PORT=${fleetPackageRegistryPort}", - "ALERTING_PROXY_PORT=${alertingProxyPort}" + "ALERTING_PROXY_PORT=${alertingProxyPort}", + "ELASTIC_APM_ACTIVE=true", + "ELASTIC_APM_TRANSACTION_SAMPLE_RATE=${sampleRate}", ] + additionalEnvs) { closure() } From 963addf16343edb2bdb7212fce914fd488ee1ac6 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Mon, 30 Nov 2020 23:23:07 -0800 Subject: [PATCH 06/12] Decrease sample rate to 1% Signed-off-by: Tyler Smalley --- vars/kibanaPipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy index 9b4ea1688dcc0..f7a51652d299a 100644 --- a/vars/kibanaPipeline.groovy +++ b/vars/kibanaPipeline.groovy @@ -89,7 +89,7 @@ def withFunctionalTestEnv(List additionalEnvs = [], Closure closure) { def esTransportPort = "61${parallelId}3" def fleetPackageRegistryPort = "61${parallelId}4" def alertingProxyPort = "61${parallelId}5" - def sampleRate = githubPr.isPr() ? "0.1" : "1.0"; + def sampleRate = githubPr.isPr() ? "0.01" : "1.0"; withEnv([ "CI_GROUP=${parallelId}", From 3ac2e10c7183fbfff2d3629bbdaa31b248a10c17 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Tue, 1 Dec 2020 07:53:22 -0800 Subject: [PATCH 07/12] Increase metricsInterval Signed-off-by: Tyler Smalley --- packages/kbn-apm-config-loader/src/config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/kbn-apm-config-loader/src/config.ts b/packages/kbn-apm-config-loader/src/config.ts index b1d55dbe86a77..16d16832251d9 100644 --- a/packages/kbn-apm-config-loader/src/config.ts +++ b/packages/kbn-apm-config-loader/src/config.ts @@ -43,6 +43,7 @@ const getDefaultConfig = (isDistributable: boolean): ApmAgentConfig => { logUncaughtExceptions: true, globalLabels: {}, centralConfig: false, + metricsInterval: '120s', // Can be performance intensive, disabling by default breakdownMetrics: isDistributable ? false : true, From 1aafb07d73c2ff2fb4efe483f190fd037f71c258 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Tue, 1 Dec 2020 07:54:27 -0800 Subject: [PATCH 08/12] Increase metricsInterval for distributable Signed-off-by: Tyler Smalley --- packages/kbn-apm-config-loader/src/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kbn-apm-config-loader/src/config.ts b/packages/kbn-apm-config-loader/src/config.ts index 16d16832251d9..2058bd7e5f455 100644 --- a/packages/kbn-apm-config-loader/src/config.ts +++ b/packages/kbn-apm-config-loader/src/config.ts @@ -43,7 +43,7 @@ const getDefaultConfig = (isDistributable: boolean): ApmAgentConfig => { logUncaughtExceptions: true, globalLabels: {}, centralConfig: false, - metricsInterval: '120s', + metricsInterval: isDistributable ? '120s' : '30s', // Can be performance intensive, disabling by default breakdownMetrics: isDistributable ? false : true, From 9331fcfc5bf7aed8953381acb3fd8e8554c3556e Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Wed, 2 Dec 2020 09:58:32 -0800 Subject: [PATCH 09/12] Disable for PRs and set to 10% sample rate Signed-off-by: Tyler Smalley --- vars/kibanaPipeline.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy index f7a51652d299a..7991dd3252153 100644 --- a/vars/kibanaPipeline.groovy +++ b/vars/kibanaPipeline.groovy @@ -89,7 +89,7 @@ def withFunctionalTestEnv(List additionalEnvs = [], Closure closure) { def esTransportPort = "61${parallelId}3" def fleetPackageRegistryPort = "61${parallelId}4" def alertingProxyPort = "61${parallelId}5" - def sampleRate = githubPr.isPr() ? "0.01" : "1.0"; + def apmActive = githubPr.isPr() ? "false" : "true" withEnv([ "CI_GROUP=${parallelId}", @@ -103,8 +103,8 @@ def withFunctionalTestEnv(List additionalEnvs = [], Closure closure) { "KBN_NP_PLUGINS_BUILT=true", "FLEET_PACKAGE_REGISTRY_PORT=${fleetPackageRegistryPort}", "ALERTING_PROXY_PORT=${alertingProxyPort}", - "ELASTIC_APM_ACTIVE=true", - "ELASTIC_APM_TRANSACTION_SAMPLE_RATE=${sampleRate}", + "ELASTIC_APM_ACTIVE=${apmActive}", + "ELASTIC_APM_TRANSACTION_SAMPLE_RATE=0.1", ] + additionalEnvs) { closure() } From dc4bb1763927a3735f6b4ab0a82bc603dfccfd55 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Wed, 2 Dec 2020 11:34:18 -0800 Subject: [PATCH 10/12] Allow disabling by env and pass sample rate to frontend Signed-off-by: Tyler Smalley --- packages/kbn-apm-config-loader/src/config.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/kbn-apm-config-loader/src/config.ts b/packages/kbn-apm-config-loader/src/config.ts index 2058bd7e5f455..c381e6d3106f2 100644 --- a/packages/kbn-apm-config-loader/src/config.ts +++ b/packages/kbn-apm-config-loader/src/config.ts @@ -27,8 +27,9 @@ import { ApmAgentConfig } from './types'; const getDefaultConfig = (isDistributable: boolean): ApmAgentConfig => { // https://www.elastic.co/guide/en/apm/agent/nodejs/current/configuration.html + return { - active: process.env.ELASTIC_APM_ACTIVE || false, + active: process.env.ELASTIC_APM_ACTIVE === 'true' || false, environment: process.env.ELASTIC_APM_ENVIRONMENT || process.env.NODE_ENV || 'development', serverUrl: 'https://38b80fbd79fb4c91bae06b4642d4d093.apm.us-east-1.aws.cloud.es.io', @@ -44,6 +45,9 @@ const getDefaultConfig = (isDistributable: boolean): ApmAgentConfig => { globalLabels: {}, centralConfig: false, metricsInterval: isDistributable ? '120s' : '30s', + transactionSampleRate: process.env.ELASTIC_APM_TRANSACTION_SAMPLE_RATE + ? parseFloat(process.env.ELASTIC_APM_TRANSACTION_SAMPLE_RATE) + : 1.0, // Can be performance intensive, disabling by default breakdownMetrics: isDistributable ? false : true, From 626fdd5ceb7487247f14212da760871bf3121b84 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Wed, 2 Dec 2020 12:03:55 -0800 Subject: [PATCH 11/12] Adds prId label and removes jobName Signed-off-by: Tyler Smalley --- packages/kbn-apm-config-loader/src/config.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/kbn-apm-config-loader/src/config.ts b/packages/kbn-apm-config-loader/src/config.ts index c381e6d3106f2..6e5a830d04b17 100644 --- a/packages/kbn-apm-config-loader/src/config.ts +++ b/packages/kbn-apm-config-loader/src/config.ts @@ -155,8 +155,9 @@ export class ApmConfiguration { globalLabels: { branch: process.env.ghprbSourceBranch || '', targetBranch: process.env.ghprbTargetBranch || '', - ciJobName: process.env.JOB_NAME || '', ciBuildNumber: process.env.BUILD_NUMBER || '', + isPr: process.env.GITHUB_PR_NUMBER ? true : false, + prId: process.env.GITHUB_PR_NUMBER || '', }, }; } From 153464341f418360bc7b0e7f47e12fc73303f94c Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Thu, 3 Dec 2020 07:31:36 -0800 Subject: [PATCH 12/12] Revert "Skip Security Endpoint test" This reverts commit 32887385486dd96ba2067b4af45251191b9a2bd1. --- .../security_solution_endpoint/apps/endpoint/resolver.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/resolver.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/resolver.ts index d838f57378fc3..d49f5bf17aab1 100644 --- a/x-pack/test/security_solution_endpoint/apps/endpoint/resolver.ts +++ b/x-pack/test/security_solution_endpoint/apps/endpoint/resolver.ts @@ -194,8 +194,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { await (await testSubjects.find('resolver:graph-controls:zoom-in')).click(); }); - // SKIP: https://github.com/elastic/kibana/issues/83446 - it.skip('Check Related Events for event.file Node', async () => { + it('Check Related Events for event.file Node', async () => { const expectedData = [ '17 authentication', '1 registry', @@ -207,8 +206,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); }); - // SKIP: https://github.com/elastic/kibana/issues/83446 - describe.skip('Resolver Tree events', function () { + describe('Resolver Tree events', function () { const expectedData = [ '17 authentication', '1 registry',