fix(node): add CPU utilization to node data source (#2605)

Signed-off-by: 666Goofy666 <153852747+666Goofy666@users.noreply.github.com>

Author: 666Goofy666

docs/data-sources/virtual_environment_node.md

@@ -43,6 +43,7 @@ output "data_proxmox_virtual_environment_node" {
 - `cpu_count` (Number) The total number of logical CPUs on the node (sockets * cores * threads)
 - `cpu_model` (String) The CPU model on the node
 - `cpu_sockets` (Number) The number of CPU sockets on the node
+- `cpu_utilization` (Number) The CPU utilization on the node (a value between `0.0` and `1.0`)
 - `id` (String) The ID of this resource.
 - `memory_available` (Number) The available memory in bytes on the node
 - `memory_total` (Number) The total memory in bytes on the node

docs/data-sources/virtual_environment_nodes.md

@@ -31,7 +31,7 @@ output "data_proxmox_virtual_environment_nodes" {
 ### Read-Only
 
 - `cpu_count` (List of Number) The total number of logical CPUs on each node
-- `cpu_utilization` (List of Number) The CPU utilization on each node
+- `cpu_utilization` (List of Number) The CPU utilization on each node (values between `0.0` and `1.0`)
 - `id` (String) The ID of this resource.
 - `memory_available` (List of Number) The available memory in bytes on each node
 - `memory_used` (List of Number) The used memory in bytes on each node

fwprovider/test/datasource_node_test.go

@@ -31,6 +31,7 @@ func TestAccDatasourceNode(t *testing.T) {
 					"cpu_count",
 					"cpu_sockets",
 					"cpu_model",
+					"cpu_utilization",
 					"memory_available",
 					"memory_used",
 					"memory_total",

proxmox/nodes/nodes_types.go

@@ -41,7 +41,8 @@ type GetInfoResponseBody struct {
 
 // GetInfoResponseData contains the data from a node info response.
 type GetInfoResponseData struct {
-	CPUInfo struct {
+	CPUUtilization *float64 `json:"cpu,omitempty"`
+	CPUInfo        struct {
 		CPUCores   *int    `json:"cores,omitempty"`
 		CPUCount   *int    `json:"cpus,omitempty"`
 		CPUSockets *int    `json:"sockets,omitempty"`

proxmoxtf/datasource/node.go

@@ -8,6 +8,7 @@ package datasource
 
 import (
 	"context"
+	"math"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -20,6 +21,7 @@ const (
 	mkDataSourceVirtualEnvironmentNodeCPUCount        = "cpu_count"
 	mkDataSourceVirtualEnvironmentNodeCPUSockets      = "cpu_sockets"
 	mkDataSourceVirtualEnvironmentNodeCPUModel        = "cpu_model"
+	mkDataSourceVirtualEnvironmentNodeCPUUtilization  = "cpu_utilization"
 	mkDataSourceVirtualEnvironmentNodeMemoryAvailable = "memory_available"
 	mkDataSourceVirtualEnvironmentNodeMemoryUsed      = "memory_used"
 	mkDataSourceVirtualEnvironmentNodeMemoryTotal     = "memory_total"
@@ -52,6 +54,11 @@ func Node() *schema.Resource {
 				Description: "The CPU model on the node",
 				Computed:    true,
 			},
+			mkDataSourceVirtualEnvironmentNodeCPUUtilization: {
+				Type:        schema.TypeFloat,
+				Description: "The CPU utilization on the node (a value between `0.0` and `1.0`)",
+				Computed:    true,
+			},
 			mkDataSourceVirtualEnvironmentNodeMemoryAvailable: {
 				Type:        schema.TypeInt,
 				Description: "The available memory in bytes on the node",
@@ -133,6 +140,14 @@ func nodeRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnosti
 
 	diags = append(diags, diag.FromErr(err)...)
 
+	if node.CPUUtilization != nil {
+		err = d.Set(mkDataSourceVirtualEnvironmentNodeCPUUtilization, math.Round(*node.CPUUtilization*100)/100)
+	} else {
+		err = d.Set(mkDataSourceVirtualEnvironmentNodeCPUUtilization, 0)
+	}
+
+	diags = append(diags, diag.FromErr(err)...)
+
 	if node.MemoryInfo.Total != nil {
 		err = d.Set(mkDataSourceVirtualEnvironmentNodeMemoryAvailable, node.MemoryInfo.Free)
 		diags = append(diags, diag.FromErr(err)...)

proxmoxtf/datasource/nodes.go

@@ -41,7 +41,7 @@ func Nodes() *schema.Resource {
 			},
 			mkDataSourceVirtualEnvironmentNodesCPUUtilization: {
 				Type:        schema.TypeList,
-				Description: "The CPU utilization on each node",
+				Description: "The CPU utilization on each node (values between `0.0` and `1.0`)",
 				Computed:    true,
 				Elem:        &schema.Schema{Type: schema.TypeFloat},
 			},