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

Explore: Fix empty result from datasource should render logs container (#16999)

Browse Source 
Make sure to return an empty logs model instead of undefined so that 
the logs container renders an empty graph and log result in Explore.

Fixes #16997
This commit is contained in:
Marcus Efraimsson 2019-05-10 12:45:26 +02:00 committed by GitHub
parent d5a35f3631
commit 8eb78ea931
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -356,7 +356,12 @@ export function seriesDataToLogsModel(seriesData: SeriesData[], intervalMs: numb
return logsModel; return logsModel;
} }
return undefined; return {
hasUniqueLabels: false,
rows: [],
meta: [],
series: [],
};
} }
export function logSeriesToLogsModel(logSeries: SeriesData[]): LogsModel { export function logSeriesToLogsModel(logSeries: SeriesData[]): LogsModel {

23
public/app/core/specs/logs_model.test.ts
View File

@ -333,22 +333,29 @@ describe('LogsParsers', () => {
}); });
}); });
const emptyLogsModel = {
hasUniqueLabels: false,
rows: [],
meta: [],
series: [],
};
describe('seriesDataToLogsModel', () => { describe('seriesDataToLogsModel', () => {
it('given empty series should return undefined', () => { it('given empty series should return empty logs model', () => {
expect(seriesDataToLogsModel([] as SeriesData[], 0)).toBeUndefined(); expect(seriesDataToLogsModel([] as SeriesData[], 0)).toMatchObject(emptyLogsModel);
}); });
it('given series without correct series name should not be processed', () => { it('given series without correct series name should return empty logs model', () => {
const series: SeriesData[] = [ const series: SeriesData[] = [
{ {
fields: [], fields: [],
rows: [], rows: [],
}, },
]; ];
expect(seriesDataToLogsModel(series, 0)).toBeUndefined(); expect(seriesDataToLogsModel(series, 0)).toMatchObject(emptyLogsModel);
}); });
it('given series without a time field should not be processed', () => { it('given series without a time field should return empty logs model', () => {
const series: SeriesData[] = [ const series: SeriesData[] = [
{ {
fields: [ fields: [
@ -360,10 +367,10 @@ describe('seriesDataToLogsModel', () => {
rows: [], rows: [],
}, },
]; ];
expect(seriesDataToLogsModel(series, 0)).toBeUndefined(); expect(seriesDataToLogsModel(series, 0)).toMatchObject(emptyLogsModel);
}); });
it('given series without a string field should not be processed', () => { it('given series without a string field should return empty logs model', () => {
const series: SeriesData[] = [ const series: SeriesData[] = [
{ {
fields: [ fields: [
@ -375,7 +382,7 @@ describe('seriesDataToLogsModel', () => {
rows: [], rows: [],
}, },
]; ];
expect(seriesDataToLogsModel(series, 0)).toBeUndefined(); expect(seriesDataToLogsModel(series, 0)).toMatchObject(emptyLogsModel);
}); });
it('given one series should return expected logs model', () => { it('given one series should return expected logs model', () => {