aboutsummaryrefslogtreecommitdiffstats
path: root/metrics/src
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahooinc.com>2023-08-24 09:45:00 +0200
committerBjørn Christian Seime <bjorncs@yahooinc.com>2023-08-24 09:50:11 +0200
commit65655cbcadc890bcad907d6cc34995a926c29183 (patch)
treed0a80d02f648ca6981bea39c70e4073c2672fd5a /metrics/src
parenta5b9150a448ed1c30d13c64055a0bc534a1b4a95 (diff)
Add additional metrics for container memory
Diffstat (limited to 'metrics/src')
-rw-r--r--metrics/src/main/java/ai/vespa/metrics/HostedNodeAdminMetrics.java4
-rw-r--r--metrics/src/main/java/ai/vespa/metrics/set/SystemMetrics.java4
2 files changed, 8 insertions, 0 deletions
diff --git a/metrics/src/main/java/ai/vespa/metrics/HostedNodeAdminMetrics.java b/metrics/src/main/java/ai/vespa/metrics/HostedNodeAdminMetrics.java
index 97185e9c703..a5f21eeba44 100644
--- a/metrics/src/main/java/ai/vespa/metrics/HostedNodeAdminMetrics.java
+++ b/metrics/src/main/java/ai/vespa/metrics/HostedNodeAdminMetrics.java
@@ -21,6 +21,10 @@ public enum HostedNodeAdminMetrics implements VespaMetrics {
MEM_UTIL("mem.util", Unit.PERCENTAGE, "Memory utilisation"),
MEM_TOTAL_USED("mem_total.used", Unit.BYTE, "Total amount of memory used by the node, including OS buffer caches"),
MEM_TOTAL_UTIL("mem_total.util", Unit.PERCENTAGE, "Total memory utilisation"),
+ MEM_SOCK("mem.sock", Unit.BYTE, "Amount of memory used in network transmission buffers"),
+ MEM_SLAB_RECLAIMABLE("mem.slab_reclaimable", Unit.BYTE, "Amount of 'slab' that might be reclaimed"),
+ MEM_SLAB("mem.slab", Unit.BYTE, "Amount of memory used for storing in-kernel data structures"),
+ MEM_ANON("mem.anon", Unit.BYTE, "Amount of memory used in anonymous mappings"),
GPU_UTIL("gpu.util", Unit.PERCENTAGE, "GPU utilisation"),
GPU_MEM_USED("gpu.memory.used", Unit.BYTE, "GPU memory used"),
GPU_MEM_TOTAL("gpu.memory.total", Unit.BYTE, "GPU memory available"),
diff --git a/metrics/src/main/java/ai/vespa/metrics/set/SystemMetrics.java b/metrics/src/main/java/ai/vespa/metrics/set/SystemMetrics.java
index 0560daebc43..a86deb3830b 100644
--- a/metrics/src/main/java/ai/vespa/metrics/set/SystemMetrics.java
+++ b/metrics/src/main/java/ai/vespa/metrics/set/SystemMetrics.java
@@ -30,6 +30,10 @@ public class SystemMetrics {
new Metric(HostedNodeAdminMetrics.MEM_UTIL.baseName()),
new Metric(HostedNodeAdminMetrics.MEM_TOTAL_USED.baseName()),
new Metric(HostedNodeAdminMetrics.MEM_TOTAL_UTIL.baseName()),
+ new Metric(HostedNodeAdminMetrics.MEM_SOCK.baseName()),
+ new Metric(HostedNodeAdminMetrics.MEM_SLAB_RECLAIMABLE.baseName()),
+ new Metric(HostedNodeAdminMetrics.MEM_SLAB.baseName()),
+ new Metric(HostedNodeAdminMetrics.MEM_ANON.baseName()),
new Metric(HostedNodeAdminMetrics.GPU_UTIL.baseName()),
new Metric(HostedNodeAdminMetrics.GPU_MEM_USED.baseName()),
new Metric(HostedNodeAdminMetrics.GPU_MEM_TOTAL.baseName())