[Entity Analytics] Fix host details page for hosts in the entity store #268272
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| import type { Filter } from '@kbn/es-query'; | ||
| import type { QueryDslQueryContainer } from '@kbn/data-views-plugin/common/types'; | ||
|
|
||
| export const euidDslFilterToPageFilters = (dsl: QueryDslQueryContainer | undefined): Filter[] => { | ||
| if (dsl == null) return []; | ||
| return [{ meta: { alias: null, negate: false, disabled: false }, query: dsl }]; | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,7 +19,6 @@ import { noop } from 'lodash/fp'; | |
| import React, { useCallback, useEffect, useMemo } from 'react'; | ||
| import { useDispatch, useSelector } from 'react-redux'; | ||
| import { useLocation } from 'react-router-dom'; | ||
| import { buildEsQuery } from '@kbn/es-query'; | ||
| import { getEsQueryConfig } from '@kbn/data-plugin/common'; | ||
| import { useUpdateAssetCriticality } from '../../../../entity_analytics/api/hooks/use_update_asset_criticality'; | ||
|
|
@@ -64,11 +63,7 @@ import { HostDetailsTabs } from './details_tabs'; | |
| import { navTabsHostDetails } from './nav_tabs'; | ||
| import type { HostDetailsProps } from './types'; | ||
| import { HostsType } from '../../store/model'; | ||
| import { getHostDetailsPageFilters } from './helpers'; | ||
| import { useGlobalFullScreen } from '../../../../common/containers/use_full_screen'; | ||
| import { Display } from '../display'; | ||
| import { useDeepEqualSelector } from '../../../../common/hooks/use_selector'; | ||
|
|
@@ -96,6 +91,7 @@ import { NO_CORRESPONDING_ENTITY_EXISTS } from '../../../../flyout/entity_detail | |
| import { useSecurityDefaultPatterns } from '../../../../data_view_manager/hooks/use_security_default_patterns'; | ||
| import { sourcererSelectors } from '../../../../sourcerer/store'; | ||
| import type { Entity } from '../../../../../common/api/entity_analytics'; | ||
| import { euidDslFilterToPageFilters } from '../../../helpers'; | ||
|
|
||
| const ES_HOST_FIELD = 'host.name'; | ||
| const HostOverviewManage = manageQuery(HostOverview); | ||
|
|
@@ -186,11 +182,6 @@ const HostDetailsComponent: React.FC<HostDetailsProps> = ({ | |
| [identityFields, detailName] | ||
| ); | ||
|
|
||
| const isEnterprisePlus = useLicense().isEnterprise(); | ||
|
|
||
| const narrowDateRange = useCallback<NarrowDateRange>( | ||
|
|
@@ -247,24 +238,23 @@ const HostDetailsComponent: React.FC<HostDetailsProps> = ({ | |
| entityStoreV2Enabled && !entityFromStoreResult.isLoading && !entityFromStoreResult.entityRecord; | ||
|
|
||
| const hostDetailsEventsPageFilters = useMemo(() => { | ||
| // Builds Kibana (not ES DSL) filters | ||
| // Fallback to host.name filter if EUID-based filter cannot be built for any reason | ||
| const legacyFilters = getHostDetailsPageFilters(detailName); | ||
| if (!entityStoreV2Enabled || noEntityInStore) { | ||
| return legacyFilters; | ||
| } | ||
| const entityDslFilter = euidApi?.euid?.dsl.getEuidFilterBasedOnDocument( | ||
| EntityType.host, | ||
| entityFromStoreResult.entityRecord | ||
| ); | ||
| return entityDslFilter ? euidDslFilterToPageFilters(entityDslFilter) : legacyFilters; | ||
| }, [ | ||
| detailName, | ||
| entityFromStoreResult.entityRecord, | ||
| entityStoreV2Enabled, | ||
| noEntityInStore, | ||
| euidApi?.euid, | ||
| ]); | ||
|
|
||
| const oldSecurityDefaultPatterns = | ||
|
|
@@ -274,6 +264,7 @@ const HostDetailsComponent: React.FC<HostDetailsProps> = ({ | |
| ? experimentalSecurityDefaultIndexPatterns | ||
| : oldSecurityDefaultPatterns; | ||
|
|
||
| // observedHost.entityRecord returns entityStoreFromResult.entityRecord when entityStoreV2Enabled | ||
| const observedHost = useObservedHost( | ||
| detailName, | ||
| PageScope.explore, | ||
|
|
@@ -316,46 +307,21 @@ const HostDetailsComponent: React.FC<HostDetailsProps> = ({ | |
| [entityId, entityStoreV2Enabled, observedHost.entityRecord?.entity?.id] | ||
| ); | ||
|
|
||
| const [rawFilteredQueryForHostDetailsIdentity, kqlError] = useMemo(() => { | ||
| try { | ||
| return [ | ||
| buildEsQuery( | ||
| newDataViewPickerEnabled | ||
| ? experimentalDataView | ||
| : dataViewSpecToViewBase(oldSourcererDataView), | ||
| [query], | ||
| [...hostDetailsEventsPageFilters, ...globalFilters], | ||
| getEsQueryConfig(uiSettings) | ||
| ), | ||
| ]; | ||
| } catch (e) { | ||
| return [undefined, e]; | ||
| } | ||
| }, [ | ||
| newDataViewPickerEnabled, | ||
| experimentalDataView, | ||
|
|
@@ -374,10 +340,9 @@ const HostDetailsComponent: React.FC<HostDetailsProps> = ({ | |
| [rawFilteredQueryForHostDetailsIdentity] | ||
| ); | ||
|
|
||
| useInvalidFilterQuery({ | ||
| id: ID, | ||
| filterQuery: stringifiedHostDetailsIdentityFilterQuery, | ||
| kqlError, | ||
| query, | ||
| startDate: from, | ||
|
|
@@ -391,17 +356,9 @@ const HostDetailsComponent: React.FC<HostDetailsProps> = ({ | |
| const { hasAlertsRead, hasIndexRead } = useAlertsPrivileges(); | ||
| const canReadAlerts = hasAlertsRead && hasIndexRead; | ||
|
|
||
| const additionalFilters = useMemo( | ||
| () => (rawFilteredQueryForHostDetailsIdentity ? [rawFilteredQueryForHostDetailsIdentity] : []), | ||
| [rawFilteredQueryForHostDetailsIdentity] | ||
| ); | ||
|
|
||
| const entity = useMemo( | ||
|
|
@@ -581,14 +538,14 @@ const HostDetailsComponent: React.FC<HostDetailsProps> = ({ | |
| <EuiFlexItem> | ||
| <AlertsByStatus | ||
| signalIndexName={signalIndexName} | ||
| entityType={EntityType.host} | ||
| entityRecord={entityStoreV2Enabled ? observedHost.entityRecord : undefined} | ||
|
Contributor
There was a problem hiding this comment. small suggestion: I see that |
||
| identityFields={resolvedIdentityFields} | ||
| additionalFilters={additionalFilters} | ||
| /> | ||
| </EuiFlexItem> | ||
| <EuiFlexItem> | ||
| <AlertCountByRuleByStatus | ||
| identityFields={resolvedIdentityFields} | ||
| signalIndexName={signalIndexName} | ||
| additionalFilters={additionalFilters} | ||
|
|
@@ -620,16 +577,18 @@ const HostDetailsComponent: React.FC<HostDetailsProps> = ({ | |
| isInitializing={isInitializing} | ||
| deleteQuery={deleteQuery} | ||
| hostDetailsFilter={hostDetailsEventsPageFilters} | ||
| to={to} | ||
| from={from} | ||
| detailName={detailName} | ||
| type={HostsType.details} | ||
| setQuery={setQuery} | ||
| entityRecord={ | ||
| entityStoreV2Enabled ? observedHost.entityRecord ?? undefined : undefined | ||
| } | ||
| filterQuery={stringifiedHostDetailsIdentityFilterQuery} | ||
| hostDetailsPagePath={hostDetailsPagePath} | ||
| identityFields={resolvedIdentityFields} | ||
| entityId={displayEntityId} | ||
| /> | ||
| </SecuritySolutionPageWrapper> | ||
| </> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
euidDslFilterToPageFilterswas moved toexplore/helpers.ts, but the original definition still lives inusers/pages/details/helpers.tsand it's no longer imported anywhere. Can we remove it?