Merge pull request #4968 from kyoto/monitoring-alert-list-filter-non-…

…fuzzy Bug 1821990: Monitoring: Change text filter by alert description to not use fuzzy
openshift · Apr 13, 2020 · 743bafe · 743bafe
2 parents 70ae2b7 + b76227d
commit 743bafe
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/frontend/integration-tests/tests/monitoring.scenario.ts b/frontend/integration-tests/tests/monitoring.scenario.ts
@@ -38,7 +38,7 @@ describe('Monitoring: Alerts', () => {
 
   it('filters Alerts by name', async () => {
     await monitoringView.wait(until.elementToBeClickable(crudView.nameFilter));
-    await crudView.nameFilter.sendKeys(`${testAlertName} PagerDuty`);
+    await crudView.nameFilter.sendKeys(testAlertName);
     expect(firstElementByTestID('alert-resource-link').getText()).toContain(testAlertName);
   });
 

diff --git a/frontend/public/components/factory/table-filters.ts b/frontend/public/components/factory/table-filters.ts
@@ -32,9 +32,17 @@ export const tableFilters: TableFilterMap = {
 
   'catalog-source-name': (filter, obj) => fuzzyCaseInsensitive(filter, obj.name),
 
-  'alert-list-text': (filter, alert) =>
-    fuzzyCaseInsensitive(filter, alert.labels?.alertname) ||
-    fuzzyCaseInsensitive(filter, alertDescription(alert)),
+  'alert-list-text': (filter, alert) => {
+    if (fuzzyCaseInsensitive(filter, alert.labels?.alertname)) {
+      return true;
+    }
+
+    // Search in alert description. Ignore case and whitespace, but don't use fuzzy since the
+    // description can be long and will often match fuzzy searches that are not really relevant.
+    const needle = _.toLower(filter.replace(/\s/g, ''));
+    const haystack = _.toLower(alertDescription(alert).replace(/\s/g, ''));
+    return haystack.includes(needle);
+  },
 
   'alert-state': (filter, alert) => filter.selected.has(alertState(alert)),