From 7499db7060724d2ad502df19ef11adf39ddb6313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Tue, 27 Jun 2023 14:31:42 +0200
Subject: [PATCH] [v10.0.x] Elasticsearch: Make it compatible with the new log
 context functionality (#70748)

Elasticsearch: Make it compatible with the new log context functionality (#70697)

(cherry picked from commit 8e9ec9dcef5dd7eb7efbcd19b8a699de9ad48b0d)
---
 public/app/plugins/datasource/elasticsearch/datasource.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index c10c48d10fe..8f280972dc7 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -28,6 +28,7 @@ import {
   SupplementaryQueryOptions,
   DataQueryError,
   rangeUtil,
+  ensureTimeField,
   Field,
   LogRowContextQueryDirection,
   LogRowContextOptions,
@@ -577,12 +578,13 @@ export class ElasticDatasource
        */
       const timestampField = dataFrame.fields.find((f: Field) => f.name === this.timeField);
       const lineField = dataFrame.fields.find((f: Field) => f.name === this.logMessageField);
+      const otherFields = dataFrame.fields.filter((f: Field) => f !== timestampField && f !== lineField);
       if (timestampField && lineField) {
         return {
           data: [
             {
               ...dataFrame,
-              fields: [...dataFrame.fields, { ...timestampField, name: 'ts' }, { ...lineField, name: 'line' }],
+              fields: [ensureTimeField(timestampField), lineField, ...otherFields],
             },
           ],
         };