Skip to content

Commit 9f6d62e

Browse files
Merge pull request #24 from sfcompute/kenny/netbox-enhancements
Netbox Ingestify enhancements: Extended hardware data collection
2 parents 2b09158 + 6b6f774 commit 9f6d62e

16 files changed

Lines changed: 1496 additions & 74 deletions

File tree

Cargo.lock

Lines changed: 109 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,18 @@ toml = "0.8.19"
2626
libc = "0.2.161"
2727
tokio = { version = "1.0", features = ["full"] }
2828
async-trait = "0.1"
29+
# Requires Nvidia driver at runtime
30+
nvml-wrapper = { version = "0.11.0", optional = true}
31+
32+
# Only compiled on x86/x86_64 targets
33+
[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]
34+
raw-cpuid = { version = "11", optional = true }
35+
36+
[features]
37+
default = []
38+
nvidia = ["nvml-wrapper"]
39+
x86-cpu = ["raw-cpuid"]
40+
full = ["nvidia", "x86-cpu"]
2941

3042
[dev-dependencies]
3143
tempfile = "3.8" # For temporary file handling in tests

MYQQGPTJ6J_hardware_report.json

Lines changed: 44 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111
"total_storage": "2.0 TB",
1212
"total_storage_tb": 1.81464035063982,
1313
"filesystems": [
14-
"/dev/disk3s1s1 (apfs) - 1.9T total, 262G used, 1.6T available, mounted on /",
15-
"/dev/disk3s6 (apfs) - 1.9T total, 262G used, 1.6T available, mounted on /System/Volumes/VM",
16-
"/dev/disk3s2 (apfs) - 1.9T total, 262G used, 1.6T available, mounted on /System/Volumes/Preboot",
17-
"/dev/disk3s4 (apfs) - 1.9T total, 262G used, 1.6T available, mounted on /System/Volumes/Update",
18-
"/dev/disk1s2 (apfs) - 500M total, 19M used, 482M available, mounted on /System/Volumes/xarts",
19-
"/dev/disk1s1 (apfs) - 500M total, 19M used, 482M available, mounted on /System/Volumes/iSCPreboot",
20-
"/dev/disk1s3 (apfs) - 500M total, 19M used, 482M available, mounted on /System/Volumes/Hardware",
21-
"/dev/disk3s7 (apfs) - 1.9T total, 262G used, 1.6T available, mounted on /nix"
14+
"/dev/disk3s1s1 (apfs) - 1.9T total, 1.3T used, 615G available, mounted on /",
15+
"/dev/disk3s6 (apfs) - 1.9T total, 1.3T used, 615G available, mounted on /System/Volumes/VM",
16+
"/dev/disk3s2 (apfs) - 1.9T total, 1.3T used, 615G available, mounted on /System/Volumes/Preboot",
17+
"/dev/disk3s4 (apfs) - 1.9T total, 1.3T used, 615G available, mounted on /System/Volumes/Update",
18+
"/dev/disk1s2 (apfs) - 500M total, 20M used, 481M available, mounted on /System/Volumes/xarts",
19+
"/dev/disk1s1 (apfs) - 500M total, 20M used, 481M available, mounted on /System/Volumes/iSCPreboot",
20+
"/dev/disk1s3 (apfs) - 500M total, 20M used, 481M available, mounted on /System/Volumes/Hardware",
21+
"/dev/disk3s7 (apfs) - 1.9T total, 1.3T used, 615G available, mounted on /nix"
2222
],
2323
"bios": {
2424
"vendor": "Apple Inc.",
25-
"version": "11881.121.1",
25+
"version": "13822.41.1",
2626
"release_date": "N/A",
27-
"firmware_version": "11881.121.1"
27+
"firmware_version": "13822.41.1"
2828
},
2929
"chassis": {
3030
"manufacturer": "Apple Inc.",
@@ -34,14 +34,14 @@
3434
"motherboard": {
3535
"manufacturer": "Apple Inc.",
3636
"product_name": "Mac16,5",
37-
"version": "11881.121.1",
37+
"version": "13822.41.1",
3838
"serial": "MYQQGPTJ6J",
3939
"features": "Integrated",
4040
"location": "System Board",
4141
"type_": "Motherboard"
4242
},
4343
"total_gpus": 1,
44-
"total_nics": 6,
44+
"total_nics": 8,
4545
"numa_topology": {},
4646
"cpu_topology": {
4747
"total_cores": 16,
@@ -96,7 +96,7 @@
9696
"devices": [
9797
{
9898
"index": 0,
99-
"name": "Apple M4 Max (Metal 3)",
99+
"name": "Apple M4 Max (Metal 4)",
100100
"uuid": "macOS-GPU-0",
101101
"memory": "Unified Memory (40 cores)",
102102
"pci_id": "Apple Fabric (Integrated)",
@@ -112,6 +112,7 @@
112112
"name": "en4",
113113
"mac": "56",
114114
"ip": "Unknown",
115+
"prefix": "Unknown",
115116
"speed": "1000 Mbps",
116117
"type_": "Ethernet",
117118
"vendor": "Apple",
@@ -123,6 +124,7 @@
123124
"name": "en5",
124125
"mac": "56",
125126
"ip": "Unknown",
127+
"prefix": "Unknown",
126128
"speed": "1000 Mbps",
127129
"type_": "Ethernet",
128130
"vendor": "Apple",
@@ -134,6 +136,7 @@
134136
"name": "en6",
135137
"mac": "56",
136138
"ip": "Unknown",
139+
"prefix": "Unknown",
137140
"speed": "1000 Mbps",
138141
"type_": "Ethernet",
139142
"vendor": "Apple",
@@ -145,6 +148,7 @@
145148
"name": "bridge0",
146149
"mac": "Unknown",
147150
"ip": "Unknown",
151+
"prefix": "Unknown",
148152
"speed": "1000 Mbps",
149153
"type_": "Ethernet",
150154
"vendor": "Apple",
@@ -156,17 +160,43 @@
156160
"name": "en0",
157161
"mac": "84",
158162
"ip": "192.168.1.90",
163+
"prefix": "Unknown",
159164
"speed": "1200 Mbps",
160165
"type_": "AirPort",
161166
"vendor": "Apple",
162167
"model": "Wi-Fi 802.11 a/b/g/n/ac/ax",
163168
"pci_id": "Apple Fabric (Integrated)",
164169
"numa_node": null
165170
},
171+
{
172+
"name": "en7",
173+
"mac": "Unknown",
174+
"ip": "Unknown",
175+
"prefix": "Unknown",
176+
"speed": "1000 Mbps",
177+
"type_": "Ethernet",
178+
"vendor": "Apple",
179+
"model": "Ethernet",
180+
"pci_id": "Apple Fabric (Integrated)",
181+
"numa_node": null
182+
},
166183
{
167184
"name": "utun4",
168185
"mac": "Unknown",
169-
"ip": "100.84.190.125",
186+
"ip": "100.112.156.46",
187+
"prefix": "Unknown",
188+
"speed": null,
189+
"type_": "VPN (io.tailscale.ipn.macsys)",
190+
"vendor": "Unknown",
191+
"model": "Unknown",
192+
"pci_id": "Unknown",
193+
"numa_node": null
194+
},
195+
{
196+
"name": "Tailscale 3",
197+
"mac": "Unknown",
198+
"ip": "Unknown",
199+
"prefix": "Unknown",
170200
"speed": null,
171201
"type_": "VPN (io.tailscale.ipn.macos)",
172202
"vendor": "Unknown",

0 commit comments

Comments
 (0)