From ebbf0c5bbb8cb41ef28c3a64bf2ecd4a5a5b9782 Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Tue, 19 Dec 2023 08:33:29 -0800
Subject: [PATCH 01/25] wip: vulnerabilities datatable

---
 .../api/use_latest_findings_data_view.ts      |  1 +
 .../public/pages/vulnerabilities/constants.ts | 33 +++++++++++
 .../hooks/use_latest_vulnerabilities.tsx      | 59 ++++++++++++++-----
 .../use_latest_vulnerabilities_table.tsx      | 55 +++++++++++++++++
 .../latest_vulnerabilities_container.tsx      | 10 ++++
 .../latest_vulnerabilities_table.tsx          | 44 ++++++++++++++
 .../pages/vulnerabilities/test_subjects.ts    |  2 +
 .../cloud_security_posture/server/plugin.ts   |  1 +
 8 files changed, 189 insertions(+), 16 deletions(-)
 create mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
 create mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_table.tsx
 create mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx
 create mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_table.tsx

diff --git a/x-pack/plugins/cloud_security_posture/public/common/api/use_latest_findings_data_view.ts b/x-pack/plugins/cloud_security_posture/public/common/api/use_latest_findings_data_view.ts
index 86b9692cbfc43b..c7259738eea889 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/api/use_latest_findings_data_view.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/api/use_latest_findings_data_view.ts
@@ -61,6 +61,7 @@ export const useLatestFindingsDataView = (dataView: string) => {
       throw new Error(`Data view not found [Name: {${dataView}}]`);
     }
 
+    // or FINDINGS_INDEX_PATTERN
     if (dataView === LATEST_FINDINGS_INDEX_PATTERN) {
       Object.entries(cloudSecurityFieldLabels).forEach(([field, label]) => {
         if (
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
new file mode 100644
index 00000000000000..22af94812295f5
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
@@ -0,0 +1,33 @@
+/*
+ * 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 { FindingsBaseURLQuery } from '../../common/types';
+import { CloudSecurityDefaultColumn } from '../../components/cloud_security_data_table';
+
+export const DEFAULT_TABLE_HEIGHT = 512;
+
+export const getDefaultQuery = ({
+  query,
+  filters,
+}: FindingsBaseURLQuery): FindingsBaseURLQuery & {
+  sort: string[][];
+} => ({
+  query,
+  filters,
+  sort: [['@timestamp', 'desc']],
+});
+
+export const defaultColumns: CloudSecurityDefaultColumn[] = [
+  { id: 'result.evaluation', width: 80 },
+  { id: 'resource.id' },
+  { id: 'resource.name' },
+  { id: 'resource.sub_type' },
+  { id: 'rule.benchmark.rule_number' },
+  { id: 'rule.name' },
+  { id: 'rule.section' },
+  { id: '@timestamp' },
+];
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx
index a3ae53a25f4d90..8bf9e17cfd2c39 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { useQuery } from '@tanstack/react-query';
+import { useInfiniteQuery } from '@tanstack/react-query';
 import { lastValueFrom } from 'rxjs';
 import type { IKibanaSearchRequest, IKibanaSearchResponse } from '@kbn/data-plugin/common';
 import { number } from 'io-ts';
@@ -13,33 +13,56 @@ import {
   SearchResponse,
   AggregationsMultiBucketAggregateBase,
   AggregationsStringRareTermsBucketKeys,
-  Sort,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { buildDataTableRecord } from '@kbn/discover-utils';
+import { EsHitRecord } from '@kbn/discover-utils/types';
+import { MAX_FINDINGS_TO_LOAD } from '../../../common/constants';
 import { CspVulnerabilityFinding } from '../../../../common/schemas';
-import { LATEST_VULNERABILITIES_INDEX_PATTERN } from '../../../../common/constants';
+import {
+  LATEST_VULNERABILITIES_INDEX_PATTERN,
+  LATEST_VULNERABILITIES_RETENTION_POLICY,
+} from '../../../../common/constants';
 import { useKibana } from '../../../common/hooks/use_kibana';
 import { showErrorToast } from '../../../common/utils/show_error_toast';
 import { FindingsBaseEsQuery } from '../../../common/types';
 type LatestFindingsRequest = IKibanaSearchRequest<SearchRequest>;
-type LatestFindingsResponse = IKibanaSearchResponse<SearchResponse<any, FindingsAggs>>;
+type LatestFindingsResponse = IKibanaSearchResponse<
+  SearchResponse<CspVulnerabilityFinding, FindingsAggs>
+>;
 
 interface FindingsAggs {
   count: AggregationsMultiBucketAggregateBase<AggregationsStringRareTermsBucketKeys>;
 }
-
 interface VulnerabilitiesQuery extends FindingsBaseEsQuery {
-  sort: Sort;
+  sort: string[][];
   enabled: boolean;
-  pageIndex: number;
-  pageSize: number;
 }
 
-export const getFindingsQuery = ({ query, sort, pageIndex, pageSize }: VulnerabilitiesQuery) => ({
+export const getVulnerabilitiesQuery = (
+  { query, sort }: VulnerabilitiesQuery,
+  pageParam: number
+) => ({
   index: LATEST_VULNERABILITIES_INDEX_PATTERN,
-  query,
-  from: pageIndex * pageSize,
-  size: pageSize,
   sort,
+  size: MAX_FINDINGS_TO_LOAD,
+  query: {
+    ...query,
+    bool: {
+      ...query?.bool,
+      filter: [
+        ...(query?.bool?.filter ?? []),
+        {
+          range: {
+            '@timestamp': {
+              gte: `now-${LATEST_VULNERABILITIES_RETENTION_POLICY}`,
+              lte: 'now',
+            },
+          },
+        },
+      ],
+    },
+  },
+  ...(pageParam ? { search_after: pageParam } : {}),
 });
 
 export const useLatestVulnerabilities = (options: VulnerabilitiesQuery) => {
@@ -47,19 +70,19 @@ export const useLatestVulnerabilities = (options: VulnerabilitiesQuery) => {
     data,
     notifications: { toasts },
   } = useKibana().services;
-  return useQuery(
+  return useInfiniteQuery(
     [LATEST_VULNERABILITIES_INDEX_PATTERN, options],
-    async () => {
+    async ({ pageParam }) => {
       const {
         rawResponse: { hits },
       } = await lastValueFrom(
         data.search.search<LatestFindingsRequest, LatestFindingsResponse>({
-          params: getFindingsQuery(options),
+          params: getVulnerabilitiesQuery(options, pageParam),
         })
       );
 
       return {
-        page: hits.hits.map((hit) => hit._source!) as CspVulnerabilityFinding[],
+        page: hits.hits.map((hit) => buildDataTableRecord(hit as EsHitRecord)),
         total: number.is(hits.total) ? hits.total : 0,
       };
     },
@@ -68,6 +91,10 @@ export const useLatestVulnerabilities = (options: VulnerabilitiesQuery) => {
       keepPreviousData: true,
       enabled: options.enabled,
       onError: (err: Error) => showErrorToast(toasts, err),
+      getNextPageParam: (lastPage) => {
+        if (lastPage.page.length === 0) return undefined;
+        return lastPage.page[lastPage.page.length - 1].raw.sort;
+      },
     }
   );
 };
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_table.tsx
new file mode 100644
index 00000000000000..ac87457e34c8b4
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_table.tsx
@@ -0,0 +1,55 @@
+/*
+ * 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 { DataView } from '@kbn/data-views-plugin/common';
+import { useMemo } from 'react';
+import { LOCAL_STORAGE_DATA_TABLE_PAGE_SIZE_KEY } from '../../../common/constants';
+import { FindingsBaseURLQuery } from '../../../common/types';
+import { useCloudPostureDataTable } from '../../../common/hooks/use_cloud_posture_data_table';
+import { useLatestVulnerabilities } from './use_latest_vulnerabilities';
+
+const columnsLocalStorageKey = 'cloudPosture:latestVulnerabilities:columns';
+
+export const useLatestVulnerabilitiesTable = ({
+  dataView,
+  getDefaultQuery,
+}: {
+  dataView: DataView;
+  getDefaultQuery: (params: FindingsBaseURLQuery) => FindingsBaseURLQuery;
+}) => {
+  const cloudPostureTable = useCloudPostureDataTable({
+    dataView,
+    paginationLocalStorageKey: LOCAL_STORAGE_DATA_TABLE_PAGE_SIZE_KEY,
+    columnsLocalStorageKey,
+    defaultQuery: getDefaultQuery,
+  });
+
+  const { query, sort, queryError, setUrlQuery, filters, getRowsFromPages } = cloudPostureTable;
+
+  const {
+    data,
+    error: fetchError,
+    isFetching,
+    fetchNextPage,
+  } = useLatestVulnerabilities({
+    query,
+    sort,
+    enabled: !queryError,
+  });
+
+  const rows = useMemo(() => getRowsFromPages(data?.pages), [data?.pages, getRowsFromPages]);
+
+  const error = fetchError || queryError;
+
+  return {
+    cloudPostureTable,
+    rows,
+    error,
+    isFetching,
+    fetchNextPage,
+  };
+};
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx
new file mode 100644
index 00000000000000..5ac528dcceb815
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx
@@ -0,0 +1,10 @@
+/*
+ * 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 React from 'react';
+import { DataView } from '@kbn/data-views-plugin/common';
+
+export const LatestVulnerabilitiesContainer = ({ dataView }: { dataView: DataView }) => {};
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_table.tsx
new file mode 100644
index 00000000000000..9ac03b64b304ad
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_table.tsx
@@ -0,0 +1,44 @@
+/*
+ * 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 React from 'react';
+import { FindingsBaseProps } from '../../common/types';
+import { CloudSecurityDataTable } from '../../components/cloud_security_data_table';
+import { useLatestVulnerabilitiesTable } from './hooks/use_latest_vulnerabilities_table';
+import { LATEST_VULNERABILITIES_TABLE } from './test_subjects';
+import { getDefaultQuery } from './constants';
+
+type LatestVulnerabilitiesTableProps = FindingsBaseProps & {
+  groupSelectorComponent?: JSX.Element;
+  height?: number;
+};
+
+export const LatestVulnerabilitiesTable = ({ dataView }: LatestVulnerabilitiesTableProps) => {
+  const { cloudPostureTable, rows, error, isFetching, fetchNextPage } =
+    useLatestVulnerabilitiesTable({
+      dataView,
+      getDefaultQuery,
+    });
+
+  return (
+    <CloudSecurityDataTable
+      data-test-subj={LATEST_VULNERABILITIES_TABLE}
+      dataView={dataView}
+      isLoading={isFetching}
+      defaultColumns={defaultColumns}
+      rows={rows}
+      total={total}
+      flyoutComponent={flyoutComponent}
+      cloudPostureTable={cloudPostureTable}
+      loadMore={fetchNextPage}
+      title={title}
+      customCellRenderer={customCellRenderer}
+      groupSelectorComponent={groupSelectorComponent}
+      height={height}
+    />
+  );
+};
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/test_subjects.ts b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/test_subjects.ts
index 72211cc7784316..d22afa6eeb77bf 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/test_subjects.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/test_subjects.ts
@@ -13,3 +13,5 @@ export const OVERVIEW_TAB_VULNERABILITY_FLYOUT = 'vulnerability_overview_tab_fly
 export const SEVERITY_STATUS_VULNERABILITY_FLYOUT = 'vulnerability_severity_status_flyout';
 export const TAB_ID_VULNERABILITY_FLYOUT = (tabId: string) =>
   `vulnerability-finding-flyout-tab-${tabId}`;
+
+export const LATEST_VULNERABILITIES_TABLE = 'latest_vulnerabilities_table';
diff --git a/x-pack/plugins/cloud_security_posture/server/plugin.ts b/x-pack/plugins/cloud_security_posture/server/plugin.ts
index 8b77581efd39da..dec2ae785aa278 100755
--- a/x-pack/plugins/cloud_security_posture/server/plugin.ts
+++ b/x-pack/plugins/cloud_security_posture/server/plugin.ts
@@ -207,6 +207,7 @@ export class CspPlugin
     this.logger.debug('initialize');
     const esClient = core.elasticsearch.client.asInternalUser;
     await initializeCspIndices(esClient, this.config, this.logger);
+    // await initializeCspDataView(esClient, this.config, this.logger);
     await initializeCspTransforms(esClient, this.logger);
     await scheduleFindingsStatsTask(taskManager, this.logger);
     this.#isInitialized = true;

From 0a0b0058033f70305fcd8970cec8e019ab60cb6d Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Wed, 20 Dec 2023 11:22:09 -0800
Subject: [PATCH 02/25] WIP: Vulnerabilities DataTable

---
 .../public/pages/vulnerabilities/constants.ts |  20 +-
 .../hooks/use_latest_vulnerabilities.tsx      |   6 +-
 .../use_latest_vulnerabilities_table.tsx      |   2 +
 .../latest_vulnerabilities_container.tsx      |   7 +-
 .../latest_vulnerabilities_table.tsx          |  66 ++-
 .../pages/vulnerabilities/vulnerabilities.tsx | 451 +-----------------
 .../vulnerability_finding_flyout.tsx          |   4 +-
 7 files changed, 97 insertions(+), 459 deletions(-)

diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
index 22af94812295f5..b34c0c28c7b372 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
@@ -7,6 +7,7 @@
 
 import { FindingsBaseURLQuery } from '../../common/types';
 import { CloudSecurityDefaultColumn } from '../../components/cloud_security_data_table';
+import { vulnerabilitiesColumns } from './vulnerabilities_table_columns';
 
 export const DEFAULT_TABLE_HEIGHT = 512;
 
@@ -18,16 +19,19 @@ export const getDefaultQuery = ({
 } => ({
   query,
   filters,
-  sort: [['@timestamp', 'desc']],
+  sort: [
+    [vulnerabilitiesColumns.severity, 'desc'],
+    [vulnerabilitiesColumns.cvss, 'desc'],
+  ],
 });
 
 export const defaultColumns: CloudSecurityDefaultColumn[] = [
-  { id: 'result.evaluation', width: 80 },
-  { id: 'resource.id' },
+  { id: 'vulnerability.id' },
+  { id: 'vulnerability.score.base' },
   { id: 'resource.name' },
-  { id: 'resource.sub_type' },
-  { id: 'rule.benchmark.rule_number' },
-  { id: 'rule.name' },
-  { id: 'rule.section' },
-  { id: '@timestamp' },
+  { id: 'resource.id' },
+  { id: 'vulnerability.severity' },
+  { id: 'package.name' },
+  { id: 'package.version' },
+  { id: 'package.fixed_version' },
 ];
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx
index 8bf9e17cfd2c39..287e31828bed0d 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx
@@ -38,12 +38,16 @@ interface VulnerabilitiesQuery extends FindingsBaseEsQuery {
   enabled: boolean;
 }
 
+const getMultiFieldsSort = (sort: string[][]) => {
+  return sort.map(([id, direction]) => ({ [id]: direction }));
+};
+
 export const getVulnerabilitiesQuery = (
   { query, sort }: VulnerabilitiesQuery,
   pageParam: number
 ) => ({
   index: LATEST_VULNERABILITIES_INDEX_PATTERN,
-  sort,
+  sort: getMultiFieldsSort(sort),
   size: MAX_FINDINGS_TO_LOAD,
   query: {
     ...query,
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_table.tsx
index ac87457e34c8b4..d3f5df7eb0d35c 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_table.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_table.tsx
@@ -42,6 +42,7 @@ export const useLatestVulnerabilitiesTable = ({
   });
 
   const rows = useMemo(() => getRowsFromPages(data?.pages), [data?.pages, getRowsFromPages]);
+  const total = data?.pages[0].total || 0;
 
   const error = fetchError || queryError;
 
@@ -51,5 +52,6 @@ export const useLatestVulnerabilitiesTable = ({
     error,
     isFetching,
     fetchNextPage,
+    total,
   };
 };
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx
index 5ac528dcceb815..f753a991d7156b 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx
@@ -4,7 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import React from 'react';
 import { DataView } from '@kbn/data-views-plugin/common';
+import React from 'react';
+import { LatestVulnerabilitiesTable } from './latest_vulnerabilities_table';
 
-export const LatestVulnerabilitiesContainer = ({ dataView }: { dataView: DataView }) => {};
+export const LatestVulnerabilitiesContainer = ({ dataView }: { dataView: DataView }) => {
+  return <LatestVulnerabilitiesTable dataView={dataView} />;
+};
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_table.tsx
index 9ac03b64b304ad..c500da2b16d3db 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_table.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_table.tsx
@@ -6,25 +6,79 @@
  */
 
 import React from 'react';
+import { DataTableRecord } from '@kbn/discover-utils/types';
+import { i18n } from '@kbn/i18n';
+import { EuiSpacer } from '@elastic/eui';
+import { CspVulnerabilityFinding } from '../../../common/schemas';
 import { FindingsBaseProps } from '../../common/types';
 import { CloudSecurityDataTable } from '../../components/cloud_security_data_table';
 import { useLatestVulnerabilitiesTable } from './hooks/use_latest_vulnerabilities_table';
 import { LATEST_VULNERABILITIES_TABLE } from './test_subjects';
-import { getDefaultQuery } from './constants';
+import { getDefaultQuery, defaultColumns } from './constants';
+import { VulnerabilityFindingFlyout } from './vulnerabilities_finding_flyout/vulnerability_finding_flyout';
+import { ErrorCallout } from '../configurations/layout/error_callout';
 
 type LatestVulnerabilitiesTableProps = FindingsBaseProps & {
   groupSelectorComponent?: JSX.Element;
   height?: number;
 };
 
-export const LatestVulnerabilitiesTable = ({ dataView }: LatestVulnerabilitiesTableProps) => {
-  const { cloudPostureTable, rows, error, isFetching, fetchNextPage } =
+/**
+ * Type Guard for checking if the given source is a CspVulnerabilityFinding
+ */
+const isCspVulnerabilityFinding = (
+  source: Record<string, any> | undefined
+): source is CspVulnerabilityFinding => {
+  return source?.result?.evaluation !== undefined;
+};
+
+/**
+ * This Wrapper component renders the children if the given row is a CspVulnerabilityFinding
+ * it uses React's Render Props pattern
+ */
+const CspFindingRenderer = ({
+  row,
+  children,
+}: {
+  row: DataTableRecord;
+  children: ({ finding }: { finding: CspVulnerabilityFinding }) => JSX.Element;
+}) => {
+  const source = row.raw._source;
+  const finding = isCspVulnerabilityFinding(source) && (source as CspVulnerabilityFinding);
+  if (!finding) return <></>;
+  return children({ finding });
+};
+
+const flyoutComponent = (row: DataTableRecord, onCloseFlyout: () => void): JSX.Element => {
+  return (
+    <CspFindingRenderer row={row}>
+      {({ finding }) => (
+        <VulnerabilityFindingFlyout vulnerabilityRecord={finding} closeFlyout={onCloseFlyout} />
+      )}
+    </CspFindingRenderer>
+  );
+};
+
+const title = i18n.translate('xpack.csp.findings.latestVulnerabilities.tableRowTypeLabel', {
+  defaultMessage: 'Vulnerabilities',
+});
+
+export const LatestVulnerabilitiesTable = ({
+  dataView,
+  height,
+}: LatestVulnerabilitiesTableProps) => {
+  const { cloudPostureTable, rows, total, error, isFetching, fetchNextPage } =
     useLatestVulnerabilitiesTable({
       dataView,
       getDefaultQuery,
     });
 
-  return (
+  return error ? (
+    <>
+      <EuiSpacer size="m" />
+      <ErrorCallout error={error} />
+    </>
+  ) : (
     <CloudSecurityDataTable
       data-test-subj={LATEST_VULNERABILITIES_TABLE}
       dataView={dataView}
@@ -36,8 +90,8 @@ export const LatestVulnerabilitiesTable = ({ dataView }: LatestVulnerabilitiesTa
       cloudPostureTable={cloudPostureTable}
       loadMore={fetchNextPage}
       title={title}
-      customCellRenderer={customCellRenderer}
-      groupSelectorComponent={groupSelectorComponent}
+      // customCellRenderer={customCellRenderer}
+      // groupSelectorComponent={groupSelectorComponent}
       height={height}
     />
   );
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities.tsx
index 9c74d7640beac4..cbe42544dac4d4 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities.tsx
@@ -4,454 +4,25 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import {
-  EuiButtonEmpty,
-  EuiButtonIcon,
-  EuiDataGrid,
-  EuiDataGridCellValueElementProps,
-  EuiFlexItem,
-  EuiProgress,
-  EuiSpacer,
-  useEuiTheme,
-} from '@elastic/eui';
-import { cx } from '@emotion/css';
-import { DataView } from '@kbn/data-views-plugin/common';
-import React, { useCallback, useMemo, useState, useEffect } from 'react';
-import { i18n } from '@kbn/i18n';
+import React from 'react';
 import { Routes, Route } from '@kbn/shared-ux-router';
-import { LOCAL_STORAGE_PAGE_SIZE_FINDINGS_KEY } from '../../common/constants';
-import {
-  CloudPostureTableResult,
-  useCloudPostureTable,
-} from '../../common/hooks/use_cloud_posture_table';
-import { useLatestVulnerabilities } from './hooks/use_latest_vulnerabilities';
-import type { VulnerabilitiesQueryData } from './types';
 import { LATEST_VULNERABILITIES_INDEX_PATTERN } from '../../../common/constants';
 import { ErrorCallout } from '../configurations/layout/error_callout';
-import { FindingsSearchBar } from '../configurations/layout/findings_search_bar';
-import { CVSScoreBadge, SeverityStatusBadge } from '../../components/vulnerability_badges';
-import { EmptyState } from '../../components/empty_state';
-import { VulnerabilityFindingFlyout } from './vulnerabilities_finding_flyout/vulnerability_finding_flyout';
 import { NoVulnerabilitiesStates } from '../../components/no_vulnerabilities_states';
 import { useCspSetupStatusApi } from '../../common/api/use_setup_status_api';
-import { useLimitProperties } from '../../common/utils/get_limit_properties';
-import { LimitedResultsBar } from '../configurations/layout/findings_layout';
-import {
-  getVulnerabilitiesColumnsGrid,
-  vulnerabilitiesColumns,
-} from './vulnerabilities_table_columns';
 import { defaultLoadingRenderer, defaultNoDataRenderer } from '../../components/cloud_posture_page';
-import { SEARCH_BAR_PLACEHOLDER, VULNERABILITIES } from './translations';
-import {
-  severitySchemaConfig,
-  severitySortScript,
-  getCaseInsensitiveSortScript,
-} from './utils/custom_sort_script';
-import { useStyles } from './hooks/use_styles';
-import { FindingsGroupBySelector } from '../configurations/layout/findings_group_by_selector';
-import { vulnerabilitiesPathnameHandler } from './utils/vulnerabilities_pathname_handler';
 import { findingsNavigation } from '../../common/navigation/constants';
 import { VulnerabilitiesByResource } from './vulnerabilities_by_resource/vulnerabilities_by_resource';
 import { ResourceVulnerabilities } from './vulnerabilities_by_resource/resource_vulnerabilities/resource_vulnerabilities';
-import { getVulnerabilitiesGridCellActions } from './utils/get_vulnerabilities_grid_cell_actions';
 import { useLatestFindingsDataView } from '../../common/api/use_latest_findings_data_view';
-
-const getDefaultQuery = ({ query, filters }: any): any => ({
-  query,
-  filters,
-  sort: [
-    { id: vulnerabilitiesColumns.severity, direction: 'desc' },
-    { id: vulnerabilitiesColumns.cvss, direction: 'desc' },
-  ],
-  pageIndex: 0,
-});
-
-const VulnerabilitiesDataGrid = ({
-  dataView,
-  data,
-  isFetching,
-  onChangeItemsPerPage,
-  onChangePage,
-  onSort,
-  urlQuery,
-  onResetFilters,
-  pageSize,
-  setUrlQuery,
-  pageIndex,
-  sort,
-}: {
-  dataView: DataView;
-  data: VulnerabilitiesQueryData | undefined;
-  isFetching: boolean;
-} & Pick<
-  CloudPostureTableResult,
-  | 'pageIndex'
-  | 'sort'
-  | 'pageSize'
-  | 'onChangeItemsPerPage'
-  | 'onChangePage'
-  | 'onSort'
-  | 'urlQuery'
-  | 'setUrlQuery'
-  | 'onResetFilters'
->) => {
-  const { euiTheme } = useEuiTheme();
-  const styles = useStyles();
-  const [showHighlight, setHighlight] = useState(false);
-
-  const invalidIndex = -1;
-
-  const selectedVulnerability = useMemo(() => {
-    if (urlQuery.vulnerabilityIndex !== undefined) {
-      return data?.page[urlQuery.vulnerabilityIndex];
-    }
-  }, [data?.page, urlQuery.vulnerabilityIndex]);
-
-  const onCloseFlyout = () => {
-    setUrlQuery({
-      vulnerabilityIndex: invalidIndex,
-    });
-  };
-
-  const onSortHandler = useCallback(
-    (newSort: any) => {
-      onSort(newSort);
-      if (newSort.length !== sort.length) {
-        setHighlight(true);
-        setTimeout(() => {
-          setHighlight(false);
-        }, 2000);
-      }
-    },
-    [onSort, sort]
-  );
-
-  const { isLastLimitedPage, limitedTotalItemCount } = useLimitProperties({
-    total: data?.total,
-    pageIndex,
-    pageSize,
-  });
-
-  const onOpenFlyout = useCallback(
-    (vulnerabilityRow: VulnerabilitiesQueryData['page'][number]) => {
-      const vulnerabilityIndex = data?.page.findIndex(
-        (vulnerabilityRecord: VulnerabilitiesQueryData['page'][number]) =>
-          vulnerabilityRecord.vulnerability?.id === vulnerabilityRow.vulnerability?.id &&
-          vulnerabilityRecord.resource?.id === vulnerabilityRow.resource?.id &&
-          vulnerabilityRecord.package.name === vulnerabilityRow.package.name &&
-          vulnerabilityRecord.package.version === vulnerabilityRow.package.version
-      );
-      setUrlQuery({
-        vulnerabilityIndex,
-      });
-    },
-    [setUrlQuery, data?.page]
-  );
-
-  const columns = useMemo(() => {
-    if (!data?.page) {
-      return [];
-    }
-    return getVulnerabilitiesGridCellActions({
-      columnGridFn: getVulnerabilitiesColumnsGrid,
-      columns: vulnerabilitiesColumns,
-      dataView,
-      pageSize,
-      data: data.page,
-      setUrlQuery,
-      filters: urlQuery.filters,
-    });
-  }, [data?.page, dataView, pageSize, setUrlQuery, urlQuery.filters]);
-
-  // Column visibility
-  const [visibleColumns, setVisibleColumns] = useState(
-    columns.map(({ id }) => id) // initialize to the full set of columns
-  );
-
-  const flyoutVulnerabilityIndex = urlQuery?.vulnerabilityIndex;
-
-  const selectedVulnerabilityIndex = flyoutVulnerabilityIndex
-    ? flyoutVulnerabilityIndex + pageIndex * pageSize
-    : undefined;
-
-  const renderCellValue = useMemo(() => {
-    const Cell: React.FC<EuiDataGridCellValueElementProps> = ({
-      columnId,
-      rowIndex,
-      setCellProps,
-    }): React.ReactElement | null => {
-      const rowIndexFromPage = rowIndex > pageSize - 1 ? rowIndex % pageSize : rowIndex;
-
-      const vulnerabilityRow = data?.page[rowIndexFromPage];
-
-      useEffect(() => {
-        if (selectedVulnerabilityIndex === rowIndex) {
-          setCellProps({
-            style: {
-              backgroundColor: euiTheme.colors.highlight,
-            },
-          });
-        } else {
-          setCellProps({
-            style: {
-              backgroundColor: 'inherit',
-            },
-          });
-        }
-      }, [rowIndex, setCellProps]);
-
-      if (isFetching) return null;
-      if (!vulnerabilityRow) return null;
-      if (!vulnerabilityRow.vulnerability?.id) return null;
-
-      if (columnId === vulnerabilitiesColumns.actions) {
-        return (
-          <EuiButtonIcon
-            iconType="expand"
-            aria-label="View"
-            onClick={() => {
-              onOpenFlyout(vulnerabilityRow);
-            }}
-          />
-        );
-      }
-      if (columnId === vulnerabilitiesColumns.vulnerability) {
-        return <>{vulnerabilityRow.vulnerability?.id}</>;
-      }
-      if (columnId === vulnerabilitiesColumns.cvss) {
-        if (
-          !vulnerabilityRow.vulnerability.score?.base ||
-          !vulnerabilityRow.vulnerability.score?.version
-        ) {
-          return null;
-        }
-        return (
-          <CVSScoreBadge
-            score={vulnerabilityRow.vulnerability.score.base}
-            version={vulnerabilityRow.vulnerability.score.version}
-          />
-        );
-      }
-      if (columnId === vulnerabilitiesColumns.resourceName) {
-        return <>{vulnerabilityRow.resource?.name}</>;
-      }
-      if (columnId === vulnerabilitiesColumns.resourceId) {
-        return <>{vulnerabilityRow.resource?.id}</>;
-      }
-      if (columnId === vulnerabilitiesColumns.severity) {
-        if (!vulnerabilityRow.vulnerability.severity) {
-          return null;
-        }
-        return <SeverityStatusBadge severity={vulnerabilityRow.vulnerability.severity} />;
-      }
-
-      if (columnId === vulnerabilitiesColumns.package) {
-        return <>{vulnerabilityRow?.package?.name}</>;
-      }
-      if (columnId === vulnerabilitiesColumns.version) {
-        return <>{vulnerabilityRow?.package?.version}</>;
-      }
-      if (columnId === vulnerabilitiesColumns.fixedVersion) {
-        return <>{vulnerabilityRow?.package?.fixed_version}</>;
-      }
-
-      return null;
-    };
-
-    return Cell;
-  }, [
-    data?.page,
-    euiTheme.colors.highlight,
-    onOpenFlyout,
-    pageSize,
-    selectedVulnerabilityIndex,
-    isFetching,
-  ]);
-
-  const showVulnerabilityFlyout = flyoutVulnerabilityIndex > invalidIndex;
-
-  if (data?.page.length === 0) {
-    return <EmptyState onResetFilters={onResetFilters} />;
-  }
-
-  const dataTableStyle = {
-    // Change the height of the grid to fit the page
-    // If there are filters, leave space for the filter bar
-    // Todo: Replace this component with EuiAutoSizer
-    height: `calc(100vh - ${urlQuery.filters.length > 0 ? 403 : 363}px)`,
-    minHeight: 400,
-  };
-
-  return (
-    <>
-      <EuiProgress
-        size="xs"
-        color="accent"
-        style={{
-          opacity: isFetching ? 1 : 0,
-        }}
-      />
-      <div style={dataTableStyle}>
-        <EuiDataGrid
-          className={cx({ [styles.gridStyle]: true }, { [styles.highlightStyle]: showHighlight })}
-          aria-label={VULNERABILITIES}
-          columns={columns}
-          columnVisibility={{ visibleColumns, setVisibleColumns }}
-          schemaDetectors={[severitySchemaConfig]}
-          rowCount={limitedTotalItemCount}
-          toolbarVisibility={{
-            showColumnSelector: false,
-            showDisplaySelector: false,
-            showKeyboardShortcuts: false,
-            showFullScreenSelector: false,
-            additionalControls: {
-              left: {
-                append: (
-                  <>
-                    <EuiButtonEmpty size="xs" color="text">
-                      {i18n.translate('xpack.csp.vulnerabilities.totalVulnerabilities', {
-                        defaultMessage:
-                          '{total, plural, one {# Vulnerability} other {# Vulnerabilities}}',
-                        values: { total: data?.total },
-                      })}
-                    </EuiButtonEmpty>
-                  </>
-                ),
-              },
-              right: (
-                <EuiFlexItem grow={false} className={styles.groupBySelector}>
-                  <FindingsGroupBySelector
-                    type="default"
-                    pathnameHandler={vulnerabilitiesPathnameHandler}
-                  />
-                </EuiFlexItem>
-              ),
-            },
-          }}
-          gridStyle={{
-            border: 'horizontal',
-            cellPadding: 'l',
-            stripes: false,
-            rowHover: 'none',
-            header: 'underline',
-          }}
-          renderCellValue={renderCellValue}
-          inMemory={{ level: 'enhancements' }}
-          sorting={{ columns: sort, onSort: onSortHandler }}
-          pagination={{
-            pageIndex,
-            pageSize,
-            pageSizeOptions: [10, 25, 100],
-            onChangeItemsPerPage,
-            onChangePage,
-          }}
-          virtualizationOptions={{
-            overscanRowCount: 20,
-          }}
-        />
-        {isLastLimitedPage && <LimitedResultsBar />}
-      </div>
-      {showVulnerabilityFlyout && selectedVulnerability && (
-        <VulnerabilityFindingFlyout
-          flyoutIndex={selectedVulnerabilityIndex}
-          vulnerabilityRecord={selectedVulnerability}
-          totalVulnerabilitiesCount={limitedTotalItemCount}
-          closeFlyout={onCloseFlyout}
-          isLoading={isFetching}
-        />
-      )}
-    </>
-  );
-};
-
-const VulnerabilitiesContent = ({ dataView }: { dataView: DataView }) => {
-  const {
-    sort,
-    query,
-    queryError,
-    pageSize,
-    pageIndex,
-    onChangeItemsPerPage,
-    onChangePage,
-    onSort,
-    urlQuery,
-    setUrlQuery,
-    onResetFilters,
-  } = useCloudPostureTable({
-    dataView,
-    defaultQuery: getDefaultQuery,
-    paginationLocalStorageKey: LOCAL_STORAGE_PAGE_SIZE_FINDINGS_KEY,
-  });
-
-  const multiFieldsSort = useMemo(() => {
-    return sort.map(({ id, direction }: { id: string; direction: string }) => {
-      if (id === vulnerabilitiesColumns.severity) {
-        return severitySortScript(direction);
-      }
-      if (id === vulnerabilitiesColumns.package) {
-        return getCaseInsensitiveSortScript(id, direction);
-      }
-
-      return {
-        [id]: direction,
-      };
-    });
-  }, [sort]);
-
-  const { data, isLoading, isFetching } = useLatestVulnerabilities({
-    query,
-    sort: multiFieldsSort,
-    enabled: !queryError,
-    pageIndex,
-    pageSize,
-  });
-
-  const error = queryError || null;
-
-  if (isLoading && !error) {
-    return defaultLoadingRenderer();
-  }
-
-  if (!data?.page && !error) {
-    return defaultNoDataRenderer();
-  }
-
-  return (
-    <>
-      <FindingsSearchBar
-        dataView={dataView}
-        setQuery={(newQuery) => {
-          setUrlQuery({ ...newQuery, pageIndex: 0 });
-        }}
-        loading={isFetching}
-        placeholder={SEARCH_BAR_PLACEHOLDER}
-      />
-      <EuiSpacer size="m" />
-      {error && <ErrorCallout error={error as Error} />}
-      {!error && (
-        <VulnerabilitiesDataGrid
-          dataView={dataView}
-          data={data}
-          isFetching={isFetching}
-          pageIndex={pageIndex}
-          sort={sort}
-          pageSize={pageSize}
-          onChangeItemsPerPage={onChangeItemsPerPage}
-          onChangePage={onChangePage}
-          onSort={onSort}
-          urlQuery={urlQuery}
-          onResetFilters={onResetFilters}
-          setUrlQuery={setUrlQuery}
-        />
-      )}
-    </>
-  );
-};
+import { LatestVulnerabilitiesContainer } from './latest_vulnerabilities_container';
 
 export const Vulnerabilities = () => {
-  const { data, isLoading, error } = useLatestFindingsDataView(
-    LATEST_VULNERABILITIES_INDEX_PATTERN
-  );
+  const {
+    data: dataView,
+    isLoading,
+    error,
+  } = useLatestFindingsDataView(LATEST_VULNERABILITIES_INDEX_PATTERN);
 
   const getSetupStatus = useCspSetupStatusApi();
 
@@ -464,7 +35,7 @@ export const Vulnerabilities = () => {
     return defaultLoadingRenderer();
   }
 
-  if (!data) {
+  if (!dataView) {
     return defaultNoDataRenderer();
   }
 
@@ -473,16 +44,16 @@ export const Vulnerabilities = () => {
       <Route
         exact
         path={findingsNavigation.resource_vulnerabilities.path}
-        render={() => <ResourceVulnerabilities dataView={data} />}
+        render={() => <ResourceVulnerabilities dataView={dataView} />}
       />
       <Route
         exact
         path={findingsNavigation.vulnerabilities_by_resource.path}
-        render={() => <VulnerabilitiesByResource dataView={data} />}
+        render={() => <VulnerabilitiesByResource dataView={dataView} />}
       />
       <Route
         path={findingsNavigation.vulnerabilities.path}
-        render={() => <VulnerabilitiesContent dataView={data} />}
+        render={() => <LatestVulnerabilitiesContainer dataView={dataView} />}
       />
     </Routes>
   );
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_finding_flyout/vulnerability_finding_flyout.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_finding_flyout/vulnerability_finding_flyout.tsx
index ac8c98e87f4118..3b3fef708815bb 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_finding_flyout/vulnerability_finding_flyout.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_finding_flyout/vulnerability_finding_flyout.tsx
@@ -89,10 +89,10 @@ export const VulnerabilityFindingFlyout = ({
 }: {
   closeFlyout: () => void;
   onPaginate?: (pageIndex: number) => void;
-  totalVulnerabilitiesCount: number;
+  totalVulnerabilitiesCount?: number;
   flyoutIndex?: number;
   vulnerabilityRecord: CspVulnerabilityFinding;
-  isLoading: boolean;
+  isLoading?: boolean;
 }) => {
   const [selectedTabId, setSelectedTabId] = useState(overviewTabId);
   const vulnerability = vulnerabilityRecord?.vulnerability;

From 4c331379a4c3c2ea1f1a10e315c68823abe120ed Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Fri, 5 Jan 2024 17:07:01 -0800
Subject: [PATCH 03/25] adding data view context

---
 .../schemas/csp_vulnerability_finding.ts      |  2 +-
 .../common/contexts/data_view_context.ts      | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 x-pack/plugins/cloud_security_posture/public/common/contexts/data_view_context.ts

diff --git a/x-pack/plugins/cloud_security_posture/common/schemas/csp_vulnerability_finding.ts b/x-pack/plugins/cloud_security_posture/common/schemas/csp_vulnerability_finding.ts
index efe26dc6648ba4..2dbab1bab77b64 100644
--- a/x-pack/plugins/cloud_security_posture/common/schemas/csp_vulnerability_finding.ts
+++ b/x-pack/plugins/cloud_security_posture/common/schemas/csp_vulnerability_finding.ts
@@ -87,7 +87,7 @@ export interface Vulnerability {
   id: string;
   title: string;
   reference: string;
-  severity: VulnSeverity;
+  severity?: VulnSeverity;
   cvss: {
     nvd: VectorScoreBase;
     redhat?: VectorScoreBase;
diff --git a/x-pack/plugins/cloud_security_posture/public/common/contexts/data_view_context.ts b/x-pack/plugins/cloud_security_posture/public/common/contexts/data_view_context.ts
new file mode 100644
index 00000000000000..a14928e7133e39
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/common/contexts/data_view_context.ts
@@ -0,0 +1,29 @@
+/*
+ * 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 { createContext, useContext } from 'react';
+import { DataView } from '@kbn/data-views-plugin/common';
+
+interface DataViewContextValue {
+  dataView: DataView;
+  dataViewRefetch?: () => void;
+  dataViewIsRefetching?: boolean;
+}
+
+export const DataViewContext = createContext<DataViewContextValue | undefined>(undefined);
+
+/**
+ * Retrieve context's properties
+ */
+export const useDataViewContext = (): DataViewContextValue => {
+  const contextValue = useContext(DataViewContext);
+
+  if (!contextValue) {
+    throw new Error('useDataViewContext can only be used within DataViewContext provider');
+  }
+
+  return contextValue;
+};

From 0878bbb5d4cfdd5d6f89781f896e7d9952dd8a1f Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Fri, 5 Jan 2024 17:07:22 -0800
Subject: [PATCH 04/25] handling null data

---
 .../public/components/vulnerability_badges.tsx              | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/cloud_security_posture/public/components/vulnerability_badges.tsx b/x-pack/plugins/cloud_security_posture/public/components/vulnerability_badges.tsx
index 20b1326d655264..ff8924833a294a 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/vulnerability_badges.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/vulnerability_badges.tsx
@@ -14,15 +14,16 @@ import { VulnSeverity } from '../../common/types_old';
 import { VULNERABILITIES_CVSS_SCORE_BADGE_SUBJ } from './test_subjects';
 
 interface CVSScoreBadgeProps {
-  score: float;
+  score?: float;
   version?: string;
 }
 
 interface SeverityStatusBadgeProps {
-  severity: VulnSeverity;
+  severity?: VulnSeverity;
 }
 
 export const CVSScoreBadge = ({ score, version }: CVSScoreBadgeProps) => {
+  if (!score) return null;
   const color = getCvsScoreColor(score);
   const versionDisplay = version ? `v${version.split('.')[0]}` : null;
   return (
@@ -56,6 +57,7 @@ export const CVSScoreBadge = ({ score, version }: CVSScoreBadgeProps) => {
 };
 
 export const SeverityStatusBadge = ({ severity }: SeverityStatusBadgeProps) => {
+  if (!severity) return null;
   const color = getSeverityStatusColor(severity);
 
   return (

From 243d46fb4f01e6179bdf7b6df59093bc28b431d4 Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Fri, 5 Jan 2024 17:07:47 -0800
Subject: [PATCH 05/25] updating findings table with new dataview context

---
 .../latest_findings_container.tsx             | 48 +++++++------------
 .../latest_findings/latest_findings_table.tsx | 14 +-----
 .../use_latest_findings_grouping.tsx          |  6 +--
 .../use_latest_findings_table.tsx             |  7 ++-
 4 files changed, 24 insertions(+), 51 deletions(-)

diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_container.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_container.tsx
index e070847b6df554..91b794c7b02633 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_container.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_container.tsx
@@ -4,12 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import React, { useCallback } from 'react';
+import React from 'react';
 import { Filter } from '@kbn/es-query';
 import { EuiSpacer } from '@elastic/eui';
 import { EmptyState } from '../../../components/empty_state';
 import { CloudSecurityGrouping } from '../../../components/cloud_security_grouping';
-import type { FindingsBaseProps } from '../../../common/types';
 import { FindingsSearchBar } from '../layout/findings_search_bar';
 import { DEFAULT_TABLE_HEIGHT } from './constants';
 import { useLatestFindingsGrouping } from './use_latest_findings_grouping';
@@ -18,26 +17,16 @@ import { groupPanelRenderer, groupStatsRenderer } from './latest_findings_group_
 import { FindingsDistributionBar } from '../layout/findings_distribution_bar';
 import { ErrorCallout } from '../layout/error_callout';
 
-export const LatestFindingsContainer = ({
-  dataView,
-  dataViewRefetch,
-  dataViewIsRefetching,
-}: FindingsBaseProps) => {
-  const renderChildComponent = useCallback(
-    (groupFilters: Filter[]) => {
-      return (
-        <LatestFindingsTable
-          dataView={dataView}
-          nonPersistedFilters={groupFilters}
-          height={DEFAULT_TABLE_HEIGHT}
-          showDistributionBar={false}
-          dataViewRefetch={dataViewRefetch}
-          dataViewIsRefetching={dataViewIsRefetching}
-        />
-      );
-    },
-    [dataView, dataViewIsRefetching, dataViewRefetch]
-  );
+export const LatestFindingsContainer = () => {
+  const renderChildComponent = (groupFilters: Filter[]) => {
+    return (
+      <LatestFindingsTable
+        nonPersistedFilters={groupFilters}
+        height={DEFAULT_TABLE_HEIGHT}
+        showDistributionBar={false}
+      />
+    );
+  };
 
   const {
     isGroupSelected,
@@ -57,12 +46,12 @@ export const LatestFindingsContainer = ({
     onDistributionBarClick,
     totalFailedFindings,
     isEmptyResults,
-  } = useLatestFindingsGrouping({ dataView, groupPanelRenderer, groupStatsRenderer });
+  } = useLatestFindingsGrouping({ groupPanelRenderer, groupStatsRenderer });
 
   if (error || isEmptyResults) {
     return (
       <>
-        <FindingsSearchBar dataView={dataView} setQuery={setUrlQuery} loading={isFetching} />
+        <FindingsSearchBar setQuery={setUrlQuery} loading={isFetching} />
         <EuiSpacer size="m" />
         {error && <ErrorCallout error={error} />}
         {isEmptyResults && <EmptyState onResetFilters={onResetFilters} />}
@@ -72,7 +61,7 @@ export const LatestFindingsContainer = ({
   if (isGroupSelected) {
     return (
       <>
-        <FindingsSearchBar dataView={dataView} setQuery={setUrlQuery} loading={isFetching} />
+        <FindingsSearchBar setQuery={setUrlQuery} loading={isFetching} />
         <div>
           <EuiSpacer size="m" />
           <FindingsDistributionBar
@@ -99,13 +88,8 @@ export const LatestFindingsContainer = ({
 
   return (
     <>
-      <FindingsSearchBar dataView={dataView} setQuery={setUrlQuery} loading={isFetching} />
-      <LatestFindingsTable
-        dataView={dataView}
-        groupSelectorComponent={grouping.groupSelector}
-        dataViewRefetch={dataViewRefetch}
-        dataViewIsRefetching={dataViewIsRefetching}
-      />
+      <FindingsSearchBar setQuery={setUrlQuery} loading={isFetching} />
+      <LatestFindingsTable groupSelectorComponent={grouping.groupSelector} />
     </>
   );
 };
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_table.tsx
index 3adb10259871d0..7f215c4d49f99e 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_table.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_table.tsx
@@ -10,7 +10,6 @@ import { DataTableRecord } from '@kbn/discover-utils/types';
 import { i18n } from '@kbn/i18n';
 import { EuiDataGridCellValueElementProps, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import React from 'react';
-import { FindingsBaseProps } from '../../../common/types';
 import * as TEST_SUBJECTS from '../test_subjects';
 import { FindingsDistributionBar } from '../layout/findings_distribution_bar';
 import { ErrorCallout } from '../layout/error_callout';
@@ -22,14 +21,12 @@ import { CspEvaluationBadge } from '../../../components/csp_evaluation_badge';
 import { CspFinding } from '../../../../common/schemas/csp_finding';
 import { FindingsRuleFlyout } from '../findings_flyout/findings_flyout';
 
-type LatestFindingsTableProps = FindingsBaseProps & {
+interface LatestFindingsTableProps {
   groupSelectorComponent?: JSX.Element;
   height?: number;
   showDistributionBar?: boolean;
   nonPersistedFilters?: Filter[];
-  dataViewRefetch?: () => void;
-  dataViewIsRefetching?: boolean;
-};
+}
 
 /**
  * Type Guard for checking if the given source is a CspFinding
@@ -84,13 +81,10 @@ const customCellRenderer = (rows: DataTableRecord[]) => ({
 });
 
 export const LatestFindingsTable = ({
-  dataView,
   groupSelectorComponent,
   height,
   showDistributionBar = true,
   nonPersistedFilters,
-  dataViewRefetch,
-  dataViewIsRefetching,
 }: LatestFindingsTableProps) => {
   const {
     cloudPostureDataTable,
@@ -104,7 +98,6 @@ export const LatestFindingsTable = ({
     canShowDistributionBar,
     onDistributionBarClick,
   } = useLatestFindingsTable({
-    dataView,
     getDefaultQuery,
     nonPersistedFilters,
     showDistributionBar,
@@ -132,7 +125,6 @@ export const LatestFindingsTable = ({
           )}
           <CloudSecurityDataTable
             data-test-subj={TEST_SUBJECTS.LATEST_FINDINGS_TABLE}
-            dataView={dataView}
             isLoading={isFetching}
             defaultColumns={defaultColumns}
             rows={rows}
@@ -144,8 +136,6 @@ export const LatestFindingsTable = ({
             customCellRenderer={customCellRenderer}
             groupSelectorComponent={groupSelectorComponent}
             height={height}
-            dataViewRefetch={dataViewRefetch}
-            dataViewIsRefetching={dataViewIsRefetching}
           />
         </>
       )}
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_grouping.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_grouping.tsx
index 9d092de673edf0..c1c2a0c3e080e7 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_grouping.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_grouping.tsx
@@ -14,7 +14,7 @@ import {
   parseGroupingQuery,
 } from '@kbn/securitysolution-grouping/src';
 import { useMemo } from 'react';
-import { DataView } from '@kbn/data-views-plugin/common';
+import { useDataViewContext } from '../../../common/contexts/data_view_context';
 import { Evaluation } from '../../../../common/types_old';
 import { LATEST_FINDINGS_RETENTION_POLICY } from '../../../../common/constants';
 import {
@@ -122,14 +122,14 @@ export const isFindingsRootGroupingAggregation = (
  * for the findings page
  */
 export const useLatestFindingsGrouping = ({
-  dataView,
   groupPanelRenderer,
   groupStatsRenderer,
 }: {
-  dataView: DataView;
   groupPanelRenderer?: GroupPanelRenderer<FindingsGroupingAggregation>;
   groupStatsRenderer?: GroupStatsRenderer<FindingsGroupingAggregation>;
 }) => {
+  const { dataView } = useDataViewContext();
+
   const {
     activePageIndex,
     grouping,
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_table.tsx
index b60eefac2ac81c..90720c3c057cce 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_table.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_table.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { DataView } from '@kbn/data-views-plugin/common';
 import { Filter } from '@kbn/es-query';
 import { useMemo } from 'react';
+import { useDataViewContext } from '../../../common/contexts/data_view_context';
 import { FindingsBaseURLQuery } from '../../../common/types';
 import { Evaluation } from '../../../../common/types_old';
 import { LOCAL_STORAGE_DATA_TABLE_PAGE_SIZE_KEY } from '../../../common/constants';
@@ -18,18 +18,17 @@ import { useLatestFindings } from './use_latest_findings';
 const columnsLocalStorageKey = 'cloudPosture:latestFindings:columns';
 
 export const useLatestFindingsTable = ({
-  dataView,
   getDefaultQuery,
   nonPersistedFilters,
   showDistributionBar,
 }: {
-  dataView: DataView;
   getDefaultQuery: (params: FindingsBaseURLQuery) => FindingsBaseURLQuery;
   nonPersistedFilters?: Filter[];
   showDistributionBar?: boolean;
 }) => {
+  const { dataView } = useDataViewContext();
+
   const cloudPostureDataTable = useCloudPostureDataTable({
-    dataView,
     paginationLocalStorageKey: LOCAL_STORAGE_DATA_TABLE_PAGE_SIZE_KEY,
     columnsLocalStorageKey,
     defaultQuery: getDefaultQuery,

From 80047019c28df5f37c285c5fffc52787c70f8ab3 Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Fri, 5 Jan 2024 17:08:21 -0800
Subject: [PATCH 06/25] vulnerabilities datatable and grouping

---
 .../api/use_latest_findings_data_view.ts      |  35 +-
 .../use_cloud_posture_data_table.ts           |   5 +-
 .../public/common/types.ts                    |   7 -
 .../cloud_security_data_table.tsx             |  22 +-
 .../pages/configurations/configurations.tsx   |  20 +-
 .../layout/findings_search_bar.tsx            |   7 +-
 .../public/pages/vulnerabilities/constants.ts |  19 +-
 .../hooks/use_grouped_vulnerabilities.tsx     |  91 ++++
 .../use_latest_vulnerabilities_grouping.tsx   | 155 ++++++
 .../use_latest_vulnerabilities_table.tsx      |  14 +-
 .../latest_vulnerabilities_container.tsx      |  79 ++-
 .../latest_vulnerabilities_group_renderer.tsx | 194 +++++++
 .../latest_vulnerabilities_table.tsx          |  87 +--
 .../pages/vulnerabilities/test_subjects.ts    |   2 +
 .../pages/vulnerabilities/translations.ts     |  32 ++
 .../pages/vulnerabilities/vulnerabilities.tsx |  55 +-
 .../resource_vulnerabilities.mock.ts          | 122 -----
 .../resource_vulnerabilities.test.tsx         | 123 -----
 .../resource_vulnerabilities.tsx              | 497 ------------------
 .../vulnerability_finding_flyout.tsx          |   8 +-
 20 files changed, 706 insertions(+), 868 deletions(-)
 create mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_grouped_vulnerabilities.tsx
 create mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
 create mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_group_renderer.tsx
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/resource_vulnerabilities/__mocks__/resource_vulnerabilities.mock.ts
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/resource_vulnerabilities/resource_vulnerabilities.test.tsx
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/resource_vulnerabilities/resource_vulnerabilities.tsx

diff --git a/x-pack/plugins/cloud_security_posture/public/common/api/use_latest_findings_data_view.ts b/x-pack/plugins/cloud_security_posture/public/common/api/use_latest_findings_data_view.ts
index d6810a8bc46534..8f99c155585d68 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/api/use_latest_findings_data_view.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/api/use_latest_findings_data_view.ts
@@ -9,7 +9,10 @@ import { useQuery } from '@tanstack/react-query';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
 import type { DataView } from '@kbn/data-plugin/common';
 import { i18n } from '@kbn/i18n';
-import { LATEST_FINDINGS_INDEX_PATTERN } from '../../../common/constants';
+import {
+  LATEST_FINDINGS_INDEX_PATTERN,
+  LATEST_VULNERABILITIES_INDEX_PATTERN,
+} from '../../../common/constants';
 import { CspClientPluginStartDeps } from '../../types';
 
 const cloudSecurityFieldLabels: Record<string, string> = {
@@ -45,6 +48,30 @@ const cloudSecurityFieldLabels: Record<string, string> = {
     'xpack.csp.findings.findingsTable.findingsTableColumn.lastCheckedColumnLabel',
     { defaultMessage: 'Last Checked' }
   ),
+  'vulnerability.id': i18n.translate(
+    'xpack.csp.findings.findingsTable.findingsTableColumn.vulnerabilityIdColumnLabel',
+    { defaultMessage: 'Vulnerability' }
+  ),
+  'vulnerability.score.base': i18n.translate(
+    'xpack.csp.findings.findingsTable.findingsTableColumn.vulnerabilityScoreColumnLabel',
+    { defaultMessage: 'CVSS' }
+  ),
+  'vulnerability.severity': i18n.translate(
+    'xpack.csp.findings.findingsTable.findingsTableColumn.vulnerabilitySeverityColumnLabel',
+    { defaultMessage: 'Severity' }
+  ),
+  'package.name': i18n.translate(
+    'xpack.csp.findings.findingsTable.findingsTableColumn.packageNameColumnLabel',
+    { defaultMessage: 'Package' }
+  ),
+  'package.version': i18n.translate(
+    'xpack.csp.findings.findingsTable.findingsTableColumn.packageVersionColumnLabel',
+    { defaultMessage: 'Version' }
+  ),
+  'package.fixed_version': i18n.translate(
+    'xpack.csp.findings.findingsTable.findingsTableColumn.packageFixedVersionColumnLabel',
+    { defaultMessage: 'Fix Version' }
+  ),
 } as const;
 
 /**
@@ -61,8 +88,10 @@ export const useLatestFindingsDataView = (dataView: string) => {
       throw new Error(`Data view not found [Name: {${dataView}}]`);
     }
 
-    // or FINDINGS_INDEX_PATTERN
-    if (dataView === LATEST_FINDINGS_INDEX_PATTERN) {
+    if (
+      dataView === LATEST_FINDINGS_INDEX_PATTERN ||
+      dataView === LATEST_VULNERABILITIES_INDEX_PATTERN
+    ) {
       let shouldUpdate = false;
       Object.entries(cloudSecurityFieldLabels).forEach(([field, label]) => {
         if (
diff --git a/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_data_table/use_cloud_posture_data_table.ts b/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_data_table/use_cloud_posture_data_table.ts
index ae21f45c7a4e82..74efb343e8be68 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_data_table/use_cloud_posture_data_table.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_data_table/use_cloud_posture_data_table.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 import { Dispatch, SetStateAction, useCallback } from 'react';
-import { type DataView } from '@kbn/data-views-plugin/common';
 import { BoolQuery, Filter } from '@kbn/es-query';
 import { CriteriaWithPagination } from '@elastic/eui';
 import { DataTableRecord } from '@kbn/discover-utils/types';
@@ -16,6 +15,7 @@ import { LOCAL_STORAGE_DATA_TABLE_COLUMNS_KEY } from '../../constants';
 import { FindingsBaseURLQuery } from '../../types';
 import { useBaseEsQuery } from './use_base_es_query';
 import { usePersistedQuery } from './use_persisted_query';
+import { useDataViewContext } from '../../contexts/data_view_context';
 
 type URLQuery = FindingsBaseURLQuery & Record<string, any>;
 
@@ -46,13 +46,11 @@ export interface CloudPostureDataTableResult {
 */
 export const useCloudPostureDataTable = ({
   defaultQuery = getDefaultQuery,
-  dataView,
   paginationLocalStorageKey,
   columnsLocalStorageKey,
   nonPersistedFilters,
 }: {
   defaultQuery?: (params: FindingsBaseURLQuery) => FindingsBaseURLQuery;
-  dataView: DataView;
   paginationLocalStorageKey: string;
   columnsLocalStorageKey?: string;
   nonPersistedFilters?: Filter[];
@@ -60,6 +58,7 @@ export const useCloudPostureDataTable = ({
   const getPersistedDefaultQuery = usePersistedQuery(defaultQuery);
   const { urlQuery, setUrlQuery } = useUrlQuery<URLQuery>(getPersistedDefaultQuery);
   const { pageSize, setPageSize } = usePageSize(paginationLocalStorageKey);
+  const { dataView } = useDataViewContext();
 
   const onChangeItemsPerPage = useCallback(
     (newPageSize) => {
diff --git a/x-pack/plugins/cloud_security_posture/public/common/types.ts b/x-pack/plugins/cloud_security_posture/public/common/types.ts
index ac483445407e48..d402ea29390627 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/types.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/types.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 import type { Criteria } from '@elastic/eui';
-import type { DataView } from '@kbn/data-views-plugin/common';
 import type { BoolQuery, Filter, Query, EsQueryConfig } from '@kbn/es-query';
 import { CspFinding } from '../../common/schemas/csp_finding';
 
@@ -20,12 +19,6 @@ export interface FindingsBaseURLQuery {
   nonPersistedFilters?: Filter[];
 }
 
-export interface FindingsBaseProps {
-  dataView: DataView;
-  dataViewRefetch?: () => void;
-  dataViewIsRefetching?: boolean;
-}
-
 export interface FindingsBaseESQueryConfig {
   config: EsQueryConfig;
 }
diff --git a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_data_table/cloud_security_data_table.tsx b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_data_table/cloud_security_data_table.tsx
index 3f0c3da73a9862..53ed78b6e9b781 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_data_table/cloud_security_data_table.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_data_table/cloud_security_data_table.tsx
@@ -6,7 +6,6 @@
  */
 import React, { useState, useMemo } from 'react';
 import { UnifiedDataTableSettings, useColumns } from '@kbn/unified-data-table';
-import { type DataView } from '@kbn/data-views-plugin/common';
 import { UnifiedDataTable, DataLoadingState } from '@kbn/unified-data-table';
 import { CellActionsProvider } from '@kbn/cell-actions';
 import { SHOW_MULTIFIELDS, SORT_DEFAULT_ORDER_SETTING } from '@kbn/discover-utils';
@@ -22,6 +21,7 @@ import { EmptyState } from '../empty_state';
 import { MAX_FINDINGS_TO_LOAD } from '../../common/constants';
 import { useStyles } from './use_styles';
 import { AdditionalControls } from './additional_controls';
+import { useDataViewContext } from '../../common/contexts/data_view_context';
 
 export interface CloudSecurityDefaultColumn {
   id: string;
@@ -41,7 +41,6 @@ const useNewFieldsApi = true;
 const controlColumnIds = ['openDetails'];
 
 export interface CloudSecurityDataTableProps {
-  dataView: DataView;
   isLoading: boolean;
   defaultColumns: CloudSecurityDefaultColumn[];
   rows: DataTableRecord[];
@@ -77,21 +76,10 @@ export interface CloudSecurityDataTableProps {
   /**
    * Height override for the data grid.
    */
-  height?: number;
-  /**
-   * Callback Function when the DataView field is edited.
-   * Required to enable editing of the field in the data grid.
-   */
-  dataViewRefetch?: () => void;
-  /**
-   * Flag to indicate if the data view is refetching.
-   * Required for smoothing re-rendering the DataTable columns.
-   */
-  dataViewIsRefetching?: boolean;
+  height?: number | string;
 }
 
 export const CloudSecurityDataTable = ({
-  dataView,
   isLoading,
   defaultColumns,
   rows,
@@ -103,8 +91,6 @@ export const CloudSecurityDataTable = ({
   customCellRenderer,
   groupSelectorComponent,
   height,
-  dataViewRefetch,
-  dataViewIsRefetching,
   ...rest
 }: CloudSecurityDataTableProps) => {
   const {
@@ -133,6 +119,8 @@ export const CloudSecurityDataTable = ({
     }
   );
 
+  const { dataView, dataViewIsRefetching, dataViewRefetch } = useDataViewContext();
+
   const [expandedDoc, setExpandedDoc] = useState<DataTableRecord | undefined>(undefined);
 
   const renderDocumentView = (hit: DataTableRecord) =>
@@ -245,7 +233,7 @@ export const CloudSecurityDataTable = ({
     // Change the height of the grid to fit the page
     // If there are filters, leave space for the filter bar
     // Todo: Replace this component with EuiAutoSizer
-    height: height ?? `calc(100vh - ${filters?.length > 0 ? 443 : 403}px)`,
+    height: height ?? `calc(100vh - ${filters?.length > 0 ? 454 : 414}px)`,
   };
 
   const rowHeightState = 0;
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/configurations.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/configurations.tsx
index 7e8bbfeedb832a..60de4432282811 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/configurations.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/configurations.tsx
@@ -14,8 +14,8 @@ import { NoFindingsStates } from '../../components/no_findings_states';
 import { CloudPosturePage } from '../../components/cloud_posture_page';
 import { useLatestFindingsDataView } from '../../common/api/use_latest_findings_data_view';
 import { cloudPosturePages, findingsNavigation } from '../../common/navigation/constants';
-import { FindingsByResourceContainer } from './latest_findings_by_resource/findings_by_resource_container';
 import { LatestFindingsContainer } from './latest_findings/latest_findings_container';
+import { DataViewContext } from '../../common/contexts/data_view_context';
 
 export const Configurations = () => {
   const location = useLocation();
@@ -31,6 +31,12 @@ export const Configurations = () => {
 
   if (!hasConfigurationFindings) return <NoFindingsStates postureType={noFindingsForPostureType} />;
 
+  const dataViewContextValue = {
+    dataView: dataViewQuery.data!,
+    dataViewRefetch: dataViewQuery.refetch,
+    dataViewIsRefetching: dataViewQuery.isRefetching,
+  };
+
   return (
     <CloudPosturePage query={dataViewQuery}>
       <Routes>
@@ -50,18 +56,12 @@ export const Configurations = () => {
           path={findingsNavigation.findings_default.path}
           render={() => (
             <TrackApplicationView viewId={findingsNavigation.findings_default.id}>
-              <LatestFindingsContainer
-                dataView={dataViewQuery.data!}
-                dataViewRefetch={dataViewQuery.refetch}
-                dataViewIsRefetching={dataViewQuery.isRefetching}
-              />
+              <DataViewContext.Provider value={dataViewContextValue}>
+                <LatestFindingsContainer />
+              </DataViewContext.Provider>
             </TrackApplicationView>
           )}
         />
-        <Route
-          path={findingsNavigation.findings_by_resource.path}
-          render={() => <FindingsByResourceContainer dataView={dataViewQuery.data!} />}
-        />
         <Route path="*" render={() => <Redirect to={findingsNavigation.findings_default.path} />} />
       </Routes>
     </CloudPosturePage>
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/layout/findings_search_bar.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/layout/findings_search_bar.tsx
index 9b6e7bcb60c536..43077778c4fdf5 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/layout/findings_search_bar.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/layout/findings_search_bar.tsx
@@ -8,9 +8,9 @@ import React, { useContext } from 'react';
 import { css } from '@emotion/react';
 import { EuiThemeComputed, useEuiTheme } from '@elastic/eui';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
-import type { DataView } from '@kbn/data-plugin/common';
 import { i18n } from '@kbn/i18n';
 import type { Filter } from '@kbn/es-query';
+import { useDataViewContext } from '../../../common/contexts/data_view_context';
 import { SecuritySolutionContext } from '../../../application/security_solution_context';
 import type { FindingsBaseURLQuery } from '../../../common/types';
 import type { CspClientPluginStartDeps } from '../../../types';
@@ -25,13 +25,12 @@ interface FindingsSearchBarProps {
 }
 
 export const FindingsSearchBar = ({
-  dataView,
   loading,
   setQuery,
   placeholder = i18n.translate('xpack.csp.findings.searchBar.searchPlaceholder', {
     defaultMessage: 'Search findings (eg. rule.section : "API Server" )',
   }),
-}: FindingsSearchBarProps & { dataView: DataView }) => {
+}: FindingsSearchBarProps) => {
   const { euiTheme } = useEuiTheme();
   const {
     unifiedSearch: {
@@ -41,6 +40,8 @@ export const FindingsSearchBar = ({
 
   const securitySolutionContext = useContext(SecuritySolutionContext);
 
+  const { dataView } = useDataViewContext();
+
   let searchBarNode = (
     <div css={getContainerStyle(euiTheme)}>
       <SearchBar
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
index b34c0c28c7b372..c4f3106c7a6ec7 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
@@ -5,12 +5,25 @@
  * 2.0.
  */
 
+import { GroupOption } from '@kbn/securitysolution-grouping';
 import { FindingsBaseURLQuery } from '../../common/types';
 import { CloudSecurityDefaultColumn } from '../../components/cloud_security_data_table';
+import { GROUPING_LABELS } from './translations';
 import { vulnerabilitiesColumns } from './vulnerabilities_table_columns';
 
 export const DEFAULT_TABLE_HEIGHT = 512;
 
+export const GROUPING_OPTIONS = {
+  RESOURCE_NAME: 'resource.name',
+};
+
+export const defaultGroupingOptions: GroupOption[] = [
+  {
+    label: GROUPING_LABELS.RESOURCE_NAME,
+    key: GROUPING_OPTIONS.RESOURCE_NAME,
+  },
+];
+
 export const getDefaultQuery = ({
   query,
   filters,
@@ -26,11 +39,11 @@ export const getDefaultQuery = ({
 });
 
 export const defaultColumns: CloudSecurityDefaultColumn[] = [
-  { id: 'vulnerability.id' },
-  { id: 'vulnerability.score.base' },
+  { id: 'vulnerability.id', width: 130 },
+  { id: 'vulnerability.score.base', width: 80 },
   { id: 'resource.name' },
   { id: 'resource.id' },
-  { id: 'vulnerability.severity' },
+  { id: 'vulnerability.severity', width: 100 },
   { id: 'package.name' },
   { id: 'package.version' },
   { id: 'package.fixed_version' },
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_grouped_vulnerabilities.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_grouped_vulnerabilities.tsx
new file mode 100644
index 00000000000000..6c990028981d53
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_grouped_vulnerabilities.tsx
@@ -0,0 +1,91 @@
+/*
+ * 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 { SearchResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { IKibanaSearchResponse } from '@kbn/data-plugin/public';
+import { GenericBuckets, GroupingQuery, RootAggregation } from '@kbn/securitysolution-grouping/src';
+import { useQuery } from '@tanstack/react-query';
+import { lastValueFrom } from 'rxjs';
+import { LATEST_VULNERABILITIES_INDEX_PATTERN } from '../../../../common/constants';
+import { useKibana } from '../../../common/hooks/use_kibana';
+import { showErrorToast } from '../../../common/utils/show_error_toast';
+
+// Elasticsearch returns `null` when a sub-aggregation cannot be computed
+type NumberOrNull = number | null;
+
+export interface VulnerabilitiesGroupingAggregation {
+  unitsCount?: {
+    value?: NumberOrNull;
+  };
+  groupsCount?: {
+    value?: NumberOrNull;
+  };
+  groupByFields?: {
+    buckets?: GenericBuckets[];
+  };
+  description?: {
+    buckets?: GenericBuckets[];
+  };
+  resourceName?: {
+    buckets?: GenericBuckets[];
+  };
+  resourceSubType?: {
+    buckets?: GenericBuckets[];
+  };
+  resourceType?: {
+    buckets?: GenericBuckets[];
+  };
+  isLoading?: boolean;
+}
+
+export type VulnerabilitiesRootGroupingAggregation =
+  RootAggregation<VulnerabilitiesGroupingAggregation>;
+
+export const getGroupedVulnerabilitiesQuery = (query: GroupingQuery) => ({
+  ...query,
+  index: LATEST_VULNERABILITIES_INDEX_PATTERN,
+  size: 0,
+});
+
+export const useGroupedVulnerabilities = ({
+  query,
+  enabled = true,
+}: {
+  query: GroupingQuery;
+  enabled: boolean;
+}) => {
+  const {
+    data,
+    notifications: { toasts },
+  } = useKibana().services;
+
+  return useQuery(
+    ['csp_grouped_vulnerabilities', { query }],
+    async () => {
+      const {
+        rawResponse: { aggregations },
+      } = await lastValueFrom(
+        data.search.search<
+          {},
+          IKibanaSearchResponse<SearchResponse<{}, VulnerabilitiesRootGroupingAggregation>>
+        >({
+          params: getGroupedVulnerabilitiesQuery(query),
+        })
+      );
+
+      if (!aggregations) throw new Error('Failed to aggregate by, missing resource id');
+
+      return aggregations;
+    },
+    {
+      onError: (err: Error) => showErrorToast(toasts, err),
+      enabled,
+      // This allows the UI to keep the previous data while the new data is being fetched
+      keepPreviousData: true,
+    }
+  );
+};
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
new file mode 100644
index 00000000000000..b711b90c7f4b4d
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
@@ -0,0 +1,155 @@
+/*
+ * 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 { getGroupingQuery } from '@kbn/securitysolution-grouping';
+import {
+  GroupingAggregation,
+  GroupPanelRenderer,
+  GroupStatsRenderer,
+  isNoneGroup,
+  NamedAggregation,
+  parseGroupingQuery,
+} from '@kbn/securitysolution-grouping/src';
+import { useMemo } from 'react';
+import { useDataViewContext } from '../../../common/contexts/data_view_context';
+import { LATEST_VULNERABILITIES_RETENTION_POLICY } from '../../../../common/constants';
+import {
+  VulnerabilitiesGroupingAggregation,
+  VulnerabilitiesRootGroupingAggregation,
+  useGroupedVulnerabilities,
+} from './use_grouped_vulnerabilities';
+import { defaultGroupingOptions, getDefaultQuery, GROUPING_OPTIONS } from '../constants';
+import { useCloudSecurityGrouping } from '../../../components/cloud_security_grouping';
+import { VULNERABILITIES_UNIT, groupingTitle } from '../translations';
+
+const getTermAggregation = (key: keyof VulnerabilitiesGroupingAggregation, field: string) => ({
+  [key]: {
+    terms: { field, size: 1 },
+  },
+});
+
+const getAggregationsByGroupField = (field: string): NamedAggregation[] => {
+  if (isNoneGroup([field])) {
+    return [];
+  }
+  const aggMetrics: NamedAggregation[] = [
+    {
+      groupByField: {
+        cardinality: {
+          field,
+        },
+      },
+    },
+  ];
+
+  switch (field) {
+    case GROUPING_OPTIONS.RESOURCE_NAME:
+      return [
+        ...aggMetrics,
+        getTermAggregation('resourceName', 'resource.id'),
+        getTermAggregation('resourceSubType', 'resource.sub_type'),
+        getTermAggregation('resourceType', 'resource.type'),
+      ];
+  }
+  return aggMetrics;
+};
+
+/**
+ * Type Guard for checking if the given source is a VulnerabilitiesRootGroupingAggregation
+ */
+export const isVulnerabilitiesRootGroupingAggregation = (
+  groupData: Record<string, any> | undefined
+): groupData is VulnerabilitiesRootGroupingAggregation => {
+  return groupData?.unitsCount?.doc_count !== undefined;
+};
+
+/**
+ * Utility hook to get the latest vulnerabilities grouping data
+ * for the vulnerabilities page
+ */
+export const useLatestVulnerabilitiesGrouping = ({
+  groupPanelRenderer,
+  groupStatsRenderer,
+}: {
+  groupPanelRenderer?: GroupPanelRenderer<VulnerabilitiesGroupingAggregation>;
+  groupStatsRenderer?: GroupStatsRenderer<VulnerabilitiesGroupingAggregation>;
+}) => {
+  const { dataView } = useDataViewContext();
+
+  const {
+    activePageIndex,
+    grouping,
+    pageSize,
+    query,
+    selectedGroup,
+    onChangeGroupsItemsPerPage,
+    onChangeGroupsPage,
+    setUrlQuery,
+    uniqueValue,
+    isNoneSelected,
+    onResetFilters,
+    error,
+    filters,
+  } = useCloudSecurityGrouping({
+    dataView,
+    groupingTitle,
+    defaultGroupingOptions,
+    getDefaultQuery,
+    unit: VULNERABILITIES_UNIT,
+    groupPanelRenderer,
+    groupStatsRenderer,
+  });
+
+  const groupingQuery = getGroupingQuery({
+    additionalFilters: query ? [query] : [],
+    groupByField: selectedGroup,
+    uniqueValue,
+    from: `now-${LATEST_VULNERABILITIES_RETENTION_POLICY}`,
+    to: 'now',
+    pageNumber: activePageIndex * pageSize,
+    size: pageSize,
+    sort: [{ groupByField: { order: 'desc' } }],
+    statsAggregations: getAggregationsByGroupField(selectedGroup),
+  });
+
+  const { data, isFetching } = useGroupedVulnerabilities({
+    query: groupingQuery,
+    enabled: !isNoneSelected,
+  });
+
+  const groupData = useMemo(
+    () =>
+      parseGroupingQuery(
+        selectedGroup,
+        uniqueValue,
+        data as GroupingAggregation<VulnerabilitiesGroupingAggregation>
+      ),
+    [data, selectedGroup, uniqueValue]
+  );
+
+  const isEmptyResults =
+    !isFetching &&
+    isVulnerabilitiesRootGroupingAggregation(groupData) &&
+    !groupData.unitsCount?.value;
+
+  return {
+    groupData,
+    grouping,
+    isFetching,
+    activePageIndex,
+    pageSize,
+    selectedGroup,
+    onChangeGroupsItemsPerPage,
+    onChangeGroupsPage,
+    setUrlQuery,
+    isGroupSelected: !isNoneSelected,
+    isGroupLoading: !data,
+    onResetFilters,
+    filters,
+    error,
+    isEmptyResults,
+  };
+};
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_table.tsx
index d3f5df7eb0d35c..d7ad17ad02e72d 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_table.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_table.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { DataView } from '@kbn/data-views-plugin/common';
 import { useMemo } from 'react';
+import { Filter } from '@kbn/es-query';
 import { LOCAL_STORAGE_DATA_TABLE_PAGE_SIZE_KEY } from '../../../common/constants';
 import { FindingsBaseURLQuery } from '../../../common/types';
 import { useCloudPostureDataTable } from '../../../common/hooks/use_cloud_posture_data_table';
@@ -15,20 +15,20 @@ import { useLatestVulnerabilities } from './use_latest_vulnerabilities';
 const columnsLocalStorageKey = 'cloudPosture:latestVulnerabilities:columns';
 
 export const useLatestVulnerabilitiesTable = ({
-  dataView,
   getDefaultQuery,
+  nonPersistedFilters,
 }: {
-  dataView: DataView;
   getDefaultQuery: (params: FindingsBaseURLQuery) => FindingsBaseURLQuery;
+  nonPersistedFilters?: Filter[];
 }) => {
-  const cloudPostureTable = useCloudPostureDataTable({
-    dataView,
+  const cloudPostureDataTable = useCloudPostureDataTable({
     paginationLocalStorageKey: LOCAL_STORAGE_DATA_TABLE_PAGE_SIZE_KEY,
     columnsLocalStorageKey,
     defaultQuery: getDefaultQuery,
+    nonPersistedFilters,
   });
 
-  const { query, sort, queryError, setUrlQuery, filters, getRowsFromPages } = cloudPostureTable;
+  const { query, sort, queryError, getRowsFromPages } = cloudPostureDataTable;
 
   const {
     data,
@@ -47,7 +47,7 @@ export const useLatestVulnerabilitiesTable = ({
   const error = fetchError || queryError;
 
   return {
-    cloudPostureTable,
+    cloudPostureDataTable,
     rows,
     error,
     isFetching,
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx
index f753a991d7156b..c93b5d81295c38 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx
@@ -4,10 +4,83 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { DataView } from '@kbn/data-views-plugin/common';
+import { Filter } from '@kbn/es-query';
 import React from 'react';
+import { EuiSpacer } from '@elastic/eui';
+import { DEFAULT_TABLE_HEIGHT } from './constants';
+import { useLatestVulnerabilitiesGrouping } from './hooks/use_latest_vulnerabilities_grouping';
 import { LatestVulnerabilitiesTable } from './latest_vulnerabilities_table';
+import { groupPanelRenderer, groupStatsRenderer } from './latest_vulnerabilities_group_renderer';
+import { FindingsSearchBar } from '../configurations/layout/findings_search_bar';
+import { ErrorCallout } from '../configurations/layout/error_callout';
+import { EmptyState } from '../../components/empty_state';
+import { CloudSecurityGrouping } from '../../components/cloud_security_grouping';
 
-export const LatestVulnerabilitiesContainer = ({ dataView }: { dataView: DataView }) => {
-  return <LatestVulnerabilitiesTable dataView={dataView} />;
+export const LatestVulnerabilitiesContainer = () => {
+  const renderChildComponent = (groupFilters: Filter[]) => {
+    return (
+      <LatestVulnerabilitiesTable
+        nonPersistedFilters={groupFilters}
+        height={DEFAULT_TABLE_HEIGHT}
+      />
+    );
+  };
+
+  const {
+    isGroupSelected,
+    groupData,
+    grouping,
+    isFetching,
+    activePageIndex,
+    pageSize,
+    selectedGroup,
+    onChangeGroupsItemsPerPage,
+    onChangeGroupsPage,
+    setUrlQuery,
+    isGroupLoading,
+    onResetFilters,
+    error,
+    isEmptyResults,
+  } = useLatestVulnerabilitiesGrouping({ groupPanelRenderer, groupStatsRenderer });
+
+  if (error || isEmptyResults) {
+    return (
+      <>
+        <FindingsSearchBar setQuery={setUrlQuery} loading={isFetching} />
+        <EuiSpacer size="m" />
+        {error && <ErrorCallout error={error} />}
+        {isEmptyResults && <EmptyState onResetFilters={onResetFilters} />}
+      </>
+    );
+  }
+  if (isGroupSelected) {
+    return (
+      <>
+        <FindingsSearchBar setQuery={setUrlQuery} loading={isFetching} />
+        <div>
+          <EuiSpacer size="m" />
+          <CloudSecurityGrouping
+            data={groupData}
+            grouping={grouping}
+            renderChildComponent={renderChildComponent}
+            onChangeGroupsItemsPerPage={onChangeGroupsItemsPerPage}
+            onChangeGroupsPage={onChangeGroupsPage}
+            activePageIndex={activePageIndex}
+            isFetching={isFetching}
+            pageSize={pageSize}
+            selectedGroup={selectedGroup}
+            isGroupLoading={isGroupLoading}
+          />
+        </div>
+      </>
+    );
+  }
+
+  return (
+    <>
+      <FindingsSearchBar setQuery={setUrlQuery} loading={isFetching} />
+      <EuiSpacer size="m" />
+      <LatestVulnerabilitiesTable groupSelectorComponent={grouping.groupSelector} />
+    </>
+  );
 };
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_group_renderer.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_group_renderer.tsx
new file mode 100644
index 00000000000000..2e190ce040ee08
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_group_renderer.tsx
@@ -0,0 +1,194 @@
+/*
+ * 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 {
+  EuiBadge,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiIconTip,
+  EuiSkeletonTitle,
+  EuiText,
+  EuiTextBlockTruncate,
+  EuiToolTip,
+  useEuiTheme,
+} from '@elastic/eui';
+import { css } from '@emotion/react';
+import {
+  ECSField,
+  GroupPanelRenderer,
+  RawBucket,
+  StatRenderer,
+} from '@kbn/securitysolution-grouping/src';
+import React from 'react';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { VulnerabilitiesGroupingAggregation } from './hooks/use_grouped_vulnerabilities';
+import { GROUPING_OPTIONS } from './constants';
+import { VULNERABILITIES_GROUPING_COUNTER } from './test_subjects';
+import { NULL_GROUPING_MESSAGES, NULL_GROUPING_UNIT, VULNERABILITIES } from './translations';
+import { getAbbreviatedNumber } from '../../common/utils/get_abbreviated_number';
+
+/**
+ * Return first non-null value. If the field contains an array, this will return the first value that isn't null. If the field isn't an array it'll be returned unless it's null.
+ */
+export function firstNonNullValue<T>(valueOrCollection: ECSField<T>): T | undefined {
+  if (valueOrCollection === null) {
+    return undefined;
+  } else if (Array.isArray(valueOrCollection)) {
+    for (const value of valueOrCollection) {
+      if (value !== null) {
+        return value;
+      }
+    }
+  } else {
+    return valueOrCollection;
+  }
+}
+
+const NullGroupComponent = ({
+  title,
+  field,
+  unit = NULL_GROUPING_UNIT,
+}: {
+  title: string;
+  field: string;
+  unit?: string;
+}) => {
+  return (
+    <EuiFlexGroup alignItems="center" gutterSize="xs">
+      <strong>{title}</strong>
+      <EuiIconTip
+        anchorProps={{
+          css: css`
+            display: inline-flex;
+          `,
+        }}
+        content={
+          <>
+            <FormattedMessage
+              id="xpack.csp.vulnerabilities.grouping.nullGroupTooltip"
+              defaultMessage="The selected {groupingTitle} field, {field} is missing a value for this group of {unit}."
+              values={{
+                groupingTitle: (
+                  <strong>
+                    <FormattedMessage
+                      id="xpack.csp.vulnerabilities.grouping.nullGroupTooltip.groupingTitle"
+                      defaultMessage="group by"
+                    />
+                  </strong>
+                ),
+                field: <code>{field}</code>,
+                unit,
+              }}
+            />
+          </>
+        }
+        position="right"
+      />
+    </EuiFlexGroup>
+  );
+};
+
+export const groupPanelRenderer: GroupPanelRenderer<VulnerabilitiesGroupingAggregation> = (
+  selectedGroup,
+  bucket,
+  nullGroupMessage,
+  isLoading
+) => {
+  if (isLoading) {
+    return (
+      <EuiSkeletonTitle size="s" isLoading={true}>
+        <FormattedMessage
+          id="xpack.csp.vulnerabilities.grouping.loadingGroupPanelTitle"
+          defaultMessage="Loading"
+        />
+      </EuiSkeletonTitle>
+    );
+  }
+  switch (selectedGroup) {
+    case GROUPING_OPTIONS.RESOURCE_NAME:
+      return nullGroupMessage ? (
+        <NullGroupComponent title={NULL_GROUPING_MESSAGES.RESOURCE_NAME} field={selectedGroup} />
+      ) : (
+        <EuiFlexGroup alignItems="center">
+          <EuiFlexItem>
+            <EuiFlexGroup direction="column" gutterSize="none">
+              <EuiFlexItem
+                css={css`
+                  display: inline;
+                `}
+              >
+                <EuiText size="s">
+                  <EuiTextBlockTruncate
+                    lines={2}
+                    css={css`
+                      word-break: break-all;
+                    `}
+                    title={bucket.resourceName?.buckets?.[0].key}
+                  >
+                    <strong>{bucket.key_as_string}</strong> {bucket.resourceName?.buckets?.[0].key}
+                  </EuiTextBlockTruncate>
+                </EuiText>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      );
+    default:
+      return nullGroupMessage ? (
+        <NullGroupComponent title={NULL_GROUPING_MESSAGES.DEFAULT} field={selectedGroup} />
+      ) : (
+        <EuiFlexGroup alignItems="center">
+          <EuiFlexItem>
+            <EuiFlexGroup direction="column" gutterSize="none">
+              <EuiFlexItem>
+                <EuiText size="s">
+                  <strong>{bucket.key_as_string}</strong>
+                </EuiText>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      );
+  }
+};
+
+const VulnerabilitiesCountComponent = ({
+  bucket,
+}: {
+  bucket: RawBucket<VulnerabilitiesGroupingAggregation>;
+}) => {
+  const { euiTheme } = useEuiTheme();
+
+  return (
+    <EuiToolTip content={bucket.doc_count}>
+      <EuiBadge
+        css={css`
+          margin-left: ${euiTheme.size.s}};
+        `}
+        color="hollow"
+        data-test-subj={VULNERABILITIES_GROUPING_COUNTER}
+      >
+        {getAbbreviatedNumber(bucket.doc_count)}
+      </EuiBadge>
+    </EuiToolTip>
+  );
+};
+
+const VulnerabilitiesCount = React.memo(VulnerabilitiesCountComponent);
+
+export const groupStatsRenderer = (
+  selectedGroup: string,
+  bucket: RawBucket<VulnerabilitiesGroupingAggregation>
+): StatRenderer[] => {
+  const defaultBadges = [
+    {
+      title: VULNERABILITIES,
+      renderer: <VulnerabilitiesCount bucket={bucket} />,
+    },
+  ];
+
+  return defaultBadges;
+};
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_table.tsx
index c500da2b16d3db..b27ebfb459fe45 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_table.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_table.tsx
@@ -8,35 +8,36 @@
 import React from 'react';
 import { DataTableRecord } from '@kbn/discover-utils/types';
 import { i18n } from '@kbn/i18n';
-import { EuiSpacer } from '@elastic/eui';
+import { EuiDataGridCellValueElementProps, EuiSpacer } from '@elastic/eui';
+import { Filter } from '@kbn/es-query';
 import { CspVulnerabilityFinding } from '../../../common/schemas';
-import { FindingsBaseProps } from '../../common/types';
 import { CloudSecurityDataTable } from '../../components/cloud_security_data_table';
 import { useLatestVulnerabilitiesTable } from './hooks/use_latest_vulnerabilities_table';
 import { LATEST_VULNERABILITIES_TABLE } from './test_subjects';
 import { getDefaultQuery, defaultColumns } from './constants';
 import { VulnerabilityFindingFlyout } from './vulnerabilities_finding_flyout/vulnerability_finding_flyout';
 import { ErrorCallout } from '../configurations/layout/error_callout';
+import { CVSScoreBadge, SeverityStatusBadge } from '../../components/vulnerability_badges';
 
-type LatestVulnerabilitiesTableProps = FindingsBaseProps & {
+interface LatestVulnerabilitiesTableProps {
   groupSelectorComponent?: JSX.Element;
   height?: number;
-};
-
+  nonPersistedFilters?: Filter[];
+}
 /**
  * Type Guard for checking if the given source is a CspVulnerabilityFinding
  */
 const isCspVulnerabilityFinding = (
   source: Record<string, any> | undefined
 ): source is CspVulnerabilityFinding => {
-  return source?.result?.evaluation !== undefined;
+  return source?.vulnerability?.id !== undefined;
 };
 
 /**
  * This Wrapper component renders the children if the given row is a CspVulnerabilityFinding
  * it uses React's Render Props pattern
  */
-const CspFindingRenderer = ({
+const CspVulnerabilityFindingRenderer = ({
   row,
   children,
 }: {
@@ -51,11 +52,11 @@ const CspFindingRenderer = ({
 
 const flyoutComponent = (row: DataTableRecord, onCloseFlyout: () => void): JSX.Element => {
   return (
-    <CspFindingRenderer row={row}>
+    <CspVulnerabilityFindingRenderer row={row}>
       {({ finding }) => (
         <VulnerabilityFindingFlyout vulnerabilityRecord={finding} closeFlyout={onCloseFlyout} />
       )}
-    </CspFindingRenderer>
+    </CspVulnerabilityFindingRenderer>
   );
 };
 
@@ -63,36 +64,60 @@ const title = i18n.translate('xpack.csp.findings.latestVulnerabilities.tableRowT
   defaultMessage: 'Vulnerabilities',
 });
 
+const customCellRenderer = (rows: DataTableRecord[]) => ({
+  'vulnerability.score.base': ({ rowIndex }: EuiDataGridCellValueElementProps) => (
+    <CspVulnerabilityFindingRenderer row={rows[rowIndex]}>
+      {({ finding }) => (
+        <CVSScoreBadge
+          score={finding.vulnerability?.score?.base}
+          version={finding.vulnerability?.score?.version}
+        />
+      )}
+    </CspVulnerabilityFindingRenderer>
+  ),
+  'vulnerability.severity': ({ rowIndex }: EuiDataGridCellValueElementProps) => (
+    <CspVulnerabilityFindingRenderer row={rows[rowIndex]}>
+      {({ finding }) => <SeverityStatusBadge severity={finding.vulnerability.severity} />}
+    </CspVulnerabilityFindingRenderer>
+  ),
+});
+
 export const LatestVulnerabilitiesTable = ({
-  dataView,
+  groupSelectorComponent,
   height,
+  nonPersistedFilters,
 }: LatestVulnerabilitiesTableProps) => {
-  const { cloudPostureTable, rows, total, error, isFetching, fetchNextPage } =
+  const { cloudPostureDataTable, rows, total, error, isFetching, fetchNextPage } =
     useLatestVulnerabilitiesTable({
-      dataView,
       getDefaultQuery,
+      nonPersistedFilters,
     });
 
-  return error ? (
+  const { filters } = cloudPostureDataTable;
+
+  return (
     <>
-      <EuiSpacer size="m" />
-      <ErrorCallout error={error} />
+      {error ? (
+        <>
+          <EuiSpacer size="m" />
+          <ErrorCallout error={error} />
+        </>
+      ) : (
+        <CloudSecurityDataTable
+          data-test-subj={LATEST_VULNERABILITIES_TABLE}
+          isLoading={isFetching}
+          defaultColumns={defaultColumns}
+          rows={rows}
+          total={total}
+          flyoutComponent={flyoutComponent}
+          cloudPostureDataTable={cloudPostureDataTable}
+          loadMore={fetchNextPage}
+          title={title}
+          customCellRenderer={customCellRenderer}
+          groupSelectorComponent={groupSelectorComponent}
+          height={height ?? `calc(100vh - ${filters?.length > 0 ? 404 : 364}px)`}
+        />
+      )}
     </>
-  ) : (
-    <CloudSecurityDataTable
-      data-test-subj={LATEST_VULNERABILITIES_TABLE}
-      dataView={dataView}
-      isLoading={isFetching}
-      defaultColumns={defaultColumns}
-      rows={rows}
-      total={total}
-      flyoutComponent={flyoutComponent}
-      cloudPostureTable={cloudPostureTable}
-      loadMore={fetchNextPage}
-      title={title}
-      // customCellRenderer={customCellRenderer}
-      // groupSelectorComponent={groupSelectorComponent}
-      height={height}
-    />
   );
 };
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/test_subjects.ts b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/test_subjects.ts
index d22afa6eeb77bf..8ad512f8a41eea 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/test_subjects.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/test_subjects.ts
@@ -15,3 +15,5 @@ export const TAB_ID_VULNERABILITY_FLYOUT = (tabId: string) =>
   `vulnerability-finding-flyout-tab-${tabId}`;
 
 export const LATEST_VULNERABILITIES_TABLE = 'latest_vulnerabilities_table';
+
+export const VULNERABILITIES_GROUPING_COUNTER = 'vulnerabilities_grouping_counter';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/translations.ts b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/translations.ts
index b2c0ca0ca83663..65ca61056f612b 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/translations.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/translations.ts
@@ -22,3 +22,35 @@ export const SEARCH_BAR_PLACEHOLDER = i18n.translate(
 export const VULNERABILITIES = i18n.translate('xpack.csp.vulnerabilities', {
   defaultMessage: 'Vulnerabilities',
 });
+
+export const VULNERABILITIES_UNIT = (totalCount: number) =>
+  i18n.translate('xpack.csp.vulnerabilities.unit', {
+    values: { totalCount },
+    defaultMessage: `{totalCount, plural, =1 {vulnerability} other {vulnerabilities}}`,
+  });
+
+export const NULL_GROUPING_UNIT = i18n.translate(
+  'xpack.csp.vulnerabilities.grouping.nullGroupUnit',
+  {
+    defaultMessage: 'vulnerabilities',
+  }
+);
+
+export const NULL_GROUPING_MESSAGES = {
+  RESOURCE_NAME: i18n.translate('xpack.csp.vulnerabilities.grouping.resource.nullGroupTitle', {
+    defaultMessage: 'No resource',
+  }),
+  DEFAULT: i18n.translate('xpack.csp.vulnerabilities.grouping.default.nullGroupTitle', {
+    defaultMessage: 'No grouping',
+  }),
+};
+
+export const GROUPING_LABELS = {
+  RESOURCE_NAME: i18n.translate('xpack.csp.findings.latestFindings.groupByResource', {
+    defaultMessage: 'Resource',
+  }),
+};
+
+export const groupingTitle = i18n.translate('xpack.csp.vulnerabilities.latestFindings.groupBy', {
+  defaultMessage: 'Group vulnerabilities by',
+});
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities.tsx
index cbe42544dac4d4..aca54e19bfccf0 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities.tsx
@@ -7,54 +7,39 @@
 import React from 'react';
 import { Routes, Route } from '@kbn/shared-ux-router';
 import { LATEST_VULNERABILITIES_INDEX_PATTERN } from '../../../common/constants';
-import { ErrorCallout } from '../configurations/layout/error_callout';
 import { NoVulnerabilitiesStates } from '../../components/no_vulnerabilities_states';
 import { useCspSetupStatusApi } from '../../common/api/use_setup_status_api';
-import { defaultLoadingRenderer, defaultNoDataRenderer } from '../../components/cloud_posture_page';
+import { CloudPosturePage } from '../../components/cloud_posture_page';
 import { findingsNavigation } from '../../common/navigation/constants';
-import { VulnerabilitiesByResource } from './vulnerabilities_by_resource/vulnerabilities_by_resource';
-import { ResourceVulnerabilities } from './vulnerabilities_by_resource/resource_vulnerabilities/resource_vulnerabilities';
 import { useLatestFindingsDataView } from '../../common/api/use_latest_findings_data_view';
 import { LatestVulnerabilitiesContainer } from './latest_vulnerabilities_container';
+import { DataViewContext } from '../../common/contexts/data_view_context';
 
 export const Vulnerabilities = () => {
-  const {
-    data: dataView,
-    isLoading,
-    error,
-  } = useLatestFindingsDataView(LATEST_VULNERABILITIES_INDEX_PATTERN);
+  const dataViewQuery = useLatestFindingsDataView(LATEST_VULNERABILITIES_INDEX_PATTERN);
 
   const getSetupStatus = useCspSetupStatusApi();
 
   if (getSetupStatus?.data?.vuln_mgmt?.status !== 'indexed') return <NoVulnerabilitiesStates />;
 
-  if (error) {
-    return <ErrorCallout error={error as Error} />;
-  }
-  if (isLoading) {
-    return defaultLoadingRenderer();
-  }
-
-  if (!dataView) {
-    return defaultNoDataRenderer();
-  }
+  const dataViewContextValue = {
+    dataView: dataViewQuery.data!,
+    dataViewRefetch: dataViewQuery.refetch,
+    dataViewIsRefetching: dataViewQuery.isRefetching,
+  };
 
   return (
-    <Routes>
-      <Route
-        exact
-        path={findingsNavigation.resource_vulnerabilities.path}
-        render={() => <ResourceVulnerabilities dataView={dataView} />}
-      />
-      <Route
-        exact
-        path={findingsNavigation.vulnerabilities_by_resource.path}
-        render={() => <VulnerabilitiesByResource dataView={dataView} />}
-      />
-      <Route
-        path={findingsNavigation.vulnerabilities.path}
-        render={() => <LatestVulnerabilitiesContainer dataView={dataView} />}
-      />
-    </Routes>
+    <CloudPosturePage query={dataViewQuery}>
+      <Routes>
+        <Route
+          path={findingsNavigation.vulnerabilities.path}
+          render={() => (
+            <DataViewContext.Provider value={dataViewContextValue}>
+              <LatestVulnerabilitiesContainer />
+            </DataViewContext.Provider>
+          )}
+        />
+      </Routes>
+    </CloudPosturePage>
   );
 };
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/resource_vulnerabilities/__mocks__/resource_vulnerabilities.mock.ts b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/resource_vulnerabilities/__mocks__/resource_vulnerabilities.mock.ts
deleted file mode 100644
index 8328192062cc04..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/resource_vulnerabilities/__mocks__/resource_vulnerabilities.mock.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * 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.
- */
-
-export const getResourceVulnerabilitiesMockData = () => ({
-  page: [
-    {
-      agent: {
-        name: 'ip-172-31-15-210',
-        id: '2d262db5-b637-4e46-a2a0-db409825ff46',
-        ephemeral_id: '2af1be77-0bdf-4313-b375-592848fe60d7',
-        type: 'cloudbeat',
-        version: '8.8.0',
-      },
-      package: {
-        path: 'usr/lib/snapd/snapd',
-        fixed_version: '3.0.0-20220521103104-8f96da9f5d5e',
-        name: 'gopkg.in/yaml.v3',
-        type: 'gobinary',
-        version: 'v3.0.0-20210107192922-496545a6307b',
-      },
-      resource: {
-        name: 'elastic-agent-instance-a6c683d0-0977-11ee-bb0b-0af2059ffbbf',
-        id: '0d103e99f17f355ba',
-      },
-      elastic_agent: {
-        id: '2d262db5-b637-4e46-a2a0-db409825ff46',
-        version: '8.8.0',
-        snapshot: false,
-      },
-      vulnerability: {
-        severity: 'HIGH',
-        package: {
-          fixed_version: '3.0.0-20220521103104-8f96da9f5d5e',
-          name: 'gopkg.in/yaml.v3',
-          version: 'v3.0.0-20210107192922-496545a6307b',
-        },
-        description:
-          'An issue in the Unmarshal function in Go-Yaml v3 causes the program to crash when attempting to deserialize invalid input.',
-        title: 'crash when attempting to deserialize invalid input',
-        classification: 'CVSS',
-        data_source: {
-          ID: 'go-vulndb',
-          URL: 'https://github.com/golang/vulndb',
-          Name: 'The Go Vulnerability Database',
-        },
-        cwe: ['CWE-502'],
-        reference: 'https://avd.aquasec.com/nvd/cve-2022-28948',
-        score: {
-          version: '3.1',
-          base: 7.5,
-        },
-        report_id: 1686633719,
-        scanner: {
-          vendor: 'Trivy',
-          version: 'v0.35.0',
-        },
-        id: 'CVE-2022-28948',
-        enumeration: 'CVE',
-        published_date: '2022-05-19T20:15:00Z',
-        class: 'lang-pkgs',
-        cvss: {
-          redhat: {
-            V3Vector: 'CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:H',
-            V3Score: 7.5,
-          },
-          nvd: {
-            V3Vector: 'CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:H',
-            V2Vector: 'AV:N/AC:L/Au:N/C:N/I:N/A:P',
-            V3Score: 7.5,
-            V2Score: 5,
-          },
-          ghsa: {
-            V3Vector: 'CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:H',
-            V3Score: 7.5,
-          },
-        },
-      },
-      cloud: {
-        provider: 'aws',
-        region: 'us-east-1',
-        account: {
-          name: 'elastic-security-cloud-security-dev',
-          id: '704479110758',
-        },
-      },
-      '@timestamp': '2023-06-13T06:15:16.182Z',
-      cloudbeat: {
-        commit_sha: '8497f3a4b4744c645233c5a13b45400367411c2f',
-        commit_time: '2023-05-09T16:07:58Z',
-        version: '8.8.0',
-      },
-      ecs: {
-        version: '8.6.0',
-      },
-      data_stream: {
-        namespace: 'default',
-        type: 'logs',
-        dataset: 'cloud_security_posture.vulnerabilities',
-      },
-      host: {
-        name: 'ip-172-31-15-210',
-      },
-      event: {
-        agent_id_status: 'auth_metadata_missing',
-        sequence: 1686633719,
-        ingested: '2023-06-15T18:37:56Z',
-        created: '2023-06-13T06:15:16.18250081Z',
-        kind: 'state',
-        id: '5cad2983-4a74-455d-ab39-6c584acd3994',
-        type: ['info'],
-        category: ['vulnerability'],
-        dataset: 'cloud_security_posture.vulnerabilities',
-        outcome: 'success',
-      },
-    },
-  ],
-  total: 1,
-});
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/resource_vulnerabilities/resource_vulnerabilities.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/resource_vulnerabilities/resource_vulnerabilities.test.tsx
deleted file mode 100644
index 9de1a61bebe38a..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/resource_vulnerabilities/resource_vulnerabilities.test.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * 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 React from 'react';
-import { render, screen } from '@testing-library/react';
-import { useParams } from 'react-router-dom';
-import { ResourceVulnerabilities } from './resource_vulnerabilities';
-import { TestProvider } from '../../../../test/test_provider';
-import { useLatestVulnerabilities } from '../../hooks/use_latest_vulnerabilities';
-import { getResourceVulnerabilitiesMockData } from './__mocks__/resource_vulnerabilities.mock';
-import { VULNERABILITIES_CVSS_SCORE_BADGE_SUBJ } from '../../../../components/test_subjects';
-
-jest.mock('../../hooks/use_latest_vulnerabilities', () => ({
-  useLatestVulnerabilities: jest.fn(),
-}));
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-  useParams: jest.fn().mockReturnValue({
-    integration: undefined,
-  }),
-}));
-
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
-describe('ResourceVulnerabilities', () => {
-  const dataView: any = {};
-
-  const renderVulnerabilityByResource = () => {
-    return render(
-      <TestProvider>
-        <ResourceVulnerabilities dataView={dataView} />
-      </TestProvider>
-    );
-  };
-
-  it('renders the loading state', () => {
-    (useLatestVulnerabilities as jest.Mock).mockReturnValue({
-      data: undefined,
-      isLoading: true,
-      isFetching: true,
-    });
-    renderVulnerabilityByResource();
-    expect(screen.getByText(/loading/i)).toBeInTheDocument();
-  });
-  it('renders the no data state', () => {
-    (useLatestVulnerabilities as jest.Mock).mockReturnValue({
-      data: undefined,
-      isLoading: false,
-      isFetching: false,
-    });
-
-    renderVulnerabilityByResource();
-    expect(screen.getByText(/no data/i)).toBeInTheDocument();
-  });
-
-  it('applies the correct filter on fetch', () => {
-    const resourceId = 'test';
-    (useParams as jest.Mock).mockReturnValue({
-      resourceId,
-    });
-    renderVulnerabilityByResource();
-    expect(useLatestVulnerabilities).toHaveBeenCalledWith(
-      expect.objectContaining({
-        query: {
-          bool: {
-            filter: [
-              {
-                term: {
-                  'resource.id': resourceId,
-                },
-              },
-            ],
-            must: [],
-            must_not: [],
-            should: [],
-          },
-        },
-      })
-    );
-  });
-
-  it('renders the empty state component', () => {
-    (useLatestVulnerabilities as jest.Mock).mockReturnValue({
-      data: { total: 0, total_vulnerabilities: 0, page: [] },
-      isLoading: false,
-      isFetching: false,
-    });
-
-    renderVulnerabilityByResource();
-    expect(screen.getByText(/no results/i)).toBeInTheDocument();
-  });
-
-  it('renders the Table', () => {
-    (useLatestVulnerabilities as jest.Mock).mockReturnValue({
-      data: getResourceVulnerabilitiesMockData(),
-      isLoading: false,
-      isFetching: false,
-    });
-
-    renderVulnerabilityByResource();
-
-    // Header
-    expect(screen.getByText(/0d103e99f17f355ba/i)).toBeInTheDocument();
-    expect(screen.getByText(/us-east-1/i)).toBeInTheDocument();
-    expect(
-      screen.getByText(/elastic-agent-instance-a6c683d0-0977-11ee-bb0b-0af2059ffbbf/i)
-    ).toBeInTheDocument();
-
-    // Table
-    expect(screen.getByText(/CVE-2022-28948/i)).toBeInTheDocument();
-    expect(screen.getByTestId(VULNERABILITIES_CVSS_SCORE_BADGE_SUBJ)).toHaveTextContent(/7.5/i);
-    expect(screen.getByTestId(VULNERABILITIES_CVSS_SCORE_BADGE_SUBJ)).toHaveTextContent(/v3/i);
-    expect(screen.getByText(/high/i)).toBeInTheDocument();
-    expect(screen.getByText(/gopkg.in\/yaml.v3/i)).toBeInTheDocument();
-    expect(screen.getByText(/v3.0.0-20210107192922-496545a6307b/i)).toBeInTheDocument();
-    expect(screen.getByText(/3.0.0-20220521103104-8f96da9f5d5e/i)).toBeInTheDocument();
-  });
-});
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/resource_vulnerabilities/resource_vulnerabilities.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/resource_vulnerabilities/resource_vulnerabilities.tsx
deleted file mode 100644
index 673dd2e8130e40..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/resource_vulnerabilities/resource_vulnerabilities.tsx
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
- * 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 {
-  EuiButtonEmpty,
-  EuiButtonIcon,
-  EuiDataGrid,
-  EuiDataGridCellValueElementProps,
-  EuiProgress,
-  EuiSpacer,
-  useEuiTheme,
-} from '@elastic/eui';
-import { cx } from '@emotion/css';
-import { DataView } from '@kbn/data-views-plugin/common';
-import React, { useCallback, useMemo, useState, useEffect } from 'react';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
-import { Link, useParams, generatePath } from 'react-router-dom';
-import type { BoolQuery } from '@kbn/es-query';
-import { LOCAL_STORAGE_PAGE_SIZE_FINDINGS_KEY } from '../../../../common/constants';
-import {
-  CloudPostureTableResult,
-  useCloudPostureTable,
-} from '../../../../common/hooks/use_cloud_posture_table';
-import { useLatestVulnerabilities } from '../../hooks/use_latest_vulnerabilities';
-import type { VulnerabilitiesQueryData } from '../../types';
-import { ErrorCallout } from '../../../configurations/layout/error_callout';
-import { FindingsSearchBar } from '../../../configurations/layout/findings_search_bar';
-import { CVSScoreBadge, SeverityStatusBadge } from '../../../../components/vulnerability_badges';
-import { EmptyState } from '../../../../components/empty_state';
-import { VulnerabilityFindingFlyout } from '../../vulnerabilities_finding_flyout/vulnerability_finding_flyout';
-import { useLimitProperties } from '../../../../common/utils/get_limit_properties';
-import {
-  LimitedResultsBar,
-  PageTitle,
-  PageTitleText,
-} from '../../../configurations/layout/findings_layout';
-import {
-  getVulnerabilitiesColumnsGrid,
-  vulnerabilitiesColumns,
-} from '../../vulnerabilities_table_columns';
-import {
-  defaultLoadingRenderer,
-  defaultNoDataRenderer,
-} from '../../../../components/cloud_posture_page';
-import { SEARCH_BAR_PLACEHOLDER, VULNERABILITIES } from '../../translations';
-import {
-  severitySchemaConfig,
-  severitySortScript,
-  getCaseInsensitiveSortScript,
-} from '../../utils/custom_sort_script';
-import { useStyles } from '../../hooks/use_styles';
-import { findingsNavigation } from '../../../../common/navigation/constants';
-import { CspInlineDescriptionList } from '../../../../components/csp_inline_description_list';
-import { getVulnerabilitiesGridCellActions } from '../../utils/get_vulnerabilities_grid_cell_actions';
-
-const getDefaultQuery = ({ query, filters }: any) => ({
-  query,
-  filters,
-  sort: [
-    { id: vulnerabilitiesColumns.severity, direction: 'desc' },
-    { id: vulnerabilitiesColumns.cvss, direction: 'desc' },
-  ],
-  pageIndex: 0,
-});
-
-const ResourceVulnerabilitiesDataGrid = ({
-  dataView,
-  data,
-  isFetching,
-  pageIndex,
-  sort,
-  pageSize,
-  onChangeItemsPerPage,
-  onChangePage,
-  onSort,
-  urlQuery,
-  setUrlQuery,
-  onResetFilters,
-}: {
-  dataView: DataView;
-  data: VulnerabilitiesQueryData;
-  isFetching: boolean;
-} & Pick<
-  CloudPostureTableResult,
-  | 'pageIndex'
-  | 'sort'
-  | 'pageSize'
-  | 'onChangeItemsPerPage'
-  | 'onChangePage'
-  | 'onSort'
-  | 'urlQuery'
-  | 'setUrlQuery'
-  | 'onResetFilters'
->) => {
-  const { euiTheme } = useEuiTheme();
-  const styles = useStyles();
-
-  const [showHighlight, setHighlight] = useState(false);
-
-  const onSortHandler = useCallback(
-    (newSort: any) => {
-      onSort(newSort);
-      if (newSort.length !== sort.length) {
-        setHighlight(true);
-        setTimeout(() => {
-          setHighlight(false);
-        }, 2000);
-      }
-    },
-    [onSort, sort]
-  );
-
-  const invalidIndex = -1;
-
-  const selectedVulnerability = useMemo(() => {
-    return data?.page[urlQuery.vulnerabilityIndex];
-  }, [data?.page, urlQuery.vulnerabilityIndex]);
-
-  const onCloseFlyout = () => {
-    setUrlQuery({
-      vulnerabilityIndex: invalidIndex,
-    });
-  };
-
-  const onOpenFlyout = useCallback(
-    (vulnerabilityRow: VulnerabilitiesQueryData['page'][number]) => {
-      const vulnerabilityIndex = data?.page.findIndex(
-        (vulnerabilityRecord: VulnerabilitiesQueryData['page'][number]) =>
-          vulnerabilityRecord.vulnerability?.id === vulnerabilityRow.vulnerability?.id &&
-          vulnerabilityRecord.resource?.id === vulnerabilityRow.resource?.id &&
-          vulnerabilityRecord.package.name === vulnerabilityRow.package.name &&
-          vulnerabilityRecord.package.version === vulnerabilityRow.package.version
-      );
-      setUrlQuery({
-        vulnerabilityIndex,
-      });
-    },
-    [setUrlQuery, data?.page]
-  );
-
-  const { isLastLimitedPage, limitedTotalItemCount } = useLimitProperties({
-    total: data?.total,
-    pageIndex,
-    pageSize,
-  });
-
-  const columns = useMemo(() => {
-    if (!data?.page) {
-      return [];
-    }
-
-    return getVulnerabilitiesGridCellActions({
-      columnGridFn: getVulnerabilitiesColumnsGrid,
-      columns: vulnerabilitiesColumns,
-      dataView,
-      pageSize,
-      data: data.page,
-      setUrlQuery,
-      filters: urlQuery.filters,
-    }).filter(
-      (column) =>
-        column.id !== vulnerabilitiesColumns.resourceName &&
-        column.id !== vulnerabilitiesColumns.resourceId
-    );
-  }, [data?.page, dataView, pageSize, setUrlQuery, urlQuery.filters]);
-
-  const flyoutVulnerabilityIndex = urlQuery?.vulnerabilityIndex;
-
-  const selectedVulnerabilityIndex = flyoutVulnerabilityIndex + pageIndex * pageSize;
-
-  const renderCellValue = useMemo(() => {
-    const Cell: React.FC<EuiDataGridCellValueElementProps> = ({
-      columnId,
-      rowIndex,
-      setCellProps,
-    }): React.ReactElement | null => {
-      const rowIndexFromPage = rowIndex > pageSize - 1 ? rowIndex % pageSize : rowIndex;
-
-      const vulnerabilityRow = data?.page[rowIndexFromPage];
-
-      useEffect(() => {
-        if (selectedVulnerabilityIndex === rowIndex) {
-          setCellProps({
-            style: {
-              backgroundColor: euiTheme.colors.highlight,
-            },
-          });
-        } else {
-          setCellProps({
-            style: {
-              backgroundColor: 'inherit',
-            },
-          });
-        }
-      }, [rowIndex, setCellProps]);
-
-      if (isFetching) return null;
-      if (!vulnerabilityRow) return null;
-      if (!vulnerabilityRow.vulnerability?.id) return null;
-
-      if (columnId === vulnerabilitiesColumns.actions) {
-        return (
-          <EuiButtonIcon
-            iconType="expand"
-            aria-label="View"
-            onClick={() => {
-              onOpenFlyout(vulnerabilityRow);
-            }}
-          />
-        );
-      }
-      if (columnId === vulnerabilitiesColumns.vulnerability) {
-        return <>{vulnerabilityRow.vulnerability?.id}</>;
-      }
-      if (columnId === vulnerabilitiesColumns.cvss) {
-        if (
-          !vulnerabilityRow.vulnerability.score?.base ||
-          !vulnerabilityRow.vulnerability.score?.version
-        ) {
-          return null;
-        }
-        return (
-          <CVSScoreBadge
-            score={vulnerabilityRow.vulnerability.score.base}
-            version={vulnerabilityRow.vulnerability.score.version}
-          />
-        );
-      }
-      if (columnId === vulnerabilitiesColumns.severity) {
-        if (!vulnerabilityRow.vulnerability.severity) {
-          return null;
-        }
-        return <SeverityStatusBadge severity={vulnerabilityRow.vulnerability.severity} />;
-      }
-
-      if (columnId === vulnerabilitiesColumns.package) {
-        return <>{vulnerabilityRow?.package?.name}</>;
-      }
-      if (columnId === vulnerabilitiesColumns.version) {
-        return <>{vulnerabilityRow?.package?.version}</>;
-      }
-      if (columnId === vulnerabilitiesColumns.fixedVersion) {
-        return <>{vulnerabilityRow?.package?.fixed_version}</>;
-      }
-
-      return null;
-    };
-
-    return Cell;
-  }, [
-    data?.page,
-    euiTheme.colors.highlight,
-    onOpenFlyout,
-    pageSize,
-    selectedVulnerabilityIndex,
-    isFetching,
-  ]);
-
-  const onPaginateFlyout = useCallback(
-    (nextVulnerabilityIndex: number) => {
-      // the index of the vulnerability in the current page
-      const newVulnerabilityIndex = nextVulnerabilityIndex % pageSize;
-
-      // if the vulnerability is not in the current page, we need to change the page
-      const flyoutPageIndex = Math.floor(nextVulnerabilityIndex / pageSize);
-
-      setUrlQuery({
-        pageIndex: flyoutPageIndex,
-        vulnerabilityIndex: newVulnerabilityIndex,
-      });
-    },
-    [pageSize, setUrlQuery]
-  );
-
-  const showVulnerabilityFlyout = flyoutVulnerabilityIndex > invalidIndex;
-
-  if (data.page.length === 0) {
-    return <EmptyState onResetFilters={onResetFilters} />;
-  }
-
-  return (
-    <>
-      <EuiProgress
-        size="xs"
-        color="accent"
-        style={{
-          opacity: isFetching ? 1 : 0,
-        }}
-      />
-      <EuiDataGrid
-        className={cx({ [styles.gridStyle]: true }, { [styles.highlightStyle]: showHighlight })}
-        aria-label={VULNERABILITIES}
-        columns={columns}
-        columnVisibility={{
-          visibleColumns: columns.map(({ id }) => id),
-          setVisibleColumns: () => {},
-        }}
-        height={undefined}
-        width={undefined}
-        schemaDetectors={[severitySchemaConfig]}
-        rowCount={limitedTotalItemCount}
-        rowHeightsOptions={{
-          defaultHeight: 40,
-        }}
-        toolbarVisibility={{
-          showColumnSelector: false,
-          showDisplaySelector: false,
-          showKeyboardShortcuts: false,
-          showFullScreenSelector: false,
-          additionalControls: {
-            left: {
-              prepend: (
-                <>
-                  <EuiButtonEmpty size="xs" color="text">
-                    {i18n.translate('xpack.csp.vulnerabilities.totalVulnerabilities', {
-                      defaultMessage:
-                        '{total, plural, one {# Vulnerability} other {# Vulnerabilities}}',
-                      values: { total: data?.total },
-                    })}
-                  </EuiButtonEmpty>
-                </>
-              ),
-            },
-          },
-        }}
-        gridStyle={{
-          border: 'horizontal',
-          cellPadding: 'l',
-          stripes: false,
-          rowHover: 'none',
-          header: 'underline',
-        }}
-        renderCellValue={renderCellValue}
-        inMemory={{ level: 'enhancements' }}
-        sorting={{ columns: sort, onSort: onSortHandler }}
-        pagination={{
-          pageIndex,
-          pageSize,
-          pageSizeOptions: [10, 25, 100],
-          onChangeItemsPerPage,
-          onChangePage,
-        }}
-      />
-      {isLastLimitedPage && <LimitedResultsBar />}
-      {showVulnerabilityFlyout && selectedVulnerability && (
-        <VulnerabilityFindingFlyout
-          flyoutIndex={selectedVulnerabilityIndex}
-          vulnerabilityRecord={selectedVulnerability}
-          totalVulnerabilitiesCount={limitedTotalItemCount}
-          onPaginate={onPaginateFlyout}
-          closeFlyout={onCloseFlyout}
-          isLoading={isFetching}
-        />
-      )}
-    </>
-  );
-};
-export const ResourceVulnerabilities = ({ dataView }: { dataView: DataView }) => {
-  const params = useParams<{ resourceId: string }>();
-  const resourceId = decodeURIComponent(params.resourceId);
-
-  const {
-    pageIndex,
-    pageSize,
-    onChangeItemsPerPage,
-    onChangePage,
-    query,
-    sort,
-    onSort,
-    queryError,
-    urlQuery,
-    setUrlQuery,
-    onResetFilters,
-  } = useCloudPostureTable({
-    dataView,
-    defaultQuery: getDefaultQuery,
-    paginationLocalStorageKey: LOCAL_STORAGE_PAGE_SIZE_FINDINGS_KEY,
-  });
-
-  const multiFieldsSort = useMemo(() => {
-    return sort.map(({ id, direction }: { id: string; direction: string }) => {
-      if (id === vulnerabilitiesColumns.severity) {
-        return severitySortScript(direction);
-      }
-      if (id === vulnerabilitiesColumns.package) {
-        return getCaseInsensitiveSortScript(id, direction);
-      }
-
-      return {
-        [id]: direction,
-      };
-    });
-  }, [sort]);
-
-  const { data, isLoading, isFetching } = useLatestVulnerabilities({
-    query: {
-      ...query,
-      bool: {
-        ...(query?.bool as BoolQuery),
-        filter: [...(query?.bool?.filter || []), { term: { 'resource.id': resourceId } }],
-      },
-    },
-    sort: multiFieldsSort,
-    enabled: !queryError,
-    pageIndex,
-    pageSize,
-  });
-
-  const error = queryError || null;
-
-  if (isLoading) {
-    return defaultLoadingRenderer();
-  }
-
-  if (!data?.page) {
-    return defaultNoDataRenderer();
-  }
-
-  return (
-    <>
-      <FindingsSearchBar
-        dataView={dataView}
-        setQuery={(newQuery) => {
-          setUrlQuery({ ...newQuery, pageIndex: 0 });
-        }}
-        loading={isFetching}
-        placeholder={SEARCH_BAR_PLACEHOLDER}
-      />
-      <Link to={generatePath(findingsNavigation.vulnerabilities_by_resource.path)}>
-        <EuiButtonEmpty iconType="arrowLeft" flush="both">
-          <FormattedMessage
-            id="xpack.csp.vulnerabilities.resourceVulnerabilities.backToResourcesPageButtonLabel"
-            defaultMessage="Back to resources"
-          />
-        </EuiButtonEmpty>
-      </Link>
-      <EuiSpacer size="xs" />
-      <PageTitle>
-        <PageTitleText
-          title={i18n.translate(
-            'xpack.csp.vulnerabilities.resourceVulnerabilities.vulnerabilitiesPageTitle',
-            {
-              defaultMessage: '{resourceName} {hyphen} Vulnerabilities',
-              values: {
-                resourceName: data?.page[0]?.resource?.name,
-                hyphen: data?.page[0]?.resource?.name ? '-' : '',
-              },
-            }
-          )}
-        />
-      </PageTitle>
-      <EuiSpacer />
-      <CspInlineDescriptionList
-        listItems={[
-          {
-            title: i18n.translate(
-              'xpack.csp.vulnerabilities.resourceVulnerabilities.resourceIdTitle',
-              {
-                defaultMessage: 'Resource ID',
-              }
-            ),
-            description: data?.page[0]?.resource?.id || '',
-          },
-          {
-            title: i18n.translate('xpack.csp.vulnerabilities.resourceVulnerabilities.regionTitle', {
-              defaultMessage: 'Region',
-            }),
-            description: data?.page[0]?.cloud?.region || '',
-          },
-        ]}
-      />
-      <EuiSpacer />
-      <EuiSpacer size="m" />
-      {error && <ErrorCallout error={error as Error} />}
-      {!error && (
-        <ResourceVulnerabilitiesDataGrid
-          dataView={dataView}
-          data={data}
-          isFetching={isFetching}
-          pageIndex={pageIndex}
-          pageSize={pageSize}
-          urlQuery={urlQuery}
-          setUrlQuery={setUrlQuery}
-          onChangeItemsPerPage={onChangeItemsPerPage}
-          onChangePage={onChangePage}
-          onResetFilters={onResetFilters}
-          onSort={onSort}
-          sort={sort}
-        />
-      )}
-    </>
-  );
-};
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_finding_flyout/vulnerability_finding_flyout.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_finding_flyout/vulnerability_finding_flyout.tsx
index 3b3fef708815bb..06b8fdc2ad941c 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_finding_flyout/vulnerability_finding_flyout.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_finding_flyout/vulnerability_finding_flyout.tsx
@@ -81,17 +81,17 @@ const getFlyoutDescriptionList = (
 
 export const VulnerabilityFindingFlyout = ({
   closeFlyout,
+  vulnerabilityRecord,
   onPaginate,
   totalVulnerabilitiesCount,
   flyoutIndex,
-  vulnerabilityRecord,
-  isLoading,
+  isLoading = false,
 }: {
   closeFlyout: () => void;
+  vulnerabilityRecord: CspVulnerabilityFinding;
   onPaginate?: (pageIndex: number) => void;
   totalVulnerabilitiesCount?: number;
   flyoutIndex?: number;
-  vulnerabilityRecord: CspVulnerabilityFinding;
   isLoading?: boolean;
 }) => {
   const [selectedTabId, setSelectedTabId] = useState(overviewTabId);
@@ -241,7 +241,7 @@ export const VulnerabilityFindingFlyout = ({
           alignItems="center"
           justifyContent={onPaginate ? 'spaceBetween' : 'flexEnd'}
         >
-          {onPaginate && (
+          {onPaginate && totalVulnerabilitiesCount && flyoutIndex && (
             <EuiFlexItem grow={false}>
               <EuiPagination
                 pageCount={totalVulnerabilitiesCount}

From 23caa12560a5dadc32e41f2277dff286fc0ccd73 Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Fri, 5 Jan 2024 17:12:28 -0800
Subject: [PATCH 07/25] empty component condition

---
 .../hooks/use_latest_vulnerabilities_grouping.tsx             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
index b711b90c7f4b4d..53150a41f17955 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
@@ -63,7 +63,7 @@ const getAggregationsByGroupField = (field: string): NamedAggregation[] => {
 export const isVulnerabilitiesRootGroupingAggregation = (
   groupData: Record<string, any> | undefined
 ): groupData is VulnerabilitiesRootGroupingAggregation => {
-  return groupData?.unitsCount?.doc_count !== undefined;
+  return groupData?.unitsCount?.value !== undefined;
 };
 
 /**
@@ -133,7 +133,7 @@ export const useLatestVulnerabilitiesGrouping = ({
   const isEmptyResults =
     !isFetching &&
     isVulnerabilitiesRootGroupingAggregation(groupData) &&
-    !groupData.unitsCount?.value;
+    groupData.unitsCount?.value === 0;
 
   return {
     groupData,

From a72df4bd7cd237ee665ebe3e78cbd39fb893ba6a Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Fri, 5 Jan 2024 18:19:42 -0800
Subject: [PATCH 08/25] FTR tests

---
 .../page_objects/findings_page.ts             | 211 ++++--------------
 .../pages/index.ts                            |   2 +
 .../pages/vulnerabilities.ts                  | 183 +++++++++++++++
 .../pages/vulnerabilities_grouping.ts         | 163 ++++++++++++++
 4 files changed, 396 insertions(+), 163 deletions(-)
 create mode 100644 x-pack/test/cloud_security_posture_functional/pages/vulnerabilities.ts
 create mode 100644 x-pack/test/cloud_security_posture_functional/pages/vulnerabilities_grouping.ts

diff --git a/x-pack/test/cloud_security_posture_functional/page_objects/findings_page.ts b/x-pack/test/cloud_security_posture_functional/page_objects/findings_page.ts
index eb7ea675601548..7d5eb823886033 100644
--- a/x-pack/test/cloud_security_posture_functional/page_objects/findings_page.ts
+++ b/x-pack/test/cloud_security_posture_functional/page_objects/findings_page.ts
@@ -12,6 +12,10 @@ import type { FtrProviderContext } from '../ftr_provider_context';
 // Defined in CSP plugin
 const FINDINGS_INDEX = 'logs-cloud_security_posture.findings-default';
 const FINDINGS_LATEST_INDEX = 'logs-cloud_security_posture.findings_latest-default';
+export const VULNERABILITIES_INDEX_DEFAULT_NS =
+  'logs-cloud_security_posture.vulnerabilities-default';
+export const LATEST_VULNERABILITIES_INDEX_DEFAULT_NS =
+  'logs-cloud_security_posture.vulnerabilities_latest-default';
 
 export function FindingsPageProvider({ getService, getPageObjects }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
@@ -35,49 +39,49 @@ export function FindingsPageProvider({ getService, getPageObjects }: FtrProvider
       log.debug('CSP plugin is initialized');
     });
 
+  const deleteByQuery = async (index: string) => {
+    await es.deleteByQuery({
+      index,
+      query: {
+        match_all: {},
+      },
+      ignore_unavailable: true,
+      refresh: true,
+    });
+  };
+
+  const insertOperation = (index: string, findingsMock: Array<Record<string, unknown>>) => {
+    return findingsMock.flatMap((doc) => [{ index: { _index: index } }, doc]);
+  };
+
   const index = {
+    remove: () =>
+      Promise.all([deleteByQuery(FINDINGS_INDEX), deleteByQuery(FINDINGS_LATEST_INDEX)]),
+    add: async (findingsMock: Array<Record<string, unknown>>) => {
+      await es.bulk({
+        refresh: true,
+        operations: [
+          ...insertOperation(VULNERABILITIES_INDEX_DEFAULT_NS, findingsMock),
+          ...insertOperation(LATEST_VULNERABILITIES_INDEX_DEFAULT_NS, findingsMock),
+        ],
+      });
+    },
+  };
+
+  const vulnerabilitiesIndex = {
     remove: () =>
       Promise.all([
-        es.deleteByQuery({
-          index: FINDINGS_INDEX,
-          query: {
-            match_all: {},
-          },
-          ignore_unavailable: true,
-          refresh: true,
-        }),
-        es.deleteByQuery({
-          index: FINDINGS_LATEST_INDEX,
-          query: {
-            match_all: {},
-          },
-          ignore_unavailable: true,
-          refresh: true,
-        }),
+        deleteByQuery(VULNERABILITIES_INDEX_DEFAULT_NS),
+        deleteByQuery(LATEST_VULNERABILITIES_INDEX_DEFAULT_NS),
       ]),
     add: async (findingsMock: Array<Record<string, unknown>>) => {
-      await Promise.all([
-        ...findingsMock.map((finding) =>
-          es.index({
-            index: FINDINGS_INDEX,
-            body: {
-              ...finding,
-              '@timestamp': finding['@timestamp'] ?? new Date().toISOString(),
-            },
-            refresh: true,
-          })
-        ),
-        ...findingsMock.map((finding) =>
-          es.index({
-            index: FINDINGS_LATEST_INDEX,
-            body: {
-              ...finding,
-              '@timestamp': finding['@timestamp'] ?? new Date().toISOString(),
-            },
-            refresh: true,
-          })
-        ),
-      ]);
+      await es.bulk({
+        refresh: true,
+        operations: [
+          ...insertOperation(VULNERABILITIES_INDEX_DEFAULT_NS, findingsMock),
+          ...insertOperation(LATEST_VULNERABILITIES_INDEX_DEFAULT_NS, findingsMock),
+        ],
+      });
     },
   };
 
@@ -229,113 +233,6 @@ export function FindingsPageProvider({ getService, getPageObjects }: FtrProvider
     },
   });
 
-  const createTableObject = (tableTestSubject: string) => ({
-    getElement() {
-      return testSubjects.find(tableTestSubject);
-    },
-
-    async getHeaders() {
-      const element = await this.getElement();
-      return await element.findAllByCssSelector('thead tr :is(th,td)');
-    },
-
-    async getColumnIndex(columnName: string) {
-      const headers = await this.getHeaders();
-      const texts = await Promise.all(headers.map((header) => header.getVisibleText()));
-      const columnIndex = texts.findIndex((i) => i === columnName);
-      expect(columnIndex).to.be.greaterThan(-1);
-      return columnIndex + 1;
-    },
-
-    async getColumnHeaderCell(columnName: string) {
-      const headers = await this.getHeaders();
-      const headerIndexes = await Promise.all(headers.map((header) => header.getVisibleText()));
-      const columnIndex = headerIndexes.findIndex((i) => i === columnName);
-      return headers[columnIndex];
-    },
-
-    async getRowsCount() {
-      const element = await this.getElement();
-      const rows = await element.findAllByCssSelector('tbody tr');
-      return rows.length;
-    },
-
-    async getFindingsCount(type: 'passed' | 'failed') {
-      const element = await this.getElement();
-      const items = await element.findAllByCssSelector(`span[data-test-subj="${type}_finding"]`);
-      return items.length;
-    },
-
-    async getRowIndexForValue(columnName: string, value: string) {
-      const values = await this.getColumnValues(columnName);
-      const rowIndex = values.indexOf(value);
-      expect(rowIndex).to.be.greaterThan(-1);
-      return rowIndex + 1;
-    },
-
-    async getFilterElementButton(rowIndex: number, columnIndex: number, negated = false) {
-      const tableElement = await this.getElement();
-      const button = negated
-        ? 'findings_table_cell_add_negated_filter'
-        : 'findings_table_cell_add_filter';
-      const selector = `tbody tr:nth-child(${rowIndex}) td:nth-child(${columnIndex}) button[data-test-subj="${button}"]`;
-      return tableElement.findByCssSelector(selector);
-    },
-
-    async addCellFilter(columnName: string, cellValue: string, negated = false) {
-      const columnIndex = await this.getColumnIndex(columnName);
-      const rowIndex = await this.getRowIndexForValue(columnName, cellValue);
-      const filterElement = await this.getFilterElementButton(rowIndex, columnIndex, negated);
-      await filterElement.click();
-    },
-
-    async getColumnValues(columnName: string) {
-      const elementsWithNoFilterCell = ['CIS Section', '@timestamp'];
-      const tableElement = await this.getElement();
-      const columnIndex = await this.getColumnIndex(columnName);
-      const selector = elementsWithNoFilterCell.includes(columnName)
-        ? `tbody tr td:nth-child(${columnIndex})`
-        : `tbody tr td:nth-child(${columnIndex}) div[data-test-subj="filter_cell_value"]`;
-      const columnCells = await tableElement.findAllByCssSelector(selector);
-
-      return await Promise.all(columnCells.map((cell) => cell.getVisibleText()));
-    },
-
-    async hasColumnValue(columnName: string, value: string) {
-      const values = await this.getColumnValues(columnName);
-      return values.includes(value);
-    },
-
-    async toggleColumnSort(columnName: string, direction: 'asc' | 'desc') {
-      const element = await this.getColumnHeaderCell(columnName);
-      const currentSort = await element.getAttribute('aria-sort');
-      if (currentSort === 'none') {
-        // a click is needed to focus on Eui column header
-        await element.click();
-
-        // default is ascending
-        if (direction === 'desc') {
-          const nonStaleElement = await this.getColumnHeaderCell(columnName);
-          await nonStaleElement.click();
-        }
-      }
-      if (
-        (currentSort === 'ascending' && direction === 'desc') ||
-        (currentSort === 'descending' && direction === 'asc')
-      ) {
-        // Without getting the element again, the click throws an error (stale element reference)
-        const nonStaleElement = await this.getColumnHeaderCell(columnName);
-        await nonStaleElement.click();
-      }
-    },
-
-    async openFlyoutAt(rowIndex: number) {
-      const table = await this.getElement();
-      const flyoutButton = await table.findAllByTestSubject('findings_table_expand_column');
-      await flyoutButton[rowIndex].click();
-    },
-  });
-
   const navigateToLatestFindingsPage = async () => {
     await PageObjects.common.navigateToUrl(
       'securitySolution', // Defined in Security Solution plugin
@@ -344,7 +241,7 @@ export function FindingsPageProvider({ getService, getPageObjects }: FtrProvider
     );
   };
 
-  const navigateToVulnerabilities = async () => {
+  const navigateToLatestVulnerabilitiesPage = async () => {
     await PageObjects.common.navigateToUrl(
       'securitySolution', // Defined in Security Solution plugin
       'cloud_security_posture/findings/vulnerabilities',
@@ -361,20 +258,8 @@ export function FindingsPageProvider({ getService, getPageObjects }: FtrProvider
   };
 
   const latestFindingsTable = createDataTableObject('latest_findings_table');
-  const resourceFindingsTable = createTableObject('resource_findings_table');
-  const findingsByResourceTable = {
-    ...createTableObject('findings_by_resource_table'),
-    async clickResourceIdLink(resourceId: string, sectionName: string) {
-      const table = await this.getElement();
-      const row = await table.findByCssSelector(
-        `[data-test-subj="findings_resource_table_row_${resourceId}/${sectionName}"]`
-      );
-      const link = await row.findByCssSelector(
-        '[data-test-subj="findings_by_resource_table_resource_id_column"'
-      );
-      await link.click();
-    },
-  };
+  const latestVulnerabilitiesTable = createDataTableObject('latest_vulnerabilities_table');
+
   const notInstalledVulnerabilities = createNotInstalledObject('cnvm-integration-not-installed');
   const notInstalledCSP = createNotInstalledObject('cloud_posture_page_package_not_installed');
 
@@ -463,14 +348,14 @@ export function FindingsPageProvider({ getService, getPageObjects }: FtrProvider
 
   return {
     navigateToLatestFindingsPage,
-    navigateToVulnerabilities,
+    navigateToLatestVulnerabilitiesPage,
     navigateToMisconfigurations,
     latestFindingsTable,
-    resourceFindingsTable,
-    findingsByResourceTable,
+    latestVulnerabilitiesTable,
     notInstalledVulnerabilities,
     notInstalledCSP,
     index,
+    vulnerabilitiesIndex,
     waitForPluginInitialized,
     distributionBar,
     vulnerabilityDataGrid,
diff --git a/x-pack/test/cloud_security_posture_functional/pages/index.ts b/x-pack/test/cloud_security_posture_functional/pages/index.ts
index 9da8cbbeeed541..f4039dc08466f5 100644
--- a/x-pack/test/cloud_security_posture_functional/pages/index.ts
+++ b/x-pack/test/cloud_security_posture_functional/pages/index.ts
@@ -18,5 +18,7 @@ export default function ({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./vulnerability_dashboard'));
     loadTestFile(require.resolve('./cis_integration'));
     loadTestFile(require.resolve('./findings_old_data'));
+    loadTestFile(require.resolve('./vulnerabilities'));
+    loadTestFile(require.resolve('./vulnerabilities_grouping'));
   });
 }
diff --git a/x-pack/test/cloud_security_posture_functional/pages/vulnerabilities.ts b/x-pack/test/cloud_security_posture_functional/pages/vulnerabilities.ts
new file mode 100644
index 00000000000000..d882d1765f752d
--- /dev/null
+++ b/x-pack/test/cloud_security_posture_functional/pages/vulnerabilities.ts
@@ -0,0 +1,183 @@
+/*
+ * 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 expect from '@kbn/expect';
+import type { FtrProviderContext } from '../ftr_provider_context';
+import { vulnerabilitiesLatestMock } from '../mocks/vulnerabilities_latest_mock';
+
+// eslint-disable-next-line import/no-default-export
+export default function ({ getPageObjects, getService }: FtrProviderContext) {
+  const queryBar = getService('queryBar');
+  const filterBar = getService('filterBar');
+  const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
+  const pageObjects = getPageObjects(['common', 'findings', 'header']);
+
+  const resourceName1 = 'name-ng-1-Node';
+  const resourceName2 = 'othername-june12-8-8-0-1';
+
+  describe('Vulnerabilities Page - DataTable', function () {
+    this.tags(['cloud_security_posture_vulnerabilities']);
+    let findings: typeof pageObjects.findings;
+    let latestVulnerabilitiesTable: typeof findings.latestVulnerabilitiesTable;
+
+    before(async () => {
+      findings = pageObjects.findings;
+      latestVulnerabilitiesTable = findings.latestVulnerabilitiesTable;
+
+      // Before we start any test we must wait for cloud_security_posture plugin to complete its initialization
+      await findings.waitForPluginInitialized();
+
+      // Prepare mocked findings
+      await findings.vulnerabilitiesIndex.remove();
+      await findings.vulnerabilitiesIndex.add(vulnerabilitiesLatestMock);
+
+      await findings.navigateToLatestVulnerabilitiesPage();
+      await retry.waitFor(
+        'Findings table to be loaded',
+        async () =>
+          (await latestVulnerabilitiesTable.getRowsCount()) === vulnerabilitiesLatestMock.length
+      );
+      pageObjects.header.waitUntilLoadingHasFinished();
+    });
+
+    after(async () => {
+      await findings.vulnerabilitiesIndex.remove();
+    });
+
+    describe('SearchBar', () => {
+      it('add filter', async () => {
+        // Filter bar uses the field's customLabel in the DataView
+        await filterBar.addFilter({
+          field: 'Resource Name',
+          operation: 'is',
+          value: resourceName1,
+        });
+
+        expect(await filterBar.hasFilter('resource.name', resourceName1)).to.be(true);
+        expect(
+          await latestVulnerabilitiesTable.hasColumnValue('resource.name', resourceName1)
+        ).to.be(true);
+      });
+
+      it('remove filter', async () => {
+        await filterBar.removeFilter('resource.name');
+
+        expect(await filterBar.hasFilter('resource.name', resourceName1)).to.be(false);
+        expect(await latestVulnerabilitiesTable.getRowsCount()).to.be(
+          vulnerabilitiesLatestMock.length
+        );
+      });
+
+      it('set search query', async () => {
+        await queryBar.setQuery(resourceName1);
+        await queryBar.submitQuery();
+
+        expect(
+          await latestVulnerabilitiesTable.hasColumnValue('resource.name', resourceName1)
+        ).to.be(true);
+        expect(
+          await latestVulnerabilitiesTable.hasColumnValue('resource.name', resourceName2)
+        ).to.be(false);
+
+        await queryBar.setQuery('');
+        await queryBar.submitQuery();
+
+        expect(await latestVulnerabilitiesTable.getRowsCount()).to.be(
+          vulnerabilitiesLatestMock.length
+        );
+      });
+    });
+
+    describe('DataTable features', () => {
+      it('Edit data view field option is Enabled', async () => {
+        await latestVulnerabilitiesTable.toggleEditDataViewFieldsOption('vulnerability.id');
+        expect(await testSubjects.find('gridEditFieldButton')).to.be.ok();
+        await latestVulnerabilitiesTable.toggleEditDataViewFieldsOption('vulnerability.id');
+      });
+    });
+
+    describe('Vulnerabilities - Fields selector', () => {
+      const CSP_FIELDS_SELECTOR_MODAL = 'cloudSecurityFieldsSelectorModal';
+      const CSP_FIELDS_SELECTOR_OPEN_BUTTON = 'cloudSecurityFieldsSelectorOpenButton';
+      const CSP_FIELDS_SELECTOR_RESET_BUTTON = 'cloudSecurityFieldsSelectorResetButton';
+      const CSP_FIELDS_SELECTOR_CLOSE_BUTTON = 'cloudSecurityFieldsSelectorCloseButton';
+
+      it('Add fields to the Vulnerabilities DataTable', async () => {
+        const fieldsButton = await testSubjects.find(CSP_FIELDS_SELECTOR_OPEN_BUTTON);
+        await fieldsButton.click();
+        await testSubjects.existOrFail(CSP_FIELDS_SELECTOR_MODAL);
+
+        const agentIdCheckbox = await testSubjects.find(
+          'cloud-security-fields-selector-item-agent.id'
+        );
+        await agentIdCheckbox.click();
+
+        const agentNameCheckbox = await testSubjects.find(
+          'cloud-security-fields-selector-item-agent.name'
+        );
+        await agentNameCheckbox.click();
+
+        await testSubjects.existOrFail('dataGridHeaderCell-agent.id');
+        await testSubjects.existOrFail('dataGridHeaderCell-agent.name');
+
+        const closeFieldsButton = await testSubjects.find(CSP_FIELDS_SELECTOR_CLOSE_BUTTON);
+        await closeFieldsButton.click();
+        await testSubjects.missingOrFail(CSP_FIELDS_SELECTOR_MODAL);
+      });
+
+      it('Remove fields from the Vulnerabilities DataTable', async () => {
+        const fieldsButton = await testSubjects.find(CSP_FIELDS_SELECTOR_OPEN_BUTTON);
+        await fieldsButton.click();
+
+        const agentIdCheckbox = await testSubjects.find(
+          'cloud-security-fields-selector-item-agent.id'
+        );
+        await agentIdCheckbox.click();
+
+        const agentNameCheckbox = await testSubjects.find(
+          'cloud-security-fields-selector-item-agent.name'
+        );
+        await agentNameCheckbox.click();
+
+        await testSubjects.missingOrFail('dataGridHeaderCell-agent.id');
+        await testSubjects.missingOrFail('dataGridHeaderCell-agent.name');
+
+        const closeFieldsButton = await testSubjects.find(CSP_FIELDS_SELECTOR_CLOSE_BUTTON);
+        await closeFieldsButton.click();
+        await testSubjects.missingOrFail(CSP_FIELDS_SELECTOR_MODAL);
+      });
+      it('Reset fields to default', async () => {
+        const fieldsButton = await testSubjects.find(CSP_FIELDS_SELECTOR_OPEN_BUTTON);
+        await fieldsButton.click();
+
+        const agentIdCheckbox = await testSubjects.find(
+          'cloud-security-fields-selector-item-agent.id'
+        );
+        await agentIdCheckbox.click();
+
+        const agentNameCheckbox = await testSubjects.find(
+          'cloud-security-fields-selector-item-agent.name'
+        );
+        await agentNameCheckbox.click();
+
+        await testSubjects.existOrFail('dataGridHeaderCell-agent.id');
+        await testSubjects.existOrFail('dataGridHeaderCell-agent.name');
+
+        const resetFieldsButton = await testSubjects.find(CSP_FIELDS_SELECTOR_RESET_BUTTON);
+        await resetFieldsButton.click();
+
+        await testSubjects.missingOrFail('dataGridHeaderCell-agent.id');
+        await testSubjects.missingOrFail('dataGridHeaderCell-agent.name');
+
+        const closeFieldsButton = await testSubjects.find(CSP_FIELDS_SELECTOR_CLOSE_BUTTON);
+        await closeFieldsButton.click();
+        await testSubjects.missingOrFail(CSP_FIELDS_SELECTOR_MODAL);
+      });
+    });
+  });
+}
diff --git a/x-pack/test/cloud_security_posture_functional/pages/vulnerabilities_grouping.ts b/x-pack/test/cloud_security_posture_functional/pages/vulnerabilities_grouping.ts
new file mode 100644
index 00000000000000..05fd8560253816
--- /dev/null
+++ b/x-pack/test/cloud_security_posture_functional/pages/vulnerabilities_grouping.ts
@@ -0,0 +1,163 @@
+/*
+ * 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 expect from '@kbn/expect';
+import { asyncForEach } from '@kbn/std';
+import type { FtrProviderContext } from '../ftr_provider_context';
+import { vulnerabilitiesLatestMock } from '../mocks/vulnerabilities_latest_mock';
+
+// eslint-disable-next-line import/no-default-export
+export default function ({ getPageObjects, getService }: FtrProviderContext) {
+  const queryBar = getService('queryBar');
+  const filterBar = getService('filterBar');
+  const pageObjects = getPageObjects(['common', 'findings', 'header']);
+
+  const resourceName1 = 'name-ng-1-Node';
+  const resourceName2 = 'othername-june12-8-8-0-1';
+
+  describe('Vulnerabilities Page - Grouping', function () {
+    this.tags(['cloud_security_posture_findings_grouping']);
+    let findings: typeof pageObjects.findings;
+
+    before(async () => {
+      findings = pageObjects.findings;
+
+      // Before we start any test we must wait for cloud_security_posture plugin to complete its initialization
+      await findings.waitForPluginInitialized();
+
+      // Prepare mocked findings
+      await findings.vulnerabilitiesIndex.remove();
+      await findings.vulnerabilitiesIndex.add(vulnerabilitiesLatestMock);
+
+      await findings.navigateToLatestVulnerabilitiesPage();
+      await pageObjects.header.waitUntilLoadingHasFinished();
+    });
+
+    after(async () => {
+      const groupSelector = await findings.groupSelector();
+      await groupSelector.openDropDown();
+      await groupSelector.setValue('None');
+      await findings.vulnerabilitiesIndex.remove();
+    });
+
+    describe('Default Grouping', async () => {
+      it('groups vulnerabilities by resource and sort by compliance score desc', async () => {
+        const groupSelector = await findings.groupSelector();
+        await groupSelector.openDropDown();
+        await groupSelector.setValue('Resource');
+
+        const grouping = await findings.findingsGrouping();
+
+        const resourceOrder = [
+          {
+            resourceName: resourceName1,
+            resourceId: vulnerabilitiesLatestMock[0].resource.id,
+            findingsCount: '1',
+          },
+          {
+            resourceName: resourceName2,
+            resourceId: vulnerabilitiesLatestMock[1].resource.id,
+            findingsCount: '1',
+          },
+        ];
+
+        await asyncForEach(
+          resourceOrder,
+          async ({ resourceName, resourceId, findingsCount }, index) => {
+            const groupRow = await grouping.getRowAtIndex(index);
+            expect(await groupRow.getVisibleText()).to.contain(resourceName);
+            expect(await groupRow.getVisibleText()).to.contain(resourceId);
+            expect(
+              await (
+                await groupRow.findByTestSubject('vulnerabilities_grouping_counter')
+              ).getVisibleText()
+            ).to.be(findingsCount);
+          }
+        );
+
+        const groupCount = await grouping.getGroupCount();
+        expect(groupCount).to.be('2 groups');
+
+        const unitCount = await grouping.getUnitCount();
+        expect(unitCount).to.be('2 vulnerabilities');
+      });
+    });
+    describe('SearchBar', () => {
+      it('add filter', async () => {
+        const groupSelector = await findings.groupSelector();
+        await groupSelector.setValue('Resource');
+
+        // Filter bar uses the field's customLabel in the DataView
+        await filterBar.addFilter({
+          field: 'Resource Name',
+          operation: 'is',
+          value: resourceName1,
+        });
+        expect(await filterBar.hasFilter('resource.name', resourceName1)).to.be(true);
+
+        const grouping = await findings.findingsGrouping();
+
+        const groupRow = await grouping.getRowAtIndex(0);
+        expect(await groupRow.getVisibleText()).to.contain(resourceName1);
+
+        const groupCount = await grouping.getGroupCount();
+        expect(groupCount).to.be('1 group');
+
+        const unitCount = await grouping.getUnitCount();
+        expect(unitCount).to.be('1 vulnerability');
+      });
+
+      it('remove filter', async () => {
+        await filterBar.removeFilter('resource.name');
+
+        expect(await filterBar.hasFilter('resource.name', resourceName1)).to.be(false);
+
+        const grouping = await findings.findingsGrouping();
+        const groupCount = await grouping.getGroupCount();
+        expect(groupCount).to.be('2 groups');
+
+        const unitCount = await grouping.getUnitCount();
+        expect(unitCount).to.be('2 vulnerabilities');
+      });
+
+      it('set search query', async () => {
+        await queryBar.setQuery(resourceName1);
+        await queryBar.submitQuery();
+
+        const grouping = await findings.findingsGrouping();
+
+        const groupRow = await grouping.getRowAtIndex(0);
+        expect(await groupRow.getVisibleText()).to.contain(resourceName1);
+
+        const groupCount = await grouping.getGroupCount();
+        expect(groupCount).to.be('1 group');
+
+        const unitCount = await grouping.getUnitCount();
+        expect(unitCount).to.be('1 finding');
+
+        await queryBar.setQuery('');
+        await queryBar.submitQuery();
+
+        expect(await grouping.getGroupCount()).to.be('2 groups');
+        expect(await grouping.getUnitCount()).to.be('2 vulnerabilities');
+      });
+    });
+
+    describe('Group table', async () => {
+      it('shows vulnerabilities table when expanding', async () => {
+        const grouping = await findings.findingsGrouping();
+        const firstRow = await grouping.getRowAtIndex(0);
+        await (await firstRow.findByCssSelector('button')).click();
+        const latestFindingsTable = findings.createDataTableObject('latest_vulnerabilities_table');
+        expect(await latestFindingsTable.getRowsCount()).to.be(1);
+        expect(await latestFindingsTable.hasColumnValue('resource.name', resourceName1)).to.be(
+          true
+        );
+      });
+    });
+  });
+}

From 0a3b17d43781b9c5888daf9fa5caff1e62a7f27a Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Tue, 9 Jan 2024 12:01:50 -0800
Subject: [PATCH 09/25] fixing unit tests / removing unused

---
 .../cloud_security_data_table.test.tsx        |  23 +-
 .../public/pages/vulnerabilities/constants.ts |   5 +-
 ...vulnerabilities_grid_cell_actions.test.tsx | 189 -----------
 .../get_vulnerabilities_grid_cell_actions.tsx | 166 ----------
 .../vulnerabilities_by_resource.mock.ts       |  35 --
 .../test_subjects.ts                          |   8 -
 .../vulnerabilities_by_resource.test.tsx      |  83 -----
 .../vulnerabilities_by_resource.tsx           | 309 ------------------
 ...lnerabilities_by_resource_table_columns.ts |  86 -----
 .../vulnerability_finding_flyout.test.tsx     |   6 +-
 .../vulnerabilities_table_columns.ts          | 113 -------
 11 files changed, 19 insertions(+), 1004 deletions(-)
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/utils/get_vulnerabilities_grid_cell_actions.test.tsx
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/utils/get_vulnerabilities_grid_cell_actions.tsx
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/__mocks__/vulnerabilities_by_resource.mock.ts
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/test_subjects.ts
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/vulnerabilities_by_resource.test.tsx
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/vulnerabilities_by_resource.tsx
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/vulnerabilities_by_resource_table_columns.ts
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_table_columns.ts

diff --git a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_data_table/cloud_security_data_table.test.tsx b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_data_table/cloud_security_data_table.test.tsx
index 7ddbe28a7da077..d775d567acb4e9 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_data_table/cloud_security_data_table.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_data_table/cloud_security_data_table.test.tsx
@@ -6,6 +6,8 @@
  */
 import { render } from '@testing-library/react';
 import React from 'react';
+import { act } from 'react-dom/test-utils';
+import { DataViewContext } from '../../common/contexts/data_view_context';
 import { TestProvider } from '../../test/test_provider';
 import { CloudSecurityDataTable, CloudSecurityDataTableProps } from './cloud_security_data_table';
 
@@ -47,7 +49,6 @@ const mockCloudPostureDataTable = {
 
 const renderDataTable = (props: Partial<CloudSecurityDataTableProps> = {}) => {
   const defaultProps: CloudSecurityDataTableProps = {
-    dataView: mockDataView,
     isLoading: false,
     defaultColumns: mockDefaultColumns,
     rows: [],
@@ -60,7 +61,9 @@ const renderDataTable = (props: Partial<CloudSecurityDataTableProps> = {}) => {
 
   return render(
     <TestProvider>
-      <CloudSecurityDataTable {...defaultProps} {...props} />
+      <DataViewContext.Provider value={{ dataView: mockDataView }}>
+        <CloudSecurityDataTable {...defaultProps} {...props} />
+      </DataViewContext.Provider>
     </TestProvider>
   );
 };
@@ -90,13 +93,15 @@ describe('CloudSecurityDataTable', () => {
         },
       },
     ] as any;
-    const { getByTestId, getByText } = renderDataTable({
-      rows: mockRows,
-      total: mockRows.length,
-    });
+    act(() => {
+      const { getByTestId, getByText } = renderDataTable({
+        rows: mockRows,
+        total: mockRows.length,
+      });
 
-    expect(getByTestId('discoverDocTable')).toBeInTheDocument();
-    expect(getByText('Label 1')).toBeInTheDocument();
-    expect(getByText('Label 2')).toBeInTheDocument();
+      expect(getByTestId('discoverDocTable')).toBeInTheDocument();
+      expect(getByText('Label 1')).toBeInTheDocument();
+      expect(getByText('Label 2')).toBeInTheDocument();
+    });
   });
 });
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
index c4f3106c7a6ec7..21977c2eae1b85 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
@@ -9,7 +9,6 @@ import { GroupOption } from '@kbn/securitysolution-grouping';
 import { FindingsBaseURLQuery } from '../../common/types';
 import { CloudSecurityDefaultColumn } from '../../components/cloud_security_data_table';
 import { GROUPING_LABELS } from './translations';
-import { vulnerabilitiesColumns } from './vulnerabilities_table_columns';
 
 export const DEFAULT_TABLE_HEIGHT = 512;
 
@@ -33,8 +32,8 @@ export const getDefaultQuery = ({
   query,
   filters,
   sort: [
-    [vulnerabilitiesColumns.severity, 'desc'],
-    [vulnerabilitiesColumns.cvss, 'desc'],
+    ['vulnerability.severity', 'desc'],
+    ['vulnerability.score.base', 'desc'],
   ],
 });
 
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/utils/get_vulnerabilities_grid_cell_actions.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/utils/get_vulnerabilities_grid_cell_actions.test.tsx
deleted file mode 100644
index 1f84f294d8be1f..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/utils/get_vulnerabilities_grid_cell_actions.test.tsx
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * 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 { getRowValueByColumnId } from './get_vulnerabilities_grid_cell_actions';
-import { vulnerabilitiesColumns } from '../vulnerabilities_table_columns';
-import { vulnerabilitiesByResourceColumns } from '../vulnerabilities_by_resource/vulnerabilities_by_resource_table_columns';
-import { CspVulnerabilityFinding } from '../../../../common/schemas';
-
-describe('getRowValueByColumnId', () => {
-  it('should return vulnerability id', () => {
-    const vulnerabilityRow = {
-      vulnerability: {
-        id: 'CVE-2017-1000117',
-      },
-    };
-    const columns = vulnerabilitiesColumns;
-    const columnId = columns.vulnerability;
-
-    expect(
-      getRowValueByColumnId(vulnerabilityRow as Partial<CspVulnerabilityFinding>, columns, columnId)
-    ).toEqual('CVE-2017-1000117');
-  });
-
-  it('should return base as a vulnerability score', () => {
-    const vulnerabilityRow = {
-      vulnerability: {
-        score: {
-          base: 5,
-          version: 'v1',
-        },
-      },
-    };
-    const columns = vulnerabilitiesColumns;
-    const columnId = columns.cvss;
-
-    expect(
-      getRowValueByColumnId(vulnerabilityRow as Partial<CspVulnerabilityFinding>, columns, columnId)
-    ).toEqual(5);
-  });
-
-  it('should return undefined when no base score is available', () => {
-    const vulnerabilityRow = {
-      vulnerability: {},
-    };
-    const columns = vulnerabilitiesColumns;
-    const columnId = columns.cvss;
-
-    expect(
-      getRowValueByColumnId(vulnerabilityRow as Partial<CspVulnerabilityFinding>, columns, columnId)
-    ).toEqual(undefined);
-
-    const vulnerabilityRow2 = {
-      vulnerability: {
-        score: {
-          version: 'v1',
-        },
-      },
-    };
-
-    expect(
-      getRowValueByColumnId(
-        vulnerabilityRow2 as Partial<CspVulnerabilityFinding>,
-        columns,
-        columnId
-      )
-    ).toEqual(undefined);
-  });
-
-  it('should return resource id', () => {
-    const vulnerabilityRow = {
-      resource: {
-        id: 'i-1234567890abcdef0',
-      },
-    };
-    const columns = vulnerabilitiesByResourceColumns;
-    const columnId = columns.resourceId;
-
-    expect(
-      getRowValueByColumnId(vulnerabilityRow as Partial<CspVulnerabilityFinding>, columns, columnId)
-    ).toEqual('i-1234567890abcdef0');
-  });
-
-  it('should return resource name', () => {
-    const vulnerabilityRow = {
-      resource: {
-        name: 'test',
-      },
-    };
-    const columns1 = vulnerabilitiesByResourceColumns;
-    const columns2 = vulnerabilitiesColumns;
-    const columnId1 = columns1.resourceName;
-    const columnId2 = columns2.resourceName;
-
-    expect(
-      getRowValueByColumnId(
-        vulnerabilityRow as Partial<CspVulnerabilityFinding>,
-        columns1,
-        columnId1
-      )
-    ).toEqual('test');
-    expect(
-      getRowValueByColumnId(
-        vulnerabilityRow as Partial<CspVulnerabilityFinding>,
-        columns2,
-        columnId2
-      )
-    ).toEqual('test');
-  });
-
-  it('should return vulnerability severity', () => {
-    const vulnerabilityRow = {
-      vulnerability: {
-        severity: 'high',
-      },
-    };
-    const columns = vulnerabilitiesColumns;
-    const columnId = columns.severity;
-
-    expect(
-      getRowValueByColumnId(vulnerabilityRow as Partial<CspVulnerabilityFinding>, columns, columnId)
-    ).toEqual('high');
-  });
-
-  it('should return package fields', () => {
-    const vulnerabilityRow = {
-      package: {
-        name: 'test',
-        version: '1.0.0',
-        fixed_version: '1.0.1',
-      },
-    };
-    const columns1 = vulnerabilitiesColumns;
-    const columnId1 = columns1.package;
-    const columnId2 = columns1.version;
-    const columnId3 = columns1.fixedVersion;
-
-    expect(
-      getRowValueByColumnId(
-        vulnerabilityRow as Partial<CspVulnerabilityFinding>,
-        columns1,
-        columnId1
-      )
-    ).toEqual('test');
-    expect(
-      getRowValueByColumnId(
-        vulnerabilityRow as Partial<CspVulnerabilityFinding>,
-        columns1,
-        columnId2
-      )
-    ).toEqual('1.0.0');
-    expect(
-      getRowValueByColumnId(
-        vulnerabilityRow as Partial<CspVulnerabilityFinding>,
-        columns1,
-        columnId3
-      )
-    ).toEqual('1.0.1');
-  });
-
-  it('should return undefined is package is missing', () => {
-    const vulnerabilityRow = {
-      vulnerability: {},
-    };
-    const columns = vulnerabilitiesColumns;
-    const columnId = columns.package;
-
-    expect(
-      getRowValueByColumnId(vulnerabilityRow as Partial<CspVulnerabilityFinding>, columns, columnId)
-    ).toEqual(undefined);
-  });
-
-  it('should return cloud region', () => {
-    const vulnerabilityRow = {
-      cloud: {
-        region: 'us-east-1',
-      },
-    };
-    const columns = vulnerabilitiesByResourceColumns;
-    const columnId = columns.region;
-
-    expect(
-      getRowValueByColumnId(vulnerabilityRow as Partial<CspVulnerabilityFinding>, columns, columnId)
-    ).toEqual('us-east-1');
-  });
-});
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/utils/get_vulnerabilities_grid_cell_actions.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/utils/get_vulnerabilities_grid_cell_actions.tsx
deleted file mode 100644
index dbde094d6f43bf..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/utils/get_vulnerabilities_grid_cell_actions.tsx
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * 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 React from 'react';
-import { EuiDataGridColumn, EuiDataGridColumnCellAction, EuiToolTip } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { CspVulnerabilityFinding } from '../../../../common/schemas';
-import { getFilters } from './get_filters';
-import { FILTER_IN, FILTER_OUT } from '../translations';
-
-export const getRowValueByColumnId = (
-  vulnerabilityRow: Partial<CspVulnerabilityFinding>,
-  columns: Record<string, string>,
-  columnId: string
-) => {
-  if (columnId === columns.vulnerability) {
-    return vulnerabilityRow.vulnerability?.id;
-  }
-  if (columnId === columns.cvss) {
-    return vulnerabilityRow.vulnerability?.score?.base;
-  }
-  if (columnId === columns.resourceId) {
-    return vulnerabilityRow.resource?.id;
-  }
-  if (columnId === columns.resourceName) {
-    return vulnerabilityRow.resource?.name;
-  }
-  if (columnId === columns.severity) {
-    return vulnerabilityRow.vulnerability?.severity;
-  }
-  if (columnId === columns.package) {
-    return vulnerabilityRow.package?.name;
-  }
-  if (columnId === columns.version) {
-    return vulnerabilityRow.package?.version;
-  }
-  if (columnId === columns.fixedVersion) {
-    return vulnerabilityRow.package?.fixed_version;
-  }
-  if (columnId === columns.region) {
-    return vulnerabilityRow.cloud?.region;
-  }
-};
-
-export const getVulnerabilitiesGridCellActions = <
-  T extends Array<Partial<CspVulnerabilityFinding>>
->({
-  data,
-  columns,
-  columnGridFn,
-  pageSize,
-  setUrlQuery,
-  filters,
-  dataView,
-}: {
-  data: T;
-  columns: Record<string, string>;
-  columnGridFn: (cellActions: EuiDataGridColumnCellAction[]) => EuiDataGridColumn[];
-  pageSize: number;
-  setUrlQuery: (query: any) => void;
-  filters: any;
-  dataView: any;
-}) => {
-  const getColumnIdValue = (rowIndex: number, columnId: string) => {
-    const vulnerabilityRow = data[rowIndex];
-    if (!vulnerabilityRow) return null;
-
-    return getRowValueByColumnId(vulnerabilityRow, columns, columnId);
-  };
-
-  const cellActions: EuiDataGridColumnCellAction[] = [
-    ({ Component, rowIndex, columnId }) => {
-      const rowIndexFromPage = rowIndex > pageSize - 1 ? rowIndex % pageSize : rowIndex;
-
-      const value = getColumnIdValue(rowIndexFromPage, columnId);
-
-      if (!value) return null;
-      return (
-        <EuiToolTip
-          position="top"
-          content={i18n.translate(
-            'xpack.csp.vulnerabilities.vulnerabilitiesTableCell.addFilterButtonTooltip',
-            {
-              defaultMessage: 'Add {columnId} filter',
-              values: { columnId },
-            }
-          )}
-        >
-          <Component
-            iconType="plusInCircle"
-            aria-label={i18n.translate(
-              'xpack.csp.vulnerabilities.vulnerabilitiesTableCell.addFilterButton',
-              {
-                defaultMessage: 'Add {columnId} filter',
-                values: { columnId },
-              }
-            )}
-            onClick={() => {
-              setUrlQuery({
-                pageIndex: 0,
-                filters: getFilters({
-                  filters,
-                  dataView,
-                  field: columnId,
-                  value,
-                  negate: false,
-                }),
-              });
-            }}
-          >
-            {FILTER_IN}
-          </Component>
-        </EuiToolTip>
-      );
-    },
-    ({ Component, rowIndex, columnId }) => {
-      const rowIndexFromPage = rowIndex > pageSize - 1 ? rowIndex % pageSize : rowIndex;
-
-      const value = getColumnIdValue(rowIndexFromPage, columnId);
-
-      if (!value) return null;
-      return (
-        <EuiToolTip
-          position="top"
-          content={i18n.translate(
-            'xpack.csp.vulnerabilities.vulnerabilitiesTableCell.addNegatedFilterButtonTooltip',
-            {
-              defaultMessage: 'Add {columnId} negated filter',
-              values: { columnId },
-            }
-          )}
-        >
-          <Component
-            iconType="minusInCircle"
-            aria-label={i18n.translate(
-              'xpack.csp.vulnerabilities.vulnerabilitiesTableCell.addNegateFilterButton',
-              {
-                defaultMessage: 'Add {columnId} negated filter',
-                values: { columnId },
-              }
-            )}
-            onClick={() => {
-              setUrlQuery({
-                pageIndex: 0,
-                filters: getFilters({
-                  filters,
-                  dataView,
-                  field: columnId,
-                  value,
-                  negate: true,
-                }),
-              });
-            }}
-          >
-            {FILTER_OUT}
-          </Component>
-        </EuiToolTip>
-      );
-    },
-  ];
-
-  return columnGridFn(cellActions);
-};
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/__mocks__/vulnerabilities_by_resource.mock.ts b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/__mocks__/vulnerabilities_by_resource.mock.ts
deleted file mode 100644
index 4ad13e2d215a1e..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/__mocks__/vulnerabilities_by_resource.mock.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- */
-
-export const getVulnerabilitiesByResourceData = () => ({
-  total: 2,
-  total_vulnerabilities: 8,
-  page: [
-    {
-      resource: { id: 'resource-id-1', name: 'resource-test-1' },
-      cloud: { region: 'us-test-1' },
-      vulnerabilities_count: 4,
-      severity_map: {
-        critical: 1,
-        high: 1,
-        medium: 1,
-        low: 1,
-      },
-    },
-    {
-      resource: { id: 'resource-id-2', name: 'resource-test-2' },
-      cloud: { region: 'us-test-1' },
-      vulnerabilities_count: 4,
-      severity_map: {
-        critical: 1,
-        high: 1,
-        medium: 1,
-        low: 1,
-      },
-    },
-  ],
-});
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/test_subjects.ts b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/test_subjects.ts
deleted file mode 100644
index 027b0b1cdb2edb..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/test_subjects.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * 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.
- */
-
-export const VULNERABILITY_RESOURCE_COUNT = 'vulnerability_resource_count';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/vulnerabilities_by_resource.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/vulnerabilities_by_resource.test.tsx
deleted file mode 100644
index bd3fb0913bc3e4..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/vulnerabilities_by_resource.test.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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 React from 'react';
-import { render, screen } from '@testing-library/react';
-import { VulnerabilitiesByResource } from './vulnerabilities_by_resource';
-import { TestProvider } from '../../../test/test_provider';
-import { useLatestVulnerabilitiesByResource } from '../hooks/use_latest_vulnerabilities_by_resource';
-import { VULNERABILITY_RESOURCE_COUNT } from './test_subjects';
-import { getVulnerabilitiesByResourceData } from './__mocks__/vulnerabilities_by_resource.mock';
-
-jest.mock('../hooks/use_latest_vulnerabilities_by_resource', () => ({
-  useLatestVulnerabilitiesByResource: jest.fn(),
-}));
-
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
-describe('VulnerabilitiesByResource', () => {
-  const dataView: any = {};
-
-  const renderVulnerabilityByResource = () => {
-    return render(
-      <TestProvider>
-        <VulnerabilitiesByResource dataView={dataView} />
-      </TestProvider>
-    );
-  };
-
-  it('renders the loading state', () => {
-    (useLatestVulnerabilitiesByResource as jest.Mock).mockReturnValue({
-      data: undefined,
-      isLoading: true,
-      isFetching: true,
-    });
-    renderVulnerabilityByResource();
-    expect(screen.getByText(/loading/i)).toBeInTheDocument();
-  });
-  it('renders the no data state', () => {
-    (useLatestVulnerabilitiesByResource as jest.Mock).mockReturnValue({
-      data: undefined,
-      isLoading: false,
-      isFetching: false,
-    });
-
-    renderVulnerabilityByResource();
-    expect(screen.getByText(/no data/i)).toBeInTheDocument();
-  });
-
-  it('renders the empty state component', () => {
-    (useLatestVulnerabilitiesByResource as jest.Mock).mockReturnValue({
-      data: { total: 0, total_vulnerabilities: 0, page: [] },
-      isLoading: false,
-      isFetching: false,
-    });
-
-    renderVulnerabilityByResource();
-    expect(screen.getByText(/no results/i)).toBeInTheDocument();
-  });
-
-  it('renders the Table', () => {
-    (useLatestVulnerabilitiesByResource as jest.Mock).mockReturnValue({
-      data: getVulnerabilitiesByResourceData(),
-      isLoading: false,
-      isFetching: false,
-    });
-
-    renderVulnerabilityByResource();
-    expect(screen.getByText(/2 resources/i)).toBeInTheDocument();
-    expect(screen.getByText(/8 vulnerabilities/i)).toBeInTheDocument();
-    expect(screen.getByText(/resource-id-1/i)).toBeInTheDocument();
-    expect(screen.getByText(/resource-id-2/i)).toBeInTheDocument();
-    expect(screen.getByText(/resource-test-1/i)).toBeInTheDocument();
-    expect(screen.getAllByText(/us-test-1/i)).toHaveLength(2);
-    expect(screen.getAllByTestId(VULNERABILITY_RESOURCE_COUNT)).toHaveLength(2);
-    expect(screen.getAllByTestId(VULNERABILITY_RESOURCE_COUNT)[0]).toHaveTextContent('4');
-    expect(screen.getAllByTestId(VULNERABILITY_RESOURCE_COUNT)[1]).toHaveTextContent('4');
-  });
-});
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/vulnerabilities_by_resource.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/vulnerabilities_by_resource.tsx
deleted file mode 100644
index 89488bf52046b8..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/vulnerabilities_by_resource.tsx
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * 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 {
-  EuiBadge,
-  EuiButtonEmpty,
-  EuiDataGrid,
-  EuiDataGridCellValueElementProps,
-  EuiFlexItem,
-  EuiProgress,
-  EuiSpacer,
-} from '@elastic/eui';
-import { DataView } from '@kbn/data-views-plugin/common';
-import React, { useMemo } from 'react';
-import { i18n } from '@kbn/i18n';
-import { Link, generatePath } from 'react-router-dom';
-import { LOCAL_STORAGE_PAGE_SIZE_FINDINGS_KEY } from '../../../common/constants';
-import { findingsNavigation } from '../../../common/navigation/constants';
-import {
-  CloudPostureTableResult,
-  useCloudPostureTable,
-} from '../../../common/hooks/use_cloud_posture_table';
-import { ErrorCallout } from '../../configurations/layout/error_callout';
-import { FindingsSearchBar } from '../../configurations/layout/findings_search_bar';
-import { useLimitProperties } from '../../../common/utils/get_limit_properties';
-import { LimitedResultsBar } from '../../configurations/layout/findings_layout';
-import {
-  getVulnerabilitiesByResourceColumnsGrid,
-  vulnerabilitiesByResourceColumns,
-} from './vulnerabilities_by_resource_table_columns';
-import {
-  defaultLoadingRenderer,
-  defaultNoDataRenderer,
-} from '../../../components/cloud_posture_page';
-import { SEARCH_BAR_PLACEHOLDER, VULNERABILITIES } from '../translations';
-import { useStyles } from '../hooks/use_styles';
-import { FindingsGroupBySelector } from '../../configurations/layout/findings_group_by_selector';
-import { vulnerabilitiesPathnameHandler } from '../utils/vulnerabilities_pathname_handler';
-import { useLatestVulnerabilitiesByResource } from '../hooks/use_latest_vulnerabilities_by_resource';
-import { EmptyState } from '../../../components/empty_state';
-import { SeverityMap } from './severity_map';
-import { VULNERABILITY_RESOURCE_COUNT } from './test_subjects';
-import { getVulnerabilitiesGridCellActions } from '../utils/get_vulnerabilities_grid_cell_actions';
-import type { VulnerabilitiesByResourceQueryData } from '../types';
-
-const getDefaultQuery = ({ query, filters }: any): any => ({
-  query,
-  filters,
-  sort: [{ id: vulnerabilitiesByResourceColumns.vulnerabilities_count, direction: 'desc' }],
-  pageIndex: 0,
-});
-
-const VulnerabilitiesByResourceDataGrid = ({
-  dataView,
-  data,
-  isFetching,
-  pageIndex,
-  sort,
-  pageSize,
-  onChangeItemsPerPage,
-  onChangePage,
-  onSort,
-  urlQuery,
-  setUrlQuery,
-  onResetFilters,
-}: {
-  dataView: DataView;
-  data: VulnerabilitiesByResourceQueryData | undefined;
-  isFetching: boolean;
-} & Pick<
-  CloudPostureTableResult,
-  | 'pageIndex'
-  | 'sort'
-  | 'pageSize'
-  | 'onChangeItemsPerPage'
-  | 'onChangePage'
-  | 'onSort'
-  | 'urlQuery'
-  | 'setUrlQuery'
-  | 'onResetFilters'
->) => {
-  const styles = useStyles();
-
-  const { isLastLimitedPage, limitedTotalItemCount } = useLimitProperties({
-    total: data?.total,
-    pageIndex,
-    pageSize,
-  });
-
-  const columns = useMemo(() => {
-    if (!data?.page) {
-      return [];
-    }
-    return getVulnerabilitiesGridCellActions<typeof data.page>({
-      columnGridFn: getVulnerabilitiesByResourceColumnsGrid,
-      columns: vulnerabilitiesByResourceColumns,
-      dataView,
-      pageSize,
-      data: data.page,
-      setUrlQuery,
-      filters: urlQuery.filters,
-    });
-  }, [data, dataView, pageSize, setUrlQuery, urlQuery.filters]);
-
-  const renderCellValue = useMemo(() => {
-    const Cell: React.FC<EuiDataGridCellValueElementProps> = ({
-      columnId,
-      rowIndex,
-    }): React.ReactElement | null => {
-      const rowIndexFromPage = rowIndex > pageSize - 1 ? rowIndex % pageSize : rowIndex;
-
-      const resourceVulnerabilityRow = data?.page[rowIndexFromPage];
-
-      if (isFetching) return null;
-      if (!resourceVulnerabilityRow?.resource?.id) return null;
-
-      if (columnId === vulnerabilitiesByResourceColumns.resourceId) {
-        return (
-          <Link
-            to={generatePath(findingsNavigation.resource_vulnerabilities.path, {
-              resourceId: encodeURIComponent(resourceVulnerabilityRow?.resource?.id),
-            })}
-            className="eui-textTruncate"
-            title={resourceVulnerabilityRow?.resource?.id}
-          >
-            {resourceVulnerabilityRow?.resource?.id}
-          </Link>
-        );
-      }
-      if (columnId === vulnerabilitiesByResourceColumns.resourceName) {
-        return <>{resourceVulnerabilityRow?.resource?.name}</>;
-      }
-      if (columnId === vulnerabilitiesByResourceColumns.region) {
-        return <>{resourceVulnerabilityRow?.cloud?.region}</>;
-      }
-      if (columnId === vulnerabilitiesByResourceColumns.vulnerabilities_count) {
-        return (
-          <EuiBadge color="hollow" data-test-subj={VULNERABILITY_RESOURCE_COUNT}>
-            {resourceVulnerabilityRow.vulnerabilities_count}
-          </EuiBadge>
-        );
-      }
-
-      if (columnId === vulnerabilitiesByResourceColumns.severity_map) {
-        return (
-          <SeverityMap
-            total={resourceVulnerabilityRow.vulnerabilities_count}
-            severityMap={resourceVulnerabilityRow.severity_map}
-          />
-        );
-      }
-      return null;
-    };
-
-    return Cell;
-  }, [data?.page, pageSize, isFetching]);
-
-  if (data?.page.length === 0) {
-    return <EmptyState onResetFilters={onResetFilters} />;
-  }
-
-  return (
-    <>
-      <EuiProgress
-        size="xs"
-        color="accent"
-        style={{
-          opacity: isFetching ? 1 : 0,
-        }}
-      />
-      <EuiDataGrid
-        className={styles.gridStyle}
-        aria-label={VULNERABILITIES}
-        columns={columns}
-        columnVisibility={{
-          visibleColumns: columns.map(({ id }) => id),
-          setVisibleColumns: () => {},
-        }}
-        rowCount={limitedTotalItemCount}
-        toolbarVisibility={{
-          showColumnSelector: false,
-          showDisplaySelector: false,
-          showKeyboardShortcuts: false,
-          showSortSelector: false,
-          showFullScreenSelector: false,
-          additionalControls: {
-            left: {
-              prepend: (
-                <>
-                  <EuiButtonEmpty size="xs" color="text">
-                    {i18n.translate('xpack.csp.vulnerabilitiesByResource.totalResources', {
-                      defaultMessage: '{total, plural, one {# Resource} other {# Resources}}',
-                      values: { total: data?.total },
-                    })}
-                  </EuiButtonEmpty>
-                  <EuiButtonEmpty size="xs" color="text">
-                    {i18n.translate('xpack.csp.vulnerabilitiesByResource.totalVulnerabilities', {
-                      defaultMessage:
-                        '{total, plural, one {# Vulnerability} other {# Vulnerabilities}}',
-                      values: { total: data?.total_vulnerabilities },
-                    })}
-                  </EuiButtonEmpty>
-                </>
-              ),
-            },
-            right: (
-              <EuiFlexItem grow={false} className={styles.groupBySelector}>
-                <FindingsGroupBySelector
-                  type="resource"
-                  pathnameHandler={vulnerabilitiesPathnameHandler}
-                />
-              </EuiFlexItem>
-            ),
-          },
-        }}
-        gridStyle={{
-          border: 'horizontal',
-          cellPadding: 'l',
-          stripes: false,
-          rowHover: 'none',
-          header: 'underline',
-        }}
-        renderCellValue={renderCellValue}
-        inMemory={{ level: 'enhancements' }}
-        sorting={{ columns: sort, onSort }}
-        pagination={{
-          pageIndex,
-          pageSize,
-          pageSizeOptions: [10, 25, 100],
-          onChangeItemsPerPage,
-          onChangePage,
-        }}
-      />
-      {isLastLimitedPage && <LimitedResultsBar />}
-    </>
-  );
-};
-
-export const VulnerabilitiesByResource = ({ dataView }: { dataView: DataView }) => {
-  const {
-    pageIndex,
-    onChangeItemsPerPage,
-    onChangePage,
-    pageSize,
-    query,
-    sort,
-    onSort,
-    queryError,
-    urlQuery,
-    setUrlQuery,
-    onResetFilters,
-  } = useCloudPostureTable({
-    dataView,
-    defaultQuery: getDefaultQuery,
-    paginationLocalStorageKey: LOCAL_STORAGE_PAGE_SIZE_FINDINGS_KEY,
-  });
-
-  const { data, isLoading, isFetching } = useLatestVulnerabilitiesByResource({
-    query,
-    sortOrder: sort[0]?.direction,
-    enabled: !queryError,
-    pageIndex,
-    pageSize,
-  });
-
-  const error = queryError || null;
-
-  if (isLoading && !error) {
-    return defaultLoadingRenderer();
-  }
-
-  if (!data?.page && !error) {
-    return defaultNoDataRenderer();
-  }
-
-  return (
-    <>
-      <FindingsSearchBar
-        dataView={dataView}
-        setQuery={(newQuery) => {
-          setUrlQuery({ ...newQuery, pageIndex: 0 });
-        }}
-        loading={isFetching}
-        placeholder={SEARCH_BAR_PLACEHOLDER}
-      />
-      <EuiSpacer size="m" />
-      {error && <ErrorCallout error={error as Error} />}
-      {!error && (
-        <VulnerabilitiesByResourceDataGrid
-          dataView={dataView}
-          data={data}
-          isFetching={isFetching}
-          pageIndex={pageIndex}
-          sort={sort}
-          pageSize={pageSize}
-          onChangeItemsPerPage={onChangeItemsPerPage}
-          onChangePage={onChangePage}
-          onSort={onSort}
-          urlQuery={urlQuery}
-          setUrlQuery={setUrlQuery}
-          onResetFilters={onResetFilters}
-        />
-      )}
-    </>
-  );
-};
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/vulnerabilities_by_resource_table_columns.ts b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/vulnerabilities_by_resource_table_columns.ts
deleted file mode 100644
index 42196f151bd074..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/vulnerabilities_by_resource_table_columns.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * 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 { EuiDataGridColumn, EuiDataGridColumnCellAction } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-
-export const vulnerabilitiesByResourceColumns = {
-  resourceId: 'resource.id',
-  resourceName: 'resource.name',
-  region: 'cloud.region',
-  vulnerabilities_count: 'vulnerabilities_count',
-  severity_map: 'severity_map',
-};
-
-const defaultColumnProps = (): Partial<EuiDataGridColumn> => ({
-  isExpandable: false,
-  actions: {
-    showHide: false,
-    showMoveLeft: false,
-    showMoveRight: false,
-    showSortAsc: false,
-    showSortDesc: false,
-  },
-  isSortable: false,
-});
-
-export const getVulnerabilitiesByResourceColumnsGrid = (
-  cellActions: EuiDataGridColumnCellAction[]
-): EuiDataGridColumn[] => [
-  {
-    ...defaultColumnProps(),
-    id: vulnerabilitiesByResourceColumns.resourceId,
-    displayAsText: i18n.translate('xpack.csp.vulnerabilityByResourceTable.column.resourceId', {
-      defaultMessage: 'Resource ID',
-    }),
-    cellActions,
-  },
-  {
-    ...defaultColumnProps(),
-    id: vulnerabilitiesByResourceColumns.resourceName,
-    displayAsText: i18n.translate('xpack.csp.vulnerabilityByResourceTable.column.resourceName', {
-      defaultMessage: 'Resource Name',
-    }),
-    cellActions,
-  },
-  {
-    ...defaultColumnProps(),
-    id: vulnerabilitiesByResourceColumns.region,
-    displayAsText: i18n.translate('xpack.csp.vulnerabilityByResourceTable.column.region', {
-      defaultMessage: 'Region',
-    }),
-    cellActions,
-    initialWidth: 150,
-  },
-  {
-    ...defaultColumnProps(),
-    actions: {
-      showHide: false,
-      showMoveLeft: false,
-      showMoveRight: false,
-      showSortAsc: true,
-      showSortDesc: true,
-    },
-    id: vulnerabilitiesByResourceColumns.vulnerabilities_count,
-    displayAsText: i18n.translate('xpack.csp.vulnerabilityByResourceTable.column.vulnerabilities', {
-      defaultMessage: 'Vulnerabilities',
-    }),
-    initialWidth: 140,
-    isResizable: false,
-    isSortable: true,
-  },
-  {
-    ...defaultColumnProps(),
-    id: vulnerabilitiesByResourceColumns.severity_map,
-    displayAsText: i18n.translate('xpack.csp.vulnerabilityByResourceTable.column.severityMap', {
-      defaultMessage: 'Severity Map',
-    }),
-    cellActions,
-    initialWidth: 110,
-    isResizable: false,
-  },
-];
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_finding_flyout/vulnerability_finding_flyout.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_finding_flyout/vulnerability_finding_flyout.test.tsx
index 47acba70f97fa5..2533819a022942 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_finding_flyout/vulnerability_finding_flyout.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_finding_flyout/vulnerability_finding_flyout.test.tsx
@@ -41,7 +41,7 @@ describe('<VulnerabilityFindingFlyout/>', () => {
       expect(descriptionList.textContent).toEqual(
         `Resource ID:${mockVulnerabilityHit.resource?.id}Resource Name:${mockVulnerabilityHit.resource?.name}Package:${mockVulnerabilityHit.package.name}Version:${mockVulnerabilityHit.package.version}`
       );
-      getByText(mockVulnerabilityHit.vulnerability.severity);
+      getByText(mockVulnerabilityHit.vulnerability.severity!);
     });
   });
 
@@ -92,7 +92,7 @@ describe('<VulnerabilityFindingFlyout/>', () => {
     });
   });
 
-  it('should allow pagination with next', async () => {
+  it.skip('should allow pagination with next', async () => {
     const { getByTestId } = render(<TestComponent />);
 
     userEvent.click(getByTestId('pagination-button-next'));
@@ -100,7 +100,7 @@ describe('<VulnerabilityFindingFlyout/>', () => {
     expect(onPaginate).toHaveBeenCalledWith(1);
   });
 
-  it('should allow pagination with previous', async () => {
+  it.skip('should allow pagination with previous', async () => {
     const { getByTestId } = render(<TestComponent flyoutIndex={1} />);
 
     userEvent.click(getByTestId('pagination-button-previous'));
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_table_columns.ts b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_table_columns.ts
deleted file mode 100644
index a3d7e2a89db15e..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_table_columns.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * 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 { EuiDataGridColumn, EuiDataGridColumnCellAction } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { severitySchemaConfig } from './utils/custom_sort_script';
-
-export const vulnerabilitiesColumns = {
-  actions: 'actions',
-  vulnerability: 'vulnerability.id',
-  cvss: 'vulnerability.score.base',
-  resourceName: 'resource.name',
-  resourceId: 'resource.id',
-  severity: 'vulnerability.severity',
-  package: 'package.name',
-  version: 'package.version',
-  fixedVersion: 'package.fixed_version',
-};
-
-const defaultColumnProps = () => ({
-  isExpandable: false,
-  actions: {
-    showHide: false,
-    showMoveLeft: false,
-    showMoveRight: false,
-  },
-});
-
-export const getVulnerabilitiesColumnsGrid = (
-  cellActions: EuiDataGridColumnCellAction[]
-): EuiDataGridColumn[] => [
-  {
-    ...defaultColumnProps(),
-    id: vulnerabilitiesColumns.actions,
-    initialWidth: 40,
-    display: [],
-    actions: false,
-    isSortable: false,
-    isResizable: false,
-    cellActions: [],
-  },
-  {
-    ...defaultColumnProps(),
-    id: vulnerabilitiesColumns.vulnerability,
-    displayAsText: i18n.translate('xpack.csp.vulnerabilityTable.column.vulnerability', {
-      defaultMessage: 'Vulnerability',
-    }),
-    initialWidth: 130,
-    cellActions,
-  },
-  {
-    ...defaultColumnProps(),
-    id: vulnerabilitiesColumns.cvss,
-    displayAsText: 'CVSS',
-    initialWidth: 80,
-    isResizable: false,
-    cellActions,
-  },
-  {
-    ...defaultColumnProps(),
-    id: vulnerabilitiesColumns.resourceId,
-    displayAsText: i18n.translate('xpack.csp.vulnerabilityTable.column.resourceId', {
-      defaultMessage: 'Resource ID',
-    }),
-    cellActions,
-  },
-  {
-    ...defaultColumnProps(),
-    id: vulnerabilitiesColumns.resourceName,
-    displayAsText: i18n.translate('xpack.csp.vulnerabilityTable.column.resourceName', {
-      defaultMessage: 'Resource Name',
-    }),
-    cellActions,
-  },
-  {
-    ...defaultColumnProps(),
-    id: vulnerabilitiesColumns.severity,
-    displayAsText: i18n.translate('xpack.csp.vulnerabilityTable.column.severity', {
-      defaultMessage: 'Severity',
-    }),
-    initialWidth: 100,
-    cellActions,
-    schema: severitySchemaConfig.type,
-  },
-  {
-    ...defaultColumnProps(),
-    id: vulnerabilitiesColumns.package,
-    displayAsText: i18n.translate('xpack.csp.vulnerabilityTable.column.package', {
-      defaultMessage: 'Package',
-    }),
-    cellActions,
-  },
-  {
-    ...defaultColumnProps(),
-    id: vulnerabilitiesColumns.version,
-    displayAsText: i18n.translate('xpack.csp.vulnerabilityTable.column.version', {
-      defaultMessage: 'Version',
-    }),
-    cellActions,
-  },
-  {
-    ...defaultColumnProps(),
-    id: vulnerabilitiesColumns.fixedVersion,
-    displayAsText: i18n.translate('xpack.csp.vulnerabilityTable.column.fixVersion', {
-      defaultMessage: 'Fix Version',
-    }),
-    cellActions,
-  },
-];

From 466de2c1b273aa48fb8ae462d566b4b2e312a230 Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Tue, 9 Jan 2024 12:15:35 -0800
Subject: [PATCH 10/25] removing unused

---
 .../cloud_security_data_table.test.tsx          | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_data_table/cloud_security_data_table.test.tsx b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_data_table/cloud_security_data_table.test.tsx
index d775d567acb4e9..0fba4f27ed23ad 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_data_table/cloud_security_data_table.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_data_table/cloud_security_data_table.test.tsx
@@ -6,7 +6,6 @@
  */
 import { render } from '@testing-library/react';
 import React from 'react';
-import { act } from 'react-dom/test-utils';
 import { DataViewContext } from '../../common/contexts/data_view_context';
 import { TestProvider } from '../../test/test_provider';
 import { CloudSecurityDataTable, CloudSecurityDataTableProps } from './cloud_security_data_table';
@@ -93,15 +92,13 @@ describe('CloudSecurityDataTable', () => {
         },
       },
     ] as any;
-    act(() => {
-      const { getByTestId, getByText } = renderDataTable({
-        rows: mockRows,
-        total: mockRows.length,
-      });
-
-      expect(getByTestId('discoverDocTable')).toBeInTheDocument();
-      expect(getByText('Label 1')).toBeInTheDocument();
-      expect(getByText('Label 2')).toBeInTheDocument();
+    const { getByTestId, getByText } = renderDataTable({
+      rows: mockRows,
+      total: mockRows.length,
     });
+
+    expect(getByTestId('discoverDocTable')).toBeInTheDocument();
+    expect(getByText('Label 1')).toBeInTheDocument();
+    expect(getByText('Label 2')).toBeInTheDocument();
   });
 });

From 5f2669bb97a1e48355d0c7d62638894184807842 Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Tue, 9 Jan 2024 12:27:01 -0800
Subject: [PATCH 11/25] Fixing variable names

---
 .../vulnerabilities/hooks/use_grouped_vulnerabilities.tsx | 8 +-------
 .../hooks/use_latest_vulnerabilities_grouping.tsx         | 7 +------
 .../latest_vulnerabilities_group_renderer.tsx             | 4 ++--
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_grouped_vulnerabilities.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_grouped_vulnerabilities.tsx
index 6c990028981d53..fda12c4b06d412 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_grouped_vulnerabilities.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_grouped_vulnerabilities.tsx
@@ -30,13 +30,7 @@ export interface VulnerabilitiesGroupingAggregation {
   description?: {
     buckets?: GenericBuckets[];
   };
-  resourceName?: {
-    buckets?: GenericBuckets[];
-  };
-  resourceSubType?: {
-    buckets?: GenericBuckets[];
-  };
-  resourceType?: {
+  resourceId?: {
     buckets?: GenericBuckets[];
   };
   isLoading?: boolean;
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
index 53150a41f17955..8179cb5ae1a9ea 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
@@ -47,12 +47,7 @@ const getAggregationsByGroupField = (field: string): NamedAggregation[] => {
 
   switch (field) {
     case GROUPING_OPTIONS.RESOURCE_NAME:
-      return [
-        ...aggMetrics,
-        getTermAggregation('resourceName', 'resource.id'),
-        getTermAggregation('resourceSubType', 'resource.sub_type'),
-        getTermAggregation('resourceType', 'resource.type'),
-      ];
+      return [...aggMetrics, getTermAggregation('resourceId', 'resource.id')];
   }
   return aggMetrics;
 };
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_group_renderer.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_group_renderer.tsx
index 2e190ce040ee08..88ff28e365f14a 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_group_renderer.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_group_renderer.tsx
@@ -126,9 +126,9 @@ export const groupPanelRenderer: GroupPanelRenderer<VulnerabilitiesGroupingAggre
                     css={css`
                       word-break: break-all;
                     `}
-                    title={bucket.resourceName?.buckets?.[0].key}
+                    title={bucket.resourceId?.buckets?.[0].key}
                   >
-                    <strong>{bucket.key_as_string}</strong> {bucket.resourceName?.buckets?.[0].key}
+                    <strong>{bucket.key_as_string}</strong> {bucket.resourceId?.buckets?.[0].key}
                   </EuiTextBlockTruncate>
                 </EuiText>
               </EuiFlexItem>

From d6757e8add425f31eb888d31aa82b32669134384 Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Tue, 9 Jan 2024 12:29:46 -0800
Subject: [PATCH 12/25] show timestamp on the field selector modal

---
 .../fields_selector/fields_selector_table.tsx                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_data_table/fields_selector/fields_selector_table.tsx b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_data_table/fields_selector/fields_selector_table.tsx
index bae971749bc789..0afd4332c41db2 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_data_table/fields_selector/fields_selector_table.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_data_table/fields_selector/fields_selector_table.tsx
@@ -73,7 +73,7 @@ export const FieldsSelectorTable = ({
     return dataView.fields
       .getAll()
       .filter((field) => {
-        return field.name !== '@timestamp' && field.name !== '_index' && field.visualizable;
+        return field.name !== '_index' && field.visualizable;
       })
       .map((field) => ({
         id: field.name,

From c5188faf05047bfc4fede74e163673182c5b6188 Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Tue, 9 Jan 2024 12:40:14 -0800
Subject: [PATCH 13/25] remove unused hook

---
 .../pages/vulnerabilities/hooks/use_styles.ts | 86 -------------------
 1 file changed, 86 deletions(-)
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_styles.ts

diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_styles.ts b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_styles.ts
deleted file mode 100644
index c09490d719f1f8..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_styles.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * 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 { useEuiTheme } from '@elastic/eui';
-import { css, keyframes } from '@emotion/css';
-
-export const useStyles = () => {
-  const { euiTheme } = useEuiTheme();
-
-  const highlight = keyframes`
-    0% { background-color: ${euiTheme.colors.warning};}
-    50% { background-color: ${euiTheme.colors.emptyShade};}
-    75% { background-color: ${euiTheme.colors.warning};}
-    100% { background-color: ${euiTheme.colors.emptyShade};}
-  `;
-
-  const gridStyle = css`
-    & .euiDataGrid__content {
-      background: transparent;
-    }
-    & .euiDataGridHeaderCell__icon {
-      display: none;
-    }
-    & .euiDataGrid__controls {
-      border-bottom: none;
-      margin-bottom: ${euiTheme.size.s};
-
-      & .euiButtonEmpty {
-        font-weight: ${euiTheme.font.weight.bold};
-      }
-    }
-    & .euiDataGrid__leftControls {
-      > .euiButtonEmpty:hover:not(:disabled),
-      .euiButtonEmpty:focus {
-        text-decoration: none;
-        cursor: default;
-      }
-    }
-    & .euiButtonIcon {
-      color: ${euiTheme.colors.primary};
-    }
-    & .euiDataGridRowCell {
-      font-size: ${euiTheme.size.m};
-
-      // Vertically center content
-      .euiDataGridRowCell__content {
-        display: flex;
-        align-items: center;
-      }
-    }
-    /* EUI QUESTION: Why is this being done via CSS instead of setting isExpandable: false in the columns API? */
-    & .euiDataGridRowCell__actions > .euiDataGridRowCell__expandCell {
-      display: none;
-    }
-    & .euiDataGridRowCell.euiDataGridRowCell--numeric {
-      text-align: left;
-    }
-    & .euiDataGridHeaderCell--numeric .euiDataGridHeaderCell__content {
-      flex-grow: 0;
-      text-align: left;
-    }
-  `;
-
-  const highlightStyle = css`
-    & [data-test-subj='dataGridColumnSortingButton'] .euiButtonEmpty__text {
-      animation: ${highlight} 1s ease-out infinite;
-      color: ${euiTheme.colors.darkestShade};
-    }
-  `;
-
-  const groupBySelector = css`
-    width: 188px;
-    display: inline-block;
-    margin-left: 8px;
-  `;
-
-  return {
-    highlightStyle,
-    gridStyle,
-    groupBySelector,
-  };
-};

From e77452b927a965e4a44f66fc7a5efecc9c07d35b Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Tue, 9 Jan 2024 13:05:21 -0800
Subject: [PATCH 14/25] adding fields to constant

---
 .../public/pages/vulnerabilities/constants.ts | 33 ++++++----
 .../hooks/use_latest_vulnerabilities.tsx      | 15 ++++-
 .../use_latest_vulnerabilities_grouping.tsx   |  9 ++-
 .../vulnerabilities/utils/get_filters.ts      | 65 -------------------
 4 files changed, 43 insertions(+), 79 deletions(-)
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/utils/get_filters.ts

diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
index 21977c2eae1b85..cc248a9f214df0 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
@@ -12,8 +12,19 @@ import { GROUPING_LABELS } from './translations';
 
 export const DEFAULT_TABLE_HEIGHT = 512;
 
-export const GROUPING_OPTIONS = {
+export const VULNERABILITY_FIELDS = {
+  VULNERABILITY_ID: 'vulnerability.id',
+  SCORE_BASE: 'vulnerability.score.base',
   RESOURCE_NAME: 'resource.name',
+  RESOURCE_ID: 'resource.id',
+  SEVERITY: 'vulnerability.severity',
+  PACKAGE_NAME: 'package.name',
+  PACKAGE_VERSION: 'package.version',
+  PACKAGE_FIXED_VERSION: 'package.fixed_version',
+} as const;
+
+export const GROUPING_OPTIONS = {
+  RESOURCE_NAME: VULNERABILITY_FIELDS.RESOURCE_NAME,
 };
 
 export const defaultGroupingOptions: GroupOption[] = [
@@ -32,18 +43,18 @@ export const getDefaultQuery = ({
   query,
   filters,
   sort: [
-    ['vulnerability.severity', 'desc'],
-    ['vulnerability.score.base', 'desc'],
+    [VULNERABILITY_FIELDS.SEVERITY, 'desc'],
+    [VULNERABILITY_FIELDS.SCORE_BASE, 'desc'],
   ],
 });
 
 export const defaultColumns: CloudSecurityDefaultColumn[] = [
-  { id: 'vulnerability.id', width: 130 },
-  { id: 'vulnerability.score.base', width: 80 },
-  { id: 'resource.name' },
-  { id: 'resource.id' },
-  { id: 'vulnerability.severity', width: 100 },
-  { id: 'package.name' },
-  { id: 'package.version' },
-  { id: 'package.fixed_version' },
+  { id: VULNERABILITY_FIELDS.VULNERABILITY_ID, width: 130 },
+  { id: VULNERABILITY_FIELDS.SCORE_BASE, width: 80 },
+  { id: VULNERABILITY_FIELDS.RESOURCE_NAME },
+  { id: VULNERABILITY_FIELDS.RESOURCE_ID },
+  { id: VULNERABILITY_FIELDS.SEVERITY, width: 100 },
+  { id: VULNERABILITY_FIELDS.PACKAGE_NAME },
+  { id: VULNERABILITY_FIELDS.PACKAGE_VERSION },
+  { id: VULNERABILITY_FIELDS.PACKAGE_FIXED_VERSION },
 ];
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx
index 287e31828bed0d..a060528e7729fc 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx
@@ -25,6 +25,8 @@ import {
 import { useKibana } from '../../../common/hooks/use_kibana';
 import { showErrorToast } from '../../../common/utils/show_error_toast';
 import { FindingsBaseEsQuery } from '../../../common/types';
+import { VULNERABILITY_FIELDS } from '../constants';
+import { getCaseInsensitiveSortScript, severitySortScript } from '../utils/custom_sort_script';
 type LatestFindingsRequest = IKibanaSearchRequest<SearchRequest>;
 type LatestFindingsResponse = IKibanaSearchResponse<
   SearchResponse<CspVulnerabilityFinding, FindingsAggs>
@@ -39,7 +41,18 @@ interface VulnerabilitiesQuery extends FindingsBaseEsQuery {
 }
 
 const getMultiFieldsSort = (sort: string[][]) => {
-  return sort.map(([id, direction]) => ({ [id]: direction }));
+  return sort.map(([id, direction]) => {
+    if (id === VULNERABILITY_FIELDS.SEVERITY) {
+      return severitySortScript(direction);
+    }
+    if (id === VULNERABILITY_FIELDS.PACKAGE_NAME) {
+      return getCaseInsensitiveSortScript(id, direction);
+    }
+
+    return {
+      [id]: direction,
+    };
+  });
 };
 
 export const getVulnerabilitiesQuery = (
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
index 8179cb5ae1a9ea..e2a396773cf612 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
@@ -21,7 +21,12 @@ import {
   VulnerabilitiesRootGroupingAggregation,
   useGroupedVulnerabilities,
 } from './use_grouped_vulnerabilities';
-import { defaultGroupingOptions, getDefaultQuery, GROUPING_OPTIONS } from '../constants';
+import {
+  defaultGroupingOptions,
+  getDefaultQuery,
+  GROUPING_OPTIONS,
+  VULNERABILITY_FIELDS,
+} from '../constants';
 import { useCloudSecurityGrouping } from '../../../components/cloud_security_grouping';
 import { VULNERABILITIES_UNIT, groupingTitle } from '../translations';
 
@@ -47,7 +52,7 @@ const getAggregationsByGroupField = (field: string): NamedAggregation[] => {
 
   switch (field) {
     case GROUPING_OPTIONS.RESOURCE_NAME:
-      return [...aggMetrics, getTermAggregation('resourceId', 'resource.id')];
+      return [...aggMetrics, getTermAggregation('resourceId', VULNERABILITY_FIELDS.RESOURCE_ID)];
   }
   return aggMetrics;
 };
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/utils/get_filters.ts b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/utils/get_filters.ts
deleted file mode 100644
index 7f7d9ff544c62d..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/utils/get_filters.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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,
-  buildFilter,
-  FILTERS,
-  FilterStateStore,
-  compareFilters,
-  FilterCompareOptions,
-} from '@kbn/es-query';
-import type { Serializable } from '@kbn/utility-types';
-import type { FindingsBaseProps } from '../../../common/types';
-
-const compareOptions: FilterCompareOptions = {
-  negate: false,
-};
-
-/**
- * adds a new filter to a new filters array
- * removes existing filter if negated filter is added
- *
- * @returns {Filter[]} a new array of filters to be added back to filterManager
- */
-export const getFilters = ({
-  filters: existingFilters,
-  dataView,
-  field,
-  value,
-  negate,
-}: {
-  filters: Filter[];
-  dataView: FindingsBaseProps['dataView'];
-  field: string;
-  value: Serializable;
-  negate: boolean;
-}): Filter[] => {
-  const dataViewField = dataView.fields.find((f) => f.spec.name === field);
-  if (!dataViewField) return existingFilters;
-
-  const phraseFilter = buildFilter(
-    dataView,
-    dataViewField,
-    FILTERS.PHRASE,
-    negate,
-    false,
-    value,
-    null,
-    FilterStateStore.APP_STATE
-  );
-
-  const nextFilters = [
-    ...existingFilters.filter(
-      // Exclude existing filters that match the newly added 'phraseFilter'
-      (filter) => !compareFilters(filter, phraseFilter, compareOptions)
-    ),
-    phraseFilter,
-  ];
-
-  return nextFilters;
-};

From ba611e9a96e570950ab1f031f03cc1530ab65825 Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Tue, 9 Jan 2024 16:22:07 -0800
Subject: [PATCH 15/25] removing unused code fixing tsc checks

---
 .../use_base_es_query.ts                      |  13 +-
 .../use_cloud_posture_data_table.ts           |   3 -
 .../hooks/use_cloud_posture_table/index.ts    |   8 -
 .../use_cloud_posture_table.ts                | 155 ---------
 .../hooks/use_cloud_posture_table/utils.ts    | 124 -------
 .../use_cloud_security_grouping.ts            |   1 -
 .../findings_by_resource_container.tsx        | 189 -----------
 .../findings_by_resource_table.test.tsx       | 113 -------
 .../findings_by_resource_table.tsx            | 212 ------------
 .../resource_findings_container.test.tsx      |  50 ---
 .../resource_findings_container.tsx           | 301 -----------------
 .../resource_findings_table.test.tsx          |  86 -----
 .../resource_findings_table.tsx               | 112 ------
 .../use_resource_findings.ts                  | 136 --------
 .../use_findings_by_resource.ts               | 218 ------------
 .../configurations/layout/findings_layout.tsx | 318 ------------------
 .../pages/configurations/utils/get_filters.ts |   4 +-
 17 files changed, 11 insertions(+), 2032 deletions(-)
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_table/index.ts
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_table/use_cloud_posture_table.ts
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_table/utils.ts
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_container.tsx
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_table.test.tsx
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_table.tsx
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_container.test.tsx
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_container.tsx
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_table.test.tsx
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_table.tsx
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/use_resource_findings.ts
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/use_findings_by_resource.ts
 delete mode 100644 x-pack/plugins/cloud_security_posture/public/pages/configurations/layout/findings_layout.tsx

diff --git a/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_data_table/use_base_es_query.ts b/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_data_table/use_base_es_query.ts
index 4adffa100e48c9..9d5f5f2bf268d7 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_data_table/use_base_es_query.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_data_table/use_base_es_query.ts
@@ -5,10 +5,12 @@
  * 2.0.
  */
 
+import { DataView } from '@kbn/data-views-plugin/common';
 import { buildEsQuery, EsQueryConfig } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
 import { useEffect, useMemo } from 'react';
-import { FindingsBaseESQueryConfig, FindingsBaseProps, FindingsBaseURLQuery } from '../../types';
+import { useDataViewContext } from '../../contexts/data_view_context';
+import { FindingsBaseESQueryConfig, FindingsBaseURLQuery } from '../../types';
 import { useKibana } from '../use_kibana';
 
 const getBaseQuery = ({
@@ -16,7 +18,10 @@ const getBaseQuery = ({
   query,
   filters,
   config,
-}: FindingsBaseURLQuery & FindingsBaseProps & FindingsBaseESQueryConfig) => {
+}: FindingsBaseURLQuery &
+  FindingsBaseESQueryConfig & {
+    dataView: DataView;
+  }) => {
   try {
     return {
       query: buildEsQuery(dataView, query, filters, config), // will throw for malformed query
@@ -30,11 +35,10 @@ const getBaseQuery = ({
 };
 
 export const useBaseEsQuery = ({
-  dataView,
   filters = [],
   query,
   nonPersistedFilters,
-}: FindingsBaseURLQuery & FindingsBaseProps) => {
+}: FindingsBaseURLQuery) => {
   const {
     notifications: { toasts },
     data: {
@@ -42,6 +46,7 @@ export const useBaseEsQuery = ({
     },
     uiSettings,
   } = useKibana().services;
+  const { dataView } = useDataViewContext();
   const allowLeadingWildcards = uiSettings.get('query:allowLeadingWildcards');
   const config: EsQueryConfig = useMemo(() => ({ allowLeadingWildcards }), [allowLeadingWildcards]);
   const baseEsQuery = useMemo(
diff --git a/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_data_table/use_cloud_posture_data_table.ts b/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_data_table/use_cloud_posture_data_table.ts
index 74efb343e8be68..03517383ecc3fb 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_data_table/use_cloud_posture_data_table.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_data_table/use_cloud_posture_data_table.ts
@@ -15,7 +15,6 @@ import { LOCAL_STORAGE_DATA_TABLE_COLUMNS_KEY } from '../../constants';
 import { FindingsBaseURLQuery } from '../../types';
 import { useBaseEsQuery } from './use_base_es_query';
 import { usePersistedQuery } from './use_persisted_query';
-import { useDataViewContext } from '../../contexts/data_view_context';
 
 type URLQuery = FindingsBaseURLQuery & Record<string, any>;
 
@@ -58,7 +57,6 @@ export const useCloudPostureDataTable = ({
   const getPersistedDefaultQuery = usePersistedQuery(defaultQuery);
   const { urlQuery, setUrlQuery } = useUrlQuery<URLQuery>(getPersistedDefaultQuery);
   const { pageSize, setPageSize } = usePageSize(paginationLocalStorageKey);
-  const { dataView } = useDataViewContext();
 
   const onChangeItemsPerPage = useCallback(
     (newPageSize) => {
@@ -115,7 +113,6 @@ export const useCloudPostureDataTable = ({
    * Page URL query to ES query
    */
   const baseEsQuery = useBaseEsQuery({
-    dataView,
     filters: urlQuery.filters,
     query: urlQuery.query,
     ...(nonPersistedFilters ? { nonPersistedFilters } : {}),
diff --git a/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_table/index.ts b/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_table/index.ts
deleted file mode 100644
index 06ad2776fb305b..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_table/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * 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.
- */
-
-export * from './use_cloud_posture_table';
diff --git a/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_table/use_cloud_posture_table.ts b/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_table/use_cloud_posture_table.ts
deleted file mode 100644
index d06e29a95e46d7..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_table/use_cloud_posture_table.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * 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 { Dispatch, SetStateAction, useCallback } from 'react';
-import { type DataView } from '@kbn/data-views-plugin/common';
-import { BoolQuery } from '@kbn/es-query';
-import { CriteriaWithPagination } from '@elastic/eui';
-import { DataTableRecord } from '@kbn/discover-utils/types';
-import { useUrlQuery } from '../use_url_query';
-import { usePageSize } from '../use_page_size';
-import { getDefaultQuery, useBaseEsQuery, usePersistedQuery } from './utils';
-import { LOCAL_STORAGE_DATA_TABLE_COLUMNS_KEY } from '../../constants';
-
-export interface CloudPostureTableResult {
-  // TODO: Remove any when all finding tables are converted to CloudSecurityDataTable
-  setUrlQuery: (query: any) => void;
-  // TODO: Remove any when all finding tables are converted to CloudSecurityDataTable
-  sort: any;
-  // TODO: Remove any when all finding tables are converted to CloudSecurityDataTable
-  filters: any[];
-  query?: { bool: BoolQuery };
-  queryError?: Error;
-  pageIndex: number;
-  // TODO: remove any, urlQuery is an object with query fields but we also add custom fields to it, need to assert usages
-  urlQuery: any;
-  setTableOptions: (options: CriteriaWithPagination<object>) => void;
-  // TODO: Remove any when all finding tables are converted to CloudSecurityDataTable
-  handleUpdateQuery: (query: any) => void;
-  pageSize: number;
-  setPageSize: Dispatch<SetStateAction<number | undefined>>;
-  onChangeItemsPerPage: (newPageSize: number) => void;
-  onChangePage: (newPageIndex: number) => void;
-  // TODO: Remove any when all finding tables are converted to CloudSecurityDataTable
-  onSort: (sort: any) => void;
-  onResetFilters: () => void;
-  columnsLocalStorageKey: string;
-  getRowsFromPages: (data: Array<{ page: DataTableRecord[] }> | undefined) => DataTableRecord[];
-}
-
-/**
- * @deprecated will be replaced by useCloudPostureDataTable
- */
-export const useCloudPostureTable = ({
-  defaultQuery = getDefaultQuery,
-  dataView,
-  paginationLocalStorageKey,
-  columnsLocalStorageKey,
-}: {
-  // TODO: Remove any when all finding tables are converted to CloudSecurityDataTable
-  defaultQuery?: (params: any) => any;
-  dataView: DataView;
-  paginationLocalStorageKey: string;
-  columnsLocalStorageKey?: string;
-}): CloudPostureTableResult => {
-  const getPersistedDefaultQuery = usePersistedQuery(defaultQuery);
-  const { urlQuery, setUrlQuery } = useUrlQuery(getPersistedDefaultQuery);
-  const { pageSize, setPageSize } = usePageSize(paginationLocalStorageKey);
-
-  const onChangeItemsPerPage = useCallback(
-    (newPageSize) => {
-      setPageSize(newPageSize);
-      setUrlQuery({
-        pageIndex: 0,
-        pageSize: newPageSize,
-      });
-    },
-    [setPageSize, setUrlQuery]
-  );
-
-  const onResetFilters = useCallback(() => {
-    setUrlQuery({
-      pageIndex: 0,
-      filters: [],
-      query: {
-        query: '',
-        language: 'kuery',
-      },
-    });
-  }, [setUrlQuery]);
-
-  const onChangePage = useCallback(
-    (newPageIndex) => {
-      setUrlQuery({
-        pageIndex: newPageIndex,
-      });
-    },
-    [setUrlQuery]
-  );
-
-  const onSort = useCallback(
-    (sort) => {
-      setUrlQuery({
-        sort,
-      });
-    },
-    [setUrlQuery]
-  );
-
-  const setTableOptions = useCallback(
-    ({ page, sort }) => {
-      setPageSize(page.size);
-      setUrlQuery({
-        sort,
-        pageIndex: page.index,
-      });
-    },
-    [setUrlQuery, setPageSize]
-  );
-
-  /**
-   * Page URL query to ES query
-   */
-  const baseEsQuery = useBaseEsQuery({
-    dataView,
-    filters: urlQuery.filters,
-    query: urlQuery.query,
-  });
-
-  const handleUpdateQuery = useCallback(
-    (query) => {
-      setUrlQuery({ ...query, pageIndex: 0 });
-    },
-    [setUrlQuery]
-  );
-
-  const getRowsFromPages = (data: Array<{ page: DataTableRecord[] }> | undefined) =>
-    data
-      ?.map(({ page }: { page: DataTableRecord[] }) => {
-        return page;
-      })
-      .flat() || [];
-
-  return {
-    setUrlQuery,
-    sort: urlQuery.sort,
-    filters: urlQuery.filters,
-    query: baseEsQuery.query,
-    queryError: baseEsQuery.error,
-    pageIndex: urlQuery.pageIndex,
-    urlQuery,
-    setTableOptions,
-    handleUpdateQuery,
-    pageSize,
-    setPageSize,
-    onChangeItemsPerPage,
-    onChangePage,
-    onSort,
-    onResetFilters,
-    columnsLocalStorageKey: columnsLocalStorageKey || LOCAL_STORAGE_DATA_TABLE_COLUMNS_KEY,
-    getRowsFromPages,
-  };
-};
diff --git a/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_table/utils.ts b/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_table/utils.ts
deleted file mode 100644
index 2d3f9b1c7605cf..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/common/hooks/use_cloud_posture_table/utils.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * 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 { useEffect, useCallback, useMemo } from 'react';
-import { buildEsQuery, EsQueryConfig } from '@kbn/es-query';
-import type { EuiBasicTableProps, Pagination } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { type Query } from '@kbn/es-query';
-import { useKibana } from '../use_kibana';
-import type {
-  FindingsBaseESQueryConfig,
-  FindingsBaseProps,
-  FindingsBaseURLQuery,
-} from '../../types';
-
-const getBaseQuery = ({
-  dataView,
-  query,
-  filters,
-  config,
-}: FindingsBaseURLQuery & FindingsBaseProps & FindingsBaseESQueryConfig) => {
-  try {
-    return {
-      query: buildEsQuery(dataView, query, filters, config), // will throw for malformed query
-    };
-  } catch (error) {
-    return {
-      query: undefined,
-      error: error instanceof Error ? error : new Error('Unknown Error'),
-    };
-  }
-};
-
-type TablePagination = NonNullable<EuiBasicTableProps<unknown>['pagination']>;
-
-export const getPaginationTableParams = (
-  params: TablePagination & Pick<Required<TablePagination>, 'pageIndex' | 'pageSize'>,
-  pageSizeOptions = [10, 25, 100],
-  showPerPageOptions = true
-): Required<TablePagination> => ({
-  ...params,
-  pageSizeOptions,
-  showPerPageOptions,
-});
-
-export const getPaginationQuery = ({
-  pageIndex,
-  pageSize,
-}: Required<Pick<Pagination, 'pageIndex' | 'pageSize'>>) => ({
-  from: pageIndex * pageSize,
-  size: pageSize,
-});
-
-export const useBaseEsQuery = ({
-  dataView,
-  filters,
-  query,
-}: FindingsBaseURLQuery & FindingsBaseProps) => {
-  const {
-    notifications: { toasts },
-    data: {
-      query: { filterManager, queryString },
-    },
-    uiSettings,
-  } = useKibana().services;
-  const allowLeadingWildcards = uiSettings.get('query:allowLeadingWildcards');
-  const config: EsQueryConfig = useMemo(() => ({ allowLeadingWildcards }), [allowLeadingWildcards]);
-  const baseEsQuery = useMemo(
-    () => getBaseQuery({ dataView, filters, query, config }),
-    [dataView, filters, query, config]
-  );
-
-  /**
-   * Sync filters with the URL query
-   */
-  useEffect(() => {
-    filterManager.setAppFilters(filters);
-    queryString.setQuery(query);
-  }, [filters, filterManager, queryString, query]);
-
-  const handleMalformedQueryError = () => {
-    const error = baseEsQuery.error;
-    if (error) {
-      toasts.addError(error, {
-        title: i18n.translate('xpack.csp.findings.search.queryErrorToastMessage', {
-          defaultMessage: 'Query Error',
-        }),
-        toastLifeTimeMs: 1000 * 5,
-      });
-    }
-  };
-
-  useEffect(handleMalformedQueryError, [baseEsQuery.error, toasts]);
-
-  return baseEsQuery;
-};
-
-export const usePersistedQuery = <T>(getter: ({ filters, query }: FindingsBaseURLQuery) => T) => {
-  const {
-    data: {
-      query: { filterManager, queryString },
-    },
-  } = useKibana().services;
-
-  return useCallback(
-    () =>
-      getter({
-        filters: filterManager.getAppFilters(),
-        query: queryString.getQuery() as Query,
-      }),
-    [getter, filterManager, queryString]
-  );
-};
-
-export const getDefaultQuery = ({ query, filters }: any): any => ({
-  query,
-  filters,
-  sort: { field: '@timestamp', direction: 'desc' },
-  pageIndex: 0,
-});
diff --git a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/use_cloud_security_grouping.ts b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/use_cloud_security_grouping.ts
index c59d3821445240..698dfdf484138e 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/use_cloud_security_grouping.ts
+++ b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/use_cloud_security_grouping.ts
@@ -48,7 +48,6 @@ export const useCloudSecurityGrouping = ({
   const [pageSize, setPageSize] = useState(DEFAULT_PAGE_SIZE);
 
   const { query, error } = useBaseEsQuery({
-    dataView,
     filters: urlQuery.filters,
     query: urlQuery.query,
   });
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_container.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_container.tsx
deleted file mode 100644
index 85095b149bce4d..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_container.tsx
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * 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 React from 'react';
-import { Routes, Route } from '@kbn/shared-ux-router';
-import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
-import { CspFinding } from '../../../../common/schemas/csp_finding';
-import type { Evaluation } from '../../../../common/types_old';
-import { FindingsSearchBar } from '../layout/findings_search_bar';
-import * as TEST_SUBJECTS from '../test_subjects';
-import { usePageSlice } from '../../../common/hooks/use_page_slice';
-import { FindingsByResourceQuery, useFindingsByResource } from './use_findings_by_resource';
-import { FindingsByResourceTable } from './findings_by_resource_table';
-import { getFilters } from '../utils/utils';
-import { LimitedResultsBar } from '../layout/findings_layout';
-import { FindingsGroupBySelector } from '../layout/findings_group_by_selector';
-import { findingsNavigation } from '../../../common/navigation/constants';
-import { ResourceFindings } from './resource_findings/resource_findings_container';
-import { ErrorCallout } from '../layout/error_callout';
-import { CurrentPageOfTotal, FindingsDistributionBar } from '../layout/findings_distribution_bar';
-import { LOCAL_STORAGE_PAGE_SIZE_FINDINGS_KEY } from '../../../common/constants';
-import type { FindingsBaseURLQuery, FindingsBaseProps } from '../../../common/types';
-import { useCloudPostureTable } from '../../../common/hooks/use_cloud_posture_table';
-import { useLimitProperties } from '../../../common/utils/get_limit_properties';
-import { getPaginationTableParams } from '../../../common/hooks/use_cloud_posture_table/utils';
-
-const getDefaultQuery = ({
-  query,
-  filters,
-}: FindingsBaseURLQuery): FindingsBaseURLQuery & FindingsByResourceQuery => ({
-  query,
-  filters,
-  pageIndex: 0,
-  sort: { field: 'compliance_score' as keyof CspFinding, direction: 'asc' },
-});
-
-/**
- * @deprecated: This component is deprecated and will be removed in the next release.
- */
-export const FindingsByResourceContainer = ({ dataView }: FindingsBaseProps) => (
-  <Routes>
-    <Route
-      exact
-      path={findingsNavigation.findings_by_resource.path}
-      render={() => (
-        <TrackApplicationView viewId={findingsNavigation.findings_by_resource.id}>
-          <LatestFindingsByResource dataView={dataView} />
-        </TrackApplicationView>
-      )}
-    />
-    <Route
-      path={findingsNavigation.resource_findings.path}
-      render={() => (
-        <TrackApplicationView viewId={findingsNavigation.resource_findings.id}>
-          <ResourceFindings dataView={dataView} />
-        </TrackApplicationView>
-      )}
-    />
-  </Routes>
-);
-
-/**
- * @deprecated: This component is deprecated and will be removed in the next release.
- */
-const LatestFindingsByResource = ({ dataView }: FindingsBaseProps) => {
-  const { queryError, query, pageSize, setTableOptions, urlQuery, setUrlQuery, onResetFilters } =
-    useCloudPostureTable({
-      dataView,
-      defaultQuery: getDefaultQuery,
-      paginationLocalStorageKey: LOCAL_STORAGE_PAGE_SIZE_FINDINGS_KEY,
-    });
-
-  /**
-   * Page ES query result
-   */
-  const findingsGroupByResource = useFindingsByResource({
-    sortDirection: urlQuery.sort.direction,
-    query,
-    enabled: !queryError,
-  });
-
-  const error = findingsGroupByResource.error || queryError;
-
-  const slicedPage = usePageSlice(findingsGroupByResource.data?.page, urlQuery.pageIndex, pageSize);
-
-  const { isLastLimitedPage, limitedTotalItemCount } = useLimitProperties({
-    total: findingsGroupByResource.data?.total,
-    pageIndex: urlQuery.pageIndex,
-    pageSize,
-  });
-
-  const handleDistributionClick = (evaluation: Evaluation) => {
-    setUrlQuery({
-      pageIndex: 0,
-      filters: getFilters({
-        filters: urlQuery.filters,
-        dataView,
-        field: 'result.evaluation',
-        value: evaluation,
-        negate: false,
-      }),
-    });
-  };
-
-  return (
-    <div data-test-subj={TEST_SUBJECTS.FINDINGS_BY_RESOURCE_CONTAINER}>
-      <FindingsSearchBar
-        dataView={dataView!}
-        setQuery={(newQuery) => {
-          setUrlQuery({ ...newQuery, pageIndex: 0 });
-        }}
-        loading={findingsGroupByResource.isFetching}
-      />
-      <EuiSpacer size="m" />
-
-      {error && <ErrorCallout error={error} />}
-      {!error && (
-        <>
-          {findingsGroupByResource.isSuccess && !!findingsGroupByResource.data.page.length && (
-            <>
-              <FindingsDistributionBar
-                {...{
-                  distributionOnClick: handleDistributionClick,
-                  type: i18n.translate('xpack.csp.findings.findingsByResource.tableRowTypeLabel', {
-                    defaultMessage: 'Resources',
-                  }),
-                  passed: findingsGroupByResource.data.count.passed,
-                  failed: findingsGroupByResource.data.count.failed,
-                }}
-              />
-              <EuiSpacer size="l" />
-              <EuiFlexGroup alignItems="center">
-                <EuiFlexItem grow={false}>
-                  <CurrentPageOfTotal
-                    pageStart={urlQuery.pageIndex * pageSize + 1}
-                    pageEnd={urlQuery.pageIndex * pageSize + slicedPage.length}
-                    total={findingsGroupByResource.data.total}
-                    type={i18n.translate(
-                      'xpack.csp.findings.findingsByResource.tableRowTypeLabel',
-                      {
-                        defaultMessage: 'Resources',
-                      }
-                    )}
-                  />
-                </EuiFlexItem>
-                <EuiFlexItem grow={false} style={{ width: 188, marginLeft: 'auto' }}>
-                  <FindingsGroupBySelector type="resource" />
-                </EuiFlexItem>
-              </EuiFlexGroup>
-            </>
-          )}
-          <EuiSpacer />
-          <FindingsByResourceTable
-            loading={findingsGroupByResource.isFetching}
-            items={slicedPage}
-            onResetFilters={onResetFilters}
-            pagination={getPaginationTableParams({
-              pageSize,
-              pageIndex: urlQuery.pageIndex,
-              totalItemCount: limitedTotalItemCount,
-            })}
-            setTableOptions={setTableOptions}
-            sorting={{
-              sort: { field: 'compliance_score', direction: urlQuery.sort.direction },
-            }}
-            onAddFilter={(field, value, negate) =>
-              setUrlQuery({
-                pageIndex: 0,
-                filters: getFilters({
-                  filters: urlQuery.filters,
-                  dataView,
-                  field,
-                  value,
-                  negate,
-                }),
-              })
-            }
-          />
-        </>
-      )}
-      {isLastLimitedPage && <LimitedResultsBar />}
-    </div>
-  );
-};
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_table.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_table.test.tsx
deleted file mode 100644
index f0a6375a66178f..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_table.test.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * 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 React from 'react';
-import { render, screen, within } from '@testing-library/react';
-import * as TEST_SUBJECTS from '../test_subjects';
-import { FindingsByResourceTable, getResourceId } from './findings_by_resource_table';
-import type { PropsOf } from '@elastic/eui';
-import Chance from 'chance';
-import { TestProvider } from '../../../test/test_provider';
-import type { FindingsByResourcePage } from './use_findings_by_resource';
-import { calculatePostureScore } from '../../../../common/utils/helpers';
-import { EMPTY_STATE_TEST_SUBJ } from '../../../components/test_subjects';
-
-const chance = new Chance();
-
-const getFakeFindingsByResource = (): FindingsByResourcePage => {
-  const failed = chance.natural();
-  const passed = chance.natural();
-  const total = failed + passed;
-  const [resourceName, resourceSubtype, ruleBenchmarkName, ...cisSections] = chance.unique(
-    chance.word,
-    5
-  );
-
-  return {
-    belongs_to: chance.guid(),
-    resource_id: chance.guid(),
-    'resource.name': resourceName,
-    'resource.sub_type': resourceSubtype,
-    'rule.section': cisSections,
-    'rule.benchmark.name': ruleBenchmarkName,
-    compliance_score: passed / total,
-    findings: {
-      failed_findings: failed,
-      passed_findings: passed,
-      normalized: passed / total,
-      total_findings: total,
-    },
-  };
-};
-
-type TableProps = PropsOf<typeof FindingsByResourceTable>;
-
-describe('<FindingsByResourceTable />', () => {
-  it('renders the zero state when status success and data has a length of zero ', async () => {
-    const props: TableProps = {
-      loading: false,
-      items: [],
-      pagination: { pageIndex: 0, pageSize: 10, totalItemCount: 0 },
-      sorting: {
-        sort: { field: 'compliance_score', direction: 'desc' },
-      },
-      setTableOptions: jest.fn(),
-      onAddFilter: jest.fn(),
-      onResetFilters: jest.fn(),
-    };
-
-    render(
-      <TestProvider>
-        <FindingsByResourceTable {...props} />
-      </TestProvider>
-    );
-
-    expect(screen.getByTestId(EMPTY_STATE_TEST_SUBJ)).toBeInTheDocument();
-  });
-
-  it('renders the table with provided items', () => {
-    const data = Array.from({ length: 10 }, getFakeFindingsByResource);
-
-    const props: TableProps = {
-      loading: false,
-      items: data,
-      pagination: { pageIndex: 0, pageSize: 10, totalItemCount: 0 },
-      sorting: {
-        sort: { field: 'compliance_score', direction: 'desc' },
-      },
-      setTableOptions: jest.fn(),
-      onAddFilter: jest.fn(),
-      onResetFilters: jest.fn(),
-    };
-
-    render(
-      <TestProvider>
-        <FindingsByResourceTable {...props} />
-      </TestProvider>
-    );
-
-    data.forEach((item) => {
-      const row = screen.getByTestId(
-        TEST_SUBJECTS.getFindingsByResourceTableRowTestId(getResourceId(item))
-      );
-      expect(row).toBeInTheDocument();
-      expect(within(row).getByText(item.resource_id || '')).toBeInTheDocument();
-      if (item['resource.name'])
-        expect(within(row).getByText(item['resource.name'])).toBeInTheDocument();
-      if (item['resource.sub_type'])
-        expect(within(row).getByText(item['resource.sub_type'])).toBeInTheDocument();
-      expect(
-        within(row).getByText(
-          `${calculatePostureScore(
-            item.findings.passed_findings,
-            item.findings.failed_findings
-          ).toFixed(0)}%`
-        )
-      ).toBeInTheDocument();
-    });
-  });
-});
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_table.tsx
deleted file mode 100644
index 71c4219d3b8523..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_table.tsx
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * 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 React, { useMemo } from 'react';
-import {
-  EuiBasicTable,
-  type EuiTableFieldDataColumnType,
-  type CriteriaWithPagination,
-  type Pagination,
-  EuiToolTip,
-  EuiBasicTableProps,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n-react';
-import numeral from '@elastic/numeral';
-import { generatePath, Link } from 'react-router-dom';
-import { i18n } from '@kbn/i18n';
-import { ColumnNameWithTooltip } from '../../../components/column_name_with_tooltip';
-import { ComplianceScoreBar } from '../../../components/compliance_score_bar';
-import * as TEST_SUBJECTS from '../test_subjects';
-import type { FindingsByResourcePage } from './use_findings_by_resource';
-import { findingsNavigation } from '../../../common/navigation/constants';
-import {
-  createColumnWithFilters,
-  type OnAddFilter,
-  baseFindingsColumns,
-} from '../layout/findings_layout';
-import { EmptyState } from '../../../components/empty_state';
-
-/**
- * @deprecated: This function is deprecated and will be removed in the next release.
- * use getAbbreviatedNumber from x-pack/plugins/cloud_security_posture/public/common/utils/get_abbreviated_number.ts
- */
-export const formatNumber = (value: number) =>
-  value < 1000 ? value : numeral(value).format('0.0a');
-
-type Sorting = Required<EuiBasicTableProps<FindingsByResourcePage>>['sorting'];
-
-interface Props {
-  items: FindingsByResourcePage[];
-  loading: boolean;
-  pagination: Pagination;
-  sorting: Sorting;
-  setTableOptions(options: CriteriaWithPagination<FindingsByResourcePage>): void;
-  onAddFilter: OnAddFilter;
-  onResetFilters: () => void;
-}
-
-/**
- * @deprecated: This function is deprecated and will be removed in the next release.
- */
-export const getResourceId = (resource: FindingsByResourcePage) => {
-  const sections = resource['rule.section'] || [];
-  return [resource.resource_id, ...sections].join('/');
-};
-
-/**
- * @deprecated: This component is deprecated and will be removed in the next release.
- */
-const FindingsByResourceTableComponent = ({
-  items,
-  loading,
-  pagination,
-  sorting,
-  setTableOptions,
-  onAddFilter,
-  onResetFilters,
-}: Props) => {
-  const getRowProps = (row: FindingsByResourcePage) => ({
-    'data-test-subj': TEST_SUBJECTS.getFindingsByResourceTableRowTestId(getResourceId(row)),
-  });
-
-  const getNonSortableColumn = (column: EuiTableFieldDataColumnType<FindingsByResourcePage>) => ({
-    ...column,
-    sortable: false,
-  });
-
-  const columns = useMemo(
-    () => [
-      {
-        ...getNonSortableColumn(findingsByResourceColumns.resource_id),
-        ['data-test-subj']: TEST_SUBJECTS.FINDINGS_BY_RESOURCE_TABLE_RESOURCE_ID_COLUMN,
-      },
-      createColumnWithFilters(
-        getNonSortableColumn(findingsByResourceColumns['resource.sub_type']),
-        { onAddFilter }
-      ),
-      createColumnWithFilters(getNonSortableColumn(findingsByResourceColumns['resource.name']), {
-        onAddFilter,
-      }),
-      createColumnWithFilters(
-        getNonSortableColumn(findingsByResourceColumns['rule.benchmark.name']),
-        { onAddFilter }
-      ),
-      getNonSortableColumn(findingsByResourceColumns.belongs_to),
-      findingsByResourceColumns.compliance_score,
-    ],
-    [onAddFilter]
-  );
-
-  if (!loading && !items.length) {
-    return <EmptyState onResetFilters={onResetFilters} />;
-  }
-
-  return (
-    <EuiBasicTable
-      data-test-subj={TEST_SUBJECTS.FINDINGS_BY_RESOURCE_TABLE}
-      loading={loading}
-      items={items}
-      columns={columns}
-      rowProps={getRowProps}
-      pagination={pagination}
-      sorting={sorting}
-      onChange={setTableOptions}
-    />
-  );
-};
-
-const baseColumns: Array<EuiTableFieldDataColumnType<FindingsByResourcePage>> = [
-  {
-    ...baseFindingsColumns['resource.id'],
-    field: 'resource_id',
-    width: '15%',
-    render: (resourceId: FindingsByResourcePage['resource_id']) => {
-      if (!resourceId) return;
-
-      return (
-        <Link
-          to={generatePath(findingsNavigation.resource_findings.path, {
-            resourceId: encodeURIComponent(resourceId),
-          })}
-          className="eui-textTruncate"
-          title={resourceId}
-        >
-          {resourceId}
-        </Link>
-      );
-    },
-  },
-  baseFindingsColumns['resource.sub_type'],
-  baseFindingsColumns['resource.name'],
-  baseFindingsColumns['rule.benchmark.name'],
-  {
-    field: 'rule.section',
-    truncateText: true,
-    name: (
-      <FormattedMessage
-        id="xpack.csp.findings.findingsByResourceTable.cisSectionsColumnLabel"
-        defaultMessage="CIS Sections"
-      />
-    ),
-    render: (sections: string[]) => {
-      const items = sections.join(', ');
-      return (
-        <EuiToolTip content={items} anchorClassName="eui-textTruncate">
-          <>{items}</>
-        </EuiToolTip>
-      );
-    },
-  },
-  {
-    field: 'belongs_to',
-    name: (
-      <ColumnNameWithTooltip
-        columnName={i18n.translate(
-          'xpack.csp.findings.findingsTable.findingsTableColumn.clusterIdColumnLabel',
-          { defaultMessage: 'Belongs To' }
-        )}
-        tooltipContent={i18n.translate(
-          'xpack.csp.findings.findingsTable.findingsTableColumn.clusterIdColumnTooltipLabel',
-          { defaultMessage: 'Kubernetes Cluster ID or Cloud Account Name' }
-        )}
-      />
-    ),
-    truncateText: true,
-  },
-  {
-    field: 'compliance_score',
-    width: '150px',
-    truncateText: true,
-    sortable: true,
-    name: (
-      <FormattedMessage
-        id="xpack.csp.findings.findingsByResourceTable.postureScoreColumnLabel"
-        defaultMessage="Posture Score"
-      />
-    ),
-    render: (complianceScore: FindingsByResourcePage['compliance_score'], data) => (
-      <ComplianceScoreBar
-        totalPassed={data.findings.passed_findings}
-        totalFailed={data.findings.failed_findings}
-      />
-    ),
-    dataType: 'number',
-  },
-];
-
-type BaseFindingColumnName = typeof baseColumns[number]['field'];
-
-/**
- * @deprecated: This function is deprecated and will be removed in the next release.
- */
-export const findingsByResourceColumns = Object.fromEntries(
-  baseColumns.map((column) => [column.field, column])
-) as Record<BaseFindingColumnName, typeof baseColumns[number]>;
-
-/**
- * @deprecated: This component is deprecated and will be removed in the next release.
- */
-export const FindingsByResourceTable = React.memo(FindingsByResourceTableComponent);
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_container.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_container.test.tsx
deleted file mode 100644
index 95eb978f8e1ca1..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_container.test.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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 React from 'react';
-import { render } from '@testing-library/react';
-import { TestProvider } from '../../../../test/test_provider';
-import { useResourceFindings } from './use_resource_findings';
-import { FindingsBaseProps } from '../../../../common/types';
-import { ResourceFindings } from './resource_findings_container';
-
-jest.mock('./use_resource_findings', () => ({
-  useResourceFindings: jest.fn().mockReturnValue({
-    data: undefined,
-    error: false,
-  }),
-}));
-
-describe('<ResourceFindings />', () => {
-  it('should fetch resources with the correct parameters', async () => {
-    const props: FindingsBaseProps = {
-      dataView: {} as any,
-    };
-
-    render(
-      <TestProvider>
-        <ResourceFindings {...props} />
-      </TestProvider>
-    );
-
-    expect(useResourceFindings).toHaveBeenNthCalledWith(1, {
-      enabled: true,
-      query: {
-        bool: {
-          filter: [],
-          must: [],
-          must_not: [],
-          should: [],
-        },
-      },
-      resourceId: 'undefined',
-      sort: {
-        direction: 'asc',
-        field: 'result.evaluation',
-      },
-    });
-  });
-});
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_container.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_container.tsx
deleted file mode 100644
index bc6e67b887096f..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_container.tsx
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * 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 React, { useCallback } from 'react';
-import {
-  EuiSpacer,
-  EuiButtonEmpty,
-  type EuiDescriptionListProps,
-  EuiFlexGroup,
-  EuiFlexItem,
-} from '@elastic/eui';
-import { Link, useParams } from 'react-router-dom';
-import { FormattedMessage } from '@kbn/i18n-react';
-import { generatePath } from 'react-router-dom';
-import { i18n } from '@kbn/i18n';
-import { CspInlineDescriptionList } from '../../../../components/csp_inline_description_list';
-import type { Evaluation } from '../../../../../common/types_old';
-import { CspFinding } from '../../../../../common/schemas/csp_finding';
-import { CloudPosturePageTitle } from '../../../../components/cloud_posture_page_title';
-import * as TEST_SUBJECTS from '../../test_subjects';
-import { LimitedResultsBar, PageTitle, PageTitleText } from '../../layout/findings_layout';
-import { findingsNavigation } from '../../../../common/navigation/constants';
-import { ResourceFindingsQuery, useResourceFindings } from './use_resource_findings';
-import { usePageSlice } from '../../../../common/hooks/use_page_slice';
-import { getFilters } from '../../utils/utils';
-import { ResourceFindingsTable } from './resource_findings_table';
-import { FindingsSearchBar } from '../../layout/findings_search_bar';
-import { ErrorCallout } from '../../layout/error_callout';
-import {
-  CurrentPageOfTotal,
-  FindingsDistributionBar,
-} from '../../layout/findings_distribution_bar';
-import { LOCAL_STORAGE_PAGE_SIZE_FINDINGS_KEY } from '../../../../common/constants';
-import type { FindingsBaseURLQuery, FindingsBaseProps } from '../../../../common/types';
-import { useCloudPostureTable } from '../../../../common/hooks/use_cloud_posture_table';
-import { useLimitProperties } from '../../../../common/utils/get_limit_properties';
-import { getPaginationTableParams } from '../../../../common/hooks/use_cloud_posture_table/utils';
-
-const getDefaultQuery = ({
-  query,
-  filters,
-}: FindingsBaseURLQuery): FindingsBaseURLQuery &
-  ResourceFindingsQuery & { findingIndex: number } => ({
-  query,
-  filters,
-  sort: { field: 'result.evaluation' as keyof CspFinding, direction: 'asc' },
-  pageIndex: 0,
-  findingIndex: -1,
-});
-
-const BackToResourcesButton = () => (
-  <Link to={generatePath(findingsNavigation.findings_by_resource.path)}>
-    <EuiButtonEmpty iconType="arrowLeft" flush="both">
-      <FormattedMessage
-        id="xpack.csp.findings.resourceFindings.backToResourcesPageButtonLabel"
-        defaultMessage="Back to resources"
-      />
-    </EuiButtonEmpty>
-  </Link>
-);
-
-const getResourceFindingSharedValues = (sharedValues: {
-  resourceId: string;
-  resourceSubType: string;
-  resourceName: string;
-  clusterId: string;
-  cloudAccountName: string;
-}): EuiDescriptionListProps['listItems'] => [
-  {
-    title: i18n.translate('xpack.csp.findings.resourceFindingsSharedValues.resourceTypeTitle', {
-      defaultMessage: 'Resource Type',
-    }),
-    description: sharedValues.resourceSubType,
-  },
-  {
-    title: i18n.translate('xpack.csp.findings.resourceFindingsSharedValues.resourceIdTitle', {
-      defaultMessage: 'Resource ID',
-    }),
-    description: sharedValues.resourceId,
-  },
-  {
-    title: i18n.translate('xpack.csp.findings.resourceFindingsSharedValues.clusterIdTitle', {
-      defaultMessage: 'Cluster ID',
-    }),
-    description: sharedValues.clusterId,
-  },
-  {
-    title: i18n.translate('xpack.csp.findings.resourceFindingsSharedValues.cloudAccountName', {
-      defaultMessage: 'Cloud Account Name',
-    }),
-    description: sharedValues.cloudAccountName,
-  },
-];
-
-/**
- * @deprecated: This component is deprecated and will be removed in the next release.
- */
-export const ResourceFindings = ({ dataView }: FindingsBaseProps) => {
-  const params = useParams<{ resourceId: string }>();
-  const decodedResourceId = decodeURIComponent(params.resourceId);
-
-  const {
-    pageIndex,
-    sort,
-    query,
-    queryError,
-    pageSize,
-    setTableOptions,
-    urlQuery,
-    setUrlQuery,
-    onResetFilters,
-  } = useCloudPostureTable({
-    dataView,
-    defaultQuery: getDefaultQuery,
-    paginationLocalStorageKey: LOCAL_STORAGE_PAGE_SIZE_FINDINGS_KEY,
-  });
-
-  /**
-   * Page ES query result
-   */
-  const resourceFindings = useResourceFindings({
-    sort,
-    resourceId: decodedResourceId,
-    enabled: !queryError,
-    query,
-  });
-
-  const error = resourceFindings.error || queryError;
-
-  const slicedPage = usePageSlice(resourceFindings.data?.page, urlQuery.pageIndex, pageSize);
-
-  const { isLastLimitedPage, limitedTotalItemCount } = useLimitProperties({
-    total: resourceFindings.data?.total,
-    pageIndex: urlQuery.pageIndex,
-    pageSize,
-  });
-
-  const handleDistributionClick = (evaluation: Evaluation) => {
-    setUrlQuery({
-      pageIndex: 0,
-      filters: getFilters({
-        filters: urlQuery.filters,
-        dataView,
-        field: 'result.evaluation',
-        value: evaluation,
-        negate: false,
-      }),
-    });
-  };
-
-  const flyoutFindingIndex = urlQuery?.findingIndex;
-
-  const pagination = getPaginationTableParams({
-    pageSize,
-    pageIndex,
-    totalItemCount: limitedTotalItemCount,
-  });
-
-  const onOpenFlyout = useCallback(
-    (flyoutFinding: CspFinding) => {
-      setUrlQuery({
-        findingIndex: slicedPage.findIndex(
-          (finding) =>
-            finding.resource.id === flyoutFinding?.resource.id &&
-            finding.rule.id === flyoutFinding?.rule.id
-        ),
-      });
-    },
-    [slicedPage, setUrlQuery]
-  );
-
-  const onCloseFlyout = () =>
-    setUrlQuery({
-      findingIndex: -1,
-    });
-
-  const onPaginateFlyout = useCallback(
-    (nextFindingIndex: number) => {
-      // the index of the finding in the current page
-      const newFindingIndex = nextFindingIndex % pageSize;
-
-      // if the finding is not in the current page, we need to change the page
-      const flyoutPageIndex = Math.floor(nextFindingIndex / pageSize);
-
-      setUrlQuery({
-        pageIndex: flyoutPageIndex,
-        findingIndex: newFindingIndex,
-      });
-    },
-    [pageSize, setUrlQuery]
-  );
-
-  return (
-    <div data-test-subj={TEST_SUBJECTS.RESOURCES_FINDINGS_CONTAINER}>
-      <FindingsSearchBar
-        dataView={dataView!}
-        setQuery={(newQuery) => {
-          setUrlQuery({ ...newQuery, pageIndex: 0 });
-        }}
-        loading={resourceFindings.isFetching}
-      />
-      <BackToResourcesButton />
-      <EuiSpacer size="xs" />
-      <PageTitle>
-        <PageTitleText
-          title={
-            <CloudPosturePageTitle
-              title={i18n.translate(
-                'xpack.csp.findings.resourceFindings.resourceFindingsPageTitle',
-                {
-                  defaultMessage: '{resourceName} {hyphen} Findings',
-                  values: {
-                    resourceName: resourceFindings.data?.resourceName,
-                    hyphen: resourceFindings.data?.resourceName ? '-' : '',
-                  },
-                }
-              )}
-            />
-          }
-        />
-      </PageTitle>
-      <EuiSpacer />
-      {resourceFindings.data && (
-        <CspInlineDescriptionList
-          listItems={getResourceFindingSharedValues({
-            resourceId: decodedResourceId,
-            resourceName: resourceFindings.data?.resourceName || '',
-            resourceSubType: resourceFindings.data?.resourceSubType || '',
-            clusterId: resourceFindings.data?.clusterId || '',
-            cloudAccountName: resourceFindings.data?.cloudAccountName || '',
-          })}
-        />
-      )}
-
-      <EuiSpacer />
-      {error && <ErrorCallout error={error} />}
-      {!error && (
-        <>
-          {resourceFindings.isSuccess && !!resourceFindings.data.page.length && (
-            <>
-              <FindingsDistributionBar
-                {...{
-                  distributionOnClick: handleDistributionClick,
-                  type: i18n.translate('xpack.csp.findings.resourceFindings.tableRowTypeLabel', {
-                    defaultMessage: 'Findings',
-                  }),
-                  passed: resourceFindings.data.count.passed,
-                  failed: resourceFindings.data.count.failed,
-                }}
-              />
-              <EuiSpacer size="l" />
-              <EuiFlexGroup alignItems="center">
-                <EuiFlexItem grow={false}>
-                  <CurrentPageOfTotal
-                    pageStart={urlQuery.pageIndex * pageSize + 1}
-                    pageEnd={urlQuery.pageIndex * pageSize + slicedPage.length}
-                    total={resourceFindings.data.total}
-                    type={i18n.translate('xpack.csp.findings.resourceFindings.tableRowTypeLabel', {
-                      defaultMessage: 'Findings',
-                    })}
-                  />
-                </EuiFlexItem>
-              </EuiFlexGroup>
-            </>
-          )}
-          <EuiSpacer />
-          <ResourceFindingsTable
-            onCloseFlyout={onCloseFlyout}
-            onPaginateFlyout={onPaginateFlyout}
-            onOpenFlyout={onOpenFlyout}
-            onResetFilters={onResetFilters}
-            flyoutFindingIndex={flyoutFindingIndex}
-            loading={resourceFindings.isFetching}
-            items={slicedPage}
-            pagination={pagination}
-            sorting={{
-              sort: { field: urlQuery.sort.field, direction: urlQuery.sort.direction },
-            }}
-            setTableOptions={setTableOptions}
-            onAddFilter={(field, value, negate) =>
-              setUrlQuery({
-                pageIndex: 0,
-                filters: getFilters({
-                  filters: urlQuery.filters,
-                  dataView,
-                  field,
-                  value,
-                  negate,
-                }),
-              })
-            }
-          />
-        </>
-      )}
-      {isLastLimitedPage && <LimitedResultsBar />}
-    </div>
-  );
-};
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_table.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_table.test.tsx
deleted file mode 100644
index b47366938db8d2..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_table.test.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * 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 React from 'react';
-import { render, screen, within } from '@testing-library/react';
-import * as TEST_SUBJECTS from '../../test_subjects';
-import { ResourceFindingsTable, ResourceFindingsTableProps } from './resource_findings_table';
-import { TestProvider } from '../../../../test/test_provider';
-
-import { capitalize } from 'lodash';
-import moment from 'moment';
-import { getFindingsFixture } from '../../../../test/fixtures/findings_fixture';
-import { EMPTY_STATE_TEST_SUBJ } from '../../../../components/test_subjects';
-
-describe('<ResourceFindingsTable />', () => {
-  it('should render no findings empty state when status success and data has a length of zero ', async () => {
-    const resourceFindingsProps: ResourceFindingsTableProps = {
-      loading: false,
-      items: [],
-      pagination: { pageIndex: 0, pageSize: 10, totalItemCount: 0 },
-      sorting: {
-        sort: { field: '@timestamp', direction: 'desc' },
-      },
-      setTableOptions: jest.fn(),
-      onAddFilter: jest.fn(),
-      flyoutFindingIndex: -1,
-      onOpenFlyout: jest.fn(),
-      onCloseFlyout: jest.fn(),
-      onPaginateFlyout: jest.fn(),
-      onResetFilters: jest.fn(),
-    };
-
-    render(
-      <TestProvider>
-        <ResourceFindingsTable {...resourceFindingsProps} />
-      </TestProvider>
-    );
-
-    expect(screen.getByTestId(EMPTY_STATE_TEST_SUBJ)).toBeInTheDocument();
-  });
-
-  it('should render resource finding table content when data has a non zero length', () => {
-    const data = Array.from({ length: 10 }, getFindingsFixture);
-
-    const props: ResourceFindingsTableProps = {
-      loading: false,
-      items: data,
-      pagination: { pageIndex: 0, pageSize: 10, totalItemCount: 0 },
-      sorting: {
-        sort: { field: 'cluster_id', direction: 'desc' },
-      },
-      setTableOptions: jest.fn(),
-      onAddFilter: jest.fn(),
-      flyoutFindingIndex: -1,
-      onOpenFlyout: jest.fn(),
-      onCloseFlyout: jest.fn(),
-      onPaginateFlyout: jest.fn(),
-      onResetFilters: jest.fn(),
-    };
-
-    render(
-      <TestProvider>
-        <ResourceFindingsTable {...props} />
-      </TestProvider>
-    );
-
-    data.forEach((item, i) => {
-      const row = screen.getByTestId(
-        TEST_SUBJECTS.getResourceFindingsTableRowTestId(item.resource.id)
-      );
-      const { evaluation } = item.result;
-      const evaluationStatusText = capitalize(
-        item.result.evaluation.slice(0, evaluation.length - 2)
-      );
-
-      expect(row).toBeInTheDocument();
-      expect(within(row).queryByText(item.rule.name)).toBeInTheDocument();
-      expect(within(row).queryByText(evaluationStatusText)).toBeInTheDocument();
-      expect(within(row).queryByText(moment(item['@timestamp']).fromNow())).toBeInTheDocument();
-      expect(within(row).queryByText(item.rule.section)).toBeInTheDocument();
-    });
-  });
-});
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_table.tsx
deleted file mode 100644
index 4dd7070af88f12..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_table.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * 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 React, { useMemo } from 'react';
-import {
-  EuiBasicTable,
-  type CriteriaWithPagination,
-  type Pagination,
-  type EuiBasicTableColumn,
-  type EuiTableActionsColumnType,
-  type EuiBasicTableProps,
-  useEuiTheme,
-} from '@elastic/eui';
-import { CspFinding } from '../../../../../common/schemas/csp_finding';
-import {
-  baseFindingsColumns,
-  createColumnWithFilters,
-  getExpandColumn,
-  type OnAddFilter,
-} from '../../layout/findings_layout';
-import { FindingsRuleFlyout } from '../../findings_flyout/findings_flyout';
-import { getSelectedRowStyle } from '../../utils/utils';
-import * as TEST_SUBJECTS from '../../test_subjects';
-import { EmptyState } from '../../../../components/empty_state';
-
-export interface ResourceFindingsTableProps {
-  items: CspFinding[];
-  loading: boolean;
-  pagination: Pagination & { pageSize: number };
-  sorting: Required<EuiBasicTableProps<CspFinding>>['sorting'];
-  setTableOptions(options: CriteriaWithPagination<CspFinding>): void;
-  onAddFilter: OnAddFilter;
-  onPaginateFlyout: (pageIndex: number) => void;
-  onCloseFlyout: () => void;
-  onOpenFlyout: (finding: CspFinding) => void;
-  flyoutFindingIndex: number;
-  onResetFilters: () => void;
-}
-
-const ResourceFindingsTableComponent = ({
-  items,
-  loading,
-  pagination,
-  sorting,
-  setTableOptions,
-  onAddFilter,
-  onOpenFlyout,
-  flyoutFindingIndex,
-  onPaginateFlyout,
-  onCloseFlyout,
-  onResetFilters,
-}: ResourceFindingsTableProps) => {
-  const { euiTheme } = useEuiTheme();
-
-  const selectedFinding = items[flyoutFindingIndex];
-
-  const getRowProps = (row: CspFinding) => ({
-    style: getSelectedRowStyle(euiTheme, row, selectedFinding),
-    'data-test-subj': TEST_SUBJECTS.getResourceFindingsTableRowTestId(row.resource.id),
-  });
-
-  const columns: [
-    EuiTableActionsColumnType<CspFinding>,
-    ...Array<EuiBasicTableColumn<CspFinding>>
-  ] = useMemo(
-    () => [
-      getExpandColumn<CspFinding>({ onClick: onOpenFlyout }),
-      createColumnWithFilters(baseFindingsColumns['result.evaluation'], { onAddFilter }),
-      baseFindingsColumns['rule.benchmark.rule_number'],
-      createColumnWithFilters(baseFindingsColumns['rule.name'], { onAddFilter }),
-      createColumnWithFilters(baseFindingsColumns['rule.section'], { onAddFilter }),
-      baseFindingsColumns['@timestamp'],
-    ],
-    [onAddFilter, onOpenFlyout]
-  );
-
-  if (!loading && !items.length) {
-    return <EmptyState onResetFilters={onResetFilters} />;
-  }
-
-  return (
-    <>
-      <EuiBasicTable
-        data-test-subj={TEST_SUBJECTS.RESOURCES_FINDINGS_TABLE}
-        loading={loading}
-        items={items}
-        columns={columns}
-        onChange={setTableOptions}
-        pagination={pagination}
-        sorting={sorting}
-        rowProps={getRowProps}
-      />
-      {selectedFinding && (
-        <FindingsRuleFlyout
-          findings={selectedFinding}
-          onClose={onCloseFlyout}
-          findingsCount={pagination.totalItemCount}
-          flyoutIndex={flyoutFindingIndex + pagination.pageIndex * pagination.pageSize}
-          onPaginate={onPaginateFlyout}
-        />
-      )}
-    </>
-  );
-};
-
-/**
- * @deprecated: This component is deprecated and will be removed in the next release.
- */
-export const ResourceFindingsTable = React.memo(ResourceFindingsTableComponent);
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/use_resource_findings.ts b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/use_resource_findings.ts
deleted file mode 100644
index 46a5e126656609..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/use_resource_findings.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * 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 { useQuery } from '@tanstack/react-query';
-import { lastValueFrom } from 'rxjs';
-import { IKibanaSearchRequest, IKibanaSearchResponse } from '@kbn/data-plugin/common';
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { Pagination } from '@elastic/eui';
-import { number } from 'io-ts';
-import { getSafeKspmClusterIdRuntimeMapping } from '../../../../../common/runtime_mappings/get_safe_kspm_cluster_id_runtime_mapping';
-import { CspFinding } from '../../../../../common/schemas/csp_finding';
-import { getAggregationCount, getFindingsCountAggQuery } from '../../utils/utils';
-import { useKibana } from '../../../../common/hooks/use_kibana';
-import type { FindingsBaseEsQuery, Sort } from '../../../../common/types';
-import { CSP_LATEST_FINDINGS_DATA_VIEW } from '../../../../../common/constants';
-import { MAX_FINDINGS_TO_LOAD } from '../../../../common/constants';
-import { showErrorToast } from '../../../../common/utils/show_error_toast';
-
-interface UseResourceFindingsOptions extends FindingsBaseEsQuery {
-  resourceId: string;
-  sort: Sort<CspFinding>;
-  enabled: boolean;
-}
-
-export interface ResourceFindingsQuery {
-  pageIndex: Pagination['pageIndex'];
-  sort: Sort<CspFinding>;
-}
-
-type ResourceFindingsRequest = IKibanaSearchRequest<estypes.SearchRequest>;
-type ResourceFindingsResponse = IKibanaSearchResponse<
-  estypes.SearchResponse<CspFinding, ResourceFindingsResponseAggs>
->;
-
-export type ResourceFindingsResponseAggs = Record<
-  'count' | 'clusterId' | 'resourceSubType' | 'resourceName' | 'cloudAccountName',
-  estypes.AggregationsMultiBucketAggregateBase<
-    estypes.AggregationsStringRareTermsBucketKeys | undefined
-  >
->;
-
-const getResourceFindingsQuery = ({
-  query,
-  resourceId,
-  sort,
-}: UseResourceFindingsOptions): estypes.SearchRequest => ({
-  index: CSP_LATEST_FINDINGS_DATA_VIEW,
-  body: {
-    size: MAX_FINDINGS_TO_LOAD,
-    runtime_mappings: {
-      ...getSafeKspmClusterIdRuntimeMapping(),
-    },
-    query: {
-      ...query,
-      bool: {
-        ...query?.bool,
-        filter: [...(query?.bool?.filter || []), { term: { 'resource.id': resourceId } }],
-      },
-    },
-    sort: [{ [sort.field]: sort.direction }],
-    aggs: {
-      ...getFindingsCountAggQuery(),
-      cloudAccountName: {
-        terms: { field: 'cloud.account.name' },
-      },
-      clusterId: {
-        terms: { field: 'safe_kspm_cluster_id' },
-      },
-      resourceSubType: {
-        terms: { field: 'resource.sub_type' },
-      },
-      resourceName: {
-        terms: { field: 'resource.name' },
-      },
-    },
-  },
-  ignore_unavailable: false,
-});
-
-/**
- * @deprecated: This hook is deprecated and will be removed in the next release.
- */
-export const useResourceFindings = (options: UseResourceFindingsOptions) => {
-  const {
-    data,
-    notifications: { toasts },
-  } = useKibana().services;
-
-  const params = { ...options };
-
-  return useQuery(
-    ['csp_resource_findings', { params }],
-    () =>
-      lastValueFrom(
-        data.search.search<ResourceFindingsRequest, ResourceFindingsResponse>({
-          params: getResourceFindingsQuery(params),
-        })
-      ),
-    {
-      enabled: options.enabled,
-      keepPreviousData: true,
-      select: ({ rawResponse: { hits, aggregations } }: ResourceFindingsResponse) => {
-        if (!aggregations) throw new Error('expected aggregations to exists');
-        assertNonBucketsArray(aggregations.count?.buckets);
-        assertNonBucketsArray(aggregations.clusterId?.buckets);
-        assertNonBucketsArray(aggregations.resourceSubType?.buckets);
-        assertNonBucketsArray(aggregations.resourceName?.buckets);
-        assertNonBucketsArray(aggregations.cloudAccountName?.buckets);
-
-        return {
-          page: hits.hits.map((hit) => hit._source!),
-          total: number.is(hits.total) ? hits.total : 0,
-          count: getAggregationCount(aggregations.count?.buckets),
-          clusterId: getFirstBucketKey(aggregations.clusterId?.buckets),
-          resourceSubType: getFirstBucketKey(aggregations.resourceSubType?.buckets),
-          resourceName: getFirstBucketKey(aggregations.resourceName?.buckets),
-          cloudAccountName: getFirstBucketKey(aggregations.cloudAccountName?.buckets),
-        };
-      },
-      onError: (err: Error) => showErrorToast(toasts, err),
-    }
-  );
-};
-
-function assertNonBucketsArray<T>(arr: unknown): asserts arr is T[] {
-  if (!Array.isArray(arr)) {
-    throw new Error('expected buckets to be an array');
-  }
-}
-
-const getFirstBucketKey = (
-  buckets: Array<estypes.AggregationsStringRareTermsBucketKeys | undefined>
-): string | undefined => buckets[0]?.key;
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/use_findings_by_resource.ts b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/use_findings_by_resource.ts
deleted file mode 100644
index e4bbd955f6092c..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/use_findings_by_resource.ts
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * 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 { useQuery } from '@tanstack/react-query';
-import { lastValueFrom } from 'rxjs';
-import { IKibanaSearchRequest, IKibanaSearchResponse } from '@kbn/data-plugin/common';
-import type { Pagination } from '@elastic/eui';
-import {
-  AggregationsCardinalityAggregate,
-  AggregationsMultiBucketAggregateBase,
-  AggregationsMultiBucketBase,
-  AggregationsScriptedMetricAggregate,
-  AggregationsStringRareTermsBucketKeys,
-  AggregationsStringTermsBucketKeys,
-  SearchRequest,
-  SearchResponse,
-} from '@elastic/elasticsearch/lib/api/types';
-import { CspFinding } from '../../../../common/schemas/csp_finding';
-import { getBelongsToRuntimeMapping } from '../../../../common/runtime_mappings/get_belongs_to_runtime_mapping';
-import { MAX_FINDINGS_TO_LOAD } from '../../../common/constants';
-import { useKibana } from '../../../common/hooks/use_kibana';
-import { showErrorToast } from '../../../common/utils/show_error_toast';
-import type { FindingsBaseEsQuery, Sort } from '../../../common/types';
-import { getAggregationCount, getFindingsCountAggQuery } from '../utils/utils';
-import { CSP_LATEST_FINDINGS_DATA_VIEW } from '../../../../common/constants';
-
-interface UseFindingsByResourceOptions extends FindingsBaseEsQuery {
-  enabled: boolean;
-  sortDirection: Sort<unknown>['direction'];
-}
-
-// Maximum number of grouped findings, default limit in elasticsearch is set to 65,536 (ref: https://www.elastic.co/guide/en/elasticsearch/reference/current/search-settings.html#search-settings-max-buckets)
-const MAX_BUCKETS = 60 * 1000;
-
-export interface FindingsByResourceQuery {
-  pageIndex: Pagination['pageIndex'];
-  sort: Sort<CspFinding>;
-}
-
-type FindingsAggRequest = IKibanaSearchRequest<SearchRequest>;
-type FindingsAggResponse = IKibanaSearchResponse<SearchResponse<{}, FindingsByResourceAggs>>;
-
-export interface FindingsByResourcePage {
-  findings: {
-    failed_findings: number;
-    passed_findings: number;
-    normalized: number;
-    total_findings: number;
-  };
-  compliance_score: number;
-  resource_id?: string;
-  belongs_to?: string;
-  'resource.name'?: string;
-  'resource.sub_type'?: string;
-  'rule.benchmark.name'?: string;
-  'rule.section'?: string[];
-}
-
-interface FindingsByResourceAggs {
-  resource_total: AggregationsCardinalityAggregate;
-  resources: AggregationsMultiBucketAggregateBase<FindingsAggBucket>;
-  count: AggregationsMultiBucketAggregateBase<AggregationsStringRareTermsBucketKeys>;
-}
-
-interface FindingsAggBucket extends AggregationsStringRareTermsBucketKeys {
-  failed_findings: AggregationsMultiBucketBase;
-  compliance_score: AggregationsScriptedMetricAggregate;
-  passed_findings: AggregationsMultiBucketBase;
-  name: AggregationsMultiBucketAggregateBase<AggregationsStringTermsBucketKeys>;
-  subtype: AggregationsMultiBucketAggregateBase<AggregationsStringTermsBucketKeys>;
-  belongs_to: AggregationsMultiBucketAggregateBase<AggregationsStringTermsBucketKeys>;
-  benchmarkName: AggregationsMultiBucketAggregateBase<AggregationsStringRareTermsBucketKeys>;
-  cis_sections: AggregationsMultiBucketAggregateBase<AggregationsStringRareTermsBucketKeys>;
-}
-
-/**
- * @deprecated: This hook is deprecated and will be removed in the next release.
- */
-export const getFindingsByResourceAggQuery = ({
-  query,
-  sortDirection,
-}: UseFindingsByResourceOptions): SearchRequest => ({
-  index: CSP_LATEST_FINDINGS_DATA_VIEW,
-  query,
-  size: 0,
-  runtime_mappings: getBelongsToRuntimeMapping(),
-  aggs: {
-    ...getFindingsCountAggQuery(),
-    resource_total: { cardinality: { field: 'resource.id' } },
-    resources: {
-      terms: { field: 'resource.id', size: MAX_BUCKETS },
-      aggs: {
-        name: {
-          terms: { field: 'resource.name', size: 1 },
-        },
-        subtype: {
-          terms: { field: 'resource.sub_type', size: 1 },
-        },
-        benchmarkName: {
-          terms: { field: 'rule.benchmark.name' },
-        },
-        cis_sections: {
-          terms: { field: 'rule.section' },
-        },
-        failed_findings: {
-          filter: { term: { 'result.evaluation': 'failed' } },
-        },
-        passed_findings: {
-          filter: { term: { 'result.evaluation': 'passed' } },
-        },
-        // this field is runtime generated
-        belongs_to: {
-          terms: { field: 'belongs_to', size: 1 },
-        },
-        compliance_score: {
-          bucket_script: {
-            buckets_path: {
-              passed: 'passed_findings>_count',
-              failed: 'failed_findings>_count',
-            },
-            script: 'params.passed / (params.passed + params.failed)',
-          },
-        },
-        sort_by_compliance_score: {
-          bucket_sort: {
-            size: MAX_FINDINGS_TO_LOAD,
-            sort: [
-              {
-                compliance_score: { order: sortDirection },
-                _count: { order: 'desc' },
-                _key: { order: 'asc' },
-              },
-            ],
-          },
-        },
-      },
-    },
-  },
-  ignore_unavailable: false,
-});
-
-const getFirstKey = (
-  buckets: AggregationsMultiBucketAggregateBase<AggregationsStringTermsBucketKeys>['buckets']
-): undefined | string => {
-  if (!!Array.isArray(buckets) && !!buckets.length) return buckets[0].key;
-};
-
-const getKeysList = (
-  buckets: AggregationsMultiBucketAggregateBase<AggregationsStringRareTermsBucketKeys>['buckets']
-): undefined | string[] => {
-  if (!!Array.isArray(buckets) && !!buckets.length) return buckets.map((v) => v.key);
-};
-
-const createFindingsByResource = (resource: FindingsAggBucket): FindingsByResourcePage => ({
-  resource_id: resource.key,
-  ['resource.name']: getFirstKey(resource.name.buckets),
-  ['resource.sub_type']: getFirstKey(resource.subtype.buckets),
-  ['rule.section']: getKeysList(resource.cis_sections.buckets),
-  ['rule.benchmark.name']: getFirstKey(resource.benchmarkName.buckets),
-  belongs_to: getFirstKey(resource.belongs_to.buckets),
-  compliance_score: resource.compliance_score.value,
-  findings: {
-    failed_findings: resource.failed_findings.doc_count,
-    normalized:
-      resource.doc_count > 0 ? resource.failed_findings.doc_count / resource.doc_count : 0,
-    total_findings: resource.doc_count,
-    passed_findings: resource.passed_findings.doc_count,
-  },
-});
-
-/**
- * @deprecated: This hook is deprecated and will be removed in the next release.
- */
-export const useFindingsByResource = (options: UseFindingsByResourceOptions) => {
-  const {
-    data,
-    notifications: { toasts },
-  } = useKibana().services;
-
-  const params = { ...options };
-
-  return useQuery(
-    ['csp_findings_resource', { params }],
-    async () => {
-      const {
-        rawResponse: { aggregations },
-      } = await lastValueFrom(
-        data.search.search<FindingsAggRequest, FindingsAggResponse>({
-          params: getFindingsByResourceAggQuery(params),
-        })
-      );
-
-      if (!aggregations) throw new Error('Failed to aggregate by, missing resource id');
-
-      if (
-        !Array.isArray(aggregations.resources.buckets) ||
-        !Array.isArray(aggregations.count.buckets)
-      )
-        throw new Error('Failed to group by, missing resource id');
-
-      const page = aggregations.resources.buckets.map(createFindingsByResource);
-
-      return {
-        page,
-        total: aggregations.resource_total.value,
-        count: getAggregationCount(aggregations.count.buckets),
-      };
-    },
-    {
-      enabled: options.enabled,
-      keepPreviousData: true,
-      onError: (err: Error) => showErrorToast(toasts, err),
-    }
-  );
-};
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/layout/findings_layout.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/layout/findings_layout.tsx
deleted file mode 100644
index 468934d6acee31..00000000000000
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/layout/findings_layout.tsx
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * 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 React from 'react';
-import {
-  EuiBottomBar,
-  EuiButtonIcon,
-  EuiSpacer,
-  EuiTableActionsColumnType,
-  EuiTableFieldDataColumnType,
-  EuiText,
-  EuiTitle,
-  EuiToolTip,
-  PropsOf,
-} from '@elastic/eui';
-import { css } from '@emotion/react';
-import { i18n } from '@kbn/i18n';
-import { euiThemeVars } from '@kbn/ui-theme';
-import type { Serializable } from '@kbn/utility-types';
-import { FormattedMessage } from '@kbn/i18n-react';
-import { FindingsByResourcePage } from '../latest_findings_by_resource/use_findings_by_resource';
-import { MAX_FINDINGS_TO_LOAD } from '../../../common/constants';
-import { TimestampTableCell } from '../../../components/timestamp_table_cell';
-import { ColumnNameWithTooltip } from '../../../components/column_name_with_tooltip';
-import { CspEvaluationBadge } from '../../../components/csp_evaluation_badge';
-import {
-  FINDINGS_TABLE_CELL_ADD_FILTER,
-  FINDINGS_TABLE_CELL_ADD_NEGATED_FILTER,
-  FINDINGS_TABLE_EXPAND_COLUMN,
-} from '../test_subjects';
-
-export type OnAddFilter = <T extends string>(key: T, value: Serializable, negate: boolean) => void;
-
-export const PageTitle: React.FC = ({ children }) => (
-  <EuiTitle size="l">
-    <div>{children}</div>
-  </EuiTitle>
-);
-
-export const PageTitleText = ({ title }: { title: React.ReactNode }) => (
-  <EuiText grow={false} size="s">
-    <h1>{title}</h1>
-  </EuiText>
-);
-
-export const getExpandColumn = <T extends unknown>({
-  onClick,
-}: {
-  onClick(item: T): void;
-}): EuiTableActionsColumnType<T> => ({
-  width: '40px',
-  actions: [
-    {
-      'data-test-subj': FINDINGS_TABLE_EXPAND_COLUMN,
-      name: i18n.translate('xpack.csp.expandColumnNameLabel', { defaultMessage: 'Expand' }),
-      description: i18n.translate('xpack.csp.expandColumnDescriptionLabel', {
-        defaultMessage: 'Expand',
-      }),
-      type: 'icon',
-      icon: 'expand',
-      onClick,
-    },
-  ],
-});
-
-const baseColumns = [
-  {
-    field: 'resource.id',
-    name: (
-      <ColumnNameWithTooltip
-        columnName={i18n.translate(
-          'xpack.csp.findings.findingsTable.findingsTableColumn.resourceIdColumnLabel',
-          { defaultMessage: 'Resource ID' }
-        )}
-        tooltipContent={i18n.translate(
-          'xpack.csp.findings.findingsTable.findingsTableColumn.resourceIdColumnTooltipLabel',
-          { defaultMessage: 'Custom Elastic Resource ID' }
-        )}
-      />
-    ),
-    truncateText: true,
-    width: '180px',
-    sortable: true,
-    render: (filename: string) => (
-      <EuiToolTip position="top" content={filename} anchorClassName="eui-textTruncate">
-        <span>{filename}</span>
-      </EuiToolTip>
-    ),
-  },
-  {
-    field: 'result.evaluation',
-    name: i18n.translate('xpack.csp.findings.findingsTable.findingsTableColumn.resultColumnLabel', {
-      defaultMessage: 'Result',
-    }),
-    width: '80px',
-    sortable: true,
-    render: (type: PropsOf<typeof CspEvaluationBadge>['type']) => (
-      <CspEvaluationBadge type={type} />
-    ),
-  },
-  {
-    field: 'resource.sub_type',
-    name: i18n.translate(
-      'xpack.csp.findings.findingsTable.findingsTableColumn.resourceTypeColumnLabel',
-      { defaultMessage: 'Resource Type' }
-    ),
-    sortable: true,
-    truncateText: true,
-    width: '10%',
-  },
-  {
-    field: 'resource.name',
-    name: i18n.translate(
-      'xpack.csp.findings.findingsTable.findingsTableColumn.resourceNameColumnLabel',
-      { defaultMessage: 'Resource Name' }
-    ),
-    sortable: true,
-    truncateText: true,
-    width: '12%',
-    render: (name: FindingsByResourcePage['resource.name']) => {
-      if (!name) return;
-
-      return (
-        <EuiToolTip content={name} position="left" anchorClassName="eui-textTruncate">
-          <>{name}</>
-        </EuiToolTip>
-      );
-    },
-  },
-  {
-    field: 'rule.name',
-    name: i18n.translate(
-      'xpack.csp.findings.findingsTable.findingsTableColumn.ruleNameColumnLabel',
-      { defaultMessage: 'Rule Name' }
-    ),
-    sortable: true,
-    render: (name: string) => (
-      <EuiToolTip content={name} position="left" anchorClassName="eui-textTruncate">
-        <>{name}</>
-      </EuiToolTip>
-    ),
-  },
-  {
-    field: 'rule.benchmark.rule_number',
-    name: i18n.translate(
-      'xpack.csp.findings.findingsTable.findingsTableColumn.ruleNumberColumnLabel',
-      {
-        defaultMessage: 'Rule Number',
-      }
-    ),
-    sortable: true,
-    width: '120px',
-  },
-  {
-    field: 'rule.benchmark.name',
-    name: (
-      <ColumnNameWithTooltip
-        columnName={i18n.translate(
-          'xpack.csp.findings.findingsTable.findingsTableColumn.ruleBenchmarkColumnLabel',
-          { defaultMessage: 'Applicable Benchmark' }
-        )}
-        tooltipContent={i18n.translate(
-          'xpack.csp.findings.findingsTable.findingsTableColumn.ruleBenchmarkColumnTooltipLabel',
-          { defaultMessage: 'The benchmark used to evaluate this resource' }
-        )}
-      />
-    ),
-    sortable: true,
-    truncateText: true,
-  },
-  {
-    field: 'rule.section',
-    name: i18n.translate(
-      'xpack.csp.findings.findingsTable.findingsTableColumn.ruleSectionColumnLabel',
-      { defaultMessage: 'CIS Section' }
-    ),
-    width: '150px',
-    sortable: true,
-    truncateText: true,
-    render: (section: string) => (
-      <EuiToolTip content={section} anchorClassName="eui-textTruncate">
-        <>{section}</>
-      </EuiToolTip>
-    ),
-  },
-  {
-    field: '@timestamp',
-    align: 'right',
-    width: '10%',
-    name: i18n.translate(
-      'xpack.csp.findings.findingsTable.findingsTableColumn.lastCheckedColumnLabel',
-      { defaultMessage: 'Last Checked' }
-    ),
-    truncateText: true,
-    sortable: true,
-    render: (timestamp: number) => <TimestampTableCell timestamp={timestamp} />,
-  },
-] as const;
-
-export const baseFindingsColumns = Object.fromEntries(
-  baseColumns.map((column) => [column.field, column])
-) as Record<typeof baseColumns[number]['field'], typeof baseColumns[number]>;
-
-export const createColumnWithFilters = <T extends unknown>(
-  column: EuiTableFieldDataColumnType<T>,
-  { onAddFilter }: { onAddFilter: OnAddFilter }
-): EuiTableFieldDataColumnType<T> => ({
-  ...column,
-  render: (cellValue: Serializable, item: T) => (
-    <FilterableCell
-      onAddFilter={() => onAddFilter(column.field as string, cellValue, false)}
-      onAddNegateFilter={() => onAddFilter(column.field as string, cellValue, true)}
-      field={column.field as string}
-    >
-      {column.render?.(cellValue, item) || getCellValue(cellValue)}
-    </FilterableCell>
-  ),
-});
-
-const getCellValue = (value: unknown) => {
-  if (!value) return;
-  if (typeof value === 'string' || typeof value === 'number') return value;
-};
-
-const FilterableCell: React.FC<{
-  onAddFilter(): void;
-  onAddNegateFilter(): void;
-  field: string;
-}> = ({ children, onAddFilter, onAddNegateFilter, field }) => (
-  <div
-    css={css`
-      position: relative;
-      width: 100%;
-
-      &:hover {
-        > .__filter_buttons {
-          opacity: 1;
-        }
-        > .__filter_value {
-          max-width: calc(100% - calc(${euiThemeVars.euiSizeL} * 2));
-        }
-      }
-    `}
-  >
-    <div className="__filter_value eui-textTruncate" data-test-subj="filter_cell_value">
-      {children}
-    </div>
-    <div
-      className="__filter_buttons"
-      css={css`
-        opacity: 0;
-        position: absolute;
-        right: 0;
-        top: 0;
-        display: flex;
-      `}
-    >
-      <EuiToolTip
-        position="top"
-        content={i18n.translate('xpack.csp.findings.findingsTableCell.addFilterButtonTooltip', {
-          defaultMessage: 'Add {field} filter',
-          values: { field },
-        })}
-      >
-        <EuiButtonIcon
-          iconType="plusInCircleFilled"
-          onClick={onAddFilter}
-          data-test-subj={FINDINGS_TABLE_CELL_ADD_FILTER}
-          aria-label={i18n.translate('xpack.csp.findings.findingsTableCell.addFilterButton', {
-            defaultMessage: 'Add {field} filter',
-            values: { field },
-          })}
-        />
-      </EuiToolTip>
-
-      <EuiToolTip
-        position="top"
-        content={i18n.translate(
-          'xpack.csp.findings.findingsTableCell.addNegatedFilterButtonTooltip',
-          {
-            defaultMessage: 'Add {field} negated filter',
-            values: { field },
-          }
-        )}
-      >
-        <EuiButtonIcon
-          iconType="minusInCircleFilled"
-          onClick={onAddNegateFilter}
-          data-test-subj={FINDINGS_TABLE_CELL_ADD_NEGATED_FILTER}
-          aria-label={i18n.translate('xpack.csp.findings.findingsTableCell.addNegateFilterButton', {
-            defaultMessage: 'Add {field} negated filter',
-            values: { field },
-          })}
-        />
-      </EuiToolTip>
-    </div>
-  </div>
-);
-
-export const LimitedResultsBar = () => (
-  <>
-    <EuiSpacer size="xxl" />
-    <EuiBottomBar data-test-subj="test-bottom-bar" paddingSize="s">
-      <EuiText textAlign="center">
-        <FormattedMessage
-          id="xpack.csp.findings..bottomBarLabel"
-          defaultMessage="These are the first {maxItems} findings matching your search, refine your search to see others."
-          values={{
-            maxItems: MAX_FINDINGS_TO_LOAD,
-          }}
-        />
-      </EuiText>
-    </EuiBottomBar>
-  </>
-);
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/utils/get_filters.ts b/x-pack/plugins/cloud_security_posture/public/pages/configurations/utils/get_filters.ts
index 200b8777f8cfc9..74d5a421f37fda 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/utils/get_filters.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/utils/get_filters.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { DataView } from '@kbn/data-views-plugin/common';
 import {
   type Filter,
   buildFilter,
@@ -14,7 +15,6 @@ import {
   FilterCompareOptions,
 } from '@kbn/es-query';
 import type { Serializable } from '@kbn/utility-types';
-import type { FindingsBaseProps } from '../../../common/types';
 
 const compareOptions: FilterCompareOptions = {
   negate: false,
@@ -34,7 +34,7 @@ export const getFilters = ({
   negate,
 }: {
   filters: Filter[];
-  dataView: FindingsBaseProps['dataView'];
+  dataView: DataView;
   field: string;
   value: Serializable;
   negate: boolean;

From daf49539453f381f27de162f6f52064345ba2e12 Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Tue, 9 Jan 2024 16:27:27 -0800
Subject: [PATCH 16/25] remove unused translations

---
 .../translations/translations/fr-FR.json      | 337 ++++++++---------
 .../translations/translations/ja-JP.json      | 341 ++++++++----------
 .../translations/translations/zh-CN.json      | 181 ++++------
 3 files changed, 362 insertions(+), 497 deletions(-)

diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index 70a03cb0f755aa..5efa64d0698a2b 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -11939,13 +11939,7 @@
     "xpack.csp.cloudPosturePage.kspmIntegration.packageNotInstalled.description": "Utilisez notre intégration {integrationFullName} (KSPM) pour détecter les erreurs de configuration de sécurité dans vos clusters Kubernetes.",
     "xpack.csp.complianceScoreBar.tooltipTitle": "{failed} résultats en échec et {passed} ayant réussi",
     "xpack.csp.eksIntegration.docsLink": "Lisez {docs} pour en savoir plus",
-    "xpack.csp.findings..bottomBarLabel": "Voici les {maxItems} premiers résultats correspondant à votre recherche. Veuillez l'affiner pour en voir davantage.",
     "xpack.csp.findings.distributionBar.showingPageOfTotalLabel": "Affichage de {pageStart}-{pageEnd} sur {total} {type}",
-    "xpack.csp.findings.findingsTableCell.addFilterButton": "Ajouter un filtre {field}",
-    "xpack.csp.findings.findingsTableCell.addFilterButtonTooltip": "Ajouter un filtre {field}",
-    "xpack.csp.findings.findingsTableCell.addNegatedFilterButtonTooltip": "Ajouter un filtre {field} négatif",
-    "xpack.csp.findings.findingsTableCell.addNegateFilterButton": "Ajouter un filtre {field} négatif",
-    "xpack.csp.findings.resourceFindings.resourceFindingsPageTitle": "{resourceName} {hyphen} Résultats",
     "xpack.csp.findingsFlyout.alerts.alertCount": "{alertCount, plural, one {# alerte} many {# alertes} other {Alertes #}}",
     "xpack.csp.findingsFlyout.alerts.detectionRuleCount": "{ruleCount, plural, one {# règle de détection} many {# règles de détection} other {# règles de détection}}",
     "xpack.csp.noFindingsStates.indexTimeout.indexTimeoutDescription": "La collecte des résultats prend plus de temps que prévu. {docs}.",
@@ -11953,15 +11947,7 @@
     "xpack.csp.rules.rulesTable.showingPageOfTotalLabel": "Affichage de {pageSize} sur {total, plural, one {# règle} many {# règles bien mises} other {# règles}}",
     "xpack.csp.subscriptionNotAllowed.promptDescription": "Pour utiliser ces fonctionnalités de sécurité du cloud, vous devez {link}.",
     "xpack.csp.vulnerabilities.detectionRuleNamePrefix": "Vulnérabilité : {vulnerabilityId}",
-    "xpack.csp.vulnerabilities.resourceVulnerabilities.vulnerabilitiesPageTitle": "{resourceName} {hyphen} vulnérabilités",
-    "xpack.csp.vulnerabilities.totalVulnerabilities": "{total, plural, one {# vulnérabilité} many {# vulnérabilités} other {# vulnérabilités}}",
-    "xpack.csp.vulnerabilities.vulnerabilitiesTableCell.addFilterButton": "Ajouter un filtre {columnId}",
-    "xpack.csp.vulnerabilities.vulnerabilitiesTableCell.addFilterButtonTooltip": "Ajouter un filtre {columnId}",
-    "xpack.csp.vulnerabilities.vulnerabilitiesTableCell.addNegatedFilterButtonTooltip": "Ajouter un filtre {columnId} négatif",
-    "xpack.csp.vulnerabilities.vulnerabilitiesTableCell.addNegateFilterButton": "Ajouter un filtre {columnId} négatif",
     "xpack.csp.vulnerabilities.vulnerabilityOverviewTile.publishedDateText": "{date}",
-    "xpack.csp.vulnerabilitiesByResource.totalResources": "{total, plural, one {# ressource} many {# ressources} other {# ressources}}",
-    "xpack.csp.vulnerabilitiesByResource.totalVulnerabilities": "{total, plural, one {# vulnérabilité} many {# vulnérabilités} other {# vulnérabilités}}",
     "xpack.csp.awsIntegration.accessKeyIdLabel": "ID de clé d'accès",
     "xpack.csp.awsIntegration.assumeRoleDescription": "Un nom ARN (Amazon Resource Name) de rôle IAM est une identité IAM que vous pouvez créer dans votre compte AWS. Lors de la création d'un rôle IAM, les utilisateurs peuvent définir les autorisations accordées au rôle. Les rôles n'ont pas d'informations d'identification à long terme standard telles que des mots de passe ou des clés d'accès.",
     "xpack.csp.awsIntegration.assumeRoleLabel": "Assumer un rôle",
@@ -12096,15 +12082,10 @@
     "xpack.csp.emptyState.readDocsLink": "Lisez les documents",
     "xpack.csp.emptyState.resetFiltersButton": "Réinitialiser les filtres",
     "xpack.csp.emptyState.title": "Aucun résultat ne correspond à vos critères de recherche.",
-    "xpack.csp.expandColumnDescriptionLabel": "Développer",
-    "xpack.csp.expandColumnNameLabel": "Développer",
     "xpack.csp.findings.distributionBar.totalFailedLabel": "Échec des résultats",
     "xpack.csp.findings.distributionBar.totalPassedLabel": "Réussite des résultats",
     "xpack.csp.findings.errorCallout.pageSearchErrorTitle": "Une erreur s’est produite lors de la récupération des résultats de recherche.",
     "xpack.csp.findings.errorCallout.showErrorButtonLabel": "Afficher le message d'erreur",
-    "xpack.csp.findings.findingsByResource.tableRowTypeLabel": "Ressources",
-    "xpack.csp.findings.findingsByResourceTable.cisSectionsColumnLabel": "Sections CIS",
-    "xpack.csp.findings.findingsByResourceTable.postureScoreColumnLabel": "Score du niveau",
     "xpack.csp.findings.findingsErrorToast.searchFailedTitle": "Échec de la recherche",
     "xpack.csp.findings.findingsFlyout.jsonTabTitle": "JSON",
     "xpack.csp.findings.findingsFlyout.overviewTab.alertsTitle": "Alertes",
@@ -12136,16 +12117,11 @@
     "xpack.csp.findings.findingsFlyout.ruleTab.tagsTitle": "Balises",
     "xpack.csp.findings.findingsFlyout.ruleTabTitle": "Règle",
     "xpack.csp.findings.findingsFlyout.tableTabTitle": "Tableau",
-    "xpack.csp.findings.findingsTable.findingsTableColumn.clusterIdColumnLabel": "Appartient à",
-    "xpack.csp.findings.findingsTable.findingsTableColumn.clusterIdColumnTooltipLabel": "ID de cluster Kubernetes ou nom de compte cloud",
     "xpack.csp.findings.findingsTable.findingsTableColumn.lastCheckedColumnLabel": "Dernière vérification",
     "xpack.csp.findings.findingsTable.findingsTableColumn.resourceIdColumnLabel": "ID ressource",
-    "xpack.csp.findings.findingsTable.findingsTableColumn.resourceIdColumnTooltipLabel": "ID ressource Elastic personnalisée",
     "xpack.csp.findings.findingsTable.findingsTableColumn.resourceNameColumnLabel": "Nom de ressource",
     "xpack.csp.findings.findingsTable.findingsTableColumn.resourceTypeColumnLabel": "Type de ressource",
     "xpack.csp.findings.findingsTable.findingsTableColumn.resultColumnLabel": "Résultat",
-    "xpack.csp.findings.findingsTable.findingsTableColumn.ruleBenchmarkColumnLabel": "Benchmark applicable",
-    "xpack.csp.findings.findingsTable.findingsTableColumn.ruleBenchmarkColumnTooltipLabel": "Le benchmark utilisé pour évaluer cette ressource",
     "xpack.csp.findings.findingsTable.findingsTableColumn.ruleNameColumnLabel": "Nom de règle",
     "xpack.csp.findings.findingsTable.findingsTableColumn.ruleNumberColumnLabel": "Numéro de règle",
     "xpack.csp.findings.findingsTable.findingsTableColumn.ruleSectionColumnLabel": "Section CIS",
@@ -12156,12 +12132,6 @@
     "xpack.csp.findings.groupBySelector.groupByNoneLabel": "Aucun",
     "xpack.csp.findings.groupBySelector.groupByResourceIdLabel": "Ressource",
     "xpack.csp.findings.latestFindings.tableRowTypeLabel": "Résultats",
-    "xpack.csp.findings.resourceFindings.backToResourcesPageButtonLabel": "Retour aux ressources",
-    "xpack.csp.findings.resourceFindings.tableRowTypeLabel": "Résultats",
-    "xpack.csp.findings.resourceFindingsSharedValues.cloudAccountName": "Nom du compte cloud",
-    "xpack.csp.findings.resourceFindingsSharedValues.clusterIdTitle": "ID cluster",
-    "xpack.csp.findings.resourceFindingsSharedValues.resourceIdTitle": "ID ressource",
-    "xpack.csp.findings.resourceFindingsSharedValues.resourceTypeTitle": "Type de ressource",
     "xpack.csp.findings.search.queryErrorToastMessage": "Erreur de requête",
     "xpack.csp.findings.searchBar.searchPlaceholder": "Rechercher dans les résultats (par ex. rule.section : \"serveur d'API\")",
     "xpack.csp.findings.tabs.misconfigurations": "Configurations incorrectes",
@@ -12276,9 +12246,6 @@
     "xpack.csp.vulnerabilities": "Vulnérabilités",
     "xpack.csp.vulnerabilities.flyoutTabs.fieldLabel": "Champ",
     "xpack.csp.vulnerabilities.flyoutTabs.fieldValueLabel": "Valeur",
-    "xpack.csp.vulnerabilities.resourceVulnerabilities.backToResourcesPageButtonLabel": "Retour aux ressources",
-    "xpack.csp.vulnerabilities.resourceVulnerabilities.regionTitle": "Région",
-    "xpack.csp.vulnerabilities.resourceVulnerabilities.resourceIdTitle": "ID ressource",
     "xpack.csp.vulnerabilities.searchBar.placeholder": "Rechercher des vulnérabilités (par exemple vulnerability.severity : \"CRITICAL\" )",
     "xpack.csp.vulnerabilities.table.filterIn": "Inclure",
     "xpack.csp.vulnerabilities.table.filterOut": "Exclure",
@@ -12301,24 +12268,12 @@
     "xpack.csp.vulnerabilities.vulnerabilityOverviewTile.publishedDate": "Date de publication",
     "xpack.csp.vulnerabilitiesByResource.severityMap.tooltipTitle": "Carte des degrés de gravité",
     "xpack.csp.vulnerability_dashboard.cspPageTemplate.pageTitle": "Gestion des vulnérabilités natives du cloud",
-    "xpack.csp.vulnerabilityByResourceTable.column.region": "Région",
-    "xpack.csp.vulnerabilityByResourceTable.column.resourceId": "ID ressource",
-    "xpack.csp.vulnerabilityByResourceTable.column.resourceName": "Nom de ressource",
-    "xpack.csp.vulnerabilityByResourceTable.column.severityMap": "Carte des degrés de gravité",
-    "xpack.csp.vulnerabilityByResourceTable.column.vulnerabilities": "Vulnérabilités",
     "xpack.csp.vulnerabilityDashboard.trendGraphChart.accountsDropDown.option.allTitle": "Tous",
     "xpack.csp.vulnerabilityDashboard.trendGraphChart.accountsDropDown.prepend.accountsTitle": "Comptes",
     "xpack.csp.vulnerabilityDashboard.trendGraphChart.trendBySeverityTitle": "Tendance par degré de gravité",
     "xpack.csp.vulnerabilityDashboard.viewAllButton.buttonTitle": "Tout afficher",
-    "xpack.csp.vulnerabilityTable.column.fixVersion": "Version du correctif",
-    "xpack.csp.vulnerabilityTable.column.package": "Pack",
-    "xpack.csp.vulnerabilityTable.column.resourceId": "ID ressource",
-    "xpack.csp.vulnerabilityTable.column.resourceName": "Nom de ressource",
-    "xpack.csp.vulnerabilityTable.column.severity": "Sévérité",
     "xpack.csp.vulnerabilityTable.column.sortAscending": "Basse -> Critique",
     "xpack.csp.vulnerabilityTable.column.sortDescending": "Critique -> Basse",
-    "xpack.csp.vulnerabilityTable.column.version": "Version",
-    "xpack.csp.vulnerabilityTable.column.vulnerability": "Vulnérabilité",
     "xpack.csp.vulnerabilityTable.panel.buttonText": "Afficher toutes les vulnérabilités",
     "xpack.csp.vulnMgmtIntegration.awsOption.nameTitle": "Amazon Web Services",
     "xpack.csp.vulnMgmtIntegration.azureOption.nameTitle": "Azure",
@@ -20152,7 +20107,6 @@
     "xpack.infra.homePage.noMetricsIndicesInstructionsActionLabel": "Voir les instructions de configuration",
     "xpack.infra.homePage.settingsTabTitle": "Paramètres",
     "xpack.infra.homePage.tellUsWhatYouThinkK8sLink": "Dites-nous ce que vous pensez ! (K8s)",
-    "xpack.observabilityShared.featureFeedbackButton.tellUsWhatYouThinkLink": "Dites-nous ce que vous pensez !",
     "xpack.infra.homePage.toolbar.kqlSearchFieldPlaceholder": "Rechercher des données d'infrastructure… (par exemple host.name:host-1)",
     "xpack.infra.hostFlyout.explainProcessMessageTitle": "Quel est ce processus ?",
     "xpack.infra.hosts.searchPlaceholder": "Rechercher dans les hôtes (par ex. cloud.provider:gcp AND system.load.1 > 0.5)",
@@ -20946,6 +20900,47 @@
     "xpack.infra.waffle.unableToSelectMetricErrorTitle": "Impossible de sélectionner les options ou la valeur pour l'indicateur.",
     "xpack.infra.waffleTime.autoRefreshButtonLabel": "Actualisation automatique",
     "xpack.infra.waffleTime.stopRefreshingButtonLabel": "Arrêter l'actualisation",
+    "xpack.observabilityShared.featureFeedbackButton.tellUsWhatYouThinkLink": "Dites-nous ce que vous pensez !",
+    "xpack.observabilityShared.inspector.stats.queryTimeValue": "{queryTime} ms",
+    "xpack.observabilityShared.breadcrumbs.observabilityLinkText": "Observabilité",
+    "xpack.observabilityShared.inspector.stats.dataViewDescription": "La vue de données qui se connecte aux index Elasticsearch.",
+    "xpack.observabilityShared.inspector.stats.dataViewLabel": "Vue de données",
+    "xpack.observabilityShared.inspector.stats.hitsDescription": "Le nombre de documents renvoyés par la requête.",
+    "xpack.observabilityShared.inspector.stats.hitsLabel": "Résultats",
+    "xpack.observabilityShared.inspector.stats.hitsTotalDescription": "Le nombre de documents correspondant à la requête.",
+    "xpack.observabilityShared.inspector.stats.hitsTotalLabel": "Résultats (total)",
+    "xpack.observabilityShared.inspector.stats.kibanaApiQueryParametersDescription": "Les paramètres de requête utilisés dans la requête d'API Kibana à l'origine de la requête Elasticsearch.",
+    "xpack.observabilityShared.inspector.stats.kibanaApiQueryParametersLabel": "Paramètres de requête d'API Kibana",
+    "xpack.observabilityShared.inspector.stats.kibanaApiRouteDescription": "Le chemin de la requête d'API Kibana à l'origine de la requête Elasticsearch.",
+    "xpack.observabilityShared.inspector.stats.kibanaApiRouteLabel": "Chemin de l’API Kibana",
+    "xpack.observabilityShared.inspector.stats.queryTimeDescription": "Le temps qu'il a fallu pour traiter la requête. Ne comprend pas le temps nécessaire pour envoyer la requête ni l'analyser dans le navigateur.",
+    "xpack.observabilityShared.inspector.stats.queryTimeLabel": "Durée de la requête",
+    "xpack.observabilityShared.navigation.betaBadge": "Bêta",
+    "xpack.observabilityShared.navigation.experimentalBadgeLabel": "Version d'évaluation technique",
+    "xpack.observabilityShared.navigation.newBadge": "NOUVEAUTÉ",
+    "xpack.observabilityShared.pageLayout.sideNavTitle": "Observabilité",
+    "xpack.observabilityShared.sectionLink.newLabel": "Nouveauté",
+    "xpack.observabilityShared.technicalPreviewBadgeDescription": "Cette fonctionnalité est en version d'évaluation technique et pourra être modifiée ou retirée complètement dans une future version. Elastic s'efforcera au maximum de corriger tout problème, mais les fonctionnalités en version d'évaluation technique ne sont pas soumises aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale.",
+    "xpack.observabilityShared.technicalPreviewBadgeLabel": "Version d'évaluation technique",
+    "xpack.observabilityShared.tour.alertsStep.imageAltText": "Démonstration des alertes",
+    "xpack.observabilityShared.tour.alertsStep.tourContent": "Définissez et détectez les conditions qui déclenchent des alertes avec des intégrations de plateformes tierces comme l’e-mail, PagerDuty et Slack.",
+    "xpack.observabilityShared.tour.alertsStep.tourTitle": "Soyez informé en cas de modification",
+    "xpack.observabilityShared.tour.endButtonLabel": "Terminer la visite",
+    "xpack.observabilityShared.tour.guidedSetupStep.tourContent": "La façon la plus facile de continuer avec Elastic Observability est de suivre les prochaines étapes recommandées dans l'assistant de données.",
+    "xpack.observabilityShared.tour.guidedSetupStep.tourTitle": "Toujours plus avec Elastic Observability",
+    "xpack.observabilityShared.tour.metricsExplorerStep.imageAltText": "Démonstration de Metrics Explorer",
+    "xpack.observabilityShared.tour.metricsExplorerStep.tourContent": "Diffusez, regroupez et visualisez les mesures provenant de vos systèmes, du cloud, du réseau et d'autres sources d'infrastructure.",
+    "xpack.observabilityShared.tour.metricsExplorerStep.tourTitle": "Monitorer l’intégrité de votre infrastructure",
+    "xpack.observabilityShared.tour.nextButtonLabel": "Suivant",
+    "xpack.observabilityShared.tour.observabilityOverviewStep.tourContent": "Faites un tour rapide pour découvrir les avantages de disposer de toutes vos données d'observabilité dans une seule suite.",
+    "xpack.observabilityShared.tour.observabilityOverviewStep.tourTitle": "Bienvenue dans Elastic Observability",
+    "xpack.observabilityShared.tour.servicesStep.imageAltText": "Démonstration des services",
+    "xpack.observabilityShared.tour.servicesStep.tourContent": "Détectez et réparez rapidement les problèmes de performances en recueillant des informations détaillées sur vos services.",
+    "xpack.observabilityShared.tour.servicesStep.tourTitle": "Identifier et résoudre les problèmes d'application",
+    "xpack.observabilityShared.tour.skipButtonLabel": "Ignorer la visite",
+    "xpack.observabilityShared.tour.streamStep.imageAltText": "Démonstration du flux de logs",
+    "xpack.observabilityShared.tour.streamStep.tourContent": "Surveillez, filtrez et inspectez les événements de journal provenant de vos applications, serveurs, machines virtuelles et conteneurs.",
+    "xpack.observabilityShared.tour.streamStep.tourTitle": "Suivi de vos logs en temps réel",
     "xpack.metricsData.assetDetails.formulas.cpuUsage": "Utilisation CPU",
     "xpack.metricsData.assetDetails.formulas.cpuUsage.iowaitLabel": "iowait",
     "xpack.metricsData.assetDetails.formulas.cpuUsage.irqLabel": "irq",
@@ -21915,53 +21910,6 @@
     "xpack.lens.xyVisualization.dataTypeFailureXShort": "Type de données incorrect pour {axis}.",
     "xpack.lens.xyVisualization.dataTypeFailureYLong": "La dimension {label} fournie pour {axis} possède un type de données incorrect. Un nombre est attendu, mais {dataType} trouvé",
     "xpack.lens.xyVisualization.dataTypeFailureYShort": "Type de données incorrect pour {axis}.",
-    "lensFormulaDocs.tinymath.absFunction.markdown": "\nCalcule une valeur absolue. Une valeur négative est multipliée par -1, une valeur positive reste identique.\n\nExemple : calculer la distance moyenne par rapport au niveau de la mer \"abs(average(altitude))\"\n    ",
-    "lensFormulaDocs.tinymath.addFunction.markdown": "\nAjoute jusqu'à deux nombres.\nFonctionne également avec le symbole \"+\".\n\nExemple : calculer la somme de deux champs\n\n\"sum(price) + sum(tax)\"\n\nExemple : compenser le compte par une valeur statique\n\n\"add(count(), 5)\"\n    ",
-    "lensFormulaDocs.tinymath.cbrtFunction.markdown": "\nÉtablit la racine carrée de la valeur.\n\nExemple : calculer la longueur du côté à partir du volume\n`cbrt(last_value(volume))`\n    ",
-    "lensFormulaDocs.tinymath.ceilFunction.markdown": "\nArrondit le plafond de la valeur au chiffre supérieur.\n\nExemple : arrondir le prix au dollar supérieur\n`ceil(sum(price))`\n    ",
-    "lensFormulaDocs.tinymath.clampFunction.markdown": "\nÉtablit une limite minimale et maximale pour la valeur.\n\nExemple : s'assurer de repérer les valeurs aberrantes\n```\nclamp(\n  average(bytes),\n  percentile(bytes, percentile=5),\n  percentile(bytes, percentile=95)\n)\n```\n",
-    "lensFormulaDocs.tinymath.cubeFunction.markdown": "\nCalcule le cube d'un nombre.\n\nExemple : calculer le volume à partir de la longueur du côté\n`cube(last_value(length))`\n    ",
-    "lensFormulaDocs.tinymath.defaultFunction.markdown": "\nRetourne une valeur numérique par défaut lorsque la valeur est nulle.\n\nExemple : Retourne -1 lorsqu'un champ ne contient aucune donnée.\n\"defaults(average(bytes), -1)\"\n",
-    "lensFormulaDocs.tinymath.divideFunction.markdown": "\nDivise le premier nombre par le deuxième.\nFonctionne également avec le symbole \"/\".\n\nExemple : calculer la marge bénéficiaire\n\"sum(profit) / sum(revenue)\"\n\nExemple : \"divide(sum(bytes), 2)\"\n    ",
-    "lensFormulaDocs.tinymath.eqFunction.markdown": "\nEffectue une comparaison d'égalité entre deux valeurs.\nÀ utiliser en tant que condition pour la fonction de comparaison \"ifelse\".\nFonctionne également avec le symbole \"==\".\n\nExemple : Retourne \"true\" si la moyenne d'octets est égale à la quantité de mémoire moyenne.\n\"average(bytes) == average(memory)\"\n\nExemple : \"eq(sum(bytes), 1000000)\"\n    ",
-    "lensFormulaDocs.tinymath.expFunction.markdown": "\nÉlève *e* à la puissance n.\n\nExemple : calculer la fonction exponentielle naturelle\n\n`exp(last_value(duration))`\n    ",
-    "lensFormulaDocs.tinymath.fixFunction.markdown": "\nPour les valeurs positives, part du bas. Pour les valeurs négatives, part du haut.\n\nExemple : arrondir à zéro\n\"fix(sum(profit))\"\n    ",
-    "lensFormulaDocs.tinymath.floorFunction.markdown": "\nArrondit à la valeur entière inférieure la plus proche.\n\nExemple : arrondir un prix au chiffre inférieur\n\"floor(sum(price))\"\n    ",
-    "lensFormulaDocs.tinymath.gteFunction.markdown": "\nEffectue une comparaison de supériorité entre deux valeurs.\nÀ utiliser en tant que condition pour la fonction de comparaison \"ifelse\".\nFonctionne également avec le symbole \">=\".\n\nExemple : Retourne \"true\" si la moyenne d'octets est supérieure ou égale à la quantité moyenne de mémoire.\n\"average(bytes) >= average(memory)\"\n\nExemple : \"gte(average(bytes), 1000)\"\n    ",
-    "lensFormulaDocs.tinymath.gtFunction.markdown": "\nEffectue une comparaison de supériorité entre deux valeurs.\nÀ utiliser en tant que condition pour la fonction de comparaison \"ifelse\".\nFonctionne également avec le symbole \">\".\n\nExemple : Retourne \"true\" si la moyenne d'octets est supérieure à la quantité moyenne de mémoire.\n\"average(bytes) > average(memory)\"\n\nExemple : \"gt(average(bytes), 1000)\"\n    ",
-    "lensFormulaDocs.tinymath.ifElseFunction.markdown": "\nRetourne une valeur selon si l'élément de condition est \"true\" ou \"false\".\n\nExemple : Revenus moyens par client, mais dans certains cas, l'ID du client n'est pas fourni, et le client est alors compté comme client supplémentaire.\n`sum(total)/(unique_count(customer_id) + ifelse( count() > count(kql='customer_id:*'), 1, 0))`\n    ",
-    "lensFormulaDocs.tinymath.logFunction.markdown": "\nÉtablit un logarithme avec base optionnelle. La base naturelle *e* est utilisée par défaut.\n\nExemple : calculer le nombre de bits nécessaire au stockage de valeurs\n```\nlog(sum(bytes))\nlog(sum(bytes), 2)\n```\n    ",
-    "lensFormulaDocs.tinymath.lteFunction.markdown": "\nEffectue une comparaison d'infériorité ou de supériorité entre deux valeurs.\nÀ utiliser en tant que condition pour la fonction de comparaison \"ifelse\".\nFonctionne également avec le symbole \"<=\".\n\nExemple : Retourne \"true\" si la moyenne d'octets est inférieure ou égale à la quantité moyenne de mémoire.\n\"average(bytes) <= average(memory)\"\n\nExemple : \"lte(average(bytes), 1000)\"\n    ",
-    "lensFormulaDocs.tinymath.ltFunction.markdown": "\nEffectue une comparaison d'infériorité entre deux valeurs.\nÀ utiliser en tant que condition pour la fonction de comparaison \"ifelse\".\nFonctionne également avec le symbole \"<\".\n\nExemple : Retourne \"true\" si la moyenne d'octets est inférieure à la quantité moyenne de mémoire.\n\"average(bytes) <= average(memory)\"\n\nExemple : \"lt(average(bytes), 1000)\"\n    ",
-    "lensFormulaDocs.tinymath.maxFunction.markdown": "\nTrouve la valeur maximale entre deux nombres.\n\nExemple : Trouver le maximum entre deux moyennes de champs\n\"pick_max(average(bytes), average(memory))\"\n        ",
-    "lensFormulaDocs.tinymath.minFunction.markdown": "\nTrouve la valeur minimale entre deux nombres.\n\nExemple : Trouver le minimum entre deux moyennes de champs\n`pick_min(average(bytes), average(memory))`\n    ",
-    "lensFormulaDocs.tinymath.modFunction.markdown": "\nÉtablit le reste après division de la fonction par un nombre.\n\nExemple : calculer les trois derniers chiffres d'une valeur\n\"mod(sum(price), 1000)\"\n    ",
-    "lensFormulaDocs.tinymath.multiplyFunction.markdown": "\nMultiplie deux nombres.\nFonctionne également avec le symbole \"*\".\n\nExemple : calculer le prix après application du taux d'imposition courant\n`sum(bytes) * last_value(tax_rate)`\n\nExemple : calculer le prix après application du taux d'imposition constant\n\"multiply(sum(price), 1.2)\"\n    ",
-    "lensFormulaDocs.tinymath.powFunction.markdown": "\nÉlève la valeur à une puissance spécifique. Le deuxième argument est obligatoire.\n\nExemple : calculer le volume en fonction de la longueur du côté\n\"pow(last_value(length), 3)\"\n    ",
-    "lensFormulaDocs.tinymath.roundFunction.markdown": "\nArrondit à un nombre donné de décimales, 0 étant la valeur par défaut.\n\nExemples : arrondir au centième\n```\nround(sum(bytes))\nround(sum(bytes), 2)\n```\n    ",
-    "lensFormulaDocs.tinymath.sqrtFunction.markdown": "\nÉtablit la racine carrée d'une valeur positive uniquement.\n\nExemple : calculer la longueur du côté en fonction de la surface\n`sqrt(last_value(area))`\n    ",
-    "lensFormulaDocs.tinymath.squareFunction.markdown": "\nÉlève la valeur à la puissance 2.\n\nExemple : calculer l’aire en fonction de la longueur du côté\n`square(last_value(length))`\n    ",
-    "lensFormulaDocs.tinymath.subtractFunction.markdown": "\nSoustrait le premier nombre du deuxième.\nFonctionne également avec le symbole \"-\".\n\nExemple : calculer la plage d'un champ\n\"subtract(max(bytes), min(bytes))\"\n    ",
-    "lensFormulaDocs.documentation.filterRatioDescription.markdown": "### Rapport de filtre :\n\nUtilisez \"kql=''\" pour filtrer un ensemble de documents et le comparer à d'autres documents du même regroupement.\nPar exemple, pour consulter l'évolution du taux d'erreur au fil du temps :\n\n```\ncount(kql='response.status_code > 400') / count()\n```\n        ",
-    "lensFormulaDocs.documentation.percentOfTotalDescription.markdown": "### Pourcentage du total\n\nLes formules peuvent calculer \"overall_sum\" pour tous les regroupements,\nce qui permet de convertir chaque regroupement en un pourcentage du total :\n\n```\nsum(products.base_price) / overall_sum(sum(products.base_price))\n```\n        ",
-    "lensFormulaDocs.documentation.recentChangeDescription.markdown": "### Modification récente\n\nUtilisez \"reducedTimeRange='30m'\" pour ajouter un filtre supplémentaire sur la plage temporelle d'un indicateur aligné avec la fin d'une plage temporelle globale. Vous pouvez l'utiliser pour calculer le degré de modification récente d'une valeur.\n\n```\nmax(system.network.in.bytes, reducedTimeRange=\"30m\")\n - min(system.network.in.bytes, reducedTimeRange=\"30m\")\n```\n        ",
-    "lensFormulaDocs.documentation.weekOverWeekDescription.markdown": "### Semaine après semaine :\n\nUtilisez \"shift='1w'\" pour obtenir la valeur de chaque regroupement\nde la semaine précédente. Le décalage ne doit pas être utilisé avec la fonction *Valeurs les plus élevées*.\n\n```\npercentile(system.network.in.bytes, percentile=99) /\npercentile(system.network.in.bytes, percentile=99, shift='1w')\n```\n        ",
-    "lensFormulaDocs.cardinality.documentation.markdown": "\nCalcule le nombre de valeurs uniques d'un champ donné. Fonctionne pour les nombres, les chaînes, les dates et les valeurs booléennes.\n\nExemple : calculer le nombre de produits différents :\n`unique_count(product.name)`\n\nExemple : calculer le nombre de produits différents du groupe \"clothes\" :\n\"unique_count(product.name, kql='product.group=clothes')\"\n      ",
-    "lensFormulaDocs.count.documentation.markdown": "\nNombre total de documents. Lorsque vous fournissez un champ, le nombre total de valeurs de champ est compté. Lorsque vous utilisez la fonction de décompte pour les champs qui comportent plusieurs valeurs dans un même document, toutes les valeurs sont comptées.\n\n#### Exemples\n\nPour calculer le nombre total de documents, utilisez `count()`.\n\nPour calculer le nombre de produits, utilisez `count(products.id)`.\n\nPour calculer le nombre de documents qui correspondent à un filtre donné, utilisez `count(kql='price > 500')`.\n      ",
-    "lensFormulaDocs.counterRate.documentation.markdown": "\nCalcule le taux d'un compteur toujours croissant. Cette fonction renvoie uniquement des résultats utiles inhérents aux champs d'indicateurs de compteur qui contiennent une mesure quelconque à croissance régulière.\nSi la valeur diminue, elle est interprétée comme une mesure de réinitialisation de compteur. Pour obtenir des résultats plus précis, \"counter_rate\" doit être calculé d’après la valeur \"max\" du champ.\n\nCe calcul est réalisé séparément pour des séries distinctes définies par des filtres ou des dimensions de valeurs supérieures.\nIl utilise l'intervalle en cours utilisé dans la formule.\n\nExemple : visualiser le taux d'octets reçus au fil du temps par un serveur Memcached :\n`counter_rate(max(memcached.stats.read.bytes))`\n      ",
-    "lensFormulaDocs.cumulativeSum.documentation.markdown": "\nCalcule la somme cumulée d'un indicateur au fil du temps, en ajoutant toutes les valeurs précédentes d'une série à chaque valeur. Pour utiliser cette fonction, vous devez également configurer une dimension de l'histogramme de dates.\n\nCe calcul est réalisé séparément pour des séries distinctes définies par des filtres ou des dimensions de valeurs supérieures.\n\nExemple : visualiser les octets reçus cumulés au fil du temps :\n`cumulative_sum(sum(bytes))`\n      ",
-    "lensFormulaDocs.differences.documentation.markdown": "\nCalcule la différence par rapport à la dernière valeur d'un indicateur au fil du temps. Pour utiliser cette fonction, vous devez également configurer une dimension de l'histogramme de dates.\nLes données doivent être séquentielles pour les différences. Si vos données sont vides lorsque vous utilisez des différences, essayez d'augmenter l'intervalle de l'histogramme de dates.\n\nCe calcul est réalisé séparément pour des séries distinctes définies par des filtres ou des dimensions de valeurs supérieures.\n\nExemple : visualiser la modification des octets reçus au fil du temps :\n`differences(sum(bytes))`\n      ",
-    "lensFormulaDocs.lastValue.documentation.markdown": "\nRenvoie la valeur d'un champ du dernier document, triée par le champ d'heure par défaut de la vue de données.\n\nCette fonction permet de récupérer le dernier état d'une entité.\n\nExemple : obtenir le statut actuel du serveur A :\n`last_value(server.status, kql='server.name=\"A\"')`\n      ",
-    "lensFormulaDocs.metric.documentation.markdown": "\nRenvoie l'indicateur {metric} d'un champ. Cette fonction fonctionne uniquement pour les champs numériques.\n\nExemple : obtenir l'indicateur {metric} d'un prix :\n\"{metric}(price)\"\n\nExemple : obtenir l'indicateur {metric} d'un prix pour des commandes du Royaume-Uni :\n\"{metric}(price, kql='location:UK')\"\n      ",
-    "lensFormulaDocs.movingAverage.documentation.markdown": "\nCalcule la moyenne mobile d'un indicateur au fil du temps, en prenant la moyenne des n dernières valeurs pour calculer la valeur actuelle. Pour utiliser cette fonction, vous devez également configurer une dimension de l'histogramme de dates.\nLa valeur de fenêtre par défaut est {defaultValue}.\n\nCe calcul est réalisé séparément pour des séries distinctes définies par des filtres ou des dimensions de valeurs supérieures.\n\nPrend un paramètre nommé \"window\" qui spécifie le nombre de dernières valeurs à inclure dans le calcul de la moyenne de la valeur actuelle.\n\nExemple : lisser une ligne de mesures :\n`moving_average(sum(bytes), window=5)`\n      ",
-    "lensFormulaDocs.overall_average.documentation.markdown": "\nCalcule la moyenne d'un indicateur pour tous les points de données d'une série dans le graphique actuel. Une série est définie par une dimension à l'aide d'un histogramme de dates ou d'une fonction d'intervalle.\nD'autres dimensions permettant de répartir les données telles que les valeurs supérieures ou les filtres sont traitées en tant que séries distinctes.\n\nSi le graphique actuel n'utilise aucun histogramme de dates ou aucune fonction d'intervalle, \"overall_average\" calcule la moyenne pour toutes les dimensions, quelle que soit la fonction utilisée.\n\nExemple : écart par rapport à la moyenne :\n\"sum(bytes) - overall_average(sum(bytes))\"\n      ",
-    "lensFormulaDocs.overall_max.documentation.markdown": "\nCalcule la valeur maximale d'un indicateur pour tous les points de données d'une série dans le graphique actuel. Une série est définie par une dimension à l'aide d'un histogramme de dates ou d'une fonction d'intervalle.\nD'autres dimensions permettant de répartir les données telles que les valeurs supérieures ou les filtres sont traitées en tant que séries distinctes.\n\nSi le graphique actuel n'utilise aucun histogramme de dates ou aucune fonction d'intervalle, \"overall_max\" calcule la valeur maximale pour toutes les dimensions, quelle que soit la fonction utilisée.\n\nExemple : pourcentage de plage\n\"(sum(bytes) - overall_min(sum(bytes))) / (overall_max(sum(bytes)) - overall_min(sum(bytes)))\"\n      ",
-    "lensFormulaDocs.overall_min.documentation.markdown": "\nCalcule la valeur minimale d'un indicateur pour tous les points de données d'une série dans le graphique actuel. Une série est définie par une dimension à l'aide d'un histogramme de dates ou d'une fonction d'intervalle.\nD'autres dimensions permettant de répartir les données telles que les valeurs supérieures ou les filtres sont traitées en tant que séries distinctes.\n\nSi le graphique actuel n'utilise aucun histogramme de dates ou aucune fonction d'intervalle, \"overall_min\" calcule la valeur minimale pour toutes les dimensions, quelle que soit la fonction utilisée.\n\nExemple : pourcentage de plage\n\"(sum(bytes) - overall_min(sum(bytes)) / (overall_max(sum(bytes)) - overall_min(sum(bytes)))\"\n      ",
-    "lensFormulaDocs.overall_sum.documentation.markdown": "\nCalcule la somme d'un indicateur pour tous les points de données d'une série dans le graphique actuel. Une série est définie par une dimension à l'aide d'un histogramme de dates ou d'une fonction d'intervalle.\nD'autres dimensions permettant de répartir les données telles que les valeurs supérieures ou les filtres sont traitées en tant que séries distinctes.\n\nSi le graphique actuel n'utilise aucun histogramme de dates ou aucune fonction d'intervalle, \"overall_sum\" calcule la somme pour toutes les dimensions, quelle que soit la fonction utilisée.\n\nExemple : pourcentage de total\n\"sum(bytes) / overall_sum(sum(bytes))\"\n      ",
-    "lensFormulaDocs.percentile.documentation.markdown": "\nRenvoie le centile spécifié des valeurs d'un champ. Il s'agit de la valeur de n pour cent des valeurs présentes dans les documents.\n\nExemple : obtenir le nombre d'octets supérieurs à 95 % des valeurs :\n`percentile(bytes, percentile=95)`\n      ",
-    "lensFormulaDocs.percentileRanks.documentation.markdown": "\nRetourne le pourcentage de valeurs qui sont en dessous d'une certaine valeur. Par exemple, si une valeur est supérieure à 95 % des valeurs observées, elle est placée au 95e rang centile.\n\nExemple : Obtenir le pourcentage de valeurs qui sont en dessous de 100 :\n\"percentile_rank(bytes, value=100)\"\n      ",
-    "lensFormulaDocs.standardDeviation.documentation.markdown": "\nRetourne la taille de la variation ou de la dispersion du champ. Cette fonction ne s’applique qu’aux champs numériques.\n\n#### Exemples\n\nPour obtenir l'écart type d'un prix, utilisez standard_deviation(price).\n\nPour obtenir la variance du prix des commandes passées au Royaume-Uni, utilisez `square(standard_deviation(price, kql='location:UK'))`.\n      ",
-    "lensFormulaDocs.time_scale.documentation.markdown": "\n\nCette fonction avancée est utile pour normaliser les comptes et les sommes sur un intervalle de temps spécifique. Elle permet l'intégration avec les indicateurs qui sont stockés déjà normalisés sur un intervalle de temps spécifique.\n\nVous pouvez faire appel à cette fonction uniquement si une fonction d'histogramme des dates est utilisée dans le graphique actuel.\n\nExemple : Un rapport comparant un indicateur déjà normalisé à un autre indicateur devant être normalisé.\n\"normalize_by_unit(counter_rate(max(system.diskio.write.bytes)), unit='s') / last_value(apache.status.bytes_per_second)\"\n      ",
     "xpack.lens.AggBasedLabel": "visualisation basée sur l'agrégation",
     "xpack.lens.app.addToLibrary": "Enregistrer dans la bibliothèque",
     "xpack.lens.app.cancel": "Annuler",
@@ -22139,11 +22087,6 @@
     "xpack.lens.fittingFunctionsTitle.lookahead": "Suivant",
     "xpack.lens.fittingFunctionsTitle.none": "Masquer",
     "xpack.lens.fittingFunctionsTitle.zero": "Zéro",
-    "lensFormulaDocs.tinymath.base": "base",
-    "lensFormulaDocs.boolean": "booléen",
-    "lensFormulaDocs.tinymath.condition": "condition",
-    "lensFormulaDocs.tinymath.decimals": "décimales",
-    "lensFormulaDocs.tinymath.defaultValue": "par défaut",
     "xpack.lens.formula.disableWordWrapLabel": "Désactiver le renvoi à la ligne des mots",
     "xpack.lens.formula.editorHelpInlineHideLabel": "Masquer la référence des fonctions",
     "xpack.lens.formula.editorHelpInlineHideToolTip": "Masquer la référence des fonctions",
@@ -22151,35 +22094,12 @@
     "xpack.lens.formula.fullScreenEnterLabel": "Développer",
     "xpack.lens.formula.fullScreenExitLabel": "Réduire",
     "xpack.lens.formula.kqlExtraArguments": "[kql]?: string, [lucene]?: string",
-    "lensFormulaDocs.tinymath.left": "gauche",
-    "lensFormulaDocs.tinymath.max": "max",
-    "lensFormulaDocs.tinymath.min": "min",
-    "lensFormulaDocs.number": "numéro",
     "xpack.lens.formula.reducedTimeRangeExtraArguments": "[reducedTimeRange]?: string",
     "xpack.lens.formula.requiredArgument": "Obligatoire",
-    "lensFormulaDocs.tinymath.right": "droite",
     "xpack.lens.formula.shiftExtraArguments": "[shift]?: string",
-    "lensFormulaDocs.string": "chaîne",
-    "lensFormulaDocs.tinymath.value": "valeur",
-    "lensFormulaDocs.CommonFormulaDocumentation": "Les formules les plus courantes divisent deux valeurs pour produire un pourcentage. Pour obtenir un affichage correct, définissez \"Format de valeur\" sur \"pourcent\".",
-    "lensFormulaDocs.documentation.columnCalculationSection": "Calculs de colonnes",
-    "lensFormulaDocs.documentation.columnCalculationSectionDescription": "Ces fonctions sont exécutées pour chaque ligne, mais elles sont fournies avec la colonne entière comme contexte. Elles sont également appelées fonctions de fenêtre.",
-    "lensFormulaDocs.documentation.comparisonSection": "Comparaison",
-    "lensFormulaDocs.documentation.comparisonSectionDescription": "Ces fonctions sont utilisées pour effectuer une comparaison de valeurs.",
-    "lensFormulaDocs.documentation.constantsSection": "Contexte Kibana",
-    "lensFormulaDocs.documentation.constantsSectionDescription": "Ces fonctions sont utilisées pour récupérer des variables de contexte Kibana, c’est-à-dire l’histogramme de date \"interval\", le \"now\" actuel et le \"time_range\" sélectionné, et pour vous aider à faire des opérations mathématiques de dates.",
-    "lensFormulaDocs.documentation.elasticsearchSection": "Elasticsearch",
-    "lensFormulaDocs.documentation.elasticsearchSectionDescription": "Ces fonctions seront exécutées sur les documents bruts pour chaque ligne du tableau résultant, en agrégeant tous les documents correspondant aux dimensions de répartition en une seule valeur.",
-    "lensFormulaDocs.documentation.filterRatio": "Rapport de filtre",
-    "lensFormulaDocs.documentation.mathSection": "Mathématique",
-    "lensFormulaDocs.documentation.mathSectionDescription": "Ces fonctions seront exécutées pour chaque ligne du tableau résultant en utilisant des valeurs uniques de la même ligne calculées à l'aide d'autres fonctions.",
-    "lensFormulaDocs.documentation.percentOfTotal": "Pourcentage du total",
-    "lensFormulaDocs.documentation.recentChange": "Modification récente",
-    "lensFormulaDocs.documentation.weekOverWeek": "Semaine après semaine",
     "xpack.lens.formulaDocumentationHeading": "Fonctionnement",
     "xpack.lens.formulaEnableWordWrapLabel": "Activer le renvoi à la ligne des mots",
     "xpack.lens.formulaExampleMarkdown": "Exemples",
-    "lensFormulaDocs.frequentlyUsedHeading": "Formules courantes",
     "xpack.lens.formulaPlaceholderText": "Saisissez une formule en combinant des fonctions avec la fonction mathématique, telle que :",
     "xpack.lens.fullExtent.niceValues": "Arrondir aux valeurs de \"gentillesse\"",
     "xpack.lens.functions.collapse.args.byHelpText": "Colonnes selon lesquelles effectuer le regroupement - ces colonnes sont conservées telles quelles",
@@ -22238,29 +22158,21 @@
     "xpack.lens.indexPattern.allFieldsLabelHelp": "Glissez-déposez les champs disponibles dans l’espace de travail et créez des visualisations. Pour modifier les champs disponibles, sélectionnez une vue de données différente, modifiez vos requêtes ou utilisez une plage temporelle différente. Certains types de champ ne peuvent pas être visualisés dans Lens, y compris les champ de texte intégral et champs géographiques.",
     "xpack.lens.indexPattern.ascendingCountPrecisionErrorWarning.link": "veuillez consulter la documentation",
     "xpack.lens.indexPattern.availableFieldsLabel": "Champs disponibles",
-    "lensFormulaDocs.avg": "Moyenne",
     "xpack.lens.indexPattern.avg.description": "Agrégation d'indicateurs à valeur unique qui calcule la moyenne des valeurs numériques extraites des documents agrégés",
     "xpack.lens.indexPattern.avg.quickFunctionDescription": "Valeur moyenne d'un ensemble de champs de nombres.",
     "xpack.lens.indexPattern.bitsFormatLabel": "Bits (1000)",
     "xpack.lens.indexPattern.bytesFormatLabel": "Octets (1024)",
-    "lensFormulaDocs.cardinality": "Compte unique",
     "xpack.lens.indexPattern.cardinality.documentation.quick": "\nNombre de valeurs uniques pour un champ spécifié de nombre, de chaîne, de date ou booléen.\n      ",
-    "lensFormulaDocs.cardinality.signature": "champ : chaîne",
     "xpack.lens.indexPattern.changeDataViewTitle": "Vue de données",
     "xpack.lens.indexPattern.chooseField": "Champ",
     "xpack.lens.indexPattern.chooseFieldLabel": "Pour utiliser cette fonction, sélectionnez un champ.",
     "xpack.lens.indexPattern.chooseSubFunction": "Choisir une sous-fonction",
     "xpack.lens.indexPattern.columnFormatLabel": "Format de valeur",
     "xpack.lens.indexPattern.compactLabel": "Valeurs compactes",
-    "lensFormulaDocs.count": "Décompte",
     "xpack.lens.indexPattern.count.documentation.quick": "\nNombre total de documents. Lorsque vous fournissez un champ, le nombre total de valeurs de champ est compté. Lorsque vous utilisez la fonction de décompte pour les champs qui comportent plusieurs valeurs dans un même document, toutes les valeurs sont comptées.\n      ",
-    "lensFormulaDocs.count.signature": "[champ : chaîne]",
     "xpack.lens.indexPattern.counterRate": "Taux de compteur",
     "xpack.lens.indexPattern.counterRate.documentation.quick": "\n      Taux de modification sur la durée d'un indicateur de série temporelle qui augmente sans cesse.\n      ",
-    "lensFormulaDocs.counterRate.signature": "indicateur : nombre",
     "xpack.lens.indexPattern.countOf": "Nombre d'enregistrements",
-    "lensFormulaDocs.cumulative_sum.signature": "indicateur : nombre",
-    "lensFormulaDocs.cumulativeSum": "Somme cumulée",
     "xpack.lens.indexPattern.cumulativeSum.documentation.quick": "\n      Somme de toutes les valeurs au fur et à mesure de leur croissance.\n      ",
     "xpack.lens.indexPattern.custom.externalDoc": "Syntaxe de format numérique",
     "xpack.lens.indexPattern.custom.patternLabel": "Format",
@@ -22290,9 +22202,7 @@
     "xpack.lens.indexPattern.dateRange.noTimeRange": "L’intervalle de plage temporelle actuel n’est pas disponible",
     "xpack.lens.indexPattern.decimalPlacesLabel": "Décimales",
     "xpack.lens.indexPattern.defaultFormatLabel": "Par défaut",
-    "lensFormulaDocs.derivative": "Différences",
     "xpack.lens.indexPattern.differences.documentation.quick": "\n      Variation entre les valeurs des intervalles suivants.\n      ",
-    "lensFormulaDocs.differences.signature": "indicateur : nombre",
     "xpack.lens.indexPattern.dimensionEditor.headingAppearance": "Apparence",
     "xpack.lens.indexPattern.dimensionEditor.headingData": "Données",
     "xpack.lens.indexPattern.dimensionEditor.headingFormula": "Formule",
@@ -22345,30 +22255,22 @@
     "xpack.lens.indexPattern.invalidOperationLabel": "Ce champ ne fonctionne pas avec la fonction sélectionnée.",
     "xpack.lens.indexPattern.invalidReducedTimeRange": "Plage temporelle réduite non valide. Entrez un entier positif suivi par l'une des unités suivantes : s, m, h, d, w, M, y. Par exemple, 3h pour 3 heures",
     "xpack.lens.indexPattern.invalidTimeShift": "Décalage non valide. Entrez un entier positif suivi par l'une des unités suivantes : s, m, h, d, w, M, y. Par exemple, 3h pour 3 heures",
-    "lensFormulaDocs.lastValue": "Dernière valeur",
     "xpack.lens.indexPattern.lastValue.disabled": "Cette fonction requiert la présence d'un champ de date dans la vue de données.",
     "xpack.lens.indexPattern.lastValue.documentation.quick": "\nValeur d'un champ du dernier document, triée par le champ d'heure par défaut de la vue de données.\n      ",
     "xpack.lens.indexPattern.lastValue.showArrayValues": "Afficher les valeurs de tableau",
     "xpack.lens.indexPattern.lastValue.showArrayValuesExplanation": "Affiche toutes les valeurs associées à ce champ dans chaque dernier document.",
     "xpack.lens.indexPattern.lastValue.showArrayValuesWithTopValuesWarning": "Lorsque vous affichez les valeurs de tableau, vous ne pouvez pas utiliser ce champ pour classer les valeurs les plus élevées.",
-    "lensFormulaDocs.lastValue.signature": "champ : chaîne",
     "xpack.lens.indexPattern.lastValue.sortField": "Trier par le champ de date",
     "xpack.lens.indexPattern.lastValue.sortFieldPlaceholder": "Champ de tri",
-    "lensFormulaDocs.max": "Maximum",
     "xpack.lens.indexPattern.max.description": "Agrégation d'indicateurs à valeur unique qui renvoie la valeur maximale des valeurs numériques extraites des documents agrégés.",
     "xpack.lens.indexPattern.max.quickFunctionDescription": "Valeur maximale d'un champ de nombre.",
-    "lensFormulaDocs.median": "Médiane",
     "xpack.lens.indexPattern.median.description": "Agrégation d'indicateurs à valeur unique qui calcule la valeur médiane des valeurs numériques extraites des documents agrégés.",
     "xpack.lens.indexPattern.median.quickFunctionDescription": "Valeur médiane d'un champ de nombre.",
     "xpack.lens.indexPattern.metaFieldsLabel": "Champs méta",
-    "lensFormulaDocs.metric.signature": "champ : chaîne",
-    "lensFormulaDocs.min": "Minimum",
     "xpack.lens.indexPattern.min.description": "Agrégation d'indicateurs à valeur unique qui renvoie la valeur minimale des valeurs numériques extraites des documents agrégés.",
     "xpack.lens.indexPattern.min.quickFunctionDescription": "Valeur minimale d'un champ de nombre.",
     "xpack.lens.indexPattern.missingFieldLabel": "Champ manquant",
     "xpack.lens.indexPattern.moveToWorkspaceNotAvailable": "Pour visualiser ce champ, veuillez l'ajouter directement au calque souhaité. L'ajout de ce champ à l'espace de travail n'est pas pris en charge avec votre configuration actuelle.",
-    "lensFormulaDocs.moving_average.signature": "indicateur : nombre, [window] : nombre",
-    "lensFormulaDocs.movingAverage": "Moyenne mobile",
     "xpack.lens.indexPattern.movingAverage.basicExplanation": "La moyenne mobile fait glisser une fenêtre sur les données et affiche la valeur moyenne. La moyenne mobile est prise en charge uniquement par les histogrammes des dates.",
     "xpack.lens.indexPattern.movingAverage.documentation.quick": "\n      Moyenne d'une fenêtre mobile de valeurs sur la durée.\n      ",
     "xpack.lens.indexPattern.movingAverage.limitations": "La première valeur de moyenne mobile commence au deuxième élément.",
@@ -22384,20 +22286,12 @@
     "xpack.lens.indexPattern.noRealMetricError": "Un calque uniquement doté de valeurs statiques n’affichera pas de résultats ; utilisez au moins un indicateur dynamique.",
     "xpack.lens.indexPattern.notAbsoluteTimeShift": "Décalage non valide.",
     "xpack.lens.indexPattern.numberFormatLabel": "Nombre",
-    "lensFormulaDocs.overall_metric": "indicateur : nombre",
-    "lensFormulaDocs.overallMax": "Max général",
-    "lensFormulaDocs.overallMin": "Min général",
-    "lensFormulaDocs.overallSum": "Somme générale",
     "xpack.lens.indexPattern.percentFormatLabel": "Pourcent",
-    "lensFormulaDocs.percentile": "Centile",
     "xpack.lens.indexPattern.percentile.documentation.quick": "\n      La plus grande valeur qui est inférieure à n pour cent des valeurs présentes dans tous les documents.\n      ",
     "xpack.lens.indexPattern.percentile.percentileRanksValue": "Valeur des rangs centiles",
     "xpack.lens.indexPattern.percentile.percentileValue": "Centile",
-    "lensFormulaDocs.percentile.signature": "champ : chaîne, [percentile] : nombre",
-    "lensFormulaDocs.percentileRank": "Rang centile",
     "xpack.lens.indexPattern.percentileRanks.documentation.quick": "\nPourcentage des valeurs inférieures à une valeur spécifique. Par exemple, lorsqu'une valeur est supérieure ou égale à 95 % des valeurs calculées, elle est placée au 95e rang centile.\n      ",
     "xpack.lens.indexPattern.percentileRanks.errorMessage": "La valeur des rangs centiles doit être un nombre",
-    "lensFormulaDocs.percentileRanks.signature": "champ : chaîne, [valeur] : nombre",
     "xpack.lens.indexPattern.precisionErrorWarning.accuracyDisabled.shortMessage": "Il peut s'agit d'une approximation. Pour obtenir des résultats plus fins, vous pouvez activer le mode de précision, mais ce mode augmente la charge sur le cluster Elasticsearch.",
     "xpack.lens.indexPattern.precisionErrorWarning.accuracyEnabled.shortMessage": "Il peut s'agit d'une approximation. Pour obtenir des résultats plus fins, utilisez les filtres ou augmentez le nombre défini pour Valeurs les plus élevées.",
     "xpack.lens.indexPattern.precisionErrorWarning.ascendingCountPrecisionErrorWarning.shortMessage": "Il peut s'agir d'une valeur approximative selon la façon dont les données sont indexées. Pour obtenir des résultats plus fins, effectuez un tri par rareté.",
@@ -22447,7 +22341,6 @@
     "xpack.lens.indexPattern.samplingPerLayer.fallbackLayerName": "Calque de données",
     "xpack.lens.indexPattern.settingsSamplingUnsupported": "La sélection de cette fonction a pour effet de changer l'échantillonnage de ce calque à 100 % afin de garantir un fonctionnement correct.",
     "xpack.lens.indexPattern.sortField.invalid": "Champ non valide. Vérifiez votre vue de données ou choisissez un autre champ.",
-    "lensFormulaDocs.standardDeviation": "Écart-type",
     "xpack.lens.indexPattern.standardDeviation.description": "Agrégation d'indicateurs à valeur unique qui calcule l’écart-type des valeurs numériques extraites des documents agrégés",
     "xpack.lens.indexPattern.standardDeviation.quickFunctionDescription": "Écart-type des valeurs d'un champ de nombre qui représente la quantité d'écart des valeurs des champs.",
     "xpack.lens.indexPattern.staticValue.label": "Valeur de la ligne de référence",
@@ -22457,7 +22350,6 @@
     "xpack.lens.indexPattern.staticValueWarningText": "Pour écraser la valeur statique, sélectionnez une fonction rapide.",
     "xpack.lens.indexPattern.suffixLabel": "Suffixe",
     "xpack.lens.indexpattern.suggestions.overTimeLabel": "Sur la durée",
-    "lensFormulaDocs.sum": "Somme",
     "xpack.lens.indexPattern.sum.description": "Agrégation d'indicateurs à valeur unique qui récapitule les valeurs numériques extraites des documents agrégés.",
     "xpack.lens.indexPattern.sum.quickFunctionDescription": "Total des valeurs d'un champ de nombre.",
     "xpack.lens.indexPattern.switchToRare": "Classer par rareté",
@@ -22495,8 +22387,6 @@
     "xpack.lens.indexPattern.terms.size": "Nombre de valeurs",
     "xpack.lens.indexPattern.termsWithMultipleShifts": "Dans un seul calque, il est impossible de combiner des indicateurs avec des décalages temporels différents et des valeurs dynamiques les plus élevées. Utilisez la même valeur de décalage pour tous les indicateurs, ou utilisez des filtres à la place des valeurs les plus élevées.",
     "xpack.lens.indexPattern.termsWithMultipleShiftsFixActionLabel": "Utiliser des filtres",
-    "lensFormulaDocs.time_scale": "indicateur : nombre, unité : s|m|h|d|w|M|y",
-    "lensFormulaDocs.timeScale": "Normaliser par unité",
     "xpack.lens.indexPattern.timeScale.label": "Normaliser par unité",
     "xpack.lens.indexPattern.timeScale.missingUnit": "Aucune unité spécifiée pour Normaliser par unité.",
     "xpack.lens.indexPattern.timeScale.tooltip": "Normalisez les valeurs pour qu'elles soient toujours affichées en tant que taux par unité de temps spécifiée, indépendamment de l'intervalle de dates sous-jacent.",
@@ -22941,6 +22831,111 @@
     "xpack.lens.xyVisualization.stackedPercentageBarHorizontalLabel": "H. À barres à pourcentages",
     "xpack.lens.xyVisualization.stackedPercentageBarLabel": "Vertical à barres à pourcentages",
     "xpack.lens.xyVisualization.xyLabel": "XY",
+    "lensFormulaDocs.tinymath.absFunction.markdown": "\nCalcule une valeur absolue. Une valeur négative est multipliée par -1, une valeur positive reste identique.\n\nExemple : calculer la distance moyenne par rapport au niveau de la mer \"abs(average(altitude))\"\n    ",
+    "lensFormulaDocs.tinymath.addFunction.markdown": "\nAjoute jusqu'à deux nombres.\nFonctionne également avec le symbole \"+\".\n\nExemple : calculer la somme de deux champs\n\n\"sum(price) + sum(tax)\"\n\nExemple : compenser le compte par une valeur statique\n\n\"add(count(), 5)\"\n    ",
+    "lensFormulaDocs.tinymath.cbrtFunction.markdown": "\nÉtablit la racine carrée de la valeur.\n\nExemple : calculer la longueur du côté à partir du volume\n`cbrt(last_value(volume))`\n    ",
+    "lensFormulaDocs.tinymath.ceilFunction.markdown": "\nArrondit le plafond de la valeur au chiffre supérieur.\n\nExemple : arrondir le prix au dollar supérieur\n`ceil(sum(price))`\n    ",
+    "lensFormulaDocs.tinymath.clampFunction.markdown": "\nÉtablit une limite minimale et maximale pour la valeur.\n\nExemple : s'assurer de repérer les valeurs aberrantes\n```\nclamp(\n  average(bytes),\n  percentile(bytes, percentile=5),\n  percentile(bytes, percentile=95)\n)\n```\n",
+    "lensFormulaDocs.tinymath.cubeFunction.markdown": "\nCalcule le cube d'un nombre.\n\nExemple : calculer le volume à partir de la longueur du côté\n`cube(last_value(length))`\n    ",
+    "lensFormulaDocs.tinymath.defaultFunction.markdown": "\nRetourne une valeur numérique par défaut lorsque la valeur est nulle.\n\nExemple : Retourne -1 lorsqu'un champ ne contient aucune donnée.\n\"defaults(average(bytes), -1)\"\n",
+    "lensFormulaDocs.tinymath.divideFunction.markdown": "\nDivise le premier nombre par le deuxième.\nFonctionne également avec le symbole \"/\".\n\nExemple : calculer la marge bénéficiaire\n\"sum(profit) / sum(revenue)\"\n\nExemple : \"divide(sum(bytes), 2)\"\n    ",
+    "lensFormulaDocs.tinymath.eqFunction.markdown": "\nEffectue une comparaison d'égalité entre deux valeurs.\nÀ utiliser en tant que condition pour la fonction de comparaison \"ifelse\".\nFonctionne également avec le symbole \"==\".\n\nExemple : Retourne \"true\" si la moyenne d'octets est égale à la quantité de mémoire moyenne.\n\"average(bytes) == average(memory)\"\n\nExemple : \"eq(sum(bytes), 1000000)\"\n    ",
+    "lensFormulaDocs.tinymath.expFunction.markdown": "\nÉlève *e* à la puissance n.\n\nExemple : calculer la fonction exponentielle naturelle\n\n`exp(last_value(duration))`\n    ",
+    "lensFormulaDocs.tinymath.fixFunction.markdown": "\nPour les valeurs positives, part du bas. Pour les valeurs négatives, part du haut.\n\nExemple : arrondir à zéro\n\"fix(sum(profit))\"\n    ",
+    "lensFormulaDocs.tinymath.floorFunction.markdown": "\nArrondit à la valeur entière inférieure la plus proche.\n\nExemple : arrondir un prix au chiffre inférieur\n\"floor(sum(price))\"\n    ",
+    "lensFormulaDocs.tinymath.gteFunction.markdown": "\nEffectue une comparaison de supériorité entre deux valeurs.\nÀ utiliser en tant que condition pour la fonction de comparaison \"ifelse\".\nFonctionne également avec le symbole \">=\".\n\nExemple : Retourne \"true\" si la moyenne d'octets est supérieure ou égale à la quantité moyenne de mémoire.\n\"average(bytes) >= average(memory)\"\n\nExemple : \"gte(average(bytes), 1000)\"\n    ",
+    "lensFormulaDocs.tinymath.gtFunction.markdown": "\nEffectue une comparaison de supériorité entre deux valeurs.\nÀ utiliser en tant que condition pour la fonction de comparaison \"ifelse\".\nFonctionne également avec le symbole \">\".\n\nExemple : Retourne \"true\" si la moyenne d'octets est supérieure à la quantité moyenne de mémoire.\n\"average(bytes) > average(memory)\"\n\nExemple : \"gt(average(bytes), 1000)\"\n    ",
+    "lensFormulaDocs.tinymath.ifElseFunction.markdown": "\nRetourne une valeur selon si l'élément de condition est \"true\" ou \"false\".\n\nExemple : Revenus moyens par client, mais dans certains cas, l'ID du client n'est pas fourni, et le client est alors compté comme client supplémentaire.\n`sum(total)/(unique_count(customer_id) + ifelse( count() > count(kql='customer_id:*'), 1, 0))`\n    ",
+    "lensFormulaDocs.tinymath.logFunction.markdown": "\nÉtablit un logarithme avec base optionnelle. La base naturelle *e* est utilisée par défaut.\n\nExemple : calculer le nombre de bits nécessaire au stockage de valeurs\n```\nlog(sum(bytes))\nlog(sum(bytes), 2)\n```\n    ",
+    "lensFormulaDocs.tinymath.lteFunction.markdown": "\nEffectue une comparaison d'infériorité ou de supériorité entre deux valeurs.\nÀ utiliser en tant que condition pour la fonction de comparaison \"ifelse\".\nFonctionne également avec le symbole \"<=\".\n\nExemple : Retourne \"true\" si la moyenne d'octets est inférieure ou égale à la quantité moyenne de mémoire.\n\"average(bytes) <= average(memory)\"\n\nExemple : \"lte(average(bytes), 1000)\"\n    ",
+    "lensFormulaDocs.tinymath.ltFunction.markdown": "\nEffectue une comparaison d'infériorité entre deux valeurs.\nÀ utiliser en tant que condition pour la fonction de comparaison \"ifelse\".\nFonctionne également avec le symbole \"<\".\n\nExemple : Retourne \"true\" si la moyenne d'octets est inférieure à la quantité moyenne de mémoire.\n\"average(bytes) <= average(memory)\"\n\nExemple : \"lt(average(bytes), 1000)\"\n    ",
+    "lensFormulaDocs.tinymath.maxFunction.markdown": "\nTrouve la valeur maximale entre deux nombres.\n\nExemple : Trouver le maximum entre deux moyennes de champs\n\"pick_max(average(bytes), average(memory))\"\n        ",
+    "lensFormulaDocs.tinymath.minFunction.markdown": "\nTrouve la valeur minimale entre deux nombres.\n\nExemple : Trouver le minimum entre deux moyennes de champs\n`pick_min(average(bytes), average(memory))`\n    ",
+    "lensFormulaDocs.tinymath.modFunction.markdown": "\nÉtablit le reste après division de la fonction par un nombre.\n\nExemple : calculer les trois derniers chiffres d'une valeur\n\"mod(sum(price), 1000)\"\n    ",
+    "lensFormulaDocs.tinymath.multiplyFunction.markdown": "\nMultiplie deux nombres.\nFonctionne également avec le symbole \"*\".\n\nExemple : calculer le prix après application du taux d'imposition courant\n`sum(bytes) * last_value(tax_rate)`\n\nExemple : calculer le prix après application du taux d'imposition constant\n\"multiply(sum(price), 1.2)\"\n    ",
+    "lensFormulaDocs.tinymath.powFunction.markdown": "\nÉlève la valeur à une puissance spécifique. Le deuxième argument est obligatoire.\n\nExemple : calculer le volume en fonction de la longueur du côté\n\"pow(last_value(length), 3)\"\n    ",
+    "lensFormulaDocs.tinymath.roundFunction.markdown": "\nArrondit à un nombre donné de décimales, 0 étant la valeur par défaut.\n\nExemples : arrondir au centième\n```\nround(sum(bytes))\nround(sum(bytes), 2)\n```\n    ",
+    "lensFormulaDocs.tinymath.sqrtFunction.markdown": "\nÉtablit la racine carrée d'une valeur positive uniquement.\n\nExemple : calculer la longueur du côté en fonction de la surface\n`sqrt(last_value(area))`\n    ",
+    "lensFormulaDocs.tinymath.squareFunction.markdown": "\nÉlève la valeur à la puissance 2.\n\nExemple : calculer l’aire en fonction de la longueur du côté\n`square(last_value(length))`\n    ",
+    "lensFormulaDocs.tinymath.subtractFunction.markdown": "\nSoustrait le premier nombre du deuxième.\nFonctionne également avec le symbole \"-\".\n\nExemple : calculer la plage d'un champ\n\"subtract(max(bytes), min(bytes))\"\n    ",
+    "lensFormulaDocs.documentation.filterRatioDescription.markdown": "### Rapport de filtre :\n\nUtilisez \"kql=''\" pour filtrer un ensemble de documents et le comparer à d'autres documents du même regroupement.\nPar exemple, pour consulter l'évolution du taux d'erreur au fil du temps :\n\n```\ncount(kql='response.status_code > 400') / count()\n```\n        ",
+    "lensFormulaDocs.documentation.percentOfTotalDescription.markdown": "### Pourcentage du total\n\nLes formules peuvent calculer \"overall_sum\" pour tous les regroupements,\nce qui permet de convertir chaque regroupement en un pourcentage du total :\n\n```\nsum(products.base_price) / overall_sum(sum(products.base_price))\n```\n        ",
+    "lensFormulaDocs.documentation.recentChangeDescription.markdown": "### Modification récente\n\nUtilisez \"reducedTimeRange='30m'\" pour ajouter un filtre supplémentaire sur la plage temporelle d'un indicateur aligné avec la fin d'une plage temporelle globale. Vous pouvez l'utiliser pour calculer le degré de modification récente d'une valeur.\n\n```\nmax(system.network.in.bytes, reducedTimeRange=\"30m\")\n - min(system.network.in.bytes, reducedTimeRange=\"30m\")\n```\n        ",
+    "lensFormulaDocs.documentation.weekOverWeekDescription.markdown": "### Semaine après semaine :\n\nUtilisez \"shift='1w'\" pour obtenir la valeur de chaque regroupement\nde la semaine précédente. Le décalage ne doit pas être utilisé avec la fonction *Valeurs les plus élevées*.\n\n```\npercentile(system.network.in.bytes, percentile=99) /\npercentile(system.network.in.bytes, percentile=99, shift='1w')\n```\n        ",
+    "lensFormulaDocs.cardinality.documentation.markdown": "\nCalcule le nombre de valeurs uniques d'un champ donné. Fonctionne pour les nombres, les chaînes, les dates et les valeurs booléennes.\n\nExemple : calculer le nombre de produits différents :\n`unique_count(product.name)`\n\nExemple : calculer le nombre de produits différents du groupe \"clothes\" :\n\"unique_count(product.name, kql='product.group=clothes')\"\n      ",
+    "lensFormulaDocs.count.documentation.markdown": "\nNombre total de documents. Lorsque vous fournissez un champ, le nombre total de valeurs de champ est compté. Lorsque vous utilisez la fonction de décompte pour les champs qui comportent plusieurs valeurs dans un même document, toutes les valeurs sont comptées.\n\n#### Exemples\n\nPour calculer le nombre total de documents, utilisez `count()`.\n\nPour calculer le nombre de produits, utilisez `count(products.id)`.\n\nPour calculer le nombre de documents qui correspondent à un filtre donné, utilisez `count(kql='price > 500')`.\n      ",
+    "lensFormulaDocs.counterRate.documentation.markdown": "\nCalcule le taux d'un compteur toujours croissant. Cette fonction renvoie uniquement des résultats utiles inhérents aux champs d'indicateurs de compteur qui contiennent une mesure quelconque à croissance régulière.\nSi la valeur diminue, elle est interprétée comme une mesure de réinitialisation de compteur. Pour obtenir des résultats plus précis, \"counter_rate\" doit être calculé d’après la valeur \"max\" du champ.\n\nCe calcul est réalisé séparément pour des séries distinctes définies par des filtres ou des dimensions de valeurs supérieures.\nIl utilise l'intervalle en cours utilisé dans la formule.\n\nExemple : visualiser le taux d'octets reçus au fil du temps par un serveur Memcached :\n`counter_rate(max(memcached.stats.read.bytes))`\n      ",
+    "lensFormulaDocs.cumulativeSum.documentation.markdown": "\nCalcule la somme cumulée d'un indicateur au fil du temps, en ajoutant toutes les valeurs précédentes d'une série à chaque valeur. Pour utiliser cette fonction, vous devez également configurer une dimension de l'histogramme de dates.\n\nCe calcul est réalisé séparément pour des séries distinctes définies par des filtres ou des dimensions de valeurs supérieures.\n\nExemple : visualiser les octets reçus cumulés au fil du temps :\n`cumulative_sum(sum(bytes))`\n      ",
+    "lensFormulaDocs.differences.documentation.markdown": "\nCalcule la différence par rapport à la dernière valeur d'un indicateur au fil du temps. Pour utiliser cette fonction, vous devez également configurer une dimension de l'histogramme de dates.\nLes données doivent être séquentielles pour les différences. Si vos données sont vides lorsque vous utilisez des différences, essayez d'augmenter l'intervalle de l'histogramme de dates.\n\nCe calcul est réalisé séparément pour des séries distinctes définies par des filtres ou des dimensions de valeurs supérieures.\n\nExemple : visualiser la modification des octets reçus au fil du temps :\n`differences(sum(bytes))`\n      ",
+    "lensFormulaDocs.lastValue.documentation.markdown": "\nRenvoie la valeur d'un champ du dernier document, triée par le champ d'heure par défaut de la vue de données.\n\nCette fonction permet de récupérer le dernier état d'une entité.\n\nExemple : obtenir le statut actuel du serveur A :\n`last_value(server.status, kql='server.name=\"A\"')`\n      ",
+    "lensFormulaDocs.metric.documentation.markdown": "\nRenvoie l'indicateur {metric} d'un champ. Cette fonction fonctionne uniquement pour les champs numériques.\n\nExemple : obtenir l'indicateur {metric} d'un prix :\n\"{metric}(price)\"\n\nExemple : obtenir l'indicateur {metric} d'un prix pour des commandes du Royaume-Uni :\n\"{metric}(price, kql='location:UK')\"\n      ",
+    "lensFormulaDocs.movingAverage.documentation.markdown": "\nCalcule la moyenne mobile d'un indicateur au fil du temps, en prenant la moyenne des n dernières valeurs pour calculer la valeur actuelle. Pour utiliser cette fonction, vous devez également configurer une dimension de l'histogramme de dates.\nLa valeur de fenêtre par défaut est {defaultValue}.\n\nCe calcul est réalisé séparément pour des séries distinctes définies par des filtres ou des dimensions de valeurs supérieures.\n\nPrend un paramètre nommé \"window\" qui spécifie le nombre de dernières valeurs à inclure dans le calcul de la moyenne de la valeur actuelle.\n\nExemple : lisser une ligne de mesures :\n`moving_average(sum(bytes), window=5)`\n      ",
+    "lensFormulaDocs.overall_average.documentation.markdown": "\nCalcule la moyenne d'un indicateur pour tous les points de données d'une série dans le graphique actuel. Une série est définie par une dimension à l'aide d'un histogramme de dates ou d'une fonction d'intervalle.\nD'autres dimensions permettant de répartir les données telles que les valeurs supérieures ou les filtres sont traitées en tant que séries distinctes.\n\nSi le graphique actuel n'utilise aucun histogramme de dates ou aucune fonction d'intervalle, \"overall_average\" calcule la moyenne pour toutes les dimensions, quelle que soit la fonction utilisée.\n\nExemple : écart par rapport à la moyenne :\n\"sum(bytes) - overall_average(sum(bytes))\"\n      ",
+    "lensFormulaDocs.overall_max.documentation.markdown": "\nCalcule la valeur maximale d'un indicateur pour tous les points de données d'une série dans le graphique actuel. Une série est définie par une dimension à l'aide d'un histogramme de dates ou d'une fonction d'intervalle.\nD'autres dimensions permettant de répartir les données telles que les valeurs supérieures ou les filtres sont traitées en tant que séries distinctes.\n\nSi le graphique actuel n'utilise aucun histogramme de dates ou aucune fonction d'intervalle, \"overall_max\" calcule la valeur maximale pour toutes les dimensions, quelle que soit la fonction utilisée.\n\nExemple : pourcentage de plage\n\"(sum(bytes) - overall_min(sum(bytes))) / (overall_max(sum(bytes)) - overall_min(sum(bytes)))\"\n      ",
+    "lensFormulaDocs.overall_min.documentation.markdown": "\nCalcule la valeur minimale d'un indicateur pour tous les points de données d'une série dans le graphique actuel. Une série est définie par une dimension à l'aide d'un histogramme de dates ou d'une fonction d'intervalle.\nD'autres dimensions permettant de répartir les données telles que les valeurs supérieures ou les filtres sont traitées en tant que séries distinctes.\n\nSi le graphique actuel n'utilise aucun histogramme de dates ou aucune fonction d'intervalle, \"overall_min\" calcule la valeur minimale pour toutes les dimensions, quelle que soit la fonction utilisée.\n\nExemple : pourcentage de plage\n\"(sum(bytes) - overall_min(sum(bytes)) / (overall_max(sum(bytes)) - overall_min(sum(bytes)))\"\n      ",
+    "lensFormulaDocs.overall_sum.documentation.markdown": "\nCalcule la somme d'un indicateur pour tous les points de données d'une série dans le graphique actuel. Une série est définie par une dimension à l'aide d'un histogramme de dates ou d'une fonction d'intervalle.\nD'autres dimensions permettant de répartir les données telles que les valeurs supérieures ou les filtres sont traitées en tant que séries distinctes.\n\nSi le graphique actuel n'utilise aucun histogramme de dates ou aucune fonction d'intervalle, \"overall_sum\" calcule la somme pour toutes les dimensions, quelle que soit la fonction utilisée.\n\nExemple : pourcentage de total\n\"sum(bytes) / overall_sum(sum(bytes))\"\n      ",
+    "lensFormulaDocs.percentile.documentation.markdown": "\nRenvoie le centile spécifié des valeurs d'un champ. Il s'agit de la valeur de n pour cent des valeurs présentes dans les documents.\n\nExemple : obtenir le nombre d'octets supérieurs à 95 % des valeurs :\n`percentile(bytes, percentile=95)`\n      ",
+    "lensFormulaDocs.percentileRanks.documentation.markdown": "\nRetourne le pourcentage de valeurs qui sont en dessous d'une certaine valeur. Par exemple, si une valeur est supérieure à 95 % des valeurs observées, elle est placée au 95e rang centile.\n\nExemple : Obtenir le pourcentage de valeurs qui sont en dessous de 100 :\n\"percentile_rank(bytes, value=100)\"\n      ",
+    "lensFormulaDocs.standardDeviation.documentation.markdown": "\nRetourne la taille de la variation ou de la dispersion du champ. Cette fonction ne s’applique qu’aux champs numériques.\n\n#### Exemples\n\nPour obtenir l'écart type d'un prix, utilisez standard_deviation(price).\n\nPour obtenir la variance du prix des commandes passées au Royaume-Uni, utilisez `square(standard_deviation(price, kql='location:UK'))`.\n      ",
+    "lensFormulaDocs.time_scale.documentation.markdown": "\n\nCette fonction avancée est utile pour normaliser les comptes et les sommes sur un intervalle de temps spécifique. Elle permet l'intégration avec les indicateurs qui sont stockés déjà normalisés sur un intervalle de temps spécifique.\n\nVous pouvez faire appel à cette fonction uniquement si une fonction d'histogramme des dates est utilisée dans le graphique actuel.\n\nExemple : Un rapport comparant un indicateur déjà normalisé à un autre indicateur devant être normalisé.\n\"normalize_by_unit(counter_rate(max(system.diskio.write.bytes)), unit='s') / last_value(apache.status.bytes_per_second)\"\n      ",
+    "lensFormulaDocs.tinymath.base": "base",
+    "lensFormulaDocs.boolean": "booléen",
+    "lensFormulaDocs.tinymath.condition": "condition",
+    "lensFormulaDocs.tinymath.decimals": "décimales",
+    "lensFormulaDocs.tinymath.defaultValue": "par défaut",
+    "lensFormulaDocs.tinymath.left": "gauche",
+    "lensFormulaDocs.tinymath.max": "max",
+    "lensFormulaDocs.tinymath.min": "min",
+    "lensFormulaDocs.number": "numéro",
+    "lensFormulaDocs.tinymath.right": "droite",
+    "lensFormulaDocs.string": "chaîne",
+    "lensFormulaDocs.tinymath.value": "valeur",
+    "lensFormulaDocs.CommonFormulaDocumentation": "Les formules les plus courantes divisent deux valeurs pour produire un pourcentage. Pour obtenir un affichage correct, définissez \"Format de valeur\" sur \"pourcent\".",
+    "lensFormulaDocs.documentation.columnCalculationSection": "Calculs de colonnes",
+    "lensFormulaDocs.documentation.columnCalculationSectionDescription": "Ces fonctions sont exécutées pour chaque ligne, mais elles sont fournies avec la colonne entière comme contexte. Elles sont également appelées fonctions de fenêtre.",
+    "lensFormulaDocs.documentation.comparisonSection": "Comparaison",
+    "lensFormulaDocs.documentation.comparisonSectionDescription": "Ces fonctions sont utilisées pour effectuer une comparaison de valeurs.",
+    "lensFormulaDocs.documentation.constantsSection": "Contexte Kibana",
+    "lensFormulaDocs.documentation.constantsSectionDescription": "Ces fonctions sont utilisées pour récupérer des variables de contexte Kibana, c’est-à-dire l’histogramme de date \"interval\", le \"now\" actuel et le \"time_range\" sélectionné, et pour vous aider à faire des opérations mathématiques de dates.",
+    "lensFormulaDocs.documentation.elasticsearchSection": "Elasticsearch",
+    "lensFormulaDocs.documentation.elasticsearchSectionDescription": "Ces fonctions seront exécutées sur les documents bruts pour chaque ligne du tableau résultant, en agrégeant tous les documents correspondant aux dimensions de répartition en une seule valeur.",
+    "lensFormulaDocs.documentation.filterRatio": "Rapport de filtre",
+    "lensFormulaDocs.documentation.mathSection": "Mathématique",
+    "lensFormulaDocs.documentation.mathSectionDescription": "Ces fonctions seront exécutées pour chaque ligne du tableau résultant en utilisant des valeurs uniques de la même ligne calculées à l'aide d'autres fonctions.",
+    "lensFormulaDocs.documentation.percentOfTotal": "Pourcentage du total",
+    "lensFormulaDocs.documentation.recentChange": "Modification récente",
+    "lensFormulaDocs.documentation.weekOverWeek": "Semaine après semaine",
+    "lensFormulaDocs.frequentlyUsedHeading": "Formules courantes",
+    "lensFormulaDocs.avg": "Moyenne",
+    "lensFormulaDocs.cardinality": "Compte unique",
+    "lensFormulaDocs.cardinality.signature": "champ : chaîne",
+    "lensFormulaDocs.count": "Décompte",
+    "lensFormulaDocs.count.signature": "[champ : chaîne]",
+    "lensFormulaDocs.counterRate.signature": "indicateur : nombre",
+    "lensFormulaDocs.cumulative_sum.signature": "indicateur : nombre",
+    "lensFormulaDocs.cumulativeSum": "Somme cumulée",
+    "lensFormulaDocs.derivative": "Différences",
+    "lensFormulaDocs.differences.signature": "indicateur : nombre",
+    "lensFormulaDocs.lastValue": "Dernière valeur",
+    "lensFormulaDocs.lastValue.signature": "champ : chaîne",
+    "lensFormulaDocs.max": "Maximum",
+    "lensFormulaDocs.median": "Médiane",
+    "lensFormulaDocs.metric.signature": "champ : chaîne",
+    "lensFormulaDocs.min": "Minimum",
+    "lensFormulaDocs.moving_average.signature": "indicateur : nombre, [window] : nombre",
+    "lensFormulaDocs.movingAverage": "Moyenne mobile",
+    "lensFormulaDocs.overall_metric": "indicateur : nombre",
+    "lensFormulaDocs.overallMax": "Max général",
+    "lensFormulaDocs.overallMin": "Min général",
+    "lensFormulaDocs.overallSum": "Somme générale",
+    "lensFormulaDocs.percentile": "Centile",
+    "lensFormulaDocs.percentile.signature": "champ : chaîne, [percentile] : nombre",
+    "lensFormulaDocs.percentileRank": "Rang centile",
+    "lensFormulaDocs.percentileRanks.signature": "champ : chaîne, [valeur] : nombre",
+    "lensFormulaDocs.standardDeviation": "Écart-type",
+    "lensFormulaDocs.sum": "Somme",
+    "lensFormulaDocs.time_scale": "indicateur : nombre, unité : s|m|h|d|w|M|y",
+    "lensFormulaDocs.timeScale": "Normaliser par unité",
     "xpack.licenseApiGuard.license.errorExpiredMessage": "Vous ne pouvez pas utiliser {pluginName}, car votre licence {licenseType} a expiré.",
     "xpack.licenseApiGuard.license.errorUnavailableMessage": "Vous ne pouvez pas utiliser {pluginName}, car les informations de la licence sont indisponibles pour le moment.",
     "xpack.licenseApiGuard.license.errorUnsupportedMessage": "Votre licence {licenseType} ne prend pas en charge {pluginName}. Veuillez mettre à niveau votre licence.",
@@ -29496,46 +29491,6 @@
     "xpack.observabilityAiAssistant.setupKb": "Améliorez votre expérience en configurant la base de connaissances.",
     "xpack.observabilityAiAssistant.stopGeneratingButtonLabel": "Arrêter la génération",
     "xpack.observabilityAiAssistant.technicalPreviewBadgeDescription": "GTP4 est nécessaire pour bénéficier d'une meilleure expérience avec les appels de fonctions (par exemple lors de la réalisation d'analyse de la cause d'un problème, de la visualisation de données et autres). GPT3.5 peut fonctionner pour certains des workflows les plus simples comme les explications d'erreurs ou pour bénéficier d'une expérience comparable à ChatGPT au sein de Kibana à partir du moment où les appels de fonctions ne sont pas fréquents.",
-    "xpack.observabilityShared.inspector.stats.queryTimeValue": "{queryTime} ms",
-    "xpack.observabilityShared.breadcrumbs.observabilityLinkText": "Observabilité",
-    "xpack.observabilityShared.inspector.stats.dataViewDescription": "La vue de données qui se connecte aux index Elasticsearch.",
-    "xpack.observabilityShared.inspector.stats.dataViewLabel": "Vue de données",
-    "xpack.observabilityShared.inspector.stats.hitsDescription": "Le nombre de documents renvoyés par la requête.",
-    "xpack.observabilityShared.inspector.stats.hitsLabel": "Résultats",
-    "xpack.observabilityShared.inspector.stats.hitsTotalDescription": "Le nombre de documents correspondant à la requête.",
-    "xpack.observabilityShared.inspector.stats.hitsTotalLabel": "Résultats (total)",
-    "xpack.observabilityShared.inspector.stats.kibanaApiQueryParametersDescription": "Les paramètres de requête utilisés dans la requête d'API Kibana à l'origine de la requête Elasticsearch.",
-    "xpack.observabilityShared.inspector.stats.kibanaApiQueryParametersLabel": "Paramètres de requête d'API Kibana",
-    "xpack.observabilityShared.inspector.stats.kibanaApiRouteDescription": "Le chemin de la requête d'API Kibana à l'origine de la requête Elasticsearch.",
-    "xpack.observabilityShared.inspector.stats.kibanaApiRouteLabel": "Chemin de l’API Kibana",
-    "xpack.observabilityShared.inspector.stats.queryTimeDescription": "Le temps qu'il a fallu pour traiter la requête. Ne comprend pas le temps nécessaire pour envoyer la requête ni l'analyser dans le navigateur.",
-    "xpack.observabilityShared.inspector.stats.queryTimeLabel": "Durée de la requête",
-    "xpack.observabilityShared.navigation.betaBadge": "Bêta",
-    "xpack.observabilityShared.navigation.experimentalBadgeLabel": "Version d'évaluation technique",
-    "xpack.observabilityShared.navigation.newBadge": "NOUVEAUTÉ",
-    "xpack.observabilityShared.pageLayout.sideNavTitle": "Observabilité",
-    "xpack.observabilityShared.sectionLink.newLabel": "Nouveauté",
-    "xpack.observabilityShared.technicalPreviewBadgeDescription": "Cette fonctionnalité est en version d'évaluation technique et pourra être modifiée ou retirée complètement dans une future version. Elastic s'efforcera au maximum de corriger tout problème, mais les fonctionnalités en version d'évaluation technique ne sont pas soumises aux accords de niveau de service d'assistance des fonctionnalités officielles en disponibilité générale.",
-    "xpack.observabilityShared.technicalPreviewBadgeLabel": "Version d'évaluation technique",
-    "xpack.observabilityShared.tour.alertsStep.imageAltText": "Démonstration des alertes",
-    "xpack.observabilityShared.tour.alertsStep.tourContent": "Définissez et détectez les conditions qui déclenchent des alertes avec des intégrations de plateformes tierces comme l’e-mail, PagerDuty et Slack.",
-    "xpack.observabilityShared.tour.alertsStep.tourTitle": "Soyez informé en cas de modification",
-    "xpack.observabilityShared.tour.endButtonLabel": "Terminer la visite",
-    "xpack.observabilityShared.tour.guidedSetupStep.tourContent": "La façon la plus facile de continuer avec Elastic Observability est de suivre les prochaines étapes recommandées dans l'assistant de données.",
-    "xpack.observabilityShared.tour.guidedSetupStep.tourTitle": "Toujours plus avec Elastic Observability",
-    "xpack.observabilityShared.tour.metricsExplorerStep.imageAltText": "Démonstration de Metrics Explorer",
-    "xpack.observabilityShared.tour.metricsExplorerStep.tourContent": "Diffusez, regroupez et visualisez les mesures provenant de vos systèmes, du cloud, du réseau et d'autres sources d'infrastructure.",
-    "xpack.observabilityShared.tour.metricsExplorerStep.tourTitle": "Monitorer l’intégrité de votre infrastructure",
-    "xpack.observabilityShared.tour.nextButtonLabel": "Suivant",
-    "xpack.observabilityShared.tour.observabilityOverviewStep.tourContent": "Faites un tour rapide pour découvrir les avantages de disposer de toutes vos données d'observabilité dans une seule suite.",
-    "xpack.observabilityShared.tour.observabilityOverviewStep.tourTitle": "Bienvenue dans Elastic Observability",
-    "xpack.observabilityShared.tour.servicesStep.imageAltText": "Démonstration des services",
-    "xpack.observabilityShared.tour.servicesStep.tourContent": "Détectez et réparez rapidement les problèmes de performances en recueillant des informations détaillées sur vos services.",
-    "xpack.observabilityShared.tour.servicesStep.tourTitle": "Identifier et résoudre les problèmes d'application",
-    "xpack.observabilityShared.tour.skipButtonLabel": "Ignorer la visite",
-    "xpack.observabilityShared.tour.streamStep.imageAltText": "Démonstration du flux de logs",
-    "xpack.observabilityShared.tour.streamStep.tourContent": "Surveillez, filtrez et inspectez les événements de journal provenant de vos applications, serveurs, machines virtuelles et conteneurs.",
-    "xpack.observabilityShared.tour.streamStep.tourTitle": "Suivi de vos logs en temps réel",
     "xpack.osquery.action.missingPrivileges": "Pour accéder à cette page, demandez à votre administrateur vos privilèges Kibana pour {osquery}.",
     "xpack.osquery.agentPolicy.confirmModalCalloutDescription": "Fleet a détecté que {agentPolicyCount, plural, one {politique d''agent} many {ces politiques d''agent} other {les politiques d''agent sélectionnées sont}} déjà en cours d'utilisation par certains de vos agents. Suite à cette action, Fleet déploie les mises à jour de tous les agents qui utilisent {agentPolicyCount, plural, one {politique d''agent} many {ces politiques d''agent} other {ces politiques d''agent}}.",
     "xpack.osquery.agentPolicy.confirmModalCalloutTitle": "Cette action va mettre à jour {agentCount, plural, one {# agent} many {# agents ont été enregistrés} other {# agents}}",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index fc7df375241f76..d4aa26d6b34806 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -11953,13 +11953,7 @@
     "xpack.csp.cloudPosturePage.kspmIntegration.packageNotInstalled.description": "{integrationFullName}（CSPM）統合を使用して、Kubernetesクラスターの構成エラーを検出します。",
     "xpack.csp.complianceScoreBar.tooltipTitle": "{failed}が失敗し、{passed}が調査結果に合格しました",
     "xpack.csp.eksIntegration.docsLink": "詳細は{docs}をご覧ください",
-    "xpack.csp.findings..bottomBarLabel": "これらは検索条件に一致した初めの{maxItems}件の調査結果です。他の結果を表示するには検索条件を絞ってください。",
     "xpack.csp.findings.distributionBar.showingPageOfTotalLabel": "{total} {type}ページ中{pageStart}-{pageEnd}ページを表示中",
-    "xpack.csp.findings.findingsTableCell.addFilterButton": "{field}フィルターを追加",
-    "xpack.csp.findings.findingsTableCell.addFilterButtonTooltip": "{field}フィルターを追加",
-    "xpack.csp.findings.findingsTableCell.addNegatedFilterButtonTooltip": "{field}否定フィルターを追加",
-    "xpack.csp.findings.findingsTableCell.addNegateFilterButton": "{field}否定フィルターを追加",
-    "xpack.csp.findings.resourceFindings.resourceFindingsPageTitle": "{resourceName} {hyphen}調査結果",
     "xpack.csp.findingsFlyout.alerts.alertCount": "{alertCount, plural, other {#件のアラート}}",
     "xpack.csp.findingsFlyout.alerts.detectionRuleCount": "{ruleCount, plural, other {#検出ルール}}",
     "xpack.csp.noFindingsStates.indexTimeout.indexTimeoutDescription": "調査結果の収集に想定よりも時間がかかっています。{docs}。",
@@ -11967,15 +11961,7 @@
     "xpack.csp.rules.rulesTable.showingPageOfTotalLabel": "{total, plural, other {#個のルール}} 件中{pageSize}を表示中",
     "xpack.csp.subscriptionNotAllowed.promptDescription": "これらのクラウドセキュリティ機能を使用するには、{link}する必要があります。",
     "xpack.csp.vulnerabilities.detectionRuleNamePrefix": "脆弱性：{vulnerabilityId}",
-    "xpack.csp.vulnerabilities.resourceVulnerabilities.vulnerabilitiesPageTitle": "{resourceName} {hyphen} 脆弱性",
-    "xpack.csp.vulnerabilities.totalVulnerabilities": "{total, plural, other {#件の脆弱性}}",
-    "xpack.csp.vulnerabilities.vulnerabilitiesTableCell.addFilterButton": "{columnId}フィルターを追加",
-    "xpack.csp.vulnerabilities.vulnerabilitiesTableCell.addFilterButtonTooltip": "{columnId}フィルターを追加",
-    "xpack.csp.vulnerabilities.vulnerabilitiesTableCell.addNegatedFilterButtonTooltip": "{columnId}否定フィルターを追加",
-    "xpack.csp.vulnerabilities.vulnerabilitiesTableCell.addNegateFilterButton": "{columnId}否定フィルターを追加",
     "xpack.csp.vulnerabilities.vulnerabilityOverviewTile.publishedDateText": "{date}",
-    "xpack.csp.vulnerabilitiesByResource.totalResources": "{total, plural, other {#個のリソース}}",
-    "xpack.csp.vulnerabilitiesByResource.totalVulnerabilities": "{total, plural, other {#件の脆弱性}}",
     "xpack.csp.awsIntegration.accessKeyIdLabel": "アクセスキーID",
     "xpack.csp.awsIntegration.assumeRoleDescription": "IAMロールAmazon Resource Name（ARN）は、AWSアカウントで作成できるIAM IDです。IAMロールを作成するときには、ユーザーはロールの権限を定義できます。ロールには、パスワードやアクセスキーなどの標準の長期的な資格情報がありません。",
     "xpack.csp.awsIntegration.assumeRoleLabel": "ロールを想定",
@@ -12110,15 +12096,10 @@
     "xpack.csp.emptyState.readDocsLink": "<b>ドキュメント</b><b>を読む</b>",
     "xpack.csp.emptyState.resetFiltersButton": "フィルターをリセット",
     "xpack.csp.emptyState.title": "検索条件と一致する結果がありません。",
-    "xpack.csp.expandColumnDescriptionLabel": "拡張",
-    "xpack.csp.expandColumnNameLabel": "拡張",
     "xpack.csp.findings.distributionBar.totalFailedLabel": "失敗した調査結果",
     "xpack.csp.findings.distributionBar.totalPassedLabel": "合格した調査結果",
     "xpack.csp.findings.errorCallout.pageSearchErrorTitle": "検索結果の取得中にエラーが発生しました",
     "xpack.csp.findings.errorCallout.showErrorButtonLabel": "エラーメッセージを表示",
-    "xpack.csp.findings.findingsByResource.tableRowTypeLabel": "リソース",
-    "xpack.csp.findings.findingsByResourceTable.cisSectionsColumnLabel": "CISセクション",
-    "xpack.csp.findings.findingsByResourceTable.postureScoreColumnLabel": "態勢スコア",
     "xpack.csp.findings.findingsErrorToast.searchFailedTitle": "検索失敗",
     "xpack.csp.findings.findingsFlyout.jsonTabTitle": "JSON",
     "xpack.csp.findings.findingsFlyout.overviewTab.alertsTitle": "アラート",
@@ -12150,16 +12131,11 @@
     "xpack.csp.findings.findingsFlyout.ruleTab.tagsTitle": "タグ",
     "xpack.csp.findings.findingsFlyout.ruleTabTitle": "ルール",
     "xpack.csp.findings.findingsFlyout.tableTabTitle": "表",
-    "xpack.csp.findings.findingsTable.findingsTableColumn.clusterIdColumnLabel": "属します",
-    "xpack.csp.findings.findingsTable.findingsTableColumn.clusterIdColumnTooltipLabel": "KubernetesクラスターIDまたはクラウドアカウント名",
     "xpack.csp.findings.findingsTable.findingsTableColumn.lastCheckedColumnLabel": "最終確認",
     "xpack.csp.findings.findingsTable.findingsTableColumn.resourceIdColumnLabel": "リソースID",
-    "xpack.csp.findings.findingsTable.findingsTableColumn.resourceIdColumnTooltipLabel": "カスタムElasticリソースID",
     "xpack.csp.findings.findingsTable.findingsTableColumn.resourceNameColumnLabel": "リソース名",
     "xpack.csp.findings.findingsTable.findingsTableColumn.resourceTypeColumnLabel": "リソースタイプ",
     "xpack.csp.findings.findingsTable.findingsTableColumn.resultColumnLabel": "結果",
-    "xpack.csp.findings.findingsTable.findingsTableColumn.ruleBenchmarkColumnLabel": "適用されるベンチマーク",
-    "xpack.csp.findings.findingsTable.findingsTableColumn.ruleBenchmarkColumnTooltipLabel": "このリソースの評価に使用されるベンチマーク",
     "xpack.csp.findings.findingsTable.findingsTableColumn.ruleNameColumnLabel": "ルール名",
     "xpack.csp.findings.findingsTable.findingsTableColumn.ruleNumberColumnLabel": "ルール番号",
     "xpack.csp.findings.findingsTable.findingsTableColumn.ruleSectionColumnLabel": "CISセクション",
@@ -12170,12 +12146,6 @@
     "xpack.csp.findings.groupBySelector.groupByNoneLabel": "なし",
     "xpack.csp.findings.groupBySelector.groupByResourceIdLabel": "リソース",
     "xpack.csp.findings.latestFindings.tableRowTypeLabel": "調査結果",
-    "xpack.csp.findings.resourceFindings.backToResourcesPageButtonLabel": "リソースに戻る",
-    "xpack.csp.findings.resourceFindings.tableRowTypeLabel": "調査結果",
-    "xpack.csp.findings.resourceFindingsSharedValues.cloudAccountName": "クラウドアカウント名",
-    "xpack.csp.findings.resourceFindingsSharedValues.clusterIdTitle": "クラスターID",
-    "xpack.csp.findings.resourceFindingsSharedValues.resourceIdTitle": "リソースID",
-    "xpack.csp.findings.resourceFindingsSharedValues.resourceTypeTitle": "リソースタイプ",
     "xpack.csp.findings.search.queryErrorToastMessage": "クエリエラー",
     "xpack.csp.findings.searchBar.searchPlaceholder": "検索結果（例：rule.section：\"API Server\"）",
     "xpack.csp.findings.tabs.misconfigurations": "構成エラー",
@@ -12290,9 +12260,6 @@
     "xpack.csp.vulnerabilities": "脆弱性",
     "xpack.csp.vulnerabilities.flyoutTabs.fieldLabel": "フィールド",
     "xpack.csp.vulnerabilities.flyoutTabs.fieldValueLabel": "値",
-    "xpack.csp.vulnerabilities.resourceVulnerabilities.backToResourcesPageButtonLabel": "リソースに戻る",
-    "xpack.csp.vulnerabilities.resourceVulnerabilities.regionTitle": "地域",
-    "xpack.csp.vulnerabilities.resourceVulnerabilities.resourceIdTitle": "リソースID",
     "xpack.csp.vulnerabilities.searchBar.placeholder": "脆弱性を検索（例：vulnerability.severity :\"CRITICAL\"）",
     "xpack.csp.vulnerabilities.table.filterIn": "フィルタリング",
     "xpack.csp.vulnerabilities.table.filterOut": "除外",
@@ -12315,24 +12282,12 @@
     "xpack.csp.vulnerabilities.vulnerabilityOverviewTile.publishedDate": "公開日",
     "xpack.csp.vulnerabilitiesByResource.severityMap.tooltipTitle": "重要度マップ",
     "xpack.csp.vulnerability_dashboard.cspPageTemplate.pageTitle": "Cloud Native Vulnerability Management",
-    "xpack.csp.vulnerabilityByResourceTable.column.region": "地域",
-    "xpack.csp.vulnerabilityByResourceTable.column.resourceId": "リソースID",
-    "xpack.csp.vulnerabilityByResourceTable.column.resourceName": "リソース名",
-    "xpack.csp.vulnerabilityByResourceTable.column.severityMap": "重要度マップ",
-    "xpack.csp.vulnerabilityByResourceTable.column.vulnerabilities": "脆弱性",
     "xpack.csp.vulnerabilityDashboard.trendGraphChart.accountsDropDown.option.allTitle": "すべて",
     "xpack.csp.vulnerabilityDashboard.trendGraphChart.accountsDropDown.prepend.accountsTitle": "アカウント",
     "xpack.csp.vulnerabilityDashboard.trendGraphChart.trendBySeverityTitle": "重要度別傾向",
     "xpack.csp.vulnerabilityDashboard.viewAllButton.buttonTitle": "すべて表示",
-    "xpack.csp.vulnerabilityTable.column.fixVersion": "修正バージョン",
-    "xpack.csp.vulnerabilityTable.column.package": "パッケージ",
-    "xpack.csp.vulnerabilityTable.column.resourceId": "リソースID",
-    "xpack.csp.vulnerabilityTable.column.resourceName": "リソース名",
-    "xpack.csp.vulnerabilityTable.column.severity": "深刻度",
     "xpack.csp.vulnerabilityTable.column.sortAscending": "低 -> 重大",
     "xpack.csp.vulnerabilityTable.column.sortDescending": "重大 -> 低",
-    "xpack.csp.vulnerabilityTable.column.version": "バージョン",
-    "xpack.csp.vulnerabilityTable.column.vulnerability": "脆弱性",
     "xpack.csp.vulnerabilityTable.panel.buttonText": "すべての脆弱性を表示",
     "xpack.csp.vulnMgmtIntegration.awsOption.nameTitle": "Amazon Web Services",
     "xpack.csp.vulnMgmtIntegration.azureOption.nameTitle": "Azure",
@@ -20165,7 +20120,6 @@
     "xpack.infra.homePage.noMetricsIndicesInstructionsActionLabel": "セットアップの手順を表示",
     "xpack.infra.homePage.settingsTabTitle": "設定",
     "xpack.infra.homePage.tellUsWhatYouThinkK8sLink": "ご意見をお聞かせください。（K8s）",
-    "xpack.observabilityShared.featureFeedbackButton.tellUsWhatYouThinkLink": "ご意見をお聞かせください。",
     "xpack.infra.homePage.toolbar.kqlSearchFieldPlaceholder": "インフラストラクチャーデータを検索…（例：host.name:host-1）",
     "xpack.infra.hostFlyout.explainProcessMessageTitle": "このプロセスの概要",
     "xpack.infra.hosts.searchPlaceholder": "ホストを検索（例：cloud.provider:gcp AND system.load.1 > 0.5）",
@@ -20959,6 +20913,47 @@
     "xpack.infra.waffle.unableToSelectMetricErrorTitle": "メトリックのオプションまたは値を選択できません。",
     "xpack.infra.waffleTime.autoRefreshButtonLabel": "自動更新",
     "xpack.infra.waffleTime.stopRefreshingButtonLabel": "更新中止",
+    "xpack.observabilityShared.featureFeedbackButton.tellUsWhatYouThinkLink": "ご意見をお聞かせください。",
+    "xpack.observabilityShared.inspector.stats.queryTimeValue": "{queryTime}ms",
+    "xpack.observabilityShared.breadcrumbs.observabilityLinkText": "Observability",
+    "xpack.observabilityShared.inspector.stats.dataViewDescription": "Elasticsearchインデックスに接続したデータビューです。",
+    "xpack.observabilityShared.inspector.stats.dataViewLabel": "データビュー",
+    "xpack.observabilityShared.inspector.stats.hitsDescription": "クエリにより返されたドキュメントの数です。",
+    "xpack.observabilityShared.inspector.stats.hitsLabel": "ヒット数",
+    "xpack.observabilityShared.inspector.stats.hitsTotalDescription": "クエリに一致するドキュメントの数です。",
+    "xpack.observabilityShared.inspector.stats.hitsTotalLabel": "ヒット数（合計）",
+    "xpack.observabilityShared.inspector.stats.kibanaApiQueryParametersDescription": "Elasticsearch要求を開始したKibana API要求で使用されているクエリパラメーター。",
+    "xpack.observabilityShared.inspector.stats.kibanaApiQueryParametersLabel": "Kibana APIクエリパラメーター",
+    "xpack.observabilityShared.inspector.stats.kibanaApiRouteDescription": "Elasticsearch要求を開始したKibana API要求のルート。",
+    "xpack.observabilityShared.inspector.stats.kibanaApiRouteLabel": "Kibana APIルート",
+    "xpack.observabilityShared.inspector.stats.queryTimeDescription": "クエリの処理の所要時間です。リクエストの送信やブラウザーでのパースの時間は含まれません。",
+    "xpack.observabilityShared.inspector.stats.queryTimeLabel": "クエリ時間",
+    "xpack.observabilityShared.navigation.betaBadge": "ベータ",
+    "xpack.observabilityShared.navigation.experimentalBadgeLabel": "テクニカルプレビュー",
+    "xpack.observabilityShared.navigation.newBadge": "新規",
+    "xpack.observabilityShared.pageLayout.sideNavTitle": "Observability",
+    "xpack.observabilityShared.sectionLink.newLabel": "新規",
+    "xpack.observabilityShared.technicalPreviewBadgeDescription": "この機能はテクニカルプレビュー中であり、将来のリリースでは変更されたり完全に削除されたりする場合があります。Elasticは最善の努力を講じてすべての問題の修正に努めますが、テクニカルプレビュー中の機能には正式なGA機能のサポートSLAが適用されません。",
+    "xpack.observabilityShared.technicalPreviewBadgeLabel": "テクニカルプレビュー",
+    "xpack.observabilityShared.tour.alertsStep.imageAltText": "アラートデモ",
+    "xpack.observabilityShared.tour.alertsStep.tourContent": "電子メール、PagerDuty、Slackなどのサードパーティプラットフォーム統合でアラートをトリガーする条件を定義して検出します。",
+    "xpack.observabilityShared.tour.alertsStep.tourTitle": "変更が発生したときに通知",
+    "xpack.observabilityShared.tour.endButtonLabel": "ツアーを終了",
+    "xpack.observabilityShared.tour.guidedSetupStep.tourContent": "Elasticオブザーバビリティに進む最も簡単な方法は、データアシスタントで推奨された次のステップに従うことです。",
+    "xpack.observabilityShared.tour.guidedSetupStep.tourTitle": "Elasticオブザーバビリティのその他の機能",
+    "xpack.observabilityShared.tour.metricsExplorerStep.imageAltText": "メトリックエクスプローラーのデモ",
+    "xpack.observabilityShared.tour.metricsExplorerStep.tourContent": "システム、クラウド、ネットワーク、その他のインフラストラクチャーソースからメトリックをストリーム、グループ化、可視化します。",
+    "xpack.observabilityShared.tour.metricsExplorerStep.tourTitle": "インフラストラクチャーの正常性を監視",
+    "xpack.observabilityShared.tour.nextButtonLabel": "次へ",
+    "xpack.observabilityShared.tour.observabilityOverviewStep.tourContent": "クイックガイドを表示し、オブザーバビリティデータすべてを1つのスタックに格納する利点をご覧ください。",
+    "xpack.observabilityShared.tour.observabilityOverviewStep.tourTitle": "Elasticオブザーバビリティへようこそ",
+    "xpack.observabilityShared.tour.servicesStep.imageAltText": "サービスのデモ",
+    "xpack.observabilityShared.tour.servicesStep.tourContent": "サービスに関する詳細情報を収集し、パフォーマンスの問題をすばやく検出、修正できます。",
+    "xpack.observabilityShared.tour.servicesStep.tourTitle": "アプリケーションの問題を特定して解決",
+    "xpack.observabilityShared.tour.skipButtonLabel": "ツアーをスキップ",
+    "xpack.observabilityShared.tour.streamStep.imageAltText": "ログストリームのデモ",
+    "xpack.observabilityShared.tour.streamStep.tourContent": "アプリケーション、サーバー、仮想マシン、コネクターからのログイベントを監視、フィルター、検査します。",
+    "xpack.observabilityShared.tour.streamStep.tourTitle": "リアルタイムでログを追跡",
     "xpack.metricsData.assetDetails.formulas.cpuUsage": "CPU使用状況",
     "xpack.metricsData.assetDetails.formulas.cpuUsage.iowaitLabel": "iowait",
     "xpack.metricsData.assetDetails.formulas.cpuUsage.irqLabel": "irq",
@@ -21929,54 +21924,6 @@
     "xpack.lens.xyVisualization.dataTypeFailureXShort": "{axis}のデータ型が正しくありません。",
     "xpack.lens.xyVisualization.dataTypeFailureYLong": "{axis}のディメンション{label}のデータ型が正しくありません。数値が想定されていますが、{dataType}です",
     "xpack.lens.xyVisualization.dataTypeFailureYShort": "{axis}のデータ型が正しくありません。",
-    "lensFormulaDocs.tinymath.absFunction.markdown": "\n絶対値を計算します。負の値は-1で乗算されます。正の値は同じままです。\n\n例：海水位までの平均距離を計算します `abs(average(altitude))`\n    ",
-    "lensFormulaDocs.tinymath.addFunction.markdown": "\n2つの数値を加算します。\n+記号も使用できます。\n\n例：2つのフィールドの合計を計算します\n\n`sum(price) + sum(tax)`\n\n例：固定値でカウントをオフセットします\n\n`add(count(), 5)`\n    ",
-    "lensFormulaDocs.tinymath.cbrtFunction.markdown": "\n値の立方根。\n\n例：体積から側面の長さを計算します\n`cbrt(last_value(volume))`\n    ",
-    "lensFormulaDocs.tinymath.ceilFunction.markdown": "\n値の上限（切り上げ）。\n\n例：価格を次のドル単位まで切り上げます\n`ceil(sum(price))`\n    ",
-    "lensFormulaDocs.tinymath.clampFunction.markdown": "\n最小値から最大値までの値を制限します。\n\n例：確実に異常値を特定します\n```\nclamp(\n  average(bytes),\n  percentile(bytes, percentile=5),\n  percentile(bytes, percentile=95)\n)\n```\n",
-    "lensFormulaDocs.tinymath.cubeFunction.markdown": "\n数値の三乗を計算します。\n\n例：側面の長さから体積を計算します\n`cube(last_value(length))`\n    ",
-    "lensFormulaDocs.tinymath.defaultFunction.markdown": "\n値がヌルのときにデフォルトの数値を返します。\n\n例：フィールドにデータがない場合は、-1を返します\n`defaults(average(bytes), -1)`\n",
-    "lensFormulaDocs.tinymath.divideFunction.markdown": "\n1番目の数値を2番目の数値で除算します。\n/記号も使用できます\n\n例：利益率を計算します\n`sum(profit) / sum(revenue)`\n\n例：`divide(sum(bytes), 2)`\n    ",
-    "lensFormulaDocs.tinymath.eqFunction.markdown": "\n2つの値で等価性の比較を実行します。\n「ifelse」比較関数の条件として使用されます。\n==記号も使用できます。\n\n例：バイトの平均が平均メモリーと同じ量の場合は、trueを返します。\n`average(bytes) == average(memory)`\n\n例: `eq(sum(bytes), 1000000)`\n    ",
-    "lensFormulaDocs.tinymath.expFunction.markdown": "\n*e*をn乗します。\n\n例：自然指数関数を計算します\n\n`exp(last_value(duration))`\n    ",
-    "lensFormulaDocs.tinymath.fixFunction.markdown": "\n正の値の場合は、下限を取ります。負の値の場合は、上限を取ります。\n\n例：ゼロに向かって端数処理します\n`fix(sum(profit))`\n    ",
-    "lensFormulaDocs.tinymath.floorFunction.markdown": "\n最も近い整数値まで切り捨てます\n\n例：価格を切り捨てます\n`floor(sum(price))`\n    ",
-    "lensFormulaDocs.tinymath.gteFunction.markdown": "\n2つの値で大なりの比較を実行します。\n「ifelse」比較関数の条件として使用されます。\n>=記号も使用できます。\n\n例：バイトの平均がメモリーの平均量以上である場合は、trueを返します\n`average(bytes) >= average(memory)`\n\n例: `gte(average(bytes), 1000)`\n    ",
-    "lensFormulaDocs.tinymath.gtFunction.markdown": "\n2つの値で大なりの比較を実行します。\n「ifelse」比較関数の条件として使用されます。\n>記号も使用できます。\n\n例：バイトの平均がメモリーの平均量より大きい場合は、trueを返します\n`average(bytes) > average(memory)`\n\n例: `gt(average(bytes), 1000)`\n    ",
-    "lensFormulaDocs.tinymath.ifElseFunction.markdown": "\n条件の要素がtrueかfalseかに応じて、値を返します。\n\n例：顧客ごとの平均収益。ただし、場合によっては、顧客IDが提供されないことがあり、その場合は別の顧客としてカウントされます\n`sum(total)/(unique_count(customer_id) + ifelse( count() > count(kql='customer_id:*'), 1, 0))`\n    ",
-    "lensFormulaDocs.tinymath.logFunction.markdown": "\nオプションで底をとる対数。デフォルトでは自然対数の底*e*を使用します。\n\n例：値を格納するために必要なビット数を計算します\n```\nlog(sum(bytes))\nlog(sum(bytes), 2)\n```\n    ",
-    "lensFormulaDocs.tinymath.lteFunction.markdown": "\n2つの値で小なりイコールの比較を実行します。\n「ifelse」比較関数の条件として使用されます。\n<=記号も使用できます。\n\n例：バイトの平均がメモリーの平均量以下である場合は、trueを返します\n`average(bytes) <= average(memory)`\n\n例: `lte(average(bytes), 1000)`\n    ",
-    "lensFormulaDocs.tinymath.ltFunction.markdown": "\n2つの値で小なりの比較を実行します。\n「ifelse」比較関数の条件として使用されます。\n<記号も使用できます。\n\n例：バイトの平均がメモリーの平均量より少ない場合は、trueを返します\n`average(bytes) <= average(memory)`\n\n例: `lt(average(bytes), 1000)`\n    ",
-    "lensFormulaDocs.tinymath.maxFunction.markdown": "\n2つの数値の間の最大値が検出されます。\n\n例：2つのフィールドの平均の最大値が検出されます。\n`pick_max(average(bytes), average(memory))`\n        ",
-    "lensFormulaDocs.tinymath.minFunction.markdown": "\n2つの数値の間の最小値が検出されます。\n\n例：2つのフィールドの平均の最小値が検索されます。\n`pick_min(average(bytes), average(memory))`\n    ",
-    "lensFormulaDocs.tinymath.modFunction.markdown": "\n関数を数値で除算した後の余り\n\n例：値の最後の3ビットを計算します\n`mod(sum(price), 1000)`\n    ",
-    "lensFormulaDocs.tinymath.multiplyFunction.markdown": "\n2つの数値を乗算します。\n*記号も使用できます。\n\n例：現在の税率を入れた価格を計算します\n`sum(bytes) * last_value(tax_rate)`\n\n例：一定の税率を入れた価格を計算します\n`multiply(sum(price), 1.2)`\n    ",
-    "lensFormulaDocs.tinymath.powFunction.markdown": "\n値を特定の乗数で累乗します。2番目の引数は必須です\n\n例：側面の長さに基づいて体積を計算します\n`pow(last_value(length), 3)`\n    ",
-    "lensFormulaDocs.tinymath.roundFunction.markdown": "\n特定の小数位に四捨五入します。デフォルトは0です。\n\n例：セントに四捨五入します\n```\nround(sum(bytes))\nround(sum(bytes), 2)\n```\n    ",
-    "lensFormulaDocs.tinymath.sqrtFunction.markdown": "\n正の値のみの平方根\n\n例：面積に基づいて側面の長さを計算します\n`sqrt(last_value(area))`\n    ",
-    "lensFormulaDocs.tinymath.squareFunction.markdown": "\n値を2乗します\n\n例：側面の長さに基づいて面積を計算します\n`square(last_value(length))`\n    ",
-    "lensFormulaDocs.tinymath.subtractFunction.markdown": "\n2番目の数値から1番目の数値を減算します。\n-記号も使用できます。\n\n例：フィールドの範囲を計算します\n`subtract(max(bytes), min(bytes))`\n    ",
-    "lensFormulaDocs.documentation.filterRatioDescription.markdown": "### フィルター比率：\n\n`kql=''`を使用すると、1つのセットのドキュメントをフィルターして、同じグループの他のドキュメントと比較します。\n例：経時的なエラー率の変化を表示する\n\n```\ncount(kql='response.status_code > 400') / count()\n```\n        ",
-    "lensFormulaDocs.documentation.markdown": "## 仕組み\n\nLens式では、Elasticsearchの集計および数学関数を使用して演算を実行できます\n。主に次の3種類の関数があります。\n\n* `sum(bytes)`などのElasticsearchメトリック\n* 時系列関数は`cumulative_sum()`などのElasticsearchメトリックを入力として使用します\n* `round()`などの数学関数\n\nこれらのすべての関数を使用する式の例：\n\n```\nround(100 * moving_average(\naverage(cpu.load.pct),\nwindow=10,\nkql='datacenter.name: east*'\n))\n```\n\nElasticsearchの関数はフィールド名を取り、フィールドは引用符で囲むこともできます。`sum(bytes)`は\nas `sum('bytes')`.\n\n一部の関数は、`moving_average(count(), window=5)`のような名前付き引数を取ります。\n\nElasticsearchメトリックはKQLまたはLucene構文を使用してフィルターできます。フィルターを追加するには、名前付き\nparameter `kql='field: value'` or `lucene=''`.KQLまたはLuceneクエリを作成するときには、必ず引用符を使用してください\n。検索が引用符で囲まれている場合は、`kql='Women's''のようにバックスラッシュでエスケープします。\n\n数学関数は位置引数を取ることができます。たとえば、pow(count(), 3)はcount() * count() * count()と同じです。\n\n+、-、/、*記号を使用して、基本演算を実行できます。\n      ",
-    "lensFormulaDocs.documentation.percentOfTotalDescription.markdown": "### 合計の割合\n\nすべてのグループで式は`overall_sum`を計算できます。\nこれは各グループを合計の割合に変換できます。\n\n```\nsum(products.base_price) / overall_sum(sum(products.base_price))\n```\n        ",
-    "lensFormulaDocs.documentation.recentChangeDescription.markdown": "### 最近の変更\n\n「reducedTimeRange='30m'」を使用して、グローバル時間範囲の最後と一致するメトリックの時間範囲で、フィルターを追加しました。これにより、どのくらいの値が最近変更されたのかを計算できます。\n\n```\nmax(system.network.in.bytes, reducedTimeRange=\"30m\")\n - min(system.network.in.bytes, reducedTimeRange=\"30m\")\n```\n        ",
-    "lensFormulaDocs.documentation.weekOverWeekDescription.markdown": "### 週単位：\n\n`shift='1w'`を使用すると、前の週から各グループの値を取得します\n。時間シフトは*Top values*関数と使用しないでください。\n\n```\npercentile(system.network.in.bytes, percentile=99) /\npercentile(system.network.in.bytes, percentile=99, shift='1w')\n```\n        ",
-    "lensFormulaDocs.cardinality.documentation.markdown": "\n指定されたフィールドの一意の値の数を計算します。数値、文字列、日付、ブール値で機能します。\n\n例：異なる製品の数を計算します。\n`unique_count(product.name)`\n\n例：「clothes」グループから異なる製品の数を計算します。\n`unique_count(product.name, kql='product.group=clothes')`\n      ",
-    "lensFormulaDocs.count.documentation.markdown": "\nドキュメントの総数。フィールドを入力すると、フィールド値の合計数がカウントされます。1つのドキュメントに複数の値があるフィールドでCount関数を使用すると、すべての値がカウントされます。\n\n#### 例\n\nドキュメントの合計数を計算するには、count()を使用します。\n\nすべての注文書の製品数を計算するには、count(products.id)を使用します。\n\n特定のフィルターと一致するドキュメントの数を計算するには、count(kql='price > 500')を使用します。\n      ",
-    "lensFormulaDocs.counterRate.documentation.markdown": "\n増加し続けるカウンターのレートを計算します。この関数は、経時的に単調に増加する種類の測定を含むカウンターメトリックフィールドでのみ結果を生成します。\n値が小さくなる場合は、カウンターリセットであると解釈されます。最も正確な結果を得るには、フィールドの「max`」で「counter_rate」を計算してください。\n\nこの計算はフィルターで定義された別の系列または上位値のディメンションに対して個別に実行されます。\n式で使用されるときには、現在の間隔を使用します。\n\n例：Memcachedサーバーで経時的に受信されたバイトの比率を可視化します。\n`counter_rate(max(memcached.stats.read.bytes))`\n      ",
-    "lensFormulaDocs.cumulativeSum.documentation.markdown": "\n経時的なメトリックの累計値を計算し、系列のすべての前の値を各値に追加します。この関数を使用するには、日付ヒストグラムディメンションも構成する必要があります。\n\nこの計算はフィルターで定義された別の系列または上位値のディメンションに対して個別に実行されます。\n\n例：経時的に累積された受信バイト数を可視化します。\n`cumulative_sum(sum(bytes))`\n      ",
-    "lensFormulaDocs.differences.documentation.markdown": "\n経時的にメトリックの最後の値に対する差異を計算します。この関数を使用するには、日付ヒストグラムディメンションも構成する必要があります。\n差異ではデータが連続する必要があります。差異を使用するときにデータが空の場合は、データヒストグラム間隔を大きくしてみてください。\n\nこの計算はフィルターで定義された別の系列または上位値のディメンションに対して個別に実行されます。\n\n例：経時的に受信したバイト数の変化を可視化します。\n`differences(sum(bytes))`\n      ",
-    "lensFormulaDocs.lastValue.documentation.markdown": "\n最後のドキュメントからフィールドの値を返し、データビューのデフォルト時刻フィールドで並べ替えます。\n\nこの関数はエンティティの最新の状態を取得する際に役立ちます。\n\n例：サーバーAの現在のステータスを取得：\n`last_value(server.status, kql='server.name=\"A\"')`\n      ",
-    "lensFormulaDocs.metric.documentation.markdown": "\nフィールドの{metric}を返します。この関数は数値フィールドでのみ動作します。\n\n例：価格の{metric}を取得：\n`{metric}(price)`\n\n例：英国からの注文の価格の{metric}を取得：\n`{metric}(price, kql='location:UK')`\n      ",
-    "lensFormulaDocs.movingAverage.documentation.markdown": "\n経時的なメトリックの移動平均を計算します。最後のn番目の値を平均化し、現在の値を計算します。この関数を使用するには、日付ヒストグラムディメンションも構成する必要があります。\nデフォルトウィンドウ値は{defaultValue}です\n\nこの計算はフィルターで定義された別の系列または上位値のディメンションに対して個別に実行されます。\n\n指名パラメーター「window」を取ります。これは現在値の平均計算に含める最後の値の数を指定します。\n\n例：測定の線を平滑化：\n`moving_average(sum(bytes), window=5)`\n      ",
-    "lensFormulaDocs.overall_average.documentation.markdown": "\n現在のグラフの系列のすべてのデータポイントのメトリックの平均を計算します。系列は日付ヒストグラムまたは間隔関数を使用してディメンションによって定義されます。\n上位の値やフィルターなどのデータを分解する他のディメンションは別の系列として処理されます。\n\n日付ヒストグラムまたは間隔関数が現在のグラフで使用されている場合、使用されている関数に関係なく、「overall_average」はすべてのディメンションで平均値を計算します。\n\n例：平均からの収束：\n`sum(bytes) - overall_average(sum(bytes))`\n      ",
-    "lensFormulaDocs.overall_max.documentation.markdown": "\n現在のグラフの系列のすべてのデータポイントのメトリックの最大値を計算します。系列は日付ヒストグラムまたは間隔関数を使用してディメンションによって定義されます。\n上位の値やフィルターなどのデータを分解する他のディメンションは別の系列として処理されます。\n\n日付ヒストグラムまたは間隔関数が現在のグラフで使用されている場合、使用されている関数に関係なく、「overall_max」はすべてのディメンションで最大値を計算します。\n\n例：範囲の割合\n`(sum(bytes) - overall_min(sum(bytes))) / (overall_max(sum(bytes)) - overall_min(sum(bytes)))`\n      ",
-    "lensFormulaDocs.overall_min.documentation.markdown": "\n現在のグラフの系列のすべてのデータポイントのメトリックの最小値を計算します。系列は日付ヒストグラムまたは間隔関数を使用してディメンションによって定義されます。\n上位の値やフィルターなどのデータを分解する他のディメンションは別の系列として処理されます。\n\n日付ヒストグラムまたは間隔関数が現在のグラフで使用されている場合、使用されている関数に関係なく、「overall_min」はすべてのディメンションで最小値を計算します。\n\n例：範囲の割合\n`(sum(bytes) - overall_min(sum(bytes)) / (overall_max(sum(bytes)) - overall_min(sum(bytes)))`\n      ",
-    "lensFormulaDocs.overall_sum.documentation.markdown": "\n現在のグラフの系列のすべてのデータポイントのメトリックの合計を計算します。系列は日付ヒストグラムまたは間隔関数を使用してディメンションによって定義されます。\n上位の値やフィルターなどのデータを分解する他のディメンションは別の系列として処理されます。\n\n日付ヒストグラムまたは間隔関数が現在のグラフで使用されている場合、使用されている関数に関係なく、「overall_sum」はすべてのディメンションで合計値を計算します。\n\n例：合計の割合\n`sum(bytes) / overall_sum(sum(bytes))`\n      ",
-    "lensFormulaDocs.percentile.documentation.markdown": "\nフィールドの値の指定された百分位数を返します。これはドキュメントに出現する値のnパーセントが小さい値です。\n\n例：値の95 %より大きいバイト数を取得：\n`percentile(bytes, percentile=95)`\n      ",
-    "lensFormulaDocs.percentileRanks.documentation.markdown": "\n特定の値未満の値の割合が返されます。たとえば、値が観察された値の95%以上の場合、95パーセンタイルランクであるとされます。\n\n例：100未満の値のパーセンタイルを取得します。\n`percentile_rank(bytes, value=100)`\n      ",
-    "lensFormulaDocs.standardDeviation.documentation.markdown": "\nフィールドの分散または散布度が返されます。この関数は数値フィールドでのみ動作します。\n\n#### 例\n\n価格の標準偏差を取得するには、standard_deviation(price)を使用します。\n\n英国からの注文書の価格の分散を取得するには、square(standard_deviation(price, kql='location:UK'))を使用します。\n      ",
-    "lensFormulaDocs.time_scale.documentation.markdown": "\n\nこの高度な機能は、特定の期間に対してカウントと合計を正規化する際に役立ちます。すでに特定の期間に対して正規化され、保存されたメトリックとの統合が可能です。\n\nこの機能は、現在のグラフで日付ヒストグラム関数が使用されている場合にのみ使用できます。\n\n例：すでに正規化されているメトリックを、正規化が必要な別のメトリックと比較した比率。\n`normalize_by_unit(counter_rate(max(system.diskio.write.bytes)), unit='s') / last_value(apache.status.bytes_per_second)`\n      ",
     "xpack.lens.AggBasedLabel": "集約に基づく可視化",
     "xpack.lens.app.addToLibrary": "ライブラリに保存",
     "xpack.lens.app.cancel": "キャンセル",
@@ -22154,11 +22101,6 @@
     "xpack.lens.fittingFunctionsTitle.lookahead": "次へ",
     "xpack.lens.fittingFunctionsTitle.none": "非表示",
     "xpack.lens.fittingFunctionsTitle.zero": "ゼロ",
-    "lensFormulaDocs.tinymath.base": "基数",
-    "lensFormulaDocs.boolean": "ブール",
-    "lensFormulaDocs.tinymath.condition": "条件",
-    "lensFormulaDocs.tinymath.decimals": "小数点以下",
-    "lensFormulaDocs.tinymath.defaultValue": "デフォルト",
     "xpack.lens.formula.disableWordWrapLabel": "単語の折り返しを無効にする",
     "xpack.lens.formula.editorHelpInlineHideLabel": "関数リファレンスを非表示",
     "xpack.lens.formula.editorHelpInlineHideToolTip": "関数リファレンスを非表示",
@@ -22166,35 +22108,12 @@
     "xpack.lens.formula.fullScreenEnterLabel": "拡張",
     "xpack.lens.formula.fullScreenExitLabel": "縮小",
     "xpack.lens.formula.kqlExtraArguments": "[kql]?：文字列、[lucene]?：文字列",
-    "lensFormulaDocs.tinymath.left": "左",
-    "lensFormulaDocs.tinymath.max": "最高",
-    "lensFormulaDocs.tinymath.min": "分",
-    "lensFormulaDocs.number": "数字",
     "xpack.lens.formula.reducedTimeRangeExtraArguments": "[reducedTimeRange]?: string",
     "xpack.lens.formula.requiredArgument": "必須",
-    "lensFormulaDocs.tinymath.right": "右",
     "xpack.lens.formula.shiftExtraArguments": "[shift]?：文字列",
-    "lensFormulaDocs.string": "文字列",
-    "lensFormulaDocs.tinymath.value": "値",
-    "lensFormulaDocs.CommonFormulaDocumentation": "最も一般的な式は2つの値を分割して割合を生成します。正確に表示するには、［値形式］を［割合］に設定します。",
-    "lensFormulaDocs.documentation.columnCalculationSection": "列計算",
-    "lensFormulaDocs.documentation.columnCalculationSectionDescription": "各行でこれらの関数が実行されますが、コンテキストとして列全体が提供されます。これはウィンドウ関数とも呼ばれます。",
-    "lensFormulaDocs.documentation.comparisonSection": "比較",
-    "lensFormulaDocs.documentation.comparisonSectionDescription": "これらの関数は値を比較するために使用されます。",
-    "lensFormulaDocs.documentation.constantsSection": "Kibanaコンテキスト",
-    "lensFormulaDocs.documentation.constantsSectionDescription": "これらの関数は、Kibanaのコンテキスト変数（日付ヒストグラムの「interval」、現在の「now」、選択した「time_range」）を取得するために使用され、日付の計算処理を行うのに役立ちます。",
-    "lensFormulaDocs.documentation.elasticsearchSection": "Elasticsearch",
-    "lensFormulaDocs.documentation.elasticsearchSectionDescription": "これらの関数は結果テーブルの各行の未加工ドキュメントで実行され、内訳ディメンションと一致するすべてのドキュメントを単一の値に集約します。",
-    "lensFormulaDocs.documentation.filterRatio": "フィルター比率",
-    "lensFormulaDocs.documentation.mathSection": "数学処理",
-    "lensFormulaDocs.documentation.mathSectionDescription": "これらの関数は、他の関数で計算された同じ行の単一の値を使用して、結果テーブルの各行で実行されます。",
-    "lensFormulaDocs.documentation.percentOfTotal": "合計の割合",
-    "lensFormulaDocs.documentation.recentChange": "最近の変更",
-    "lensFormulaDocs.documentation.weekOverWeek": "週単位",
     "xpack.lens.formulaDocumentationHeading": "仕組み",
     "xpack.lens.formulaEnableWordWrapLabel": "単語の折り返しを有効にする",
     "xpack.lens.formulaExampleMarkdown": "例",
-    "lensFormulaDocs.frequentlyUsedHeading": "一般的な式",
     "xpack.lens.formulaPlaceholderText": "関数を演算と組み合わせて式を入力します。例：",
     "xpack.lens.fullExtent.niceValues": "切りの良い値に端数処理",
     "xpack.lens.functions.collapse.args.byHelpText": "グループ化の基準となる列。この列はそのまま保持されます",
@@ -22253,29 +22172,20 @@
     "xpack.lens.indexPattern.allFieldsLabelHelp": "使用可能なフィールドをワークスペースまでドラッグし、ビジュアライゼーションを作成します。使用可能なフィールドを変更するには、別のデータビューを選択するか、クエリを編集するか、別の時間範囲を使用します。一部のフィールドタイプは、完全なテキストおよびグラフィックフィールドを含む Lens では、ビジュアライゼーションできません。",
     "xpack.lens.indexPattern.ascendingCountPrecisionErrorWarning.link": "ドキュメントをご覧ください",
     "xpack.lens.indexPattern.availableFieldsLabel": "利用可能なフィールド",
-    "lensFormulaDocs.avg": "平均",
     "xpack.lens.indexPattern.avg.description": "集約されたドキュメントから抽出された数値の平均値を計算する単一値メトリック集約",
     "xpack.lens.indexPattern.avg.quickFunctionDescription": "数値フィールドの集合の平均値。",
     "xpack.lens.indexPattern.bitsFormatLabel": "ビット（1000）",
     "xpack.lens.indexPattern.bytesFormatLabel": "バイト（1024）",
-    "lensFormulaDocs.cardinality": "ユニークカウント",
     "xpack.lens.indexPattern.cardinality.documentation.quick": "\n指定した数値、文字列、日付、ブール値フィールドの一意の値の数。\n      ",
-    "lensFormulaDocs.cardinality.signature": "フィールド：文字列",
     "xpack.lens.indexPattern.changeDataViewTitle": "データビュー",
     "xpack.lens.indexPattern.chooseField": "フィールド",
     "xpack.lens.indexPattern.chooseFieldLabel": "この関数を使用するには、フィールドを選択してください。",
     "xpack.lens.indexPattern.chooseSubFunction": "サブ関数を選択",
     "xpack.lens.indexPattern.columnFormatLabel": "値の形式",
     "xpack.lens.indexPattern.compactLabel": "値の圧縮",
-    "lensFormulaDocs.count": "カウント",
     "xpack.lens.indexPattern.count.documentation.quick": "\nドキュメントの総数。フィールドを入力すると、フィールド値の合計数がカウントされます。1つのドキュメントに複数の値があるフィールドでCount関数を使用すると、すべての値がカウントされます。\n      ",
-    "lensFormulaDocs.count.signature": "[field: string]",
-    "lensFormulaDocs.counterRate": "カウンターレート",
     "xpack.lens.indexPattern.counterRate.documentation.quick": "\n      増加を続ける時系列メトリックの経時的な変化率。\n      ",
-    "lensFormulaDocs.counterRate.signature": "メトリック：数値",
     "xpack.lens.indexPattern.countOf": "レコード数",
-    "lensFormulaDocs.cumulative_sum.signature": "メトリック：数値",
-    "lensFormulaDocs.cumulativeSum": "累積和",
     "xpack.lens.indexPattern.cumulativeSum.documentation.quick": "\n      経時的に増加するすべての値の合計。\n      ",
     "xpack.lens.indexPattern.custom.externalDoc": "数値書式構文",
     "xpack.lens.indexPattern.custom.patternLabel": "フォーマット",
@@ -22305,9 +22215,7 @@
     "xpack.lens.indexPattern.dateRange.noTimeRange": "現在の時間範囲がありません",
     "xpack.lens.indexPattern.decimalPlacesLabel": "小数点以下",
     "xpack.lens.indexPattern.defaultFormatLabel": "デフォルト",
-    "lensFormulaDocs.derivative": "差異",
     "xpack.lens.indexPattern.differences.documentation.quick": "\n      後続の間隔の値の変化。\n      ",
-    "lensFormulaDocs.differences.signature": "メトリック：数値",
     "xpack.lens.indexPattern.dimensionEditor.headingAppearance": "見た目",
     "xpack.lens.indexPattern.dimensionEditor.headingData": "データ",
     "xpack.lens.indexPattern.dimensionEditor.headingFormula": "式",
@@ -22360,30 +22268,22 @@
     "xpack.lens.indexPattern.invalidOperationLabel": "選択した関数はこのフィールドで動作しません。",
     "xpack.lens.indexPattern.invalidReducedTimeRange": "縮小された時間範囲が無効です。正の整数の後に単位s、m、h、d、w、M、yのいずれかを入力します。例：3時間は3hです",
     "xpack.lens.indexPattern.invalidTimeShift": "無効な時間シフトです。正の整数の後に単位s、m、h、d、w、M、yのいずれかを入力します。例：3時間は3hです",
-    "lensFormulaDocs.lastValue": "最終値",
     "xpack.lens.indexPattern.lastValue.disabled": "この関数には、データビューの日付フィールドが必要です",
     "xpack.lens.indexPattern.lastValue.documentation.quick": "\n最後のドキュメントのフィールドの値。データビューのデフォルト時刻フィールドで並べ替えられます。\n      ",
     "xpack.lens.indexPattern.lastValue.showArrayValues": "ゼロ値を表示",
     "xpack.lens.indexPattern.lastValue.showArrayValuesExplanation": "各最後のドキュメントのこのフィールドに関連付けられたすべての値を表示します。",
     "xpack.lens.indexPattern.lastValue.showArrayValuesWithTopValuesWarning": "配列値を表示するときには、このフィールドを使用して上位の値をランク付けできません。",
-    "lensFormulaDocs.lastValue.signature": "フィールド：文字列",
     "xpack.lens.indexPattern.lastValue.sortField": "日付フィールドで並べ替え",
     "xpack.lens.indexPattern.lastValue.sortFieldPlaceholder": "並べ替えフィールド",
-    "lensFormulaDocs.max": "最高",
     "xpack.lens.indexPattern.max.description": "集約されたドキュメントから抽出された数値の最大値を返す単一値メトリック集約。",
     "xpack.lens.indexPattern.max.quickFunctionDescription": "数値フィールドの最大値。",
-    "lensFormulaDocs.median": "中央",
     "xpack.lens.indexPattern.median.description": "集約されたドキュメントから抽出された中央値を計算する単一値メトリック集約。",
     "xpack.lens.indexPattern.median.quickFunctionDescription": "数値フィールドの中央値。",
     "xpack.lens.indexPattern.metaFieldsLabel": "メタフィールド",
-    "lensFormulaDocs.metric.signature": "フィールド：文字列",
-    "lensFormulaDocs.min": "最低",
     "xpack.lens.indexPattern.min.description": "集約されたドキュメントから抽出された数値の最小値を返す単一値メトリック集約。",
     "xpack.lens.indexPattern.min.quickFunctionDescription": "数値フィールドの最小値。",
     "xpack.lens.indexPattern.missingFieldLabel": "見つからないフィールド",
     "xpack.lens.indexPattern.moveToWorkspaceNotAvailable": "このフィールドを可視化するには、直接任意のレイヤーに追加してください。現在の設定では、このフィールドをワークスペースに追加することはサポートされていません。",
-    "lensFormulaDocs.moving_average.signature": "メトリック：数値、[window]：数値",
-    "lensFormulaDocs.movingAverage": "移動平均",
     "xpack.lens.indexPattern.movingAverage.basicExplanation": "移動平均はデータ全体でウィンドウをスライドし、平均値を表示します。移動平均は日付ヒストグラムでのみサポートされています。",
     "xpack.lens.indexPattern.movingAverage.documentation.quick": "\n      経時的な値の移動範囲の平均。\n      ",
     "xpack.lens.indexPattern.movingAverage.limitations": "最初の移動平均値は2番目の項目から開始します。",
@@ -22399,20 +22299,12 @@
     "xpack.lens.indexPattern.noRealMetricError": "静的値のみのレイヤーには結果が表示されません。1つ以上の動的メトリックを使用してください",
     "xpack.lens.indexPattern.notAbsoluteTimeShift": "無効な時間シフトです。",
     "xpack.lens.indexPattern.numberFormatLabel": "数字",
-    "lensFormulaDocs.overall_metric": "メトリック：数値",
-    "lensFormulaDocs.overallMax": "全体最高",
-    "lensFormulaDocs.overallMin": "全体最低",
-    "lensFormulaDocs.overallSum": "全体合計",
     "xpack.lens.indexPattern.percentFormatLabel": "割合（%）",
-    "lensFormulaDocs.percentile": "パーセンタイル",
     "xpack.lens.indexPattern.percentile.documentation.quick": "\n      すべてのドキュメントで発生する値のnパーセントよりも小さい最大値。\n      ",
     "xpack.lens.indexPattern.percentile.percentileRanksValue": "パーセンタイル順位値",
     "xpack.lens.indexPattern.percentile.percentileValue": "パーセンタイル",
-    "lensFormulaDocs.percentile.signature": "フィールド：文字列、[percentile]：数値",
-    "lensFormulaDocs.percentileRank": "パーセンタイル順位",
     "xpack.lens.indexPattern.percentileRanks.documentation.quick": "\n特定の値未満の値の割合。たとえば、値が計算された値の95%以上の場合、95パーセンタイル順位です。\n      ",
     "xpack.lens.indexPattern.percentileRanks.errorMessage": "パーセンタイル順位値は数値でなければなりません",
-    "lensFormulaDocs.percentileRanks.signature": "フィールド: 文字列, [value]: 数値",
     "xpack.lens.indexPattern.precisionErrorWarning.accuracyDisabled.shortMessage": "これは近似値の可能性があります。より正確な結果を得るために精度モードを有効にできますが、Elasticsearchクラスターの負荷が大きくなります。",
     "xpack.lens.indexPattern.precisionErrorWarning.accuracyEnabled.shortMessage": "これは近似値の可能性があります。より正確な結果を得るには、フィルターを使用するか、上位の値の数を増やしてください。",
     "xpack.lens.indexPattern.precisionErrorWarning.ascendingCountPrecisionErrorWarning.shortMessage": "データのインデックスの作成方法により、近似される場合があります。より正確な結果を得るには、希少性でソートしてください。",
@@ -22462,7 +22354,6 @@
     "xpack.lens.indexPattern.samplingPerLayer.fallbackLayerName": "データレイヤー",
     "xpack.lens.indexPattern.settingsSamplingUnsupported": "この関数を選択すると、関数が正常に機能するように、このレイヤーのサンプリングが100%に変更されます。",
     "xpack.lens.indexPattern.sortField.invalid": "無効なフィールドです。データビューを確認するか、別のフィールドを選択してください。",
-    "lensFormulaDocs.standardDeviation": "標準偏差",
     "xpack.lens.indexPattern.standardDeviation.description": "集約されたドキュメントから抽出された数値の標準偏差を計算する単一値メトリック集約",
     "xpack.lens.indexPattern.standardDeviation.quickFunctionDescription": "フィールド値の変動量である数値フィールドの値の標準偏差。",
     "xpack.lens.indexPattern.staticValue.label": "基準線値",
@@ -22472,7 +22363,6 @@
     "xpack.lens.indexPattern.staticValueWarningText": "固定値を上書きするには、クイック関数を選択します",
     "xpack.lens.indexPattern.suffixLabel": "接尾辞",
     "xpack.lens.indexpattern.suggestions.overTimeLabel": "一定時間",
-    "lensFormulaDocs.sum": "合計",
     "xpack.lens.indexPattern.sum.description": "集約されたドキュメントから抽出された数値を合計する単一値メトリック集約。",
     "xpack.lens.indexPattern.sum.quickFunctionDescription": "数値フィールドの値の合計量。",
     "xpack.lens.indexPattern.switchToRare": "希少性でランク",
@@ -22510,8 +22400,6 @@
     "xpack.lens.indexPattern.terms.size": "値の数",
     "xpack.lens.indexPattern.termsWithMultipleShifts": "単一のレイヤーでは、メトリックを異なる時間シフトと動的な上位の値と組み合わせることができません。すべてのメトリックで同じ時間シフト値を使用するか、上位の値ではなくフィルターを使用します。",
     "xpack.lens.indexPattern.termsWithMultipleShiftsFixActionLabel": "フィルターを使用",
-    "lensFormulaDocs.time_scale": "メトリック：数値、単位：s|m|h|d|w|M|y",
-    "lensFormulaDocs.timeScale": "単位で正規化",
     "xpack.lens.indexPattern.timeScale.label": "単位で正規化",
     "xpack.lens.indexPattern.timeScale.missingUnit": "単位による正規化の単位が指定されていません。",
     "xpack.lens.indexPattern.timeScale.tooltip": "基本の日付間隔に関係なく、常に指定された時間単位のレートとして表示されるように値を正規化します。",
@@ -22956,6 +22844,113 @@
     "xpack.lens.xyVisualization.stackedPercentageBarHorizontalLabel": "H.割合棒",
     "xpack.lens.xyVisualization.stackedPercentageBarLabel": "縦棒割合",
     "xpack.lens.xyVisualization.xyLabel": "XY",
+    "lensFormulaDocs.tinymath.absFunction.markdown": "\n絶対値を計算します。負の値は-1で乗算されます。正の値は同じままです。\n\n例：海水位までの平均距離を計算します `abs(average(altitude))`\n    ",
+    "lensFormulaDocs.tinymath.addFunction.markdown": "\n2つの数値を加算します。\n+記号も使用できます。\n\n例：2つのフィールドの合計を計算します\n\n`sum(price) + sum(tax)`\n\n例：固定値でカウントをオフセットします\n\n`add(count(), 5)`\n    ",
+    "lensFormulaDocs.tinymath.cbrtFunction.markdown": "\n値の立方根。\n\n例：体積から側面の長さを計算します\n`cbrt(last_value(volume))`\n    ",
+    "lensFormulaDocs.tinymath.ceilFunction.markdown": "\n値の上限（切り上げ）。\n\n例：価格を次のドル単位まで切り上げます\n`ceil(sum(price))`\n    ",
+    "lensFormulaDocs.tinymath.clampFunction.markdown": "\n最小値から最大値までの値を制限します。\n\n例：確実に異常値を特定します\n```\nclamp(\n  average(bytes),\n  percentile(bytes, percentile=5),\n  percentile(bytes, percentile=95)\n)\n```\n",
+    "lensFormulaDocs.tinymath.cubeFunction.markdown": "\n数値の三乗を計算します。\n\n例：側面の長さから体積を計算します\n`cube(last_value(length))`\n    ",
+    "lensFormulaDocs.tinymath.defaultFunction.markdown": "\n値がヌルのときにデフォルトの数値を返します。\n\n例：フィールドにデータがない場合は、-1を返します\n`defaults(average(bytes), -1)`\n",
+    "lensFormulaDocs.tinymath.divideFunction.markdown": "\n1番目の数値を2番目の数値で除算します。\n/記号も使用できます\n\n例：利益率を計算します\n`sum(profit) / sum(revenue)`\n\n例：`divide(sum(bytes), 2)`\n    ",
+    "lensFormulaDocs.tinymath.eqFunction.markdown": "\n2つの値で等価性の比較を実行します。\n「ifelse」比較関数の条件として使用されます。\n==記号も使用できます。\n\n例：バイトの平均が平均メモリーと同じ量の場合は、trueを返します。\n`average(bytes) == average(memory)`\n\n例: `eq(sum(bytes), 1000000)`\n    ",
+    "lensFormulaDocs.tinymath.expFunction.markdown": "\n*e*をn乗します。\n\n例：自然指数関数を計算します\n\n`exp(last_value(duration))`\n    ",
+    "lensFormulaDocs.tinymath.fixFunction.markdown": "\n正の値の場合は、下限を取ります。負の値の場合は、上限を取ります。\n\n例：ゼロに向かって端数処理します\n`fix(sum(profit))`\n    ",
+    "lensFormulaDocs.tinymath.floorFunction.markdown": "\n最も近い整数値まで切り捨てます\n\n例：価格を切り捨てます\n`floor(sum(price))`\n    ",
+    "lensFormulaDocs.tinymath.gteFunction.markdown": "\n2つの値で大なりの比較を実行します。\n「ifelse」比較関数の条件として使用されます。\n>=記号も使用できます。\n\n例：バイトの平均がメモリーの平均量以上である場合は、trueを返します\n`average(bytes) >= average(memory)`\n\n例: `gte(average(bytes), 1000)`\n    ",
+    "lensFormulaDocs.tinymath.gtFunction.markdown": "\n2つの値で大なりの比較を実行します。\n「ifelse」比較関数の条件として使用されます。\n>記号も使用できます。\n\n例：バイトの平均がメモリーの平均量より大きい場合は、trueを返します\n`average(bytes) > average(memory)`\n\n例: `gt(average(bytes), 1000)`\n    ",
+    "lensFormulaDocs.tinymath.ifElseFunction.markdown": "\n条件の要素がtrueかfalseかに応じて、値を返します。\n\n例：顧客ごとの平均収益。ただし、場合によっては、顧客IDが提供されないことがあり、その場合は別の顧客としてカウントされます\n`sum(total)/(unique_count(customer_id) + ifelse( count() > count(kql='customer_id:*'), 1, 0))`\n    ",
+    "lensFormulaDocs.tinymath.logFunction.markdown": "\nオプションで底をとる対数。デフォルトでは自然対数の底*e*を使用します。\n\n例：値を格納するために必要なビット数を計算します\n```\nlog(sum(bytes))\nlog(sum(bytes), 2)\n```\n    ",
+    "lensFormulaDocs.tinymath.lteFunction.markdown": "\n2つの値で小なりイコールの比較を実行します。\n「ifelse」比較関数の条件として使用されます。\n<=記号も使用できます。\n\n例：バイトの平均がメモリーの平均量以下である場合は、trueを返します\n`average(bytes) <= average(memory)`\n\n例: `lte(average(bytes), 1000)`\n    ",
+    "lensFormulaDocs.tinymath.ltFunction.markdown": "\n2つの値で小なりの比較を実行します。\n「ifelse」比較関数の条件として使用されます。\n<記号も使用できます。\n\n例：バイトの平均がメモリーの平均量より少ない場合は、trueを返します\n`average(bytes) <= average(memory)`\n\n例: `lt(average(bytes), 1000)`\n    ",
+    "lensFormulaDocs.tinymath.maxFunction.markdown": "\n2つの数値の間の最大値が検出されます。\n\n例：2つのフィールドの平均の最大値が検出されます。\n`pick_max(average(bytes), average(memory))`\n        ",
+    "lensFormulaDocs.tinymath.minFunction.markdown": "\n2つの数値の間の最小値が検出されます。\n\n例：2つのフィールドの平均の最小値が検索されます。\n`pick_min(average(bytes), average(memory))`\n    ",
+    "lensFormulaDocs.tinymath.modFunction.markdown": "\n関数を数値で除算した後の余り\n\n例：値の最後の3ビットを計算します\n`mod(sum(price), 1000)`\n    ",
+    "lensFormulaDocs.tinymath.multiplyFunction.markdown": "\n2つの数値を乗算します。\n*記号も使用できます。\n\n例：現在の税率を入れた価格を計算します\n`sum(bytes) * last_value(tax_rate)`\n\n例：一定の税率を入れた価格を計算します\n`multiply(sum(price), 1.2)`\n    ",
+    "lensFormulaDocs.tinymath.powFunction.markdown": "\n値を特定の乗数で累乗します。2番目の引数は必須です\n\n例：側面の長さに基づいて体積を計算します\n`pow(last_value(length), 3)`\n    ",
+    "lensFormulaDocs.tinymath.roundFunction.markdown": "\n特定の小数位に四捨五入します。デフォルトは0です。\n\n例：セントに四捨五入します\n```\nround(sum(bytes))\nround(sum(bytes), 2)\n```\n    ",
+    "lensFormulaDocs.tinymath.sqrtFunction.markdown": "\n正の値のみの平方根\n\n例：面積に基づいて側面の長さを計算します\n`sqrt(last_value(area))`\n    ",
+    "lensFormulaDocs.tinymath.squareFunction.markdown": "\n値を2乗します\n\n例：側面の長さに基づいて面積を計算します\n`square(last_value(length))`\n    ",
+    "lensFormulaDocs.tinymath.subtractFunction.markdown": "\n2番目の数値から1番目の数値を減算します。\n-記号も使用できます。\n\n例：フィールドの範囲を計算します\n`subtract(max(bytes), min(bytes))`\n    ",
+    "lensFormulaDocs.documentation.filterRatioDescription.markdown": "### フィルター比率：\n\n`kql=''`を使用すると、1つのセットのドキュメントをフィルターして、同じグループの他のドキュメントと比較します。\n例：経時的なエラー率の変化を表示する\n\n```\ncount(kql='response.status_code > 400') / count()\n```\n        ",
+    "lensFormulaDocs.documentation.markdown": "## 仕組み\n\nLens式では、Elasticsearchの集計および数学関数を使用して演算を実行できます\n。主に次の3種類の関数があります。\n\n* `sum(bytes)`などのElasticsearchメトリック\n* 時系列関数は`cumulative_sum()`などのElasticsearchメトリックを入力として使用します\n* `round()`などの数学関数\n\nこれらのすべての関数を使用する式の例：\n\n```\nround(100 * moving_average(\naverage(cpu.load.pct),\nwindow=10,\nkql='datacenter.name: east*'\n))\n```\n\nElasticsearchの関数はフィールド名を取り、フィールドは引用符で囲むこともできます。`sum(bytes)`は\nas `sum('bytes')`.\n\n一部の関数は、`moving_average(count(), window=5)`のような名前付き引数を取ります。\n\nElasticsearchメトリックはKQLまたはLucene構文を使用してフィルターできます。フィルターを追加するには、名前付き\nparameter `kql='field: value'` or `lucene=''`.KQLまたはLuceneクエリを作成するときには、必ず引用符を使用してください\n。検索が引用符で囲まれている場合は、`kql='Women's''のようにバックスラッシュでエスケープします。\n\n数学関数は位置引数を取ることができます。たとえば、pow(count(), 3)はcount() * count() * count()と同じです。\n\n+、-、/、*記号を使用して、基本演算を実行できます。\n      ",
+    "lensFormulaDocs.documentation.percentOfTotalDescription.markdown": "### 合計の割合\n\nすべてのグループで式は`overall_sum`を計算できます。\nこれは各グループを合計の割合に変換できます。\n\n```\nsum(products.base_price) / overall_sum(sum(products.base_price))\n```\n        ",
+    "lensFormulaDocs.documentation.recentChangeDescription.markdown": "### 最近の変更\n\n「reducedTimeRange='30m'」を使用して、グローバル時間範囲の最後と一致するメトリックの時間範囲で、フィルターを追加しました。これにより、どのくらいの値が最近変更されたのかを計算できます。\n\n```\nmax(system.network.in.bytes, reducedTimeRange=\"30m\")\n - min(system.network.in.bytes, reducedTimeRange=\"30m\")\n```\n        ",
+    "lensFormulaDocs.documentation.weekOverWeekDescription.markdown": "### 週単位：\n\n`shift='1w'`を使用すると、前の週から各グループの値を取得します\n。時間シフトは*Top values*関数と使用しないでください。\n\n```\npercentile(system.network.in.bytes, percentile=99) /\npercentile(system.network.in.bytes, percentile=99, shift='1w')\n```\n        ",
+    "lensFormulaDocs.cardinality.documentation.markdown": "\n指定されたフィールドの一意の値の数を計算します。数値、文字列、日付、ブール値で機能します。\n\n例：異なる製品の数を計算します。\n`unique_count(product.name)`\n\n例：「clothes」グループから異なる製品の数を計算します。\n`unique_count(product.name, kql='product.group=clothes')`\n      ",
+    "lensFormulaDocs.count.documentation.markdown": "\nドキュメントの総数。フィールドを入力すると、フィールド値の合計数がカウントされます。1つのドキュメントに複数の値があるフィールドでCount関数を使用すると、すべての値がカウントされます。\n\n#### 例\n\nドキュメントの合計数を計算するには、count()を使用します。\n\nすべての注文書の製品数を計算するには、count(products.id)を使用します。\n\n特定のフィルターと一致するドキュメントの数を計算するには、count(kql='price > 500')を使用します。\n      ",
+    "lensFormulaDocs.counterRate.documentation.markdown": "\n増加し続けるカウンターのレートを計算します。この関数は、経時的に単調に増加する種類の測定を含むカウンターメトリックフィールドでのみ結果を生成します。\n値が小さくなる場合は、カウンターリセットであると解釈されます。最も正確な結果を得るには、フィールドの「max`」で「counter_rate」を計算してください。\n\nこの計算はフィルターで定義された別の系列または上位値のディメンションに対して個別に実行されます。\n式で使用されるときには、現在の間隔を使用します。\n\n例：Memcachedサーバーで経時的に受信されたバイトの比率を可視化します。\n`counter_rate(max(memcached.stats.read.bytes))`\n      ",
+    "lensFormulaDocs.cumulativeSum.documentation.markdown": "\n経時的なメトリックの累計値を計算し、系列のすべての前の値を各値に追加します。この関数を使用するには、日付ヒストグラムディメンションも構成する必要があります。\n\nこの計算はフィルターで定義された別の系列または上位値のディメンションに対して個別に実行されます。\n\n例：経時的に累積された受信バイト数を可視化します。\n`cumulative_sum(sum(bytes))`\n      ",
+    "lensFormulaDocs.differences.documentation.markdown": "\n経時的にメトリックの最後の値に対する差異を計算します。この関数を使用するには、日付ヒストグラムディメンションも構成する必要があります。\n差異ではデータが連続する必要があります。差異を使用するときにデータが空の場合は、データヒストグラム間隔を大きくしてみてください。\n\nこの計算はフィルターで定義された別の系列または上位値のディメンションに対して個別に実行されます。\n\n例：経時的に受信したバイト数の変化を可視化します。\n`differences(sum(bytes))`\n      ",
+    "lensFormulaDocs.lastValue.documentation.markdown": "\n最後のドキュメントからフィールドの値を返し、データビューのデフォルト時刻フィールドで並べ替えます。\n\nこの関数はエンティティの最新の状態を取得する際に役立ちます。\n\n例：サーバーAの現在のステータスを取得：\n`last_value(server.status, kql='server.name=\"A\"')`\n      ",
+    "lensFormulaDocs.metric.documentation.markdown": "\nフィールドの{metric}を返します。この関数は数値フィールドでのみ動作します。\n\n例：価格の{metric}を取得：\n`{metric}(price)`\n\n例：英国からの注文の価格の{metric}を取得：\n`{metric}(price, kql='location:UK')`\n      ",
+    "lensFormulaDocs.movingAverage.documentation.markdown": "\n経時的なメトリックの移動平均を計算します。最後のn番目の値を平均化し、現在の値を計算します。この関数を使用するには、日付ヒストグラムディメンションも構成する必要があります。\nデフォルトウィンドウ値は{defaultValue}です\n\nこの計算はフィルターで定義された別の系列または上位値のディメンションに対して個別に実行されます。\n\n指名パラメーター「window」を取ります。これは現在値の平均計算に含める最後の値の数を指定します。\n\n例：測定の線を平滑化：\n`moving_average(sum(bytes), window=5)`\n      ",
+    "lensFormulaDocs.overall_average.documentation.markdown": "\n現在のグラフの系列のすべてのデータポイントのメトリックの平均を計算します。系列は日付ヒストグラムまたは間隔関数を使用してディメンションによって定義されます。\n上位の値やフィルターなどのデータを分解する他のディメンションは別の系列として処理されます。\n\n日付ヒストグラムまたは間隔関数が現在のグラフで使用されている場合、使用されている関数に関係なく、「overall_average」はすべてのディメンションで平均値を計算します。\n\n例：平均からの収束：\n`sum(bytes) - overall_average(sum(bytes))`\n      ",
+    "lensFormulaDocs.overall_max.documentation.markdown": "\n現在のグラフの系列のすべてのデータポイントのメトリックの最大値を計算します。系列は日付ヒストグラムまたは間隔関数を使用してディメンションによって定義されます。\n上位の値やフィルターなどのデータを分解する他のディメンションは別の系列として処理されます。\n\n日付ヒストグラムまたは間隔関数が現在のグラフで使用されている場合、使用されている関数に関係なく、「overall_max」はすべてのディメンションで最大値を計算します。\n\n例：範囲の割合\n`(sum(bytes) - overall_min(sum(bytes))) / (overall_max(sum(bytes)) - overall_min(sum(bytes)))`\n      ",
+    "lensFormulaDocs.overall_min.documentation.markdown": "\n現在のグラフの系列のすべてのデータポイントのメトリックの最小値を計算します。系列は日付ヒストグラムまたは間隔関数を使用してディメンションによって定義されます。\n上位の値やフィルターなどのデータを分解する他のディメンションは別の系列として処理されます。\n\n日付ヒストグラムまたは間隔関数が現在のグラフで使用されている場合、使用されている関数に関係なく、「overall_min」はすべてのディメンションで最小値を計算します。\n\n例：範囲の割合\n`(sum(bytes) - overall_min(sum(bytes)) / (overall_max(sum(bytes)) - overall_min(sum(bytes)))`\n      ",
+    "lensFormulaDocs.overall_sum.documentation.markdown": "\n現在のグラフの系列のすべてのデータポイントのメトリックの合計を計算します。系列は日付ヒストグラムまたは間隔関数を使用してディメンションによって定義されます。\n上位の値やフィルターなどのデータを分解する他のディメンションは別の系列として処理されます。\n\n日付ヒストグラムまたは間隔関数が現在のグラフで使用されている場合、使用されている関数に関係なく、「overall_sum」はすべてのディメンションで合計値を計算します。\n\n例：合計の割合\n`sum(bytes) / overall_sum(sum(bytes))`\n      ",
+    "lensFormulaDocs.percentile.documentation.markdown": "\nフィールドの値の指定された百分位数を返します。これはドキュメントに出現する値のnパーセントが小さい値です。\n\n例：値の95 %より大きいバイト数を取得：\n`percentile(bytes, percentile=95)`\n      ",
+    "lensFormulaDocs.percentileRanks.documentation.markdown": "\n特定の値未満の値の割合が返されます。たとえば、値が観察された値の95%以上の場合、95パーセンタイルランクであるとされます。\n\n例：100未満の値のパーセンタイルを取得します。\n`percentile_rank(bytes, value=100)`\n      ",
+    "lensFormulaDocs.standardDeviation.documentation.markdown": "\nフィールドの分散または散布度が返されます。この関数は数値フィールドでのみ動作します。\n\n#### 例\n\n価格の標準偏差を取得するには、standard_deviation(price)を使用します。\n\n英国からの注文書の価格の分散を取得するには、square(standard_deviation(price, kql='location:UK'))を使用します。\n      ",
+    "lensFormulaDocs.time_scale.documentation.markdown": "\n\nこの高度な機能は、特定の期間に対してカウントと合計を正規化する際に役立ちます。すでに特定の期間に対して正規化され、保存されたメトリックとの統合が可能です。\n\nこの機能は、現在のグラフで日付ヒストグラム関数が使用されている場合にのみ使用できます。\n\n例：すでに正規化されているメトリックを、正規化が必要な別のメトリックと比較した比率。\n`normalize_by_unit(counter_rate(max(system.diskio.write.bytes)), unit='s') / last_value(apache.status.bytes_per_second)`\n      ",
+    "lensFormulaDocs.tinymath.base": "基数",
+    "lensFormulaDocs.boolean": "ブール",
+    "lensFormulaDocs.tinymath.condition": "条件",
+    "lensFormulaDocs.tinymath.decimals": "小数点以下",
+    "lensFormulaDocs.tinymath.defaultValue": "デフォルト",
+    "lensFormulaDocs.tinymath.left": "左",
+    "lensFormulaDocs.tinymath.max": "最高",
+    "lensFormulaDocs.tinymath.min": "分",
+    "lensFormulaDocs.number": "数字",
+    "lensFormulaDocs.tinymath.right": "右",
+    "lensFormulaDocs.string": "文字列",
+    "lensFormulaDocs.tinymath.value": "値",
+    "lensFormulaDocs.CommonFormulaDocumentation": "最も一般的な式は2つの値を分割して割合を生成します。正確に表示するには、［値形式］を［割合］に設定します。",
+    "lensFormulaDocs.documentation.columnCalculationSection": "列計算",
+    "lensFormulaDocs.documentation.columnCalculationSectionDescription": "各行でこれらの関数が実行されますが、コンテキストとして列全体が提供されます。これはウィンドウ関数とも呼ばれます。",
+    "lensFormulaDocs.documentation.comparisonSection": "比較",
+    "lensFormulaDocs.documentation.comparisonSectionDescription": "これらの関数は値を比較するために使用されます。",
+    "lensFormulaDocs.documentation.constantsSection": "Kibanaコンテキスト",
+    "lensFormulaDocs.documentation.constantsSectionDescription": "これらの関数は、Kibanaのコンテキスト変数（日付ヒストグラムの「interval」、現在の「now」、選択した「time_range」）を取得するために使用され、日付の計算処理を行うのに役立ちます。",
+    "lensFormulaDocs.documentation.elasticsearchSection": "Elasticsearch",
+    "lensFormulaDocs.documentation.elasticsearchSectionDescription": "これらの関数は結果テーブルの各行の未加工ドキュメントで実行され、内訳ディメンションと一致するすべてのドキュメントを単一の値に集約します。",
+    "lensFormulaDocs.documentation.filterRatio": "フィルター比率",
+    "lensFormulaDocs.documentation.mathSection": "数学処理",
+    "lensFormulaDocs.documentation.mathSectionDescription": "これらの関数は、他の関数で計算された同じ行の単一の値を使用して、結果テーブルの各行で実行されます。",
+    "lensFormulaDocs.documentation.percentOfTotal": "合計の割合",
+    "lensFormulaDocs.documentation.recentChange": "最近の変更",
+    "lensFormulaDocs.documentation.weekOverWeek": "週単位",
+    "lensFormulaDocs.frequentlyUsedHeading": "一般的な式",
+    "lensFormulaDocs.avg": "平均",
+    "lensFormulaDocs.cardinality": "ユニークカウント",
+    "lensFormulaDocs.cardinality.signature": "フィールド：文字列",
+    "lensFormulaDocs.count": "カウント",
+    "lensFormulaDocs.count.signature": "[field: string]",
+    "lensFormulaDocs.counterRate": "カウンターレート",
+    "lensFormulaDocs.counterRate.signature": "メトリック：数値",
+    "lensFormulaDocs.cumulative_sum.signature": "メトリック：数値",
+    "lensFormulaDocs.cumulativeSum": "累積和",
+    "lensFormulaDocs.derivative": "差異",
+    "lensFormulaDocs.differences.signature": "メトリック：数値",
+    "lensFormulaDocs.lastValue": "最終値",
+    "lensFormulaDocs.lastValue.signature": "フィールド：文字列",
+    "lensFormulaDocs.max": "最高",
+    "lensFormulaDocs.median": "中央",
+    "lensFormulaDocs.metric.signature": "フィールド：文字列",
+    "lensFormulaDocs.min": "最低",
+    "lensFormulaDocs.moving_average.signature": "メトリック：数値、[window]：数値",
+    "lensFormulaDocs.movingAverage": "移動平均",
+    "lensFormulaDocs.overall_metric": "メトリック：数値",
+    "lensFormulaDocs.overallMax": "全体最高",
+    "lensFormulaDocs.overallMin": "全体最低",
+    "lensFormulaDocs.overallSum": "全体合計",
+    "lensFormulaDocs.percentile": "パーセンタイル",
+    "lensFormulaDocs.percentile.signature": "フィールド：文字列、[percentile]：数値",
+    "lensFormulaDocs.percentileRank": "パーセンタイル順位",
+    "lensFormulaDocs.percentileRanks.signature": "フィールド: 文字列, [value]: 数値",
+    "lensFormulaDocs.standardDeviation": "標準偏差",
+    "lensFormulaDocs.sum": "合計",
+    "lensFormulaDocs.time_scale": "メトリック：数値、単位：s|m|h|d|w|M|y",
+    "lensFormulaDocs.timeScale": "単位で正規化",
     "xpack.licenseApiGuard.license.errorExpiredMessage": "{licenseType} ライセンスが期限切れのため {pluginName} を使用できません。",
     "xpack.licenseApiGuard.license.errorUnavailableMessage": "現在ライセンス情報が利用できないため {pluginName} を使用できません。",
     "xpack.licenseApiGuard.license.errorUnsupportedMessage": "ご使用の {licenseType} ライセンスは {pluginName} をサポートしていません。ライセンスをアップグレードしてください。",
@@ -29496,46 +29491,6 @@
     "xpack.observabilityAiAssistant.setupKb": "ナレッジベースを設定することで、エクスペリエンスが改善されます。",
     "xpack.observabilityAiAssistant.stopGeneratingButtonLabel": "生成を停止",
     "xpack.observabilityAiAssistant.technicalPreviewBadgeDescription": "関数呼び出し（根本原因分析やデータの視覚化など）を使用する際に、より一貫性のあるエクスペリエンスを実現するために、GPT4が必要です。GPT3.5は、エラーの説明などのシンプルなワークフローの一部や、頻繁な関数呼び出しの使用が必要とされないKibana内のエクスペリエンスなどのChatGPTで機能します。",
-    "xpack.observabilityShared.inspector.stats.queryTimeValue": "{queryTime}ms",
-    "xpack.observabilityShared.breadcrumbs.observabilityLinkText": "Observability",
-    "xpack.observabilityShared.inspector.stats.dataViewDescription": "Elasticsearchインデックスに接続したデータビューです。",
-    "xpack.observabilityShared.inspector.stats.dataViewLabel": "データビュー",
-    "xpack.observabilityShared.inspector.stats.hitsDescription": "クエリにより返されたドキュメントの数です。",
-    "xpack.observabilityShared.inspector.stats.hitsLabel": "ヒット数",
-    "xpack.observabilityShared.inspector.stats.hitsTotalDescription": "クエリに一致するドキュメントの数です。",
-    "xpack.observabilityShared.inspector.stats.hitsTotalLabel": "ヒット数（合計）",
-    "xpack.observabilityShared.inspector.stats.kibanaApiQueryParametersDescription": "Elasticsearch要求を開始したKibana API要求で使用されているクエリパラメーター。",
-    "xpack.observabilityShared.inspector.stats.kibanaApiQueryParametersLabel": "Kibana APIクエリパラメーター",
-    "xpack.observabilityShared.inspector.stats.kibanaApiRouteDescription": "Elasticsearch要求を開始したKibana API要求のルート。",
-    "xpack.observabilityShared.inspector.stats.kibanaApiRouteLabel": "Kibana APIルート",
-    "xpack.observabilityShared.inspector.stats.queryTimeDescription": "クエリの処理の所要時間です。リクエストの送信やブラウザーでのパースの時間は含まれません。",
-    "xpack.observabilityShared.inspector.stats.queryTimeLabel": "クエリ時間",
-    "xpack.observabilityShared.navigation.betaBadge": "ベータ",
-    "xpack.observabilityShared.navigation.experimentalBadgeLabel": "テクニカルプレビュー",
-    "xpack.observabilityShared.navigation.newBadge": "新規",
-    "xpack.observabilityShared.pageLayout.sideNavTitle": "Observability",
-    "xpack.observabilityShared.sectionLink.newLabel": "新規",
-    "xpack.observabilityShared.technicalPreviewBadgeDescription": "この機能はテクニカルプレビュー中であり、将来のリリースでは変更されたり完全に削除されたりする場合があります。Elasticは最善の努力を講じてすべての問題の修正に努めますが、テクニカルプレビュー中の機能には正式なGA機能のサポートSLAが適用されません。",
-    "xpack.observabilityShared.technicalPreviewBadgeLabel": "テクニカルプレビュー",
-    "xpack.observabilityShared.tour.alertsStep.imageAltText": "アラートデモ",
-    "xpack.observabilityShared.tour.alertsStep.tourContent": "電子メール、PagerDuty、Slackなどのサードパーティプラットフォーム統合でアラートをトリガーする条件を定義して検出します。",
-    "xpack.observabilityShared.tour.alertsStep.tourTitle": "変更が発生したときに通知",
-    "xpack.observabilityShared.tour.endButtonLabel": "ツアーを終了",
-    "xpack.observabilityShared.tour.guidedSetupStep.tourContent": "Elasticオブザーバビリティに進む最も簡単な方法は、データアシスタントで推奨された次のステップに従うことです。",
-    "xpack.observabilityShared.tour.guidedSetupStep.tourTitle": "Elasticオブザーバビリティのその他の機能",
-    "xpack.observabilityShared.tour.metricsExplorerStep.imageAltText": "メトリックエクスプローラーのデモ",
-    "xpack.observabilityShared.tour.metricsExplorerStep.tourContent": "システム、クラウド、ネットワーク、その他のインフラストラクチャーソースからメトリックをストリーム、グループ化、可視化します。",
-    "xpack.observabilityShared.tour.metricsExplorerStep.tourTitle": "インフラストラクチャーの正常性を監視",
-    "xpack.observabilityShared.tour.nextButtonLabel": "次へ",
-    "xpack.observabilityShared.tour.observabilityOverviewStep.tourContent": "クイックガイドを表示し、オブザーバビリティデータすべてを1つのスタックに格納する利点をご覧ください。",
-    "xpack.observabilityShared.tour.observabilityOverviewStep.tourTitle": "Elasticオブザーバビリティへようこそ",
-    "xpack.observabilityShared.tour.servicesStep.imageAltText": "サービスのデモ",
-    "xpack.observabilityShared.tour.servicesStep.tourContent": "サービスに関する詳細情報を収集し、パフォーマンスの問題をすばやく検出、修正できます。",
-    "xpack.observabilityShared.tour.servicesStep.tourTitle": "アプリケーションの問題を特定して解決",
-    "xpack.observabilityShared.tour.skipButtonLabel": "ツアーをスキップ",
-    "xpack.observabilityShared.tour.streamStep.imageAltText": "ログストリームのデモ",
-    "xpack.observabilityShared.tour.streamStep.tourContent": "アプリケーション、サーバー、仮想マシン、コネクターからのログイベントを監視、フィルター、検査します。",
-    "xpack.observabilityShared.tour.streamStep.tourTitle": "リアルタイムでログを追跡",
     "xpack.osquery.action.missingPrivileges": "このページにアクセスするには、{osquery} Kibana権限について管理者に確認してください。",
     "xpack.osquery.agentPolicy.confirmModalCalloutDescription": "選択した{agentPolicyCount, plural, other {エージェントポリシー}}が一部のエージェントですでに使用されていることをFleetが検出しました。このアクションの結果として、Fleetはこの{agentPolicyCount, plural, other {エージェントポリシー}}を使用しているすべてのエージェントに更新をデプロイします。",
     "xpack.osquery.agentPolicy.confirmModalCalloutTitle": "{agentCount, plural, other {#個のエージェント}}が更新されます",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index e6a5247f6cd9b2..85c7cd070335a8 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -4895,6 +4895,33 @@
     "lensFormulaDocs.percentileRanks.documentation.markdown": "\n返回小于某个值的值的百分比。例如，如果某个值大于或等于 95% 的观察值，则称它处于第 95 个百分位等级\n\n例如：获取小于 100 的值的百分比：\n`percentile_rank(bytes, value=100)`\n      ",
     "lensFormulaDocs.standardDeviation.documentation.markdown": "\n返回字段的变量或差量数量。此函数仅适用于数字字段。\n\n#### 示例\n\n要获取价格的标准偏差，请使用 `standard_deviation(price)`。\n\n要获取来自英国的订单的价格方差，请使用 `square(standard_deviation(price, kql='location:UK'))`。\n      ",
     "lensFormulaDocs.time_scale.documentation.markdown": "\n\n此高级函数用于将计数和总和标准化为特定时间间隔。它允许集成所存储的已标准化为特定时间间隔的指标。\n\n此函数只能在当前图表中使用了日期直方图函数时使用。\n\n例如：将已标准化指标与其他需要标准化的指标进行比较的比率。\n`normalize_by_unit(counter_rate(max(system.diskio.write.bytes)), unit='s') / last_value(apache.status.bytes_per_second)`\n      ",
+    "lensFormulaDocs.tinymath.base": "底数",
+    "lensFormulaDocs.boolean": "布尔值",
+    "lensFormulaDocs.tinymath.condition": "条件",
+    "lensFormulaDocs.tinymath.decimals": "小数",
+    "lensFormulaDocs.tinymath.defaultValue": "默认值",
+    "lensFormulaDocs.tinymath.left": "左",
+    "lensFormulaDocs.tinymath.right": "右",
+    "lensFormulaDocs.tinymath.value": "值",
+    "lensFormulaDocs.documentation.filterRatio": "筛选比",
+    "lensFormulaDocs.documentation.mathSection": "数学",
+    "lensFormulaDocs.documentation.mathSectionDescription": "结果表的每行使用相同行中使用其他函数计算的单值执行这些函数。",
+    "lensFormulaDocs.documentation.percentOfTotal": "总计的百分比",
+    "lensFormulaDocs.documentation.recentChange": "最近更改",
+    "lensFormulaDocs.documentation.weekOverWeek": "周环比",
+    "lensFormulaDocs.frequentlyUsedHeading": "常用公式",
+    "lensFormulaDocs.cardinality.signature": "field: string",
+    "lensFormulaDocs.count.signature": "[字段：字符串]",
+    "lensFormulaDocs.counterRate.signature": "指标：数字",
+    "lensFormulaDocs.cumulative_sum.signature": "指标：数字",
+    "lensFormulaDocs.differences.signature": "指标：数字",
+    "lensFormulaDocs.lastValue.signature": "field: string",
+    "lensFormulaDocs.metric.signature": "field: string",
+    "lensFormulaDocs.moving_average.signature": "指标：数字，[window]：数字",
+    "lensFormulaDocs.overall_metric": "指标：数字",
+    "lensFormulaDocs.percentile.signature": "field: string, [percentile]: number",
+    "lensFormulaDocs.percentileRanks.signature": "字段：字符串，[值]：数字",
+    "lensFormulaDocs.time_scale": "指标：数字，单位：s|m|h|d|w|M|y",
     "links.contentManagement.saveModalTitle": "将 {contentId} 面板保存到库",
     "links.externalLink.editor.urlFormatError": "格式无效。示例：{exampleUrl}",
     "links.dashboardLink.description": "前往仪表板",
@@ -12020,13 +12047,7 @@
     "xpack.csp.cloudPosturePage.kspmIntegration.packageNotInstalled.description": "使用我们的 {integrationFullName} (KSPM) 集成可在您的 Kubernetes 集群中检测安全配置错误。",
     "xpack.csp.complianceScoreBar.tooltipTitle": "{failed} 个失败和 {passed} 个通过的结果",
     "xpack.csp.eksIntegration.docsLink": "请参阅 {docs} 了解更多详情",
-    "xpack.csp.findings..bottomBarLabel": "这些是匹配您的搜索的前 {maxItems} 个结果，请优化搜索以查看其他结果。",
     "xpack.csp.findings.distributionBar.showingPageOfTotalLabel": "正在显示第 {pageStart}-{pageEnd} 个 {type}（共 {total} 个）",
-    "xpack.csp.findings.findingsTableCell.addFilterButton": "添加 {field} 筛选",
-    "xpack.csp.findings.findingsTableCell.addFilterButtonTooltip": "添加 {field} 筛选",
-    "xpack.csp.findings.findingsTableCell.addNegatedFilterButtonTooltip": "添加 {field} 作废筛选",
-    "xpack.csp.findings.findingsTableCell.addNegateFilterButton": "添加 {field} 作废筛选",
-    "xpack.csp.findings.resourceFindings.resourceFindingsPageTitle": "{resourceName} {hyphen} 结果",
     "xpack.csp.findingsFlyout.alerts.alertCount": "{alertCount, plural, other {# 个告警}}",
     "xpack.csp.findingsFlyout.alerts.detectionRuleCount": "{ruleCount, plural, other {# 个检测规则}}",
     "xpack.csp.noFindingsStates.indexTimeout.indexTimeoutDescription": "收集结果所需的时间长于预期。{docs}。",
@@ -12034,15 +12055,7 @@
     "xpack.csp.rules.rulesTable.showingPageOfTotalLabel": "正在显示 {pageSize} 个规则（共 {total, plural, other {# 个规则}}）",
     "xpack.csp.subscriptionNotAllowed.promptDescription": "要使用这些云安全功能，您必须 {link}。",
     "xpack.csp.vulnerabilities.detectionRuleNamePrefix": "漏洞：{vulnerabilityId}",
-    "xpack.csp.vulnerabilities.resourceVulnerabilities.vulnerabilitiesPageTitle": "{resourceName} {hyphen} 漏洞",
-    "xpack.csp.vulnerabilities.totalVulnerabilities": "{total, plural, other {# 个漏洞}}",
-    "xpack.csp.vulnerabilities.vulnerabilitiesTableCell.addFilterButton": "添加 {columnId} 筛选",
-    "xpack.csp.vulnerabilities.vulnerabilitiesTableCell.addFilterButtonTooltip": "添加 {columnId} 筛选",
-    "xpack.csp.vulnerabilities.vulnerabilitiesTableCell.addNegatedFilterButtonTooltip": "添加 {columnId} 作废筛选",
-    "xpack.csp.vulnerabilities.vulnerabilitiesTableCell.addNegateFilterButton": "添加 {columnId} 作废筛选",
     "xpack.csp.vulnerabilities.vulnerabilityOverviewTile.publishedDateText": "{date}",
-    "xpack.csp.vulnerabilitiesByResource.totalResources": "{total, plural, other {# 项资源}}",
-    "xpack.csp.vulnerabilitiesByResource.totalVulnerabilities": "{total, plural, other {# 个漏洞}}",
     "xpack.csp.awsIntegration.accessKeyIdLabel": "访问密钥 ID",
     "xpack.csp.awsIntegration.assumeRoleDescription": "IAM 角色 Amazon 资源名称 (ARN) 是您可在 AWS 帐户中创建的 IAM 身份。创建 IAM 角色时，用户可以定义该角色的权限。角色没有标准的长期凭据，如密码或访问密钥。",
     "xpack.csp.awsIntegration.assumeRoleLabel": "接管角色",
@@ -12177,15 +12190,10 @@
     "xpack.csp.emptyState.readDocsLink": "阅读文档",
     "xpack.csp.emptyState.resetFiltersButton": "重置筛选",
     "xpack.csp.emptyState.title": "没有任何结果匹配您的搜索条件",
-    "xpack.csp.expandColumnDescriptionLabel": "展开",
-    "xpack.csp.expandColumnNameLabel": "展开",
     "xpack.csp.findings.distributionBar.totalFailedLabel": "失败的结果",
     "xpack.csp.findings.distributionBar.totalPassedLabel": "通过的结果",
     "xpack.csp.findings.errorCallout.pageSearchErrorTitle": "检索搜索结果时遇到问题",
     "xpack.csp.findings.errorCallout.showErrorButtonLabel": "显示错误消息",
-    "xpack.csp.findings.findingsByResource.tableRowTypeLabel": "资源",
-    "xpack.csp.findings.findingsByResourceTable.cisSectionsColumnLabel": "CIS 部分",
-    "xpack.csp.findings.findingsByResourceTable.postureScoreColumnLabel": "态势分数",
     "xpack.csp.findings.findingsErrorToast.searchFailedTitle": "搜索失败",
     "xpack.csp.findings.findingsFlyout.jsonTabTitle": "JSON",
     "xpack.csp.findings.findingsFlyout.overviewTab.alertsTitle": "告警",
@@ -12217,16 +12225,11 @@
     "xpack.csp.findings.findingsFlyout.ruleTab.tagsTitle": "标签",
     "xpack.csp.findings.findingsFlyout.ruleTabTitle": "规则",
     "xpack.csp.findings.findingsFlyout.tableTabTitle": "表",
-    "xpack.csp.findings.findingsTable.findingsTableColumn.clusterIdColumnLabel": "属于",
-    "xpack.csp.findings.findingsTable.findingsTableColumn.clusterIdColumnTooltipLabel": "Kubernetes 集群 ID 或云帐户名称",
     "xpack.csp.findings.findingsTable.findingsTableColumn.lastCheckedColumnLabel": "上次检查时间",
     "xpack.csp.findings.findingsTable.findingsTableColumn.resourceIdColumnLabel": "资源 ID",
-    "xpack.csp.findings.findingsTable.findingsTableColumn.resourceIdColumnTooltipLabel": "定制 Elastic 资源 ID",
     "xpack.csp.findings.findingsTable.findingsTableColumn.resourceNameColumnLabel": "资源名称",
     "xpack.csp.findings.findingsTable.findingsTableColumn.resourceTypeColumnLabel": "资源类型",
     "xpack.csp.findings.findingsTable.findingsTableColumn.resultColumnLabel": "结果",
-    "xpack.csp.findings.findingsTable.findingsTableColumn.ruleBenchmarkColumnLabel": "适用基准",
-    "xpack.csp.findings.findingsTable.findingsTableColumn.ruleBenchmarkColumnTooltipLabel": "用于评估此资源的基准",
     "xpack.csp.findings.findingsTable.findingsTableColumn.ruleNameColumnLabel": "规则名称",
     "xpack.csp.findings.findingsTable.findingsTableColumn.ruleNumberColumnLabel": "规则编号",
     "xpack.csp.findings.findingsTable.findingsTableColumn.ruleSectionColumnLabel": "CIS 部分",
@@ -12237,12 +12240,6 @@
     "xpack.csp.findings.groupBySelector.groupByNoneLabel": "无",
     "xpack.csp.findings.groupBySelector.groupByResourceIdLabel": "资源",
     "xpack.csp.findings.latestFindings.tableRowTypeLabel": "结果",
-    "xpack.csp.findings.resourceFindings.backToResourcesPageButtonLabel": "返回到资源",
-    "xpack.csp.findings.resourceFindings.tableRowTypeLabel": "结果",
-    "xpack.csp.findings.resourceFindingsSharedValues.cloudAccountName": "云帐户名称",
-    "xpack.csp.findings.resourceFindingsSharedValues.clusterIdTitle": "集群 ID",
-    "xpack.csp.findings.resourceFindingsSharedValues.resourceIdTitle": "资源 ID",
-    "xpack.csp.findings.resourceFindingsSharedValues.resourceTypeTitle": "资源类型",
     "xpack.csp.findings.search.queryErrorToastMessage": "查询错误",
     "xpack.csp.findings.searchBar.searchPlaceholder": "搜索结果（例如，rule.section：“APM 服务器”）",
     "xpack.csp.findings.tabs.misconfigurations": "错误配置",
@@ -12357,9 +12354,6 @@
     "xpack.csp.vulnerabilities": "漏洞",
     "xpack.csp.vulnerabilities.flyoutTabs.fieldLabel": "字段",
     "xpack.csp.vulnerabilities.flyoutTabs.fieldValueLabel": "值",
-    "xpack.csp.vulnerabilities.resourceVulnerabilities.backToResourcesPageButtonLabel": "返回到资源",
-    "xpack.csp.vulnerabilities.resourceVulnerabilities.regionTitle": "地区",
-    "xpack.csp.vulnerabilities.resourceVulnerabilities.resourceIdTitle": "资源 ID",
     "xpack.csp.vulnerabilities.searchBar.placeholder": "搜索漏洞（例如，vulnerability.severity：“CRITICAL”）",
     "xpack.csp.vulnerabilities.table.filterIn": "筛选范围",
     "xpack.csp.vulnerabilities.table.filterOut": "筛除",
@@ -12382,24 +12376,12 @@
     "xpack.csp.vulnerabilities.vulnerabilityOverviewTile.publishedDate": "发布日期",
     "xpack.csp.vulnerabilitiesByResource.severityMap.tooltipTitle": "严重性映射",
     "xpack.csp.vulnerability_dashboard.cspPageTemplate.pageTitle": "云原生漏洞管理",
-    "xpack.csp.vulnerabilityByResourceTable.column.region": "地区",
-    "xpack.csp.vulnerabilityByResourceTable.column.resourceId": "资源 ID",
-    "xpack.csp.vulnerabilityByResourceTable.column.resourceName": "资源名称",
-    "xpack.csp.vulnerabilityByResourceTable.column.severityMap": "严重性映射",
-    "xpack.csp.vulnerabilityByResourceTable.column.vulnerabilities": "漏洞",
     "xpack.csp.vulnerabilityDashboard.trendGraphChart.accountsDropDown.option.allTitle": "全部",
     "xpack.csp.vulnerabilityDashboard.trendGraphChart.accountsDropDown.prepend.accountsTitle": "帐户",
     "xpack.csp.vulnerabilityDashboard.trendGraphChart.trendBySeverityTitle": "趋势（按严重性）",
     "xpack.csp.vulnerabilityDashboard.viewAllButton.buttonTitle": "查看全部",
-    "xpack.csp.vulnerabilityTable.column.fixVersion": "修复版本",
-    "xpack.csp.vulnerabilityTable.column.package": "软件包",
-    "xpack.csp.vulnerabilityTable.column.resourceId": "资源 ID",
-    "xpack.csp.vulnerabilityTable.column.resourceName": "资源名称",
-    "xpack.csp.vulnerabilityTable.column.severity": "严重性",
     "xpack.csp.vulnerabilityTable.column.sortAscending": "低 -> 严重",
     "xpack.csp.vulnerabilityTable.column.sortDescending": "严重 -> 低",
-    "xpack.csp.vulnerabilityTable.column.version": "版本",
-    "xpack.csp.vulnerabilityTable.column.vulnerability": "漏洞",
     "xpack.csp.vulnerabilityTable.panel.buttonText": "查看所有漏洞",
     "xpack.csp.vulnMgmtIntegration.awsOption.nameTitle": "Amazon Web Services",
     "xpack.csp.vulnMgmtIntegration.azureOption.nameTitle": "Azure",
@@ -20232,7 +20214,6 @@
     "xpack.infra.homePage.noMetricsIndicesInstructionsActionLabel": "查看设置说明",
     "xpack.infra.homePage.settingsTabTitle": "设置",
     "xpack.infra.homePage.tellUsWhatYouThinkK8sLink": "告诉我们您的看法！(K8s)",
-    "xpack.observabilityShared.featureFeedbackButton.tellUsWhatYouThinkLink": "告诉我们您的看法！",
     "xpack.infra.homePage.toolbar.kqlSearchFieldPlaceholder": "搜索基础设施数据……（例如 host.name:host-1）",
     "xpack.infra.hostFlyout.explainProcessMessageTitle": "此进程是什么？",
     "xpack.infra.hosts.searchPlaceholder": "搜索主机（例如，cloud.provider:gcp AND system.load.1 > 0.5）",
@@ -21026,6 +21007,47 @@
     "xpack.infra.waffle.unableToSelectMetricErrorTitle": "无法选择指标选项或指标值。",
     "xpack.infra.waffleTime.autoRefreshButtonLabel": "自动刷新",
     "xpack.infra.waffleTime.stopRefreshingButtonLabel": "停止刷新",
+    "xpack.observabilityShared.featureFeedbackButton.tellUsWhatYouThinkLink": "告诉我们您的看法！",
+    "xpack.observabilityShared.inspector.stats.queryTimeValue": "{queryTime}ms",
+    "xpack.observabilityShared.breadcrumbs.observabilityLinkText": "Observability",
+    "xpack.observabilityShared.inspector.stats.dataViewDescription": "连接到 Elasticsearch 索引的数据视图。",
+    "xpack.observabilityShared.inspector.stats.dataViewLabel": "数据视图",
+    "xpack.observabilityShared.inspector.stats.hitsDescription": "查询返回的文档数目。",
+    "xpack.observabilityShared.inspector.stats.hitsLabel": "命中数",
+    "xpack.observabilityShared.inspector.stats.hitsTotalDescription": "与查询匹配的文档数目。",
+    "xpack.observabilityShared.inspector.stats.hitsTotalLabel": "命中数（总数）",
+    "xpack.observabilityShared.inspector.stats.kibanaApiQueryParametersDescription": "发起 Elasticsearch 请求的 Kibana API 请求中使用的查询参数。",
+    "xpack.observabilityShared.inspector.stats.kibanaApiQueryParametersLabel": "Kibana API 查询参数",
+    "xpack.observabilityShared.inspector.stats.kibanaApiRouteDescription": "发起 Elasticsearch 请求的 Kibana API 请求的路由。",
+    "xpack.observabilityShared.inspector.stats.kibanaApiRouteLabel": "Kibana API 路由",
+    "xpack.observabilityShared.inspector.stats.queryTimeDescription": "处理查询所花费的时间。不包括发送请求或在浏览器中解析它的时间。",
+    "xpack.observabilityShared.inspector.stats.queryTimeLabel": "查询时间",
+    "xpack.observabilityShared.navigation.betaBadge": "公测版",
+    "xpack.observabilityShared.navigation.experimentalBadgeLabel": "技术预览",
+    "xpack.observabilityShared.navigation.newBadge": "新建",
+    "xpack.observabilityShared.pageLayout.sideNavTitle": "Observability",
+    "xpack.observabilityShared.sectionLink.newLabel": "新建",
+    "xpack.observabilityShared.technicalPreviewBadgeDescription": "此功能处于技术预览状态，在未来版本中可能会更改或完全移除。Elastic 将尽最大努力来修复任何问题，但处于技术预览状态的功能不受正式 GA 功能支持 SLA 的约束。",
+    "xpack.observabilityShared.technicalPreviewBadgeLabel": "技术预览",
+    "xpack.observabilityShared.tour.alertsStep.imageAltText": "告警演示",
+    "xpack.observabilityShared.tour.alertsStep.tourContent": "通过电子邮件、PagerDuty 和 Slack 等第三方平台集成定义并检测触发告警的条件。",
+    "xpack.observabilityShared.tour.alertsStep.tourTitle": "发生更改时接收通知",
+    "xpack.observabilityShared.tour.endButtonLabel": "结束教程",
+    "xpack.observabilityShared.tour.guidedSetupStep.tourContent": "继续使用 Elastic Observability 的最简便方法，是按照数据助手中推荐的后续步骤操作。",
+    "xpack.observabilityShared.tour.guidedSetupStep.tourTitle": "Elastic Observability 让您事半功倍",
+    "xpack.observabilityShared.tour.metricsExplorerStep.imageAltText": "指标浏览器演示",
+    "xpack.observabilityShared.tour.metricsExplorerStep.tourContent": "流式传输、分组并可视化您的系统、云、网络和其他基础架构源中的指标。",
+    "xpack.observabilityShared.tour.metricsExplorerStep.tourTitle": "监测基础架构运行状况",
+    "xpack.observabilityShared.tour.nextButtonLabel": "下一步",
+    "xpack.observabilityShared.tour.observabilityOverviewStep.tourContent": "学习快速教程以了解在一个堆栈中保存所有 Observability 数据的优势。",
+    "xpack.observabilityShared.tour.observabilityOverviewStep.tourTitle": "欢迎使用 Elastic Observability",
+    "xpack.observabilityShared.tour.servicesStep.imageAltText": "服务演示",
+    "xpack.observabilityShared.tour.servicesStep.tourContent": "通过收集有关服务的详细信息快速查找并修复性能问题。",
+    "xpack.observabilityShared.tour.servicesStep.tourTitle": "确定并解决应用程序问题",
+    "xpack.observabilityShared.tour.skipButtonLabel": "跳过教程",
+    "xpack.observabilityShared.tour.streamStep.imageAltText": "日志流演示",
+    "xpack.observabilityShared.tour.streamStep.tourContent": "监测、筛选并检查从您的应用程序、服务器、虚拟机和容器中流入的日志事件。",
+    "xpack.observabilityShared.tour.streamStep.tourTitle": "实时跟踪您的日志",
     "xpack.metricsData.assetDetails.formulas.cpuUsage": "CPU 使用率",
     "xpack.metricsData.assetDetails.formulas.cpuUsage.iowaitLabel": "iowait",
     "xpack.metricsData.assetDetails.formulas.cpuUsage.irqLabel": "irq",
@@ -22172,11 +22194,6 @@
     "xpack.lens.fittingFunctionsTitle.lookahead": "下一个",
     "xpack.lens.fittingFunctionsTitle.none": "隐藏",
     "xpack.lens.fittingFunctionsTitle.zero": "零",
-    "lensFormulaDocs.tinymath.base": "底数",
-    "lensFormulaDocs.boolean": "布尔值",
-    "lensFormulaDocs.tinymath.condition": "条件",
-    "lensFormulaDocs.tinymath.decimals": "小数",
-    "lensFormulaDocs.tinymath.defaultValue": "默认值",
     "xpack.lens.formula.disableWordWrapLabel": "禁用自动换行",
     "xpack.lens.formula.editorHelpInlineHideLabel": "隐藏函数引用",
     "xpack.lens.formula.editorHelpInlineHideToolTip": "隐藏函数引用",
@@ -22184,22 +22201,12 @@
     "xpack.lens.formula.fullScreenEnterLabel": "展开",
     "xpack.lens.formula.fullScreenExitLabel": "折叠",
     "xpack.lens.formula.kqlExtraArguments": "[kql]?: string, [lucene]?: string",
-    "lensFormulaDocs.tinymath.left": "左",
     "xpack.lens.formula.reducedTimeRangeExtraArguments": "[reducedTimeRange]?: 字符串",
     "xpack.lens.formula.requiredArgument": "必需",
-    "lensFormulaDocs.tinymath.right": "右",
     "xpack.lens.formula.shiftExtraArguments": "[shift]?: string",
-    "lensFormulaDocs.tinymath.value": "值",
-    "lensFormulaDocs.documentation.filterRatio": "筛选比",
-    "lensFormulaDocs.documentation.mathSection": "数学",
-    "lensFormulaDocs.documentation.mathSectionDescription": "结果表的每行使用相同行中使用其他函数计算的单值执行这些函数。",
-    "lensFormulaDocs.documentation.percentOfTotal": "总计的百分比",
-    "lensFormulaDocs.documentation.recentChange": "最近更改",
-    "lensFormulaDocs.documentation.weekOverWeek": "周环比",
     "xpack.lens.formulaDocumentationHeading": "运作方式",
     "xpack.lens.formulaEnableWordWrapLabel": "启用自动换行",
     "xpack.lens.formulaExampleMarkdown": "示例",
-    "lensFormulaDocs.frequentlyUsedHeading": "常用公式",
     "xpack.lens.formulaPlaceholderText": "通过将函数与数学表达式组合来键入公式，如：",
     "xpack.lens.fullExtent.niceValues": "舍入到优先值",
     "xpack.lens.functions.collapse.args.byHelpText": "要作为分组依据的列 - 这些列将保持原样",
@@ -22263,7 +22270,6 @@
     "xpack.lens.indexPattern.bitsFormatLabel": "位 (1000)",
     "xpack.lens.indexPattern.bytesFormatLabel": "字节 (1024)",
     "xpack.lens.indexPattern.cardinality.documentation.quick": "\n指定数字、字符串、日期或布尔值字段的唯一值的数目。\n      ",
-    "lensFormulaDocs.cardinality.signature": "field: string",
     "xpack.lens.indexPattern.changeDataViewTitle": "数据视图",
     "xpack.lens.indexPattern.chooseField": "字段",
     "xpack.lens.indexPattern.chooseFieldLabel": "要使用此函数，请选择字段。",
@@ -22271,11 +22277,8 @@
     "xpack.lens.indexPattern.columnFormatLabel": "值格式",
     "xpack.lens.indexPattern.compactLabel": "紧凑值",
     "xpack.lens.indexPattern.count.documentation.quick": "\n文档总数。提供字段时，将计算字段值的总数。将计数函数用于单个文档中具有多个值的字段时，将对所有值计数。\n      ",
-    "lensFormulaDocs.count.signature": "[字段：字符串]",
     "xpack.lens.indexPattern.counterRate.documentation.quick": "\n      不断增长的时间序列指标一段时间的更改速率。\n      ",
-    "lensFormulaDocs.counterRate.signature": "指标：数字",
     "xpack.lens.indexPattern.countOf": "记录计数",
-    "lensFormulaDocs.cumulative_sum.signature": "指标：数字",
     "xpack.lens.indexPattern.cumulativeSum.documentation.quick": "\n      随时间增长的所有值的总和。\n      ",
     "xpack.lens.indexPattern.custom.externalDoc": "数字格式语法",
     "xpack.lens.indexPattern.custom.patternLabel": "格式",
@@ -22306,7 +22309,6 @@
     "xpack.lens.indexPattern.decimalPlacesLabel": "小数",
     "xpack.lens.indexPattern.defaultFormatLabel": "默认",
     "xpack.lens.indexPattern.differences.documentation.quick": "\n      后续时间间隔中的值之间的更改情况。\n      ",
-    "lensFormulaDocs.differences.signature": "指标：数字",
     "xpack.lens.indexPattern.dimensionEditor.headingAppearance": "外观",
     "xpack.lens.indexPattern.dimensionEditor.headingData": "数据",
     "xpack.lens.indexPattern.dimensionEditor.headingFormula": "公式",
@@ -22364,7 +22366,6 @@
     "xpack.lens.indexPattern.lastValue.showArrayValues": "显示数组值",
     "xpack.lens.indexPattern.lastValue.showArrayValuesExplanation": "显示与最后每个文档中的此字段关联的所有值。",
     "xpack.lens.indexPattern.lastValue.showArrayValuesWithTopValuesWarning": "显示数组值时，无法使用此字段对排名最前值排名。",
-    "lensFormulaDocs.lastValue.signature": "field: string",
     "xpack.lens.indexPattern.lastValue.sortField": "按日期字段排序",
     "xpack.lens.indexPattern.lastValue.sortFieldPlaceholder": "排序字段",
     "xpack.lens.indexPattern.max.description": "单值指标聚合，返回从聚合文档提取的数值中的最大值。",
@@ -22372,12 +22373,10 @@
     "xpack.lens.indexPattern.median.description": "单值指标聚合，计算从聚合文档提取的中值。",
     "xpack.lens.indexPattern.median.quickFunctionDescription": "数字字段的中值。",
     "xpack.lens.indexPattern.metaFieldsLabel": "元字段",
-    "lensFormulaDocs.metric.signature": "field: string",
     "xpack.lens.indexPattern.min.description": "单值指标聚合，返回从聚合文档提取的数值中的最小值。",
     "xpack.lens.indexPattern.min.quickFunctionDescription": "数字字段的最小值。",
     "xpack.lens.indexPattern.missingFieldLabel": "缺失字段",
     "xpack.lens.indexPattern.moveToWorkspaceNotAvailable": "要可视化此字段，请直接将其添加到所需图层。根据您当前的配置，不支持将此字段添加到工作区。",
-    "lensFormulaDocs.moving_average.signature": "指标：数字，[window]：数字",
     "xpack.lens.indexPattern.movingAverage.basicExplanation": "移动平均值在数据上滑动时间窗并显示平均值。仅日期直方图支持移动平均值。",
     "xpack.lens.indexPattern.movingAverage.documentation.quick": "\n      一段时间中移动窗口值的平均值。\n      ",
     "xpack.lens.indexPattern.movingAverage.limitations": "第一个移动平均值开始于第二项。",
@@ -22393,15 +22392,12 @@
     "xpack.lens.indexPattern.noRealMetricError": "仅包含静态值的图层将不显示结果，请至少使用一个动态指标",
     "xpack.lens.indexPattern.notAbsoluteTimeShift": "时间偏移无效。",
     "xpack.lens.indexPattern.numberFormatLabel": "数字",
-    "lensFormulaDocs.overall_metric": "指标：数字",
     "xpack.lens.indexPattern.percentFormatLabel": "百分比",
     "xpack.lens.indexPattern.percentile.documentation.quick": "\n      小于所有文档中出现值的 n% 的最大值。\n      ",
     "xpack.lens.indexPattern.percentile.percentileRanksValue": "百分位等级值",
     "xpack.lens.indexPattern.percentile.percentileValue": "百分位数",
-    "lensFormulaDocs.percentile.signature": "field: string, [percentile]: number",
     "xpack.lens.indexPattern.percentileRanks.documentation.quick": "\n小于特定值的值的百分比。例如，如果某个值大于或等于 95% 的计算值，则该值处于第 95 个百分位等级。\n      ",
     "xpack.lens.indexPattern.percentileRanks.errorMessage": "百分位等级值必须为数字",
-    "lensFormulaDocs.percentileRanks.signature": "字段：字符串，[值]：数字",
     "xpack.lens.indexPattern.precisionErrorWarning.accuracyDisabled.shortMessage": "这可能为近似值。要获得更精确的结果，可以启用准确性模式，但这会增加 Elasticsearch 集群的负载。",
     "xpack.lens.indexPattern.precisionErrorWarning.accuracyEnabled.shortMessage": "这可能为近似值。要获得更精确的结果，请使用筛选或增加排名最前值的数量。",
     "xpack.lens.indexPattern.precisionErrorWarning.ascendingCountPrecisionErrorWarning.shortMessage": "这可能为近似值，具体取决于如何索引数据。要获得更精确的结果，请按稀有度排序。",
@@ -22497,7 +22493,6 @@
     "xpack.lens.indexPattern.terms.size": "值数目",
     "xpack.lens.indexPattern.termsWithMultipleShifts": "在单个图层中，无法将指标与不同时间偏移和动态排名最前值组合。将相同的时间偏移值用于所有指标或使用筛选，而非排名最前值。",
     "xpack.lens.indexPattern.termsWithMultipleShiftsFixActionLabel": "使用筛选",
-    "lensFormulaDocs.time_scale": "指标：数字，单位：s|m|h|d|w|M|y",
     "xpack.lens.indexPattern.timeScale.label": "按单位标准化",
     "xpack.lens.indexPattern.timeScale.missingUnit": "没有为按单位标准化指定单位。",
     "xpack.lens.indexPattern.timeScale.tooltip": "将值标准化为始终显示为每指定时间单位速率，无论基础日期时间间隔是多少。",
@@ -29480,46 +29475,6 @@
     "xpack.observabilityAiAssistant.setupKb": "通过设置知识库来改进体验。",
     "xpack.observabilityAiAssistant.stopGeneratingButtonLabel": "停止生成",
     "xpack.observabilityAiAssistant.technicalPreviewBadgeDescription": "需要 GPT4 以在使用函数调用时（例如，执行根本原因分析、数据可视化等时候）获得更加一致的体验。GPT3.5 可作用于某些更简单的工作流（如解释错误），或在 Kibana 中获得不需要频繁使用函数调用的与 ChatGPT 类似的体验。",
-    "xpack.observabilityShared.inspector.stats.queryTimeValue": "{queryTime}ms",
-    "xpack.observabilityShared.breadcrumbs.observabilityLinkText": "Observability",
-    "xpack.observabilityShared.inspector.stats.dataViewDescription": "连接到 Elasticsearch 索引的数据视图。",
-    "xpack.observabilityShared.inspector.stats.dataViewLabel": "数据视图",
-    "xpack.observabilityShared.inspector.stats.hitsDescription": "查询返回的文档数目。",
-    "xpack.observabilityShared.inspector.stats.hitsLabel": "命中数",
-    "xpack.observabilityShared.inspector.stats.hitsTotalDescription": "与查询匹配的文档数目。",
-    "xpack.observabilityShared.inspector.stats.hitsTotalLabel": "命中数（总数）",
-    "xpack.observabilityShared.inspector.stats.kibanaApiQueryParametersDescription": "发起 Elasticsearch 请求的 Kibana API 请求中使用的查询参数。",
-    "xpack.observabilityShared.inspector.stats.kibanaApiQueryParametersLabel": "Kibana API 查询参数",
-    "xpack.observabilityShared.inspector.stats.kibanaApiRouteDescription": "发起 Elasticsearch 请求的 Kibana API 请求的路由。",
-    "xpack.observabilityShared.inspector.stats.kibanaApiRouteLabel": "Kibana API 路由",
-    "xpack.observabilityShared.inspector.stats.queryTimeDescription": "处理查询所花费的时间。不包括发送请求或在浏览器中解析它的时间。",
-    "xpack.observabilityShared.inspector.stats.queryTimeLabel": "查询时间",
-    "xpack.observabilityShared.navigation.betaBadge": "公测版",
-    "xpack.observabilityShared.navigation.experimentalBadgeLabel": "技术预览",
-    "xpack.observabilityShared.navigation.newBadge": "新建",
-    "xpack.observabilityShared.pageLayout.sideNavTitle": "Observability",
-    "xpack.observabilityShared.sectionLink.newLabel": "新建",
-    "xpack.observabilityShared.technicalPreviewBadgeDescription": "此功能处于技术预览状态，在未来版本中可能会更改或完全移除。Elastic 将尽最大努力来修复任何问题，但处于技术预览状态的功能不受正式 GA 功能支持 SLA 的约束。",
-    "xpack.observabilityShared.technicalPreviewBadgeLabel": "技术预览",
-    "xpack.observabilityShared.tour.alertsStep.imageAltText": "告警演示",
-    "xpack.observabilityShared.tour.alertsStep.tourContent": "通过电子邮件、PagerDuty 和 Slack 等第三方平台集成定义并检测触发告警的条件。",
-    "xpack.observabilityShared.tour.alertsStep.tourTitle": "发生更改时接收通知",
-    "xpack.observabilityShared.tour.endButtonLabel": "结束教程",
-    "xpack.observabilityShared.tour.guidedSetupStep.tourContent": "继续使用 Elastic Observability 的最简便方法，是按照数据助手中推荐的后续步骤操作。",
-    "xpack.observabilityShared.tour.guidedSetupStep.tourTitle": "Elastic Observability 让您事半功倍",
-    "xpack.observabilityShared.tour.metricsExplorerStep.imageAltText": "指标浏览器演示",
-    "xpack.observabilityShared.tour.metricsExplorerStep.tourContent": "流式传输、分组并可视化您的系统、云、网络和其他基础架构源中的指标。",
-    "xpack.observabilityShared.tour.metricsExplorerStep.tourTitle": "监测基础架构运行状况",
-    "xpack.observabilityShared.tour.nextButtonLabel": "下一步",
-    "xpack.observabilityShared.tour.observabilityOverviewStep.tourContent": "学习快速教程以了解在一个堆栈中保存所有 Observability 数据的优势。",
-    "xpack.observabilityShared.tour.observabilityOverviewStep.tourTitle": "欢迎使用 Elastic Observability",
-    "xpack.observabilityShared.tour.servicesStep.imageAltText": "服务演示",
-    "xpack.observabilityShared.tour.servicesStep.tourContent": "通过收集有关服务的详细信息快速查找并修复性能问题。",
-    "xpack.observabilityShared.tour.servicesStep.tourTitle": "确定并解决应用程序问题",
-    "xpack.observabilityShared.tour.skipButtonLabel": "跳过教程",
-    "xpack.observabilityShared.tour.streamStep.imageAltText": "日志流演示",
-    "xpack.observabilityShared.tour.streamStep.tourContent": "监测、筛选并检查从您的应用程序、服务器、虚拟机和容器中流入的日志事件。",
-    "xpack.observabilityShared.tour.streamStep.tourTitle": "实时跟踪您的日志",
     "xpack.osquery.action.missingPrivileges": "要访问此页面，请联系管理员获取 {osquery} Kibana 权限。",
     "xpack.osquery.agentPolicy.confirmModalCalloutDescription": "Fleet 检测到您的部分代理已在使用选定{agentPolicyCount, plural, other {代理策略}}。由于此操作，Fleet 会将更新部署到使用此{agentPolicyCount, plural, other {代理策略}}的所有代理。",
     "xpack.osquery.agentPolicy.confirmModalCalloutTitle": "此操作将更新 {agentCount, plural, other {# 个代理}}",

From aafa7bc66ce731105ae8da8578eb14828ca6571f Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Tue, 9 Jan 2024 16:58:38 -0800
Subject: [PATCH 17/25] fix FTR tests

---
 .../page_objects/findings_page.ts                           | 6 +++---
 .../pages/findings_onboarding.ts                            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x-pack/test/cloud_security_posture_functional/page_objects/findings_page.ts b/x-pack/test/cloud_security_posture_functional/page_objects/findings_page.ts
index 7d5eb823886033..5c42f0e9bf9aed 100644
--- a/x-pack/test/cloud_security_posture_functional/page_objects/findings_page.ts
+++ b/x-pack/test/cloud_security_posture_functional/page_objects/findings_page.ts
@@ -61,8 +61,8 @@ export function FindingsPageProvider({ getService, getPageObjects }: FtrProvider
       await es.bulk({
         refresh: true,
         operations: [
-          ...insertOperation(VULNERABILITIES_INDEX_DEFAULT_NS, findingsMock),
-          ...insertOperation(LATEST_VULNERABILITIES_INDEX_DEFAULT_NS, findingsMock),
+          ...insertOperation(FINDINGS_INDEX, findingsMock),
+          ...insertOperation(FINDINGS_LATEST_INDEX, findingsMock),
         ],
       });
     },
@@ -236,7 +236,7 @@ export function FindingsPageProvider({ getService, getPageObjects }: FtrProvider
   const navigateToLatestFindingsPage = async () => {
     await PageObjects.common.navigateToUrl(
       'securitySolution', // Defined in Security Solution plugin
-      'cloud_security_posture/findings',
+      'cloud_security_posture/findings/configurations',
       { shouldUseHashForSubUrl: false }
     );
   };
diff --git a/x-pack/test/cloud_security_posture_functional/pages/findings_onboarding.ts b/x-pack/test/cloud_security_posture_functional/pages/findings_onboarding.ts
index 4919e4102df871..765dc7fae1370b 100644
--- a/x-pack/test/cloud_security_posture_functional/pages/findings_onboarding.ts
+++ b/x-pack/test/cloud_security_posture_functional/pages/findings_onboarding.ts
@@ -28,7 +28,7 @@ export default ({ getPageObjects }: FtrProviderContext) => {
     });
 
     it('clicking on the `No integrations installed` prompt action button - `install CNVM`: navigates to the CNVM integration installation page', async () => {
-      await findings.navigateToVulnerabilities();
+      await findings.navigateToLatestVulnerabilitiesPage();
       await PageObjects.header.waitUntilLoadingHasFinished();
       const element = await notInstalledVulnerabilities.getElement();
       expect(element).to.not.be(null);

From 0016729927b44ef197f0a0238dbc53446d552bf3 Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Tue, 9 Jan 2024 17:09:12 -0800
Subject: [PATCH 18/25] fixing ftr test vulnerability

---
 .../pages/vulnerabilities_grouping.ts                        | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/x-pack/test/cloud_security_posture_functional/pages/vulnerabilities_grouping.ts b/x-pack/test/cloud_security_posture_functional/pages/vulnerabilities_grouping.ts
index 05fd8560253816..8e569d27b8a4dd 100644
--- a/x-pack/test/cloud_security_posture_functional/pages/vulnerabilities_grouping.ts
+++ b/x-pack/test/cloud_security_posture_functional/pages/vulnerabilities_grouping.ts
@@ -88,9 +88,6 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     });
     describe('SearchBar', () => {
       it('add filter', async () => {
-        const groupSelector = await findings.groupSelector();
-        await groupSelector.setValue('Resource');
-
         // Filter bar uses the field's customLabel in the DataView
         await filterBar.addFilter({
           field: 'Resource Name',
@@ -137,7 +134,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         expect(groupCount).to.be('1 group');
 
         const unitCount = await grouping.getUnitCount();
-        expect(unitCount).to.be('1 finding');
+        expect(unitCount).to.be('1 vulnerability');
 
         await queryBar.setQuery('');
         await queryBar.submitQuery();

From 4f3de1fb60afbaf6768359193ae744be7a439b15 Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Wed, 10 Jan 2024 15:25:23 -0800
Subject: [PATCH 19/25] remove comment

---
 x-pack/plugins/cloud_security_posture/server/plugin.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/x-pack/plugins/cloud_security_posture/server/plugin.ts b/x-pack/plugins/cloud_security_posture/server/plugin.ts
index 4923fa213e2d22..58a143b220857b 100755
--- a/x-pack/plugins/cloud_security_posture/server/plugin.ts
+++ b/x-pack/plugins/cloud_security_posture/server/plugin.ts
@@ -209,7 +209,6 @@ export class CspPlugin
     this.logger.debug('initialize');
     const esClient = core.elasticsearch.client.asInternalUser;
     await initializeCspIndices(esClient, this.config, this.logger);
-    // await initializeCspDataView(esClient, this.config, this.logger);
     await initializeCspTransforms(esClient, this.logger);
     await scheduleFindingsStatsTask(taskManager, this.logger);
     this.#isInitialized = true;

From 80eb3e65027f97fb8e107ffeacbf2669164a2d93 Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Wed, 10 Jan 2024 15:29:08 -0800
Subject: [PATCH 20/25] adding skip description

---
 .../vulnerability_finding_flyout.test.tsx     | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_finding_flyout/vulnerability_finding_flyout.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_finding_flyout/vulnerability_finding_flyout.test.tsx
index 896d1ee5d222d1..da7587cfc8ad03 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_finding_flyout/vulnerability_finding_flyout.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_finding_flyout/vulnerability_finding_flyout.test.tsx
@@ -93,19 +93,24 @@ describe('<VulnerabilityFindingFlyout/>', () => {
     });
   });
 
-  it.skip('should allow pagination with next', async () => {
-    const { getByTestId } = render(<TestComponent />);
+  /**
+   * TODO: Enable this test once https://github.com/elastic/kibana/issues/168619 is resolved
+   */
+  describe.skip('Flyout Pagination', () => {
+    it('should allow pagination with next', async () => {
+      const { getByTestId } = render(<TestComponent />);
 
-    userEvent.click(getByTestId('pagination-button-next'));
+      userEvent.click(getByTestId('pagination-button-next'));
 
-    expect(onPaginate).toHaveBeenCalledWith(1);
-  });
+      expect(onPaginate).toHaveBeenCalledWith(1);
+    });
 
-  it.skip('should allow pagination with previous', async () => {
-    const { getByTestId } = render(<TestComponent flyoutIndex={1} />);
+    it('should allow pagination with previous', async () => {
+      const { getByTestId } = render(<TestComponent flyoutIndex={1} />);
 
-    userEvent.click(getByTestId('pagination-button-previous'));
+      userEvent.click(getByTestId('pagination-button-previous'));
 
-    expect(onPaginate).toHaveBeenCalledWith(0);
+      expect(onPaginate).toHaveBeenCalledWith(0);
+    });
   });
 });

From 8414c130e732c045d0e81b0a36bc079f96a2903c Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Wed, 10 Jan 2024 15:50:00 -0800
Subject: [PATCH 21/25] split grouping local storage key

---
 .../cloud_security_posture/public/common/constants.ts        | 3 +++
 .../cloud_security_grouping/use_cloud_security_grouping.ts   | 5 +++--
 .../latest_findings/use_latest_findings_grouping.tsx         | 2 ++
 .../hooks/use_latest_vulnerabilities_grouping.tsx            | 2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/cloud_security_posture/public/common/constants.ts b/x-pack/plugins/cloud_security_posture/public/common/constants.ts
index 833f941c95292b..b05a9b08c15842 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/constants.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/constants.ts
@@ -49,6 +49,9 @@ export const LOCAL_STORAGE_DASHBOARD_BENCHMARK_SORT_KEY =
   'cloudPosture:complianceDashboard:benchmarkSort';
 export const LOCAL_STORAGE_FINDINGS_LAST_SELECTED_TAB_KEY = 'cloudPosture:findings:lastSelectedTab';
 
+export const LOCAL_STORAGE_VULNERABILITIES_GROUPING_KEY = 'cspLatestVulnerabilitiesGrouping';
+export const LOCAL_STORAGE_FINDINGS_GROUPING_KEY = 'cspLatestFindingsGrouping';
+
 export const SESSION_STORAGE_FIELDS_MODAL_SHOW_SELECTED = 'cloudPosture:fieldsModal:showSelected';
 
 export type CloudPostureIntegrations = Record<
diff --git a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/use_cloud_security_grouping.ts b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/use_cloud_security_grouping.ts
index 698dfdf484138e..23fd8267e5d761 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/use_cloud_security_grouping.ts
+++ b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/use_cloud_security_grouping.ts
@@ -19,7 +19,6 @@ import { FindingsBaseURLQuery } from '../../common/types';
 import { useBaseEsQuery, usePersistedQuery } from '../../common/hooks/use_cloud_posture_data_table';
 
 const DEFAULT_PAGE_SIZE = 10;
-const GROUPING_ID = 'cspLatestFindings';
 const MAX_GROUPING_LEVELS = 1;
 
 /*
@@ -33,6 +32,7 @@ export const useCloudSecurityGrouping = ({
   unit,
   groupPanelRenderer,
   groupStatsRenderer,
+  groupingLocalStorageKey,
 }: {
   dataView: DataView;
   groupingTitle: string;
@@ -41,6 +41,7 @@ export const useCloudSecurityGrouping = ({
   unit: (count: number) => string;
   groupPanelRenderer?: GroupPanelRenderer<any>;
   groupStatsRenderer?: GroupStatsRenderer<any>;
+  groupingLocalStorageKey: string;
 }) => {
   const getPersistedDefaultQuery = usePersistedQuery(getDefaultQuery);
   const { urlQuery, setUrlQuery } = useUrlQuery(getPersistedDefaultQuery);
@@ -68,7 +69,7 @@ export const useCloudSecurityGrouping = ({
     },
     defaultGroupingOptions,
     fields: dataView.fields,
-    groupingId: GROUPING_ID,
+    groupingId: groupingLocalStorageKey,
     maxGroupingLevels: MAX_GROUPING_LEVELS,
     title: groupingTitle,
     onGroupChange: () => {
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_grouping.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_grouping.tsx
index c1c2a0c3e080e7..38144f476b697b 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_grouping.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_grouping.tsx
@@ -14,6 +14,7 @@ import {
   parseGroupingQuery,
 } from '@kbn/securitysolution-grouping/src';
 import { useMemo } from 'react';
+import { LOCAL_STORAGE_FINDINGS_GROUPING_KEY } from '../../../common/constants';
 import { useDataViewContext } from '../../../common/contexts/data_view_context';
 import { Evaluation } from '../../../../common/types_old';
 import { LATEST_FINDINGS_RETENTION_POLICY } from '../../../../common/constants';
@@ -152,6 +153,7 @@ export const useLatestFindingsGrouping = ({
     unit: FINDINGS_UNIT,
     groupPanelRenderer,
     groupStatsRenderer,
+    groupingLocalStorageKey: LOCAL_STORAGE_FINDINGS_GROUPING_KEY,
   });
 
   const groupingQuery = getGroupingQuery({
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
index e2a396773cf612..45fdc5c71a342c 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
@@ -14,6 +14,7 @@ import {
   parseGroupingQuery,
 } from '@kbn/securitysolution-grouping/src';
 import { useMemo } from 'react';
+import { LOCAL_STORAGE_VULNERABILITIES_GROUPING_KEY } from '../../../common/constants';
 import { useDataViewContext } from '../../../common/contexts/data_view_context';
 import { LATEST_VULNERABILITIES_RETENTION_POLICY } from '../../../../common/constants';
 import {
@@ -101,6 +102,7 @@ export const useLatestVulnerabilitiesGrouping = ({
     unit: VULNERABILITIES_UNIT,
     groupPanelRenderer,
     groupStatsRenderer,
+    groupingLocalStorageKey: LOCAL_STORAGE_VULNERABILITIES_GROUPING_KEY,
   });
 
   const groupingQuery = getGroupingQuery({

From 1c741a88b6a2fc5215ed6203d516a5398ac5c83e Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Wed, 10 Jan 2024 16:24:52 -0800
Subject: [PATCH 22/25] make severity sorting behavior to match the sorting
 text

---
 .../public/pages/vulnerabilities/constants.ts                | 2 +-
 .../vulnerabilities/hooks/use_latest_vulnerabilities.tsx     | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
index cc248a9f214df0..11d0086cbfabc0 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
@@ -43,7 +43,7 @@ export const getDefaultQuery = ({
   query,
   filters,
   sort: [
-    [VULNERABILITY_FIELDS.SEVERITY, 'desc'],
+    [VULNERABILITY_FIELDS.SEVERITY, 'asc'],
     [VULNERABILITY_FIELDS.SCORE_BASE, 'desc'],
   ],
 });
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx
index a060528e7729fc..201113f3a79ec6 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx
@@ -26,7 +26,7 @@ import { useKibana } from '../../../common/hooks/use_kibana';
 import { showErrorToast } from '../../../common/utils/show_error_toast';
 import { FindingsBaseEsQuery } from '../../../common/types';
 import { VULNERABILITY_FIELDS } from '../constants';
-import { getCaseInsensitiveSortScript, severitySortScript } from '../utils/custom_sort_script';
+import { getCaseInsensitiveSortScript } from '../utils/custom_sort_script';
 type LatestFindingsRequest = IKibanaSearchRequest<SearchRequest>;
 type LatestFindingsResponse = IKibanaSearchResponse<
   SearchResponse<CspVulnerabilityFinding, FindingsAggs>
@@ -42,9 +42,6 @@ interface VulnerabilitiesQuery extends FindingsBaseEsQuery {
 
 const getMultiFieldsSort = (sort: string[][]) => {
   return sort.map(([id, direction]) => {
-    if (id === VULNERABILITY_FIELDS.SEVERITY) {
-      return severitySortScript(direction);
-    }
     if (id === VULNERABILITY_FIELDS.PACKAGE_NAME) {
       return getCaseInsensitiveSortScript(id, direction);
     }

From a8375c11acc88bfdbdbe61ea0d6aad7af1afc200 Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Thu, 11 Jan 2024 13:11:36 -0800
Subject: [PATCH 23/25] Addressing PR comments

---
 .../common/api/use_latest_findings_data_view.ts |  6 ++++++
 .../public/common/constants.ts                  |  2 ++
 .../configurations/latest_findings/constants.ts |  2 --
 .../latest_findings_container.tsx               |  4 ++--
 .../latest_findings/use_latest_findings.ts      | 17 +++++++++++++----
 .../use_latest_findings_table.tsx               |  4 +++-
 .../public/pages/vulnerabilities/constants.ts   |  2 --
 .../hooks/use_latest_vulnerabilities.tsx        | 17 +++++++++++++----
 .../hooks/use_latest_vulnerabilities_table.tsx  |  3 ++-
 .../latest_vulnerabilities_container.tsx        |  4 ++--
 10 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/x-pack/plugins/cloud_security_posture/public/common/api/use_latest_findings_data_view.ts b/x-pack/plugins/cloud_security_posture/public/common/api/use_latest_findings_data_view.ts
index 8f99c155585d68..442330a888a50f 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/api/use_latest_findings_data_view.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/api/use_latest_findings_data_view.ts
@@ -15,6 +15,9 @@ import {
 } from '../../../common/constants';
 import { CspClientPluginStartDeps } from '../../types';
 
+/**
+ * TODO: Remove this static labels once https://github.com/elastic/kibana/issues/172615 is resolved
+ */
 const cloudSecurityFieldLabels: Record<string, string> = {
   'result.evaluation': i18n.translate(
     'xpack.csp.findings.findingsTable.findingsTableColumn.resultColumnLabel',
@@ -88,6 +91,9 @@ export const useLatestFindingsDataView = (dataView: string) => {
       throw new Error(`Data view not found [Name: {${dataView}}]`);
     }
 
+    /**
+     * TODO: Remove this update logic once https://github.com/elastic/kibana/issues/172615 is resolved
+     */
     if (
       dataView === LATEST_FINDINGS_INDEX_PATTERN ||
       dataView === LATEST_VULNERABILITIES_INDEX_PATTERN
diff --git a/x-pack/plugins/cloud_security_posture/public/common/constants.ts b/x-pack/plugins/cloud_security_posture/public/common/constants.ts
index b05a9b08c15842..bd266c98b80153 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/constants.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/constants.ts
@@ -228,3 +228,5 @@ export const NO_FINDINGS_STATUS_REFRESH_INTERVAL_MS = 10000;
 
 export const DETECTION_ENGINE_RULES_KEY = 'detection_engine_rules';
 export const DETECTION_ENGINE_ALERTS_KEY = 'detection_engine_alerts';
+
+export const DEFAULT_GROUPING_TABLE_HEIGHT = 512;
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/constants.ts b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/constants.ts
index e2e4585906bae8..3d8200a144bd5d 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/constants.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/constants.ts
@@ -77,8 +77,6 @@ export const groupingTitle = i18n.translate('xpack.csp.findings.latestFindings.g
   defaultMessage: 'Group findings by',
 });
 
-export const DEFAULT_TABLE_HEIGHT = 512;
-
 export const getDefaultQuery = ({
   query,
   filters,
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_container.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_container.tsx
index 91b794c7b02633..11c60718b29f85 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_container.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_container.tsx
@@ -7,10 +7,10 @@
 import React from 'react';
 import { Filter } from '@kbn/es-query';
 import { EuiSpacer } from '@elastic/eui';
+import { DEFAULT_GROUPING_TABLE_HEIGHT } from '../../../common/constants';
 import { EmptyState } from '../../../components/empty_state';
 import { CloudSecurityGrouping } from '../../../components/cloud_security_grouping';
 import { FindingsSearchBar } from '../layout/findings_search_bar';
-import { DEFAULT_TABLE_HEIGHT } from './constants';
 import { useLatestFindingsGrouping } from './use_latest_findings_grouping';
 import { LatestFindingsTable } from './latest_findings_table';
 import { groupPanelRenderer, groupStatsRenderer } from './latest_findings_group_renderer';
@@ -22,7 +22,7 @@ export const LatestFindingsContainer = () => {
     return (
       <LatestFindingsTable
         nonPersistedFilters={groupFilters}
-        height={DEFAULT_TABLE_HEIGHT}
+        height={DEFAULT_GROUPING_TABLE_HEIGHT}
         showDistributionBar={false}
       />
     );
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings.ts b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings.ts
index 0c0aee860d344c..f25c00e9308f8d 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings.ts
@@ -26,6 +26,7 @@ import { showErrorToast } from '../../../common/utils/show_error_toast';
 interface UseFindingsOptions extends FindingsBaseEsQuery {
   sort: string[][];
   enabled: boolean;
+  pageSize: number;
 }
 
 export interface FindingsGroupByNoneQuery {
@@ -65,7 +66,7 @@ export const getFindingsQuery = ({ query, sort }: UseFindingsOptions, pageParam:
       ],
     },
   },
-  ...(pageParam ? { search_after: pageParam } : {}),
+  ...(pageParam ? { from: pageParam } : {}),
 });
 
 const getMultiFieldsSort = (sort: string[][]) => {
@@ -111,6 +112,12 @@ export const useLatestFindings = (options: UseFindingsOptions) => {
     data,
     notifications: { toasts },
   } = useKibana().services;
+  /**
+   * We're using useInfiniteQuery in this case to allow the user to fetch more data (if available and up to 10k)
+   * useInfiniteQuery differs from useQuery because it accumulates and caches a chunk of data from the previous fetches into an array
+   * it uses the getNextPageParam to know if there are more pages to load and retrieve the position of
+   * the last loaded record to be used as a from parameter to fetch the next chunk of data.
+   */
   return useInfiniteQuery(
     ['csp_findings', { params: options }],
     async ({ pageParam }) => {
@@ -135,9 +142,11 @@ export const useLatestFindings = (options: UseFindingsOptions) => {
       enabled: options.enabled,
       keepPreviousData: true,
       onError: (err: Error) => showErrorToast(toasts, err),
-      getNextPageParam: (lastPage) => {
-        if (lastPage.page.length === 0) return undefined;
-        return lastPage.page[lastPage.page.length - 1].raw.sort;
+      getNextPageParam: (lastPage, allPages) => {
+        if (lastPage.page.length < options.pageSize) {
+          return undefined;
+        }
+        return allPages.length * options.pageSize;
       },
     }
   );
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_table.tsx
index 90720c3c057cce..a2c5ad544dadb2 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_table.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_table.tsx
@@ -35,7 +35,8 @@ export const useLatestFindingsTable = ({
     nonPersistedFilters,
   });
 
-  const { query, sort, queryError, setUrlQuery, filters, getRowsFromPages } = cloudPostureDataTable;
+  const { query, sort, queryError, setUrlQuery, filters, getRowsFromPages, pageSize } =
+    cloudPostureDataTable;
 
   const {
     data,
@@ -46,6 +47,7 @@ export const useLatestFindingsTable = ({
     query,
     sort,
     enabled: !queryError,
+    pageSize,
   });
 
   const rows = useMemo(() => getRowsFromPages(data?.pages), [data?.pages, getRowsFromPages]);
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
index 11d0086cbfabc0..52361bb9b2c6b5 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/constants.ts
@@ -10,8 +10,6 @@ import { FindingsBaseURLQuery } from '../../common/types';
 import { CloudSecurityDefaultColumn } from '../../components/cloud_security_data_table';
 import { GROUPING_LABELS } from './translations';
 
-export const DEFAULT_TABLE_HEIGHT = 512;
-
 export const VULNERABILITY_FIELDS = {
   VULNERABILITY_ID: 'vulnerability.id',
   SCORE_BASE: 'vulnerability.score.base',
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx
index 201113f3a79ec6..df9d5446ea9268 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx
@@ -38,6 +38,7 @@ interface FindingsAggs {
 interface VulnerabilitiesQuery extends FindingsBaseEsQuery {
   sort: string[][];
   enabled: boolean;
+  pageSize: number;
 }
 
 const getMultiFieldsSort = (sort: string[][]) => {
@@ -76,7 +77,7 @@ export const getVulnerabilitiesQuery = (
       ],
     },
   },
-  ...(pageParam ? { search_after: pageParam } : {}),
+  ...(pageParam ? { from: pageParam } : {}),
 });
 
 export const useLatestVulnerabilities = (options: VulnerabilitiesQuery) => {
@@ -84,6 +85,12 @@ export const useLatestVulnerabilities = (options: VulnerabilitiesQuery) => {
     data,
     notifications: { toasts },
   } = useKibana().services;
+  /**
+   * We're using useInfiniteQuery in this case to allow the user to fetch more data (if available and up to 10k)
+   * useInfiniteQuery differs from useQuery because it accumulates and caches a chunk of data from the previous fetches into an array
+   * it uses the getNextPageParam to know if there are more pages to load and retrieve the position of
+   * the last loaded record to be used as a from parameter to fetch the next chunk of data.
+   */
   return useInfiniteQuery(
     [LATEST_VULNERABILITIES_INDEX_PATTERN, options],
     async ({ pageParam }) => {
@@ -105,9 +112,11 @@ export const useLatestVulnerabilities = (options: VulnerabilitiesQuery) => {
       keepPreviousData: true,
       enabled: options.enabled,
       onError: (err: Error) => showErrorToast(toasts, err),
-      getNextPageParam: (lastPage) => {
-        if (lastPage.page.length === 0) return undefined;
-        return lastPage.page[lastPage.page.length - 1].raw.sort;
+      getNextPageParam: (lastPage, allPages) => {
+        if (lastPage.page.length < options.pageSize) {
+          return undefined;
+        }
+        return allPages.length * options.pageSize;
       },
     }
   );
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_table.tsx
index d7ad17ad02e72d..6c6f9cd112c57a 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_table.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_table.tsx
@@ -28,7 +28,7 @@ export const useLatestVulnerabilitiesTable = ({
     nonPersistedFilters,
   });
 
-  const { query, sort, queryError, getRowsFromPages } = cloudPostureDataTable;
+  const { query, sort, queryError, getRowsFromPages, pageSize } = cloudPostureDataTable;
 
   const {
     data,
@@ -39,6 +39,7 @@ export const useLatestVulnerabilitiesTable = ({
     query,
     sort,
     enabled: !queryError,
+    pageSize,
   });
 
   const rows = useMemo(() => getRowsFromPages(data?.pages), [data?.pages, getRowsFromPages]);
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx
index c93b5d81295c38..8ba50c3aac4f13 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx
@@ -7,7 +7,6 @@
 import { Filter } from '@kbn/es-query';
 import React from 'react';
 import { EuiSpacer } from '@elastic/eui';
-import { DEFAULT_TABLE_HEIGHT } from './constants';
 import { useLatestVulnerabilitiesGrouping } from './hooks/use_latest_vulnerabilities_grouping';
 import { LatestVulnerabilitiesTable } from './latest_vulnerabilities_table';
 import { groupPanelRenderer, groupStatsRenderer } from './latest_vulnerabilities_group_renderer';
@@ -15,13 +14,14 @@ import { FindingsSearchBar } from '../configurations/layout/findings_search_bar'
 import { ErrorCallout } from '../configurations/layout/error_callout';
 import { EmptyState } from '../../components/empty_state';
 import { CloudSecurityGrouping } from '../../components/cloud_security_grouping';
+import { DEFAULT_GROUPING_TABLE_HEIGHT } from '../../common/constants';
 
 export const LatestVulnerabilitiesContainer = () => {
   const renderChildComponent = (groupFilters: Filter[]) => {
     return (
       <LatestVulnerabilitiesTable
         nonPersistedFilters={groupFilters}
-        height={DEFAULT_TABLE_HEIGHT}
+        height={DEFAULT_GROUPING_TABLE_HEIGHT}
       />
     );
   };

From a32e1f6fea6be2d0f8004384f42e987f3fd6a24a Mon Sep 17 00:00:00 2001
From: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Date: Fri, 12 Jan 2024 00:15:21 +0000
Subject: [PATCH 24/25] [CI] Auto-commit changed files from 'node
 scripts/eslint --no-cache --fix'

---
 .../pages/configurations/latest_findings/use_latest_findings.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings.ts b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings.ts
index e442dc2a7e71fe..9968bb9c414bf0 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings.ts
@@ -77,7 +77,7 @@ export const getFindingsQuery = (
         must_not: mutedRulesFilterQuery,
       },
     },
-  ...(pageParam ? { from: pageParam } : {}),
+    ...(pageParam ? { from: pageParam } : {}),
   };
 };
 

From 71777df76638f0a025d468adf726c0749ea8c4d2 Mon Sep 17 00:00:00 2001
From: Paulo Henrique <paulo.henrique@elastic.co>
Date: Fri, 12 Jan 2024 14:10:37 -0800
Subject: [PATCH 25/25] share renderers grouping components

---
 .../cloud_security_grouping/index.ts          |   3 +
 .../cloud_security_grouping/loading_group.tsx |  18 +++
 .../cloud_security_grouping/null_group.tsx    |  55 +++++++++
 .../utils/first_non_null_value.test.ts        |  34 ++++++
 .../utils/first_non_null_value.ts             |  25 +++++
 .../latest_findings_group_renderer.tsx        | 106 +++---------------
 .../latest_findings/use_latest_findings.ts    |   2 +-
 .../latest_vulnerabilities_group_renderer.tsx |  90 ++-------------
 8 files changed, 163 insertions(+), 170 deletions(-)
 create mode 100644 x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/loading_group.tsx
 create mode 100644 x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/null_group.tsx
 create mode 100644 x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/utils/first_non_null_value.test.ts
 create mode 100644 x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/utils/first_non_null_value.ts

diff --git a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/index.ts b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/index.ts
index 35a321d06119d5..84353541e8ad8d 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/index.ts
+++ b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/index.ts
@@ -7,3 +7,6 @@
 
 export { useCloudSecurityGrouping } from './use_cloud_security_grouping';
 export { CloudSecurityGrouping } from './cloud_security_grouping';
+export { firstNonNullValue } from './utils/first_non_null_value';
+export { NullGroup } from './null_group';
+export { LoadingGroup } from './loading_group';
diff --git a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/loading_group.tsx b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/loading_group.tsx
new file mode 100644
index 00000000000000..8774095be67557
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/loading_group.tsx
@@ -0,0 +1,18 @@
+/*
+ * 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 { EuiSkeletonTitle } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import React from 'react';
+
+export const LoadingGroup = () => {
+  return (
+    <EuiSkeletonTitle size="s" isLoading={true}>
+      <FormattedMessage id="xpack.csp.grouping.loadingGroupPanelTitle" defaultMessage="Loading" />
+    </EuiSkeletonTitle>
+  );
+};
diff --git a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/null_group.tsx b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/null_group.tsx
new file mode 100644
index 00000000000000..bf06d15e61a2a2
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/null_group.tsx
@@ -0,0 +1,55 @@
+/*
+ * 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 { EuiFlexGroup, EuiIconTip } from '@elastic/eui';
+import { css } from '@emotion/react';
+import { FormattedMessage } from '@kbn/i18n-react';
+import React from 'react';
+
+export const NullGroup = ({
+  title,
+  field,
+  unit,
+}: {
+  title: string;
+  field: string;
+  unit: string;
+}) => {
+  return (
+    <EuiFlexGroup alignItems="center" gutterSize="xs">
+      <strong>{title}</strong>
+      <EuiIconTip
+        anchorProps={{
+          css: css`
+            display: inline-flex;
+          `,
+        }}
+        content={
+          <>
+            <FormattedMessage
+              id="xpack.csp.grouping.nullGroupTooltip"
+              defaultMessage="The selected {groupingTitle} field, {field} is missing a value for this group of {unit}."
+              values={{
+                groupingTitle: (
+                  <strong>
+                    <FormattedMessage
+                      id="xpack.csp.grouping.nullGroupTooltip.groupingTitle"
+                      defaultMessage="group by"
+                    />
+                  </strong>
+                ),
+                field: <code>{field}</code>,
+                unit,
+              }}
+            />
+          </>
+        }
+        position="right"
+      />
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/utils/first_non_null_value.test.ts b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/utils/first_non_null_value.test.ts
new file mode 100644
index 00000000000000..5c332e6924ca16
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/utils/first_non_null_value.test.ts
@@ -0,0 +1,34 @@
+/*
+ * 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 { firstNonNullValue } from './first_non_null_value';
+
+describe('firstNonNullValue', () => {
+  it('returns the value itself for non-null single value', () => {
+    expect(firstNonNullValue(5)).toBe(5);
+  });
+
+  it('returns undefined for a null single value', () => {
+    expect(firstNonNullValue(null)).toBeUndefined();
+  });
+
+  it('returns undefined for an array of all null values', () => {
+    expect(firstNonNullValue([null, null, null])).toBeUndefined();
+  });
+
+  it('returns the first non-null value in an array of mixed values', () => {
+    expect(firstNonNullValue([null, 7, 8])).toBe(7);
+  });
+
+  it('returns the first value in an array of all non-null values', () => {
+    expect(firstNonNullValue([3, 4, 5])).toBe(3);
+  });
+
+  it('returns undefined for an empty array', () => {
+    expect(firstNonNullValue([])).toBeUndefined();
+  });
+});
diff --git a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/utils/first_non_null_value.ts b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/utils/first_non_null_value.ts
new file mode 100644
index 00000000000000..a8c5da0500e8a0
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/utils/first_non_null_value.ts
@@ -0,0 +1,25 @@
+/*
+ * 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 { ECSField } from '@kbn/securitysolution-grouping/src';
+
+/**
+ * Return first non-null value. If the field contains an array, this will return the first value that isn't null. If the field isn't an array it'll be returned unless it's null.
+ */
+export function firstNonNullValue<T>(valueOrCollection: ECSField<T>): T | undefined {
+  if (valueOrCollection === null) {
+    return undefined;
+  } else if (Array.isArray(valueOrCollection)) {
+    for (const value of valueOrCollection) {
+      if (value !== null) {
+        return value;
+      }
+    }
+  } else {
+    return valueOrCollection;
+  }
+}
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_group_renderer.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_group_renderer.tsx
index d0684452fb23a9..fe8536eaf0f697 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_group_renderer.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_group_renderer.tsx
@@ -8,23 +8,20 @@ import {
   EuiBadge,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiIconTip,
-  EuiSkeletonTitle,
   EuiText,
   EuiTextBlockTruncate,
   EuiToolTip,
   useEuiTheme,
 } from '@elastic/eui';
 import { css } from '@emotion/react';
-import {
-  ECSField,
-  GroupPanelRenderer,
-  RawBucket,
-  StatRenderer,
-} from '@kbn/securitysolution-grouping/src';
+import { GroupPanelRenderer, RawBucket, StatRenderer } from '@kbn/securitysolution-grouping/src';
 import React from 'react';
-import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
+import {
+  NullGroup,
+  LoadingGroup,
+  firstNonNullValue,
+} from '../../../components/cloud_security_grouping';
 import { getAbbreviatedNumber } from '../../../common/utils/get_abbreviated_number';
 import { CISBenchmarkIcon } from '../../../components/cis_benchmark_icon';
 import { ComplianceScoreBar } from '../../../components/compliance_score_bar';
@@ -32,67 +29,6 @@ import { FindingsGroupingAggregation } from './use_grouped_findings';
 import { GROUPING_OPTIONS, NULL_GROUPING_MESSAGES, NULL_GROUPING_UNIT } from './constants';
 import { FINDINGS_GROUPING_COUNTER } from '../test_subjects';
 
-/**
- * Return first non-null value. If the field contains an array, this will return the first value that isn't null. If the field isn't an array it'll be returned unless it's null.
- */
-export function firstNonNullValue<T>(valueOrCollection: ECSField<T>): T | undefined {
-  if (valueOrCollection === null) {
-    return undefined;
-  } else if (Array.isArray(valueOrCollection)) {
-    for (const value of valueOrCollection) {
-      if (value !== null) {
-        return value;
-      }
-    }
-  } else {
-    return valueOrCollection;
-  }
-}
-
-const NullGroupComponent = ({
-  title,
-  field,
-  unit = NULL_GROUPING_UNIT,
-}: {
-  title: string;
-  field: string;
-  unit?: string;
-}) => {
-  return (
-    <EuiFlexGroup alignItems="center" gutterSize="xs">
-      <strong>{title}</strong>
-      <EuiIconTip
-        anchorProps={{
-          css: css`
-            display: inline-flex;
-          `,
-        }}
-        content={
-          <>
-            <FormattedMessage
-              id="xpack.csp.findings.grouping.nullGroupTooltip"
-              defaultMessage="The selected {groupingTitle} field, {field} is missing a value for this group of {unit}."
-              values={{
-                groupingTitle: (
-                  <strong>
-                    <FormattedMessage
-                      id="xpack.csp.findings.grouping.nullGroupTooltip.groupingTitle"
-                      defaultMessage="group by"
-                    />
-                  </strong>
-                ),
-                field: <code>{field}</code>,
-                unit,
-              }}
-            />
-          </>
-        }
-        position="right"
-      />
-    </EuiFlexGroup>
-  );
-};
-
 export const groupPanelRenderer: GroupPanelRenderer<FindingsGroupingAggregation> = (
   selectedGroup,
   bucket,
@@ -100,20 +36,18 @@ export const groupPanelRenderer: GroupPanelRenderer<FindingsGroupingAggregation>
   isLoading
 ) => {
   if (isLoading) {
-    return (
-      <EuiSkeletonTitle size="s" isLoading={true}>
-        <FormattedMessage
-          id="xpack.csp.findings.grouping.loadingGroupPanelTitle"
-          defaultMessage="Loading"
-        />
-      </EuiSkeletonTitle>
-    );
+    return <LoadingGroup />;
   }
   const benchmarkId = firstNonNullValue(bucket.benchmarkId?.buckets?.[0]?.key);
+
+  const renderNullGroup = (title: string) => (
+    <NullGroup title={title} field={selectedGroup} unit={NULL_GROUPING_UNIT} />
+  );
+
   switch (selectedGroup) {
     case GROUPING_OPTIONS.RESOURCE_NAME:
       return nullGroupMessage ? (
-        <NullGroupComponent title={NULL_GROUPING_MESSAGES.RESOURCE_NAME} field={selectedGroup} />
+        renderNullGroup(NULL_GROUPING_MESSAGES.RESOURCE_NAME)
       ) : (
         <EuiFlexGroup alignItems="center">
           <EuiFlexItem>
@@ -146,7 +80,7 @@ export const groupPanelRenderer: GroupPanelRenderer<FindingsGroupingAggregation>
       );
     case GROUPING_OPTIONS.RULE_NAME:
       return nullGroupMessage ? (
-        <NullGroupComponent title={NULL_GROUPING_MESSAGES.RULE_NAME} field={selectedGroup} />
+        renderNullGroup(NULL_GROUPING_MESSAGES.RULE_NAME)
       ) : (
         <EuiFlexGroup alignItems="center">
           <EuiFlexItem>
@@ -168,10 +102,7 @@ export const groupPanelRenderer: GroupPanelRenderer<FindingsGroupingAggregation>
       );
     case GROUPING_OPTIONS.CLOUD_ACCOUNT_NAME:
       return nullGroupMessage ? (
-        <NullGroupComponent
-          title={NULL_GROUPING_MESSAGES.CLOUD_ACCOUNT_NAME}
-          field={selectedGroup}
-        />
+        renderNullGroup(NULL_GROUPING_MESSAGES.CLOUD_ACCOUNT_NAME)
       ) : (
         <EuiFlexGroup alignItems="center" gutterSize="m">
           {benchmarkId && (
@@ -200,10 +131,7 @@ export const groupPanelRenderer: GroupPanelRenderer<FindingsGroupingAggregation>
       );
     case GROUPING_OPTIONS.ORCHESTRATOR_CLUSTER_NAME:
       return nullGroupMessage ? (
-        <NullGroupComponent
-          title={NULL_GROUPING_MESSAGES.ORCHESTRATOR_CLUSTER_NAME}
-          field={selectedGroup}
-        />
+        renderNullGroup(NULL_GROUPING_MESSAGES.ORCHESTRATOR_CLUSTER_NAME)
       ) : (
         <EuiFlexGroup alignItems="center" gutterSize="m">
           {benchmarkId && (
@@ -232,7 +160,7 @@ export const groupPanelRenderer: GroupPanelRenderer<FindingsGroupingAggregation>
       );
     default:
       return nullGroupMessage ? (
-        <NullGroupComponent title={NULL_GROUPING_MESSAGES.DEFAULT} field={selectedGroup} />
+        renderNullGroup(NULL_GROUPING_MESSAGES.DEFAULT)
       ) : (
         <EuiFlexGroup alignItems="center">
           <EuiFlexItem>
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings.ts b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings.ts
index e442dc2a7e71fe..9968bb9c414bf0 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings.ts
@@ -77,7 +77,7 @@ export const getFindingsQuery = (
         must_not: mutedRulesFilterQuery,
       },
     },
-  ...(pageParam ? { from: pageParam } : {}),
+    ...(pageParam ? { from: pageParam } : {}),
   };
 };
 
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_group_renderer.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_group_renderer.tsx
index 88ff28e365f14a..82626fd6845131 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_group_renderer.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_group_renderer.tsx
@@ -8,88 +8,20 @@ import {
   EuiBadge,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiIconTip,
-  EuiSkeletonTitle,
   EuiText,
   EuiTextBlockTruncate,
   EuiToolTip,
   useEuiTheme,
 } from '@elastic/eui';
 import { css } from '@emotion/react';
-import {
-  ECSField,
-  GroupPanelRenderer,
-  RawBucket,
-  StatRenderer,
-} from '@kbn/securitysolution-grouping/src';
+import { GroupPanelRenderer, RawBucket, StatRenderer } from '@kbn/securitysolution-grouping/src';
 import React from 'react';
-import { FormattedMessage } from '@kbn/i18n-react';
 import { VulnerabilitiesGroupingAggregation } from './hooks/use_grouped_vulnerabilities';
 import { GROUPING_OPTIONS } from './constants';
 import { VULNERABILITIES_GROUPING_COUNTER } from './test_subjects';
 import { NULL_GROUPING_MESSAGES, NULL_GROUPING_UNIT, VULNERABILITIES } from './translations';
 import { getAbbreviatedNumber } from '../../common/utils/get_abbreviated_number';
-
-/**
- * Return first non-null value. If the field contains an array, this will return the first value that isn't null. If the field isn't an array it'll be returned unless it's null.
- */
-export function firstNonNullValue<T>(valueOrCollection: ECSField<T>): T | undefined {
-  if (valueOrCollection === null) {
-    return undefined;
-  } else if (Array.isArray(valueOrCollection)) {
-    for (const value of valueOrCollection) {
-      if (value !== null) {
-        return value;
-      }
-    }
-  } else {
-    return valueOrCollection;
-  }
-}
-
-const NullGroupComponent = ({
-  title,
-  field,
-  unit = NULL_GROUPING_UNIT,
-}: {
-  title: string;
-  field: string;
-  unit?: string;
-}) => {
-  return (
-    <EuiFlexGroup alignItems="center" gutterSize="xs">
-      <strong>{title}</strong>
-      <EuiIconTip
-        anchorProps={{
-          css: css`
-            display: inline-flex;
-          `,
-        }}
-        content={
-          <>
-            <FormattedMessage
-              id="xpack.csp.vulnerabilities.grouping.nullGroupTooltip"
-              defaultMessage="The selected {groupingTitle} field, {field} is missing a value for this group of {unit}."
-              values={{
-                groupingTitle: (
-                  <strong>
-                    <FormattedMessage
-                      id="xpack.csp.vulnerabilities.grouping.nullGroupTooltip.groupingTitle"
-                      defaultMessage="group by"
-                    />
-                  </strong>
-                ),
-                field: <code>{field}</code>,
-                unit,
-              }}
-            />
-          </>
-        }
-        position="right"
-      />
-    </EuiFlexGroup>
-  );
-};
+import { LoadingGroup, NullGroup } from '../../components/cloud_security_grouping';
 
 export const groupPanelRenderer: GroupPanelRenderer<VulnerabilitiesGroupingAggregation> = (
   selectedGroup,
@@ -98,19 +30,17 @@ export const groupPanelRenderer: GroupPanelRenderer<VulnerabilitiesGroupingAggre
   isLoading
 ) => {
   if (isLoading) {
-    return (
-      <EuiSkeletonTitle size="s" isLoading={true}>
-        <FormattedMessage
-          id="xpack.csp.vulnerabilities.grouping.loadingGroupPanelTitle"
-          defaultMessage="Loading"
-        />
-      </EuiSkeletonTitle>
-    );
+    return <LoadingGroup />;
   }
+
+  const renderNullGroup = (title: string) => (
+    <NullGroup title={title} field={selectedGroup} unit={NULL_GROUPING_UNIT} />
+  );
+
   switch (selectedGroup) {
     case GROUPING_OPTIONS.RESOURCE_NAME:
       return nullGroupMessage ? (
-        <NullGroupComponent title={NULL_GROUPING_MESSAGES.RESOURCE_NAME} field={selectedGroup} />
+        renderNullGroup(NULL_GROUPING_MESSAGES.RESOURCE_NAME)
       ) : (
         <EuiFlexGroup alignItems="center">
           <EuiFlexItem>
@@ -138,7 +68,7 @@ export const groupPanelRenderer: GroupPanelRenderer<VulnerabilitiesGroupingAggre
       );
     default:
       return nullGroupMessage ? (
-        <NullGroupComponent title={NULL_GROUPING_MESSAGES.DEFAULT} field={selectedGroup} />
+        renderNullGroup(NULL_GROUPING_MESSAGES.DEFAULT)
       ) : (
         <EuiFlexGroup alignItems="center">
           <EuiFlexItem>