From 74997a126e8aa0a6e8d96ab6a58056bc99a5e047 Mon Sep 17 00:00:00 2001
From: Miguel de la Cruz <miguel@mcrx.me>
Date: Fri, 31 May 2019 17:25:11 +0100
Subject: [PATCH] Change ES trace config type from boolean to string (#11019)

---
 config/default.json | 3 ++-
 model/config.go     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/config/default.json b/config/default.json
index b1a21dda21..021c54b562 100644
--- a/config/default.json
+++ b/config/default.json
@@ -397,7 +397,8 @@
         "IndexPrefix": "",
         "LiveIndexingBatchSize": 1,
         "BulkIndexingTimeWindowSeconds": 3600,
-        "RequestTimeoutSeconds": 30
+        "RequestTimeoutSeconds": 30,
+        "Trace": ""
     },
     "DataRetentionSettings": {
         "EnableMessageDeletion": false,
diff --git a/model/config.go b/model/config.go
index 9e84f43acf..5524a393ec 100644
--- a/model/config.go
+++ b/model/config.go
@@ -1991,7 +1991,7 @@ type ElasticsearchSettings struct {
 	LiveIndexingBatchSize         *int    `restricted:"true"`
 	BulkIndexingTimeWindowSeconds *int    `restricted:"true"`
 	RequestTimeoutSeconds         *int    `restricted:"true"`
-	Trace                         *bool   `restricted:"true"`
+	Trace                         *string `restricted:"true"`
 }
 
 func (s *ElasticsearchSettings) SetDefaults() {
@@ -2072,7 +2072,7 @@ func (s *ElasticsearchSettings) SetDefaults() {
 	}
 
 	if s.Trace == nil {
-		s.Trace = NewBool(false)
+		s.Trace = NewString("")
 	}
 }