[Cloud Security Posture][Benchmark Improvements] Rules Page Improvements phase 1

x-pack/plugins/cloud_security_posture/common/types/rules/v3.ts

@@ -107,9 +107,25 @@ export const findCspBenchmarkRuleRequestSchema = schema.object({
    * benchmark id
    */
   benchmarkId: schema.maybe(
-    schema.oneOf([schema.literal('cis_k8s'), schema.literal('cis_eks'), schema.literal('cis_aws')])
+    schema.oneOf([
+      schema.literal('cis_k8s'),
+      schema.literal('cis_eks'),
+      schema.literal('cis_aws'),
+      schema.literal('cis_gcp'),
+      schema.literal('cis_azure'),
+    ])
   ),
 
+  /**
+   * policy_id
+   */
+  benchmarkVersion: schema.maybe(schema.string()),
+
+  /**
+   * policy_id
+   */
+  policyId: schema.maybe(schema.string()),
+
   /**
    * package_policy_id
    */

x-pack/plugins/cloud_security_posture/common/utils/helpers.ts

@@ -57,6 +57,9 @@ export const getBenchmarkFilter = (type: BenchmarkId, section?: RuleSection): st
       : ''
   }`;
 
+export const getBenchmarkFilterQuery = (id: BenchmarkId, version?: string): string =>
+  `${CSP_RULE_TEMPLATE_SAVED_OBJECT_TYPE}.attributes.metadata.benchmark.id:${id} AND ${CSP_RULE_TEMPLATE_SAVED_OBJECT_TYPE}.attributes.metadata.benchmark.version:"v${version}"`;
+
 export const isEnabledBenchmarkInputType = (input: PackagePolicyInput | NewPackagePolicyInput) =>
   input.enabled;
 

x-pack/plugins/cloud_security_posture/public/common/navigation/constants.ts

@@ -59,11 +59,12 @@ export const cloudPosturePages: Record<CspPage, CspPageNavigationItem> = {
     id: 'cloud_security_posture-benchmarks',
   },
 };
-
+// CHANGE THIS
 export const benchmarksNavigation: Record<CspBenchmarksPage, CspPageNavigationItem> = {
   rules: {
     name: NAV_ITEMS_NAMES.RULES,
-    path: `${CLOUD_SECURITY_POSTURE_BASE_PATH}/benchmarks/:packagePolicyId/:policyId/rules`,
+    // path: `${CLOUD_SECURITY_POSTURE_BASE_PATH}/benchmarks/:packagePolicyId/:policyId/rules`,
+    path: `${CLOUD_SECURITY_POSTURE_BASE_PATH}/benchmarks/:benchmarkId/:benchmarkVersion/rules`,
     id: 'cloud_security_posture-benchmarks-rules',
   },
 };

x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks.tsx

@@ -31,9 +31,14 @@ import {
 } from './use_csp_benchmark_integrations';
 import { extractErrorMessage, getBenchmarkCisName } from '../../../common/utils/helpers';
 import * as TEST_SUBJ from './test_subjects';
-import { LOCAL_STORAGE_PAGE_SIZE_BENCHMARK_KEY } from '../../common/constants';
+import {
+  LOCAL_STORAGE_PAGE_SIZE_BENCHMARK_KEY,
+  NO_FINDINGS_STATUS_REFRESH_INTERVAL_MS,
+} from '../../common/constants';
 import { usePageSize } from '../../common/hooks/use_page_size';
 import { useKibana } from '../../common/hooks/use_kibana';
+import { NoFindingsStates } from '../../components/no_findings_states';
+import { useCspSetupStatusApi } from '../../common/api/use_setup_status_api';
 
 const SEARCH_DEBOUNCE_MS = 300;
 
@@ -151,6 +156,14 @@ export const Benchmarks = () => {
     [];
   const totalItemCount = queryResult.data?.items.length || 0;
 
+  // Check if we have any CSP Integration or not
+  const getSetupStatus = useCspSetupStatusApi({
+    refetchInterval: NO_FINDINGS_STATUS_REFRESH_INTERVAL_MS,
+  });
+  const showConfigurationInstallPrompt =
+    getSetupStatus.data?.kspm?.status === 'not-installed' &&
+    getSetupStatus.data?.cspm?.status === 'not-installed';
+
   return (
     <CloudPosturePage>
       <EuiPageHeader
@@ -166,44 +179,51 @@ export const Benchmarks = () => {
         bottomBorder
       />
       <EuiSpacer />
-      <BenchmarkSearchField
-        isLoading={queryResult.isFetching}
-        onSearch={(name) => setQuery((current) => ({ ...current, name }))}
-      />
-      <EuiSpacer />
-      <TotalIntegrationsCount
-        pageCount={(queryResult.data?.items || []).length}
-        totalCount={totalItemCount}
-      />
-      <EuiSpacer size="s" />
-      <BenchmarksTable
-        benchmarks={benchmarkResult}
-        data-test-subj={TEST_SUBJ.BENCHMARKS_TABLE_DATA_TEST_SUBJ}
-        error={queryResult.error ? extractErrorMessage(queryResult.error) : undefined}
-        loading={queryResult.isFetching}
-        pageIndex={query.page}
-        pageSize={pageSize || query.perPage}
-        sorting={{
-          // @ts-expect-error - EUI types currently do not support sorting by nested fields
-          sort: { field: query.sortField, direction: query.sortOrder },
-          allowNeutralSort: false,
-        }}
-        totalItemCount={totalItemCount}
-        setQuery={({ page, sort }) => {
-          setPageSize(page.size);
-          setQuery((current) => ({
-            ...current,
-            page: page.index,
-            perPage: page.size,
-            sortField:
-              (sort?.field as UseCspBenchmarkIntegrationsProps['sortField']) || current.sortField,
-            sortOrder: sort?.direction || current.sortOrder,
-          }));
-        }}
-        noItemsMessage={
-          queryResult.isSuccess ? <BenchmarkEmptyState name={query.name} /> : undefined
-        }
-      />
+      {showConfigurationInstallPrompt ? (
+        // Does not matter what posture value we put here, as we wanted to render the case where both cspm and kspm are both not-installed
+        <NoFindingsStates posturetype={'cspm'} />
+      ) : (
+        <>
+          <BenchmarkSearchField
+            isLoading={queryResult.isFetching}
+            onSearch={(name) => setQuery((current) => ({ ...current, name }))}
+          />
+          <EuiSpacer />
+          <TotalIntegrationsCount
+            pageCount={(queryResult.data?.items || []).length}
+            totalCount={totalItemCount}
+          />
+          <EuiSpacer size="s" />
+          <BenchmarksTable
+            benchmarks={benchmarkResult || []}
+            data-test-subj={TEST_SUBJ.BENCHMARKS_TABLE_DATA_TEST_SUBJ}
+            error={queryResult.error ? extractErrorMessage(queryResult.error) : undefined}
+            loading={queryResult.isFetching}
+            pageIndex={query.page}
+            pageSize={pageSize || query.perPage}
+            sorting={{
+              sort: { field: query.sortField, direction: query.sortOrder },
+              allowNeutralSort: false,
+            }}
+            totalItemCount={totalItemCount}
+            setQuery={({ page, sort }) => {
+              setPageSize(page.size);
+              setQuery((current) => ({
+                ...current,
+                page: page.index,
+                perPage: page.size,
+                sortField:
+                  (sort?.field as UseCspBenchmarkIntegrationsProps['sortField']) ||
+                  current.sortField,
+                sortOrder: sort?.direction || current.sortOrder,
+              }));
+            }}
+            noItemsMessage={
+              queryResult.isSuccess ? <BenchmarkEmptyState name={query.name} /> : undefined
+            }
+          />
+        </>
+      )}
     </CloudPosturePage>
   );
 };

x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks_table.tsx

@@ -14,17 +14,21 @@ import {
   EuiEmptyPrompt,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiLink,
 } from '@elastic/eui';
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { generatePath } from 'react-router-dom';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import type { BenchmarkScore, Benchmark, BenchmarksCisId } from '../../../common/types/latest';
 import * as TEST_SUBJ from './test_subjects';
 import { isCommonError } from '../../components/cloud_posture_page';
 import { FullSizeCenteredPage } from '../../components/full_size_centered_page';
 import { ComplianceScoreBar } from '../../components/compliance_score_bar';
 import { getBenchmarkCisName, getBenchmarkApplicableTo } from '../../../common/utils/helpers';
 import { CISBenchmarkIcon } from '../../components/cis_benchmark_icon';
+import { benchmarksNavigation } from '../../common/navigation/constants';
 
 export const ERROR_STATE_TEST_SUBJECT = 'benchmark_page_error';
 
@@ -36,46 +40,71 @@ interface BenchmarksTableProps
   'data-test-subj'?: string;
 }
 
+const IntegrationButtonLink = ({
+  packageName,
+  benchmarkVersion,
+  benchmarkId,
+}: {
+  packageName: string;
+  benchmarkVersion: string;
+  benchmarkId: string;
+}) => {
+  const { application } = useKibana().services;
+
+  return (
+    <EuiLink
+      href={application?.getUrlForApp('security', {
+        path: generatePath(benchmarksNavigation.rules.path, {
+          benchmarkVersion,
+          benchmarkId,
+        }),
+      })}
+    >
+      {packageName}
+    </EuiLink>
+  );
+};
+
 export const getBenchmarkPlurals = (benchmarkId: string, accountEvaluation: number) => {
   switch (benchmarkId) {
     case 'cis_k8s':
       return (
         <FormattedMessage
           id="xpack.csp.benchmarks.benchmarksTable.integrationBenchmarkK8sAccountPlural"
-          defaultMessage="{accountCount, plural, one {# cluster} other {# clusters}}"
-          values={{ accountCount: accountEvaluation || 0 }}
+          defaultMessage="{ruleCount, plural, one {# cluster} other {# clusters}}"
+          values={{ ruleCount: accountEvaluation || 0 }}
         />
       );
     case 'cis_azure':
       return (
         <FormattedMessage
           id="xpack.csp.benchmarks.benchmarksTable.integrationBenchmarkAzureAccountPlural"
-          defaultMessage="{accountCount, plural, one {# subscription} other {# subscriptions}}"
-          values={{ accountCount: accountEvaluation || 0 }}
+          defaultMessage="{ruleCount, plural, one {# subscription} other {# subscriptions}}"
+          values={{ ruleCount: accountEvaluation || 0 }}
         />
       );
     case 'cis_aws':
       return (
         <FormattedMessage
           id="xpack.csp.benchmarks.benchmarksTable.integrationBenchmarkAwsAccountPlural"
-          defaultMessage="{accountCount, plural, one {# account} other {# accounts}}"
-          values={{ accountCount: accountEvaluation || 0 }}
+          defaultMessage="{ruleCount, plural, one {# account} other {# accounts}}"
+          values={{ ruleCount: accountEvaluation || 0 }}
         />
       );
     case 'cis_eks':
       return (
         <FormattedMessage
           id="xpack.csp.benchmarks.benchmarksTable.integrationBenchmarkEksAccountPlural"
-          defaultMessage="{accountCount, plural, one {# cluster} other {# clusters}}"
-          values={{ accountCount: accountEvaluation || 0 }}
+          defaultMessage="{ruleCount, plural, one {# cluster} other {# clusters}}"
+          values={{ ruleCount: accountEvaluation || 0 }}
         />
       );
     case 'cis_gcp':
       return (
         <FormattedMessage
           id="xpack.csp.benchmarks.benchmarksTable.integrationBenchmarkGcpAccountPlural"
-          defaultMessage="{accountCount, plural, one {# project} other {# projects}}"
-          values={{ accountCount: accountEvaluation || 0 }}
+          defaultMessage="{ruleCount, plural, one {# project} other {# projects}}"
+          values={{ ruleCount: accountEvaluation || 0 }}
         />
       );
   }
@@ -123,9 +152,13 @@ const BENCHMARKS_TABLE_COLUMNS: Array<EuiBasicTableColumn<Benchmark>> = [
     truncateText: true,
     width: '17.5%',
     sortable: true,
-    render: (benchmarkId: BenchmarksCisId) => {
-      return getBenchmarkCisName(benchmarkId);
-    },
+    render: (complianceScore: Benchmark['id'], benchmarkId) => (
+      <IntegrationButtonLink
+        packageName={getBenchmarkCisName(benchmarkId.id) || ''}
+        benchmarkId={benchmarkId.id || ''}
+        benchmarkVersion={benchmarkId.version || ''}
+      />
+    ),
     'data-test-subj': TEST_SUBJ.BENCHMARKS_TABLE_COLUMNS.CIS_NAME,
   },
   {