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

[APM] Revert to using apm-* as default indices #22445

Merged
merged 2 commits into from
Aug 28, 2018
Merged

[APM] Revert to using apm-* as default indices #22445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95e9aba
[APM] Revert to using apm-* as default indices
sorenlouv Aug 28, 2018
a19e4c4
Update docs
sorenlouv Aug 28, 2018
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
8 changes: 4 additions & 4 deletions docs/settings/apm-settings.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ xpack.apm.ui.enabled:: Set to `false` to hide the APM plugin {kib} from the menu

apm_oss.indexPattern:: Index pattern is used for integrations with Machine Learning and Kuery Bar. It must match all apm indices. Defaults to `apm-*`.

apm_oss.errorIndices:: Matcher for indices containing error documents. Defaults to `apm-\*-error-*`.
apm_oss.errorIndices:: Matcher for indices containing error documents. Defaults to `apm-\*`.

apm_oss.onboardingIndices:: Matcher for indices containing onboarding documents. Defaults to `apm-\*-onboarding-*`.
apm_oss.onboardingIndices:: Matcher for indices containing onboarding documents. Defaults to `apm-\*`.

apm_oss.spanIndices:: Matcher for indices containing span documents. Defaults to `apm-\*-span-*`.
apm_oss.spanIndices:: Matcher for indices containing span documents. Defaults to `apm-\*`.

apm_oss.transactionIndices:: Matcher for indices containing transaction documents. Defaults to `apm-\*-transaction-*`.
apm_oss.transactionIndices:: Matcher for indices containing transaction documents. Defaults to `apm-\*`.
8 changes: 4 additions & 4 deletions src/core_plugins/apm_oss/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ export default function apmOss(kibana) {
indexPattern: Joi.string().default('apm-*'),

// ES Indices
errorIndices: Joi.string().default('apm-*-error-*'),
onboardingIndices: Joi.string().default('apm-*-onboarding-*'),
spanIndices: Joi.string().default('apm-*-span-*'),
transactionIndices: Joi.string().default('apm-*-transaction-*'),
errorIndices: Joi.string().default('apm-*'),
onboardingIndices: Joi.string().default('apm-*'),
spanIndices: Joi.string().default('apm-*'),
transactionIndices: Joi.string().default('apm-*'),
}).default();
},
});
Expand Down