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.

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

[CI] Enables APM collection #81731

Merged
merged 16 commits into from
Dec 3, 2020
Merged
5 changes: 3 additions & 2 deletions packages/kbn-apm-config-loader/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,19 @@ 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: {},
centralConfig: false,
metricsInterval: isDistributable ? '120s' : '30s',

// Can be performance intensive, disabling by default
breakdownMetrics: isDistributable ? false : true,
Expand Down
5 changes: 4 additions & 1 deletion vars/kibanaPipeline.groovy
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 sampleRate = githubPr.isPr() ? "0.01" : "1.0";

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=true",
"ELASTIC_APM_TRANSACTION_SAMPLE_RATE=${sampleRate}",
] + additionalEnvs) {
closure()
}
Expand Down
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://github.com/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://github.com/elastic/kibana/issues/83446
describe.skip('Resolver Tree events', function () {
const expectedData = [
'17 authentication',
'1 registry',
Expand Down