IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-16 16:14:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

log error on datasource access denied

Browse Source
This commit is contained in:
Marcus Efraimsson
2018-10-30 09:32:32 +01:00
parent 70ddf93688
commit 52d825f535
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/dataproxy.go
+1 -1
View File
@@ -14,7 +14,7 @@ func (hs *HTTPServer) ProxyDataSourceRequest(c *m.ReqContext) {
ds, err := hs.DatasourceCache.GetDatasource(dsId, c.SignedInUser, c.SkipCache) ds, err := hs.DatasourceCache.GetDatasource(dsId, c.SignedInUser, c.SkipCache)
if err != nil { if err != nil {
if err == m.ErrDataSourceAccessDenied { if err == m.ErrDataSourceAccessDenied {
c.JsonApiErr(403, "Access denied to datasource", nil) c.JsonApiErr(403, "Access denied to datasource", err)
return return
} }
c.JsonApiErr(500, "Unable to load datasource meta data", err) c.JsonApiErr(500, "Unable to load datasource meta data", err)
pkg/api/metrics.go
+1 -1
View File
@@ -28,7 +28,7 @@ func (hs *HTTPServer) QueryMetrics(c *m.ReqContext, reqDto dtos.MetricRequest) R
ds, err := hs.DatasourceCache.GetDatasource(datasourceId, c.SignedInUser, c.SkipCache) ds, err := hs.DatasourceCache.GetDatasource(datasourceId, c.SignedInUser, c.SkipCache)
if err != nil { if err != nil {
if err == m.ErrDataSourceAccessDenied { if err == m.ErrDataSourceAccessDenied {
return Error(403, "Access denied to datasource", nil) return Error(403, "Access denied to datasource", err)
} }
return Error(500, "Unable to load datasource meta data", err) return Error(500, "Unable to load datasource meta data", err)
} }