diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.tsx
index bd4a59414e1144..37f4f4559b50bc 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.tsx
@@ -71,6 +71,7 @@ export const FieldValueCell = React.memo(
eventId={eventId}
fieldFormat={data.format}
fieldName={data.field}
+ fieldFromBrowserField={fieldFromBrowserField}
fieldType={data.type}
isAggregatable={fieldFromBrowserField.aggregatable}
isDraggable={isDraggable}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
index 7062fc7afbb78c..6cc5f76c8123a9 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
@@ -13,6 +13,7 @@ import { isNumber, isEmpty } from 'lodash/fp';
import React from 'react';
import { css } from '@emotion/css';
+import type { BrowserField } from '../../../../../common/containers/source';
import { SENTINEL_ONE_AGENT_ID_FIELD } from '../../../../../common/utils/sentinelone_alert_check';
import { SentinelOneAgentStatus } from '../../../../../detections/components/host_isolation/sentinel_one_agent_status';
import { EndpointAgentStatusById } from '../../../../../common/components/endpoint/endpoint_agent_status';
@@ -65,6 +66,7 @@ const FormattedFieldValueComponent: React.FC<{
isAggregatable?: boolean;
isObjectArray?: boolean;
fieldFormat?: string;
+ fieldFromBrowserField?: BrowserField;
fieldName: string;
fieldType?: string;
isButton?: boolean;
@@ -84,6 +86,7 @@ const FormattedFieldValueComponent: React.FC<{
isAggregatable = false,
fieldName,
fieldType = '',
+ fieldFromBrowserField,
isButton,
isObjectArray = false,
isDraggable = true,
@@ -256,6 +259,11 @@ const FormattedFieldValueComponent: React.FC<{
iconSide={isButton ? 'right' : undefined}
/>
);
+ } else if (
+ fieldName === SENTINEL_ONE_AGENT_ID_FIELD ||
+ fieldFromBrowserField?.name === SENTINEL_ONE_AGENT_ID_FIELD
+ ) {
+ return ;
} else if (fieldName === AGENT_STATUS_FIELD_NAME) {
return (
);
- } else if (fieldName === SENTINEL_ONE_AGENT_ID_FIELD) {
- return ;
} else if (
[
RULE_REFERENCE_FIELD_NAME,