SECURITY-ENDPOINT: add host properties (#70238) (#70254)

elastic · Jun 29, 2020 · 52b5e35 · 52b5e35
1 parent 1f7d38b
commit 52b5e35
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
@@ -48,6 +48,8 @@ const Windows: OSFields[] = [
     name: 'windows 10.0',
     full: 'Windows 10',
     version: '10.0',
+    platform: 'Windows',
+    family: 'Windows',
     Ext: {
       variant: 'Windows Pro',
     },
@@ -56,6 +58,8 @@ const Windows: OSFields[] = [
     name: 'windows 10.0',
     full: 'Windows Server 2016',
     version: '10.0',
+    platform: 'Windows',
+    family: 'Windows',
     Ext: {
       variant: 'Windows Server',
     },
@@ -64,6 +68,8 @@ const Windows: OSFields[] = [
     name: 'windows 6.2',
     full: 'Windows Server 2012',
     version: '6.2',
+    platform: 'Windows',
+    family: 'Windows',
     Ext: {
       variant: 'Windows Server',
     },
@@ -72,6 +78,8 @@ const Windows: OSFields[] = [
     name: 'windows 6.3',
     full: 'Windows Server 2012R2',
     version: '6.3',
+    platform: 'Windows',
+    family: 'Windows',
     Ext: {
       variant: 'Windows Server Release 2',
     },
@@ -316,6 +324,7 @@ export class EndpointDocGenerator {
   }
 
   private createHostData(): HostInfo {
+    const hostName = this.randomHostname();
     return {
       agent: {
         version: this.randomVersion(),
@@ -329,7 +338,9 @@ export class EndpointDocGenerator {
       },
       host: {
         id: this.seededUUIDv4(),
-        hostname: this.randomHostname(),
+        hostname: hostName,
+        name: hostName,
+        architecture: this.randomString(10),
         ip: this.randomArray(3, () => this.randomIP()),
         mac: this.randomArray(3, () => this.randomMac()),
         os: this.randomChoice(OS),
@@ -1016,9 +1027,7 @@ export class EndpointDocGenerator {
       ecs: {
         version: '1.4.0',
       },
-      host: {
-        id: this.commonInfo.host.id,
-      },
+      host: this.commonInfo.host,
       Endpoint: {
         policy: {
           applied: {

diff --git a/x-pack/plugins/security_solution/common/endpoint/types.ts b/x-pack/plugins/security_solution/common/endpoint/types.ts
@@ -179,6 +179,8 @@ export interface OSFields {
   full: string;
   name: string;
   version: string;
+  platform: string;
+  family: string;
   Ext: OSFieldsExt;
 }
 
@@ -195,8 +197,10 @@ export interface OSFieldsExt {
 export interface Host {
   id: string;
   hostname: string;
+  name: string;
   ip: string[];
   mac: string[];
+  architecture: string;
   os: OSFields;
 }