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

Logs: Update logic to process logs dataPlane frame with labels field (#77708)

Browse Source 
* Logs: Update dataplane logic to use labels instead of attributes

* Update Loki logs data plane data frame according to specs

* Remove only in test
This commit is contained in:
Ivana Huckova
2023-11-07 10:53:10 +01:00
committed by GitHub
parent f9fffd3ff1
commit d4a257bc8e
15 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/tsdb/loki/frame.go
View File

@@ -173,7 +173,7 @@ func adjustDataplaneLogsFrame(frame *data.Frame, query *lokiQuery) error {
}
timeField.Name = "timestamp"
labelsField.Name = "attributes"
labelsField.Name = "labels"
lineField.Name = "body"
if frame.Meta == nil {

4
pkg/tsdb/loki/testdata_dataplane/streams_parse_errors.golden.jsonc
View File

@@ -11,7 +11,7 @@
// Name:
// Dimensions: 4 Fields by 4 Rows
// +------------------------------------------------+-------------------------------+----------------+------------------------------+
// | Name: attributes | Name: timestamp | Name: body | Name: id |
// | Name: labels | Name: timestamp | Name: body | Name: id |
// | Labels: | Labels: | Labels: | Labels: |
// | Type: []json.RawMessage | Type: []time.Time | Type: []string | Type: []string |
// +------------------------------------------------+-------------------------------+----------------+------------------------------+
@@ -38,7 +38,7 @@
},
"fields": [
{
"name": "attributes",
"name": "labels",
"type": "other",
"typeInfo": {
"frame": "json.RawMessage"

4
pkg/tsdb/loki/testdata_dataplane/streams_simple.golden.jsonc
View File

@@ -119,7 +119,7 @@
// Name:
// Dimensions: 4 Fields by 6 Rows
// +---------------------------------------+-----------------------------------------+------------------+--------------------------------+
// | Name: attributes | Name: timestamp | Name: body | Name: id |
// | Name: labels | Name: timestamp | Name: body | Name: id |
// | Labels: | Labels: | Labels: | Labels: |
// | Type: []json.RawMessage | Type: []time.Time | Type: []string | Type: []string |
// +---------------------------------------+-----------------------------------------+------------------+--------------------------------+
@@ -256,7 +256,7 @@
},
"fields": [
{
"name": "attributes",
"name": "labels",
"type": "other",
"typeInfo": {
"frame": "json.RawMessage"

4
pkg/tsdb/loki/testdata_logs_dataplane/streams_parse_errors.golden.jsonc
View File

@@ -11,7 +11,7 @@
// Name:
// Dimensions: 4 Fields by 4 Rows
// +------------------------------------------------+-------------------------------+----------------+------------------------------+
// | Name: attributes | Name: timestamp | Name: body | Name: id |
// | Name: labels | Name: timestamp | Name: body | Name: id |
// | Labels: | Labels: | Labels: | Labels: |
// | Type: []json.RawMessage | Type: []time.Time | Type: []string | Type: []string |
// +------------------------------------------------+-------------------------------+----------------+------------------------------+
@@ -38,7 +38,7 @@
},
"fields": [
{
"name": "attributes",
"name": "labels",
"type": "other",
"typeInfo": {
"frame": "json.RawMessage"

4
pkg/tsdb/loki/testdata_logs_dataplane/streams_simple.golden.jsonc
View File

@@ -119,7 +119,7 @@
// Name:
// Dimensions: 4 Fields by 6 Rows
// +---------------------------------------+-----------------------------------------+------------------+--------------------------------+
// | Name: attributes | Name: timestamp | Name: body | Name: id |
// | Name: labels | Name: timestamp | Name: body | Name: id |
// | Labels: | Labels: | Labels: | Labels: |
// | Type: []json.RawMessage | Type: []time.Time | Type: []string | Type: []string |
// +---------------------------------------+-----------------------------------------+------------------+--------------------------------+
@@ -256,7 +256,7 @@
},
"fields": [
{
"name": "attributes",
"name": "labels",
"type": "other",
"typeInfo": {
"frame": "json.RawMessage"