Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CI] Enables APM collection #81731

Merged
merged 16 commits into from
Dec 3, 2020
Merged

[CI] Enables APM collection #81731

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5c3601e
[CI] Enables APM collection
Oct 26, 2020
0e41a31
Merge remote-tracking branch 'upstream/master' into enable-apm-ci
Nov 16, 2020
3288738
Skip Security Endpoint test
Nov 16, 2020
3134787
Merge remote-tracking branch 'upstream/master' into enable-apm-ci
Nov 18, 2020
c7ee220
Updates token
Nov 24, 2020
d93b0a7
Enable APM for FTR only
Nov 25, 2020
8bc8914
Merge remote-tracking branch 'upstream/master' into enable-apm-ci
Nov 25, 2020
f380562
Set sample rate
Dec 1, 2020
963addf
Decrease sample rate to 1%
Dec 1, 2020
3ac2e10
Increase metricsInterval
Dec 1, 2020
1aafb07
Increase metricsInterval for distributable
Dec 1, 2020
49bf559
Merge branch 'master' into enable-apm-ci
kibanamachine Dec 1, 2020
9331fcf
Disable for PRs and set to 10% sample rate
Dec 2, 2020
dc4bb17
Allow disabling by env and pass sample rate to frontend
Dec 2, 2020
626fdd5
Adds prId label and removes jobName
Dec 2, 2020
1534643
Revert "Skip Security Endpoint test"
Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions packages/kbn-apm-config-loader/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,27 @@ 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://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: {},
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,
Expand Down Expand Up @@ -150,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 || '',
},
};
}
Expand Down
5 changes: 4 additions & 1 deletion vars/kibanaPipeline.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 apmActive = githubPr.isPr() ? "false" : "true"

withEnv([
"CI_GROUP=${parallelId}",
Expand All @@ -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=${apmActive}",
"ELASTIC_APM_TRANSACTION_SAMPLE_RATE=0.1",
] + additionalEnvs) {
closure()
}
Expand Down
6 changes: 4 additions & 2 deletions x-pack/test/security_solution_endpoint/apps/endpoint/resolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:/elastic/kibana/issues/83446
tylersmalley marked this conversation as resolved.
Show resolved Hide resolved
it.skip('Check Related Events for event.file Node', async () => {
const expectedData = [
'17 authentication',
'1 registry',
Expand All @@ -206,7 +207,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
});
});

describe('Resolver Tree events', function () {
// SKIP: https:/elastic/kibana/issues/83446
describe.skip('Resolver Tree events', function () {
const expectedData = [
'17 authentication',
'1 registry',
Expand Down