Merge pull request #111 from EverythingMe/fix_graphite_settings

Fix: added JSON parsing of the Graphite settings

Author: arikfr

redash/data/manager.py

@@ -158,7 +158,12 @@ def start_workers(self, workers_count, connection_type, connection_string):
             runner = query_runner_mysql.mysql(connection_string)
         elif connection_type == 'graphite':
             from redash.data import query_runner_graphite
-            runner = query_runner_graphite.graphite(connection_string)
+            connection_params = json.loads(connection_string)
+            if connection_params['auth']:
+                connection_params['auth'] = tuple(connection_params['auth'])
+            else:
+                connection_params['auth'] = None
+            runner = query_runner_graphite.graphite(connection_params)
         else:
             from redash.data import query_runner
             runner = query_runner.redshift(connection_string)

redash/settings.py

@@ -39,7 +39,7 @@ def array_from_string(str):
 # Connection string for the database that is used to run queries against. Examples:
 # -- mysql:    CONNECTION_STRING = "Server=;User=;Pwd=;Database="
 # -- pg:       CONNECTION_STRING = "user= password= host= port=5439 dbname="
-# -- graphite: CONNECTION_STRING = {'url': 'https://graphite.yourcompany.com', 'auth': ('user', 'password'), 'verify': True}
+# -- graphite: CONNECTION_STRING = {"url": "https://graphite.yourcompany.com", "auth": ["user", "password"], "verify": true}
 CONNECTION_STRING = os.environ.get("REDASH_CONNECTION_STRING", "user= password= host= port=5439 dbname=")
 
 # Connection settings for re:dash's own database (where we store the queries, results, etc)