Merge pull request #172 from alanconway/fix-log-queries

COO-1271: fix:  Failed to open the Loki log through Korrel8r graph in OpenShift Console

Author: openshift-merge-bot[bot]

web/src/__tests__/log.spec.ts

@@ -74,30 +74,56 @@ describe('LogDomain.queryToLink', () => {
     {
       // LogQL query
       query: `log:infrastructure:{kubernetes_namespace_name="default",kubernetes_pod_name="foo"}`,
-      constraint: Constraint.fromAPI({
-        start: '2025-03-25T10:00:00.000Z',
-        end: '2025-03-25T22:00:00.000Z',
-      }),
-      url: new URIRef(`monitoring/logs`, {
-        q: '{kubernetes_namespace_name="default",kubernetes_pod_name="foo"}',
-        tenant: 'infrastructure',
-        start: 1742896800000,
-        end: 1742940000000,
-      }),
+      q: '{kubernetes_namespace_name="default",kubernetes_pod_name="foo"}',
+      tenant: 'infrastructure',
     },
     {
       // k8s Pod query
       query: 'log:infrastructure:{"namespace":"default","name":"foo"}',
-      constraint: Constraint.fromAPI({
+      q: '{kubernetes_namespace_name="default",kubernetes_pod_name="foo"}',
+      tenant: 'infrastructure',
+    },
+    {
+      // k8s Pod query with labels
+      query: 'log:infrastructure:{"namespace":"default","name":"foo","labels":{"a":"b","c":"d"}}',
+      q: '{kubernetes_namespace_name="default",kubernetes_pod_name="foo"}|json|kubernetes_labels_a="b"|kubernetes_labels_c="d"',
+      tenant: 'infrastructure',
+    },
+    {
+      // k8s partial query
+      query: 'log:infrastructure:{"namespace":"default","labels":{}}',
+      q: '{kubernetes_namespace_name="default"}',
+      tenant: 'infrastructure',
+    },
+    {
+      // k8s partial query
+      query:
+        'log:infrastructure:{"namespace":"openshift-monitoring","labels":{"app":"cluster-monitoring-operator"}}',
+      q: '{kubernetes_namespace_name="openshift-monitoring"}|json|kubernetes_labels_app="cluster-monitoring-operator"',
+      tenant: 'infrastructure',
+    },
+
+    {
+      query: 'log:application:{}',
+      q: '{}',
+      tenant: 'application',
+    },
+  ])('$query', ({ query, q, tenant }) => {
+    const got = new LogDomain().queryToLink(
+      Query.parse(query),
+      Constraint.fromAPI({
         start: '2025-03-25T10:00:00.000Z',
         end: '2025-03-25T22:00:00.000Z',
       }),
-
-      url: new URIRef('k8s/ns/default/core~v1~Pod/foo/aggregated-logs'),
-    },
-  ])('$query', ({ url, query, constraint }) =>
-    expect(new LogDomain().queryToLink(Query.parse(query), constraint)).toEqual(url),
-  );
+    );
+    const want = new URIRef('monitoring/logs', {
+      q,
+      tenant,
+      start: 1742896800000,
+      end: 1742940000000,
+    });
+    expect(got.toString()).toEqual(want.toString());
+  });
 });
 
 describe('expected errors', () => {

web/src/korrel8r/k8s.ts

@@ -11,7 +11,7 @@ type Model = {
 };
 
 // Parsed form of a k8s query selector.
-type Selector = {
+export type Selector = {
   name?: string;
   namespace?: string;
   labels?: { [key: string]: string };

web/src/korrel8r/log.ts

@@ -1,5 +1,4 @@
-import { K8sDomain } from './k8s';
-import { Class, Constraint, Domain, joinPath, Query, unixMilliseconds, URIRef } from './types';
+import { Class, Constraint, Domain, Query, unixMilliseconds, URIRef } from './types';
 
 enum LogClass {
   application = 'application',
@@ -10,13 +9,8 @@ enum LogClass {
 // TODO: Aggregated log links and k8s:pod style log queries ignore the containers parameter.
 
 export class LogDomain extends Domain {
-  private k8s: K8sDomain;
-  private pod: Class;
-
   constructor() {
     super('log');
-    this.k8s = new K8sDomain();
-    this.pod = new Class('k8s', 'Pod');
   }
 
   class(name: string): Class {
@@ -50,19 +44,35 @@ export class LogDomain extends Domain {
   queryToLink(query: Query, constraint?: Constraint): URIRef {
     const logClass = LogClass[query.class.name as keyof typeof LogClass];
     if (!logClass) throw this.badQuery(query, 'unknown class');
-    try {
-      // First try to parse the selector as k8s pod selector
-      const link = this.k8s.queryToLink(this.pod.query(query.selector));
-      link.pathname = joinPath(link.pathname, 'aggregated-logs');
-      return link;
-    } catch {
-      // Otherwise assume it is a LogQL query.
-      return new URIRef('monitoring/logs', {
-        q: query.selector,
-        tenant: logClass,
-        start: unixMilliseconds(constraint?.start),
-        end: unixMilliseconds(constraint?.end),
-      });
-    }
+    return new URIRef('monitoring/logs', {
+      // Try to translate as a direct pod selector, otherwise use as logQL query
+      q: directToLogQL(query.selector) || query.selector,
+      tenant: logClass,
+      start: unixMilliseconds(constraint?.start),
+      end: unixMilliseconds(constraint?.end),
+    });
   }
 }
+
+const directToLogQL = (maybeDirect: string): string | undefined => {
+  try {
+    // Try to parse the selector as k8s pod selector, and translate to logQL.
+    const direct = JSON.parse(maybeDirect);
+    if (!direct || typeof direct !== 'object') return undefined;
+    const streams = [
+      direct?.namespace && `kubernetes_namespace_name="${direct.namespace}"`,
+      direct?.name && `kubernetes_pod_name="${direct.name}"`,
+    ]
+      .filter((x) => x)
+      .join(',');
+    const pipeline =
+      direct?.labels && typeof direct.labels === 'object'
+        ? Object.entries(direct.labels)
+            .map(([k, v]) => `|kubernetes_labels_${k}="${v}"`)
+            .join('')
+        : '';
+    return `{${streams}}${pipeline ? '|json' + pipeline : ''}`;
+  } catch {
+    return undefined;
+  }
+};