Merge pull request #106 from alanconway/spurious-json

fix(COO-557): Remove spurious '|json' in log queries.

Author: openshift-merge-bot[bot]

web/src/__tests__/log-node.spec.ts

@@ -7,8 +7,7 @@ describe('LogNode.fromURL', () => {
         '{kubernetes_namespace_name="default",kubernetes_pod_name="foo"}',
       )}&tenant=infrastructure`,
       query:
-        `log:infrastructure:{kubernetes_namespace_name="default"` +
-        `,kubernetes_pod_name="foo"}|json`,
+        `log:infrastructure:{kubernetes_namespace_name="default"` + `,kubernetes_pod_name="foo"}`,
     },
     {
       url: `monitoring/logs?q=${encodeURIComponent(
@@ -17,31 +16,30 @@ describe('LogNode.fromURL', () => {
       )}`,
       query:
         `log:infrastructure:{kubernetes_namespace_name="default",` +
-        `kubernetes_pod_name="foo",log_type="infrastructure"}|json`,
+        `kubernetes_pod_name="foo",log_type="infrastructure"}`,
     },
     {
       url: `monitoring/logs?q=${encodeURIComponent(
-        '{kubernetes_namespace_name="default",kubernetes_pod_name="foo"}|json',
+        '{kubernetes_namespace_name="default",kubernetes_pod_name="foo"}',
       )}&tenant=infrastructure`,
       query:
-        `log:infrastructure:{kubernetes_namespace_name="default",` +
-        `kubernetes_pod_name="foo"}|json`,
+        `log:infrastructure:{kubernetes_namespace_name="default",` + `kubernetes_pod_name="foo"}`,
     },
     {
       url: `monitoring/logs?q=${encodeURIComponent(
-        '{kubernetes_namespace_name="default",kubernetes_pod_name="foo",log_type="infrastructure"}|json',
+        '{kubernetes_namespace_name="default",kubernetes_pod_name="foo",log_type="infrastructure"}',
       )}&tenant=infrastructure`,
       query:
         `log:infrastructure:{kubernetes_namespace_name="default",` +
-        `kubernetes_pod_name="foo",log_type="infrastructure"}|json`,
+        `kubernetes_pod_name="foo",log_type="infrastructure"}`,
     },
     {
       url: `/k8s/ns/foo/pods/bar/aggregated-logs`,
-      query: `log:application:{kubernetes_namespace_name="foo",kubernetes_pod_name="bar"}|json`,
+      query: `log:application:{kubernetes_namespace_name="foo",kubernetes_pod_name="bar"}`,
     },
     {
       url: `/k8s/ns/kube/pods/bar/aggregated-logs`,
-      query: `log:infrastructure:{kubernetes_namespace_name="kube",kubernetes_pod_name="bar"}|json`,
+      query: `log:infrastructure:{kubernetes_namespace_name="kube",kubernetes_pod_name="bar"}`,
     },
   ])('$url', ({ url, query }) => expect(LogNode.fromURL(url)?.toQuery()).toEqual(query));
 });
@@ -50,16 +48,15 @@ describe('LogNode.fromQuery', () => {
   it.each([
     {
       query:
-        `log:infrastructure:{kubernetes_namespace_name="default",` +
-        `kubernetes_pod_name="foo"}|json`,
+        `log:infrastructure:{kubernetes_namespace_name="default",` + `kubernetes_pod_name="foo"}`,
       url: `monitoring/logs?q=${encodeURIComponent(
-        '{kubernetes_namespace_name="default",kubernetes_pod_name="foo"}|json',
+        '{kubernetes_namespace_name="default",kubernetes_pod_name="foo"}',
       )}&tenant=infrastructure`,
     },
     {
       query: 'log:infrastructure:{kubernetes_namespace_name="default",log_type="infrastructure"}',
       url: `monitoring/logs?q=${encodeURIComponent(
-        '{kubernetes_namespace_name="default",log_type="infrastructure"}|json',
+        '{kubernetes_namespace_name="default",log_type="infrastructure"}',
       )}&tenant=infrastructure`,
     },
   ])('$query', ({ url, query }) => expect(LogNode.fromQuery(query)?.toURL()).toEqual(url));
@@ -72,7 +69,7 @@ describe('expected errors', () => {
       expected: 'Expected log URL: monitoring/log',
     },
     {
-      url: 'monitoring/logs?q={kubernetes_namespace_name="default",kubernetes_pod_name="foo"}|json',
+      url: 'monitoring/logs?q={kubernetes_namespace_name="default",kubernetes_pod_name="foo"}',
       expected: 'No log class found in URL',
     },
   ])('error from url: $url', ({ url, expected }) => {

web/src/__tests__/node-factory.spec.ts

@@ -41,10 +41,9 @@ const testdata = [
   },
   {
     url: `monitoring/logs?q=${encodeURIComponent(
-      '{kubernetes_namespace_name="default",log_type="infrastructure"}|json',
+      '{kubernetes_namespace_name="default",log_type="infrastructure"}',
     )}&tenant=infrastructure`,
-    query:
-      'log:infrastructure:{kubernetes_namespace_name="default",log_type="infrastructure"}|json',
+    query: 'log:infrastructure:{kubernetes_namespace_name="default",log_type="infrastructure"}',
   },
 ];
 

web/src/korrel8r/log.ts

@@ -7,10 +7,6 @@ enum LogClass {
   audit = 'audit',
 }
 
-const addJSON = (logQL: string): string => {
-  return logQL.match(/\|json/) ? logQL : logQL + '|json';
-};
-
 export class LogNode extends Korrel8rNode {
   logClass: LogClass;
   query: string;
@@ -34,7 +30,7 @@ export class LogNode extends Korrel8rNode {
       return new LogNode(
         url,
         `log:${logClass}:{kubernetes_namespace_name="${namespace}",` +
-          `kubernetes_pod_name="${name}"}|json`,
+          `kubernetes_pod_name="${name}"}`,
         logClass,
       );
     }
@@ -45,15 +41,15 @@ export class LogNode extends Korrel8rNode {
       params.get('tenant') || logQL?.match(/{[^}]*log_type(?:=~?)"([^"]+)"/)?.at(1);
     const logClass = LogClass[logClassStr as keyof typeof LogClass];
     if (!logClass) throw new NodeError(`No log class found in URL: ${url}`);
-    return new LogNode(url, `log:${logClass}:${addJSON(logQL)}`, logClass);
+    return new LogNode(url, `log:${logClass}:${logQL}`, logClass);
   }
 
   static fromQuery(query: string): Korrel8rNode {
     const [clazz, logQL] = parseQuery('log', query);
     const logClass = LogClass[clazz as keyof typeof LogClass];
     if (!logClass) throw new NodeError(`Expected log class in query: ${query}`);
     return new LogNode(
-      `monitoring/logs?q=${encodeURIComponent(`${addJSON(logQL)}`)}&tenant=${logClass}`,
+      `monitoring/logs?q=${encodeURIComponent(`${logQL}`)}&tenant=${logClass}`,
       query,
       logClass,
     );