Merge pull request #176 from hubmapconsortium/development

Release 1.2.0

.gitignore

@@ -1,4 +1,5 @@
 venv/
+.envrc
 
 *.pyc
 __pycache__/
@@ -22,4 +23,5 @@ db.sqlite3
 /src/tests/test_django_config.json
 /docker/db_dir/
 /docker/redis_dir/
-/docker/docker-compose.yml
+/docker/docker-compose.yml
+/docker/grafana_dir/provisioning/datasources/datasource.yml

VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

docker/example-docker-compose.yml

@@ -38,6 +38,14 @@ services:
     environment:
       - POSTGRES_PASSWORD=blank
       - POSTGRES_USER=blank
+      - GRAFANA_PASSWORD=blank
+      - GRAFANA_USER=blank
     depends_on:
       - redis
       - postgres
+  grafana:
+    image: grafana/grafana
+    build:
+      context: ./grafana_dir
+    ports:
+      - "3000:3000"

docker/grafana_dir/Dockerfile

@@ -0,0 +1,13 @@
+FROM grafana/grafana
+# Disable Login form or not
+# ENV GF_AUTH_DISABLE_LOGIN_FORM="true"
+# # Allow anonymous authentication or not
+# ENV GF_AUTH_ANONYMOUS_ENABLED="true"
+# # Role of anonymous user
+# ENV GF_AUTH_ANONYMOUS_ORG_ROLE="Admin"
+ENV GF_DATABASE_SSL_MODE="disable"
+ENV GF_SERVER_PROTOCOL="https"
+ENV GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH="/etc/grafana/dashboards/default.json"
+
+ADD ./provisioning /etc/grafana/provisioning
+ADD ./dashboards /etc/grafana/dashboards