github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "add EBT Labels through configs (#136843)"

Browse source 
This reverts commit c476b453db.
This commit is contained in:
Tiago Costa 2022-07-28 14:10:44 +01:00
parent 824dfb6d5f
commit 371f091a14
No known key found for this signature in database
GPG key ID: BAECC2D04A04C6EA
9 changed files with 24 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/plugins/telemetry/server/config/telemetry_labels.ts
View file

@ -20,9 +20,9 @@ export const labelsSchema = schema.object(
ciBuildId: schema.maybe(schema.string()),
ciBuildNumber: schema.maybe(schema.number()),
ftrConfig: schema.maybe(schema.string()),
gitRev: schema.maybe(schema.string()),
git_rev: schema.maybe(schema.string()),
isPr: schema.maybe(schema.boolean()),
prId: schema.maybe(schema.number()),
prId: schema.maybe(schema.string()),
journeyName: schema.maybe(schema.string()),
testBuildId: schema.maybe(schema.string()),
testJobId: schema.maybe(schema.string()),

4
test/plugin_functional/test_suites/core_plugins/rendering.ts
View file

@ -148,10 +148,10 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
'telemetry.labels.ciBuildJobId (string)',
'telemetry.labels.ciBuildNumber (number)',
'telemetry.labels.ftrConfig (string)',
'telemetry.labels.gitRev (string)',
'telemetry.labels.git_rev (string)',
'telemetry.labels.isPr (boolean)',
'telemetry.labels.journeyName (string)',
'telemetry.labels.prId (number)',
'telemetry.labels.prId (string)',
'telemetry.labels.testBuildId (string)',
'telemetry.labels.testJobId (string)',
'telemetry.hidePrivacyStatement (boolean)',

13
x-pack/test/performance/journeys/base.config.ts
View file

@ -36,18 +36,7 @@ export default async function ({ readConfigFile, log }: FtrConfigProviderContext
},
kbnTestServer: {
...functionalConfig.get('kbnTestServer'),
serverArgs: [
...functionalConfig.get('kbnTestServer.serverArgs'),
`--telemetry.labels.branch=${process.env.BUILDKITE_BRANCH}`,
`--telemetry.labels.ciBuildId=${process.env.BUILDKITE_BUILD_ID}`,
`--telemetry.labels.ciBuildJobId=${process.env.BUILDKITE_JOB_ID}`,
`--telemetry.labels.ciBuildNumber=${process.env.BUILDKITE_BUILD_NUMBER}`,
`--telemetry.labels.gitRev=${process.env.BUILDKITE_COMMIT}`,
`--telemetry.labels.isPr=${!!process.env.GITHUB_PR_NUMBER}`,
`--telemetry.labels.prId=${process.env.GITHUB_PR_NUMBER || ''}`,
`--telemetry.labels.testJobId=${testJobId}`,
`--telemetry.labels.testBuildId=${testBuildId}`,
],
serverArgs: [...functionalConfig.get('kbnTestServer.serverArgs')],
env: {
ELASTIC_APM_ACTIVE: process.env.TEST_PERFORMANCE_PHASE ? 'true' : 'false',
ELASTIC_APM_CONTEXT_PROPAGATION_ONLY: 'false',

12
x-pack/test/performance/journeys/ecommerce_dashboard/config.ts
View file

@ -7,12 +7,10 @@
import { FtrConfigProviderContext } from '@kbn/test';
import { serializeApmGlobalLabels } from '../../utils';
const JOURNEY_ECOMMERCE_DASHBOARD = 'ecommerce_dashboard';
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const performanceConfig = await readConfigFile(require.resolve('../base.config'));
const testFiles = [require.resolve(`./${JOURNEY_ECOMMERCE_DASHBOARD}`)];
const testFiles = [require.resolve('./ecommerce_dashboard')];
const config = {
testFiles,
@ -21,19 +19,15 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const apmGlobalLabels = {
...performanceConfig.get('kbnTestServer').env.ELASTIC_APM_GLOBAL_LABELS,
ftrConfig: `x-pack/test/performance/tests/journeys/${JOURNEY_ECOMMERCE_DASHBOARD}/config.ts`,
ftrConfig: `x-pack/test/performance/tests/journeys/ecommerce_dashboard/config.ts`,
performancePhase: process.env.TEST_PERFORMANCE_PHASE,
journeyName: JOURNEY_ECOMMERCE_DASHBOARD,
journeyName: 'ecommerce_dashboard',
};
return {
...config,
kbnTestServer: {
...config.kbnTestServer,
serverArgs: [
...performanceConfig.get('kbnTestServer.serverArgs'),
`--telemetry.labels.journeyName=${JOURNEY_ECOMMERCE_DASHBOARD}`,
],
env: {
...config.kbnTestServer.env,
ELASTIC_APM_GLOBAL_LABELS: serializeApmGlobalLabels(apmGlobalLabels),

12
x-pack/test/performance/journeys/flight_dashboard/config.ts
View file

@ -7,12 +7,10 @@
import { FtrConfigProviderContext } from '@kbn/test';
import { serializeApmGlobalLabels } from '../../utils';
const JOURNEY_FLIGHT_DASHBOARD = 'flight_dashboard';
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const performanceConfig = await readConfigFile(require.resolve('../base.config'));
const testFiles = [require.resolve(`./${JOURNEY_FLIGHT_DASHBOARD}`)];
const testFiles = [require.resolve('./flight_dashboard')];
const config = {
testFiles,
@ -21,19 +19,15 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const apmGlobalLabels = {
...performanceConfig.get('kbnTestServer').env.ELASTIC_APM_GLOBAL_LABELS,
ftrConfig: `x-pack/test/performance/tests/journeys/${JOURNEY_FLIGHT_DASHBOARD}/config.ts`,
ftrConfig: `x-pack/test/performance/tests/journeys/flight_dashboard/config.ts`,
performancePhase: process.env.TEST_PERFORMANCE_PHASE,
journeyName: JOURNEY_FLIGHT_DASHBOARD,
journeyName: 'flight_dashboard',
};
return {
...config,
kbnTestServer: {
...config.kbnTestServer,
serverArgs: [
...performanceConfig.get('kbnTestServer.serverArgs'),
`--telemetry.labels.journeyName=${JOURNEY_FLIGHT_DASHBOARD}`,
],
env: {
...config.kbnTestServer.env,
ELASTIC_APM_GLOBAL_LABELS: serializeApmGlobalLabels(apmGlobalLabels),

12
x-pack/test/performance/journeys/login/config.ts
View file

@ -7,12 +7,10 @@
import { FtrConfigProviderContext } from '@kbn/test';
import { serializeApmGlobalLabels } from '../../utils';
const JOURNEY_LOGIN = 'login';
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const performanceConfig = await readConfigFile(require.resolve('../base.config'));
const testFiles = [require.resolve(`./${JOURNEY_LOGIN}`)];
const testFiles = [require.resolve('./login')];
const config = {
testFiles,
@ -44,19 +42,15 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const apmGlobalLabels = {
...performanceConfig.get('kbnTestServer').env.ELASTIC_APM_GLOBAL_LABELS,
ftrConfig: `x-pack/test/performance/tests/journeys/${JOURNEY_LOGIN}/config.ts`,
ftrConfig: `x-pack/test/performance/tests/journeys/login/config.ts`,
performancePhase: process.env.TEST_PERFORMANCE_PHASE,
journeyName: JOURNEY_LOGIN,
journeyName: 'login',
};
return {
...config,
kbnTestServer: {
...config.kbnTestServer,
serverArgs: [
...performanceConfig.get('kbnTestServer.serverArgs'),
`--telemetry.labels.journeyName=${JOURNEY_LOGIN}`,
],
env: {
...config.kbnTestServer.env,
ELASTIC_APM_GLOBAL_LABELS: serializeApmGlobalLabels(apmGlobalLabels),

12
x-pack/test/performance/journeys/many_fields_discover/config.ts
View file

@ -7,12 +7,10 @@
import { FtrConfigProviderContext } from '@kbn/test';
import { serializeApmGlobalLabels } from '../../utils';
const JOURNEY_MANY_FIELDS_DISCOVER = 'many_fields_discover';
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const performanceConfig = await readConfigFile(require.resolve('../base.config'));
const testFiles = [require.resolve(`./${JOURNEY_MANY_FIELDS_DISCOVER}`)];
const testFiles = [require.resolve('./many_fields_discover')];
const config = {
testFiles,
@ -21,19 +19,15 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const apmGlobalLabels = {
...performanceConfig.get('kbnTestServer').env.ELASTIC_APM_GLOBAL_LABELS,
ftrConfig: `x-pack/test/performance/tests/journeys/${JOURNEY_MANY_FIELDS_DISCOVER}/config.ts`,
ftrConfig: `x-pack/test/performance/tests/journeys/many_fields_discover/config.ts`,
performancePhase: process.env.TEST_PERFORMANCE_PHASE,
journeyName: JOURNEY_MANY_FIELDS_DISCOVER,
journeyName: 'many_fields_discover',
};
return {
...config,
kbnTestServer: {
...config.kbnTestServer,
serverArgs: [
...performanceConfig.get('kbnTestServer.serverArgs'),
`--telemetry.labels.journeyName=${JOURNEY_MANY_FIELDS_DISCOVER}`,
],
env: {
...config.kbnTestServer.env,
ELASTIC_APM_GLOBAL_LABELS: serializeApmGlobalLabels(apmGlobalLabels),

12
x-pack/test/performance/journeys/promotion_tracking_dashboard/config.ts
View file

@ -7,12 +7,10 @@
import { FtrConfigProviderContext } from '@kbn/test';
import { serializeApmGlobalLabels } from '../../utils';
const JOURNEY_PROMOTION_TRACKING_DASHBOARD = 'promotion_tracking_dashboard';
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const performanceConfig = await readConfigFile(require.resolve('../base.config'));
const testFiles = [require.resolve(`./${JOURNEY_PROMOTION_TRACKING_DASHBOARD}`)];
const testFiles = [require.resolve('./promotion_tracking_dashboard')];
const config = {
testFiles,
@ -44,19 +42,15 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const apmGlobalLabels = {
...performanceConfig.get('kbnTestServer').env.ELASTIC_APM_GLOBAL_LABELS,
ftrConfig: `x-pack/test/performance/tests/journeys/${JOURNEY_PROMOTION_TRACKING_DASHBOARD}/config.ts`,
ftrConfig: `x-pack/test/performance/tests/journeys/promotion_tracking_dashboard/config.ts`,
performancePhase: process.env.TEST_PERFORMANCE_PHASE,
journeyName: JOURNEY_PROMOTION_TRACKING_DASHBOARD,
journeyName: 'promotion_tracking_dashboard',
};
return {
...config,
kbnTestServer: {
...config.kbnTestServer,
serverArgs: [
...performanceConfig.get('kbnTestServer.serverArgs'),
`--telemetry.labels.journeyName=${JOURNEY_PROMOTION_TRACKING_DASHBOARD}`,
],
env: {
...config.kbnTestServer.env,
ELASTIC_APM_GLOBAL_LABELS: serializeApmGlobalLabels(apmGlobalLabels),

14
x-pack/test/performance/journeys/web_logs_dashboard/config.ts
View file

@ -7,12 +7,10 @@
import { FtrConfigProviderContext } from '@kbn/test';
import { serializeApmGlobalLabels } from '../../utils';
const JOURNEY_WEBLOGS_DASHBOARD = 'web_logs_dashboard';
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
export default async function webLogsDashboard({ readConfigFile, log }: FtrConfigProviderContext) {
const performanceConfig = await readConfigFile(require.resolve('../base.config'));
const testFiles = [require.resolve(`./${JOURNEY_WEBLOGS_DASHBOARD}`)];
const testFiles = [require.resolve('./web_logs_dashboard')];
const config = {
testFiles,
@ -21,19 +19,15 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const apmGlobalLabels = {
...performanceConfig.get('kbnTestServer').env.ELASTIC_APM_GLOBAL_LABELS,
ftrConfig: `x-pack/test/performance/tests/journeys/${JOURNEY_WEBLOGS_DASHBOARD}/config.ts`,
ftrConfig: `x-pack/test/performance/tests/journeys/web_logs_dashboard/config.ts`,
performancePhase: process.env.TEST_PERFORMANCE_PHASE,
journeyName: JOURNEY_WEBLOGS_DASHBOARD,
journeyName: 'web_logs_dashboard',
};
return {
...config,
kbnTestServer: {
...config.kbnTestServer,
serverArgs: [
...performanceConfig.get('kbnTestServer.serverArgs'),
`--telemetry.labels.journeyName=${JOURNEY_WEBLOGS_DASHBOARD}`,
],
env: {
...config.kbnTestServer.env,
ELASTIC_APM_GLOBAL_LABELS: serializeApmGlobalLabels(apmGlobalLabels),