Merge branch 'database_url' of https://github.com/Scalingo/grafana into Scalingo-database_url

2016-08-19 13:15:44 +02:00
parent 28ac05b1d1 aa064b18e8
commit c663e32ea8
4 changed files with 60 additions and 7 deletions
@@ -65,6 +65,9 @@ host = 127.0.0.1:3306
 name = grafana
 user = root
 password =
+# Use either URL or the previous fields to configure the database
+# Example: mysql://user:secret@host:port/database
+url =

 # For "postgres", use either "disable", "require" or "verify-full"
 # For "mysql", use either "true", "false", or "skip-verify".