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

[APM] Fixes incorrect index config names #114904

Merged
merged 1 commit into from
Oct 13, 2021
Merged

[APM] Fixes incorrect index config names #114904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,12 +211,12 @@ kibana_vars=(
xpack.alerts.invalidateApiKeysTask.interval
xpack.alerts.invalidateApiKeysTask.removalDelay
xpack.apm.enabled
xpack.apm.indices.errors
xpack.apm.indices.metrics
xpack.apm.indices.error
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a note to anyone else reviewing this part - these settings have not been released, so OK to just rename.

xpack.apm.indices.metric
xpack.apm.indices.onboarding
xpack.apm.indices.sourcemaps
xpack.apm.indices.spans
xpack.apm.indices.transactions
xpack.apm.indices.sourcemap
xpack.apm.indices.span
xpack.apm.indices.transaction
xpack.apm.maxServiceEnvironments
xpack.apm.searchAggregatedTransactions
xpack.apm.serviceMapEnabled
Expand Down
20 changes: 10 additions & 10 deletions x-pack/plugins/apm/ftr_e2e/cypress/integration/power_user/no_data_screen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ describe('No data screen', () => {
url: apmIndicesSaveURL,
method: 'POST',
body: {
sourcemaps: 'foo-*',
errors: 'foo-*',
sourcemap: 'foo-*',
error: 'foo-*',
onboarding: 'foo-*',
spans: 'foo-*',
transactions: 'foo-*',
metrics: 'foo-*',
span: 'foo-*',
transaction: 'foo-*',
metric: 'foo-*',
},
headers: {
'kbn-xsrf': true,
Expand All @@ -49,12 +49,12 @@ describe('No data screen', () => {
url: apmIndicesSaveURL,
method: 'POST',
body: {
sourcemaps: '',
errors: '',
sourcemap: '',
error: '',
onboarding: '',
spans: '',
transactions: '',
metrics: '',
span: '',
transaction: '',
metric: '',
},
headers: { 'kbn-xsrf': true },
auth: { user: 'apm_power_user', pass: 'changeme' },
Expand Down
20 changes: 10 additions & 10 deletions x-pack/plugins/apm/public/utils/testHelpers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,12 @@ interface MockSetup {
config: APMConfig;
uiFilters: UxUIFilters;
indices: {
sourcemaps: string;
errors: string;
sourcemap: string;
error: string;
onboarding: string;
spans: string;
transactions: string;
metrics: string;
span: string;
transaction: string;
metric: string;
apmAgentConfigurationIndex: string;
apmCustomLinkIndex: string;
};
Expand Down Expand Up @@ -176,12 +176,12 @@ export async function inspectSearchParams(
) as APMConfig,
uiFilters: {},
indices: {
sourcemaps: 'myIndex',
errors: 'myIndex',
sourcemap: 'myIndex',
error: 'myIndex',
onboarding: 'myIndex',
spans: 'myIndex',
transactions: 'myIndex',
metrics: 'myIndex',
span: 'myIndex',
transaction: 'myIndex',
metric: 'myIndex',
apmAgentConfigurationIndex: 'myIndex',
apmCustomLinkIndex: 'myIndex',
},
Expand Down
10 changes: 5 additions & 5 deletions ..._saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects/mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,22 +189,22 @@
},
"apm-indices": {
"properties": {
"errors": {
"error": {
"type": "keyword"
},
"metrics": {
"metric": {
"type": "keyword"
},
"onboarding": {
"type": "keyword"
},
"sourcemaps": {
"sourcemap": {
"type": "keyword"
},
"spans": {
"span": {
"type": "keyword"
},
"transactions": {
"transaction": {
"type": "keyword"
}
}
Expand Down
10 changes: 5 additions & 5 deletions ..._api_integration/fixtures/es_archiver/encrypted_saved_objects_different_key/mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,22 +216,22 @@
},
"apm-indices": {
"properties": {
"errors": {
"error": {
"type": "keyword"
},
"metrics": {
"metric": {
"type": "keyword"
},
"onboarding": {
"type": "keyword"
},
"sourcemaps": {
"sourcemap": {
"type": "keyword"
},
"spans": {
"span": {
"type": "keyword"
},
"transactions": {
"transaction": {
"type": "keyword"
}
}
Expand Down
10 changes: 5 additions & 5 deletions ...t/encrypted_saved_objects_api_integration/fixtures/es_archiver/key_rotation/mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,22 +214,22 @@
},
"apm-indices": {
"properties": {
"errors": {
"error": {
"type": "keyword"
},
"metrics": {
"metric": {
"type": "keyword"
},
"onboarding": {
"type": "keyword"
},
"sourcemaps": {
"sourcemap": {
"type": "keyword"
},
"spans": {
"span": {
"type": "keyword"
},
"transactions": {
"transaction": {
"type": "keyword"
}
}
Expand Down
10 changes: 5 additions & 5 deletions x-pack/test/functional/es_archives/action_task_params/mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,22 +206,22 @@
},
"apm-indices": {
"properties": {
"errors": {
"error": {
"type": "keyword"
},
"metrics": {
"metric": {
"type": "keyword"
},
"onboarding": {
"type": "keyword"
},
"sourcemaps": {
"sourcemap": {
"type": "keyword"
},
"spans": {
"span": {
"type": "keyword"
},
"transactions": {
"transaction": {
"type": "keyword"
}
}
Expand Down
10 changes: 5 additions & 5 deletions x-pack/test/functional/es_archives/actions/mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,22 +202,22 @@
},
"apm-indices": {
"properties": {
"errors": {
"error": {
"type": "keyword"
},
"metrics": {
"metric": {
"type": "keyword"
},
"onboarding": {
"type": "keyword"
},
"sourcemaps": {
"sourcemap": {
"type": "keyword"
},
"spans": {
"span": {
"type": "keyword"
},
"transactions": {
"transaction": {
"type": "keyword"
}
}
Expand Down
10 changes: 5 additions & 5 deletions x-pack/test/functional/es_archives/alerts_legacy/mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,22 +198,22 @@
},
"apm-indices": {
"properties": {
"errors": {
"error": {
"type": "keyword"
},
"metrics": {
"metric": {
"type": "keyword"
},
"onboarding": {
"type": "keyword"
},
"sourcemaps": {
"sourcemap": {
"type": "keyword"
},
"spans": {
"span": {
"type": "keyword"
},
"transactions": {
"transaction": {
"type": "keyword"
}
}
Expand Down
10 changes: 5 additions & 5 deletions x-pack/test/functional/es_archives/canvas/reports/mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,22 +229,22 @@
},
"apm-indices": {
"properties": {
"errors": {
"error": {
"type": "keyword"
},
"metrics": {
"metric": {
"type": "keyword"
},
"onboarding": {
"type": "keyword"
},
"sourcemaps": {
"sourcemap": {
"type": "keyword"
},
"spans": {
"span": {
"type": "keyword"
},
"transactions": {
"transaction": {
"type": "keyword"
}
}
Expand Down
10 changes: 5 additions & 5 deletions x-pack/test/functional/es_archives/cases/migrations/7.10.0/mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,22 +199,22 @@
},
"apm-indices": {
"properties": {
"errors": {
"error": {
"type": "keyword"
},
"metrics": {
"metric": {
"type": "keyword"
},
"onboarding": {
"type": "keyword"
},
"sourcemaps": {
"sourcemap": {
"type": "keyword"
},
"spans": {
"span": {
"type": "keyword"
},
"transactions": {
"transaction": {
"type": "keyword"
}
}
Expand Down
10 changes: 5 additions & 5 deletions x-pack/test/functional/es_archives/cases/migrations/7.11.1/mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,22 +254,22 @@
},
"apm-indices": {
"properties": {
"errors": {
"error": {
"type": "keyword"
},
"metrics": {
"metric": {
"type": "keyword"
},
"onboarding": {
"type": "keyword"
},
"sourcemaps": {
"sourcemap": {
"type": "keyword"
},
"spans": {
"span": {
"type": "keyword"
},
"transactions": {
"transaction": {
"type": "keyword"
}
}
Expand Down
10 changes: 5 additions & 5 deletions x-pack/test/functional/es_archives/cases/migrations/7.13.2/mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,22 +260,22 @@
},
"apm-indices": {
"properties": {
"errors": {
"error": {
"type": "keyword"
},
"metrics": {
"metric": {
"type": "keyword"
},
"onboarding": {
"type": "keyword"
},
"sourcemaps": {
"sourcemap": {
"type": "keyword"
},
"spans": {
"span": {
"type": "keyword"
},
"transactions": {
"transaction": {
"type": "keyword"
}
}
Expand Down
10 changes: 5 additions & 5 deletions x-pack/test/functional/es_archives/cases/migrations/7.13_user_actions/mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,22 +261,22 @@
},
"apm-indices": {
"properties": {
"errors": {
"error": {
"type": "keyword"
},
"metrics": {
"metric": {
"type": "keyword"
},
"onboarding": {
"type": "keyword"
},
"sourcemaps": {
"sourcemap": {
"type": "keyword"
},
"spans": {
"span": {
"type": "keyword"
},
"transactions": {
"transaction": {
"type": "keyword"
}
}
Expand Down
Loading