Merge pull request #24 from sfcompute/kenny/netbox-enhancements

Netbox Ingestify enhancements: Extended hardware data collection

Author: kennethdsheridan

Cargo.lock

@@ -26,6 +26,18 @@ toml = "0.8.19"
 libc = "0.2.161"
 tokio = { version = "1.0", features = ["full"] }
 async-trait = "0.1"
+# Requires Nvidia driver at runtime
+nvml-wrapper = { version = "0.11.0", optional = true}
+
+# Only compiled on x86/x86_64 targets
+[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]
+raw-cpuid = { version = "11", optional = true }
+
+[features]
+default = []
+nvidia = ["nvml-wrapper"]
+x86-cpu = ["raw-cpuid"]
+full = ["nvidia", "x86-cpu"]
 
 [dev-dependencies]
 tempfile = "3.8"   # For temporary file handling in tests

Cargo.toml

@@ -11,20 +11,20 @@
     "total_storage": "2.0 TB",
     "total_storage_tb": 1.81464035063982,
     "filesystems": [
-      "/dev/disk3s1s1 (apfs) - 1.9T total, 262G used, 1.6T available, mounted on /",
-      "/dev/disk3s6 (apfs) - 1.9T total, 262G used, 1.6T available, mounted on /System/Volumes/VM",
-      "/dev/disk3s2 (apfs) - 1.9T total, 262G used, 1.6T available, mounted on /System/Volumes/Preboot",
-      "/dev/disk3s4 (apfs) - 1.9T total, 262G used, 1.6T available, mounted on /System/Volumes/Update",
-      "/dev/disk1s2 (apfs) - 500M total, 19M used, 482M available, mounted on /System/Volumes/xarts",
-      "/dev/disk1s1 (apfs) - 500M total, 19M used, 482M available, mounted on /System/Volumes/iSCPreboot",
-      "/dev/disk1s3 (apfs) - 500M total, 19M used, 482M available, mounted on /System/Volumes/Hardware",
-      "/dev/disk3s7 (apfs) - 1.9T total, 262G used, 1.6T available, mounted on /nix"
+      "/dev/disk3s1s1 (apfs) - 1.9T total, 1.3T used, 615G available, mounted on /",
+      "/dev/disk3s6 (apfs) - 1.9T total, 1.3T used, 615G available, mounted on /System/Volumes/VM",
+      "/dev/disk3s2 (apfs) - 1.9T total, 1.3T used, 615G available, mounted on /System/Volumes/Preboot",
+      "/dev/disk3s4 (apfs) - 1.9T total, 1.3T used, 615G available, mounted on /System/Volumes/Update",
+      "/dev/disk1s2 (apfs) - 500M total, 20M used, 481M available, mounted on /System/Volumes/xarts",
+      "/dev/disk1s1 (apfs) - 500M total, 20M used, 481M available, mounted on /System/Volumes/iSCPreboot",
+      "/dev/disk1s3 (apfs) - 500M total, 20M used, 481M available, mounted on /System/Volumes/Hardware",
+      "/dev/disk3s7 (apfs) - 1.9T total, 1.3T used, 615G available, mounted on /nix"
     ],
     "bios": {
       "vendor": "Apple Inc.",
-      "version": "11881.121.1",
+      "version": "13822.41.1",
       "release_date": "N/A",
-      "firmware_version": "11881.121.1"
+      "firmware_version": "13822.41.1"
     },
     "chassis": {
       "manufacturer": "Apple Inc.",
@@ -34,14 +34,14 @@
     "motherboard": {
       "manufacturer": "Apple Inc.",
       "product_name": "Mac16,5",
-      "version": "11881.121.1",
+      "version": "13822.41.1",
       "serial": "MYQQGPTJ6J",
       "features": "Integrated",
       "location": "System Board",
       "type_": "Motherboard"
     },
     "total_gpus": 1,
-    "total_nics": 6,
+    "total_nics": 8,
     "numa_topology": {},
     "cpu_topology": {
       "total_cores": 16,
@@ -96,7 +96,7 @@
       "devices": [
         {
           "index": 0,
-          "name": "Apple M4 Max (Metal 3)",
+          "name": "Apple M4 Max (Metal 4)",
           "uuid": "macOS-GPU-0",
           "memory": "Unified Memory (40 cores)",
           "pci_id": "Apple Fabric (Integrated)",
@@ -112,6 +112,7 @@
         "name": "en4",
         "mac": "56",
         "ip": "Unknown",
+        "prefix": "Unknown",
         "speed": "1000 Mbps",
         "type_": "Ethernet",
         "vendor": "Apple",
@@ -123,6 +124,7 @@
         "name": "en5",
         "mac": "56",
         "ip": "Unknown",
+        "prefix": "Unknown",
         "speed": "1000 Mbps",
         "type_": "Ethernet",
         "vendor": "Apple",
@@ -134,6 +136,7 @@
         "name": "en6",
         "mac": "56",
         "ip": "Unknown",
+        "prefix": "Unknown",
         "speed": "1000 Mbps",
         "type_": "Ethernet",
         "vendor": "Apple",
@@ -145,6 +148,7 @@
         "name": "bridge0",
         "mac": "Unknown",
         "ip": "Unknown",
+        "prefix": "Unknown",
         "speed": "1000 Mbps",
         "type_": "Ethernet",
         "vendor": "Apple",
@@ -156,17 +160,43 @@
         "name": "en0",
         "mac": "84",
         "ip": "192.168.1.90",
+        "prefix": "Unknown",
         "speed": "1200 Mbps",
         "type_": "AirPort",
         "vendor": "Apple",
         "model": "Wi-Fi 802.11 a/b/g/n/ac/ax",
         "pci_id": "Apple Fabric (Integrated)",
         "numa_node": null
       },
+      {
+        "name": "en7",
+        "mac": "Unknown",
+        "ip": "Unknown",
+        "prefix": "Unknown",
+        "speed": "1000 Mbps",
+        "type_": "Ethernet",
+        "vendor": "Apple",
+        "model": "Ethernet",
+        "pci_id": "Apple Fabric (Integrated)",
+        "numa_node": null
+      },
       {
         "name": "utun4",
         "mac": "Unknown",
-        "ip": "100.84.190.125",
+        "ip": "100.112.156.46",
+        "prefix": "Unknown",
+        "speed": null,
+        "type_": "VPN (io.tailscale.ipn.macsys)",
+        "vendor": "Unknown",
+        "model": "Unknown",
+        "pci_id": "Unknown",
+        "numa_node": null
+      },
+      {
+        "name": "Tailscale 3",
+        "mac": "Unknown",
+        "ip": "Unknown",
+        "prefix": "Unknown",
         "speed": null,
         "type_": "VPN (io.tailscale.ipn.macos)",
         "vendor": "Unknown",