From 6aba17ff9df2f4bffed53f58cbfb980aff0381d3 Mon Sep 17 00:00:00 2001
From: Miguel de la Cruz <miguel@mcrx.me>
Date: Thu, 30 May 2019 16:48:19 +0100
Subject: [PATCH] [MM-15637] Add Trace config option to the Elasticsearch block
 (#11008)

---
 app/diagnostics.go | 1 +
 model/config.go    | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/app/diagnostics.go b/app/diagnostics.go
index 23ebb69778..0b437d6ec2 100644
--- a/app/diagnostics.go
+++ b/app/diagnostics.go
@@ -571,6 +571,7 @@ func (a *App) trackConfig() {
 		"live_indexing_batch_size":          *cfg.ElasticsearchSettings.LiveIndexingBatchSize,
 		"bulk_indexing_time_window_seconds": *cfg.ElasticsearchSettings.BulkIndexingTimeWindowSeconds,
 		"request_timeout_seconds":           *cfg.ElasticsearchSettings.RequestTimeoutSeconds,
+		"trace":                             *cfg.ElasticsearchSettings.Trace,
 	})
 
 	a.SendDiagnostic(TRACK_CONFIG_PLUGIN, map[string]interface{}{
diff --git a/model/config.go b/model/config.go
index 891a297305..9e84f43acf 100644
--- a/model/config.go
+++ b/model/config.go
@@ -1991,6 +1991,7 @@ type ElasticsearchSettings struct {
 	LiveIndexingBatchSize         *int    `restricted:"true"`
 	BulkIndexingTimeWindowSeconds *int    `restricted:"true"`
 	RequestTimeoutSeconds         *int    `restricted:"true"`
+	Trace                         *bool   `restricted:"true"`
 }
 
 func (s *ElasticsearchSettings) SetDefaults() {
@@ -2069,6 +2070,10 @@ func (s *ElasticsearchSettings) SetDefaults() {
 	if s.RequestTimeoutSeconds == nil {
 		s.RequestTimeoutSeconds = NewInt(ELASTICSEARCH_SETTINGS_DEFAULT_REQUEST_TIMEOUT_SECONDS)
 	}
+
+	if s.Trace == nil {
+		s.Trace = NewBool(false)
+	}
 }
 
 type DataRetentionSettings struct {