Merge pull request #23717 from vespa-engine/hakonhall/add-num-containers-dimension-to-memory-overhead-metric

Add num containers dimension to memory overhead metric

1 files changed, 4 insertions, 3 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
index a371cdcde25..a112c0d2697 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
@@ -49,9 +49,9 @@ public class NodeAdminImpl implements NodeAdmin {
     private final Gauge jvmHeapUsed;
     private final Gauge jvmHeapFree;
     private final Gauge jvmHeapTotal;
-    private final Gauge memoryOverhead;
     private final Gauge containerCount;
     private final Counter numberOfUnhandledExceptions;
+    private final Metrics metrics;
 
     public NodeAdminImpl(NodeAgentFactory nodeAgentFactory, Metrics metrics, Clock clock, FileSystem fileSystem) {
         this(nodeAgentContext -> create(clock, nodeAgentFactory, nodeAgentContext),
@@ -82,8 +82,8 @@ public class NodeAdminImpl implements NodeAdmin {
         this.jvmHeapUsed = metrics.declareGauge("mem.heap.used");
         this.jvmHeapFree = metrics.declareGauge("mem.heap.free");
         this.jvmHeapTotal = metrics.declareGauge("mem.heap.total");
-        this.memoryOverhead = metrics.declareGauge("mem.system.overhead");
         this.containerCount = metrics.declareGauge("container.count");
+        this.metrics = metrics;
     }
 
     @Override
@@ -139,7 +139,8 @@ public class NodeAdminImpl implements NodeAdmin {
         if (!isSuspended) {
             containerCount.sample(numContainers);
             ProcMeminfo meminfo = procMeminfoReader.read();
-            memoryOverhead.sample(meminfo.memTotalBytes() - meminfo.memAvailableBytes() - totalContainerMemoryBytes);
+            metrics.declareGauge("mem.system.overhead", new Dimensions(Map.of("containers", Long.toString(numContainers))))
+                   .sample(meminfo.memTotalBytes() - meminfo.memAvailableBytes() - totalContainerMemoryBytes);
         }
     }