diff --git a/grafana-setup/datasources/graphite.json b/grafana-setup/datasources/graphite.json
index 9a26cf512..76a77aac7 100644
--- a/grafana-setup/datasources/graphite.json
+++ b/grafana-setup/datasources/graphite.json
@@ -3,8 +3,8 @@
   "type": "graphite",
   "url": "http://graphite:80",
   "access": "proxy",
+  "isDefault": true,
   "basicAuth": true,
-  "default": true,
-  "user": "guest",
-  "password": "guest"
+  "basicAuthUser":"guest",
+  "basicAuthPassword":"guest"
 }
diff --git a/grafana-setup/datasources/influxdb.json b/grafana-setup/datasources/influxdb.json
index 29c6b28d7..b85c46931 100644
--- a/grafana-setup/datasources/influxdb.json
+++ b/grafana-setup/datasources/influxdb.json
@@ -3,8 +3,9 @@
   "type": "influxdb",
   "url": "http://influxdb:8086",
   "access": "proxy",
+  "isDefault": false,
   "basicAuth": false,
-  "database": "_internal",
-  "user": "admin",
-  "password": "admin"
+  "basicAuthUser":"admin",
+  "basicAuthPassword":"admin",
+  "database": "_internal"
 }
diff --git a/grafana-setup/entrypoint.sh b/grafana-setup/entrypoint.sh
index 5a7df864f..07d4294a4 100755
--- a/grafana-setup/entrypoint.sh
+++ b/grafana-setup/entrypoint.sh
@@ -15,13 +15,17 @@ echo "Up!"
 echo "Adding datasources..."
 
 for datasource in `ls -1 /datasources/*.json`; do
-  curl -H 'Content-Type:application/json' -u admin:admin --data @"${datasource}" ${GF_API}/datasources
+  echo "Adding ${datasource}"
+  curl -s -H 'Content-Type:application/json' -u admin:admin --data @"${datasource}" ${GF_API}/datasources
+  echo ""
 done
 
 echo "Adding dashboards..."
 
 for dashboard in `ls -1 /dashboards/*.json`; do
-  curl -H 'Content-Type:application/json' -u admin:admin --data @"${dashboard}" ${GF_API}/dashboards/db
+  echo "Adding ${dashboard}"
+  curl -s -H 'Content-Type:application/json' -u admin:admin --data @"${dashboard}" ${GF_API}/dashboards/db
+  echo ""
 done
 
 echo "Done!"