From a50be7ea0aa80617677c9681fe2ccd1ca613cf4b Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Wed, 29 Nov 2023 20:55:00 +0100
Subject: [PATCH] Loki: Fix derived fields with undefined `matcherType`
 (#78849)

Loki: Fix derived fields with no `matcherType`
---
 .../datasource/loki/getDerivedFields.test.ts  | 37 +++++++++++++++++++
 .../datasource/loki/getDerivedFields.ts       |  5 ++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/loki/getDerivedFields.test.ts b/public/app/plugins/datasource/loki/getDerivedFields.test.ts
index 880db4a88ac..f5d13c339f1 100644
--- a/public/app/plugins/datasource/loki/getDerivedFields.test.ts
+++ b/public/app/plugins/datasource/loki/getDerivedFields.test.ts
@@ -154,4 +154,41 @@ describe('getDerivedFields', () => {
     const trace4 = newFields.find((f) => f.name === 'trace4Name');
     expect(trace4!.values).toEqual([null, null, null, null]);
   });
+
+  it('adds links to fields with no `matcherType`', () => {
+    const df = createDataFrame({ fields: [{ name: 'line', values: ['nothing', 'trace1=1234', 'trace2=foo'] }] });
+    const newFields = getDerivedFields(df, [
+      {
+        matcherRegex: 'trace1=(\\w+)',
+        name: 'trace1',
+        url: 'http://localhost/${__value.raw}',
+      },
+    ]);
+    expect(newFields.length).toBe(1);
+    const trace1 = newFields.find((f) => f.name === 'trace1');
+    expect(trace1!.values).toEqual([null, '1234', null]);
+    expect(trace1!.config.links![0]).toEqual({
+      url: 'http://localhost/${__value.raw}',
+      title: '',
+    });
+  });
+
+  it('adds links to fields with `matcherType=regex`', () => {
+    const df = createDataFrame({ fields: [{ name: 'line', values: ['nothing', 'trace1=1234', 'trace2=foo'] }] });
+    const newFields = getDerivedFields(df, [
+      {
+        matcherRegex: 'trace1=(\\w+)',
+        matcherType: 'regex',
+        name: 'trace1',
+        url: 'http://localhost/${__value.raw}',
+      },
+    ]);
+    expect(newFields.length).toBe(1);
+    const trace1 = newFields.find((f) => f.name === 'trace1');
+    expect(trace1!.values).toEqual([null, '1234', null]);
+    expect(trace1!.config.links![0]).toEqual({
+      url: 'http://localhost/${__value.raw}',
+      title: '',
+    });
+  });
 });
diff --git a/public/app/plugins/datasource/loki/getDerivedFields.ts b/public/app/plugins/datasource/loki/getDerivedFields.ts
index 24b3b9f1c46..75b9b6f7de7 100644
--- a/public/app/plugins/datasource/loki/getDerivedFields.ts
+++ b/public/app/plugins/datasource/loki/getDerivedFields.ts
@@ -41,7 +41,10 @@ export function getDerivedFields(dataFrame: DataFrame, derivedFieldConfigs: Deri
           }
         }
         field.values.push(null);
-      } else if (derivedFieldsGrouped[field.name][0].matcherType === 'regex') {
+      } else if (
+        derivedFieldsGrouped[field.name][0].matcherType === 'regex' ||
+        derivedFieldsGrouped[field.name][0].matcherType === undefined
+      ) {
         // `matcherRegex` will actually be used as a RegExp here
         const line = lineField.values[i];
         const logMatch = line.match(derivedFieldsGrouped[field.name][0].matcherRegex);