[Cloud Posture] track application views (#144665)

elastic · Nov 7, 2022 · abf0d0f · abf0d0f
1 parent f29982c
commit abf0d0f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/x-pack/plugins/cloud_security_posture/kibana.json b/x-pack/plugins/cloud_security_posture/kibana.json
@@ -22,6 +22,6 @@
     "cloud",
     "licensing"
   ],
-  "requiredBundles": ["kibanaReact"],
+  "requiredBundles": ["kibanaReact", "usageCollection"],
   "optionalPlugins": ["usageCollection"]
 }
diff --git a/x-pack/plugins/cloud_security_posture/public/application/csp_router.tsx b/x-pack/plugins/cloud_security_posture/public/application/csp_router.tsx
@@ -8,6 +8,7 @@
 import React from 'react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { Redirect, Route, RouteComponentProps, type RouteProps, Switch } from 'react-router-dom';
+import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { CLOUD_SECURITY_POSTURE_BASE_PATH, type CspSecuritySolutionContext } from '..';
 import { cloudPosturePages } from '../common/navigation/constants';
 import type { CloudSecurityPosturePageId, CspPageNavigationItem } from '../common/navigation/types';
@@ -50,7 +51,9 @@ export const addSpyRouteComponentToRoute = (
     render: (props: RouteComponentProps) => (
       <>
         <SpyRoute pageName={route.id} />
-        <Component {...props} />
+        <TrackApplicationView viewId={route.id}>
+          <Component {...props} />
+        </TrackApplicationView>
       </>
     ),
   };

diff --git a/x-pack/plugins/cloud_security_posture/public/types.ts b/x-pack/plugins/cloud_security_posture/public/types.ts
@@ -13,6 +13,10 @@ import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plu
 import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import type { DiscoverStart } from '@kbn/discover-plugin/public';
 import type { FleetSetup, FleetStart } from '@kbn/fleet-plugin/public';
+import type {
+  UsageCollectionSetup,
+  UsageCollectionStart,
+} from '@kbn/usage-collection-plugin/public';
 import type { CspRouterProps } from './application/csp_router';
 import type { BreadcrumbEntry, CloudSecurityPosturePageId } from './common/navigation/types';
 
@@ -36,6 +40,7 @@ export interface CspClientPluginSetupDeps {
   fleet: FleetSetup;
   cloud: CloudSetup;
   // optional
+  usageCollection?: UsageCollectionSetup;
 }
 
 export interface CspClientPluginStartDeps {
@@ -47,6 +52,7 @@ export interface CspClientPluginStartDeps {
   fleet: FleetStart;
   licensing: LicensingPluginStart;
   // optional
+  usageCollection?: UsageCollectionStart;
 }
 
 /**

diff --git a/x-pack/plugins/security_solution/public/cloud_security_posture/routes.tsx b/x-pack/plugins/security_solution/public/cloud_security_posture/routes.tsx
@@ -39,7 +39,6 @@ const CloudSecurityPosture = memo(() => {
   };
 
   return (
-    // TODO: Finer granularity of this needs to be implemented in the cloud security posture plugin
     <PluginTemplateWrapper>
       <TrackApplicationView viewId="cloud_security_posture">
         <SecuritySolutionPageWrapper noPadding noTimeline>