[Security_Solution][Telemetry] - Update endpoint usage to use agentSe…

…rvice (elastic#93829) Co-authored-by: Kibana Machine <[email protected]>
michaelolo24 · Mar 10, 2021 · 5ce704f · 5ce704f
1 parent 9fe2f68
commit 5ce704f
Show file tree

Hide file tree

Showing 8 changed files with 164 additions and 142 deletions.
diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts
@@ -162,19 +162,20 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
 
     initSavedObjects(core.savedObjects);
     initUiSettings(core.uiSettings);
+    const endpointContext: EndpointAppContext = {
+      logFactory: this.context.logger,
+      service: this.endpointAppContextService,
+      config: (): Promise<ConfigType> => Promise.resolve(config),
+    };
+
     initUsageCollectors({
       core,
+      endpointAppContext: endpointContext,
       kibanaIndex: globalConfig.kibana.index,
       ml: plugins.ml,
       usageCollection: plugins.usageCollection,
     });
 
-    const endpointContext: EndpointAppContext = {
-      logFactory: this.context.logger,
-      service: this.endpointAppContextService,
-      config: (): Promise<ConfigType> => Promise.resolve(config),
-    };
-
     const router = core.http.createRouter<SecuritySolutionRequestHandlerContext>();
     core.http.registerRouteHandlerContext<SecuritySolutionRequestHandlerContext, typeof APP_ID>(
       APP_ID,

diff --git a/x-pack/plugins/security_solution/server/usage/collector.ts b/x-pack/plugins/security_solution/server/usage/collector.ts
@@ -31,6 +31,7 @@ export async function getInternalSavedObjectsClient(core: CoreSetup) {
 
 export const registerCollector: RegisterCollector = ({
   core,
+  endpointAppContext,
   kibanaIndex,
   ml,
   usageCollection,
@@ -138,7 +139,7 @@ export const registerCollector: RegisterCollector = ({
       const [detections, detectionMetrics, endpoints] = await Promise.allSettled([
         fetchDetectionsUsage(kibanaIndex, esClient, ml, savedObjectsClient),
         fetchDetectionsMetrics(ml, savedObjectsClient),
-        getEndpointTelemetryFromFleet(internalSavedObjectsClient),
+        getEndpointTelemetryFromFleet(savedObjectsClient, endpointAppContext, esClient),
       ]);
 
       return {

diff --git a/x-pack/plugins/security_solution/server/usage/endpoints/endpoint.mocks.ts b/x-pack/plugins/security_solution/server/usage/endpoints/endpoint.mocks.ts
@@ -7,10 +7,7 @@
 
 import { SavedObjectsFindResponse } from 'src/core/server';
 import { AgentEventSOAttributes } from './../../../../fleet/common/types/models/agent';
-import {
-  AGENT_SAVED_OBJECT_TYPE,
-  AGENT_EVENT_SAVED_OBJECT_TYPE,
-} from '../../../../fleet/common/constants/agent';
+import { AGENT_EVENT_SAVED_OBJECT_TYPE } from '../../../../fleet/common/constants/agent';
 import { Agent } from '../../../../fleet/common';
 import { FLEET_ENDPOINT_PACKAGE_CONSTANT } from './fleet_saved_objects';
 
@@ -36,84 +33,68 @@ export const MockOSFullName = 'somePlatformFullName';
 export const mockFleetObjectsResponse = (
   hasDuplicates = true,
   lastCheckIn = new Date().toISOString()
-): SavedObjectsFindResponse<Agent> => ({
+): { agents: Agent[]; total: number; page: number; perPage: number } | undefined => ({
   page: 1,
-  per_page: 20,
+  perPage: 20,
   total: 1,
-  saved_objects: [
+  agents: [
     {
-      type: AGENT_SAVED_OBJECT_TYPE,
+      active: true,
       id: testAgentId,
-      attributes: {
-        active: true,
-        id: testAgentId,
-        policy_id: 'randoAgentPolicyId',
-        type: 'PERMANENT',
-        user_provided_metadata: {},
-        enrolled_at: lastCheckIn,
-        current_error_events: [],
-        local_metadata: {
-          elastic: {
-            agent: {
-              id: testAgentId,
-            },
-          },
-          host: {
-            hostname: testHostName,
-            name: testHostName,
-            id: testHostId,
-          },
-          os: {
-            platform: MockOSPlatform,
-            version: MockOSVersion,
-            name: MockOSName,
-            full: MockOSFullName,
+      policy_id: 'randoAgentPolicyId',
+      type: 'PERMANENT',
+      user_provided_metadata: {},
+      enrolled_at: lastCheckIn,
+      current_error_events: [],
+      local_metadata: {
+        elastic: {
+          agent: {
+            id: testAgentId,
           },
         },
-        packages: [FLEET_ENDPOINT_PACKAGE_CONSTANT, 'system'],
-        last_checkin: lastCheckIn,
+        host: {
+          hostname: testHostName,
+          name: testHostName,
+          id: testHostId,
+        },
+        os: {
+          platform: MockOSPlatform,
+          version: MockOSVersion,
+          name: MockOSName,
+          full: MockOSFullName,
+        },
       },
-      references: [],
-      updated_at: lastCheckIn,
-      version: 'WzI4MSwxXQ==',
-      score: 0,
+      packages: [FLEET_ENDPOINT_PACKAGE_CONSTANT, 'system'],
+      last_checkin: lastCheckIn,
     },
     {
-      type: AGENT_SAVED_OBJECT_TYPE,
-      id: testAgentId,
-      attributes: {
-        active: true,
-        id: 'oldTestAgentId',
-        policy_id: 'randoAgentPolicyId',
-        type: 'PERMANENT',
-        user_provided_metadata: {},
-        enrolled_at: lastCheckIn,
-        current_error_events: [],
-        local_metadata: {
-          elastic: {
-            agent: {
-              id: 'oldTestAgentId',
-            },
-          },
-          host: {
-            hostname: hasDuplicates ? testHostName : 'oldRandoHostName',
-            name: hasDuplicates ? testHostName : 'oldRandoHostName',
-            id: hasDuplicates ? testHostId : 'oldRandoHostId',
-          },
-          os: {
-            platform: MockOSPlatform,
-            version: MockOSVersion,
-            name: MockOSName,
-            full: MockOSFullName,
+      active: true,
+      id: 'oldTestAgentId',
+      policy_id: 'randoAgentPolicyId',
+      type: 'PERMANENT',
+      user_provided_metadata: {},
+      enrolled_at: lastCheckIn,
+      current_error_events: [],
+      local_metadata: {
+        elastic: {
+          agent: {
+            id: 'oldTestAgentId',
           },
         },
-        packages: [FLEET_ENDPOINT_PACKAGE_CONSTANT, 'system'],
-        last_checkin: lastCheckIn,
+        host: {
+          hostname: hasDuplicates ? testHostName : 'oldRandoHostName',
+          name: hasDuplicates ? testHostName : 'oldRandoHostName',
+          id: hasDuplicates ? testHostId : 'oldRandoHostId',
+        },
+        os: {
+          platform: MockOSPlatform,
+          version: MockOSVersion,
+          name: MockOSName,
+          full: MockOSFullName,
+        },
       },
-      references: [],
-      updated_at: lastCheckIn,
-      version: 'WzI4MSwxXQ==',
-      score: 0,
+      packages: [FLEET_ENDPOINT_PACKAGE_CONSTANT, 'system'],
+      last_checkin: lastCheckIn,
     },
   ],
 });