From e694604be5db3cccf45755345b2bcd6808b9f485 Mon Sep 17 00:00:00 2001
From: David Kaltschmidt <david.kaltschmidt@gmail.com>
Date: Sat, 22 Dec 2018 17:19:58 +0100
Subject: [PATCH 1/3] Loki: fix timestamp field

- timestamp was renamed to `ts` in grafana/loki#152
- renamed here in result transformer and tests
---
 public/app/core/logs_model.ts                             | 2 +-
 .../plugins/datasource/loki/result_transformer.test.ts    | 8 ++++----
 public/app/plugins/datasource/loki/result_transformer.ts  | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/public/app/core/logs_model.ts b/public/app/core/logs_model.ts
index fabb29c6e18..97ce38a7c93 100644
--- a/public/app/core/logs_model.ts
+++ b/public/app/core/logs_model.ts
@@ -81,7 +81,7 @@ export interface LogsStream {
 
 export interface LogsStreamEntry {
   line: string;
-  timestamp: string;
+  ts: string;
 }
 
 export interface LogsStreamLabels {
diff --git a/public/app/plugins/datasource/loki/result_transformer.test.ts b/public/app/plugins/datasource/loki/result_transformer.test.ts
index c23a370ab81..bacc96c6f41 100644
--- a/public/app/plugins/datasource/loki/result_transformer.test.ts
+++ b/public/app/plugins/datasource/loki/result_transformer.test.ts
@@ -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',
         },
       ],
     };
diff --git a/public/app/plugins/datasource/loki/result_transformer.ts b/public/app/plugins/datasource/loki/result_transformer.ts
index f922595e4b8..11986335102 100644
--- a/public/app/plugins/datasource/loki/result_transformer.ts
+++ b/public/app/plugins/datasource/loki/result_transformer.ts
@@ -116,10 +116,10 @@ export function processEntry(
   uniqueLabels: LogsStreamLabels,
   search: string
 ): LogRow {
-  const { line, timestamp } = entry;
+  const { line, ts } = entry;
   // 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 +135,7 @@ export function processEntry(
     entry: line,
     labels: parsedLabels,
     searchWords: search ? [search] : [],
-    timestamp: timestamp,
+    timestamp: ts,
   };
 }
 

From b8fdacd81fa9c32c63fdffd19600673c04f724ae Mon Sep 17 00:00:00 2001
From: Dan Cech <dan@aussiedan.com>
Date: Sat, 22 Dec 2018 17:28:51 +0100
Subject: [PATCH 2/3] Update
 public/app/plugins/datasource/loki/result_transformer.ts

Co-Authored-By: davkal <david.kaltschmidt@gmail.com>
---
 public/app/plugins/datasource/loki/result_transformer.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/loki/result_transformer.ts b/public/app/plugins/datasource/loki/result_transformer.ts
index 11986335102..b24f7d473b9 100644
--- a/public/app/plugins/datasource/loki/result_transformer.ts
+++ b/public/app/plugins/datasource/loki/result_transformer.ts
@@ -116,7 +116,8 @@ export function processEntry(
   uniqueLabels: LogsStreamLabels,
   search: string
 ): LogRow {
-  const { line, ts } = entry;
+  const { line } = entry;
+  const ts = entry.ts || entry.timestamp;
   // Assumes unique-ness, needs nanosec precision for timestamp
   const key = `EK${ts}${labels}`;
   const time = moment(ts);

From d1dec8bd442aed810948c5ef826196c6c76a5b65 Mon Sep 17 00:00:00 2001
From: David Kaltschmidt <david.kaltschmidt@gmail.com>
Date: Sat, 22 Dec 2018 17:36:35 +0100
Subject: [PATCH 3/3] Add timestamp back to log entry type

---
 public/app/core/logs_model.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/app/core/logs_model.ts b/public/app/core/logs_model.ts
index 97ce38a7c93..0947688bc89 100644
--- a/public/app/core/logs_model.ts
+++ b/public/app/core/logs_model.ts
@@ -82,6 +82,8 @@ export interface LogsStream {
 export interface LogsStreamEntry {
   line: string;
   ts: string;
+  // Legacy, was renamed to ts
+  timestamp?: string;
 }
 
 export interface LogsStreamLabels {