Merge remote-tracking branch 'origin/prod_changes'

master
agp8x 2020-06-04 14:24:46 +02:00
commit 72336a3f4a
1 changed files with 2 additions and 8 deletions

View File

@ -9,14 +9,10 @@ services:
- TF_HOST=192.168.2.160 - TF_HOST=192.168.2.160
- TF_PORT=4223 - TF_PORT=4223
- TF_ID=DYC - TF_ID=DYC
- INFLUX_URL=http://influxdb:8086
- INFLUXDB_DB=mydb - INFLUXDB_DB=mydb
influxdb: influxdb:
image: influxdb:1.5-alpine image: influxdb:1.7-alpine
#TODO: 1.7-alpine
command: influxd -config /etc/influxdb/influxdb.conf command: influxd -config /etc/influxdb/influxdb.conf
ports:
- "8086:8086"
volumes: volumes:
- "./influxdb/:/var/lib/influxdb" - "./influxdb/:/var/lib/influxdb"
environment: environment:
@ -25,12 +21,10 @@ services:
#- INLFUXDB_USER_PASSWORD=<secret> #- INLFUXDB_USER_PASSWORD=<secret>
grafana: grafana:
image: grafana/grafana image: grafana/grafana
#TODO: 6.2.5
ports: ports:
- "3000:3000" - "3000:3000"
volumes: volumes:
# - "./grafana_etc/:/etc/grafana/"
- "./grafana_lib/:/var/lib/grafana/" - "./grafana_lib/:/var/lib/grafana/"
# docker-compose exec influxdb influx_inspect export -database mydb -out /var/lib/influxdb/backup-text-dump -datadir /var/lib/influxdb/data -waldir /var/lib/influxdb/wal # docker-compose exec influxdb influx_inspect export -database mydb -out /var/lib/influxdb/backup-text-dump -datadir /var/lib/influxdb/data -waldir /var/lib/influxdb/wal