client: emit max_memory metric (#11490)

hashicorp · Nov 17, 2021 · e70b0b7 · e70b0b7
1 parent 23c977c
commit e70b0b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/client/client.go b/client/client.go
@@ -2911,6 +2911,7 @@ func (c *Client) setGaugeForAllocationStats(nodeID string, baseLabels []metrics.
 
 	// Emit allocated
 	metrics.SetGaugeWithLabels([]string{"client", "allocated", "memory"}, float32(allocated.Flattened.Memory.MemoryMB), baseLabels)
+	metrics.SetGaugeWithLabels([]string{"client", "allocated", "max_memory"}, float32(allocated.Flattened.Memory.MemoryMaxMB), baseLabels)
 	metrics.SetGaugeWithLabels([]string{"client", "allocated", "disk"}, float32(allocated.Shared.DiskMB), baseLabels)
 	metrics.SetGaugeWithLabels([]string{"client", "allocated", "cpu"}, float32(allocated.Flattened.Cpu.CpuShares), baseLabels)
 

diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
@@ -9697,7 +9697,7 @@ func (a *Allocation) SetEventDisplayMessages() {
 //
 // COMPAT(0.11): Remove in 0.11
 func (a *Allocation) ComparableResources() *ComparableResources {
-	// ALloc already has 0.9+ behavior
+	// Alloc already has 0.9+ behavior
 	if a.AllocatedResources != nil {
 		return a.AllocatedResources.Comparable()
 	}
@@ -9720,7 +9720,8 @@ func (a *Allocation) ComparableResources() *ComparableResources {
 				CpuShares: int64(resources.CPU),
 			},
 			Memory: AllocatedMemoryResources{
-				MemoryMB: int64(resources.MemoryMB),
+				MemoryMB:    int64(resources.MemoryMB),
+				MemoryMaxMB: int64(resources.MemoryMaxMB),
 			},
 			Networks: resources.Networks,
 		},