IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Prometheus: Add error source to differentiate errors for api server work" (#96043)

Browse Source 
Revert "Prometheus: Add error source to differentiate errors for api server w…"

This reverts commit b9b5445090.
This commit is contained in:
Brendan O'Handley 2024-11-07 10:52:42 -06:00 committed by GitHub
parent 4cc204affe
commit 6638dd9a83
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/promlib/querydata/request.go
View File

@ -235,9 +235,8 @@ func (s *QueryData) rangeQuery(ctx context.Context, c *client.Client, q *models.
res, err := c.QueryRange(ctx, q) res, err := c.QueryRange(ctx, q)
if err != nil { if err != nil {
return backend.DataResponse{ return backend.DataResponse{
Error: err, Error: err,
Status: backend.StatusBadGateway, Status: backend.StatusBadGateway,
ErrorSource: backend.ErrorSourceDownstream,
} }
} }
@ -255,17 +254,15 @@ func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *model
res, err := c.QueryInstant(ctx, q) res, err := c.QueryInstant(ctx, q)
if err != nil { if err != nil {
return backend.DataResponse{ return backend.DataResponse{
Error: err, Error: err,
Status: backend.StatusBadGateway, Status: backend.StatusBadGateway,
ErrorSource: backend.ErrorSourceDownstream,
} }
} }
// This is only for health check fall back scenario // This is only for health check fall back scenario
if res.StatusCode != 200 && q.RefId == "__healthcheck__" { if res.StatusCode != 200 && q.RefId == "__healthcheck__" {
return backend.DataResponse{ return backend.DataResponse{
Error: errors.New(res.Status), Error: errors.New(res.Status),
ErrorSource: backend.ErrorSourceDownstream,
} }
} }
@ -283,8 +280,7 @@ func (s *QueryData) exemplarQuery(ctx context.Context, c *client.Client, q *mode
res, err := c.QueryExemplars(ctx, q) res, err := c.QueryExemplars(ctx, q)
if err != nil { if err != nil {
return backend.DataResponse{ return backend.DataResponse{
Error: err, Error: err,
ErrorSource: backend.ErrorSourceDownstream,
} }
} }