Merge remote-tracking branch 'origin/prod_changes'

docker-compose.yml

@@ -9,14 +9,10 @@ services:
    - TF_HOST=192.168.2.160
    - TF_PORT=4223
    - TF_ID=DYC
-   - INFLUX_URL=http://influxdb:8086
    - INFLUXDB_DB=mydb
  influxdb:
-  image: influxdb:1.5-alpine
-#TODO: 1.7-alpine
+  image: influxdb:1.7-alpine
   command: influxd -config /etc/influxdb/influxdb.conf
-  ports:
-   - "8086:8086"
   volumes:
    - "./influxdb/:/var/lib/influxdb"
   environment:
@@ -25,11 +21,9 @@ services:
    #- INLFUXDB_USER_PASSWORD=<secret>
  grafana:
   image: grafana/grafana
-#TODO: 6.2.5
   ports:
    - "3000:3000"
   volumes:
-#   - "./grafana_etc/:/etc/grafana/"
    - "./grafana_lib/:/var/lib/grafana/"