refactor: NO-JIRA: Simplify/improve alert matching code and error handling.

Corrections to the fix for #152

Author: alanconway

web/src/__tests__/alert.spec.ts

@@ -9,7 +9,7 @@ describe('AlertNode.fromURL', () => {
         'container=bad-deployment&endpoint=https-main&job=kube-state-metrics&namespace=default&pod=bad-deployment&' +
         'reason=CrashLoopBackOff&service=kube-state-metrics&uid=00000000-0000-0000-0000-000000000000',
       query:
-        'alert:alert:{"prometheus":"openshift-monitoring/k8s","severity":"warning","alertname":"KubePodCrashLooping","container":"bad-deployment",' +
+        'alert:alert:{"severity":"warning","alertname":"KubePodCrashLooping","container":"bad-deployment",' +
         '"endpoint":"https-main","job":"kube-state-metrics","namespace":"default","pod":"bad-deployment",' +
         '"reason":"CrashLoopBackOff","service":"kube-state-metrics","uid":"00000000-0000-0000-0000-000000000000"}',
     },

web/src/components/topology/LoadingTopology.tsx

@@ -1,4 +1,3 @@
-import * as React from 'react';
 import {
   action,
   BreadthFirstLayout,
@@ -18,6 +17,7 @@ import {
   VisualizationProvider,
   VisualizationSurface,
 } from '@patternfly/react-topology';
+import * as React from 'react';
 
 const baselineComponentFactory: ComponentFactory = (kind: ModelKind, type: string) => {
   switch (type) {
@@ -75,6 +75,7 @@ export const LoadingTopology: React.FC = () => {
             resetViewCallback: action(() => {
               controller.getGraph().reset();
               controller.getGraph().layout();
+              controller.getGraph().fit(30);
             }),
             legend: false,
             zoomInDisabled: true,

web/src/korrel8r/alert.ts

@@ -14,20 +14,17 @@ export class AlertDomain extends Domain {
 
   // Convert a Query to a relative URI reference.
   linkToQuery(link: URIRef): Query {
-    const m = link.pathname.match(/monitoring\/(?:alerts|alertrules)(?:\/(.*))?$/);
+    const m = link.pathname.match(/monitoring\/(?:alerts|alertrules)(?:\/([^/]*))?/);
     if (!m) throw this.badLink(link);
     const ruleID = m?.[1];
-    let selector: { alertname?: string };
+    let selector: { [key: string]: string };
     if (ruleID) {
       // Search for alerts belonging to a specific alerting rule.
       selector = Object.fromEntries(link.searchParams);
-      // Get the name from the path if not found in search parameters.
-      if (!selector.alertname) {
-        const name = this?.idToName?.get(ruleID);
-        if (name) selector.alertname = name;
-      }
+      selector['alertname'] ||= this?.idToName?.get(ruleID); // Look up name from ID if missing
       // Must have an alertname for a specific rule search.
-      if (!selector.alertname) throw this.badLink(link, 'cannot find alertname');
+      if (!selector['alertname']) throw this.badLink(link, 'cannot find alertname');
+      nonLabelParams.forEach((key: string) => delete selector[key]);
     } else {
       // Generic alert search across rules. Empty selector is allowed - means "all alerts"
       selector = parseKeyValueList(link.searchParams.get('alerts'));
@@ -36,7 +33,20 @@ export class AlertDomain extends Domain {
   }
 
   queryToLink(query: Query): URIRef {
-    const selectors = keyValueList(JSON.parse(query.selector));
-    return new URIRef(`monitoring/alerts`, { alerts: selectors || undefined });
+    // Use "alerts" parameter to search for alerts of possibly mixed alertnames.
+    try {
+      const selectors = keyValueList(JSON.parse(query.selector));
+      return new URIRef(`monitoring/alerts`, { alerts: selectors || undefined });
+    } catch (e) {
+      throw this.badQuery(query, e.toString());
+    }
   }
 }
+
+// URL parameters that are not alert labels, remove them from the query.
+const nonLabelParams = new Set<string>([
+  'prometheus',
+  'rowFilter-alert-state',
+  'rowFilter-alert-source',
+  'rowFilter-alerting-rule-source',
+]);