Merge pull request #12143 from grafana/davkal/ifql-datasource

InfluxDB IFQL datasource (beta)
2018-06-05 14:23:21 +02:00
parent 9e7651a1b3 64f5874778
commit 45a156577c
19 changed files with 1001 additions and 0 deletions
@@ -85,6 +85,13 @@ func getFrontendSettingsMap(c *m.ReqContext) (map[string]interface{}, error) {
 				dsMap["database"] = ds.Database
 				dsMap["url"] = url
 			}
+
+			if ds.Type == m.DS_INFLUXDB_IFQL {
+				dsMap["username"] = ds.User
+				dsMap["password"] = ds.Password
+				dsMap["database"] = ds.Database
+				dsMap["url"] = url
+			}
 		}

 		if ds.Type == m.DS_ES {
@@ -95,6 +102,10 @@ func getFrontendSettingsMap(c *m.ReqContext) (map[string]interface{}, error) {
 			dsMap["database"] = ds.Database
 		}

+		if ds.Type == m.DS_INFLUXDB_IFQL {
+			dsMap["database"] = ds.Database
+		}
+
 		if ds.Type == m.DS_PROMETHEUS {
 			// add unproxied server URL for link to Prometheus web UI
 			dsMap["directUrl"] = ds.Url