added TemplateCustomSettings as Dictionary<string,string> (#311)

serilog-contrib · Jan 22, 2020 · a9359d1 · a9359d1
1 parent 91748ad
commit a9359d1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ElasticsearchSinkOptions.cs b/src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ElasticsearchSinkOptions.cs
@@ -58,6 +58,12 @@ public class ElasticsearchSinkOptions
         /// </summary>
         public Func<object> GetTemplateContent { get; set; }
 
+        /// <summary>
+        /// When using the <see cref="AutoRegisterTemplate"/> feature, this allows you to override the default template content.
+        /// If not provided, a default template that is optimized to deal with Serilog events is used.
+        /// </summary>
+        public Dictionary<string,string> TemplateCustomSettings { get; set; }
+
         /// <summary>
         /// When using the <see cref="AutoRegisterTemplate"/> feature, this allows you to overwrite the template in Elasticsearch if it already exists.
         /// Defaults to: false

diff --git a/src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ElasticsearchSinkState.cs b/src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ElasticsearchSinkState.cs
@@ -160,7 +160,7 @@ public void RegisterTemplateIfNeeded()
                 {
                     var templateExistsResponse = _client.Indices.TemplateExistsForAll<VoidResponse>(_templateName, new IndexTemplateExistsRequestParameters()
                     {
-                        RequestConfiguration = new RequestConfiguration() { AllowedStatusCodes = new [] {200, 404} }
+                        RequestConfiguration = new RequestConfiguration() { AllowedStatusCodes = new[] { 200, 404 } }
                     });
                     if (templateExistsResponse.HttpStatusCode == 200)
                     {
@@ -173,7 +173,7 @@ public void RegisterTemplateIfNeeded()
                 var result = _client.Indices.PutTemplateForAll<StringResponse>(_templateName, GetTemplatePostData(),
                     new PutIndexTemplateRequestParameters
                     {
-                        IncludeTypeName = IncludeTypeName ? true : (bool?) null
+                        IncludeTypeName = IncludeTypeName ? true : (bool?)null
                     });
 
                 if (!result.Success)
@@ -222,15 +222,15 @@ private object GetTemplateData()
             if (_options.GetTemplateContent != null)
                 return _options.GetTemplateContent();
 
-            var settings = new Dictionary<string, string>
-            {
-                {"index.refresh_interval", "5s"}
-            };
+            var settings = _options.TemplateCustomSettings ?? new Dictionary<string, string>();
+
+            if (!settings.ContainsKey("index.refresh_interval"))
+                settings.Add("index.refresh_interval", "5s");
 
-            if (_options.NumberOfShards.HasValue)
+            if (_options.NumberOfShards.HasValue && !settings.ContainsKey("number_of_shards"))
                 settings.Add("number_of_shards", _options.NumberOfShards.Value.ToString());
 
-            if (_options.NumberOfReplicas.HasValue)
+            if (_options.NumberOfReplicas.HasValue && !settings.ContainsKey("number_of_replicas"))
                 settings.Add("number_of_replicas", _options.NumberOfReplicas.Value.ToString());
 
             return ElasticsearchTemplateProvider.GetTemplate(
@@ -245,14 +245,14 @@ private object GetTemplateData()
         public void DiscoverClusterVersion()
         {
             if (!_options.DetectElasticsearchVersion) return;
-            
+
             var response = _client.Cat.Nodes<StringResponse>(new CatNodesRequestParameters()
-            {   
-                Headers = new [] { "v"}
+            {
+                Headers = new[] { "v" }
             });
             if (!response.Success) return;
 
-            _discoveredVersion = response.Body.Split(new[] {'\r', '\n'}, StringSplitOptions.RemoveEmptyEntries)
+            _discoveredVersion = response.Body.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
                 .FirstOrDefault();
 
             if (_discoveredVersion?.StartsWith("7.") ?? false)