@lansweeper/data-platform-outbound-grpc 0.3.2 → 0.3.4

package/model/target/classes/outbound.proto

@@ -0,0 +1,3611 @@
+/**
+ * Copyright Lansweeper (c)
+ *
+ * This files contains the Data Access API and the definition of outbound model
+ *
+ * N.B. This file has been documented using the specification available here: https://github.com/pseudomuto/protoc-gen-doc
+ */
+syntax = "proto3";
+package com.lansweeper.dp.outbound.v1;
+option go_package = "./generated-go";
+option java_multiple_files = true;
+
+import "google/protobuf/timestamp.proto";
+import "google/protobuf/any.proto";
+
+// ----- Service Part ------
+
+/**
+ * GRPC Service. Currently supported operation:
+ *   - Get Entity
+ *   - Stream Entities
+ */
+service DataCoreOutboundService {
+
+  // ----------------------------------------
+  // ACCESS API
+  // ----------------------------------------
+
+  // Retrieve a single entity by site/inst-id/type/id
+  rpc GetEntity (GetEntityRequest) returns (GetEntityResponse) {}
+
+  // lists entities for a site or site/type
+  rpc ListEntities(ListEntityRequest) returns (stream ListEntityResponse) {}
+
+  // ----------------------------------------
+  // ENRICHMENT API
+  // ----------------------------------------
+
+  // Retrieve a single entity by site/inst-id/type/id
+  rpc CatalogLookup (CatalogLookupRequest) returns (CatalogLookupResponse) {}
+
+  // ----------------------------------------
+  // CONFIG API
+  // ----------------------------------------
+
+  // Get IP Location config (BY SITE)
+  rpc GetIpLocationConfig(GetIpLocationConfigRequest) returns (GetIpLocationConfigResponse) {}
+
+  // Set IP Location Config far a Site
+  rpc SetIpLocationConfig(SetIpLocationConfigRequest) returns (SetIpLocationConfigResponse) {}
+
+}
+
+/**
+ * GRPC Service for Backoffice
+ */
+service DataCoreBackofficeService {
+
+  // CRUD Entity
+  rpc CreateEntity(Entity) returns (Entity);
+  rpc GetAsset(EntityPath) returns (Entity);
+  rpc UpdateAsset(Entity) returns (Entity);
+  rpc DeleteAsset(EntityPath) returns (Entity);
+  // Just take site_id from entity path
+  rpc ListAssets(EntityFilter) returns (stream Entity);
+
+  // CRUD Site
+  rpc CreateSite(Site) returns (Site);
+  rpc GetSite(SiteKey) returns (Site);
+  rpc UpdateSite(Site) returns (Site);
+  rpc DeleteSite(SiteKey) returns (Site);
+}
+
+message Site {
+  SiteKey key = 1;
+  optional google.protobuf.Timestamp last_update = 2;  // Use Timestamp for Instant
+  optional int32 size = 3;
+  optional ReconRuleSet recon_rule_set = 4;
+  repeated IpLocationConfig ip_location_configs = 5;
+  optional float custom_trace_probability = 6;
+  optional bool needs_reconcile = 7;
+  optional bool raw_checkpoint_enabled = 8;
+  optional int64 reconciliation_refresh_frequency = 9;
+}
+
+message EntityFilter {
+  string site_id = 1;
+  optional bool full_entity = 2; // default false - just return metadata
+
+  enum EntryState {
+    GOLDEN = 0;
+    ALIAS = 1;
+  }
+
+  enum VirtualState {
+    REAL = 0;
+    VIRTUAL = 1;
+  }
+
+  optional EntryState entry_state = 3;
+  optional VirtualState virtual_state = 4;
+}
+// ------------------------------------------------------------------------------------
+
+
+/**
+ * Retrieve an Entity through his path
+ */
+message GetEntityRequest {
+  EntityPath entity_path = 1;
+  // bool send_related = 2;      // send also related entities
+}
+
+message GetEntityResponse {
+  bool success = 1;
+  optional string error_description = 2;
+
+  optional Entity entity = 3;
+  repeated Entity related = 4;
+}
+
+message ListEntityRequest {
+  EntityPath filter = 1; // minimum is for a site
+}
+
+message ListEntityResponse {
+  Entity entity = 1;
+  repeated Entity related = 2;
+}
+
+message CatalogLookupRequest {
+  repeated int64 brand_id = 1;
+  repeated int64 model_id = 2;
+  repeated int64 os_id = 3;
+  repeated int64 sw_id = 4;
+  repeated int64 monitor_id = 5;
+
+  optional bool only_requested = 10; // false by default: to avoid to get full path
+}
+
+message CatalogLookupResponse {
+  repeated CatalogBrand brand = 1;
+  repeated CatalogModel model = 2;
+  repeated CatalogOs os = 3;
+  repeated CatalogSoftware sw = 4;
+  repeated CatalogMonitor monitor = 5;
+  optional bool success = 6;
+  optional string error_description = 7;
+}
+
+/**
+ * IP location management
+ */
+message GetIpLocationConfigRequest {
+  string site_id = 1;
+}
+
+message GetIpLocationConfigResponse {
+  repeated IpLocationConfig config = 1;
+}
+
+message SetIpLocationConfigRequest {
+  string site_id = 2;
+  repeated IpLocationConfig config = 1;
+}
+
+message SetIpLocationConfigResponse {
+  bool ok = 1;
+  string error_description = 2;
+}
+
+// ----- Data Part ------
+
+message EntityPath {
+  string site_id = 1;
+  optional string source_id = 2;
+  optional string source_type = 3; // IT, OT, CDK, 3rdParty
+  optional string entity_type = 4; // "asset" "user" etc
+  optional string entity_id = 5;
+}
+
+/* Main Entity object: variant */
+message Entity {
+  oneof entity {
+    Asset asset = 1;
+    User user = 2;
+    Group group = 3;
+    // Other ...
+  }
+}
+
+
+/* Asset object: IT/OT/CDR  */
+message Asset {
+
+  EntityPath id = 1;
+
+  google.protobuf.Timestamp last_synced = 2;
+  google.protobuf.Timestamp first_seen = 3;
+  google.protobuf.Timestamp last_updated = 4;
+  google.protobuf.Timestamp last_enriched = 5;
+
+  optional string last_synced_source_agent = 39;      // last synced source agent name and version
+  optional string last_synced_source_name = 49;       // last synced source name
+
+  /**
+   * Every source that contributed sending a scan for this asset is listed here.
+   * The source_info is a actually a map by source type/id, keeping history of scans.
+   * If the asset was discovered by a single sources, it's redudant with info already in main asset msg.
+   * The list are two as we keep both the active source info and the unlinked source info
+   * (i.e. the sources of duplicates that are unlinked by the user)
+   */
+  repeated SourceInfo source_info = 74;
+  repeated SourceInfo unlinked_source_info = 86;
+
+  /**
+   * This is unique and source of UUID asset_id. Kept also in verbose key format for debug/future use.
+   * The key is not globally unique across sites, but it's made up with strongest attributes of the asset.
+   * Like e.g.:  brand/model/serial of a Windows PC.
+   * Like e.g.:  MAC address of CDR devices (if present).
+   */
+  optional string unique_key = 23;
+
+  repeated ScanError scan_error = 33;
+
+  optional IpInfo internet_ip = 32; // Internet IP and related geo-location info, when available
+
+  repeated Tag tag = 14;
+  repeated Relation relation = 20; // e.g. relations to and from OT parent module to sub-modules
+
+  optional CorrelationFields correlation_fields = 78; // correlation fields needed and used by reconciliation engine
+  optional ReconciliationInfo reconciliation = 79;
+
+  CoreFields core = 6;
+
+  optional HardwareInfo hw = 7;
+  optional OperatingSystem os = 8;
+
+  optional MonitorInventory monitor_inventory = 10;
+  optional NetworkInterfaces network_interfaces = 11;
+  optional NetworkProtocols network_protocols = 76;
+  optional PortScan port_scan = 77;
+
+  repeated WarrantyInfo warranty_info = 81;
+
+  // list of deprecated fields, now moved to computer message
+  reserved 9, 26, 13, 37, 15, 18, 19, 21, 24, 25, 27, 30, 28, 29, 31, 82;
+
+  optional Computer computer = 75;
+  optional ServerGroup server_group = 87;
+
+  optional ActiveDirectoryComputer ad_computer = 88;
+
+  optional Printer printer = 84;
+  optional Ups ups = 85;
+
+  optional OtModule ot_module = 16; // OT specific module info when asset type is 'OT'
+
+  optional CloudEntity cloud = 17;
+
+  repeated AssetChangeEvent change_log = 80;
+}
+
+
+/**
+ * Asset change event log.
+ */
+message AssetChangeEvent {
+  google.protobuf.Timestamp timestamp = 1;
+  oneof event {
+    SoftwareChangeEvent sw = 2;
+    OperatingSystemChangeEvent os = 3;
+    WindowsSqlServerChangeEvent sql_server = 4; // specific to SQL server on Windows
+  }
+}
+
+/**
+ * Warranty information.
+ */
+message WarrantyInfo {
+  google.protobuf.Timestamp timestamp = 1;
+  optional google.protobuf.Timestamp start_date = 2;
+  optional google.protobuf.Timestamp end_date = 3;
+  optional google.protobuf.Timestamp ship_date = 4;
+
+  optional string service_type = 5;
+  optional string purchase_country = 6;
+
+  bool is_reliable = 7; // from is_silly
+}
+
+/**
+ * Computer message keeping all sections of asset.computer.
+ */
+message Computer {
+  // HW
+  optional Chassis chassis = 1;
+  optional Motherboard motherboard = 2;
+  repeated Processor processor = 3;
+  optional Memory memory = 4;
+  repeated GraphicsCard graphics_card = 5;
+  repeated SoundCard sound_card = 6;
+  repeated Keyboard keyboard = 7;
+  repeated PointingDevice pointing_device = 8;
+  repeated ComputerBus computer_bus = 9;
+  repeated ComputerInfrared computer_infrared = 10;
+  repeated ParallelPort parallel_port = 11;
+  repeated SerialPort serial_port = 12;
+  repeated PcmciaController pcmcia = 13;
+  repeated PortConnector port_connector = 14;
+  repeated ScsiController scsi_controller = 15;
+  repeated ComputerBattery computer_battery = 16;
+  repeated PortableBattery portable_battery = 17;
+  repeated OpticalDrive optical_drive = 18;
+  repeated HardDrive hard_drive = 19;
+  repeated DriveVolume drive_volume = 20;
+  repeated TrustedPlatformModule tpm = 21;
+  repeated ComputerConnectedUsbController usb_controller = 22;
+  repeated ComputerConnectedUsbDeviceInfo usb_device_info = 23;
+  repeated ComputerConnectedModem modem = 24;
+  repeated ComputerConnectedPrinter printer = 25;
+  repeated ComputerConnectedTapeDrive tape_drive = 26;
+  repeated ComputerWindowsFloppy windows_floppy = 33;
+  repeated ComputerWindowsDesktop windows_desktop = 27;
+  repeated ComputerWindowsDesktopMonitor windows_desktop_monitor = 32;
+  repeated ComputerWindowsDisplay windows_display = 28;
+  repeated ComputerWindowsDisplayController windows_display_controller = 29;
+  repeated ComputerWindowsIdeController windows_ide_controller = 30;
+  repeated ComputerWindowsDiskPartition windows_disk_partition = 31;
+  repeated ComputerMacWifiController mac_wifi_controller = 34;
+  repeated ComputerMacBluetooth mac_bluetooth = 35;
+  repeated ComputerMacNetworkLocation mac_network_location = 36;
+  optional ComputerMacSecureElements mac_secure_elements = 37;
+  repeated ComputerMacCamera mac_camera = 38; 
+  repeated ComputerMacCardReader mac_card_reader = 39;
+  optional ComputerMacHardwareController mac_hardware_controller = 40;
+  repeated ComputerMacDiagnostics mac_diagnostic = 41;
+  optional ComputerMacEthernet mac_ethernet = 42;
+  optional ComputerMacNVMExpress mac_nvm_express = 43;
+  repeated ComputerMacSPIDevice mac_spi_device = 44;
+  repeated ComputerMacSATAController mac_sata_controller = 45;
+  
+
+  // OS
+  optional Bios bios = 101;
+  repeated OperatingSystemPatch os_patch = 102;
+  repeated OperatingSystemFeature os_feature = 103;
+  optional OperatingSystemRecovery os_recovery = 104;
+  repeated OperatingSystemService os_service = 105;
+  optional ComputerSystemProduct computer_system_product = 106;
+  repeated ComputerWindowsPageFile page_file = 107;
+  optional WindowsComputerSystem computer_system = 108;
+
+  // SW
+  optional SoftwareInventory software_inventory = 201;
+  repeated AntivirusSoftware antivirus = 202;
+  repeated AutoRunCommand auto_run_command = 203;
+  optional BootConfig boot_config = 204;
+  repeated Driver driver = 205;
+  repeated RunningProcess running_process = 206;
+  repeated SharedResource shared_resource = 207;
+  optional InternetExplorer internet_explorer = 208; // specific to IE on Windows
+  repeated WindowsSqlServer windows_sql_server = 209; // specific to SQL server on Windows
+  repeated ComputerWindowsNetworkClient windows_network_client = 210;
+  repeated NetworkVolume network_volume = 211;
+  repeated ComputerWindowsCertificate windows_cert = 212;
+  repeated ComputerWindowsSerial windows_serial = 213;
+  repeated ComputerWindowsEnvironment win_env = 214;
+  repeated ComputerWindowsComApp windows_comapp_com = 215;
+  repeated ComputerWindowsComApp windows_comapp_dcom = 216;
+  repeated ComputerWindowsComApp windows_comapp_component = 217;
+  repeated ComputerWindowsSat windows_sat = 218;
+  repeated ComputerWindowsCodec windows_codec = 219;
+  optional ComputerMacAccessibility mac_accessibility = 220;
+  repeated ComputerMacOsFramework mac_framework = 221;
+  repeated ComputerMacPreferencePane mac_preference_pane = 222;
+  optional ComputerMacRegionalSettings mac_regional_settings = 224;
+  repeated ComputerMacInstallHistory mac_install_history = 225;
+  optional ComputerLinuxBasicInfo linux_basic_info = 226;
+  repeated ComputerLinuxPcieCard linux_pcie_cards = 227;
+
+  // USERS AND ACCOUNT
+  optional LastUser last_user = 301; // i.e. computer current user
+  repeated UserAccount user = 302;
+  repeated UserGroup user_group = 303;
+  repeated UserInGroup user_in_group = 304;
+}
+
+message ServerGroup {
+  optional SccmInfo sccm_info = 1;
+
+}
+
+message SccmInfo {
+  google.protobuf.Timestamp timestamp = 1;
+  SccmServer sccm_server = 2;
+  SccmSite sccm_site = 3; // filled only one's own site
+  int64 resource_id = 4;
+  optional SccmClient sccm_client = 5;
+  optional google.protobuf.Timestamp creation_date = 6;
+}
+
+message SccmServer {
+  EntityPath server = 1;
+  optional string server_name = 2;
+  optional string domain = 3;
+  string server_id = 4; // reference to site useful for SccmSite Entity in Syncer
+  repeated SccmSite sccm_site = 5; // filled by SCCM Server for all sites - LECAdapter will create the opportunity Entity type [SccmSite and SccmServer]
+}
+
+message SccmSite {
+  string site_id = 1; // reference to site useful for SccmAsset Entity in Syncer
+  optional string code = 5;
+  optional string name = 6;
+  optional string version = 7;
+  optional int32 build_number = 8;
+  optional string status = 9;
+}
+
+message SccmClient {
+  optional MappedValue client_edition = 1;
+  optional string client_version = 2;
+}
+
+/**
+ * A key/value tag, also known as a key-value pair or simply a tag: a key and a corresponding value.
+ * It is used to associate metadata or additional information with an entity or data element.
+ * The key represents the identifier or name of the tag, while the value contains the associated data or information.
+ * The key serves as a unique label or reference that can be used to retrieve or manipulate the value associated with it.
+ * In this context, the key can be thought of as a variable name or a dictionary key, and the value can be any data type or object.
+ *
+ * Among other things we also use this to mark the Source.
+ *    * E.g.: Source: LS/IT/CDR
+ *    * E.g.: Source: LS/IT/Scan-WMI
+ *    * E.g.: Source: LS/IT/Scan-MAC
+ *    * E.g.: Source: LS/IT/Scan-Linux
+ *    * E.g.: Source: LS/IT/OT     (OT like this?)
+ *    * E.g.: Source: LS/CDK       (cloud discovery?)
+ *    * E.g.: Source: LS/DataCore  (reconciliation)
+ */
+message Tag {
+  string key = 1;
+  optional string value = 2;
+}
+
+/**
+ * A relation between two entities refers to the connection, association, or interaction that exists between them.
+ * It signifies the way in which these entities are related or linked to each other based on certain characteristics,
+ * attributes, behaviors, dependencies, or roles they share.
+ */
+message Relation {
+  optional EntityPath from = 1; // if missing, 'self' assumed
+  repeated EntityPath to = 2;   // if missing, 'self' assumed
+  google.protobuf.Timestamp start = 3;
+  optional google.protobuf.Timestamp end = 4; // if end is marked, it's over
+  string name = 5;
+  repeated Tag tag = 6;
+}
+
+/**
+ * Correlation fields used by reconciliation/correlation engine.
+ */
+message CorrelationFields {
+  // version or timestamp here...
+    repeated CorrField field = 1;
+
+}
+
+message CorrField {
+    string key = 1;
+    repeated string value = 2;
+}
+
+/**
+ * ReconciliationInfo fields used by reconciliation/correlation engine.
+ */
+message ReconciliationInfo {
+   enum EntryState {
+     GOLDEN = 0;
+     ALIAS = 1;
+   }
+
+  enum MasterType {
+    ENGINE = 0;
+    USER = 1;
+  }
+
+  google.protobuf.Timestamp correlation_time = 1;
+  EntryState state = 2;
+  optional MasterType master_type = 3; // NULL | ENGINE | USER
+
+  reserved 4,5,6,7,8;
+
+  optional CorrelationInfo master_asset = 9;             // null if GOLDEN / Filled with ID of master if overridden
+  optional CorrelationInfo reference_asset = 10;         // Filled by ENGINE with the Master ID chosen, if any: To preserve history of engine decisions vs user decisions.
+  repeated CorrelationInfo alias_asset = 11;             // Master is keeping a link to aliases
+  repeated CorrelationInfo unlinked_alias_asset = 12;    // Master is keeping a link to unlink aliases, too
+}
+
+message CorrelationInfo {
+  EntityPath entity = 1;
+
+  reserved 2; // deprecated tags
+
+  optional int32 confidence = 3; // Numeric value 0-100 of correlation confidence.
+
+  // For future use of correlation leads that brought to merge.
+  optional string debug_string = 4;
+
+  optional CorrelationFields correlation_fields = 5;
+}
+
+/**
+ * Cloud entity coming from CDK scanner.
+ * This could be extended later on to become more than a carrier of opaque info.
+ * I.e. the any object contains objects as defined in discovery_cloud.proto
+ * Only objects needing to be mapped into common/core asset fields are handled
+ * the rest is fast-forwarded ahead to the chain to allow us to avoid useless
+ * early heavy mapping and post-pone it only where/when it's needed.
+ */
+message CloudEntity {
+  google.protobuf.Any body = 1;
+  string environment_id = 2;
+  string cloud_provider = 3;
+  optional string region_id = 4;
+  string environment_name = 5;
+  string category = 6;
+  repeated Tag cdk_tags = 7; // Displayable tags from CDK scanner
+  optional string location = 8;
+  optional string tenant_id = 9;
+  optional string tenant_name = 10;
+}
+
+/**
+ * OT module/card specific info.
+ * Information about belonging rack and:
+ * - if it's main module, reference to all sub-modules
+ * - if it's sub-module, reference to parent main
+ * HW info: in HW standard section.
+ * OS info: in OS standard section.
+ */
+message OtModule {
+  optional string component_type = 1;
+  repeated OtBusConfig bus_config = 2; // a module can have one bus-config for each rack/bus it's part of
+
+  bool is_main_module = 3;
+  int32 total_bus_count = 11;   // main module only: total buses including children
+  int32 total_bus_size = 12;    // main module only: super total number of modules in all buses
+  int32 max_bus_level = 13;     // main module only: max number of bus levels
+
+  optional string part_number = 4;
+  repeated OtModuleExtInfo ext_info = 5;
+
+  optional string route_path = 6;
+
+  bool is_network_node = 7;
+  optional string scan_protocol = 8;
+  optional OtScanInfo scan_info = 9;
+  repeated OtFirmwareHistory fw_history = 10;
+}
+
+// Information about the OT rack the module is plugged into
+message OtBusConfig {
+  int32 number = 1;
+  optional string name = 2;
+  optional string type = 3;
+  int32 size = 4;
+  int32 start_index = 7;
+  optional int32 position = 5; // the specific slot number for this module in the rack
+  optional int32 width = 6;  // the specific slot width for this module in the rack
+  optional bool is_main_module = 8;
+}
+
+message OtModuleExtInfo {
+  string key = 1;
+  string value = 2;
+}
+
+// Information about the Scan config and last run of OT scan
+message OtScanInfo {
+  optional string scan_target_id = 1;
+  optional string scan_target_name = 2;
+  optional string sensor_id = 3;
+  optional string sensor_name = 4;
+  optional string protocol_id = 5;
+  optional string protocol_name = 6;
+  optional int32 port = 7;
+  optional string network_protocol = 8;
+  optional google.protobuf.Timestamp last_tried = 9;
+  optional google.protobuf.Timestamp last_scan = 10;
+}
+
+// Information about OT firmware history
+message OtFirmwareHistory {
+  string firmware = 1;
+  google.protobuf.Timestamp from = 2;
+  google.protobuf.Timestamp until = 3;
+}
+
+/**
+ * Asset Type enables customers to manage the settings for a
+ * category of information in a centralized, reusable way.
+ */
+message AssetType {
+  // Lansweeper Asset Type. Full list available here: /lansweeperapis/packages/model/masterData/content/masterData.json
+  string ls_name = 1;
+  // Lansweeper type ID
+  int32 ls_id = 3;
+  // Fing Type
+  optional string fing_type = 2;
+  optional string sub_type = 4; // sub type for OT and CDK
+}
+
+
+/**
+ * Detailed Source information for each source (aka installation in legacy terms)
+ * that at least once contributed to sending a scan about this asset.
+ */
+message SourceInfo {
+  string source_id = 1;                   // source id, like installation id of IT
+  string source_type = 2;                 // source type like e.g. IT
+  optional string source_agent = 3;       // source agent name and version
+  optional string source_name = 4;        // source name
+  optional string source_tag = 8;         // source tag
+  string raw_id = 5;                      // entity/asset raw id for source
+  optional string entity_id = 7;          // entity/asset id in data-core
+  google.protobuf.Timestamp last_synced = 6;
+  // later here we could also have a summary of errors, if needed to keep history
+}
+
+/**
+ * Scan errors.
+ */
+message ScanError {
+  string section = 1; // name of section
+  string error = 2; // error descr
+  optional string source = 3; // e.g. "WMI"
+  optional google.protobuf.Timestamp timestamp = 4;
+  optional int64 duration = 5;
+}
+
+/**
+ * Core Fields for all Assets.
+ */
+message CoreFields {
+  AssetType type = 1;
+  string name = 2;
+  optional string domain = 3;
+  optional string ip_address = 4;
+  optional string serial = 5;
+  optional string mac = 6;
+  optional string mac_vendor = 7;
+  optional string sensor_id = 8;
+  optional string fqdn = 9;
+
+  /**
+   * Asset confidence 1-100:
+   *   - 100 is for credential-scan assets by LS internal scanners
+   *   - <100 is for e.g. CDR or imported data from 3rd parties
+   */
+  int32 confidence = 10;
+}
+
+
+
+message LastUser {
+    string user_name = 1;
+    optional string user_type = 2;
+    optional string upn = 3;
+    optional string sid = 4;
+}
+
+/**
+ * User account: from Windows.WindowsUser and Unix.Users.
+ */
+message UserAccount {
+  optional string name = 1; // unix:user_name
+  optional string domain = 2;
+  optional string caption = 3;
+  optional string description = 4; // unix:comment
+  optional string full_name = 5;
+
+  optional MappedValue account_type = 6; // unix:type
+
+  optional string sid = 7;
+  optional MappedValue sid_type = 8;
+
+  optional bool local_account = 9;
+  optional bool disabled = 10;
+  optional bool lockout = 11;
+  optional bool password_changeable = 12;
+  optional bool password_expires = 13;
+  optional bool password_required = 14;
+
+  optional string status = 15;
+
+  // unix specific
+  optional int32 user_id = 16;
+  optional int32 group_id = 17;
+
+  optional string home_directory = 18;
+  optional string login_shell = 19;
+}
+
+/**
+ * User group, from Windows.WindowsGroup and Unix.GroupEntry.
+ * Note that Unix.user_names are not here but programmatically mapped to UserInGroup.
+ */
+message UserGroup {
+  optional string name = 1;
+  optional string caption = 2;
+  optional string description = 3;
+  optional string domain = 4;
+
+  optional string sid = 5;
+  optional bool local_account = 6;
+  
+  // unix specific
+  optional int32 group_id = 7;
+  optional string type = 8;
+}
+
+/**
+ * Many to many relationship between users and groups and related relation properties.
+ * Windows: direct mapping mapped from WindowsUserInGroupInfo.
+ * Unix: created from parsing of Unix.GroupEntry.user_names
+ */
+message UserInGroup {
+  optional string group_name = 1;
+  optional string user_name = 2;
+  optional string user_domain_name = 3;
+  optional string account_type = 4;
+
+  optional bool is_admin_group = 5;
+}
+
+/**
+ * IE on Windows. Very specific.
+ * From sections: WindowsActiveX, WindowsInternetExplorerBarInfo,
+ *                WindowsInternetExplorerBrowserObjectInfo, WindowsInternetExplorerExtensionInfo.
+ */
+message InternetExplorer {
+  // from WindowsActiveX
+    message ActiveX {
+      optional string control = 1;
+      optional string code_base = 2;
+      optional string info = 3;
+      optional string osd = 4;
+    }
+
+    // InternetExplorerExtensionInfo
+    message Extension {
+      optional string control = 1;
+      optional string button_text = 2;
+      optional string cls_id = 3;
+      optional string default_visible = 4;
+      optional string exec = 5;
+      optional string hot_icon = 6;
+      optional string icon = 7;
+      optional string menu_text = 8;
+      optional string tooltip = 9;
+    }
+
+    // from InternetExplorerBrowserObjectInfo
+  message BrowserObject {
+    string control = 1;
+  }
+
+  // from WindowsInternetExplorerBarInfo
+  message BarInfo {
+    string control = 1;
+  }
+
+
+  repeated ActiveX active_x = 1; 
+  repeated BrowserObject bar = 2;
+  repeated BrowserObject browser_object = 3;
+  repeated Extension extension = 4;
+}
+
+/**
+ * SQL Server extended information on Windows Computers.
+ */
+message WindowsSqlServer {
+  enum SqlAuthenticationMode {
+    UNKNOWN_MODE = 0;
+    WINDOWS = 1;
+    MIXED = 2;
+  }
+  
+    bool is_clustered = 1;
+    SqlAuthenticationMode sql_authentication_mode = 2;
+    repeated SqlServerDatabase databases = 3;
+    repeated SqlServerService services = 4;
+    string service_name = 5;
+    string display_version = 6;
+    string version = 7;
+    optional int32 sp_level = 8;
+    optional string sku_name = 9;
+    optional MappedValue language = 10;
+    optional bool is_wow64 = 11;
+    optional string install_path = 12;
+    optional string file_version = 13;
+    optional string data_path = 14;
+    optional SqlServerCluster cluster = 15;
+    string instance_id = 16;
+    optional string instance_name = 17;
+}
+
+
+message SqlServerDatabase {
+  optional int64 data_files_size_kb = 1;
+  optional int64 log_files_size_kb = 2;
+  optional int64 log_files_used_size_kb = 3;
+  optional string name = 4;
+}
+
+message SqlServerService {
+  enum ServiceState {
+    NO_SERVICE_STATE = 0;
+    STOPPED = 1;
+    START_PENDING = 2;
+    STOP_PENDING = 3;
+    RUNNING = 4;
+    CONTINUE_PENDING = 5;
+    PAUSE_PENDING = 6;
+    PAUSED = 7;
+  }
+
+  enum ServiceStartupType {
+    NO_SERVICE_STARTUP_TYPE = 0;
+    OTHER_STARTYP_TYPE = 1;
+    AUTOMATIC = 2;
+    MANUAL = 3;
+    DISABLED = 4;
+  }
+  
+  optional ServiceState state = 1;
+  optional ServiceStartupType startup_type = 2;
+  optional string name = 3;
+  optional string instance_id = 4;
+}
+
+message SqlServerCluster {
+  optional string name = 1;
+  repeated SqlServerClusterNode cluster_nodes = 2;
+}
+
+message SqlServerClusterNode {
+  optional string name = 1;
+}
+
+/**
+ * Log entry for windows sql server change log, tracking install, uninstall and update.
+ */
+ message WindowsSqlServerChangeEvent {
+  enum EventType {
+    INSTALL = 0;
+    UNINSTALL = 1;
+    UPDATE = 2;
+  }
+
+  EventType event_type = 1;
+
+  google.protobuf.Timestamp start = 2;
+  optional google.protobuf.Timestamp end = 3;
+
+  WindowsSqlServer windows_sql_server = 4;
+}
+
+/**
+ * General section for any HW, normalized and with raw data.
+ */
+message HardwareInfo {
+  optional int64 type_id = 1;
+
+  // catalog id of: CatalogBrand
+  optional int64 make_id = 2;
+
+  // catalog id of: CatalogModel
+  optional int64 model_id = 3;
+
+  // catalog id of: CatalogModel
+  optional int64 family_id = 4;
+
+  optional bool is_family = 6;
+  optional string serial = 7;
+
+  optional string type_name = 10;       // e.g.: "SMART_HOME"
+  optional string type_caption = 14;    // e.g.: "Smart Device"
+  optional string type_group = 15;      // e.g.: "Smart Home"
+
+  optional string make_name = 11;
+  optional string model_name = 12;
+  optional string family_name = 13;
+
+  optional string cpe = 21;
+  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 {
+  optional string architecture = 1;
+  optional string model = 2;
+  optional string manufacturer = 3;
+  optional string serial_number = 4;
+  optional string system_sku = 5;
+  optional int64  uptime = 6;
+  optional string bus_speed = 7;          // mac
+  optional string boot_rom_version = 8;   // mac
+  optional string smc_version_system = 9; // mac
+
+}
+
+
+
+message OperatingSystem {
+  // catalog id of: CatalogOs
+  optional int64 id = 1;
+
+  // catalog id of: CatalogBrand
+  optional int64 make_id = 11;
+
+  optional string name = 2;
+  optional string version = 3;
+  optional string build = 4;
+
+  optional string fw_version = 5;
+
+  optional string cpe = 6;
+  optional string fw_cpe = 7;
+
+  optional int32 rank = 8;
+
+  oneof spec {
+    WindowsOperatingSystemInfo windows = 32;
+    MacOperatingSystemInfo mac = 33;
+    LinuxOperatingSystemInfo linux = 34;
+  }
+}
+
+message MacOperatingSystemInfo {
+  optional string kernel_caption = 1;
+  optional string system_version = 2;
+  optional string boot_volume = 3;
+  optional string boot_mode = 4;
+  optional string computer_name = 5;
+  optional string user_name = 6;
+  optional string up_time = 7;
+  optional string secure_virtual_memory = 8;
+  optional string sixty_four_bit_kernel_and_exts = 9;
+  optional string system_integrity = 10;
+}
+
+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;
+}
+
+
+/* Section element for hardware iBridge controller info on Mac */
+message ComputerMacHardwareController {
+  optional string boot_uuid = 1;
+  optional string firmware_version = 2;
+  optional string extra_boot_policies = 3;
+  optional string model_identifier = 4;
+  optional bool boot_args_filtering_enabled = 5;
+  optional bool kernel_ctrr_enabled = 6;
+  optional bool device_mdm_operations = 7;
+  optional bool user_mdm_operations = 8;
+  optional bool other_kernel_extensions = 9;
+  optional bool system_integrity_protection = 10;
+  optional bool signed_system_volume = 11;
+  optional string secure_boot = 12;
+}
+
+message WindowsOperatingSystemInfo {
+  optional string version = 1;
+  optional int32 service_pack = 2;
+  optional string build = 3;                // "WindowsVersion": "10.0.19045"
+  optional string version_name = 4;         // OsVersion": "22H2",
+  optional bool is_domain_controller = 7;
+  optional bool part_of_domain = 8;
+  optional bool is_azure_ad_joined = 9;
+
+  optional string os_code = 10;            // "OsCode": "10.0.19045" - with S if server
+
+  optional string boot_device = 12;
+  optional string build_number = 13;   // "OsBuildNumber": "2486",
+  optional string build_type = 14;
+  optional string caption = 15;
+  optional string code_set = 16;
+  optional string country_code = 17;
+  optional string csd_version = 18;
+  optional int32 current_timezone = 19;
+  optional bool debug = 20;
+  optional string description = 21;
+  optional uint32 foreground_application_boost = 22;
+  optional google.protobuf.Timestamp install_date = 23;
+  optional uint64 max_process_memory_size = 24;
+  optional uint32 number_of_licensed_users = 25;
+  optional string organization = 26;
+  optional MappedValue os_language = 27;
+  optional MappedValue os_product_suite = 28;
+  optional MappedValue os_type = 29;
+  optional string plus_product_id = 30;
+  optional string plus_version_number = 31;
+  optional string registered_user = 32;
+  optional string serial_number = 33;
+  optional uint32 service_pack_major_version = 34;
+  optional uint32 service_pack_minor_version = 35;
+  optional uint64 size_stored_in_paging_files = 36;
+  optional string status = 37;
+  optional string system_device = 38;
+  optional string system_directory = 39;
+  optional uint64 total_virtual_memory_size = 40;
+  optional uint64 total_visible_memory_size = 41;
+  optional string windows_directory = 43;
+  optional uint64 total_swap_space_size = 44;
+  optional uint32 large_system_cache = 45;
+  optional string other_type_description = 46;
+  optional MappedValue product_type = 47;
+  optional uint32 suite_mask = 48;
+  optional string system_drive = 49;
+  optional uint32 encryption_level = 50;
+  optional bool data_execution_prevention32_bit_applications = 51;
+  optional bool is_data_execution_prevention_available = 52;
+  optional bool data_execution_prevention_drivers = 53;
+  optional uint32 data_execution_prevention_support_policy = 54;
+}
+
+/**
+ * Log entry for OS change log, tracking install, uninstall and update.
+ */
+message OperatingSystemChangeEvent {
+  enum EventType {
+    INSTALL = 0;
+    UNINSTALL = 1;
+    UPDATE = 2;
+  }
+
+  EventType event_type = 1;
+
+  google.protobuf.Timestamp start = 2;
+  optional google.protobuf.Timestamp end = 3;
+
+  OperatingSystem os = 4;
+  optional OperatingSystem prev_os = 5;
+
+}
+
+/* OS Feature, i.e. WindowsFeature */
+message OperatingSystemFeature {
+  string name = 1;
+  string caption = 2;
+}
+
+/* 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;
+  repeated NetworkInterface interface = 2;
+}
+
+
+
+message NetworkInterface {
+  string name = 1; // note for macOS -> to Be mapped from BSD name or fallback to confirmed_interface_name in Network IPV6 model
+  string type = 2;
+  string sub_type = 3;
+
+  optional string id = 4;
+
+  optional string mac = 5;
+
+  optional bool dhcp_enabled = 6;
+  optional string dhcp_server_ip = 7;
+
+  repeated NetIpAddress ip = 8;
+
+  optional string gateway_ip = 9;
+  optional string gateway_mac = 10;
+
+  repeated string dns_server = 11;
+  optional string dns_host_name = 12;
+  optional string dns_domain_suffix_search_order = 13; // to be mapped from Windows fields and from macOS NetworkDns.search_domains field
+
+  optional string service_name = 14;
+  optional string database_path = 15;
+
+  // SNMP specifics:
+  optional int32 snmp_index = 27;   // SNMP only: marking if it's a SNMP enumerated interface
+  optional string description = 16; // SNMP only
+  optional string alias = 17; // SNMP only
+  optional int64 mtu = 18; // SNMP only
+  optional int64 speed = 19; // SNMP only
+  optional int64 high_speed = 20; // SNMP only
+  optional MappedValue admin_status = 21; // SNMP only
+  optional MappedValue oper_status = 22; // SNMP only
+  repeated string connected_devices = 23; // SNMP only
+  repeated string vlans = 24; // SNMP only
+
+  // macOS specifics:
+  optional uint64 ipv6_prefix_length = 25; // macOS only
+  optional string network_signature = 26; // macOS only
+}
+
+
+/* Network IP address with IP and subnet */
+message NetIpAddress {
+  string ip = 1;
+  string subnet = 2;
+}
+
+/**
+ * Network protocols, summary and detailed info.
+ */
+message NetworkProtocols {
+    repeated string protocol = 1; // summary list of protocols and data points available
+
+   // later here we can have all fingerprints merged
+
+}
+
+/**
+ * Full port scan.
+ */
+message PortScan {
+  google.protobuf.Timestamp timestamp = 1;
+  repeated ScannedPort scanned_port = 2;
+}
+
+message ScannedPort {
+  string protocol = 1;
+  int32 port_number = 2;
+  optional string local_address = 3;
+  optional string process_name = 4;
+
+  optional string banner = 5;
+  optional HttpServerInfo http_server = 6;
+
+}
+
+// macOS Diagnostic model
+message ComputerMacDiagnostics {
+  optional string name = 1;
+  optional google.protobuf.Timestamp last_run = 2;
+  optional bool result = 3;
+}
+
+message HttpServerInfo {
+  int32 port = 1;
+  optional bool ssl = 2;
+
+  repeated string server = 3; // http_header.server
+  repeated string wwwauth = 4; // http_header.wwwauth
+  repeated string cookie = 5;   // http_header.cookie
+
+  optional string title = 6; // html_title
+  optional string favicon_md5 = 7; // favicon.md5
+  optional bytes favicon = 8; // in case at some point we want to store full
+
+  repeated HttpCertificate certificates = 9; // Captured certificates
+}
+
+message HttpCertificate {
+  optional string thumbprint = 1; // thumbprint
+  optional string serial_number = 2; // serial_number (as a big-endian hexadecimal string)
+  optional string x509_issuer = 3; // x509.issuer
+  optional string x509_subject = 4; // x509.subject
+  optional google.protobuf.Timestamp effective_date = 5; // not_before
+  optional google.protobuf.Timestamp expiration_date = 6; // not_after
+
+  enum SslPolicyErrors {
+    SSL_REMOTE_CERTIFICATE_NOT_AVAILABLE = 0;
+    SSL_REMOTE_CERTIFICATE_NAME_MISMATCH = 1;
+    SSL_REMOTE_CERTIFICATE_CHAIN_ERRORS = 2;
+  }
+
+  repeated SslPolicyErrors errors = 7; // ssl errors
+}
+
+
+/** Processor **/
+message Processor {
+  string  name = 1  ;
+  optional string address_sizes = 2; // Linux-only
+  optional int32 address_width = 3; // Windows-only
+  optional MappedValue architecture = 4; // Consolidate on-prem fields into single numeric list with translations
+  optional int32 availability = 5; // Windows-only
+  optional double bogo_mips = 6; // Standardize to numeric
+  optional string byte_order = 7; // Linux-only
+  optional string caption = 8; // Windows-only
+  optional int32 current_clock_speed = 9; // Standardize values to numeric (MHz)
+  optional int32 data_width = 10; // Windows-only
+  optional string device_id = 11; // Windows-only
+  optional int32 external_clock_mhz = 12; // Windows-only
+  optional MappedValue family = 13; //  Consolidate on-prem fields into single numeric list with translations
+  optional string hypervisor_vendor = 14; // Linux-only
+  optional int32 l1d_cache_size_kb = 15; // Linux-only, standardize to numeric (kilobytes)
+  optional int32 l1i_cache_size_kb = 16; // Linux-only, standardize to numeric (kilobytes)
+  optional int32 l2_cache_size_kb = 17; // Standardize values to int (kilobytes)
+  optional int32 l2_cache_speed_mhz = 18; // Windows-only
+  optional int32 l3_cache_size_kb = 19; // Linux-only, standardize to numeric (kilobytes)
+  optional int32 level = 20; // Windows-only, unclear meaning
+  optional int32 logical_cores_count = 21  ;
+  optional string manufacturer = 22  ;
+  optional int32 max_clock_speed_mhz = 23; // Standardize Linux values to int (MHz)
+  optional int32 min_clock_speed_mhz = 24; // Linux-only, standardize to numeric (MHz)
+  optional int32 model_number = 25; // Linux-only, standardize to numeric
+  optional string op_modes = 26; // Linux-only
+  optional int32 physical_cores_count = 27  ;
+  optional string processor_id = 28; // Windows-only, probably not used much by customers due to its complexity
+  optional MappedValue processor_type = 29; // Windows-only
+  optional int32 revision = 30; // Windows-only
+  optional string socket_designation = 31; // Windows-only
+  optional int32  sockets = 32; // Linux-only
+  optional MappedValue status = 33; // Windows-only
+  optional int32 stepping = 34; // Consolidate on-prem fields into single numeric list
+  optional int32 threads_per_physical_core_count = 35; // Linux-only
+  optional string unique_id = 36; // Windows-only
+  optional MappedValue upgrade_method = 37; // Windows-only
+  optional string version = 38; // Windows-only
+  optional string virtualization = 39; // Linux-only
+  optional MappedValue voltage_capabilities = 40; // Windows-only
+}
+
+/** Chassis **/
+message Chassis
+{
+  MappedValue	type = 1;
+  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;
+}
+
+/**
+ * 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;
+}
+
+/**
+ * Volumes for Computers: Windows.Volume+Windows.EncryptableVolumes and Unix.Volumes
+ **/
+message DriveVolume {
+  optional string device_id = 1;
+  optional string path = 2; // unix path, windows drive_letter
+  optional string label = 3; // win and linux
+  optional string name = 4;
+
+  optional int64 capacity = 5; // windows capacity, size in unix
+  optional int64 block_size = 6;
+  optional int64 free_space = 7;
+
+  optional MappedValue drive_type = 8; // Windows: WMI mapped, Unix: string
+  optional MappedValue protection_status = 9; // from Windows if encrypted: Windows.EncryptableVolumes
+
+  optional string error_description = 10;
+  optional string error_methodology = 11;
+  optional string file_system = 12;
+
+  optional bool auto_mount = 13;
+  optional bool compressed = 14;
+  optional bool dirty_bit_set = 15;
+  optional bool error_cleared = 16;
+  optional bool indexing_enabled = 17;
+  optional bool page_file_present = 18;
+  optional bool supports_disk_quotas = 19;
+  optional bool supports_file_based_compression = 20;
+
+  // unix
+  optional string mounted = 21;
+  optional string mount_point = 22;
+
+}
+
+/**
+ * Network drives/volumes for Computers: Windows.MappedDrive and Mac.NetworkVolume
+ **/
+message NetworkVolume {
+  oneof driver {
+    WindowsMappedDrive win_mapped_drive = 1;
+    MacNetworkVolume mac_volume = 2;
+    }
+
+  optional string name = 100;
+}
+
+// Network drive for Windows: Mapped drive.
+message WindowsMappedDrive {
+  string drive_letter = 1;
+  optional string user_name = 2;
+  optional string user_domain = 3;
+  optional string remote_path = 4;
+}
+
+// Network volume for Mac: NetworkVolume.
+message MacNetworkVolume {
+  optional string name = 1;
+  optional string auto_mounted = 2;
+  optional string fsmt_non_name = 3;
+  optional string fs_type_name = 4;
+  optional string mnt_from_name = 5;
+}
+
+/**
+ * Keyboard for computers: Windows.Keyboards
+ **/
+message Keyboard {
+  optional MappedValue config_manager_error_code = 1;
+  optional bool config_manager_user_config = 2;
+  optional string description = 3;
+  optional string device_id = 4;
+  optional string layout = 5;
+  optional int32 number_of_function_keys = 6;
+}
+
+/**
+ * Computer Bus: from Windows.Bus
+ * WMI mappings from https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-bus
+ */
+message ComputerBus {
+  optional int32 bus_num = 1;
+  optional MappedValue bus_type = 2;
+  optional string device_id = 3;
+  optional string pnp_device_id = 4;
+}
+
+/**
+ * Computer Infrared: from Windows.Infrared
+ * WMI mappings from https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-infrareddevice
+ */
+message ComputerInfrared {
+  optional MappedValue availability = 1;
+  optional string caption = 2;
+  optional MappedValue config_manager_error_code = 3;
+  optional bool config_manager_user_config = 4;
+  optional string device_id = 5;
+  optional string manufacturer = 6;
+  optional MappedValue protocol_supported = 7;
+}
+
+
+/**
+ * Pointing Device for computers, like mouse or trackpad: Windows.PointingDevice
+ **/
+message PointingDevice {
+  optional string caption = 1;
+  optional string device_id = 2;
+  optional MappedValue device_interface = 3;
+  optional int32  double_speed_threshold = 4;
+  optional MappedValue handedness = 5;
+  optional string inf_file_name = 6;
+  optional string inf_section = 7;
+  optional string manufacturer = 8;
+  optional int32  number_of_buttons = 9;
+  optional MappedValue pointing_type = 10;
+  optional int32  quad_speed_threshold = 11;
+}
+
+/**
+ * AutoRunCommand: Windows.Autorun and Mac - MacStartupItems
+ **/
+message AutoRunCommand {
+  optional string caption = 1;
+  optional string command = 2;
+  optional string location = 3;
+  optional string name = 4;
+  optional string user = 5; // Windows Only
+  optional string user_sid = 6; // Windows Only
+  optional string order_preference = 7; // macOS only
+  repeated string provides = 8; // macOS only
+  repeated string required = 9; // macOS only
+  repeated string uses = 10; // macOS only
+  optional bool enabled = 11; // macOS only
+}
+
+/**
+ * BootConfig: Windows.BootConfig 
+ **/
+message BootConfig {
+  optional string boot_directory = 1;
+  optional string caption = 2;
+  optional string name = 3;
+  optional string configuration_path = 4;
+  optional string scratch_directory = 5;
+  optional string temp_directory = 6;
+
+  // from mac
+  optional string boot_volume = 7;
+  optional string boot_mode = 8;
+}
+
+/**
+ * SharedResource: windows WindowsShare.
+ */
+message SharedResource {
+  optional string caption = 1;
+  optional string name  = 2;
+  optional string path = 3;
+  optional MappedValue type = 4;
+  repeated SharedPermission shared_permission = 5;
+}
+
+/**
+ * SharedPermission: windows SharePermissionInfo.
+ */
+ message SharedPermission {
+  optional string name = 1;
+  optional string trustee  = 2;
+  optional bool read_access = 3;
+  optional bool write_access = 4;
+  optional bool full_access = 5;
+  optional string deny_access = 6;
+}
+
+/**
+ * RunningProcess: computer running processes. Windows.WindowsProcess
+ */
+message RunningProcess {
+  optional string name = 2; // caption
+  optional string path = 3; // executable_path
+  optional int32 threads = 4;
+  optional int32 priority = 5; // windows: 0 = LOWEST , 31 = HIGHEST, as per table: https://learn.microsoft.com/en-us/windows/win32/procthread/scheduling-priorities
+  optional string handle = 6;
+}
+
+/**
+ * Operating System Service: WindowsService.
+ */
+message OperatingSystemService {
+  optional string name = 1;
+  optional string caption = 2;
+  optional string pathname = 3;
+  optional string start_mode = 4;
+  optional string start_name = 5;
+  optional string state = 6;
+  optional bool started = 7;
+  optional bool accept_pause = 8;
+  optional bool accept_stop = 9;
+  optional bool desktop_interact = 10;
+}
+
+/**
+ * Operating System Recovery: only windows atm.
+ */
+message OperatingSystemRecovery {
+  oneof os {
+      WindowsOsRecovery win = 1;
+  }
+}
+
+/**
+ * Windows WindowsOsRecovery.
+ */
+message WindowsOsRecovery {
+  optional bool auto_reboot = 2;
+  optional string debug_file_path = 3;
+  optional bool kernel_dump_only = 4;
+  optional string name = 5;
+  optional bool overwrite_existing_debug_file = 6;
+  optional bool send_admin_alert = 7;
+  optional bool write_debug_info = 8;
+  optional bool write_to_system_log = 9;
+  optional MappedValue debug_info_type = 10;
+  optional string mini_dump_directory = 11;
+}
+
+
+/**
+ * Driver: computer drivers.
+ */
+message Driver {
+  oneof driver {
+    WindowsSystemDriver win_sys = 1;
+    WindowsPnpSignedDriver win_pnp = 2;
+    WindowsPrinterDriver win_printer = 3;
+    MacOsKernelExtension mac_kernel_extension = 4;
+    MacPrinterSoftwareItem mac_image_capture_devices = 5;
+    MacPrinterSoftwareItem mac_image_capture_support = 6;
+    MacPrinterSoftwareItem mac_library_extensions = 7;
+    MacPrinterSoftwareItem mac_ppds = 8;
+    MacPrinterSoftwareItem mac_printers = 9;
+    MacPrinterSoftwareItem mac_system_library_extensions = 10;
+  }
+
+  optional string name = 100;
+  optional string description = 101;
+}
+
+/**
+ * WindowsSystemDriver: Windows.SystemDriver
+ */
+message WindowsSystemDriver {
+  optional bool  accept_pause = 1;
+  optional bool  accept_stop = 2;
+  optional bool  desktop_interact = 3;
+  optional string error_control = 4;
+  optional int32  exit_code = 5;
+  optional string path_name = 6;
+  optional int32  service_specific_exit_code = 7;
+  optional string service_type= 8;
+  optional bool  started = 9;
+  optional string start_mode = 10;
+  optional string start_name = 11;
+  optional string state = 12;
+  optional string status = 13;
+  optional int32  tag_id = 14;
+  optional string name = 15;
+  optional string description = 16;
+  optional string caption = 17;
+  optional string display_name = 18;
+}
+
+/**
+ * WindowsPnpSignedDriver: Windows.PnpSignedDriver
+ */
+message WindowsPnpSignedDriver {
+  optional string compat_id = 1;
+  optional string device_id = 2;
+  optional string dev_loader = 3;
+  optional string driver_name = 4;
+  optional string friendly_name = 5;
+  google.protobuf.Timestamp driver_date = 6;
+  optional string driver_version = 7;
+  optional string hardware_id = 8;
+  optional string inf_name = 9;
+  optional bool  is_signed = 10;
+  optional string location = 11;
+  optional string pdo = 12;
+  optional string manufacturer = 13;
+  optional string device_name = 14;
+  optional string device_class = 15;
+  optional string description = 16;
+  optional string signer = 17;
+  optional string driver_provider_name = 18;
+}
+
+/**
+ * WindowsPrinterDriver: Windows.PrinterDriver
+ */
+message WindowsPrinterDriver {
+  optional string config_file = 1;
+  optional string data_file = 2;
+  optional string default_data_type = 3;
+  optional string driver_path = 4;
+  optional string file_path = 5;
+  optional string help_file = 6;
+  optional string monitor_name = 7;
+  optional string oem_url = 8;
+  optional int32  version = 9;
+  optional string driver_version = 10;
+  optional string driver_date = 11;
+  optional string hardware_id = 12;
+  optional string inf_path = 13;
+  optional string printer_environment = 14;
+  optional string print_processor = 15;
+  optional string name = 16;
+  optional string provider = 17;
+  optional string supported_platform = 18;
+  optional string manufacturer = 19;
+}
+
+// Mac OS Kernel Extension. From MacOs.Extension inbound model
+message MacOsKernelExtension {
+  optional string name = 1;
+  optional string has64_bit_intel_code = 2;
+  repeated string architectures = 3;
+  optional string bundle_id = 4;
+  optional string dependencies = 5;
+  repeated KernelExtensionErrorType dependency_errors = 6;
+  optional string info = 7;
+  optional google.protobuf.Timestamp last_modified = 8;
+  optional string load_address = 9;
+  optional string loadable = 10;
+  optional string loaded = 11;
+  optional string notarized = 12;
+  optional string obtained_from = 13;
+  optional string path_location = 14;
+  optional string runtime_environment = 15;
+  optional string signed_by = 16;
+  optional string signing_errors = 17;
+  repeated KernelExtensionErrorType validity_errors = 18;
+  optional string version = 19;
+  optional string version_kext = 20;
+}
+
+message KernelExtensionErrorType {
+  optional string error_type = 1;
+  repeated KernelExtensionError errors = 2;
+}
+
+message KernelExtensionError {
+  optional string error_description = 1;
+  repeated string values = 2;
+}
+
+// Accessibility Information from MacOS, to be mapped from MacAccessibility
+message ComputerMacAccessibility {
+  optional string contrast = 1;
+  optional string cursor_mag = 2;
+  optional string display = 3;
+  optional string flash_screen = 4;
+  optional string keyboard_zoom = 5;
+  optional string mouse_keys = 6;
+  optional string scroll_zoom = 7;
+  optional string slow_keys = 8;
+  optional string sticky_keys = 9;
+  optional string voice_over = 10;
+  optional string zoom_mode = 11;
+}
+
+// Apple Pay - Secure Elements - macOS Only
+message ComputerMacSecureElements {
+  optional string controller_firmware = 1;
+  optional string controller_hardware = 2;
+  optional string controller_info = 3;
+  optional string controller_middleware = 4;
+  optional string secure_elements_device = 5;
+  optional string secure_elements_firmware = 6;
+  optional string secure_elements_hardware = 7;
+  optional string secure_elements_id = 8;
+  optional bool secure_elements_restricted_mode = 9;
+  optional string secure_elements_info = 10;
+  optional string secure_elements_os_version = 11;
+  optional string secure_elements_platform_id = 12;
+  optional bool secure_elements_production_signed = 13;
+}
+
+// Network Location Info from macOS, to be mapped from MacNetworkLocation. NetworkInterface message is shared.
+message ComputerMacNetworkLocation {
+  optional string name = 1;
+  optional bool location_active = 2;
+  repeated NetworkInterface location_services = 3;
+}
+
+/* Section element for NVMExpress info on Mac */
+message ComputerMacNVMExpress {
+  optional string controller_name = 1;
+  repeated NVMExpress entries = 2;
+}
+
+message NVMExpress {
+  optional string name = 1;
+  optional string bsd_name = 2;
+  optional bool detachable_drive = 3;
+  optional string device_model = 4;
+  optional string device_revision = 5;
+  optional string device_serial_number = 6;
+  optional string partition_map_type = 7;
+  optional bool removable_media = 8;
+  optional string size = 9;
+  optional uint64 size_in_bytes = 10;
+  optional string smart_status = 11;
+  optional bool trim_support = 12;
+  repeated MacDiskVolume volumes = 13;
+}
+
+// SATA Controller, macOS specific for now
+message ComputerMacSATAController {
+  optional string name = 1;
+  optional string negotiated_link_speed = 2;
+  optional string physical_interconnect = 3;
+  optional string port_description = 4;
+  optional string port_speed = 5;
+  optional string product = 6;
+  optional string vendor = 7;
+  repeated MacSATADevice devices = 8;
+}
+
+message MacSATADevice {
+  optional string name = 1;
+  optional string bsd_name = 2;
+  optional bool detachable_drive = 3;
+  optional string device_model = 4;
+  optional string device_revision = 5;
+  optional string device_serial_number = 6;
+  optional string partition_map_type = 7;
+  optional bool removable_media = 8;
+  optional string size = 9;
+  optional uint64 size_in_bytes = 10;
+  optional string smart_status = 11;
+  optional string medium_type = 12;
+  optional bool native_command_queuing = 13;
+  optional string queue_depth = 14;
+  optional bool trim_support = 15;
+  optional string async_notification = 16;
+  optional string power_off = 17;
+  repeated MacDiskVolume volumes = 18;
+}
+
+message MacDiskVolume {
+  optional string name = 1;
+  optional string bsd_name = 2;
+  optional string file_system = 3;
+  optional string free_space = 4;
+  optional uint64 free_space_in_bytes = 5;
+  optional string io_content = 6;
+  optional string mount_point = 7;
+  optional string size = 8;
+  optional uint64 size_in_bytes = 9;
+  optional string volume_uuid = 10;
+  optional bool writable = 11;
+}
+
+// SPI Device, macOS only, to be mapped from MacSPI inbound model
+message ComputerMacSPIDevice {
+  optional string name = 1;
+  optional string product_id = 2;
+  optional string vendor_id = 3;
+  optional string stfw_version = 4;
+  optional string serial_number = 5;
+  optional string device_speed = 6;
+  optional string manufacturer = 7;
+  optional string location_id = 8;
+  optional string mtfw_version = 9;
+}
+
+/**
+ * Sound Card for computers: Windows.WindowsSound, Unix.SoundCards (=PciCards), macOS (MacAudio)
+ **/
+message SoundCard {
+  optional string caption = 1;                  // Windows, Linux(name), Mac (name)
+  optional string device_id = 2;                // Windows, Linux
+  optional string manufacturer = 3;             // Windows, Linux, mac(coreaudio_device_manufacturer)
+
+  optional string type = 4;                     // Linux
+  optional string subsystem_name = 5;           // Linux
+  optional string subsystem_manufacturer = 6;   // Linux
+  optional string parent = 7;                   // Linux
+
+  optional string input_source = 8; // macOS
+  optional string output_source = 9; // macOS
+  optional string device_srate = 10; // macOS
+  optional string device_trasport = 11; // macOS
+
+  optional bool default_input_device = 12; // macOS
+  optional bool default_output_device = 13; // macOS
+  optional bool default_system_device = 14; // macOS
+}
+
+/**
+ * Graphics Card for computers: Windows.VideoControllers, Unix.SoundCards (=PciCards)
+ **/
+message GraphicsCard {
+  optional	string	name = 1; //	Windows, Linux
+  optional	int32	color_planes_count = 2; //		Windows
+  optional	int32	current_bits_per_pixel = 3; //		Windows
+  optional	int32	current_horizontal_resolution = 4; //		Windows
+  optional	int64	current_number_of_colors = 5; //		Windows
+  optional	int32	current_refresh_rate = 6; //		Windows
+  optional	MappedValue	current_scan_mode = 7; //		Windows
+  optional	int32	current_vertical_resolution = 8; //		Windows
+  optional	string	device_id = 9; //		Windows, Linux
+  optional	int32	device_specific_pens = 10; //		Windows
+  optional	string	driver_version = 11; //		Windows
+  optional	string	inf_filename = 12; //		Windows
+  optional	string	inf_section = 13; //		Windows
+  optional	string	installed_display_drivers = 14; //		Windows
+  optional	bool	is_monochrome = 15; //		Windows
+  optional	string	manufacturer = 16; //		Windows, Linux
+  optional	int32	max_refresh_rate = 17; //		Windows
+  optional	int64	memory = 18; //		Windows
+  optional	MappedValue	memory_type = 19; //		Windows
+  optional	int32	min_refresh_rate = 20; //		Windows
+  optional	string	pci_type = 21; //		Linux
+  optional	string	pnp_device_id = 22; //		Windows
+  optional	MappedValue	state = 23; //		Windows
+  optional	string	subsystem_manufacturer = 24; //		Linux
+  optional	string	subsystem_name = 25; //		Linux
+  optional	MappedValue	video_architecture = 26; //		Windows
+  optional	string	video_mode = 27; //		Windows
+  optional	string	video_processor = 28; //		Windows
+}
+
+/**
+ * BIOS for computers.
+ */
+message Bios {
+  oneof spec {
+    WindowsBios win = 1;
+    LinuxBios linux = 2;
+  }
+
+  // common fields summarized
+  optional string manufacturer = 100;
+  optional string version = 101;
+  optional google.protobuf.Timestamp release_date = 102;
+}
+
+/**
+ * Windows Bios from Windows.Bios
+ * WMI mappings from https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-bios
+ */
+message WindowsBios {
+  repeated MappedValue bios_characteristics = 2;
+  optional string caption = 3;
+  optional string current_language = 4;
+  optional int32 installable_languages = 5;
+  optional string manufacturer = 6;
+  optional string name = 7;
+  optional bool primary_bios = 8;
+  optional google.protobuf.Timestamp release_date = 9;
+  optional string serial_number = 10;
+  optional string smbios_bios_version = 11;
+  optional int32 smbios_major_version = 12;
+  optional int32 smbios_minor_version = 13;
+  optional bool smbios_present = 14;
+  optional string software_element_id = 15;
+  optional MappedValue software_element_state = 16;
+  optional string status = 17;
+  optional MappedValue target_operating_system = 18;
+  optional string version = 19;
+  repeated string bios_version = 20;
+}
+
+/**
+ * Bios for Unix/Linux: Unix.Bios
+ */
+message LinuxBios {
+  optional string version = 1; // e.g.: "Hyper-V UEFI Release v4.1"
+  optional string address = 2;
+  optional string vendor = 3;
+  optional int64 runtime_size = 4; // parsed from e.g. "64 kB"
+  optional int64 rom_size = 5;    // parsed from e.g. "64 kB"
+  optional google.protobuf.Timestamp release_date = 6;
+}
+
+/**
+* Computer Battery: Windows.WindowsBattery. Mac.Power battery messages.
+**/
+message ComputerBattery {
+  oneof spec {
+    WindowsComputerBattery win_battery = 1;
+    WindowsPortableBattery win_portable = 2;
+    MacComputerBattery mac_battery = 3;
+  }
+}
+
+/**
+* Computer Battery: Windows.WindowsBattery.
+* WMI MappedValue to be taken from: https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-battery
+**/
+message WindowsComputerBattery {
+  optional MappedValue availability = 1;
+  optional MappedValue battery_status = 2;
+  optional MappedValue chemistry = 3;
+  optional MappedValue design_capacity = 4;
+  optional string device_id = 5;
+  optional string name = 6;
+  repeated MappedValue power_management_capabilities = 7;
+  optional bool power_management_supported = 8;
+  optional string smart_battery_version = 9;
+  optional string status = 10;
+}
+
+/**
+* Windows PortableBattery: WindowsPortableBattery.
+* WMI MappedValue to be taken from: https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-portablebattery
+**/
+message WindowsPortableBattery {
+  optional int32 capacity_multiplier = 1;
+  optional MappedValue chemistry = 2;
+  optional int32 design_capacity = 3;
+  optional int64 design_voltage = 4;
+  optional string device_id = 5;
+  optional string location = 6;
+  optional string manufacture_date = 7;
+  optional string manufacturer = 8;
+  optional int32 max_battery_error = 9;
+  optional string name = 10;
+  optional string smart_battery_version = 11;
+}
+
+/**
+* Computer Battery: Mac.Power battery messages.
+**/
+message MacComputerBattery {
+  // from battery power
+  optional int32 disk_sleep_timer = 1;
+  optional int32 display_sleep_timer = 2;
+  optional int32 hibernate_mode = 3;
+  optional int32 prioritize_network_reachability_over_sleep = 4;
+  optional bool sleep_on_power_button = 5; // parse from: 'Yes'
+  optional int32 system_sleep_timer = 6;
+  optional bool wake_on_lan = 7;
+  optional int32 current_power_source = 8;
+  optional int32 high_power_mode = 9;
+  optional int32 low_power_mode = 10;
+  optional bool reduce_brightness = 11;
+
+  // from battery charge (parse booleans)
+  optional bool is_at_warn_level = 12;
+  optional bool is_fully_charged = 13;
+  optional bool is_charging = 14;
+  optional int32  state_of_charge = 15;
+
+  // from battery_health_info
+  optional int32 cycle_count = 16;
+  optional string health_status = 17;
+  optional string health_status_maximum_capacity = 18;
+
+  // from battery_model_info
+  optional string pcb_lot_code = 19;
+  optional string pack_lot_code = 20;
+  optional string cell_revision = 21;
+  optional string device_name = 22;
+  optional string firmware_version = 23;
+  optional string hardware_revision = 24;
+  optional string serial_number = 25;
+
+  optional bool battery_charger_connected = 26;
+  optional bool battery_is_charging = 27;
+}
+
+/**
+* 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
+  optional	string	bus	= 3; // 	"2:0:0:0"	Linux
+  repeated	MappedValue	capabilities	= 4; // 	"Supports writing, Random Access, Supports Removable Media" 	Windows
+  optional	string	cache_size	= 5; // 	"32 KB", "2048 KB"	Mac
+  optional	string	burn_support	= 6; // 	"DRDeviceSupportLevelUnsupported","Yes (Apple Shipping Drive)","Yes (Generic Drive Support)"	Mac
+  optional	string	cd_write	= 7; // 	"-R, -RW"	Mac
+  optional	string	dvd_write	= 8; // 	"-R, -RAM, -RW"	Mac
+  optional	string	read_dvd	= 9; // 	"yes"	Mac
+  optional	string	drive_path	= 10; // 	Windows: "H:" Linux: "/dev/sr0 (/dev/sg0)"	Windows, Linux
+  optional	string	firmware_version	= 11; // 	"RQ00","1.00"	Mac
+  optional	string	connection	= 12; // 	"ATAPI","USB"	Mac
+  optional	string	is_underrun_protection_enabled	= 13; // 	"yes"	Mac
+  optional	string	manufacturer	= 14; // 	Windows:"(Standard CD-ROM drives)",Linux:"NECVMWar"	Windows, Linux
+  optional	string	mount_point	= 15; // 		Linux
+  optional	string	write_strategies	= 16; // 	"CD-TAO, CD-SAO, CD-Raw, DVD-DAO"	Mac
+  optional	int32	scsi_bus	= 17; // 	7	Windows
+  optional	int32	scsi_logical_unit	= 18; // 	0	Windows
+  optional	int32	scsi_port	= 19; // 	0	Windows
+  optional	int32	scsi_target_id	= 20; // 	0	Windows
+  optional	string	media_burn_information = 21; // 	Mac
+}
+
+/**
+ * Motherboard for computers.
+ **/
+message Motherboard {
+  string name = 1; // Windows, Linux
+  repeated string	config_options = 2; // Windows
+  optional bool	is_hosting_board = 3; // Windows
+  optional bool	is_powered_on = 4; // Windows
+  optional string	location = 5; // Linux
+  optional string	manufacturer = 6; // Windows, Linux
+  optional string	serial_number = 7; // Windows, Linux
+  optional string	tag = 8; // Windows
+  optional string	type = 9; // Linux
+  optional string	version = 10; // Windows, Linux
+
+  repeated MotherboardDevice device = 12;
+}
+
+/**
+ * Motherboard device, available only on Windows atm.
+ **/
+message MotherboardDevice {
+  optional string	description = 1;
+  optional bool	enabled = 2;
+  optional string	tag = 3;
+  optional MappedValue type = 4;
+}
+
+/**
+ * Memory with summary fields and repeated entries.
+ **/
+message Memory {
+    int64 installed_size = 1;
+    repeated PhysicalMemory physical_memory = 2;
+    repeated MemoryArray memory_array = 3;
+    optional string global_ecc_state = 4; // macOS only
+    optional bool is_memory_upgradable = 5; // macOS only
+}
+
+/** MemoryEntry **/
+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, Mac, Linux
+    optional string	name= 10; //	Mac
+    optional string	part_number= 11; //	Windows, Mac
+    optional int32	position_in_row= 12; //	Windows
+    optional string	serial_number= 13; //	Windows, Mac, 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
+}
+
+/**
+ * ParallelPort, only Windows atm.
+ * WMI mappings at: https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-parallelport
+*/
+message ParallelPort {
+  optional string caption = 1;
+  optional MappedValue availability = 2;
+  optional MappedValue protocol_supported = 3;
+  optional MappedValue config_manager_error_code = 4;
+  optional string pnp_device_id = 5;
+  optional bool config_manager_user_config = 6;
+  optional bool os_auto_discovered = 7;
+  optional bool power_management_supported = 8;
+}
+
+/**
+ * SerialPort, only Windows atm.
+ * WMI mappings at: https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-serialport
+*/
+message SerialPort {
+  optional MappedValue availability = 1;
+  optional bool binary = 2;
+  optional string caption = 3;
+  optional string device_id = 4;
+  optional int32 max_baud_rate = 5;
+  optional int32 maximum_input_buffer_size = 6;
+  optional int32 maximum_output_buffer_size = 7;
+  optional bool os_auto_discovered = 8;
+  optional string pnp_device_id = 9;
+  optional string provider_type = 10;
+}
+
+/**
+ * PcmciaController, only Windows atm.
+ * WMI mappings at: https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-pcmciacontroller
+*/
+message PcmciaController {
+  optional string caption = 1;
+  optional MappedValue protocol_supported = 2;
+  optional MappedValue config_manager_error_code = 3;
+  optional bool config_manager_user_config = 4;
+  optional string device_id = 5;
+  optional string manufacturer = 6;
+}
+
+
+// Bluetooth Card. Only macOS, to be mapped from MacBluetooth inbound model
+message ComputerMacBluetooth {
+  optional string address = 1;
+  optional string firmware_version = 2;
+  optional bool discoverable = 3;
+  optional string chip_set = 4;
+  optional string product_id = 5;
+  optional bool controller_turned_on = 6;
+  optional string supported_services = 7;
+  optional string transport = 8;
+  optional string vendor_id = 9;
+  repeated BluetoothDevice devices_connected = 10;
+  repeated BluetoothDevice devices_not_connected = 11;
+}
+
+message BluetoothDevice {
+  optional string address = 1;
+  optional string firmware_version = 2;
+  optional string minor_type = 3;
+  optional string product_id = 4;
+  optional string rssi = 5;
+  optional string services = 6;
+  optional string vendor_id = 7;
+  optional string name = 8;
+}
+
+/**
+ * PortConnector, only Windows atm.
+ * WMI mappings at: https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-portconnector
+*/
+message PortConnector {
+  repeated MappedValue connector_type = 1;
+  optional string external_reference_designator = 2;
+  optional string internal_reference_designator = 3;
+  optional MappedValue port_type = 4;
+  optional string tag = 5;
+}
+
+/**
+ * ScsiController, only Windows atm.
+ * WMI mappings at: https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-scsicontroller
+*/
+message ScsiController {
+  optional MappedValue availability = 1;
+  optional string caption = 2;
+  optional string device_id = 3;
+  optional string driver_name = 4;
+  optional string manufacturer = 5;
+  optional MappedValue protocol_supported = 6;
+}
+
+/**
+ * ComputerSystemProduct, only Windows atm.
+ * WMI mappings at: https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-computersystemproduct
+*/
+message ComputerSystemProduct {
+  optional string identifying_number = 1;
+  optional string name = 2;
+  optional string uuid = 3;
+  optional string vendor = 4;
+  optional string version = 5;
+}
+
+/**
+ * ComputerSystemProduct, only Windows atm.
+ * WMI mappings at: https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-computersystem
+*/
+message WindowsComputerSystem {
+  optional MappedValue admin_password_status = 2;
+  optional bool automatic_reset_boot_option = 3;
+  optional bool automatic_reset_capability = 4;
+  optional MappedValue boot_option_on_limit = 5;
+  optional MappedValue boot_option_on_watch_dog = 6;
+  optional bool boot_rom_supported = 7;
+  optional string boot_up_state = 8;
+  optional MappedValue chassis_boot_up_state = 9;
+  optional int32 current_time_zone = 10;
+  optional bool daylight_in_effect = 11;
+  optional string description = 12;
+  optional string domain = 13;
+  optional MappedValue domain_role = 14;
+  optional MappedValue front_panel_reset_status = 15;
+  optional bool infrared_supported = 16;
+  optional MappedValue keyboard_password_status = 17;
+  optional string manufacturer = 18;
+  optional string name = 19;
+  optional string model = 20;
+  optional bool network_server_mode_enabled = 21;
+  optional int32 number_of_processors = 22;
+  optional int64 pause_after_reset = 23;
+  optional MappedValue power_on_password_status = 24;
+  optional MappedValue power_state = 25;
+  optional MappedValue power_supply_state = 26;
+  optional string primary_owner_name = 27;
+  optional MappedValue reset_capability = 28;
+  optional int32 reset_count = 29;
+  optional int32 reset_limit = 30;
+  repeated string roles = 31;
+  optional string status = 32;
+  optional int32 system_startup_delay = 33;
+  repeated string system_startup_options = 34;
+  optional string system_type = 36;
+  optional MappedValue thermal_state = 37;
+  optional int64 total_physical_memory = 38;
+  optional MappedValue wakeup_type = 39;
+  optional bool enable_daylight_savings_time = 40;
+  optional bool part_of_domain = 41;
+  optional int32 number_of_logical_processors = 42;
+}
+
+/**
+ * TrustedPlatformModule, only Windows atm.
+ * WMI mappings at: https://learn.microsoft.com/en-us/windows/win32/secprov/win32-tpm
+*/
+message TrustedPlatformModule {
+  optional bool is_initial_value_activated = 1;
+  optional bool is_initial_value_enabled = 2;
+  optional bool is_initial_value_owned = 3;
+  optional string spec_version = 4;
+  optional string manufacturer_version = 5;
+  optional string manufacturer_version_info = 6;
+
+  /**
+    This integer value can be translated to a string value by interpreting each byte as an ASCII character.
+    For example, an integer value of 1414548736 can be divided into these 4 bytes: 0x54, 0x50, 0x4D, and 0x00.
+    Assuming the string is interpreted from left to right, this integer value translated to a string value of "TPM".
+   */
+  optional string manufacturer_id = 7;
+
+  optional string manufacturer_version_full20 = 8;
+  optional string manufacturer_id_txt = 9;
+  optional string physical_presence_version_info = 10;
+}
+
+/**
+ * ComputerConnectedUsbController, Windows and macOS.
+ * WMI mappings at: https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-usbcontroller
+*/
+message ComputerConnectedUsbController {
+  optional string caption = 1;
+  optional string device_id = 2;
+  optional string manufacturer = 3;
+  optional MappedValue protocol_supported = 4;
+
+  oneof controller {
+    MacUSBController mac_usb_controller = 5;
+    MacThunderboltController mac_thunderbolt_controller = 6;
+  }
+}
+
+message MacUSBController {
+  optional string name = 1;
+  optional string host_controller_driver = 2;
+  optional string pci_device_id = 3;
+  optional string pci_revision_id = 4;
+  optional string pci_vendor_id = 5;
+  repeated MacUSBDevice devices = 6;
+}
+
+message MacUSBDevice {
+  optional string name = 1;
+  optional string bcd_device_version = 2;
+  optional bool built_in_device = 3;
+  optional string bus_power_available = 4;
+  optional string bus_power_used = 5;
+  optional string device_speed = 6;
+  optional string extra_current_used = 7;
+  optional string location_id = 8;
+  optional string manufacturer = 9;
+  optional string product_id = 10;
+  optional string serial_number = 11;
+  optional string vendor_id = 12;
+  repeated MacUSBDevice sub_devices = 13;
+}
+
+message MacThunderboltController {
+  optional string name = 1;
+  optional string device_name = 2;
+  optional string domain_uuid = 3;
+  optional string route_string = 4;
+  optional string switch_uid = 5;
+  optional string switch_version = 6;
+  optional string vendor_name = 7;
+  repeated ThunderboltPort ports = 8;
+  optional string device_id = 9;
+  optional string device_revision = 10;
+  optional string vendor_id = 11;
+}
+
+message ThunderboltPort {
+  optional string current_link_width = 1;
+  optional string current_speed = 2;
+  optional string link_status = 3;
+  optional string receptacle_id = 4;
+  optional string receptacle_status = 5;
+  optional string cable_firmware_version = 6;
+  optional string cable_serial_number = 7;
+  optional string link_controller_firmware_version = 8;
+}
+
+message ComputerLinuxBasicInfo {
+  optional bool is_dmidecode_available = 1;
+  optional bool is_sudo_available = 2;
+  optional string dmi_decode_path = 3;
+  optional bool is_hal_available = 4;
+  optional bool is_tty_required = 5;
+  repeated LinuxCommandInformation command_information = 6;
+}
+
+message LinuxCommandInformation {
+  optional string command = 1;
+  optional bool is_command_available = 2;
+  optional bool is_sudo_available = 3;
+  optional string command_path = 4;
+}
+
+/**
+ * Windows only atm.
+ */
+message ComputerConnectedUsbDeviceInfo {
+  string device_key = 1;
+  string device_value = 2;
+  string manufacturer = 3;
+  optional string pnp_device_id = 4;
+  optional string pnp_class = 5;
+  optional string status = 6;
+  optional string service = 7;
+  optional string caption = 8;
+  optional string description = 9;
+  optional bool present = 10;
+}
+
+/**
+ * Modem on computers: windows and mac.
+ */
+message ComputerConnectedModem {
+  optional string attached_to = 1;
+  optional string caption = 2;              // mac: name
+  optional string country_info = 3;         // windows: country_selected, mac: country_info     
+  optional string device_id = 4;
+  optional string device_type = 5;          // mac: interface_type
+  optional int32 max_baud_rate_to_phone = 6;
+  optional int32 max_baud_rate_to_serial_port = 7;
+  optional string modem_inf_path = 8;
+  optional string modem_inf_section = 9;
+  optional string provider_name = 10;
+
+  optional string hw_version = 11;          // mac only
+  optional string interface_type = 12;      // mac only
+  optional string model = 13;               // mac only
+  optional string modulation = 14;          // mac only
+}
+
+/**
+ * Windows computer: a Printer connected to the computer.
+ */
+message ComputerConnectedPrinter {
+  repeated string capability_descriptions = 2;
+  optional string caption = 3;
+  optional string device_id = 4;
+  optional string location = 6;
+  optional string port_name = 7;
+  optional string print_job_data_type = 8;
+  optional string print_processor = 9;
+  optional string share_name = 10;
+  optional string status = 11;
+  optional string comment = 13;
+
+  optional int32 horizontal_resolution = 5;
+  optional int32 vertical_resolution = 12;
+
+  optional bool enable_bidi = 14;
+  optional bool local = 15;
+  optional bool network = 16;
+}
+
+/**
+ * Windows computer: a Tape connected to the computer.
+ */
+message ComputerConnectedTapeDrive {
+  optional MappedValue availability = 1;
+  repeated MappedValue capabilities = 2;
+  optional string caption = 3;
+  optional bool compression = 4;
+  optional int64 default_block_size = 5;
+  optional string device_id = 6;
+  optional string manufacturer = 7;
+  optional int64 max_block_size = 8;
+  optional int64 max_media_size = 9;
+  optional int32 max_partition_count = 10;
+  optional string media_type = 11;
+  optional int64 min_block_size = 12;
+  optional bool needs_cleaning = 13;
+  optional int32 number_of_media_supported = 14;
+  optional int32 padding = 15;
+}
+
+/**
+ * Computer, Windows only Serial info. Mapped from
+ */
+message ComputerWindowsSerial {
+  optional string product_name = 1;
+  optional string product_id = 2;
+  optional string product_serial = 3;
+}
+
+/**
+ * Computer Windows only: environment variables.
+ */
+message ComputerWindowsEnvironment {
+  optional string caption = 1;
+  optional string name = 2;
+  optional bool system_variable = 3;
+  optional string user_name = 4;
+  optional string variable_value = 5;
+}
+
+/**
+ * Computer Windows only: from WindowsComApplication, WindowsDcomApplication, WindowsComponentCategory.
+ */
+message ComputerWindowsComApp {
+  optional string app_id = 1;
+  optional string caption = 2;
+}
+
+/**
+ * Linux only, all cards are aggregated in a single source.
+ */
+message ComputerLinuxPcieCard {
+  optional string device_id = 1;
+  optional string type = 2;
+  optional string name = 3;
+  optional string manufacturer = 4;
+  optional string subsystem_name = 5;
+  optional string subsystem_manufacturer = 6;
+  optional string parent = 7;
+}
+
+/**
+ * Computer Windows only: from Windows Codec.
+ */
+message ComputerWindowsCodec {
+  optional bool archive = 1;
+  optional string caption = 2;
+  optional bool compressed = 3;
+  optional string compression_method = 4;
+  optional string description = 5;
+  optional string drive = 6;
+  optional bool encrypted = 7;
+  optional string encryption_method = 8;
+  optional string extension = 9;
+  optional string file_name = 10;
+  optional int64 file_size = 11;
+  optional string file_type = 12;
+  optional string fs_name = 13;
+  optional string group = 14;
+  optional bool hidden = 15;
+  optional google.protobuf.Timestamp install_date = 16;
+  optional string manufacturer = 17;
+  optional string status = 18;
+  optional bool system = 19;
+  optional string version = 20;
+}
+
+/**
+ * Computer Windows only: windows SAT, performance scores .
+ */
+message ComputerWindowsSat {
+  optional string time_taken = 1;
+  optional double win_spr_level = 2;
+  optional uint32 win_sat_assessment_state = 3;
+  optional double memory_score = 4;
+  optional double cpu_score = 5;
+  optional double disk_score = 6;
+  optional double d3d_score = 7;
+  optional double graphics_score = 8;
+}
+
+
+/**
+ * Computer, Windows only Certificate.
+ */
+message ComputerWindowsCertificate {
+
+  enum KeyUsageType {
+    DIGITAL_SIGNATURE = 0;
+    NON_REPUDIATION = 1;
+    KEY_ENCIPHERMENT = 2;
+    DATA_ENCIPHERMENT = 3;
+    KEY_AGREEMENT = 4;
+    KEY_CERT_SIGN = 5;
+    CRL_SIGN = 6;
+    ENCIPHER_ONLY = 7;
+    DECIPHER_ONLY = 8;
+  }
+
+  repeated WindowsCertificateEnhancedKeyUsage enhanced_key_usage = 1;
+  repeated KeyUsageType key_usage = 2;
+  string template = 3;
+  string dns_name_list = 4;
+  optional string signature_algorithm = 5;
+  int32 version = 6;
+  bool has_private_key = 7;
+  bool is_archived = 8;
+  google.protobuf.Timestamp expiration_date = 9;
+  google.protobuf.Timestamp start_date = 10;
+  string issuer_name = 11;
+  string issuer = 12;
+  string subject_alternative_name = 13;
+  string subject_name = 14;
+  string subject = 15;
+  string serial = 16;
+  string thumbprint = 17;
+  string friendly_name = 18;
+  repeated WindowsCertificateLocation location = 19;
+}
+
+message WindowsCertificateEnhancedKeyUsage {
+  optional string oid_name = 1;
+  optional string oid_value = 2;
+}
+
+message WindowsCertificateLocation {
+  string store = 1;
+  string folder = 2;
+}
+
+// macOS Camera / Webcam
+message ComputerMacCamera {
+  optional string name = 1;
+  optional string model_id = 2;
+  optional string unique_id = 3;
+}
+
+// macOS Language and Regional Settings, macOS only. To be mapped from inbound model: MacRegional
+message ComputerMacRegionalSettings {
+  optional MacRegionalUserSettings user_settings = 1;
+  optional MacRegionalSystemSettings system_settings = 2;
+  optional MacRegionalRecoveryOsSettings recovery_os_settings = 3;
+}
+
+message MacRegionalUserSettings {
+  repeated string linguistic_data_assets_requested = 1;
+  optional string user_assistant_language = 2;
+  optional string user_assistant_voice_language = 3;
+  optional string user_calendar = 4;
+  optional string user_country_code = 5;
+  optional string user_current_input_source = 6;
+  optional string user_language_code = 7;
+  optional string user_locale = 8;
+  repeated string user_preferred_interface_languages = 9;
+  optional string user_temperature_unit = 10;
+  optional string user_uses_metric_system = 11;
+}
+
+message MacRegionalSystemSettings {
+  optional string system_country = 1;
+  repeated string system_interface_languages = 2;
+  repeated string system_languages = 3;
+  optional string system_locale = 4;
+  optional string system_text_direction = 5;
+  optional string system_uses_metric_system = 6;
+}
+
+message MacRegionalRecoveryOsSettings {
+  optional string boot_keyboard_code = 1;
+  optional string boot_locale = 2;
+}
+
+/**
+ * Computer Windows only: page files.
+ */
+message ComputerWindowsPageFile {
+  oneof page_file {
+    WindowsSinglePageFile single = 1;
+    WindowsPageFileCombinedData combined = 2;
+  }
+}
+
+message WindowsSinglePageFile {
+  optional bool archive = 1;
+  optional string caption = 2;
+  optional google.protobuf.Timestamp creation_date = 3;
+  optional uint64 file_size = 4;
+  optional bool hidden = 5;
+  optional uint32 initial_size = 6;
+  optional google.protobuf.Timestamp install_date = 7;
+  optional google.protobuf.Timestamp last_accessed = 8;
+  optional google.protobuf.Timestamp last_modified = 9;
+  optional uint32 maximum_size = 10;
+  optional string name = 11;
+  optional string path = 12;
+  optional bool readable = 13;
+  optional bool system = 14;
+  optional bool writeable = 15;
+}
+
+/* Section element for ethernet hardware info on Mac */
+message ComputerMacEthernet {
+  optional string name = 1;
+  optional string bsd_device_name = 2;
+  optional bool avb_support = 3;
+  optional string bus = 4;
+  optional string device_id = 5;
+  optional string driver = 6;
+  optional string mac_address = 7;
+  optional string max_link_speed = 8;
+  optional string pcie_link_speed = 9;
+  optional uint32 pcie_link_width = 10;
+  optional string revision_id = 11;
+  optional string subsystem_id = 12;
+  optional string subsystem_vendor_id = 13;
+  optional string vendor_id = 14;
+}
+
+message WindowsPageFileCombinedData {
+  repeated WindowsPageFileUsage page_file_usages = 1;
+  repeated WindowsPageFileSetting page_file_settings = 2;
+}
+
+message WindowsPageFileSetting {
+  optional string caption = 1;
+  optional string description = 2;
+  optional uint32 initial_size = 3;
+  optional uint32 maximum_size = 4;
+  optional string name = 5;
+  optional string setting_id = 6;
+}
+
+message WindowsPageFileUsage {
+  optional uint32 allocated_base_size = 1;
+  optional string caption = 2;
+  optional uint32 current_usage = 3;
+  optional string description  = 4;
+  optional google.protobuf.Timestamp install_date = 5;
+  optional string name = 6;
+  optional uint32 peak_usage = 7;
+  optional string status = 8;
+  optional bool temp_page_file = 9;
+}
+
+
+/**
+ * Computer, Windows only.
+ */
+message ComputerWindowsDesktop {
+  optional int32 border_width = 1;
+  optional bool cool_switch = 2;
+  optional int32 cursor_blink_rate = 3;
+  optional bool drag_full_windows = 4;
+  optional int32 grid_granularity = 5;
+  optional int32 icon_spacing = 6;
+  optional string icon_title_facename = 7;
+  optional int32 icon_title_size = 8;
+  optional bool icon_title_wrap = 9;
+  optional string name = 10;
+  optional string pattern = 11;
+  optional bool screensaver_active = 12;
+  optional string screensaver_executable = 13;
+  optional bool screensaver_secure = 14;
+  optional int32 screensavertimeout = 15;
+  optional string wallpaper = 16;
+  optional bool wallpaper_stretched = 17;
+  optional bool wallpaper_tiled = 18;
+}
+
+/**
+ * Computer, Windows only: from WindowsDisplayConfig.
+ */
+message ComputerWindowsDisplay {
+  optional int32 bits_per_pel = 1;
+  optional string caption = 2;
+  optional string device_name = 3;
+  optional int32 display_flags = 4;
+  optional int32 display_frequency = 5;
+  optional string driver_version = 6;
+  optional int32 log_pixels = 7;
+  optional int32 pels_height = 8;
+  optional int32 pels_width = 9;
+  optional int32 specification_version = 10;
+}
+
+/**
+ * Computer, Windows only.
+ */
+message ComputerWindowsDesktopMonitor {
+  optional MappedValue availability = 1;
+  optional string caption = 2;
+  optional string device_id = 3;
+  optional string monitor_manufacturer = 4;
+  optional uint32 pixels_per_x_logical_inch = 5;
+  optional uint32 pixels_per_y_logical_inch = 6;
+  optional string pnp_device_id = 7;
+  optional uint32 screen_height = 8;
+  optional uint32 screen_width = 9;
+}
+
+// Preference Panes, macOS only. To be mapped from inbound model: MacPreferencePanes
+message ComputerMacPreferencePane {
+  optional string name = 1;
+  optional string bundle_path_location = 2;
+  optional string identifier = 3;
+  optional bool is_visible = 4;
+  optional string kind = 5;
+  optional string supported_by = 6;
+  optional string version = 7;
+}
+
+// Card Reader, macOS Only. To be mppaer from MacCardReader inbound model
+message ComputerMacCardReader {
+  optional string device_id = 1;
+  optional string link_speed = 2;
+  optional string link_width = 3;
+  optional string revision_id = 4;
+  optional string subsystem_id = 5;
+  optional string subsystem_vendor_id = 6;
+  optional string vendor_id = 7;
+}
+
+/**
+ * Computer, Windows only: from WindowsDisplayControllerConfig.
+ */
+message ComputerWindowsDisplayController {
+  optional int32 bits_per_pixel = 1;
+  optional string caption = 2;
+  optional uint32 color_planes = 3;
+  optional uint32 device_entries_in_a_color_table = 4;
+  optional uint32 device_specific_pens = 5;
+  optional uint32 horizontal_resolution = 6;
+  optional string name = 7;
+  optional int32 refresh_rate = 8;
+  optional uint32 vertical_resolution = 9;
+  optional string video_mode = 10;
+}
+
+/**
+ * Computer Windows only: from WindowsNetworkClient.
+ */
+message ComputerWindowsNetworkClient {
+  optional string caption = 1;
+  optional string description = 2;
+  optional string manufacturer = 3;
+  optional string name = 4;
+}
+
+
+/**
+ * Computer Windows only: from WindowsIdeController.
+ * WMI mappings from: https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-idecontroller
+ */
+message ComputerWindowsIdeController {
+  optional string caption = 1;
+  optional string device_id = 2;
+  optional string manufacturer = 3;
+  optional MappedValue protocol_supported = 4;
+}
+
+/**
+ * Computer Windows only: from WindowsDiskPartition.
+ * As per spec: https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-diskpartition
+ */
+message ComputerWindowsDiskPartition {
+  optional int64 block_size = 1;
+  optional bool bootable = 2;
+  optional bool boot_partition = 3;
+  optional string device_id = 4;
+  optional int32 disk_index = 5;
+  optional int32 index = 6;
+  optional int64 number_of_blocks = 7;
+  optional bool primary_partition = 8;
+  optional int64 size = 9;
+  optional int64 starting_offset = 10;
+  optional string type = 11;
+}
+
+/**
+ * Computer Windows only: from WindowsFloppy. Mapped in LEC adapter to DiskDrive.
+ */
+message ComputerWindowsFloppy {
+  optional uint32 bytes_per_sector = 2;
+  optional string description = 3;
+  optional string interface_type = 4;
+  optional string manufacturer = 5;
+  optional string model = 6;
+  optional string name = 7;
+  optional uint32 partitions = 8;
+  optional string pnp_device_id = 9;
+  optional uint32 sectors_per_track = 10;
+  optional int64 size = 11;
+  optional int64 total_cylinders = 12;
+  optional uint32 total_heads = 13;
+  optional int64 total_sectors = 14;
+  optional int64 total_tracks = 15;
+  optional uint32 tracks_per_cylinder = 16;
+  optional string device_id = 17;
+  optional string status = 18;
+  optional string firmware_revision = 19;
+  optional string serial_number = 20;
+}
+
+/**
+ * PortableBattery, only Windows atm.
+ * WMI mappings at: https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-portablebattery
+*/
+message PortableBattery {
+  optional int32 capacity_multiplier = 1;
+  optional MappedValue chemistry = 2;
+  optional int32 design_capacity = 3;
+  optional int64 design_voltage = 4;
+  optional string device_id = 5;
+  optional string location = 6;
+  optional string manufacture_date = 7;
+  optional string manufacturer = 8;
+  optional int32 max_battery_error = 9;
+  optional string name = 10;
+  optional string smart_battery_version = 11;
+}
+
+// MacOS Frameworks system library. To be mapped from MacFramework inbound model
+message ComputerMacOsFramework {
+  optional string name = 1;
+  optional string arch_kind = 2;
+  optional string info = 3;
+  optional google.protobuf.Timestamp last_modified = 4;
+  optional string obtained_from = 5;
+  optional string path_location = 6;
+  optional string private_framework = 7;
+  repeated string signed_by = 8;
+  optional string version = 9;
+}
+
+// macOS Printer Software. To be mapped from MacPrinterSoftware
+message MacPrinterSoftwareItem {
+  optional string info_path = 1;
+  optional string info_version = 2;
+}
+
+/**
+ * A Mapped value is a numeric field that can optionally have a text looked up value.
+ * Typical in WMI fields.
+ */
+message MappedValue {
+  int64 value = 1;
+  optional string name = 2;
+}
+
+/* Monitor Inventory with list of connected monitors */
+message MonitorInventory {
+  google.protobuf.Timestamp timestamp = 1;
+  repeated Monitor monitor = 2;
+}
+
+
+/* Monitor definition: normalized and with link to raw */
+message Monitor {
+  // catalog id of: CatalogMonitor
+  optional int64 id = 1;
+
+  // catalog id of: CatalogBrand
+  optional int64 make_id = 2;
+
+  string make_name = 3;
+  string model_name = 4;
+
+  optional string serial_number = 5;
+  google.protobuf.Timestamp manufacturer_date = 6;
+
+  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 {
+  string model = 1;
+  optional string pnp_device_id = 2;
+  optional string serial_number = 3;
+  optional string serial_hex = 4;
+  optional string vesa_manufacturer = 5;
+  optional string key_manufacturer = 6;
+  optional google.protobuf.Timestamp manufacturer_date = 7;
+  optional string device_id = 8;
+}
+
+// Section element for Wi-Fi (AirPort) info on Mac. To be mapper from MacWifi from inbound model
+message ComputerMacWifiController {
+  repeated WiFiInterface airport_interfaces = 1;
+  optional WiFiSoftware software_information = 2;
+}
+
+message WiFiInterface {
+  optional string name = 1;
+  optional string airdrop_channel = 2;
+  optional bool airdrop_supported = 3;
+  optional bool auto_unlock_supported = 4;
+  optional string card_type = 5;
+  optional string country_code = 6;
+  optional string firmware_version = 7;
+  optional string locale = 8;
+  optional string mac_address = 9;
+  optional string status_information = 10;
+  repeated string supported_channels = 11;
+  optional string supported_phy_modes = 12;
+  optional bool wake_on_wireless_supported = 13;
+  optional WiFiNetwork current_network = 14;
+  repeated WiFiNetwork other_local_networks = 15;
+}
+
+message WiFiNetwork {
+  optional string name = 1;
+  optional string network_bssid = 2;
+  optional string network_channel = 3;
+  optional string network_country_code = 4;
+  optional string network_mcs_index = 5;
+  optional string network_phy_mode = 6;
+  optional string network_transmit_rate = 7;
+  optional string network_type = 8;
+  optional string security_mode = 9;
+  optional string signal_noise = 10;
+}
+
+message WiFiSoftware {
+  optional string airport_utility_version = 1;
+  optional string core_wlan_version = 2;
+  optional string core_wlan_kit_version = 3;
+  optional string diagnostics_version = 4;
+  optional string io80211_family_version = 5;
+  optional string menu_extra_version = 6;
+  optional string system_information_version = 7;
+}
+
+/**
+ 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)
+}
+
+/**
+ * Internet IP info, if external_ip is present and valid.
+ */
+message IpInfo {
+  string address = 1;
+  optional string hostname = 2;
+  optional string timezone = 3;
+  optional string continent_code = 4;
+  optional string country_code = 5;
+  optional string region_code = 6;
+  optional string country_city = 7;
+  optional string isp = 8;
+  optional string organization = 9;
+}
+
+/**
+ * Software Inventory with list of installed SW.
+ * Sources:
+ *  - com.lansweeper.discovery.sensor.windows.v1.WindowsSoftwareInfo: section on Windows WMI/Local/SCCM
+ *  - com.lansweeper.discovery.sensor.mac.v1.MacSoftware: section on Mac via SSH or local
+ *  - com.lansweeper.discovery.sensor.unix.v1.Software: section Linux/Unix via SSH or local
+ */
+message SoftwareInventory {
+  google.protobuf.Timestamp timestamp = 1;
+  repeated Software software = 2;
+  reserved 3; // depcrecated software change event log
+}
+
+
+
+/**
+ * Software definition: normalized and with link to raw.
+ * Translated and enriched from:
+ *  - com.lansweeper.discovery.sensor.windows.v1.SoftwareInfo
+ *  - com.lansweeper.discovery.sensor.mac.v1.Software
+ *  - com.lansweeper.discovery.sensor.unix.v1.SoftwareEntry
+ */
+message Software {
+
+  optional int32 rank = 1;
+  optional int64 type_id = 2;
+  optional int64 cat_id = 3;
+
+  // catalog id of: CatalogBrand
+  optional int64 make_id = 4;
+
+  // catalog id of: CatalogSoftware
+  optional int64 sw_id = 5;
+
+  // catalog id of: CatalogSoftware
+  optional int64 parent_id = 6;
+
+  optional string type_name = 7;
+  optional string cat_name = 8;
+  optional string make_name = 9;
+  optional string name = 10;
+  optional string version = 11;
+  optional string market_ver = 12;
+  optional string edition = 13;
+  optional string build = 14;
+  optional string arch = 20;
+  optional string lang = 21;
+  optional string obtained_from = 22;
+  repeated string signed_by = 23;
+
+  optional string cpe = 15;
+
+  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;
+}
+
+/**
+ * Raw Software definition, as mapped from Windows, Mac, Linux.
+ */
+message RawSoftware {
+  string name = 1;
+
+  optional string vendor = 2;
+  optional string version = 3;
+  optional string info = 4;
+  optional string exe_path = 5;
+  optional string arch = 6; // when available the specific sw arch
+  optional google.protobuf.Timestamp install_date = 7;
+  optional string source_type = 8; // Registry | System | MsStore | Package | Custom | etc
+
+  optional string sw_id = 9; // optional SW id on the client side
+
+  optional bool is_current_user = 10;
+}
+
+
+/**
+ * Log entry for software change log, tracking install, uninstall and update.
+ */
+message SoftwareChangeEvent {
+  enum EventType {
+    INSTALL = 0;
+    UNINSTALL = 1;
+    UPDATE = 2;
+  }
+
+  EventType event_type = 1;
+
+  google.protobuf.Timestamp start = 2;
+  optional google.protobuf.Timestamp end = 3;
+
+  Software software = 4;
+  optional Software prev_software = 5;
+
+}
+
+// macOS installation history - To be mapped from inbound entity: MacInstallHistory
+message ComputerMacInstallHistory {
+  optional string name = 1;
+  optional google.protobuf.Timestamp install_date = 2;
+  optional string install_version = 3;
+  optional string package_source = 4;
+}
+
+// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< CATALOG ENTITIES >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+message CatalogBrand {
+  int64  id = 1;
+  string make_name = 3;
+
+  optional int64 parent_id = 18;
+  optional google.protobuf.Timestamp last_update_time = 5;
+
+  optional string country_code = 6;
+  optional string logo_image_url = 7;
+  optional string banner_image_url = 8;
+  optional string wikipedia_id = 9;
+  optional string wikipedia_lang_code = 10;
+  optional string website_url = 11;
+  optional string support_url = 12;
+  optional string support_phone = 13;
+  optional string facebook_account = 14;
+  optional string twitter_account = 15;
+  optional string warranty_url = 16;
+  optional string warranty_direct_url = 17;
+  optional string community_url = 20;
+  optional string linkedin_account = 21;
+  optional string instagram_account = 22;
+  optional string youtube_account = 23;
+  optional string pinterest_account = 24;
+  optional string tiktok_account = 31;
+
+  optional bool class_hardware = 25;
+  optional bool class_software = 26;
+  optional bool class_consumer = 27;
+  optional bool class_enterprise = 28;
+  optional bool class_industrial = 29;
+  optional bool class_individual = 30;
+
+  optional int32 match_score = 19; // relevant only in search result
+}
+
+message CatalogModel {
+  int64 id = 1;
+
+  int64 make_id = 3;
+  string device_model = 4;
+
+  optional int64 device_type_id = 5;
+  repeated string device_model_code = 6;
+
+  optional int64 family_id = 10;
+  optional bool is_family = 11;
+  optional string manual_url = 12;
+  optional string faq_url = 13;
+  optional google.protobuf.Timestamp release_date = 14;
+  optional google.protobuf.Timestamp disc_date = 15;
+  optional google.protobuf.Timestamp eos_date = 26;
+  optional string lifecyle_confidence = 29;
+
+  optional string price_class = 24;
+  optional string product_class = 25;
+
+  optional int32 cfp_emissions = 30;
+  optional int32 cfp_emissions_std = 31;
+  optional int32 cfp_use = 32;
+
+  optional string sh_ifttt_handle = 17;
+  repeated string sh_google_ass_langs = 18;
+  repeated string sh_alexa_langs = 19;
+  optional string sh_hass_handle = 20;
+  optional bool   sh_apple_home_kit = 21;
+  optional string sh_open_hab_handle = 22;
+
+  optional string nist_cpe = 28;
+
+  optional int32 popularity = 23;
+
+  optional google.protobuf.Timestamp last_update_time = 16;
+
+  optional int32 match_score = 27; // filled only when a result of search
+}
+
+message CatalogOs {
+  int64 id = 1;
+
+  string os_name = 3;
+
+  optional string os_version = 4;
+  optional string os_build = 12;
+  optional string os_version_name = 5;
+
+  optional int64 override_id = 6;
+  optional int64 make_id = 7;
+  optional int64 parent_id = 8;
+
+  optional google.protobuf.Timestamp release_date = 9;
+  optional google.protobuf.Timestamp eol_date = 10;
+  optional google.protobuf.Timestamp eos_date = 22;
+  optional google.protobuf.Timestamp eosx_date = 25;
+  optional string lifecyle_confidence = 26;
+  optional string logo_image_url = 13;
+  optional string banner_image_url = 14;
+  optional string wikipedia_id = 15;
+  optional string wikipedia_lang_code = 16;
+  optional string website_url = 17;
+  optional string support_url = 18;
+  optional string support_phone = 19;
+  optional string facebook_account = 20;
+  optional string twitter_account = 21;
+
+  optional string nist_cpe = 23;
+
+  optional google.protobuf.Timestamp last_update_time = 11;
+
+  optional int32 match_score = 24; // filled only when a result of search
+}
+
+message CatalogSoftware {
+  int64 id = 1;
+  string sw_name = 2;
+
+  optional string sw_version = 3;
+  optional string sw_market_ver = 4;
+  optional string sw_edition = 5;
+  optional string sw_lang = 6;
+  optional string sw_build = 7;
+
+  optional int64 make_id = 8;
+  optional int64 parent_id = 9;
+  optional int64 latest_id = 10;
+
+  optional string sw_type = 11;
+  optional string sw_category = 12;
+
+  optional google.protobuf.Timestamp release_date = 13;
+  optional google.protobuf.Timestamp eol_date = 14;
+  optional google.protobuf.Timestamp eos_date = 15;
+  optional google.protobuf.Timestamp eosx_date = 16;
+  optional string lifecyle_confidence = 17;
+
+  optional bool flag_latest = 18;
+  optional bool flag_widespread = 19;
+  optional bool flag_deprecated = 20;
+
+  optional google.protobuf.Timestamp last_update_time = 21;
+
+  optional int32 match_score = 100; // filled only when a result of search
+}
+
+message CatalogMonitor {
+  int64  id = 1;
+
+  string model = 3;
+  optional string vendor_id = 4;
+  optional int64 make_id = 5;
+
+  optional int64 family_id = 6;
+  optional bool is_family = 7;
+  optional string official_page = 8;
+  optional string support_page = 9;
+
+  optional double size_inch = 10;
+  optional string max_resolution = 11;
+  optional string aspect_ratio = 12;
+  optional double response_time_ms = 13;
+  optional string hd_type = 14;
+  optional string display_tech = 15;
+  optional int32 refresh_rate = 16;
+  optional string panel = 17;
+  optional double height_cm = 18;
+  optional double width_cm = 19;
+  optional double diagonal_cm = 20;
+
+  optional string usb_upstream = 21;
+  optional int32 nr_usb_upstream = 22;
+  optional int32 nr_usb_type_a_downstream = 23;
+  optional int32 nr_hdmi = 24;
+  optional int32 nr_vga = 25;
+  optional int32 nr_dvi = 26;
+  optional double hdmi_version = 27;
+  optional int32 nr_display_ports = 28;
+  optional double display_port_version = 29;
+
+  optional string energy_class = 30;
+  optional int32 sdr_per_1000_u = 31;
+  optional double average_watt_usage = 32;
+  optional double max_watt_usage = 33;
+  optional double watt_usage_standby = 34;
+  optional double watt_power_save = 35;
+  optional string ac_voltage = 36;
+  optional string ac_freq_hz = 37;
+  optional double current_a = 38;
+
+  optional bool feature_aio = 39;
+  optional bool feature_camera = 40;
+  optional bool feature_speakers = 41;
+  optional bool feature_hdmi = 42;
+  optional bool feature_eth = 43;
+  optional bool feature_portrait = 44;
+  optional bool feature_curved = 45;
+
+  optional google.protobuf.Timestamp last_update_time = 46;
+
+  optional int32 match_score = 100; // filled only when a result of search
+
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+
+/**
+ * Printer details.
+ * Currently filled only from source SNMP.
+ */
+message Printer {
+  optional string printer_name = 1;
+  optional int64 printed_pages = 2;
+  optional int64 printed_color_pages = 3;
+  optional int64 printed_mono_pages = 4;
+  optional string printer_status = 5;
+  optional string serial_number = 6;
+  repeated PrinterTonerInfo toner = 7;
+}
+
+/**
+ * Printer details.
+ * Currently filled only from source SNMP.
+ */
+message PrinterTonerInfo {
+  optional string name = 1;
+  optional string color = 2;
+  optional MappedValue color_number = 3;
+  optional int64 maximum_toner_level = 4;
+  optional int64 number = 5;
+  optional int64 remaining_toner_level = 6;
+}
+
+/**
+ * UPS details.
+ * Currently filled only from source SNMP.
+ */
+message Ups {
+  optional string manufacturer = 1;
+  optional string model = 2;
+  optional string ups_software_version = 3;
+  optional string agent_software_version = 4;
+  optional string name = 5;
+  optional string attached_devices = 6;
+  optional int64 battery_status = 7;
+  optional int64 seconds_on_battery = 8;
+  optional int64 estimated_minutes_remaining = 9;
+  optional int64 estimated_charge_remaining = 10;
+  optional int64 battery_voltage = 11;
+  optional int64 battery_current = 12;
+  optional int64 battery_temperature = 13;
+  optional int64 alarms_present = 14;
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+
+/* User object */
+message User {
+  EntityPath id = 1;
+
+  google.protobuf.Timestamp last_synced = 2;
+  google.protobuf.Timestamp first_seen = 3;
+  google.protobuf.Timestamp last_updated = 4;
+  google.protobuf.Timestamp last_enriched = 5;
+
+  optional string last_synced_source_agent = 6;
+  optional string last_synced_source_name = 7;
+
+  repeated SourceInfo source_info = 8;
+  repeated SourceInfo unlinked_source_info = 9;
+
+  optional string unique_key = 10;
+
+  repeated ScanError scan_error = 11;
+
+  optional IpInfo internet_ip = 12; // Internet IP and related geo-location info, when available
+
+  repeated Tag tag = 13;
+  repeated Relation relation = 14; // e.g. relations to and from OT parent module to sub-modules
+
+  optional CorrelationFields correlation_fields = 15;
+  optional ReconciliationInfo reconciliation = 16;
+
+  // user info:
+  UserCoreFields core = 20;
+
+  optional ActiveDirectoryUser ad_user = 21;
+  // optional LastUser asset_user = 22; <- refine here with also link/relation to originating asset?
+}
+
+/* Core fields for users */
+message UserCoreFields {
+  optional string user_name = 1;
+  optional string upn = 2;
+  optional string sid = 3;
+  optional string email = 4;
+  //optional google.protobuf.Timestamp creation_time = 24;
+  //optional google.protobuf.Timestamp last_changed = 25;
+}
+
+/*  Group of entities, e.g. active directory group */
+message Group {
+  EntityPath id = 1;
+
+  google.protobuf.Timestamp last_synced = 2;
+  google.protobuf.Timestamp first_seen = 3;
+  google.protobuf.Timestamp last_updated = 4;
+  google.protobuf.Timestamp last_enriched = 5;
+
+  optional string last_synced_source_agent = 6;
+  optional string last_synced_source_name = 7;
+
+  repeated SourceInfo source_info = 8;
+  repeated SourceInfo unlinked_source_info = 9;
+
+  optional string unique_key = 10;
+
+  repeated ScanError scan_error = 11;
+
+  optional IpInfo internet_ip = 12; // Internet IP and related geo-location info, when available
+
+  repeated Tag tag = 13;
+  repeated Relation relation = 14; // e.g. relations to and from OT parent module to sub-modules
+
+  optional CorrelationFields correlation_fields = 15;
+  optional ReconciliationInfo reconciliation = 16;
+
+  // group info:
+  GroupCoreFields core = 20;
+
+  // .......................
+
+  optional ActiveDirectoryGroup ad_group = 21;
+}
+
+/* Core fields for groups */
+message GroupCoreFields {
+  optional string sid = 1;
+  optional string name = 2;
+}
+
+/**
+ * Common fields for any AD object.
+ */
+message ActiveDirectoryObject {
+  string domain_oid = 1;
+  string oid = 2;
+  string sid = 3;
+  string distinguished_name = 4;
+
+  optional string domain_dns = 5;
+  optional string name = 6;
+  optional string object_class = 7;
+
+  optional google.protobuf.Timestamp creation_time = 8;
+  optional google.protobuf.Timestamp last_changed = 9;
+}
+
+/**
+ * Computer in ActiveDirectory.
+ */
+message ActiveDirectoryComputer {
+
+  ActiveDirectoryObject ad_object = 1;
+
+  optional string sam_account_name = 2;
+  optional string cn = 3;
+  optional string ou = 4;
+  optional string description = 5;
+  optional string comment = 6;
+  optional string company = 7;
+  optional string location = 8;
+  optional string ip_address = 9;
+  optional bool enabled = 10;
+
+  optional string bitlocker_recovery_info = 11;
+  optional string operating_system = 12;
+  optional string operating_system_version = 13;
+
+  optional string managed_by_user_oid = 14;     // translated into relation
+  optional string managed_by_group_oid = 15;    // translated into relation
+}
+
+message ActiveDirectoryDomain {
+  ActiveDirectoryObject ad_object = 1;
+
+  optional int32 minimum_password_age = 2;  // in days
+  optional int32 maximum_password_age = 3;  // in days
+}
+
+/**
+ * User in ActiveDirectory.
+ */
+message ActiveDirectoryUser {
+  ActiveDirectoryObject ad_object = 1;
+  
+  optional string sam_account_name = 2;
+  optional string cn = 3;
+  optional string ou = 4;
+  optional string description = 5;
+  optional string comment = 6;
+  optional string company = 7;
+  optional int32 primary_group_id = 8;
+  optional bool enabled = 9;
+  optional int32 user_account_control = 10;
+  optional google.protobuf.Timestamp account_expires = 11;
+  optional google.protobuf.Timestamp lockout_time = 12;
+  optional google.protobuf.Timestamp password_last_set = 13;
+  optional google.protobuf.Timestamp last_logon = 14;
+  optional google.protobuf.Timestamp lockout_date = 15;
+  optional bool can_user_change_password = 16;
+  optional google.protobuf.Timestamp password_expiration_date = 17;
+  optional bool password_never_expires = 18;
+  optional bool password_required = 19;
+  optional google.protobuf.Timestamp password_changeable_date = 20;
+  optional string email = 21;
+  optional string display_name = 22;
+  optional string given_name = 23;
+  optional string surname = 24;
+  optional string telephone = 25;
+  optional string fac_simile = 26;
+  optional string mobile = 27;
+  optional string street_address = 28;
+  optional string city = 29;
+  optional string country = 30;
+  optional string department = 31;
+  optional string delivery_office_name = 32;
+  optional string country_abbreviation = 33;
+  optional string postal_code = 34;
+  optional string country_code = 35;
+  optional string principal_name = 36;
+  optional string title = 37;
+  optional string division = 38;
+  optional string info = 39;
+  optional string home_phone = 40;
+  optional string pager = 41;
+  optional string ip_phone = 42;
+  optional string home_page = 43;
+  optional string post_office_box = 44;
+  optional string state = 45;
+  optional string profile_path = 46;
+  optional string script_path = 47;
+  optional string home_directory = 48;
+  optional bytes thumbnail_photo = 49;
+  optional string employee_id = 50;
+  optional string employee_number = 51;
+  optional string employee_type = 52;
+  optional string initials = 53;
+  optional string middle_name = 54;
+
+  optional string primary_group_oid = 55;
+  optional string manager_oid = 56;
+  repeated string member_of_oid = 57;
+}
+
+/**
+ * User group in ActiveDirectory.
+ */
+message ActiveDirectoryGroup {
+  ActiveDirectoryObject ad_object = 1;
+
+  optional string sam_account_name = 2;
+  optional string cn = 3;
+  optional string ou = 4;
+  optional string description = 5;
+  optional string comment = 6;
+  optional int32 group_type = 7;
+  optional string email = 8;
+
+  optional string managed_by_user_oid = 9;
+  optional string managed_by_group_oid = 10;
+
+  repeated string member_of_oid = 11;
+}
+
+
+// ---------------------------------------------------------------------------------------------------------------------
+
+/**
+ * Configuration of rules for IP location.
+ */
+message IpLocationConfig {
+
+  string name = 1; // IP location name, to set when match
+
+  // Local IP Address filter
+  optional string local_ip_cidr = 2;
+  optional string local_ip_start = 3;
+  optional string local_ip_end = 4;
+
+  optional string source_id = 5; //  source id / name (optional in vNext, this was mandatory in LS-classic)
+
+  // Internet public rules: vNext new
+  optional string internet_ip_cidr = 6;
+  optional string internet_country_code = 7;
+  optional string internet_country_city = 8;
+
+}
+
+message SiteKey {
+  string site_id = 1;
+}
+
+enum ReconRuleId {
+  RECONCILE_BY_MAC = 0;
+  RECONCILE_BY_MAKE_MODEL_SERIAL = 1;
+  RECONCILE_BY_NETBIOS = 2;
+}
+
+/**
+  * Configuration of rules for reconciliation.
+  * Wraps a list of ReconRule, site specific.
+ */
+message ReconRuleSet {
+  repeated ReconRule recon_rules = 1;
+}
+
+/**
+  * Configuration of a single reconciliation rule.
+ */
+message ReconRule {
+  ReconRuleId id = 1; // ID of the rule
+  string name = 2; // Short name
+  string description = 3; // Description
+  int32 priority = 4; // Rule priority (0-100). Every rule has a default.
+  bool enabled = 5; // Whether the rule is enabled or not for the site.
+}
+
+// ---------------------------------------------------------------------------------------------------------------------