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

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

* Update docs

# Conflicts:
#	docs/settings/apm-settings.asciidoc
This commit is contained in:
Søren Louv-Jansen 2018-09-08 16:54:03 +02:00 committed by GitHub
parent a726dd1014
commit 800dbfead0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions

View file

@ -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-*`.

View file

@ -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();
},
});