From 8a53b9fb5b909d13c8cc28a22129590f05845775 Mon Sep 17 00:00:00 2001 From: Jon Bloom Date: Sun, 29 Dec 2019 23:47:19 -0500 Subject: [PATCH 1/4] temporarily remove file --- init/docker/docker-compose.env.example | 12 ------ init/docker/docker-compose.yml | 55 -------------------------- 2 files changed, 67 deletions(-) delete mode 100644 init/docker/docker-compose.env.example delete mode 100644 init/docker/docker-compose.yml diff --git a/init/docker/docker-compose.env.example b/init/docker/docker-compose.env.example deleted file mode 100644 index 1222c0c8..00000000 --- a/init/docker/docker-compose.env.example +++ /dev/null @@ -1,12 +0,0 @@ -INFLUXDB_USERNAME=admin -INFLUXDB_PASSWORD=admin -INFLUXDB_DATABASE=unifi - -GRAFANA_USERNAME=admin -GRAFANA_PASSWORD=admin - -UP_BRANCH=stable -UP_UNIFI_USER=influx -UP_UNIFI_PASS= -UP_UNIFI_URL=https://127.0.0.1:8443 -UP_DEBUG=false diff --git a/init/docker/docker-compose.yml b/init/docker/docker-compose.yml deleted file mode 100644 index fcdbdddf..00000000 --- a/init/docker/docker-compose.yml +++ /dev/null @@ -1,55 +0,0 @@ -version: '2' -services: - influxdb: - restart: always - image: influxdb:latest - ports: - - '8086:8086' - volumes: - - influxdb-storage:/var/lib/influxdb - environment: - - INFLUXDB_DB=${INFLUXDB_DATABASE} - - INFLUXDB_ADMIN_USER=${INFLUXDB_USERNAME} - - INFLUXDB_ADMIN_PASSWORD=${INFLUXDB_PASSWORD} - chronograf: - image: chronograf:latest - restart: always - ports: - - '127.0.0.1:8888:8888' - volumes: - - chronograf-storage:/var/lib/chronograf - depends_on: - - influxdb - environment: - - INFLUXDB_URL=http://influxdb:8086 - - INFLUXDB_USERNAME=${INFLUXDB_USERNAME} - - INFLUXDB_PASSWORD=${INFLUXDB_PASSWORD} - grafana: - image: grafana/grafana:latest - restart: always - ports: - - '3000:3000' - volumes: - - grafana-storage:/var/lib/grafana - depends_on: - - influxdb - environment: - - GF_SECURITY_ADMIN_USER=${GRAFANA_USERNAME} - - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD} - - GF_INSTALL_PLUGINS=grafana-clock-panel,natel-discrete-panel,grafana-piechart-panel - unifi-poller: - restart: always - image: golift/unifi-poller:${UP_BRANCH} - environment: - - UP_INFLUX_DB=${INFLUXDB_DATABASE} - - UP_INFLUX_USER=${INFLUXDB_USERNAME} - - UP_INFLUX_PASS=${INFLUXDB_PASSWORD} - - UP_INFLUX_URL=http://influxdb:8086 - - UP_UNIFI_USER=${UP_UNIFI_USER} - - UP_UNIFI_PASS=${UP_UNIFI_PASS} - - UP_UNIFI_URL=${UP_UNIFI_URL} - - UP_DEBUG=${UP_DEBUG} -volumes: - influxdb-storage: - chronograf-storage: - grafana-storage: From 28165d06f1e038a447da514da9827b16b14249bb Mon Sep 17 00:00:00 2001 From: Jon Bloom Date: Sun, 29 Dec 2019 23:48:05 -0500 Subject: [PATCH 2/4] Revert "temporarily remove file" This reverts commit 8a53b9fb5b909d13c8cc28a22129590f05845775. --- init/docker/docker-compose.env.example | 12 ++++++ init/docker/docker-compose.yml | 55 ++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 init/docker/docker-compose.env.example create mode 100644 init/docker/docker-compose.yml diff --git a/init/docker/docker-compose.env.example b/init/docker/docker-compose.env.example new file mode 100644 index 00000000..1222c0c8 --- /dev/null +++ b/init/docker/docker-compose.env.example @@ -0,0 +1,12 @@ +INFLUXDB_USERNAME=admin +INFLUXDB_PASSWORD=admin +INFLUXDB_DATABASE=unifi + +GRAFANA_USERNAME=admin +GRAFANA_PASSWORD=admin + +UP_BRANCH=stable +UP_UNIFI_USER=influx +UP_UNIFI_PASS= +UP_UNIFI_URL=https://127.0.0.1:8443 +UP_DEBUG=false diff --git a/init/docker/docker-compose.yml b/init/docker/docker-compose.yml new file mode 100644 index 00000000..fcdbdddf --- /dev/null +++ b/init/docker/docker-compose.yml @@ -0,0 +1,55 @@ +version: '2' +services: + influxdb: + restart: always + image: influxdb:latest + ports: + - '8086:8086' + volumes: + - influxdb-storage:/var/lib/influxdb + environment: + - INFLUXDB_DB=${INFLUXDB_DATABASE} + - INFLUXDB_ADMIN_USER=${INFLUXDB_USERNAME} + - INFLUXDB_ADMIN_PASSWORD=${INFLUXDB_PASSWORD} + chronograf: + image: chronograf:latest + restart: always + ports: + - '127.0.0.1:8888:8888' + volumes: + - chronograf-storage:/var/lib/chronograf + depends_on: + - influxdb + environment: + - INFLUXDB_URL=http://influxdb:8086 + - INFLUXDB_USERNAME=${INFLUXDB_USERNAME} + - INFLUXDB_PASSWORD=${INFLUXDB_PASSWORD} + grafana: + image: grafana/grafana:latest + restart: always + ports: + - '3000:3000' + volumes: + - grafana-storage:/var/lib/grafana + depends_on: + - influxdb + environment: + - GF_SECURITY_ADMIN_USER=${GRAFANA_USERNAME} + - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD} + - GF_INSTALL_PLUGINS=grafana-clock-panel,natel-discrete-panel,grafana-piechart-panel + unifi-poller: + restart: always + image: golift/unifi-poller:${UP_BRANCH} + environment: + - UP_INFLUX_DB=${INFLUXDB_DATABASE} + - UP_INFLUX_USER=${INFLUXDB_USERNAME} + - UP_INFLUX_PASS=${INFLUXDB_PASSWORD} + - UP_INFLUX_URL=http://influxdb:8086 + - UP_UNIFI_USER=${UP_UNIFI_USER} + - UP_UNIFI_PASS=${UP_UNIFI_PASS} + - UP_UNIFI_URL=${UP_UNIFI_URL} + - UP_DEBUG=${UP_DEBUG} +volumes: + influxdb-storage: + chronograf-storage: + grafana-storage: From 2d1fe77630a9b35164971e91ed1a8b816636acae Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Sun, 29 Dec 2019 20:52:40 -0800 Subject: [PATCH 3/4] Delete docker-compose.env.example --- init/docker/docker-compose.env.example | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 init/docker/docker-compose.env.example diff --git a/init/docker/docker-compose.env.example b/init/docker/docker-compose.env.example deleted file mode 100644 index 1222c0c8..00000000 --- a/init/docker/docker-compose.env.example +++ /dev/null @@ -1,12 +0,0 @@ -INFLUXDB_USERNAME=admin -INFLUXDB_PASSWORD=admin -INFLUXDB_DATABASE=unifi - -GRAFANA_USERNAME=admin -GRAFANA_PASSWORD=admin - -UP_BRANCH=stable -UP_UNIFI_USER=influx -UP_UNIFI_PASS= -UP_UNIFI_URL=https://127.0.0.1:8443 -UP_DEBUG=false From 0ec3096a20bbe699794d3b5d16b343a59b4b8193 Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Sun, 29 Dec 2019 20:52:47 -0800 Subject: [PATCH 4/4] Delete docker-compose.yml --- init/docker/docker-compose.yml | 55 ---------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 init/docker/docker-compose.yml diff --git a/init/docker/docker-compose.yml b/init/docker/docker-compose.yml deleted file mode 100644 index fcdbdddf..00000000 --- a/init/docker/docker-compose.yml +++ /dev/null @@ -1,55 +0,0 @@ -version: '2' -services: - influxdb: - restart: always - image: influxdb:latest - ports: - - '8086:8086' - volumes: - - influxdb-storage:/var/lib/influxdb - environment: - - INFLUXDB_DB=${INFLUXDB_DATABASE} - - INFLUXDB_ADMIN_USER=${INFLUXDB_USERNAME} - - INFLUXDB_ADMIN_PASSWORD=${INFLUXDB_PASSWORD} - chronograf: - image: chronograf:latest - restart: always - ports: - - '127.0.0.1:8888:8888' - volumes: - - chronograf-storage:/var/lib/chronograf - depends_on: - - influxdb - environment: - - INFLUXDB_URL=http://influxdb:8086 - - INFLUXDB_USERNAME=${INFLUXDB_USERNAME} - - INFLUXDB_PASSWORD=${INFLUXDB_PASSWORD} - grafana: - image: grafana/grafana:latest - restart: always - ports: - - '3000:3000' - volumes: - - grafana-storage:/var/lib/grafana - depends_on: - - influxdb - environment: - - GF_SECURITY_ADMIN_USER=${GRAFANA_USERNAME} - - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD} - - GF_INSTALL_PLUGINS=grafana-clock-panel,natel-discrete-panel,grafana-piechart-panel - unifi-poller: - restart: always - image: golift/unifi-poller:${UP_BRANCH} - environment: - - UP_INFLUX_DB=${INFLUXDB_DATABASE} - - UP_INFLUX_USER=${INFLUXDB_USERNAME} - - UP_INFLUX_PASS=${INFLUXDB_PASSWORD} - - UP_INFLUX_URL=http://influxdb:8086 - - UP_UNIFI_USER=${UP_UNIFI_USER} - - UP_UNIFI_PASS=${UP_UNIFI_PASS} - - UP_UNIFI_URL=${UP_UNIFI_URL} - - UP_DEBUG=${UP_DEBUG} -volumes: - influxdb-storage: - chronograf-storage: - grafana-storage: