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

Merge pull request #14636 from grafana/davkal/fix-14635

Browse Source 
Loki: fix timestamp field
This commit is contained in:
David 2018-12-22 17:52:59 +01:00 committed by GitHub
commit b05e7aaecb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,9 @@ export interface LogsStream {
export interface LogsStreamEntry {
line: string;
timestamp: string;
ts: string;
// Legacy, was renamed to ts
timestamp?: string;
}
export interface LogsStreamLabels {

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',
},
],
};

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

@ -116,10 +116,11 @@ export function processEntry(
uniqueLabels: LogsStreamLabels,
search: string
): LogRow {
const { line, timestamp } = entry;
const { line } = entry;
const ts = entry.ts || entry.timestamp;
// Assumes unique-ness, needs nanosec precision for timestamp
const key = `EK${timestamp}${labels}`;
const time = moment(timestamp);
const key = `EK${ts}${labels}`;
const time = moment(ts);
const timeEpochMs = time.valueOf();
const timeFromNow = time.fromNow();
const timeLocal = time.format('YYYY-MM-DD HH:mm:ss');
@ -135,7 +136,7 @@ export function processEntry(
entry: line,
labels: parsedLabels,
searchWords: search ? [search] : [],
timestamp: timestamp,
timestamp: ts,
};
}