mysql: progress on mysql data source

pkg/api/frontendsettings.go

@@ -42,6 +42,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
 		}
 
 		var dsMap = map[string]interface{}{
+			"id":   ds.Id,
 			"type": ds.Type,
 			"name": ds.Name,
 			"url":  url,

pkg/api/metrics.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 
 	"github.com/grafana/grafana/pkg/api/dtos"
+	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/metrics"
 	"github.com/grafana/grafana/pkg/middleware"
 	"github.com/grafana/grafana/pkg/models"
@@ -18,6 +19,20 @@ import (
 func QueryMetrics(c *middleware.Context, reqDto dtos.MetricRequest) Response {
 	timeRange := tsdb.NewTimeRange(reqDto.From, reqDto.To)
 
+	if len(reqDto.Queries) == 0 {
+		return ApiError(400, "No queries found in query", nil)
+	}
+
+	dsId, err := reqDto.Queries[0].Get("datasourceId").Int64()
+	if err != nil {
+		return ApiError(400, "Query missing datasourceId", nil)
+	}
+
+	dsQuery := models.GetDataSourceByIdQuery{Id: dsId}
+	if err := bus.Dispatch(&dsQuery); err != nil {
+		return ApiError(500, "failed to fetch data source", err)
+	}
+
 	request := &tsdb.Request{TimeRange: timeRange}
 
 	for _, query := range reqDto.Queries {
@@ -26,10 +41,7 @@ func QueryMetrics(c *middleware.Context, reqDto dtos.MetricRequest) Response {
 			MaxDataPoints: query.Get("maxDataPoints").MustInt64(100),
 			IntervalMs:    query.Get("intervalMs").MustInt64(1000),
 			Model:         query,
-			DataSource: &models.DataSource{
-				Name: "Grafana TestDataDB",
-				Type: "grafana-testdata-datasource",
-			},
+			DataSource:    dsQuery.Result,
 		})
 	}