update to new tsdbgw that uses sarama again

Author: Dieterbe

docker/docker-dev-custom-cfg-kafka/docker-compose.yml

@@ -137,7 +137,7 @@ services:
 
   tsdb-gw:
     hostname: tsdb-gw
-    image: raintank/tsdb-gw:0.8.0-111-g5fa198b
+    image: raintank/tsdb-gw:0.8.0-151-g3884aaa
     ports:
      - "9000:80"
     volumes:

docker/docker-dev-custom-cfg-kafka/gw/tsdb-gw.ini

@@ -1,19 +1,35 @@
-log-level = 2
-addr = :80
+graphite-url = http://metrictank:8080
+metrictank-url = http://metrictank:6060
+
+# auth
+auth-file-path = /etc/gw/auth.ini
 admin-key = not_very_secret_key
+
+# api
+addr = :80
 api-auth-plugin = file
+ssl = false
+cert-file =
+key-file =
 
-kafka-tcp-addr = kafka:9092
+# carbon ingest
+carbon-enabled = false
+carbon-addr = 0.0.0.0:2003
+carbon-auth-plugin = file
+carbon-flush-interval = 1s
+carbon-concurrency = 1
+carbon-buffer-size = 100000
+carbon-non-blocking-buffer = false
 
+# kafka publisher
+kafka-tcp-addr = kafka:9092
 metrics-topic = mdm
-metrics-kafka-comp = none
+metrics-kafka-comp = snappy
 metrics-publish = true
 metrics-partition-scheme = bySeries
-metrics-max-in-flight = 1000000
-metrics-buffer-max-msgs = 100000
-metrics-buffer-max-ms = 100
-batch-num-messages = 10000
-
+metrics-flush-freq = 50ms
+metrics-max-messages = 5000
+schemas-file = /etc/metrictank/storage-schemas.conf
 # enable optimized MetricPoint payload
 v2 = true
 # encode org-id in messages
@@ -23,25 +39,18 @@ v2-stale-thresh = 6h
 # check interval for expiring keys
 v2-prune-interval = 1h
 
-graphite-url = http://metrictank:8080
-metrictank-url = http://metrictank:6060
+# logging
+log-level = 2
+
+# usage tracking
+tsdb-stats-enabled = false
+tsdb-stats-addr = localhost:2004
 
+# stats and tracing
 stats-enabled = true
 stats-prefix = tsdb-gw.stats.default.$hostname
 stats-addr = metrictank:2003
 stats-interval = 1
 stats-buffer-size = 20000
-
-tsdb-stats-enabled = false
-tsdb-stats-addr = localhost:2004
-
-carbon-auth-plugin = file
-carbon-enabled = false
-carbon-addr = 0.0.0.0:2003
-schemas-file = /etc/metrictank/storage-schemas.conf
-carbon-flush-interval = 1s
-carbon-concurrency = 1
-carbon-buffer-size = 100000
-carbon-non-blocking-buffer = false
-
-auth-file-path = /etc/gw/auth.ini
+tracing-enabled = false
+tracing-addr = localhost:6831