not using os details in id, changes on os updates

elastic · Jul 30, 2020 · 5577ce4 · 5577ce4
1 parent 537aa12
commit 5577ce4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
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
@@ -25,8 +25,6 @@ export const MockOSName = 'somePlatformName';
 export const MockOSVersion = '1';
 /** Mock OS Full Name for endpoint telemetry */
 export const MockOSFullName = 'somePlatformFullName';
-/** Mock OS Full Name for endpoint telemetry */
-export const MockOSKernel = 'popcorn';
 
 /**
  *
@@ -68,7 +66,6 @@ export const mockFleetObjectsResponse = (
             version: MockOSVersion,
             name: MockOSName,
             full: MockOSFullName,
-            kernel: MockOSKernel,
           },
         },
         packages: [FLEET_ENDPOINT_PACKAGE_CONSTANT, 'system'],
@@ -106,7 +103,6 @@ export const mockFleetObjectsResponse = (
             version: MockOSVersion,
             name: MockOSName,
             full: MockOSFullName,
-            kernel: hasDuplicates ? MockOSKernel : 'unpopped-popocorn',
           },
         },
         packages: [FLEET_ENDPOINT_PACKAGE_CONSTANT, 'system'],

diff --git a/x-pack/plugins/security_solution/server/usage/endpoints/index.ts b/x-pack/plugins/security_solution/server/usage/endpoints/index.ts
@@ -49,7 +49,6 @@ export interface AgentLocalMetadata extends AgentMetadata {
   os: {
     name: string;
     platform: string;
-    kernel: string;
     version: string;
     full: string;
   };
@@ -229,9 +228,9 @@ export const getEndpointTelemetryFromFleet = async (
       const { host, os, elastic } = localMetadata as AgentLocalMetadata;
 
       // Although not perfect, the goal is to dedupe hosts to get the most recent data for a host
-      // An agent re-installed on the same host will have all the same id, name, and kernel details
-      // A cloned VM will have the same id, but "may" have the same name and kernel, but it's really up to the user.
-      const compoundUniqueId = `${host?.id}-${host?.hostname}-${os?.kernel}`;
+      // An agent re-installed on the same host will have the same id and hostname
+      // A cloned VM will have the same id, but "may" have the same hostname, but it's really up to the user.
+      const compoundUniqueId = `${host?.id}-${host?.hostname}`;
       if (!uniqueHosts.has(compoundUniqueId)) {
         uniqueHosts.add(compoundUniqueId);
         const agentId = elastic?.agent?.id;