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

loki: generate dataplane-compliant logs dataframes (behind feature flag) (#69909)

Browse Source 
* add feature flag

* prepare tests

* enable dataplane-format in loki-backend
This commit is contained in:
Gábor Farkas
2023-07-13 09:58:00 +02:00
committed by GitHub
parent 9990d5025d
commit e045860fbf
57 changed files with 4435 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/loki/loki.go
+3 -1
View File
@@ -65,6 +65,7 @@ type QueryJSONModel struct {
type ResponseOpts struct {
metricDataplane bool
logsDataplane bool
}
func parseQueryModel(raw json.RawMessage) (*QueryJSONModel, error) {
@@ -150,6 +151,7 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
responseOpts := ResponseOpts{
metricDataplane: s.features.IsEnabled(featuremgmt.FlagLokiMetricDataplane),
logsDataplane: s.features.IsEnabled(featuremgmt.FlagLokiLogsDataplane),
}
return queryData(ctx, req, dsInfo, responseOpts, s.tracer)
@@ -202,7 +204,7 @@ func runQuery(ctx context.Context, api *LokiAPI, query *lokiQuery, responseOpts
}
for _, frame := range frames {
if err = adjustFrame(frame, query, !responseOpts.metricDataplane); err != nil {
if err = adjustFrame(frame, query, !responseOpts.metricDataplane, responseOpts.logsDataplane); err != nil {
return data.Frames{}, err
}
if err != nil {