comment out Grafana server url and smtp settings

fix #20
stefanprodan · Feb 14, 2018 · 6dd60fc · 6dd60fc
1 parent 024ad7a
commit 6dd60fc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -457,23 +457,3 @@ Scope offers remote access to the Swarm’s nods and containers, making it easy
 ![Scope Hosts](https://raw.githubusercontent.com/stefanprodan/swarmprom/master/grafana/screens/weave-scope-hosts-v2.png)
 
 
-## Enable emails on Grafana:
-
-To get SMTP credentials you can use [SendGrid](https://sendgrid.com/) service with free 40K emails per month.
-
-Export the next env vars:
-
-```bash
-
-export GF_SMTP_ENABLED=true
-export GF_SMTP_FROM_ADDRESS=grafana@test.com  # change to you preference
-export GF_SMTP_FROM_NAME=Grafana
-export GF_SMTP_HOST=smtp:25  # change, based on your SMTP provider
-export GF_SMTP_USER=***  # change, based on your SMTP provider
-export GF_SMTP_PASSWORD=***  # change, based on your SMTP provider
-
-```
-You can test emails by:
- - invite users, visit: localhost:`/org/users?gettingstarted`
- - send test notification: localhost:`/alerting/notification/new`
-
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -65,13 +65,13 @@ services:
       - GF_SECURITY_ADMIN_USER=${ADMIN_USER:-admin}
       - GF_SECURITY_ADMIN_PASSWORD=${ADMIN_PASSWORD:-admin}
       - GF_USERS_ALLOW_SIGN_UP=false
-      - GF_SERVER_ROOT_URL=${GF_SERVER_ROOT_URL:-localhost}
-      - GF_SMTP_ENABLED=${GF_SMTP_ENABLED:-false}
-      - GF_SMTP_FROM_ADDRESS=${GF_SMTP_FROM_ADDRESS:-grafana@test.com}
-      - GF_SMTP_FROM_NAME=${GF_SMTP_FROM_NAME:-Grafana}
-      - GF_SMTP_HOST=${GF_SMTP_HOST:-smtp:25}
-      - GF_SMTP_USER=${GF_SMTP_USER}
-      - GF_SMTP_PASSWORD=${GF_SMTP_PASSWORD}
+#      - GF_SERVER_ROOT_URL=${GF_SERVER_ROOT_URL:-localhost}
+#      - GF_SMTP_ENABLED=${GF_SMTP_ENABLED:-false}
+#      - GF_SMTP_FROM_ADDRESS=${GF_SMTP_FROM_ADDRESS:-grafana@test.com}
+#      - GF_SMTP_FROM_NAME=${GF_SMTP_FROM_NAME:-Grafana}
+#      - GF_SMTP_HOST=${GF_SMTP_HOST:-smtp:25}
+#      - GF_SMTP_USER=${GF_SMTP_USER}
+#      - GF_SMTP_PASSWORD=${GF_SMTP_PASSWORD}
     volumes:
       - grafana:/var/lib/grafana
     deploy:

diff --git a/weave-compose.yml b/weave-compose.yml
@@ -50,13 +50,13 @@ services:
       - GF_SECURITY_ADMIN_USER=${ADMIN_USER:-admin}
       - GF_SECURITY_ADMIN_PASSWORD=${ADMIN_PASSWORD:-admin}
       - GF_USERS_ALLOW_SIGN_UP=false
-      - GF_SERVER_ROOT_URL=${GF_SERVER_ROOT_URL:-localhost}
-      - GF_SMTP_ENABLED=${GF_SMTP_ENABLED:-false}
-      - GF_SMTP_FROM_ADDRESS=${GF_SMTP_FROM_ADDRESS:-grafana@test.com}
-      - GF_SMTP_FROM_NAME=${GF_SMTP_FROM_NAME:-Grafana}
-      - GF_SMTP_HOST=${GF_SMTP_HOST:-smtp:25}
-      - GF_SMTP_USER=${GF_SMTP_USER}
-      - GF_SMTP_PASSWORD=${GF_SMTP_PASSWORD}
+#      - GF_SERVER_ROOT_URL=${GF_SERVER_ROOT_URL:-localhost}
+#      - GF_SMTP_ENABLED=${GF_SMTP_ENABLED:-false}
+#      - GF_SMTP_FROM_ADDRESS=${GF_SMTP_FROM_ADDRESS:-grafana@test.com}
+#      - GF_SMTP_FROM_NAME=${GF_SMTP_FROM_NAME:-Grafana}
+#      - GF_SMTP_HOST=${GF_SMTP_HOST:-smtp:25}
+#      - GF_SMTP_USER=${GF_SMTP_USER}
+#      - GF_SMTP_PASSWORD=${GF_SMTP_PASSWORD}
     volumes:
       - grafana:/var/lib/grafana
     deploy: