@lansweeper/data-platform-outbound-grpc 0.1.35 → 0.1.36

package/java.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lansweeper/data-platform-outbound-grpc",
-  "version": "0.1.35",
+  "version": "0.1.36",
   "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": "50480034813d35a1befe90e6a606e2dd878a9c66"
+  "gitHead": "369d8ae0c536fa5ef2506672f736f23113d640bd"
 }

package/proto/outbound.proto

@@ -114,9 +114,10 @@ message Asset {
   CoreFields core = 6;
 
   optional HardwareInfo hw = 7;
-  optional DeprecatedOperatingSystemInfo deprecated_os = 8;
-  optional OperatingSystem os = 22;
+  optional OperatingSystemInfo deprecated_os = 8;
+
   optional SoftwareInventory software_inventory = 9;
+  optional AntivirusSoftware antivirus = 26;
 
   optional MonitorInventory monitor_inventory = 10;
 
@@ -129,6 +130,7 @@ message Asset {
   optional Memory memory = 19;
   optional Motherboard motherboard = 21;
   repeated OpticalDrive optical_drive = 24;
+  repeated HardDrive hard_drive = 25;
 
   optional OtModule ot_module = 16; // OT specific module info when asset type is 'OT'
 
@@ -287,77 +289,9 @@ message SpecHardwareInfo {
   optional string serial_number = 4;
 }
 
-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 MappedValue 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 MappedValue 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
-  repeated MappedValue suite_mask	 = 34; //Communications,Datacenter Edition	Windows
-  optional MappedValue 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 {
+message OperatingSystemInfo {
   // catalog id of: CatalogOs
   optional int64 id = 1;
 
@@ -376,32 +310,25 @@ message DeprecatedOperatingSystemInfo {
   optional int32 rank = 8;
 
   oneof spec {
-    DeprecatedWindowsOperatingSystemInfo windows = 32;
+    WindowsOperatingSystemInfo windows = 32;
+    MacOperatingSystemInfo mac = 33;
+    LinuxOperatingSystemInfo linux = 34;
   }
 }
 
+message MacOperatingSystemInfo {
+  optional string kernel_caption = 1;
+}
 
-/* OS Patch, i.e. Windows KB's, aka Hotfix, aka QuickFixEngieering */
-message OperatingSystemPatch {
-  // from hot_fix_id, e.g.: "KB4570334"
-  string id = 1;
-
-  // from description, e.g.: Security Update
-  optional string type = 2;
-
-  optional google.protobuf.Timestamp install_date = 3;
-
-  // e.g.: "NT AUTHORITY\\SYSTEM"
-  optional string install_by = 4;
-
-  optional string comments = 5;
-
-  optional string windows_service_pack = 6;
-
+message LinuxOperatingSystemInfo {
+  optional string kernel_name = 1;
+  optional string kernel_release = 2;
+  optional string kernel_version = 3;
+  optional string distribution = 4;
+  optional string os_release = 5;
 }
 
-// deprecated
-message DeprecatedWindowsOperatingSystemInfo {
+message WindowsOperatingSystemInfo {
   optional string version = 1;
   optional int32 service_pack = 2;
   optional string build = 3;                // "WindowsVersion": "10.0.19045"
@@ -456,6 +383,25 @@ message DeprecatedWindowsOperatingSystemInfo {
   optional uint32 data_execution_prevention_support_policy = 54;
 }
 
+/* OS Patch, i.e. Windows KB's, aka Hotfix, aka QuickFixEngieering */
+message OperatingSystemPatch {
+  // from hot_fix_id, e.g.: "KB4570334"
+  string id = 1;
+
+  // from description, e.g.: Security Update
+  optional string type = 2;
+
+  optional google.protobuf.Timestamp install_date = 3;
+
+  // e.g.: "NT AUTHORITY\\SYSTEM"
+  optional string install_by = 4;
+
+  optional string comments = 5;
+
+  optional string windows_service_pack = 6;
+
+}
+
 /* Network Interface cards */
 message NetworkInterfaces {
   google.protobuf.Timestamp timestamp = 1;
@@ -551,8 +497,25 @@ message Chassis
 }
 
 /**
- * Optical disc drive for computers.
+ * Hard drive for computers: Windows.WindowsHardDisk, Unix.HardDisks, Mac.MacHardDisk
  **/
+message HardDrive {
+  optional string caption = 1;
+  optional bool compressed = 2;
+  optional string description = 3;
+  optional string device_id = 4;
+  optional MappedValue drive_type = 5;
+  optional string file_system = 6;
+  optional int64 free_space = 7;
+  optional int64 size = 8;
+  optional string volume_name = 9;
+  optional string serial_number = 10;
+  optional string mounted_on = 11;
+}
+
+/**
+* Optical disc drive for computers.
+**/
 message OpticalDrive {
   optional	string	name	= 1; // Windows: "HL-DT-ST DVD+-RW GHB0N", Linux: "VMware SATA CD00", Mac: "NECVMWar VMware SATA CD01"	Windows, Linux, Mac
   optional	string	status	= 2; // 	"OK","Error","Degraded"	Windows
@@ -702,6 +665,17 @@ message WindowsMonitorInfo {
   optional string device_id = 8;
 }
 
+/**
+ Antivirus software (that could be even missing from scanned SW list.
+ */
+message AntivirusSoftware {
+  optional string name = 2;
+  optional string guid = 3;
+  optional bool enabled = 4;
+  optional bool up_to_date = 5;
+  optional Software software = 6; // filled only in case it was scanned sw (not windows registry)
+}
+
 /**
  * Software Inventory with list of installed SW.
  * Sources: