@lansweeper/data-platform-outbound-grpc 0.3.31 → 0.3.32

package/java.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.3.30",
+  "version": "0.3.31",
   "package": "com.lansweeper.dp.outbound.v1",
   "name": "outbound",
   "service": true

package/model/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.lansweeper.dp.outbound.v1</groupId>
         <artifactId>parent</artifactId>
-        <version>0.3.30</version>
+        <version>0.3.31</version>
     </parent>
 
     <artifactId>outbound-model</artifactId>

package/model/src/main/proto/outbound.proto

@@ -1143,6 +1143,7 @@ message SpecHardwareInfo {
   optional string bus_speed = 7;          // mac
   optional string boot_rom_version = 8;   // mac
   optional string smc_version_system = 9; // mac
+  optional string model_number = 10; // mac
 
 }
 
@@ -2102,7 +2103,7 @@ message SoundCard {
  * Graphics Card for computers: Windows.VideoControllers, Unix.SoundCards (=PciCards)
  **/
 message GraphicsCard {
-  optional	string	name = 1; //	Windows, Linux
+  optional	string	name = 1; //	Windows, Linux, MacOS
   optional	int32	color_planes_count = 2; //		Windows
   optional	int32	current_bits_per_pixel = 3; //		Windows
   optional	int32	current_horizontal_resolution = 4; //		Windows
@@ -2110,22 +2111,22 @@ message GraphicsCard {
   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	string	device_id = 9; //		Windows, Linux, MacOS
   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	string	manufacturer = 16; //		Windows, Linux, MacOS
   optional	int32	max_refresh_rate = 17; //		Windows
-  optional	int64	memory = 18; //		Windows
+  optional	int64	memory = 18; //		Windows, MacOS
   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_manufacturer = 24; //		Linux, MacOS
   optional	string	subsystem_name = 25; //		Linux
   optional	MappedValue	video_architecture = 26; //		Windows
   optional	string	video_mode = 27; //		Windows
@@ -3220,6 +3221,7 @@ message Monitor {
 
   oneof spec {
     WindowsMonitorInfo windows = 20;
+    MacMonitorInfo mac = 21;
   }
 
   // placeholder to be able to inject the catalog meta-data if/when needed
@@ -3239,6 +3241,30 @@ message WindowsMonitorInfo {
   optional string device_id = 8;
 }
 
+message MacMonitorInfo {
+  optional string name = 1;
+  optional string product_id = 2;
+  optional string serial_number = 3;
+  optional string vendor_id = 4;
+  optional string week = 5;
+  optional string year = 6;
+  optional string id = 7;
+  optional string pixels = 8;
+  optional string resolution = 9;
+  optional string ambient_brightness = 10;
+  optional string connection_type = 11;
+  optional string display_type = 12;
+  optional string is_main = 13;
+  optional string mirror = 14;
+  optional string is_online = 15;
+  optional string pixel_resolution = 16;
+  optional string core_image = 17;
+  optional string depth = 18;
+  optional string quartz_extreme = 19;
+  optional string device_type = 20;
+  optional string built_in = 21;
+}
+
 // Section element for Wi-Fi (AirPort) info on Mac. To be mapper from MacWifi from inbound model
 message ComputerMacWifiController {
   repeated WiFiInterface airport_interfaces = 1;

package/model/target/classes/outbound.proto

@@ -1143,6 +1143,7 @@ message SpecHardwareInfo {
   optional string bus_speed = 7;          // mac
   optional string boot_rom_version = 8;   // mac
   optional string smc_version_system = 9; // mac
+  optional string model_number = 10; // mac
 
 }
 
@@ -2102,7 +2103,7 @@ message SoundCard {
  * Graphics Card for computers: Windows.VideoControllers, Unix.SoundCards (=PciCards)
  **/
 message GraphicsCard {
-  optional	string	name = 1; //	Windows, Linux
+  optional	string	name = 1; //	Windows, Linux, MacOS
   optional	int32	color_planes_count = 2; //		Windows
   optional	int32	current_bits_per_pixel = 3; //		Windows
   optional	int32	current_horizontal_resolution = 4; //		Windows
@@ -2110,22 +2111,22 @@ message GraphicsCard {
   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	string	device_id = 9; //		Windows, Linux, MacOS
   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	string	manufacturer = 16; //		Windows, Linux, MacOS
   optional	int32	max_refresh_rate = 17; //		Windows
-  optional	int64	memory = 18; //		Windows
+  optional	int64	memory = 18; //		Windows, MacOS
   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_manufacturer = 24; //		Linux, MacOS
   optional	string	subsystem_name = 25; //		Linux
   optional	MappedValue	video_architecture = 26; //		Windows
   optional	string	video_mode = 27; //		Windows
@@ -3220,6 +3221,7 @@ message Monitor {
 
   oneof spec {
     WindowsMonitorInfo windows = 20;
+    MacMonitorInfo mac = 21;
   }
 
   // placeholder to be able to inject the catalog meta-data if/when needed
@@ -3239,6 +3241,30 @@ message WindowsMonitorInfo {
   optional string device_id = 8;
 }
 
+message MacMonitorInfo {
+  optional string name = 1;
+  optional string product_id = 2;
+  optional string serial_number = 3;
+  optional string vendor_id = 4;
+  optional string week = 5;
+  optional string year = 6;
+  optional string id = 7;
+  optional string pixels = 8;
+  optional string resolution = 9;
+  optional string ambient_brightness = 10;
+  optional string connection_type = 11;
+  optional string display_type = 12;
+  optional string is_main = 13;
+  optional string mirror = 14;
+  optional string is_online = 15;
+  optional string pixel_resolution = 16;
+  optional string core_image = 17;
+  optional string depth = 18;
+  optional string quartz_extreme = 19;
+  optional string device_type = 20;
+  optional string built_in = 21;
+}
+
 // Section element for Wi-Fi (AirPort) info on Mac. To be mapper from MacWifi from inbound model
 message ComputerMacWifiController {
   repeated WiFiInterface airport_interfaces = 1;

package/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/GraphicsCard.java

@@ -63,7 +63,7 @@ private static final long serialVersionUID = 0L;
   private volatile java.lang.Object name_ = "";
   /**
    * <pre>
-   *	Windows, Linux
+   *	Windows, Linux, MacOS
    * </pre>
    *
    * <code>optional string name = 1;</code>
@@ -75,7 +75,7 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   *	Windows, Linux
+   *	Windows, Linux, MacOS
    * </pre>
    *
    * <code>optional string name = 1;</code>
@@ -96,7 +96,7 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   *	Windows, Linux
+   *	Windows, Linux, MacOS
    * </pre>
    *
    * <code>optional string name = 1;</code>
@@ -322,7 +322,7 @@ private static final long serialVersionUID = 0L;
   private volatile java.lang.Object deviceId_ = "";
   /**
    * <pre>
-   *		Windows, Linux
+   *		Windows, Linux, MacOS
    * </pre>
    *
    * <code>optional string device_id = 9;</code>
@@ -334,7 +334,7 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   *		Windows, Linux
+   *		Windows, Linux, MacOS
    * </pre>
    *
    * <code>optional string device_id = 9;</code>
@@ -355,7 +355,7 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   *		Windows, Linux
+   *		Windows, Linux, MacOS
    * </pre>
    *
    * <code>optional string device_id = 9;</code>
@@ -671,7 +671,7 @@ private static final long serialVersionUID = 0L;
   private volatile java.lang.Object manufacturer_ = "";
   /**
    * <pre>
-   *		Windows, Linux
+   *		Windows, Linux, MacOS
    * </pre>
    *
    * <code>optional string manufacturer = 16;</code>
@@ -683,7 +683,7 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   *		Windows, Linux
+   *		Windows, Linux, MacOS
    * </pre>
    *
    * <code>optional string manufacturer = 16;</code>
@@ -704,7 +704,7 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   *		Windows, Linux
+   *		Windows, Linux, MacOS
    * </pre>
    *
    * <code>optional string manufacturer = 16;</code>
@@ -756,7 +756,7 @@ private static final long serialVersionUID = 0L;
   private long memory_ = 0L;
   /**
    * <pre>
-   *		Windows
+   *		Windows, MacOS
    * </pre>
    *
    * <code>optional int64 memory = 18;</code>
@@ -768,7 +768,7 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   *		Windows
+   *		Windows, MacOS
    * </pre>
    *
    * <code>optional int64 memory = 18;</code>
@@ -1005,7 +1005,7 @@ private static final long serialVersionUID = 0L;
   private volatile java.lang.Object subsystemManufacturer_ = "";
   /**
    * <pre>
-   *		Linux
+   *		Linux, MacOS
    * </pre>
    *
    * <code>optional string subsystem_manufacturer = 24;</code>
@@ -1017,7 +1017,7 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   *		Linux
+   *		Linux, MacOS
    * </pre>
    *
    * <code>optional string subsystem_manufacturer = 24;</code>
@@ -1038,7 +1038,7 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   *		Linux
+   *		Linux, MacOS
    * </pre>
    *
    * <code>optional string subsystem_manufacturer = 24;</code>
@@ -2455,7 +2455,7 @@ private static final long serialVersionUID = 0L;
     private java.lang.Object name_ = "";
     /**
      * <pre>
-     *	Windows, Linux
+     *	Windows, Linux, MacOS
      * </pre>
      *
      * <code>optional string name = 1;</code>
@@ -2466,7 +2466,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *	Windows, Linux
+     *	Windows, Linux, MacOS
      * </pre>
      *
      * <code>optional string name = 1;</code>
@@ -2486,7 +2486,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *	Windows, Linux
+     *	Windows, Linux, MacOS
      * </pre>
      *
      * <code>optional string name = 1;</code>
@@ -2507,7 +2507,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *	Windows, Linux
+     *	Windows, Linux, MacOS
      * </pre>
      *
      * <code>optional string name = 1;</code>
@@ -2524,7 +2524,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *	Windows, Linux
+     *	Windows, Linux, MacOS
      * </pre>
      *
      * <code>optional string name = 1;</code>
@@ -2538,7 +2538,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *	Windows, Linux
+     *	Windows, Linux, MacOS
      * </pre>
      *
      * <code>optional string name = 1;</code>
@@ -3051,7 +3051,7 @@ private static final long serialVersionUID = 0L;
     private java.lang.Object deviceId_ = "";
     /**
      * <pre>
-     *		Windows, Linux
+     *		Windows, Linux, MacOS
      * </pre>
      *
      * <code>optional string device_id = 9;</code>
@@ -3062,7 +3062,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *		Windows, Linux
+     *		Windows, Linux, MacOS
      * </pre>
      *
      * <code>optional string device_id = 9;</code>
@@ -3082,7 +3082,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *		Windows, Linux
+     *		Windows, Linux, MacOS
      * </pre>
      *
      * <code>optional string device_id = 9;</code>
@@ -3103,7 +3103,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *		Windows, Linux
+     *		Windows, Linux, MacOS
      * </pre>
      *
      * <code>optional string device_id = 9;</code>
@@ -3120,7 +3120,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *		Windows, Linux
+     *		Windows, Linux, MacOS
      * </pre>
      *
      * <code>optional string device_id = 9;</code>
@@ -3134,7 +3134,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *		Windows, Linux
+     *		Windows, Linux, MacOS
      * </pre>
      *
      * <code>optional string device_id = 9;</code>
@@ -3678,7 +3678,7 @@ private static final long serialVersionUID = 0L;
     private java.lang.Object manufacturer_ = "";
     /**
      * <pre>
-     *		Windows, Linux
+     *		Windows, Linux, MacOS
      * </pre>
      *
      * <code>optional string manufacturer = 16;</code>
@@ -3689,7 +3689,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *		Windows, Linux
+     *		Windows, Linux, MacOS
      * </pre>
      *
      * <code>optional string manufacturer = 16;</code>
@@ -3709,7 +3709,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *		Windows, Linux
+     *		Windows, Linux, MacOS
      * </pre>
      *
      * <code>optional string manufacturer = 16;</code>
@@ -3730,7 +3730,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *		Windows, Linux
+     *		Windows, Linux, MacOS
      * </pre>
      *
      * <code>optional string manufacturer = 16;</code>
@@ -3747,7 +3747,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *		Windows, Linux
+     *		Windows, Linux, MacOS
      * </pre>
      *
      * <code>optional string manufacturer = 16;</code>
@@ -3761,7 +3761,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *		Windows, Linux
+     *		Windows, Linux, MacOS
      * </pre>
      *
      * <code>optional string manufacturer = 16;</code>
@@ -3837,7 +3837,7 @@ private static final long serialVersionUID = 0L;
     private long memory_ ;
     /**
      * <pre>
-     *		Windows
+     *		Windows, MacOS
      * </pre>
      *
      * <code>optional int64 memory = 18;</code>
@@ -3849,7 +3849,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *		Windows
+     *		Windows, MacOS
      * </pre>
      *
      * <code>optional int64 memory = 18;</code>
@@ -3861,7 +3861,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *		Windows
+     *		Windows, MacOS
      * </pre>
      *
      * <code>optional int64 memory = 18;</code>
@@ -3877,7 +3877,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *		Windows
+     *		Windows, MacOS
      * </pre>
      *
      * <code>optional int64 memory = 18;</code>
@@ -4469,7 +4469,7 @@ private static final long serialVersionUID = 0L;
     private java.lang.Object subsystemManufacturer_ = "";
     /**
      * <pre>
-     *		Linux
+     *		Linux, MacOS
      * </pre>
      *
      * <code>optional string subsystem_manufacturer = 24;</code>
@@ -4480,7 +4480,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *		Linux
+     *		Linux, MacOS
      * </pre>
      *
      * <code>optional string subsystem_manufacturer = 24;</code>
@@ -4500,7 +4500,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *		Linux
+     *		Linux, MacOS
      * </pre>
      *
      * <code>optional string subsystem_manufacturer = 24;</code>
@@ -4521,7 +4521,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *		Linux
+     *		Linux, MacOS
      * </pre>
      *
      * <code>optional string subsystem_manufacturer = 24;</code>
@@ -4538,7 +4538,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *		Linux
+     *		Linux, MacOS
      * </pre>
      *
      * <code>optional string subsystem_manufacturer = 24;</code>
@@ -4552,7 +4552,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     *		Linux
+     *		Linux, MacOS
      * </pre>
      *
      * <code>optional string subsystem_manufacturer = 24;</code>