#123 dedicated Grafana viewer InfluxDB Data Collector

smartemission · Jun 20, 2018 · ed8de9e · ed8de9e
1 parent 86cb26e
commit ed8de9e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 68 deletions.
diff --git a/etl/options/example.args b/etl/options/example.args
@@ -128,6 +128,8 @@ grafana_admin_password=grafana_admin_pw
 GF_SECURITY_ADMIN_PASSWORD=grafana_admin_pw
 SE_INFLUX_ADMIN_PASSWORD=thepwd
 SE_INFLUX_ADMIN_USER=theuser
+SE_INFLUX_PASSWORD=thepwd
+SE_INFLUX_USER=theuser
 
 #
 # GOST SensorThings API

diff --git a/services/grafana-dc/docker-compose.yml b/services/grafana-dc/docker-compose.yml
@@ -4,7 +4,7 @@ services:
 
   grafana:
 
-    image: smartemission/se-grafana-dc:5.1.3-1
+    image: smartemission/se-grafana-dc:5.1.3-2
 
     container_name: grafana-dc
 

diff --git a/services/grafana-dc/run.sh b/services/grafana-dc/run.sh
@@ -1,73 +1,7 @@
 #!/bin/bash
 #
-# Run Grafana from http://docs.grafana.org/installation/docker/
+# Run Grafana using smartemission/se-grafana-dc:5.1.3-1
 #
-# On first run the config, data and log dirs are copied from container to /var/smartem/*/grafana dirs.
-# InfluxDB needs to run first.
-# NB Change the default password there!
-
-#SCRIPT_DIR=${0%/*}
-#
-#GIT="/opt/geonovum/smartem/git"
-#LOG_DIR="/var/smartem/log/grafana"
-#DATA_DIR="/var/smartem/data/grafana"
-#CONFIG_DIR="/var/smartem/config/grafana"
-#NAME="grafana"
-#IMAGE="grafana/grafana:4.6.3"
-#INFLUX_HOST=influxdb
-## PROMETHEUS_HOST=prometheus
-#
-## Volume maps for initial and full run
-#VOL_MAP_PART=" "
-#VOL_MAP_FULL="-v ${DATA_DIR}:/var/lib/grafana -v ${LOG_DIR}:/var/log/grafana -v ${CONFIG_DIR}:/etc/grafana"
-#
-#PORT_MAP="-p 3000:3000"
-## LINK_MAP="--link ${INFLUX_HOST}:${INFLUX_HOST}"
-#
-## Get Admin Pwd from local options file
-#source ${SCRIPT_DIR}/../../etl/options/`hostname`.args
-#ENV_MAP="-e GF_SECURITY_ADMIN_PASSWORD=${grafana_admin_password}"
-#
-## Restart with volume mapping(s) provided in $1
-#function restart_image() {
-#  VOL_MAP="$@"
-#
-#  # Stop and remove possibly old containers
-#  sudo docker stop ${NAME} > /dev/null 2>&1
-#  sudo docker rm ${NAME} > /dev/null 2>&1
-#  echo "restart ${NAME} with volumes: ${VOL_MAP}"
-#  # Finally run with all mappings
-#  sudo docker run --name ${NAME} ${PORT_MAP} ${VOL_MAP} --network="se_back" ${ENV_MAP} -d ${IMAGE}
-#}
-#
-## Some tricky stuff to get all Grafana dirs on host when non-existing on host
-#if [ ! -d "${CONFIG_DIR}" ]; then
-#   # First time: get Grafana dirs. Loosing/rebuilding the Docker image will thus
-#   # never result in loss of data.
-#   # to the host on first run.
-#   # In subsequent runs we can adapt the config etc. The data is also saved outside container.
-#   echo "${CONFIG_DIR} empty: copy from original ${NAME} version to ${CONFIG_DIR}"
-#   restart_image ${VOL_MAP_PART}
-#
-#   # Copy from original data dir in container and rename by moving on host
-#   sudo rm -rf ${DATA_DIR}
-#   sudo rm -rf ${LOG_DIR}
-#   sudo mkdir -p ${CONFIG_DIR}
-#   sudo mkdir -p ${DATA_DIR}
-#   sudo mkdir -p ${LOG_DIR}
-#   sudo docker cp ${NAME}:/etc/grafana ${CONFIG_DIR}
-#   sudo docker cp ${NAME}:/var/lib/grafana ${DATA_DIR}
-#   sudo docker cp ${NAME}:/var/log/grafana ${LOG_DIR}
-#
-#   sudo cp ${SCRIPT_DIR}/config/* ${CONFIG_DIR}
-#
-#   # Rerun with full volume mapping
-#   restart_image ${VOL_MAP_FULL}
-#else
-#   echo "Ok, using existing ${CONFIG_DIR} dir on host"
-#   sudo cp ${SCRIPT_DIR}/config/* ${CONFIG_DIR}
-#   restart_image ${VOL_MAP_FULL}
-#fi
 
 export HOSTNAME