public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds signed in user to backend v2 plugins requests (#22584)

Browse Source 
closes #12043
This commit is contained in:
Carl Bergquist
2020-03-06 14:37:36 +01:00
committed by GitHub
parent c73a0007c7
commit 1dcfaf25fc
7 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/metrics.go
+9 -2
View File
@@ -16,6 +16,7 @@ import (
"github.com/grafana/grafana/pkg/util"
)
// QueryMetricsV2 returns query metrics
// POST /api/ds/query DataSource query w/ expressions
func (hs *HTTPServer) QueryMetricsV2(c *models.ReqContext, reqDto dtos.MetricRequest) Response {
if !setting.IsExpressionsEnabled() {
@@ -29,6 +30,7 @@ func (hs *HTTPServer) QueryMetricsV2(c *models.ReqContext, reqDto dtos.MetricReq
request := &tsdb.TsdbQuery{
TimeRange: tsdb.NewTimeRange(reqDto.From, reqDto.To),
Debug: reqDto.Debug,
User: c.SignedInUser,
}
expr := false
@@ -92,6 +94,7 @@ func (hs *HTTPServer) QueryMetricsV2(c *models.ReqContext, reqDto dtos.MetricReq
return JSON(statusCode, &resp)
}
// QueryMetrics returns query metrics
// POST /api/tsdb/query
func (hs *HTTPServer) QueryMetrics(c *models.ReqContext, reqDto dtos.MetricRequest) Response {
timeRange := tsdb.NewTimeRange(reqDto.From, reqDto.To)
@@ -113,7 +116,11 @@ func (hs *HTTPServer) QueryMetrics(c *models.ReqContext, reqDto dtos.MetricReque
return Error(500, "Unable to load datasource meta data", err)
}
request := &tsdb.TsdbQuery{TimeRange: timeRange, Debug: reqDto.Debug}
request := &tsdb.TsdbQuery{
TimeRange: timeRange,
Debug: reqDto.Debug,
User: c.SignedInUser,
}
for _, query := range reqDto.Queries {
request.Queries = append(request.Queries, &tsdb.Query{
@@ -165,7 +172,7 @@ func GetTestDataScenarios(c *models.ReqContext) Response {
return JSON(200, &result)
}
// Generates a index out of range error
// GenerateError generates a index out of range error
func GenerateError(c *models.ReqContext) Response {
var array []string
// nolint: govet
pkg/api/plugins.go
+4 -2
View File
@@ -205,6 +205,7 @@ func ImportDashboard(c *models.ReqContext, apiCmd dtos.ImportDashboardCommand) R
return JSON(200, cmd.Result)
}
// CheckHealth returns the health of a plugin.
// /api/plugins/:pluginId/health
func (hs *HTTPServer) CheckHealth(c *models.ReqContext) Response {
pluginID := c.Params("pluginId")
@@ -226,8 +227,9 @@ func (hs *HTTPServer) CheckHealth(c *models.ReqContext) Response {
}
payload := map[string]interface{}{
"status": resp.Status.String(),
"message": resp.Message,
"status": resp.Status.String(),
"message": resp.Message,
"jsonDetails": resp.JSONDetails,
}
if resp.Status != backendplugin.HealthStatusOk {