opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-16 21:52:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Logs

Browse Source
This commit is contained in:
Sarah Zinger
2025-08-13 14:29:43 -04:00
parent 66d37ac1c9
commit 84de7ce8cd
5 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/expr/query_convert.go
View File

@ -43,6 +43,7 @@ func ConvertBackendRequestToDataRequest(req *backend.QueryDataRequest) (*data.Qu
To: req.Queries[0].TimeRange.To.String(), To: req.Queries[0].TimeRange.To.String(),
}, },
} }
backend.Logger.Info("!!!!!!!!!!!!!!!!! k8sReq", "k8sReq.TimeRange", k8sReq.TimeRange)
for _, q := range req.Queries { for _, q := range req.Queries {
dataQuery, err := convertBackendQueryToDataQuery(q) dataQuery, err := convertBackendQueryToDataQuery(q)

2
pkg/registry/apis/query/query.go
View File

@ -235,7 +235,7 @@ func handleQuery(ctx context.Context, raw query.QueryDataRequest, b QueryAPIBuil
} }
mReq := dtos.MetricRequest{ mReq := dtos.MetricRequest{
From: raw.From, From: raw.From, // in alerting, this is empty because time ranges are per query, but in the ui it may not be blank
To: raw.To, To: raw.To,
Queries: jsonQueries, Queries: jsonQueries,
} }

4
pkg/services/query/query.go
View File

@ -314,6 +314,7 @@ func (s *ServiceImpl) handleQuerySingleDatasource(ctx context.Context, user iden
func getTimeRange(query *simplejson.Json, globalFrom string, globalTo string) (string, string, error) { func getTimeRange(query *simplejson.Json, globalFrom string, globalTo string) (string, string, error) {
tr, ok := query.CheckGet("timeRange") tr, ok := query.CheckGet("timeRange")
if !ok { // timeRange json node does not exist, use global from/to if !ok { // timeRange json node does not exist, use global from/to
backend.Logger.Info("!!!!!!timeRange not found, using global from/to", "globalFrom", globalFrom, "globalTo", globalTo)
return globalFrom, globalTo, nil return globalFrom, globalTo, nil
} }
from, err := tr.Get("from").String() from, err := tr.Get("from").String()
@ -324,6 +325,7 @@ func getTimeRange(query *simplejson.Json, globalFrom string, globalTo string) (s
if err != nil { if err != nil {
return "", "", errors.New("time range: field 'to' is missing or invalid") return "", "", errors.New("time range: field 'to' is missing or invalid")
} }
backend.Logger.Info("!!!!!!getTimeRange", "from", from, "to", to)
return from, to, nil return from, to, nil
} }
@ -369,8 +371,10 @@ func (s *ServiceImpl) parseMetricRequest(ctx context.Context, user identity.Requ
return nil, err return nil, err
} }
timeRange = gtime.NewTimeRange(from, to) timeRange = gtime.NewTimeRange(from, to)
s.log.Info("!!!!!!from and to, supportLocalTimeRange is enabled", "timeRange", timeRange)
} else { } else {
timeRange = gtime.NewTimeRange(reqDTO.From, reqDTO.To) timeRange = gtime.NewTimeRange(reqDTO.From, reqDTO.To)
s.log.Info("!!!!!!from and to, supportLocalTimeRange is disabled", "timeRange", timeRange)
} }
modelJSON, err := query.MarshalJSON() modelJSON, err := query.MarshalJSON()

1
pkg/tsdb/cloud-monitoring/cloudmonitoring.go
View File

@ -329,6 +329,7 @@ func migrateRequest(req *backend.QueryDataRequest) error {
// QueryData takes in the frontend queries, parses them into the CloudMonitoring query format // QueryData takes in the frontend queries, parses them into the CloudMonitoring query format
// executes the queries against the CloudMonitoring API and parses the response into data frames // executes the queries against the CloudMonitoring API and parses the response into data frames
func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) { func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
s.logger.Info("!!!!!!request getting sent to datasource", "req.Queries[0].TimeRange", req.Queries[0].TimeRange)
logger := s.logger.FromContext(ctx) logger := s.logger.FromContext(ctx)
if len(req.Queries) == 0 { if len(req.Queries) == 0 {
return nil, fmt.Errorf("query contains no queries") return nil, fmt.Errorf("query contains no queries")

1
pkg/tsdb/prometheus/prometheus.go
View File

@ -26,6 +26,7 @@ func ProvideService(httpClientProvider *sdkhttpclient.Provider) *Service {
} }
func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) { func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
backend.Logger.Info("!!!!!!request getting sent to datasource", "req.Queries[0].TimeRange", req.Queries[0].TimeRange)
return s.lib.QueryData(ctx, req) return s.lib.QueryData(ctx, req)
} }