From 11488d505561c87628ceb19c931a1fde4f3079da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= <sorenlouv@gmail.com>
Date: Tue, 28 Aug 2018 17:17:53 +0200
Subject: [PATCH] [APM] Revert to using apm-* as default indices (#22445)

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

* Update docs
---
 docs/settings/apm-settings.asciidoc | 8 ++++----
 src/core_plugins/apm_oss/index.js   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/settings/apm-settings.asciidoc b/docs/settings/apm-settings.asciidoc
index fdbbee30ecad..6e785818c09c 100644
--- a/docs/settings/apm-settings.asciidoc
+++ b/docs/settings/apm-settings.asciidoc
@@ -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-\*`.
diff --git a/src/core_plugins/apm_oss/index.js b/src/core_plugins/apm_oss/index.js
index 69ff8901d2f3..fcbc188f8906 100644
--- a/src/core_plugins/apm_oss/index.js
+++ b/src/core_plugins/apm_oss/index.js
@@ -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();
     },
   });