group metric series together in the same item, expand to see individual series

2 files changed, 5 insertions, 2 deletions

diff --git a/kamon-core/src/main/scala/kamon/status/JsonMarshalling.scala b/kamon-core/src/main/scala/kamon/status/JsonMarshalling.scala
index 3fb2df1e..2291648c 100644
--- a/kamon-core/src/main/scala/kamon/status/JsonMarshalling.scala
+++ b/kamon-core/src/main/scala/kamon/status/JsonMarshalling.scala
@@ -85,6 +85,8 @@ object JsonMarshalling {
           .`object`()
             .value("name", metric.name)
             .value("type", metric.instrumentType.name)
+            .value("unitDimension", metric.unit.dimension.name)
+            .value("unitMagnitude", metric.unit.magnitude.name)
             .`object`("tags")
 
         metric.tags.foreach { case (tag, value) => metricsObject.value(tag, value) }
diff --git a/kamon-core/src/main/scala/kamon/status/Status.scala b/kamon-core/src/main/scala/kamon/status/Status.scala
index 9b323922..956e3594 100644
--- a/kamon-core/src/main/scala/kamon/status/Status.scala
+++ b/kamon-core/src/main/scala/kamon/status/Status.scala
@@ -2,11 +2,11 @@ package kamon.status
 
 import com.typesafe.config.Config
 import kamon.metric.InstrumentFactory.InstrumentType
-import kamon.metric.MetricRegistry
+import kamon.metric.{MeasurementUnit, MetricRegistry}
 import kamon.{Configuration, Environment, Kamon}
 import kamon.module.ModuleRegistry
 import kamon.module.Module.{Kind => ModuleKind}
-import java.util.{Collections, Map => JavaMap, List => JavaList}
+import java.util.{Collections, List => JavaList, Map => JavaMap}
 
 /**
   * Exposes Kamon components' status information. This is meant to be used for informational and debugging purposes.
@@ -84,6 +84,7 @@ object Status {
   case class Metric(
     name: String,
     tags: Map[String, String],
+    unit: MeasurementUnit,
     instrumentType: InstrumentType
   )