[8.x] [Inventory][Hosts] Make alert count consistent with the alerts …

…page using a filter (elastic#203003) (elastic#203400) # Backport This will backport the following commits from `main` to `8.x`: - [[Inventory][Hosts] Make alert count consistent with the alerts page using a filter (elastic#203003)](elastic#203003)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: jennypavlova <[email protected]>
pgayvallet · Dec 9, 2024 · 859c567 · 859c567
1 parent 54d86c7
commit 859c567
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 19 deletions.
diff --git a/...ervability_solution/infra/public/components/asset_details/tabs/overview/alerts/alerts.tsx b/...ervability_solution/infra/public/components/asset_details/tabs/overview/alerts/alerts.tsx
@@ -75,7 +75,7 @@ export const AlertsSummaryContent = ({
             )}
             <EuiFlexItem grow={false}>
               <LinkToAlertsPage
-                kuery={`"${assetId}"`}
+                kuery={`${assetIdField}:"${assetId}"`}
                 dateRange={dateRange}
                 data-test-subj="infraAssetDetailsAlertsTabAlertsShowAllButton"
               />

diff --git a/...y_solution/infra/public/pages/metrics/hosts/components/tabs/alerts/alerts_tab_content.tsx b/...y_solution/infra/public/pages/metrics/hosts/components/tabs/alerts/alerts_tab_content.tsx
@@ -6,11 +6,7 @@
  */
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import {
-  AlertConsumers,
-  INFRA_RULE_TYPE_IDS,
-  OBSERVABILITY_RULE_TYPE_IDS,
-} from '@kbn/rule-data-utils';
+import { AlertConsumers, OBSERVABILITY_RULE_TYPE_IDS } from '@kbn/rule-data-utils';
 import { BrushEndListener, type XYBrushEvent } from '@elastic/charts';
 import { useSummaryTimeRange } from '@kbn/observability-plugin/public';
 import { useBoolean } from '@kbn/react-hooks';
@@ -47,11 +43,7 @@ export const AlertsTabContent = () => {
 
   const { alertsTableConfigurationRegistry, getAlertsStateTable: AlertsStateTable } =
     triggersActionsUi;
-
-  const hostsWithAlertsKuery = hostNodes
-    .filter((host) => host.alertsCount)
-    .map((host) => `"${host.name}"`)
-    .join(' OR ');
+  const hostNamesKuery = hostNodes.map((host) => `host.name: "${host.name}"`).join(' OR ');
 
   return (
     <HeightRetainer>
@@ -73,7 +65,7 @@ export const AlertsTabContent = () => {
               <LinkToAlertsPage
                 dateRange={searchCriteria.dateRange}
                 data-test-subj="infraHostAlertsTabAlertsShowAllButton"
-                kuery={`${hostsWithAlertsKuery}`}
+                kuery={hostNamesKuery}
               />
             </EuiFlexItem>
           </EuiFlexGroup>
@@ -146,7 +138,7 @@ const MemoAlertSummaryWidget = React.memo(
     return (
       <AlertSummaryWidget
         chartProps={chartProps}
-        ruleTypeIds={INFRA_RULE_TYPE_IDS}
+        ruleTypeIds={OBSERVABILITY_RULE_TYPE_IDS}
         consumers={INFRA_ALERT_CONSUMERS}
         filter={alertsQuery}
         fullSize

diff --git a/...ervability_solution/infra/public/pages/metrics/hosts/components/tabs/alerts_tab_badge.tsx b/...ervability_solution/infra/public/pages/metrics/hosts/components/tabs/alerts_tab_badge.tsx
@@ -7,16 +7,16 @@
 import React from 'react';
 import { EuiIcon, EuiLoadingSpinner, EuiBadge, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { OBSERVABILITY_RULE_TYPE_IDS } from '@kbn/rule-data-utils';
 import { INFRA_ALERT_CONSUMERS } from '../../../../../../common/constants';
-import { INFRA_RULE_TYPE_IDS } from '../../../../../../common/alerting/metrics/types';
 import { useAlertsCount } from '../../../../../hooks/use_alerts_count';
 import { useAlertsQuery } from '../../hooks/use_alerts_query';
 
 export const AlertsTabBadge = () => {
   const { alertsEsQuery } = useAlertsQuery();
 
   const { alertsCount, loading, error } = useAlertsCount({
-    ruleTypeIds: INFRA_RULE_TYPE_IDS,
+    ruleTypeIds: OBSERVABILITY_RULE_TYPE_IDS,
     consumers: INFRA_ALERT_CONSUMERS,
     query: alertsEsQuery,
   });

diff --git a/...ins/observability_solution/inventory/public/components/alerts_badge/alerts_badge.test.tsx b/...ins/observability_solution/inventory/public/components/alerts_badge/alerts_badge.test.tsx
@@ -15,10 +15,12 @@ const useKibanaMock = useKibana as jest.Mock;
 
 const commonEntityFields: Partial<InventoryEntity> = {
   entityLastSeenTimestamp: 'foo',
-  entityId: 'entity1',
+  entityId: '1',
 };
 
 describe('AlertsBadge', () => {
+  const mockAsKqlFilter = jest.fn();
+
   beforeEach(() => {
     jest.clearAllMocks();
 
@@ -29,6 +31,11 @@ describe('AlertsBadge', () => {
             prepend: (path: string) => path,
           },
         },
+        entityManager: {
+          entityClient: {
+            asKqlFilter: mockAsKqlFilter,
+          },
+        },
       },
     });
   });
@@ -52,10 +59,11 @@ describe('AlertsBadge', () => {
         provider: null,
       },
     };
+    mockAsKqlFilter.mockReturnValue('host.name: "foo"');
 
     render(<AlertsBadge entity={entity} />);
     expect(screen.queryByTestId('inventoryAlertsBadgeLink')?.getAttribute('href')).toEqual(
-      `/app/observability/alerts?_a=(kuery:\"entity1\",status:active)`
+      `/app/observability/alerts?_a=(kuery:'host.name: "foo"',status:active)`
     );
     expect(screen.queryByTestId('inventoryAlertsBadgeLink')?.textContent).toEqual('1');
   });
@@ -78,11 +86,40 @@ describe('AlertsBadge', () => {
 
       alertsCount: 5,
     };
+    mockAsKqlFilter.mockReturnValue('service.name: "bar"');
 
     render(<AlertsBadge entity={entity} />);
     expect(screen.queryByTestId('inventoryAlertsBadgeLink')?.getAttribute('href')).toEqual(
-      `/app/observability/alerts?_a=(kuery:\"entity1\",status:active)`
+      `/app/observability/alerts?_a=(kuery:'service.name: "bar"',status:active)`
     );
     expect(screen.queryByTestId('inventoryAlertsBadgeLink')?.textContent).toEqual('5');
   });
+  it('render alerts badge for a service entity with multiple identity fields', () => {
+    const entity: InventoryEntity = {
+      ...(commonEntityFields as InventoryEntity),
+      entityType: 'service',
+      entityDisplayName: 'foo',
+      entityIdentityFields: ['service.name', 'service.environment'],
+      entityDefinitionId: 'service',
+      service: {
+        name: 'bar',
+        environment: 'prod',
+      },
+      agent: {
+        name: 'node',
+      },
+      cloud: {
+        provider: null,
+      },
+      alertsCount: 2,
+    };
+
+    mockAsKqlFilter.mockReturnValue('service.name: "bar" AND service.environment: "prod"');
+
+    render(<AlertsBadge entity={entity} />);
+    expect(screen.queryByTestId('inventoryAlertsBadgeLink')?.getAttribute('href')).toEqual(
+      `/app/observability/alerts?_a=(kuery:'service.name: "bar" AND service.environment: "prod"',status:active)`
+    );
+    expect(screen.queryByTestId('inventoryAlertsBadgeLink')?.textContent).toEqual('2');
+  });
 });
diff --git a/.../plugins/observability_solution/inventory/public/components/alerts_badge/alerts_badge.tsx b/.../plugins/observability_solution/inventory/public/components/alerts_badge/alerts_badge.tsx
@@ -15,12 +15,18 @@ export function AlertsBadge({ entity }: { entity: InventoryEntity }) {
   const {
     services: {
       http: { basePath },
+      entityManager,
     },
   } = useKibana();
 
   const activeAlertsHref = basePath.prepend(
     `/app/observability/alerts?_a=${rison.encode({
-      kuery: `"${entity.entityId}"`,
+      kuery: entityManager.entityClient.asKqlFilter({
+        entity: {
+          identity_fields: entity.entityIdentityFields,
+        },
+        ...entity,
+      }),
       status: 'active',
     })}`
   );