diff --git a/docs/operations/metrics.md b/docs/operations/metrics.md
index f5a72dbb354..e561414502c 100644
--- a/docs/operations/metrics.md
+++ b/docs/operations/metrics.md
@@ -242,7 +242,7 @@ These metrics are only available if the JVMMonitor module is included.
 |`jvm/mem/used`|Used memory.|memKind.|< max memory|
 |`jvm/mem/committed`|Committed memory.|memKind.|close to max memory|
 |`jvm/gc/count`|Garbage collection count.|gcName (cms/g1/parallel/etc.), gcGen (old/young)|Varies.|
-|`jvm/gc/cpu`|Cpu time in Nanoseconds spent on garbage collection.|gcName, gcGen|Sum of `jvm/gc/cpu` should be within 10-30% of sum of `jvm/cpu/total`, depending on the GC algorithm used (reported by [`JvmCpuMonitor`](../configuration/index.html#enabling-metrics)) |
+|`jvm/gc/cpu`|Count of CPU time in Nanoseconds spent on garbage collection. Note: `jvm/gc/cpu` represents the total time over multiple GC cycles; divide by `jvm/gc/count` to get the mean GC time per cycle|gcName, gcGen|Sum of `jvm/gc/cpu` should be within 10-30% of sum of `jvm/cpu/total`, depending on the GC algorithm used (reported by [`JvmCpuMonitor`](../configuration/index.html#enabling-metrics)) |
 
 ### EventReceiverFirehose
 
diff --git a/extensions-contrib/statsd-emitter/src/main/resources/defaultMetricDimensions.json b/extensions-contrib/statsd-emitter/src/main/resources/defaultMetricDimensions.json
index 279c0a305ea..30cbeff7e50 100644
--- a/extensions-contrib/statsd-emitter/src/main/resources/defaultMetricDimensions.json
+++ b/extensions-contrib/statsd-emitter/src/main/resources/defaultMetricDimensions.json
@@ -73,8 +73,8 @@
   "segment/dropped/count" : { "dimensions" : ["tier"], "type" : "count" },
   "segment/deleted/count" : { "dimensions" : ["tier"], "type" : "count" },
   "segment/unneeded/count" : { "dimensions" : ["tier"], "type" : "count" },
-  "segment/unavailable/count" : { "dimensions" : ["dataSource"], "type" : "count" },
-  "segment/underReplicated/count" : { "dimensions" : ["dataSource", "tier"], "type" : "count" },
+  "segment/unavailable/count" : { "dimensions" : ["dataSource"], "type" : "gauge" },
+  "segment/underReplicated/count" : { "dimensions" : ["dataSource", "tier"], "type" : "gauge" },
   "segment/cost/raw" : { "dimensions" : ["tier"], "type" : "count" },
   "segment/cost/normalization" : { "dimensions" : ["tier"], "type" : "count" },
   "segment/cost/normalized" : { "dimensions" : ["tier"], "type" : "count" },
@@ -102,7 +102,7 @@
   "jvm/mem/used" : { "dimensions" : ["memKind"], "type" : "gauge" },
   "jvm/mem/committed" : { "dimensions" : ["memKind"], "type" : "gauge" },
   "jvm/gc/count" : { "dimensions" : ["gcName"], "type" : "count" },
-  "jvm/gc/cpu" : { "dimensions" : ["gcName"], "type" : "timer" },
+  "jvm/gc/cpu" : { "dimensions" : ["gcName"], "type" : "count" },
 
   "ingest/events/buffered" : { "dimensions" : ["serviceName, bufferCapacity"], "type" : "gauge"},