From: Guillaume Thouvenin <gthouvenin@mirantis.com>
Date: Fri, 21 Oct 2016 14:00:41 +0000 (+0200)
Subject: Remove deprecated option [cluster]
X-Git-Tag: 2016.12~1^2~11^2~2
X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Finfluxdb.git;a=commitdiff_plain;h=54104a07e8cd5d41cc3cf802f647ba79d29f62c7;ds=sidebyside

Remove deprecated option [cluster]

This patch replaces the deprecated config option [cluster] with
[coordinator]
---

diff --git a/influxdb/files/influxdb.conf b/influxdb/files/influxdb.conf
index 76c9633..259a71a 100644
--- a/influxdb/files/influxdb.conf
+++ b/influxdb/files/influxdb.conf
@@ -102,20 +102,19 @@ reporting-disabled = false
 {%- endif %}
 
 ###
-### [cluster]
+### [coordinator]
 ###
-### Controls non-Raft cluster behavior, which generally includes how data is
-### shared across shards.
+### Controls the clustering service configuration.
 ###
 
-[cluster]
-  shard-writer-timeout = "5s" # The time within which a remote shard must respond to a write request.
-  write-timeout = "10s" # The time within which a write request must complete on the cluster.
-  max-concurrent-queries = 0 # The maximum number of concurrent queries that can run. 0 to disable.
-  query-timeout = "0s" # The time within a query must complete before being killed automatically. 0s to disable.
-  max-select-point = 0 # The maximum number of points to scan in a query. 0 to disable.
-  max-select-series = 0 # The maximum number of series to select in a query. 0 to disable.
-  max-select-buckets = 0 # The maximum number of buckets to select in an aggregate query. 0 to disable.
+[coordinator]
+  write-timeout = "10s"
+  max-concurrent-queries = 0
+  query-timeout = "0"
+  log-queries-after = "0"
+  max-select-point = 0
+  max-select-series = 0
+  max-select-buckets = 0
 
 ###
 ### [retention]