diff --git a/plugins/inputs/nvidia_smi/nvidia_smi_test.go b/plugins/inputs/nvidia_smi/nvidia_smi_test.go index 449474481..039e73900 100644 --- a/plugins/inputs/nvidia_smi/nvidia_smi_test.go +++ b/plugins/inputs/nvidia_smi/nvidia_smi_test.go @@ -141,6 +141,55 @@ func TestGatherValidXML(t *testing.T) { time.Unix(0, 0)), }, }, + { + name: "Quadro P2000", + filename: "quadro-p2000-v12.xml", + expected: []telegraf.Metric{ + testutil.MustMetric( + "nvidia_smi", + map[string]string{ + "arch": "Pascal", + "compute_mode": "Default", + "index": "0", + "name": "Quadro P2000", + "pstate": "P8", + "uuid": "GPU-396caaed-39ca-3199-2e68-717cdb786ec6", + }, + map[string]interface{}{ + + "clocks_current_graphics": 139, + "clocks_current_memory": 405, + "clocks_current_sm": 139, + "clocks_current_video": 544, + "cuda_version": "12.0", + "display_active": "Disabled", + "display_mode": "Disabled", + "driver_version": "525.125.06", + "encoder_stats_average_fps": 0, + "encoder_stats_average_latency": 0, + "encoder_stats_session_count": 0, + "fbc_stats_average_fps": 0, + "fbc_stats_average_latency": 0, + "fbc_stats_session_count": 0, + "fan_speed": 46, + "memory_free": 5051, + "memory_reserved": 66, + "memory_total": 5120, + "memory_used": 1, + "pcie_link_gen_current": 1, + "pcie_link_width_current": 8, + "power_draw": float64(4.61), + "serial": "0322218049033", + "temperature_gpu": 34, + "utilization_gpu": 0, + "utilization_memory": 0, + "utilization_encoder": 0, + "utilization_decoder": 0, + "vbios_version": "86.06.3F.00.30", + }, + time.Unix(0, 0)), + }, + }, { name: "Tesla T4", filename: "tesla-t4.xml", diff --git a/plugins/inputs/nvidia_smi/schema_v12/parser.go b/plugins/inputs/nvidia_smi/schema_v12/parser.go index efab31577..f8c7cdfe7 100644 --- a/plugins/inputs/nvidia_smi/schema_v12/parser.go +++ b/plugins/inputs/nvidia_smi/schema_v12/parser.go @@ -73,6 +73,7 @@ func Parse(acc telegraf.Accumulator, buf []byte) error { common.SetIfUsed("int", fields, "clocks_current_sm", gpu.Clocks.SmClock) common.SetIfUsed("int", fields, "clocks_current_memory", gpu.Clocks.MemClock) common.SetIfUsed("int", fields, "clocks_current_video", gpu.Clocks.VideoClock) + common.SetIfUsed("float", fields, "power_draw", gpu.PowerReadings.PowerDraw) common.SetIfUsed("float", fields, "power_draw", gpu.GpuPowerReadings.PowerDraw) common.SetIfUsed("float", fields, "module_power_draw", gpu.ModulePowerReadings.PowerDraw) acc.AddFields("nvidia_smi", fields, tags, timestamp) diff --git a/plugins/inputs/nvidia_smi/schema_v12/types.go b/plugins/inputs/nvidia_smi/schema_v12/types.go index 3eeefe6e0..9a00e6d80 100644 --- a/plugins/inputs/nvidia_smi/schema_v12/types.go +++ b/plugins/inputs/nvidia_smi/schema_v12/types.go @@ -214,8 +214,18 @@ type smi struct { RxUtil string `xml:"rx_util"` TxUtil string `xml:"tx_util"` } `xml:"pci"` - PerformanceState string `xml:"performance_state"` - PersistenceMode string `xml:"persistence_mode"` + PerformanceState string `xml:"performance_state"` + PersistenceMode string `xml:"persistence_mode"` + PowerReadings struct { + PowerState string `xml:"power_state"` + PowerManagement string `xml:"power_management"` + PowerDraw string `xml:"power_draw"` + PowerLimit string `xml:"power_limit"` + DefaultPowerLimit string `xml:"default_power_limit"` + EnforcedPowerLimit string `xml:"enforced_power_limit"` + MinPowerLimit string `xml:"min_power_limit"` + MaxPowerLimit string `xml:"max_power_limit"` + } `xml:"power_readings"` Processes struct{} `xml:"processes"` ProductArchitecture string `xml:"product_architecture"` ProductBrand string `xml:"product_brand"` diff --git a/plugins/inputs/nvidia_smi/testdata/quadro-p2000-v12.xml b/plugins/inputs/nvidia_smi/testdata/quadro-p2000-v12.xml new file mode 100644 index 000000000..669113e7c --- /dev/null +++ b/plugins/inputs/nvidia_smi/testdata/quadro-p2000-v12.xml @@ -0,0 +1,558 @@ + + + + Wed Sep 20 09:37:38 2023 + 525.125.06 + 12.0 + 1 + + Quadro P2000 + Quadro + Pascal + Disabled + Disabled + Enabled + + N/A + N/A + + + None + + Disabled + 4000 + + N/A + N/A + + 0322218049033 + GPU-396caaed-39ca-3199-2e68-717cdb786ec6 + 0 + 86.06.3F.00.30 + No + 0x1700 + 900-5G410-0100-000 + 1C30-875-A1 + 1 + + G410.0502.00.02 + 1.1 + N/A + N/A + + + N/A + N/A + + N/A + + None + N/A + + + N/A + + + 17 + 00 + 0000 + 1C3010DE + 00000000:17:00.0 + 11B31028 + + + 3 + 1 + 1 + 3 + 3 + + + 16x + 8x + + + + N/A + N/A + + 0 + 0 + 0 KB/s + 0 KB/s + N/A + N/A + + 46 % + P8 + + Active + Not Active + Not Active + Not Active + Not Active + Not Active + Not Active + Not Active + Not Active + + + 5120 MiB + 66 MiB + 1 MiB + 5051 MiB + + + 256 MiB + 5 MiB + 251 MiB + + Default + + 0 % + 0 % + 0 % + 0 % + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + N/A + N/A + + + + + N/A + N/A + N/A + N/A + N/A + N/A + N/A + N/A + + + N/A + N/A + N/A + N/A + N/A + N/A + N/A + N/A + + + + + N/A + N/A + N/A + N/A + N/A + N/A + N/A + N/A + + + N/A + N/A + N/A + N/A + N/A + N/A + N/A + N/A + + + + + + N/A + N/A + + + N/A + N/A + + N/A + N/A + + N/A + + 34 C + N/A + 104 C + 101 C + N/A + 83 C + N/A + N/A + + + 65 C + 98 C + + + P8 + Supported + 4.61 W + 75.00 W + 75.00 W + 75.00 W + 75.00 W + 75.00 W + + + 139 MHz + 139 MHz + 405 MHz + 544 MHz + + + 1075 MHz + 3504 MHz + + + 1075 MHz + 3504 MHz + + + N/A + + + 1721 MHz + 1721 MHz + 3504 MHz + 1556 MHz + + + 1721 MHz + + + N/A + N/A + + + N/A + + + N/A + N/A + + + + 3504 MHz + 1721 MHz + 1708 MHz + 1695 MHz + 1683 MHz + 1670 MHz + 1657 MHz + 1645 MHz + 1632 MHz + 1620 MHz + 1607 MHz + 1594 MHz + 1582 MHz + 1569 MHz + 1556 MHz + 1544 MHz + 1531 MHz + 1518 MHz + 1506 MHz + 1493 MHz + 1480 MHz + 1468 MHz + 1455 MHz + 1442 MHz + 1430 MHz + 1417 MHz + 1404 MHz + 1392 MHz + 1379 MHz + 1366 MHz + 1354 MHz + 1341 MHz + 1328 MHz + 1316 MHz + 1303 MHz + 1290 MHz + 1278 MHz + 1265 MHz + 1252 MHz + 1240 MHz + 1227 MHz + 1215 MHz + 1202 MHz + 1189 MHz + 1177 MHz + 1164 MHz + 1151 MHz + 1139 MHz + 1126 MHz + 1113 MHz + 1101 MHz + 1088 MHz + 1075 MHz + 1063 MHz + 1050 MHz + 1037 MHz + 1025 MHz + 1012 MHz + 999 MHz + 987 MHz + 974 MHz + 961 MHz + 949 MHz + 936 MHz + 923 MHz + 911 MHz + 898 MHz + 885 MHz + 873 MHz + 860 MHz + 847 MHz + 835 MHz + 822 MHz + 810 MHz + 797 MHz + 784 MHz + 772 MHz + 759 MHz + 746 MHz + 734 MHz + 721 MHz + 708 MHz + 696 MHz + 683 MHz + 670 MHz + 658 MHz + 645 MHz + 632 MHz + 620 MHz + 607 MHz + 594 MHz + 582 MHz + 569 MHz + 556 MHz + 544 MHz + 531 MHz + 518 MHz + 506 MHz + 493 MHz + 480 MHz + 468 MHz + 455 MHz + 442 MHz + 430 MHz + 417 MHz + 405 MHz + 392 MHz + 379 MHz + 367 MHz + 354 MHz + 341 MHz + 329 MHz + 316 MHz + 303 MHz + 291 MHz + 278 MHz + 265 MHz + 253 MHz + 240 MHz + 227 MHz + 215 MHz + 202 MHz + 189 MHz + 177 MHz + 164 MHz + 151 MHz + 139 MHz + + + 810 MHz + 1721 MHz + 1708 MHz + 1695 MHz + 1683 MHz + 1670 MHz + 1657 MHz + 1645 MHz + 1632 MHz + 1620 MHz + 1607 MHz + 1594 MHz + 1582 MHz + 1569 MHz + 1556 MHz + 1544 MHz + 1531 MHz + 1518 MHz + 1506 MHz + 1493 MHz + 1480 MHz + 1468 MHz + 1455 MHz + 1442 MHz + 1430 MHz + 1417 MHz + 1404 MHz + 1392 MHz + 1379 MHz + 1366 MHz + 1354 MHz + 1341 MHz + 1328 MHz + 1316 MHz + 1303 MHz + 1290 MHz + 1278 MHz + 1265 MHz + 1252 MHz + 1240 MHz + 1227 MHz + 1215 MHz + 1202 MHz + 1189 MHz + 1177 MHz + 1164 MHz + 1151 MHz + 1139 MHz + 1126 MHz + 1113 MHz + 1101 MHz + 1088 MHz + 1075 MHz + 1063 MHz + 1050 MHz + 1037 MHz + 1025 MHz + 1012 MHz + 999 MHz + 987 MHz + 974 MHz + 961 MHz + 949 MHz + 936 MHz + 923 MHz + 911 MHz + 898 MHz + 885 MHz + 873 MHz + 860 MHz + 847 MHz + 835 MHz + 822 MHz + 810 MHz + 797 MHz + 784 MHz + 772 MHz + 759 MHz + 746 MHz + 734 MHz + 721 MHz + 708 MHz + 696 MHz + 683 MHz + 670 MHz + 658 MHz + 645 MHz + 632 MHz + 620 MHz + 607 MHz + 594 MHz + 582 MHz + 569 MHz + 556 MHz + 544 MHz + 531 MHz + 518 MHz + 506 MHz + 493 MHz + 480 MHz + 468 MHz + 455 MHz + 442 MHz + 430 MHz + 417 MHz + 405 MHz + 392 MHz + 379 MHz + 367 MHz + 354 MHz + 341 MHz + 329 MHz + 316 MHz + 303 MHz + 291 MHz + 278 MHz + 265 MHz + 253 MHz + 240 MHz + 227 MHz + 215 MHz + 202 MHz + 189 MHz + 177 MHz + 164 MHz + 151 MHz + 139 MHz + + + 405 MHz + 607 MHz + 594 MHz + 582 MHz + 569 MHz + 556 MHz + 544 MHz + 531 MHz + 518 MHz + 506 MHz + 493 MHz + 480 MHz + 468 MHz + 455 MHz + 442 MHz + 430 MHz + 417 MHz + 405 MHz + 392 MHz + 379 MHz + 367 MHz + 354 MHz + 341 MHz + 329 MHz + 316 MHz + 303 MHz + 291 MHz + 278 MHz + 265 MHz + 253 MHz + 240 MHz + 227 MHz + 215 MHz + 202 MHz + 189 MHz + 177 MHz + 164 MHz + 151 MHz + 139 MHz + + + + + + + + +