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

Elastic: Fix displaying of correct log message (#26020)

Browse Source 
* Fix default field, remove redundant line field check

* Add comments
This commit is contained in:
Ivana Huckova
2020-07-03 09:10:59 +02:00
committed by GitHub
parent b7792de16d
commit 8b46655361
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/core/logs_model.ts
View File

@@ -319,10 +319,7 @@ export function logSeriesToLogsModel(logSeries: DataFrame[]): LogsModel | undefi
// Find the fields we care about and collect all labels // Find the fields we care about and collect all labels
const allSeries: LogFields[] = logSeries.map(series => { const allSeries: LogFields[] = logSeries.map(series => {
const fieldCache = new FieldCache(series); const fieldCache = new FieldCache(series);
const stringField = fieldCache.getFirstFieldOfType(FieldType.string);
const stringField = fieldCache.hasFieldNamed('line')
? fieldCache.getFieldByName('line')
: fieldCache.getFirstFieldOfType(FieldType.string);
if (stringField?.labels) { if (stringField?.labels) {
allLabels.push(stringField.labels); allLabels.push(stringField.labels);
} }

2
public/app/plugins/datasource/loki/result_transformer.ts
View File

@@ -78,7 +78,7 @@ function constructDataFrame(
refId, refId,
fields: [ fields: [
{ name: 'ts', type: FieldType.time, config: { displayName: 'Time' }, values: times }, // Time { name: 'ts', type: FieldType.time, config: { displayName: 'Time' }, values: times }, // Time
{ name: 'line', type: FieldType.string, config: {}, values: lines, labels }, // Line { name: 'line', type: FieldType.string, config: {}, values: lines, labels }, // Line - needs to be the first field with string type
{ name: 'id', type: FieldType.string, config: {}, values: uids }, { name: 'id', type: FieldType.string, config: {}, values: uids },
{ name: 'tsNs', type: FieldType.time, config: { displayName: 'Time ns' }, values: timesNs }, // Time { name: 'tsNs', type: FieldType.time, config: { displayName: 'Time ns' }, values: timesNs }, // Time
], ],