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: better handle missing fields (#46963)

Browse Source
This commit is contained in:
Gábor Farkas
2022-03-31 10:48:03 +02:00
committed by GitHub
parent 58922d78df
commit 2d61022d93
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -326,24 +326,27 @@ export function logSeriesToLogsModel(logSeries: DataFrame[]): LogsModel | undefi
const seriesWithFields = logSeries.filter((series) => series.fields.length); const seriesWithFields = logSeries.filter((series) => series.fields.length);
if (seriesWithFields.length) { if (seriesWithFields.length) {
allSeries = seriesWithFields.map((series) => { seriesWithFields.forEach((series) => {
const fieldCache = new FieldCache(series); const fieldCache = new FieldCache(series);
const stringField = fieldCache.getFirstFieldOfType(FieldType.string); const stringField = fieldCache.getFirstFieldOfType(FieldType.string);
const timeField = fieldCache.getFirstFieldOfType(FieldType.time);
if (stringField?.labels) { if (stringField !== undefined && timeField !== undefined) {
allLabels.push(stringField.labels); if (stringField?.labels) {
allLabels.push(stringField.labels);
}
allSeries.push({
series,
timeField,
timeNanosecondField: fieldCache.hasFieldWithNameAndType('tsNs', FieldType.time)
? fieldCache.getFieldByName('tsNs')
: undefined,
stringField,
logLevelField: fieldCache.getFieldByName('level'),
idField: getIdField(fieldCache),
});
} }
return {
series,
timeField: fieldCache.getFirstFieldOfType(FieldType.time),
timeNanosecondField: fieldCache.hasFieldWithNameAndType('tsNs', FieldType.time)
? fieldCache.getFieldByName('tsNs')
: undefined,
stringField,
logLevelField: fieldCache.getFieldByName('level'),
idField: getIdField(fieldCache),
} as LogFields;
}); });
} }