[Cloud Posture] onboarding prompts for vul_mgmt

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

@@ -12,7 +12,7 @@ export const STATS_ROUTE_PATH = '/internal/cloud_security_posture/stats/{policy_
 export const BENCHMARKS_ROUTE_PATH = '/internal/cloud_security_posture/benchmarks';
 
 export const CLOUD_SECURITY_POSTURE_PACKAGE_NAME = 'cloud_security_posture';
-
+// TODO: REMOVE CSP_LATEST_FINDINGS_DATA_VIEW and replace it with LATEST_FINDINGS_INDEX_PATTERN
 export const CSP_LATEST_FINDINGS_DATA_VIEW = 'logs-cloud_security_posture.findings_latest-*';
 
 export const FINDINGS_INDEX_NAME = 'logs-cloud_security_posture.findings';
@@ -96,4 +96,7 @@ export const POSTURE_TYPES: { [x: string]: PostureTypes } = {
   [CSPM_POLICY_TEMPLATE]: CSPM_POLICY_TEMPLATE,
   [VULN_MGMT_POLICY_TEMPLATE]: VULN_MGMT_POLICY_TEMPLATE,
   [POSTURE_TYPE_ALL]: POSTURE_TYPE_ALL,
-} as const;
+};
+
+export const VULNERABILITIES = 'vulnerabilities';
+export const CONFIGURATIONS = 'configurations';

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

@@ -87,6 +87,7 @@ export interface BaseCspSetupStatus {
   kspm: BaseCspSetupBothPolicy;
   vuln_mgmt: BaseCspSetupBothPolicy;
   isPluginInitialized: boolean;
+  installedPackageVersion?: string | undefined;
 }
 
 export type CspSetupStatus = BaseCspSetupStatus;

x-pack/plugins/cloud_security_posture/public/common/api/use_latest_findings_data_view.ts

@@ -8,25 +8,24 @@
 import { useQuery } from '@tanstack/react-query';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
 import type { DataView } from '@kbn/data-plugin/common';
-import { CSP_LATEST_FINDINGS_DATA_VIEW } from '../../../common/constants';
 import { CspClientPluginStartDeps } from '../../types';
 
 /**
  *  TODO: use perfected kibana data views
  */
-export const useLatestFindingsDataView = () => {
+export const useLatestFindingsDataView = (dataView: string) => {
   const {
     data: { dataViews },
   } = useKibana<CspClientPluginStartDeps>().services;
 
   const findDataView = async (): Promise<DataView> => {
-    const dataView = (await dataViews.find(CSP_LATEST_FINDINGS_DATA_VIEW))?.[0];
-    if (!dataView) {
-      throw new Error('Findings data view not found');
+    const dataViewObj = (await dataViews.find(dataView))?.[0];
+    if (!dataViewObj) {
+      throw new Error(`Data view not found [Name: {${dataView}}]`);
     }
 
-    return dataView;
+    return dataViewObj;
   };
 
-  return useQuery(['latest_findings_data_view'], findDataView);
+  return useQuery([`useDataView-${dataView}`], findDataView);
 };

x-pack/plugins/cloud_security_posture/public/common/api/use_setup_status_api.ts

@@ -12,9 +12,9 @@ import { STATUS_ROUTE_PATH } from '../../../common/constants';
 
 const getCspSetupStatusQueryKey = 'csp_status_key';
 
-export const useCspSetupStatusApi = ({
-  options,
-}: { options?: UseQueryOptions<CspSetupStatus, unknown, CspSetupStatus> } = {}) => {
+export const useCspSetupStatusApi = (
+  options?: UseQueryOptions<CspSetupStatus, unknown, CspSetupStatus>
+) => {
   const { http } = useKibana().services;
   return useQuery<CspSetupStatus, unknown, CspSetupStatus>(
     [getCspSetupStatusQueryKey],

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

@@ -6,12 +6,12 @@
  */
 
 import { pagePathGetters, pkgKeyFromPackageInfo } from '@kbn/fleet-plugin/public';
-import type { PosturePolicyTemplate } from '../../../common/types';
+import type { CloudSecurityPolicyTemplate } from '../../../common/types';
 import { useCisKubernetesIntegration } from '../api/use_cis_kubernetes_integration';
 import { useKibana } from '../hooks/use_kibana';
 
 export const useCspIntegrationLink = (
-  policyTemplate: PosturePolicyTemplate
+  policyTemplate: CloudSecurityPolicyTemplate
 ): string | undefined => {
   const { http } = useKibana().services;
   const cisIntegration = useCisKubernetesIntegration();

x-pack/plugins/cloud_security_posture/public/components/cloud_posture_page.test.tsx

@@ -23,8 +23,6 @@ import React, { ComponentProps } from 'react';
 import { UseQueryResult } from '@tanstack/react-query';
 import { CloudPosturePage } from './cloud_posture_page';
 import { NoDataPage } from '@kbn/kibana-react-plugin/public';
-import { useCspSetupStatusApi } from '../common/api/use_setup_status_api';
-import { useCspIntegrationLink } from '../common/navigation/use_csp_integration_link';
 
 const chance = new Chance();
 
@@ -35,19 +33,6 @@ jest.mock('../common/navigation/use_csp_integration_link');
 describe('<CloudPosturePage />', () => {
   beforeEach(() => {
     jest.resetAllMocks();
-    (useCspSetupStatusApi as jest.Mock).mockImplementation(() =>
-      createReactQueryResponse({
-        status: 'success',
-        data: {
-          cspm: { status: 'indexed' },
-          kspm: { status: 'indexed' },
-          indicesDetails: [
-            { index: 'logs-cloud_security_posture.findings_latest-default', status: 'not-empty' },
-            { index: 'logs-cloud_security_posture.findings-default*', status: 'not-empty' },
-          ],
-        },
-      })
-    );
 
     (useSubscriptionStatus as jest.Mock).mockImplementation(() =>
       createReactQueryResponse({
@@ -58,7 +43,9 @@ describe('<CloudPosturePage />', () => {
   });
 
   const renderCloudPosturePage = (
-    props: ComponentProps<typeof CloudPosturePage> = { children: null }
+    props: ComponentProps<typeof CloudPosturePage> = {
+      children: null,
+    }
   ) => {
     const mockCore = coreMock.createStart();
 
@@ -147,69 +134,6 @@ describe('<CloudPosturePage />', () => {
     expect(screen.queryByTestId(ERROR_STATE_TEST_SUBJECT)).not.toBeInTheDocument();
   });
 
-  it('renders integrations installation prompt if integration is not installed', () => {
-    (useCspSetupStatusApi as jest.Mock).mockImplementation(() =>
-      createReactQueryResponse({
-        status: 'success',
-        data: {
-          kspm: { status: 'not-installed' },
-          cspm: { status: 'not-installed' },
-          indicesDetails: [
-            { index: 'logs-cloud_security_posture.findings_latest-default', status: 'empty' },
-            { index: 'logs-cloud_security_posture.findings-default*', status: 'empty' },
-          ],
-        },
-      })
-    );
-    (useCspIntegrationLink as jest.Mock).mockImplementation(() => chance.url());
-
-    const children = chance.sentence();
-    renderCloudPosturePage({ children });
-
-    expect(screen.getByTestId(PACKAGE_NOT_INSTALLED_TEST_SUBJECT)).toBeInTheDocument();
-    expect(screen.queryByText(children)).not.toBeInTheDocument();
-    expect(screen.queryByTestId(LOADING_STATE_TEST_SUBJECT)).not.toBeInTheDocument();
-    expect(screen.queryByTestId(SUBSCRIPTION_NOT_ALLOWED_TEST_SUBJECT)).not.toBeInTheDocument();
-    expect(screen.queryByTestId(ERROR_STATE_TEST_SUBJECT)).not.toBeInTheDocument();
-  });
-
-  it('renders default loading state when the integration query is loading', () => {
-    (useCspSetupStatusApi as jest.Mock).mockImplementation(
-      () =>
-        createReactQueryResponse({
-          status: 'loading',
-        }) as unknown as UseQueryResult
-    );
-
-    const children = chance.sentence();
-    renderCloudPosturePage({ children });
-
-    expect(screen.getByTestId(LOADING_STATE_TEST_SUBJECT)).toBeInTheDocument();
-    expect(screen.queryByText(children)).not.toBeInTheDocument();
-    expect(screen.queryByTestId(ERROR_STATE_TEST_SUBJECT)).not.toBeInTheDocument();
-    expect(screen.queryByTestId(SUBSCRIPTION_NOT_ALLOWED_TEST_SUBJECT)).not.toBeInTheDocument();
-    expect(screen.queryByTestId(PACKAGE_NOT_INSTALLED_TEST_SUBJECT)).not.toBeInTheDocument();
-  });
-
-  it('renders default error state when the integration query has an error', () => {
-    (useCspSetupStatusApi as jest.Mock).mockImplementation(
-      () =>
-        createReactQueryResponse({
-          status: 'error',
-          error: new Error('error'),
-        }) as unknown as UseQueryResult
-    );
-
-    const children = chance.sentence();
-    renderCloudPosturePage({ children });
-
-    expect(screen.getByTestId(ERROR_STATE_TEST_SUBJECT)).toBeInTheDocument();
-    expect(screen.queryByTestId(LOADING_STATE_TEST_SUBJECT)).not.toBeInTheDocument();
-    expect(screen.queryByTestId(SUBSCRIPTION_NOT_ALLOWED_TEST_SUBJECT)).not.toBeInTheDocument();
-    expect(screen.queryByText(children)).not.toBeInTheDocument();
-    expect(screen.queryByTestId(PACKAGE_NOT_INSTALLED_TEST_SUBJECT)).not.toBeInTheDocument();
-  });
-
   it('renders default loading text when query isLoading', () => {
     const query = createReactQueryResponse({
       status: 'loading',

x-pack/plugins/cloud_security_posture/public/components/cloud_posture_page.tsx

@@ -7,34 +7,22 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import type { UseQueryResult } from '@tanstack/react-query';
-import {
-  EuiButton,
-  EuiEmptyPrompt,
-  EuiImage,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiLink,
-} from '@elastic/eui';
+import { EuiEmptyPrompt } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { NoDataPage, NoDataPageProps } from '@kbn/kibana-react-plugin/public';
 import { css } from '@emotion/react';
-import { CSPM_POLICY_TEMPLATE, KSPM_POLICY_TEMPLATE } from '../../common/constants';
 import { SubscriptionNotAllowed } from './subscription_not_allowed';
 import { useSubscriptionStatus } from '../common/hooks/use_subscription_status';
 import { FullSizeCenteredPage } from './full_size_centered_page';
-import { useCspSetupStatusApi } from '../common/api/use_setup_status_api';
 import { CspLoadingState } from './csp_loading_state';
-import { useCspIntegrationLink } from '../common/navigation/use_csp_integration_link';
-
-import noDataIllustration from '../assets/illustrations/no_data_illustration.svg';
-import { cspIntegrationDocsNavigation } from '../common/navigation/constants';
-import { getCpmStatus } from '../common/utils/get_cpm_status';
 
 export const LOADING_STATE_TEST_SUBJECT = 'cloud_posture_page_loading';
 export const ERROR_STATE_TEST_SUBJECT = 'cloud_posture_page_error';
 export const PACKAGE_NOT_INSTALLED_TEST_SUBJECT = 'cloud_posture_page_package_not_installed';
 export const CSPM_INTEGRATION_NOT_INSTALLED_TEST_SUBJECT = 'cloud_posture_page_cspm_not_installed';
 export const KSPM_INTEGRATION_NOT_INSTALLED_TEST_SUBJECT = 'cloud_posture_page_kspm_not_installed';
+export const VULN_MGMT_INTEGRATION_NOT_INSTALLED_TEST_SUBJECT =
+  'cloud_posture_page_vuln_mgmt_not_installed';
 export const DEFAULT_NO_DATA_TEST_SUBJECT = 'cloud_posture_page_no_data';
 export const SUBSCRIPTION_NOT_ALLOWED_TEST_SUBJECT = 'cloud_posture_page_subscription_not_allowed';
 
@@ -104,71 +92,6 @@ export const CspNoDataPage = ({
   );
 };
 
-const packageNotInstalledRenderer = ({
-  kspmIntegrationLink,
-  cspmIntegrationLink,
-}: {
-  kspmIntegrationLink?: string;
-  cspmIntegrationLink?: string;
-}) => {
-  return (
-    <FullSizeCenteredPage>
-      <EuiEmptyPrompt
-        data-test-subj={PACKAGE_NOT_INSTALLED_TEST_SUBJECT}
-        icon={<EuiImage size="fullWidth" src={noDataIllustration} alt="no-data-illustration" />}
-        title={
-          <h2>
-            <FormattedMessage
-              id="xpack.csp.cloudPosturePage.packageNotInstalledRenderer.promptTitle"
-              defaultMessage="Detect security misconfigurations in your cloud infrastructure!"
-            />
-          </h2>
-        }
-        layout="horizontal"
-        color="plain"
-        body={
-          <p>
-            <FormattedMessage
-              id="xpack.csp.cloudPosturePage.packageNotInstalledRenderer.promptDescription"
-              defaultMessage="Detect and remediate potential configuration risks in your cloud infrastructure, like publicly accessible S3 buckets, with our Cloud and Kubernetes Security Posture Management solutions. {learnMore}"
-              values={{
-                learnMore: (
-                  <EuiLink href={cspIntegrationDocsNavigation.cspm.overviewPath} target="_blank">
-                    <FormattedMessage
-                      id="xpack.csp.cloudPosturePage.packageNotInstalledRenderer.learnMoreTitle"
-                      defaultMessage="Learn more about Cloud Security Posture"
-                    />
-                  </EuiLink>
-                ),
-              }}
-            />
-          </p>
-        }
-        actions={
-          <EuiFlexGroup>
-            <EuiFlexItem grow={false}>
-              <EuiButton color="primary" fill href={cspmIntegrationLink}>
-                <FormattedMessage
-                  id="xpack.csp.cloudPosturePage.packageNotInstalledRenderer.addCspmIntegrationButtonTitle"
-                  defaultMessage="Add CSPM Integration"
-                />
-              </EuiButton>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiButton color="primary" fill href={kspmIntegrationLink}>
-                <FormattedMessage
-                  id="xpack.csp.cloudPosturePage.packageNotInstalledRenderer.addKspmIntegrationButtonTitle"
-                  defaultMessage="Add KSPM Integration"
-                />
-              </EuiButton>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        }
-      />
-    </FullSizeCenteredPage>
-  );
-};
-
 const defaultLoadingRenderer = () => (
   <CspLoadingState data-test-subj={LOADING_STATE_TEST_SUBJECT}>
     <FormattedMessage
@@ -251,10 +174,6 @@ export const CloudPosturePage = <TData, TError>({
   noDataRenderer = defaultNoDataRenderer,
 }: CloudPosturePageProps<TData, TError>) => {
   const subscriptionStatus = useSubscriptionStatus();
-  const { data: getSetupStatus, isLoading, isError, error } = useCspSetupStatusApi();
-  const kspmIntegrationLink = useCspIntegrationLink(KSPM_POLICY_TEMPLATE);
-  const cspmIntegrationLink = useCspIntegrationLink(CSPM_POLICY_TEMPLATE);
-  const { isEmptyData, hasFindings } = getCpmStatus(getSetupStatus);
 
   const render = () => {
     if (subscriptionStatus.isError) {
@@ -269,23 +188,6 @@ export const CloudPosturePage = <TData, TError>({
       return subscriptionNotAllowedRenderer();
     }
 
-    if (isError) {
-      return defaultErrorRenderer(error);
-    }
-
-    if (isLoading) {
-      return defaultLoadingRenderer();
-    }
-
-    /* Checks if its a completely new user which means no integration has been installed and no latest findings default index has been found */
-    if (isEmptyData) {
-      return packageNotInstalledRenderer({ kspmIntegrationLink, cspmIntegrationLink });
-    }
-
-    if (!hasFindings) {
-      return children;
-    }
-
     if (!query) {
       return children;
     }