ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject ambari git commit: AMBARI-10778. Add unit info to metrics.json. (Ivan via Jaimin)
Date Tue, 28 Apr 2015 07:20:14 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 930b3e4ee -> eb31a92a5


AMBARI-10778. Add unit info to metrics.json. (Ivan via Jaimin)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eb31a92a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eb31a92a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eb31a92a

Branch: refs/heads/trunk
Commit: eb31a92a5a9906587befcab2c3249e4c99618f19
Parents: 930b3e4
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Tue Apr 28 00:19:37 2015 -0700
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Tue Apr 28 00:19:37 2015 -0700

----------------------------------------------------------------------
 .../internal/AbstractPropertyProvider.java      |  1 +
 .../controller/internal/PropertyInfo.java       | 11 ++++++++-
 .../internal/StackDefinedPropertyProvider.java  |  1 +
 .../controller/utilities/PropertyHelper.java    | 13 ++++++++++-
 .../ambari/server/state/stack/Metric.java       |  8 ++++++-
 .../HBASE/0.96.0.2.0/metrics.json               | 19 ++++++++++++++++
 .../common-services/HDFS/2.1.0.2.0/metrics.json | 24 ++++++++++++++++++++
 .../StackArtifactResourceProviderTest.java      |  1 +
 .../RestMetricsPropertyProviderTest.java        | 16 ++++++-------
 9 files changed, 83 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/eb31a92a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractPropertyProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractPropertyProvider.java
index dba20ed..98b42e0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractPropertyProvider.java
@@ -305,6 +305,7 @@ public abstract class AbstractPropertyProvider extends BaseProvider implements
P
           propertyInfo.isTemporal(), propertyInfo.isPointInTime());
         compPropertyInfo.setAmsHostMetric(propertyInfo.isAmsHostMetric());
         compPropertyInfo.setAmsId(propertyInfo.getAmsId());
+        compPropertyInfo.setUnit(propertyInfo.getUnit());
         componentMetricMap.put(propertyId, compPropertyInfo);
       }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/eb31a92a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PropertyInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PropertyInfo.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PropertyInfo.java
index ac1eb33..9060b13 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PropertyInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PropertyInfo.java
@@ -27,6 +27,7 @@ public class PropertyInfo {
   private final boolean pointInTime;
   private String amsId;
   private boolean amsHostMetric;
+  private String unit;
 
   public PropertyInfo(String propertyId, boolean temporal, boolean pointInTime) {
     this.propertyId = propertyId;
@@ -61,4 +62,12 @@ public class PropertyInfo {
   public void setAmsHostMetric(boolean amsHostMetric) {
     this.amsHostMetric = amsHostMetric;
   }
-}
+
+  public String getUnit() {
+    return unit;
+  }
+
+  public void setUnit(String unit) {
+    this.unit = unit;
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/eb31a92a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
index 497230d..89ba36e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
@@ -251,6 +251,7 @@ public class StackDefinedPropertyProvider implements PropertyProvider
{
       PropertyInfo propertyInfo = new PropertyInfo(metric.getName(),
         metric.isTemporal(), metric.isPointInTime());
       propertyInfo.setAmsHostMetric(metric.isAmsHostMetric());
+      propertyInfo.setUnit(metric.getUnit());
       defs.put(entry.getKey(), propertyInfo);
     }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/eb31a92a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java
index cce4909..cde8581 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java
@@ -434,6 +434,7 @@ public class PropertyHelper {
               metric.isTemporal(), metric.isPointInTime());
             propertyInfo.setAmsId(metric.getAmsId());
             propertyInfo.setAmsHostMetric(metric.isAmsHostMetric());
+            propertyInfo.setUnit(metric.getUnit());
             metrics.put(property, propertyInfo);
           }
           componentMetrics.put(componentEntry.getKey(), metrics);
@@ -489,14 +490,16 @@ public class PropertyHelper {
     private boolean temporal;
     private String amsId;
     private boolean amsHostMetric;
+    private String unit = "unitless";
 
     private Metric() {
     }
 
-    protected Metric(String metric, boolean pointInTime, boolean temporal) {
+    protected Metric(String metric, boolean pointInTime, boolean temporal, String unit) {
       this.metric = metric;
       this.pointInTime = pointInTime;
       this.temporal = temporal;
+      this.unit = unit;
     }
 
     public String getMetric() {
@@ -538,5 +541,13 @@ public class PropertyHelper {
     public void setAmsHostMetric(boolean amsHostMetric) {
       this.amsHostMetric = amsHostMetric;
     }
+
+    public void setUnit(String unit) {
+      this.unit = unit;
+    }
+
+    public String getUnit() {
+      return unit;
+    }
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/eb31a92a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/Metric.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/Metric.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/Metric.java
index 4debef5..ef2e7c6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/Metric.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/Metric.java
@@ -22,16 +22,18 @@ public class Metric {
   private boolean pointInTime = false;
   private boolean temporal = false;
   private boolean amsHostMetric = false;
+  private String unit = "unitless";
 
   public Metric() {
   }
 
   public Metric(String metric, boolean pointInTime, boolean temporal,
-                boolean amsHostMetric) {
+                boolean amsHostMetric, String unit) {
     this.metric = metric;
     this.pointInTime = pointInTime;
     this.temporal = temporal;
     this.amsHostMetric = amsHostMetric;
+    this.unit = unit;
   }
 
   public String getName() {
@@ -52,4 +54,8 @@ public class Metric {
   public boolean isAmsHostMetric() {
     return amsHostMetric;
   }
+
+  public String getUnit() {
+    return unit;
+  }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/eb31a92a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
index 290ac73..1682a00 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
@@ -317,31 +317,37 @@
             },
             "metrics/hbase/regionserver/Server/Get_95th_percentile": {
               "metric": "regionserver.Server.Get_95th_percentile",
+              "unit": "ms",
               "pointInTime": true,
               "temporal": true
             },
             "metrics/hbase/regionserver/Server/ScanNext_95th_percentile": {
               "metric": "regionserver.Server.ScanNext_95th_percentile",
+              "unit": "ms",
               "pointInTime": true,
               "temporal": true
             },
             "metrics/hbase/regionserver/Server/Mutate_95th_percentile": {
               "metric": "regionserver.Server.Mutate_95th_percentile",
+              "unit": "ms",
               "pointInTime": true,
               "temporal": true
             },
             "metrics/hbase/regionserver/Server/Increment_95th_percentile": {
               "metric": "regionserver.Server.Increment_95th_percentile",
+              "unit": "ms",
               "pointInTime": true,
               "temporal": true
             },
             "metrics/hbase/regionserver/Server/Append_95th_percentile": {
               "metric": "regionserver.Server.Append_95th_percentile",
+              "unit": "ms",
               "pointInTime": true,
               "temporal": true
             },
             "metrics/hbase/regionserver/Server/Delete_95th_percentile": {
               "metric": "regionserver.Server.Delete_95th_percentile",
+              "unit": "ms",
               "pointInTime": true,
               "temporal": true
             },
@@ -637,6 +643,7 @@
             },
             "metrics/hbase/regionserver/deleteRequestLatency_95th_percentile": {
               "metric": "regionserver.Server.Delete_95th_percentile",
+              "unit": "ms",
               "pointInTime": false,
               "temporal": true
             },
@@ -1399,6 +1406,7 @@
             },
             "metrics/hbase/regionserver/putRequestLatency_95th_percentile": {
               "metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.Mutate_95th_percentile",
+              "unit": "ms",
               "pointInTime": true,
               "temporal": false
             },
@@ -1519,11 +1527,13 @@
             },
             "metrics/hbase/regionserver/getRequestLatency_95th_percentile": {
               "metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.Get_95th_percentile",
+              "unit": "ms",
               "pointInTime": true,
               "temporal": false
             },
             "metrics/hbase/regionserver/deleteRequestLatency_95th_percentile": {
               "metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.Delete_95th_percentile",
+              "unit": "ms",
               "pointInTime": true,
               "temporal": false
             },
@@ -1792,6 +1802,7 @@
             },
             "metrics/hbase/regionserver/putRequestLatency_95th_percentile": {
               "metric": "regionserver.Server.Mutate_95th_percentile",
+              "unit": "ms",
               "pointInTime": false,
               "temporal": true
             },
@@ -2162,11 +2173,13 @@
             },
             "metrics/hbase/regionserver/deleteRequestLatency_95th_percentile": {
               "metric": "regionserver.Server.Delete_95th_percentile",
+              "unit": "ms",
               "pointInTime": false,
               "temporal": true
             },
             "metrics/hbase/regionserver/getRequestLatency_95th_percentile": {
               "metric": "regionserver.Server.Get_95th_percentile",
+              "unit": "ms",
               "pointInTime": false,
               "temporal": true
             },
@@ -2477,6 +2490,7 @@
             },
             "metrics/regionserver/Server/Append_95th_percentile": {
               "metric": "regionserver.Server.Append_95th_percentile",
+              "unit": "ms",
               "pointInTime": false,
               "temporal": true
             },
@@ -2597,6 +2611,7 @@
             },
             "metrics/regionserver/Server/Increment_95th_percentile": {
               "metric": "regionserver.Server.Increment_95th_percentile",
+              "unit": "ms",
               "pointInTime": false,
               "temporal": true
             },
@@ -2697,6 +2712,7 @@
             },
             "metrics/regionserver/Server/ScanNext_95th_percentile": {
               "metric": "regionserver.Server.ScanNext_95th_percentile",
+              "unit": "ms",
               "pointInTime": false,
               "temporal": true
             },
@@ -3034,6 +3050,7 @@
             },
             "metrics/hbase/regionserver/putRequestLatency_95th_percentile": {
               "metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.Mutate_95th_percentile",
+              "unit": "ms",
               "pointInTime": true,
               "temporal": false
             },
@@ -3154,11 +3171,13 @@
             },
             "metrics/hbase/regionserver/getRequestLatency_95th_percentile": {
               "metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.Get_95th_percentile",
+              "unit": "ms",
               "pointInTime": true,
               "temporal": false
             },
             "metrics/hbase/regionserver/deleteRequestLatency_95th_percentile": {
               "metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.Delete_95th_percentile",
+              "unit": "ms",
               "pointInTime": true,
               "temporal": false
             },

http://git-wip-us.apache.org/repos/asf/ambari/blob/eb31a92a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
index 53575de..a96d45c 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
@@ -77,6 +77,7 @@
             },
             "metrics/jvm/memNonHeapUsedM": {
               "metric": "jvm.JvmMetrics.MemNonHeapUsedM",
+              "unit": "MB",
               "pointInTime": false,
               "temporal": true
             },
@@ -462,6 +463,7 @@
             },
             "metrics/jvm/memHeapUsedM": {
               "metric": "jvm.JvmMetrics.MemHeapUsedM",
+              "unit": "MB",
               "pointInTime": false,
               "temporal": true
             },
@@ -774,6 +776,7 @@
             },
             "metrics/jvm/memNonHeapUsedM": {
               "metric": "Hadoop:service=NameNode,name=JvmMetrics.MemNonHeapUsedM",
+              "unit": "MB",
               "pointInTime": true,
               "temporal": false
             },
@@ -1154,6 +1157,7 @@
             },
             "metrics/jvm/memHeapUsedM": {
               "metric": "Hadoop:service=NameNode,name=JvmMetrics.MemHeapUsedM",
+              "unit": "MB",
               "pointInTime": true,
               "temporal": false
             },
@@ -1597,6 +1601,7 @@
             },
             "metrics/jvm/memNonHeapUsedM": {
               "metric": "jvm.JvmMetrics.MemNonHeapUsedM",
+              "unit": "MB",
               "pointInTime": false,
               "temporal": true
             },
@@ -1962,6 +1967,7 @@
             },
             "metrics/jvm/memHeapUsedM": {
               "metric": "jvm.JvmMetrics.MemHeapUsedM",
+              "unit": "MB",
               "pointInTime": false,
               "temporal": true
             },
@@ -2244,6 +2250,7 @@
             },
             "metrics/jvm/memNonHeapUsedM": {
               "metric": "Hadoop:service=NameNode,name=JvmMetrics.MemNonHeapUsedM",
+              "unit": "MB",
               "pointInTime": true,
               "temporal": false
             },
@@ -2574,6 +2581,7 @@
             },
             "metrics/jvm/memHeapUsedM": {
               "metric": "Hadoop:service=NameNode,name=JvmMetrics.MemHeapUsedM",
+              "unit": "MB",
               "pointInTime": true,
               "temporal": false
             },
@@ -2980,6 +2988,7 @@
             },
             "metrics/jvm/memNonHeapUsedM": {
               "metric": "jvm.JvmMetrics.MemNonHeapUsedM",
+              "unit": "MB",
               "pointInTime": true,
               "temporal": true
             },
@@ -3275,6 +3284,7 @@
             },
             "metrics/jvm/memHeapCommittedM": {
               "metric": "jvm.JvmMetrics.MemHeapCommittedM",
+              "unit": "MB",
               "pointInTime": true,
               "temporal": true
             },
@@ -4215,6 +4225,7 @@
             },
             "metrics/jvm/memHeapUsedM": {
               "metric": "jvm.JvmMetrics.MemHeapUsedM",
+              "unit": "MB",
               "pointInTime": true,
               "temporal": true
             },
@@ -4673,6 +4684,7 @@
             },
             "metrics/jvm/memNonHeapUsedM": {
               "metric": "jvm.JvmMetrics.MemNonHeapUsedM",
+              "unit": "MB",
               "pointInTime": false,
               "temporal": true
             },
@@ -4948,6 +4960,7 @@
             },
             "metrics/jvm/memHeapCommittedM": {
               "metric": "jvm.JvmMetrics.MemHeapCommittedM",
+              "unit": "MB",
               "pointInTime": false,
               "temporal": true
             },
@@ -5843,6 +5856,7 @@
             },
             "metrics/jvm/memHeapUsedM": {
               "metric": "jvm.JvmMetrics.MemHeapUsedM",
+              "unit": "MB",
               "pointInTime": false,
               "temporal": true
             },
@@ -6155,6 +6169,7 @@
             },
             "metrics/jvm/memNonHeapUsedM": {
               "metric": "Hadoop:service=DataNode,name=JvmMetrics.MemNonHeapUsedM",
+              "unit": "MB",
               "pointInTime": true,
               "temporal": false
             },
@@ -6255,6 +6270,7 @@
             },
             "metrics/jvm/memHeapUsedM": {
               "metric": "Hadoop:service=DataNode,name=JvmMetrics.MemHeapUsedM",
+              "unit": "MB",
               "pointInTime": true,
               "temporal": false
             },
@@ -6531,6 +6547,7 @@
             },
             "metrics/jvm/memNonHeapUsedM": {
               "metric": "jvm.JvmMetrics.MemNonHeapUsedM",
+              "unit": "MB",
               "pointInTime": true,
               "temporal": true
             },
@@ -6696,6 +6713,7 @@
             },
             "metrics/jvm/memHeapCommittedM": {
               "metric": "jvm.JvmMetrics.MemHeapCommittedM",
+              "unit": "MB",
               "pointInTime": true,
               "temporal": true
             },
@@ -6786,6 +6804,7 @@
             },
             "metrics/jvm/memHeapUsedM": {
               "metric": "jvm.JvmMetrics.MemHeapUsedM",
+              "unit": "MB",
               "pointInTime": true,
               "temporal": true
             },
@@ -6985,6 +7004,7 @@
             },
             "metrics/jvm/memNonHeapUsedM": {
               "metric": "jvm.JvmMetrics.MemNonHeapUsedM",
+              "unit": "MB",
               "pointInTime": false,
               "temporal": true
             },
@@ -7150,6 +7170,7 @@
             },
             "metrics/jvm/memHeapCommittedM": {
               "metric": "jvm.JvmMetrics.MemHeapCommittedM",
+              "unit": "MB",
               "pointInTime": false,
               "temporal": true
             },
@@ -7240,6 +7261,7 @@
             },
             "metrics/jvm/memHeapUsedM": {
               "metric": "jvm.JvmMetrics.MemHeapUsedM",
+              "unit": "MB",
               "pointInTime": false,
               "temporal": true
             },
@@ -7462,6 +7484,7 @@
             },
             "metrics/jvm/memNonHeapUsedM": {
               "metric": "Hadoop:service=JournalNode,name=JvmMetrics.MemNonHeapUsedM",
+              "unit": "MB",
               "pointInTime": true,
               "temporal": false
             },
@@ -7552,6 +7575,7 @@
             },
             "metrics/jvm/memHeapUsedM": {
               "metric": "Hadoop:service=JournalNode,name=JvmMetrics.MemHeapUsedM",
+              "unit": "MB",
               "pointInTime": true,
               "temporal": false
             },

http://git-wip-us.apache.org/repos/asf/ambari/blob/eb31a92a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java
index 8e5d017..f4c212c 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java
@@ -125,6 +125,7 @@ public class StackArtifactResourceProviderTest {
     Metric m2 = md.getMetrics().get("metrics/rpc/closeRegion_num_ops");
     Assert.assertEquals(326, md.getMetrics().size());
     Assert.assertTrue(m1.isAmsHostMetric());
+    Assert.assertEquals("unitless", m1.getUnit());
     Assert.assertFalse(m2.isAmsHostMetric());
 
     verify(managementController);

http://git-wip-us.apache.org/repos/asf/ambari/blob/eb31a92a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
index 295fd52..1534226 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
@@ -74,14 +74,14 @@ public class RestMetricsPropertyProviderTest {
     metricsProperties.put("port_config_type", "storm-site");
     metricsProperties.put("port_property_name", "storm.port");
     metricsProperties.put("protocol", "http");
-    componentMetrics.put("metrics/api/cluster/summary/tasks.total", new Metric("/api/cluster/summary##tasks.total",
false, false, false));
-    componentMetrics.put("metrics/api/cluster/summary/slots.total", new Metric("/api/cluster/summary##slots.total",
false, false, false));
-    componentMetrics.put("metrics/api/cluster/summary/slots.free", new Metric("/api/cluster/summary##slots.free",
false, false, false));
-    componentMetrics.put("metrics/api/cluster/summary/supervisors", new Metric("/api/cluster/summary##supervisors",
false, false, false));
-    componentMetrics.put("metrics/api/cluster/summary/executors.total", new Metric("/api/cluster/summary##executors.total",
false, false, false));
-    componentMetrics.put("metrics/api/cluster/summary/slots.used", new Metric("/api/cluster/summary##slots.used",
false, false, false));
-    componentMetrics.put("metrics/api/cluster/summary/topologies", new Metric("/api/cluster/summary##topologies",
false, false, false));
-    componentMetrics.put("metrics/api/cluster/summary/nimbus.uptime", new Metric("/api/cluster/summary##nimbus.uptime",
false, false, false));
+    componentMetrics.put("metrics/api/cluster/summary/tasks.total", new Metric("/api/cluster/summary##tasks.total",
false, false, false, "unitless"));
+    componentMetrics.put("metrics/api/cluster/summary/slots.total", new Metric("/api/cluster/summary##slots.total",
false, false, false, "unitless"));
+    componentMetrics.put("metrics/api/cluster/summary/slots.free", new Metric("/api/cluster/summary##slots.free",
false, false, false, "unitless"));
+    componentMetrics.put("metrics/api/cluster/summary/supervisors", new Metric("/api/cluster/summary##supervisors",
false, false, false, "unitless"));
+    componentMetrics.put("metrics/api/cluster/summary/executors.total", new Metric("/api/cluster/summary##executors.total",
false, false, false, "unitless"));
+    componentMetrics.put("metrics/api/cluster/summary/slots.used", new Metric("/api/cluster/summary##slots.used",
false, false, false, "unitless"));
+    componentMetrics.put("metrics/api/cluster/summary/topologies", new Metric("/api/cluster/summary##topologies",
false, false, false, "unitless"));
+    componentMetrics.put("metrics/api/cluster/summary/nimbus.uptime", new Metric("/api/cluster/summary##nimbus.uptime",
false, false, false, "unitless"));
   }
 
 


Mime
View raw message