From fe53b515baaf327887ee39036ef6af3937902ee6 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 19 Mar 2019 10:51:58 -0700 Subject: [PATCH] Update schema version in monitoring index name (#11315) * Update schema version in monitoring index name * Update tests (cherry picked from commit 55aba204236ddee9233f74fc2f2e6eb183c2bc50) --- metricbeat/helper/elastic/elastic.go | 2 +- metricbeat/helper/elastic/elastic_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/metricbeat/helper/elastic/elastic.go b/metricbeat/helper/elastic/elastic.go index 207768a2491..e7cc0827ab4 100644 --- a/metricbeat/helper/elastic/elastic.go +++ b/metricbeat/helper/elastic/elastic.go @@ -77,7 +77,7 @@ func (p Product) String() string { // MakeXPackMonitoringIndexName method returns the name of the monitoring index for // a given product { elasticsearch, kibana, logstash, beats } func MakeXPackMonitoringIndexName(product Product) string { - const version = "6" + const version = "7" return fmt.Sprintf(".monitoring-%v-%v-mb", product.xPackMonitoringIndexString(), version) } diff --git a/metricbeat/helper/elastic/elastic_test.go b/metricbeat/helper/elastic/elastic_test.go index 83c8830365e..71cf1d6023f 100644 --- a/metricbeat/helper/elastic/elastic_test.go +++ b/metricbeat/helper/elastic/elastic_test.go @@ -35,22 +35,22 @@ func TestMakeXPackMonitoringIndexName(t *testing.T) { { "Elasticsearch monitoring index", Elasticsearch, - ".monitoring-es-6-mb", + ".monitoring-es-7-mb", }, { "Kibana monitoring index", Kibana, - ".monitoring-kibana-6-mb", + ".monitoring-kibana-7-mb", }, { "Logstash monitoring index", Logstash, - ".monitoring-logstash-6-mb", + ".monitoring-logstash-7-mb", }, { "Beats monitoring index", Beats, - ".monitoring-beats-6-mb", + ".monitoring-beats-7-mb", }, }