Added GC metrics to whitelist, simplified GC metric key composition

2 files changed, 9 insertions, 3 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
index 6467199d9f9..fc46ed18dde 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
@@ -110,6 +110,13 @@ public class VespaMetricSet {
         metrics.add(new Metric("jdisc.memory_mappings.max"));
         metrics.add(new Metric("jdisc.open_file_descriptors.max"));
 
+        metrics.add(new Metric("jdisc.gc.count.average"));
+        metrics.add(new Metric("jdisc.gc.count.max"));
+        metrics.add(new Metric("jdisc.gc.count.last"));
+        metrics.add(new Metric("jdisc.gc.ms.average"));
+        metrics.add(new Metric("jdisc.gc.ms.max"));
+        metrics.add(new Metric("jdisc.gc.ms.last"));
+
         metrics.add(new Metric("jdisc.deactivated_containers.total.last"));
         metrics.add(new Metric("jdisc.deactivated_containers.with_retained_refs.last"));
 
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java
index 49353332271..c208da6a07d 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetrics.java
@@ -15,9 +15,8 @@ import java.util.Map;
  * @author ollivir
  */
 public class GarbageCollectionMetrics {
-    private static final String GC_PREFIX = "jdisc.gc.";
-    private static final String GC_COUNT = GC_PREFIX + ".count";
-    private static final String GC_TIME = GC_PREFIX + ".ms";
+    private static final String GC_COUNT = "jdisc.gc.count";
+    private static final String GC_TIME = "jdisc.gc.ms";
     private static final String DIMENSION_KEY = "gcName";
 
     public static final long REPORTING_INTERVAL = Duration.ofSeconds(62).toMillis();