@lansweeper/data-platform-outbound-grpc 0.1.29 → 0.1.31

package/java.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.28",
+  "version": "0.1.30",
   "package": "com.lansweeper.dp.outbound.v1",
   "service": true
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lansweeper/data-platform-outbound-grpc",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "description": "Data Platform Outbound gRPC",
   "main": "gen-proto/index.js",
   "types": "gen-proto/index.d.ts",
@@ -9,5 +9,5 @@
     "@grpc/grpc-js": "^1.5.1",
     "google-protobuf": "^3.17.0"
   },
-  "gitHead": "c1ac50081c781c7ab12a47d204dcf79685659171"
+  "gitHead": "97766ade635c49d796c28cca836b4b3bf2ed8dfe"
 }

package/proto/outbound.proto

@@ -105,13 +105,17 @@ message Asset {
   google.protobuf.Timestamp last_updated = 4;
   google.protobuf.Timestamp last_enriched = 5;
 
+  // this is unique and source of UUID asset_id. Kept also in verbose key format for debug/future use.
+  optional string unique_key = 23;
+
   repeated Tag tag = 14;
   repeated Relation relation = 20; // e.g. relations to and from OT parent module to sub-modules
 
   CoreFields core = 6;
 
   optional HardwareInfo hw = 7;
-  optional OperatingSystemInfo os = 8;
+  optional DeprecatedOperatingSystemInfo deprecated_os = 8;
+  optional OperatingSystem os = 22;
   optional SoftwareInventory software_inventory = 9;
 
   optional MonitorInventory monitor_inventory = 10;
@@ -265,6 +269,13 @@ message HardwareInfo {
   optional int32 rank = 20;
 
   optional SpecHardwareInfo spec = 24;
+
+  // placeholder to be able to inject the catalog meta-data if/when needed
+  optional CatalogBrand catalog_brand = 50;
+  // placeholder to be able to inject the catalog meta-data if/when needed
+  optional CatalogModel catalog_model = 51;
+  // placeholder to be able to inject the catalog meta-data if/when needed
+  optional CatalogModel catalog_family = 52;
 }
 
 message SpecHardwareInfo {
@@ -274,7 +285,77 @@ message SpecHardwareInfo {
   optional string serial_number = 4;
 }
 
-message OperatingSystemInfo {
+message NormalizedOperatingSystem {
+  // catalog id of: CatalogOs
+  optional int64 id = 1;
+  // catalog id of: CatalogBrand
+  optional int64 make_id = 2;
+  // normalized name
+  optional string name = 3;
+  // normalized version
+  optional string version = 4;
+  // normalized build
+  optional string build = 5;
+  // normalized firmware version
+  optional string fw_version = 6;
+  // normalized cpe
+  optional string cpe = 7;
+
+  // normalized firmware cpe
+  optional string fw_cpe = 8;
+
+  // normalized rank of data quality
+  optional int32 rank = 9;
+
+  // placeholder to be able to inject the catalog meta-data if/when needed
+  optional CatalogBrand catalog_brand = 20;
+
+  // placeholder to be able to inject the catalog meta-data if/when needed
+  optional CatalogOs catalog_os = 21;
+}
+
+message OperatingSystem {
+  optional NormalizedOperatingSystem normalized = 1;
+
+  optional string	architecture = 9; // 	x64-based PC,x86_64	Windows, Linux, Mac
+  optional string	build_environment_type = 10; //	Multiprocessor Free	Windows
+  optional google.protobuf.Timestamp	install_date = 11; //	2022-06-20 18:22:59.000	Windows
+  optional bool	is_debug_build = 12; //	0	Windows
+  optional string	kernel_caption = 13; //	Darwin 21.4.0,#41-Ubuntu SMP Tue Dec 3 00:27:35 UTC 2019,11.4.0.15.0	Linux, Mac
+  optional string	kernel_name	 = 14; //Linux,SunOS	Linux
+  optional string	kernel_release = 15; //	5.0.0-38-generic,5.11	Linux
+  optional int32	max_licensed_users	 = 16; //0	Windows
+  optional int64	max_process_memory_size	 = 17; //2097024,137438950000,8589934464	Windows
+  optional string	organization	 = 18; //Lansweeper	Windows
+  optional	string	os_caption	 = 19; //Windows 10 Enterprise,macOS 12.3.1 (21E258),Ubuntu 20.04.4 LTS	Windows, Linux, Mac
+  optional string	os_directory	 = 20; //C:\Windows	Windows
+  optional string	os_drive_letter	 = 21; //C:	Windows
+  optional string	os_edition	 = 22; //Pro, Enterprise, Datacenter	Windows
+  optional string	os_name	 = 23; //Windows 7, Windows 10, Windows Server 2019, Windows Server 2022, Ubuntu, Fedora, macOS Catalina, macOS Monterey	Windows, Linux, Mac
+  optional string	os_physical_partition	 = 24; //\Device\HarddiskVolume3	Windows
+  optional string	os_type	 = 25; //Windows, MacOS, Linux, Unix	Windows, Linux, Mac
+  optional string	os_serial_number = 26; //	00355-62792-31115-AAOEM	Windows
+  optional string	os_system_directory = 27; //	C:\Windows\System32	Windows
+  optional string	other_type_description  = 28; //		Windows
+  optional string	product_suite	 = 29; //SmallBusinessServer,TerminalServices	Windows
+  optional string	registered_user	 = 30; //Andy	Windows
+  optional string	service_pack_name	 = 31; //Service Pack 3	Windows
+  optional int32	sp_major_version	 = 32; //3	Windows
+  optional int32	sp_minor_version = 33; //	0	Windows
+  optional string	suite_mask	 = 34; //Communications,Datacenter Edition	Windows
+  optional string	system_role = 35; //	workstation (1), domain controller (2) or server (3)	Windows
+  optional string	uuid = 36; //	241F0742-E4BD-42F9-5B77-D243F25C3188	Windows, Linux, Mac
+  optional string	version = 37; //	22H2	Windows
+  optional string	version_full = 38; //	Windows, Mac, Linux examples: 10.0.19045.2965, 12.3.1 (21E258),20.04.4	Windows
+  optional string	version_major = 39; //	Windows, Mac, Linux examples: 10,12,22	Windows, Linux, Mac
+  optional string	version_minor = 40; //	Windows, Mac, Linux examples: 0,3,04	Windows, Linux, Mac
+  optional string	version_full_3rd_digit = 41; //	Windows, Mac, Linux examples: 19045,1,4	Windows, Linux, Mac
+  optional string	version_full_4th_digit = 42; //	Windows, Mac examples: 2965,21E258	Windows, Linux, Mac
+  optional int64	visible_memory = 43; //	16729456	Windows
+
+}
+
+message DeprecatedOperatingSystemInfo {
   // catalog id of: CatalogOs
   optional int64 id = 1;
 
@@ -293,11 +374,11 @@ message OperatingSystemInfo {
   optional int32 rank = 8;
 
   oneof spec {
-    WindowsOperatingSystemInfo windows = 32;
-    OtFirmwareInfo ot = 33;
+    DeprecatedWindowsOperatingSystemInfo windows = 32;
   }
 }
 
+
 /* OS Patch, i.e. Windows KB's, aka Hotfix, aka QuickFixEngieering */
 message OperatingSystemPatch {
   // from hot_fix_id, e.g.: "KB4570334"
@@ -317,11 +398,8 @@ message OperatingSystemPatch {
 
 }
 
-message OtFirmwareInfo {
-  string firmware = 1;
-}
-
-message WindowsOperatingSystemInfo {
+// deprecated
+message DeprecatedWindowsOperatingSystemInfo {
   optional string version = 1;
   optional int32 service_pack = 2;
   optional string build = 3;                // "WindowsVersion": "10.0.19045"
@@ -461,13 +539,13 @@ message Processor {
 message Chassis
 {
   MappedValue	type = 1;
-  optional bool chassis_lock_present = 2;
-  optional string	chassis_manufacturer = 3;
-  optional MappedValue	chassis_security_status = 4;
-  optional string	chassis_serial_number = 5;
-  optional string	chassis_asset_tag = 6;
-  optional string	chassis_version = 7;
-  optional MappedValue	chassis_bootup_state = 8;
+  optional bool lock_present = 2;
+  optional string	manufacturer = 3;
+  optional MappedValue security_status = 4;
+  optional string	serial_number = 5;
+  optional string	asset_tag = 6;
+  optional string	version = 7;
+  optional MappedValue bootup_state = 8;
 }
 
 /**
@@ -511,37 +589,37 @@ message Memory {
 message PhysicalMemory
 {
     optional  int64 size = 21; // memory capacity/size
-    optional	string	bank_locator= 1; //	Linux
-    optional	int32	configured_clock_speed = 2; //	Windows
-    optional	int32	configured_voltage= 3; //	Windows
-    optional	int32	data_width= 4; //	Windows, Linux
-    optional	string	device_locator= 5; //	Windows, Linux
-    optional	MappedValue	form_factor= 6; //	Windows, Linux
-    optional	int32	interleave_data_depth= 7; //	Windows
-    optional	MappedValue	interleave_position= 8; //	Windows
-    optional	string	manufacturer= 9; //	Windows, Linux
-    optional	string	name= 10; //	Mac
-    optional	string	part_number= 11; //	Windows
-    optional	int32	position_in_row= 12; //	Windows
-    optional	string	serial_number= 13; //	Windows, Linux
-    optional	string	set= 14; //	Linux
-    optional	string	sku= 15; //	Windows
-    optional	int32	speed= 16; //	Windows, Linux, Mac
-    optional	string	state= 17; //	Mac
-    optional	int32	total_width= 18; //	Windows, Linux
-    optional	MappedValue	type= 19; //	Windows, Linux, Mac
-    optional	MappedValue	type_detail= 20; //	Windows, Linux
+    optional string	bank_locator= 1; //	Linux
+    optional int32	configured_clock_speed = 2; //	Windows
+    optional int32	configured_voltage= 3; //	Windows
+    optional int32	data_width= 4; //	Windows, Linux
+    optional string	device_locator= 5; //	Windows, Linux
+    optional MappedValue	form_factor= 6; //	Windows, Linux
+    optional int32	interleave_data_depth= 7; //	Windows
+    optional MappedValue	interleave_position= 8; //	Windows
+    optional string	manufacturer= 9; //	Windows, Linux
+    optional string	name= 10; //	Mac
+    optional string	part_number= 11; //	Windows
+    optional int32	position_in_row= 12; //	Windows
+    optional string	serial_number= 13; //	Windows, Linux
+    optional string	set= 14; //	Linux
+    optional string	sku= 15; //	Windows
+    optional int32	speed= 16; //	Windows, Linux, Mac
+    optional string	state= 17; //	Mac
+    optional int32	total_width= 18; //	Windows, Linux
+    optional MappedValue	type= 19; //	Windows, Linux, Mac
+    optional MappedValue	type_detail= 20; //	Windows, Linux
 }
 
 
 /** MemoryArray, only Windows **/
 message MemoryArray {
   optional int32	max_capacity= 1; //	Windows
-  optional	MappedValue	location= 2; //	Windows
-  optional	int32	memory_devices= 3; //	Windows
-  optional	MappedValue	memory_error_correction= 4; //	Windows
-  optional	string	tag= 5; //	Windows
-  optional	MappedValue	use= 6; //	Windows
+  optional MappedValue	location= 2; //	Windows
+  optional int32	memory_devices= 3; //	Windows
+  optional MappedValue	memory_error_correction= 4; //	Windows
+  optional string	tag= 5; //	Windows
+  optional MappedValue	use= 6; //	Windows
 }
 
 /**
@@ -577,6 +655,11 @@ message Monitor {
   oneof spec {
     WindowsMonitorInfo windows = 20;
   }
+
+  // placeholder to be able to inject the catalog meta-data if/when needed
+  optional CatalogBrand catalog_brand = 50;
+  // placeholder to be able to inject the catalog meta-data if/when needed
+  optional CatalogMonitor catalog_monitor = 51;
 }
 
 message WindowsMonitorInfo {
@@ -640,6 +723,13 @@ message Software {
   RawSoftware raw = 17;
   optional string raw_hash = 18; // optional raw hash of SW
   optional string nre_hash = 19; // optional NRE hash of SW
+
+  // placeholder to be able to inject the catalog meta-data if/when needed
+  optional CatalogBrand catalog_brand = 50;
+  // placeholder to be able to inject the catalog meta-data if/when needed
+  optional CatalogSoftware catalog_software = 51;
+  // placeholder to be able to inject the catalog meta-data if/when needed
+  optional CatalogSoftware catalog_parent = 52;
 }
 
 /**