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

Loki: fix timestamp field

Browse Source 
- timestamp was renamed to `ts` in grafana/loki#152
- renamed here in result transformer and tests
This commit is contained in:
David Kaltschmidt
2018-12-22 17:19:58 +01:00
parent b2401e37fa
commit e694604be5
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/plugins/datasource/loki/result_transformer.test.ts
View File

@@ -99,7 +99,7 @@ describe('mergeStreamsToLogs()', () => {
entries: [
{
line: 'WARN boooo',
timestamp: '1970-01-01T00:00:00Z',
ts: '1970-01-01T00:00:00Z',
},
],
};
@@ -120,7 +120,7 @@ describe('mergeStreamsToLogs()', () => {
entries: [
{
line: 'WARN boooo',
timestamp: '1970-01-01T00:00:01Z',
ts: '1970-01-01T00:00:01Z',
},
],
};
@@ -129,11 +129,11 @@ describe('mergeStreamsToLogs()', () => {
entries: [
{
line: 'INFO 1',
timestamp: '1970-01-01T00:00:00Z',
ts: '1970-01-01T00:00:00Z',
},
{
line: 'INFO 2',
timestamp: '1970-01-01T00:00:02Z',
ts: '1970-01-01T00:00:02Z',
},
],
};