From d9ce5cf6c0522356e0d92ba5b1b514c507619a8f Mon Sep 17 00:00:00 2001
From: Bertrand Lallau <bertrand.lallau@thalesgroup.com>
Date: Mon, 3 Apr 2017 10:43:44 +0200
Subject: [PATCH] Fix outdated InfluxDB configuration

Actual InfluxDB config is deprecated, it must be updated based on the
following documentation:
https://docs.influxdata.com/influxdb/v1.2/administration/config

* remove following options:
  lease-duration = "1m0s"
  pprof-enabled = false
https://github.com/influxdata/influxdb/commit/22173acb707af833b832126f8631e0afda445ea9

* rename "cluster" section to "coordination":
https://github.com/influxdata/influxdb/commit/75e89e35d80dfad65146c8d8a1df2d7b9930c99a

* remove shard-writer-timeout option:
  shard-writer-timeout = "5s"
https://github.com/influxdata/influxdb/commit/db7d58c867513d019c1b9f1718772062b5c491bc

Closes-Bug: #1678982
Change-Id: Id905336123bc5aa76d6e6903a82f915c3702669f
---
 ansible/roles/influxdb/templates/influxdb.conf.j2 | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/ansible/roles/influxdb/templates/influxdb.conf.j2 b/ansible/roles/influxdb/templates/influxdb.conf.j2
index cded6fbe68..efd585989f 100644
--- a/ansible/roles/influxdb/templates/influxdb.conf.j2
+++ b/ansible/roles/influxdb/templates/influxdb.conf.j2
@@ -1,21 +1,17 @@
 reporting-disabled = false
 [logging]
-level = "info"
-file = "/var/log/kolla/influxdb/influxdb.log"
+  level = "info"
+  file = "/var/log/kolla/influxdb/influxdb.log"
 [meta]
   dir = "/var/lib/influxdb/meta"
   retention-autocreate = true
   logging-enabled = true
-  pprof-enabled = false
-  lease-duration = "1m0s"
 [data]
-  enabled = true
   dir = "/var/lib/influxdb/data"
   wal-dir = "/var/lib/influxdb/wal"
   wal-logging-enabled = true
   data-logging-enabled = true
-[cluster]
-  shard-writer-timeout = "5s"
+[coordinator]
   write-timeout = "10s"
   max-concurrent-queries = 0
   query-timeout = "0s"