ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abaranc...@apache.org
Subject [2/3] ambari git commit: AMBARI-9748 - Remove cpu amd memory metrics from metrics.jsone files because they are generated by AMS
Date Tue, 24 Feb 2015 12:44:21 GMT
AMBARI-9748 - Remove cpu amd memory metrics from metrics.jsone files because they are generated by AMS


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

Branch: refs/heads/branch-2.0.0
Commit: 31335a84e5499501d7a002be6fcd31f1c4fd0ea5
Parents: a3e1edb
Author: Artem Baranchuk <abaranchuk@hortonworks.con>
Authored: Tue Feb 24 14:42:33 2015 +0200
Committer: Artem Baranchuk <abaranchuk@hortonworks.con>
Committed: Tue Feb 24 14:42:33 2015 +0200

----------------------------------------------------------------------
 .../HBASE/0.96.0.2.0/metrics.json               | 390 -----------------
 .../common-services/HDFS/2.1.0.2.0/metrics.json | 410 ------------------
 .../STORM/0.9.1.2.1/metrics.json                | 284 -------------
 .../common-services/YARN/2.1.0.2.0/metrics.json | 420 -------------------
 4 files changed, 1504 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/31335a84/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 870aa38..9ebef8a 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
@@ -229,11 +229,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_total": {
-            "metric": "mem_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/jvm/memHeapCommittedM": {
             "metric": "jvm.JvmMetrics.MemHeapCommittedM",
             "pointInTime": true,
@@ -334,11 +329,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_nice": {
-            "metric": "cpu_nice",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/unassign_avg_time": {
             "metric": "rpc.rpc.unassign_avg_time",
             "pointInTime": true,
@@ -634,11 +624,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/memory/mem_free": {
-            "metric": "mem_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/execCoprocessor/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.execCoprocessor.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -694,11 +679,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_cached": {
-            "metric": "mem_cached",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/getConfiguration/aboveOneSec/_num_ops": {
             "metric": "rpc.rpc.getConfiguration.aboveOneSec._num_ops",
             "pointInTime": true,
@@ -909,16 +889,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_user": {
-            "metric": "cpu_user",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/swap_free": {
-            "metric": "swap_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/regionServerReport_num_ops": {
             "metric": "rpc.rpc.regionServerReport_num_ops",
             "pointInTime": true,
@@ -974,11 +944,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/memory/mem_shared": {
-            "metric": "mem_shared",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/abort_num_ops": {
             "metric": "rpc.rpc.abort_num_ops",
             "pointInTime": true,
@@ -1004,11 +969,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_num": {
-            "metric": "cpu_num",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/rollHLogWriter_num_ops": {
             "metric": "rpc.rpc.rollHLogWriter_num_ops",
             "pointInTime": true,
@@ -1154,11 +1114,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_idle": {
-            "metric": "cpu_idle",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/hbase/regionserver/getRequestLatency_75th_percentile": {
             "metric": "regionserver.Server.Get_75th_percentile",
             "pointInTime": false,
@@ -1229,11 +1184,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_wio": {
-            "metric": "cpu_wio",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/getZooKeeper/aboveOneSec/_num_ops": {
             "metric": "rpc.rpc.getZooKeeper.aboveOneSec._num_ops",
             "pointInTime": true,
@@ -1624,11 +1574,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/disk/disk_total": {
-            "metric": "disk_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/get/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.get.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -1799,11 +1744,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/disk/disk_free": {
-            "metric": "disk_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/jvm/threadsWaiting": {
             "metric": "jvm.JvmMetrics.ThreadsWaiting",
             "pointInTime": true,
@@ -1829,11 +1769,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_system": {
-            "metric": "cpu_system",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/hbase/regionserver/requests": {
             "metric": "regionserver.Server.totalRequestCount",
             "pointInTime": false,
@@ -2441,11 +2376,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_idle": {
-            "metric": "cpu_idle",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/hbase/regionserver/getRequestLatency_75th_percentile": {
             "metric": "regionserver.Server.Get_75th_percentile",
             "pointInTime": false,
@@ -2581,11 +2511,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_wio": {
-            "metric": "cpu_wio",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/getConfiguration/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.getConfiguration.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -2631,11 +2556,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_total": {
-            "metric": "mem_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/rollHLogWriter/aboveOneSec/_num_ops": {
             "metric": "rpc.rpc.rollHLogWriter.aboveOneSec._num_ops",
             "pointInTime": true,
@@ -2781,11 +2701,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_nice": {
-            "metric": "cpu_nice",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/bulkLoadHFiles_num_ops": {
             "metric": "rpc.rpc.bulkLoadHFiles_num_ops",
             "pointInTime": true,
@@ -3336,11 +3251,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_free": {
-            "metric": "mem_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/hbase/regionserver/readRequestsCount": {
             "metric": "regionserver.Server.readRequestCount",
             "pointInTime": false,
@@ -3426,16 +3336,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/memory/mem_cached": {
-            "metric": "mem_cached",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/disk/disk_total": {
-            "metric": "disk_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/getConfiguration/aboveOneSec/_num_ops": {
             "metric": "rpc.rpc.getConfiguration.aboveOneSec._num_ops",
             "pointInTime": true,
@@ -3761,11 +3661,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/disk/disk_free": {
-            "metric": "disk_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/unlockRow_num_ops": {
             "metric": "rpc.rpc.unlockRow_num_ops",
             "pointInTime": true,
@@ -3811,21 +3706,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_user": {
-            "metric": "cpu_user",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/swap_free": {
-            "metric": "swap_free",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_system": {
-            "metric": "cpu_system",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/hbase/regionserver/requests": {
             "metric": "regionserver.Server.totalRequestCount",
             "pointInTime": false,
@@ -3951,11 +3831,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/memory/mem_shared": {
-            "metric": "mem_shared",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/hbase/regionserver/getRequestLatency_max": {
             "metric": "regionserver.Server.Get_max",
             "pointInTime": false,
@@ -4006,11 +3881,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_num": {
-            "metric": "cpu_num",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/rollHLogWriter_num_ops": {
             "metric": "rpc.rpc.rollHLogWriter_num_ops",
             "pointInTime": true,
@@ -4505,11 +4375,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_idle": {
-            "metric": "cpu_idle",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/rollHLogWriter/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.rollHLogWriter.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -4635,11 +4500,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_wio": {
-            "metric": "cpu_wio",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/getConfiguration/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.getConfiguration.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -4685,11 +4545,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_total": {
-            "metric": "mem_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/rollHLogWriter/aboveOneSec/_num_ops": {
             "metric": "rpc.rpc.rollHLogWriter.aboveOneSec._num_ops",
             "pointInTime": true,
@@ -4830,11 +4685,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_nice": {
-            "metric": "cpu_nice",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/bulkLoadHFiles_num_ops": {
             "metric": "rpc.rpc.bulkLoadHFiles_num_ops",
             "pointInTime": true,
@@ -5255,11 +5105,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_free": {
-            "metric": "mem_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/execCoprocessor/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.execCoprocessor.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -5305,21 +5150,11 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_cached": {
-            "metric": "mem_cached",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/getConfiguration/aboveOneSec/_num_ops": {
             "metric": "rpc.rpc.getConfiguration.aboveOneSec._num_ops",
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/disk/disk_total": {
-            "metric": "disk_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/get/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.get.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -5610,11 +5445,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/disk/disk_free": {
-            "metric": "disk_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/unlockRow_num_ops": {
             "metric": "rpc.rpc.unlockRow_num_ops",
             "pointInTime": true,
@@ -5655,21 +5485,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_user": {
-            "metric": "cpu_user",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/swap_free": {
-            "metric": "swap_free",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_system": {
-            "metric": "cpu_system",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/exists/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.exists.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -5750,11 +5565,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_shared": {
-            "metric": "mem_shared",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/getProtocolSignature_num_ops": {
             "metric": "rpc.rpc.getProtocolSignature_num_ops",
             "pointInTime": true,
@@ -5775,11 +5585,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_num": {
-            "metric": "cpu_num",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/getProtocolVersion_avg_time": {
             "metric": "rpcdetailed.rpcdetailed.getProtocolVersion_avg_time",
             "pointInTime": true,
@@ -5997,11 +5802,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_idle": {
-            "metric": "cpu_idle",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/rollHLogWriter/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.rollHLogWriter.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -6112,11 +5912,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_wio": {
-            "metric": "cpu_wio",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/getConfiguration/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.getConfiguration.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -6162,11 +5957,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_total": {
-            "metric": "mem_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/rollHLogWriter/aboveOneSec/_num_ops": {
             "metric": "rpc.rpc.rollHLogWriter.aboveOneSec._num_ops",
             "pointInTime": true,
@@ -6302,11 +6092,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_nice": {
-            "metric": "cpu_nice",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/bulkLoadHFiles_num_ops": {
             "metric": "rpc.rpc.bulkLoadHFiles_num_ops",
             "pointInTime": true,
@@ -6702,11 +6487,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_free": {
-            "metric": "mem_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/execCoprocessor/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.execCoprocessor.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -6752,16 +6532,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_cached": {
-            "metric": "mem_cached",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/disk/disk_total": {
-            "metric": "disk_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/getConfiguration/aboveOneSec/_num_ops": {
             "metric": "rpc.rpc.getConfiguration.aboveOneSec._num_ops",
             "pointInTime": true,
@@ -7027,11 +6797,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/disk/disk_free": {
-            "metric": "disk_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/unlockRow_num_ops": {
             "metric": "rpc.rpc.unlockRow_num_ops",
             "pointInTime": true,
@@ -7072,21 +6837,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_user": {
-            "metric": "cpu_user",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/swap_free": {
-            "metric": "swap_free",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_system": {
-            "metric": "cpu_system",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/exists/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.exists.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -7167,11 +6917,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_shared": {
-            "metric": "mem_shared",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/getProtocolSignature_num_ops": {
             "metric": "rpc.rpc.getProtocolSignature_num_ops",
             "pointInTime": true,
@@ -7192,11 +6937,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_num": {
-            "metric": "cpu_num",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/rollHLogWriter_num_ops": {
             "metric": "rpc.rpc.rollHLogWriter_num_ops",
             "pointInTime": true,
@@ -7386,11 +7126,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_idle": {
-            "metric": "cpu_idle",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/modifyTable/aboveOneSec/_num_ops": {
             "metric": "rpc.rpc.modifyTable.aboveOneSec._num_ops",
             "pointInTime": true,
@@ -7486,11 +7221,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_wio": {
-            "metric": "cpu_wio",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/hbase/master/splitTime_num_ops": {
             "metric": "master.FileSystem.HlogSplitTime_num_ops",
             "pointInTime": false,
@@ -7526,11 +7256,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_total": {
-            "metric": "mem_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/jvm/memHeapCommittedM": {
             "metric": "jvm.JvmMetrics.MemHeapCommittedM",
             "pointInTime": true,
@@ -7626,11 +7351,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_nice": {
-            "metric": "cpu_nice",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/bulkLoadHFiles_num_ops": {
             "metric": "rpc.rpc.bulkLoadHFiles_num_ops",
             "pointInTime": true,
@@ -7946,11 +7666,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_free": {
-            "metric": "mem_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/assign_num_ops": {
             "metric": "rpc.rpc.assign_num_ops",
             "pointInTime": true,
@@ -7976,21 +7691,11 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_cached": {
-            "metric": "mem_cached",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/addColumn/aboveOneSec/_num_ops": {
             "metric": "rpc.rpc.addColumn.aboveOneSec._num_ops",
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/disk/disk_total": {
-            "metric": "disk_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/shutdown/aboveOneSec/_num_ops": {
             "metric": "rpc.rpc.shutdown.aboveOneSec._num_ops",
             "pointInTime": true,
@@ -8191,11 +7896,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/disk/disk_free": {
-            "metric": "disk_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/jvm/threadsWaiting": {
             "metric": "jvm.JvmMetrics.ThreadsWaiting",
             "pointInTime": true,
@@ -8231,21 +7931,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_user": {
-            "metric": "cpu_user",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/swap_free": {
-            "metric": "swap_free",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_system": {
-            "metric": "cpu_system",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/regionServerReport_num_ops": {
             "metric": "rpc.rpc.regionServerReport_num_ops",
             "pointInTime": true,
@@ -8316,11 +8001,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_shared": {
-            "metric": "mem_shared",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/getProtocolSignature_num_ops": {
             "metric": "rpc.rpc.getProtocolSignature_num_ops",
             "pointInTime": true,
@@ -8331,11 +8011,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_num": {
-            "metric": "cpu_num",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/rollHLogWriter_num_ops": {
             "metric": "rpc.rpc.rollHLogWriter_num_ops",
             "pointInTime": true,
@@ -10593,11 +10268,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_idle": {
-            "metric": "cpu_idle",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/modifyTable/aboveOneSec/_num_ops": {
             "metric": "rpc.rpc.modifyTable.aboveOneSec._num_ops",
             "pointInTime": true,
@@ -10693,11 +10363,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_wio": {
-            "metric": "cpu_wio",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/hbase/master/splitTime_num_ops": {
             "metric": "master.FileSystem.HlogSplitTime_num_ops",
             "pointInTime": false,
@@ -10733,11 +10398,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_total": {
-            "metric": "mem_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/jvm/memHeapCommittedM": {
             "metric": "jvm.JvmMetrics.MemHeapCommittedM",
             "pointInTime": true,
@@ -10833,11 +10493,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_nice": {
-            "metric": "cpu_nice",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/bulkLoadHFiles_num_ops": {
             "metric": "rpc.rpc.bulkLoadHFiles_num_ops",
             "pointInTime": true,
@@ -11153,11 +10808,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_free": {
-            "metric": "mem_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/assign_num_ops": {
             "metric": "rpc.rpc.assign_num_ops",
             "pointInTime": true,
@@ -11183,21 +10833,11 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_cached": {
-            "metric": "mem_cached",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/addColumn/aboveOneSec/_num_ops": {
             "metric": "rpc.rpc.addColumn.aboveOneSec._num_ops",
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/disk/disk_total": {
-            "metric": "disk_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/shutdown/aboveOneSec/_num_ops": {
             "metric": "rpc.rpc.shutdown.aboveOneSec._num_ops",
             "pointInTime": true,
@@ -11398,11 +11038,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/disk/disk_free": {
-            "metric": "disk_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/jvm/threadsWaiting": {
             "metric": "jvm.JvmMetrics.ThreadsWaiting",
             "pointInTime": true,
@@ -11438,21 +11073,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_user": {
-            "metric": "cpu_user",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/swap_free": {
-            "metric": "swap_free",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_system": {
-            "metric": "cpu_system",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/regionServerReport_num_ops": {
             "metric": "rpc.rpc.regionServerReport_num_ops",
             "pointInTime": true,
@@ -11523,11 +11143,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_shared": {
-            "metric": "mem_shared",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/getProtocolSignature_num_ops": {
             "metric": "rpc.rpc.getProtocolSignature_num_ops",
             "pointInTime": true,
@@ -11538,11 +11153,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_num": {
-            "metric": "cpu_num",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/rollHLogWriter_num_ops": {
             "metric": "rpc.rpc.rollHLogWriter_num_ops",
             "pointInTime": true,

http://git-wip-us.apache.org/repos/asf/ambari/blob/31335a84/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 088626a..0ed53c8 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
@@ -179,11 +179,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_idle": {
-            "metric": "cpu_idle",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/versionRequest_avg_time": {
             "metric": "rpcdetailed.rpcdetailed.VersionRequestAvgTime",
             "pointInTime": true,
@@ -194,11 +189,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_free": {
-            "metric": "mem_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/versionRequest_num_ops": {
             "metric": "rpcdetailed.rpcdetailed.VersionRequestNumOps",
             "pointInTime": true,
@@ -239,16 +229,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/memory/mem_cached": {
-            "metric": "mem_cached",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/disk/disk_total": {
-            "metric": "disk_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/setPermission_avg_time": {
             "metric": "rpcdetailed.rpcdetailed.SetPermissionAvgTime",
             "pointInTime": true,
@@ -289,11 +269,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_wio": {
-            "metric": "cpu_wio",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/create_avg_time": {
             "metric": "rpcdetailed.rpcdetailed.CreateAvgTime",
             "pointInTime": false,
@@ -304,11 +279,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_speed": {
-            "metric": "cpu_speed",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/delete_avg_time": {
             "metric": "rpcdetailed.rpcdetailed.DeleteAvgTime",
             "pointInTime": true,
@@ -364,11 +334,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_total": {
-            "metric": "mem_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/getEditLogSize_num_ops": {
             "metric": "rpcdetailed.rpcdetailed.GetEditLogManifestNumOps",
             "pointInTime": false,
@@ -469,11 +434,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_nice": {
-            "metric": "cpu_nice",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/dfs/namenode/blockReport_num_ops": {
             "metric": "dfs.namenode.BlockReportNumOps",
             "pointInTime": false,
@@ -514,11 +474,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/disk/disk_free": {
-            "metric": "disk_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/dfs/FSNamesystem/BlocksTotal": {
             "metric": "dfs.FSNamesystem.BlocksTotal",
             "pointInTime": false,
@@ -559,26 +514,11 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_user": {
-            "metric": "cpu_user",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/swap_free": {
-            "metric": "swap_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/load/load_five": {
             "metric": "load_five",
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_system": {
-            "metric": "cpu_system",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/dfs/FSNamesystem/CapacityRemainingGB": {
             "metric": "dfs.FSNamesystem.CapacityRemainingGB",
             "pointInTime": false,
@@ -679,11 +619,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/memory/mem_shared": {
-            "metric": "mem_shared",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/dfs/FSNamesystem/UnderReplicatedBlocks": {
             "metric": "dfs.FSNamesystem.UnderReplicatedBlocks",
             "pointInTime": false,
@@ -709,11 +644,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_num": {
-            "metric": "cpu_num",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/getProtocolVersion_avg_time": {
             "metric": "rpcdetailed.rpcdetailed.getProtocolVersion_avg_time",
             "pointInTime": false,
@@ -1596,11 +1526,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_idle": {
-            "metric": "cpu_idle",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/versionRequest_avg_time": {
             "metric": "rpcdetailed.rpcdetailed.VersionRequestAvgTime",
             "pointInTime": true,
@@ -1611,11 +1536,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_free": {
-            "metric": "mem_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/versionRequest_num_ops": {
             "metric": "rpcdetailed.rpcdetailed.VersionRequestNumOps",
             "pointInTime": true,
@@ -1656,16 +1576,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/memory/mem_cached": {
-            "metric": "mem_cached",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/disk/disk_total": {
-            "metric": "disk_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/setPermission_avg_time": {
             "metric": "rpcdetailed.rpcdetailed.SetPermissionAvgTime",
             "pointInTime": true,
@@ -1706,11 +1616,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_wio": {
-            "metric": "cpu_wio",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/create_avg_time": {
             "metric": "rpcdetailed.rpcdetailed.CreateAvgTime",
             "pointInTime": false,
@@ -1721,11 +1626,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_speed": {
-            "metric": "cpu_speed",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/delete_avg_time": {
             "metric": "rpcdetailed.rpcdetailed.DeleteAvgTime",
             "pointInTime": true,
@@ -1781,11 +1681,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_total": {
-            "metric": "mem_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/getEditLogSize_num_ops": {
             "metric": "rpcdetailed.rpcdetailed.GetEditLogManifestNumOps",
             "pointInTime": false,
@@ -1886,11 +1781,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_nice": {
-            "metric": "cpu_nice",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/dfs/namenode/blockReport_num_ops": {
             "metric": "dfs.namenode.BlockReportNumOps",
             "pointInTime": false,
@@ -1931,11 +1821,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/disk/disk_free": {
-            "metric": "disk_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/dfs/FSNamesystem/BlocksTotal": {
             "metric": "dfs.FSNamesystem.BlocksTotal",
             "pointInTime": false,
@@ -1976,26 +1861,11 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_user": {
-            "metric": "cpu_user",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/swap_free": {
-            "metric": "swap_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/load/load_five": {
             "metric": "load_five",
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_system": {
-            "metric": "cpu_system",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/dfs/FSNamesystem/CapacityRemainingGB": {
             "metric": "dfs.FSNamesystem.CapacityRemainingGB",
             "pointInTime": false,
@@ -2096,11 +1966,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/memory/mem_shared": {
-            "metric": "mem_shared",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/dfs/FSNamesystem/UnderReplicatedBlocks": {
             "metric": "dfs.FSNamesystem.UnderReplicatedBlocks",
             "pointInTime": false,
@@ -2126,11 +1991,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_num": {
-            "metric": "cpu_num",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/getProtocolVersion_avg_time": {
             "metric": "rpcdetailed.rpcdetailed.getProtocolVersion_avg_time",
             "pointInTime": false,
@@ -2965,11 +2825,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_idle": {
-            "metric": "cpu_idle",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/rollHLogWriter/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.rollHLogWriter.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -3100,11 +2955,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_wio": {
-            "metric": "cpu_wio",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/getConfiguration/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.getConfiguration.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -3160,11 +3010,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_total": {
-            "metric": "mem_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/rollHLogWriter/aboveOneSec/_num_ops": {
             "metric": "rpc.rpc.rollHLogWriter.aboveOneSec._num_ops",
             "pointInTime": true,
@@ -3305,11 +3150,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_nice": {
-            "metric": "cpu_nice",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/bulkLoadHFiles_num_ops": {
             "metric": "rpc.rpc.bulkLoadHFiles_num_ops",
             "pointInTime": true,
@@ -3780,11 +3620,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_free": {
-            "metric": "mem_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/execCoprocessor/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.execCoprocessor.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -3830,21 +3665,11 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_cached": {
-            "metric": "mem_cached",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/getConfiguration/aboveOneSec/_num_ops": {
             "metric": "rpc.rpc.getConfiguration.aboveOneSec._num_ops",
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/disk/disk_total": {
-            "metric": "disk_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/get/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.get.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -4160,11 +3985,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/disk/disk_free": {
-            "metric": "disk_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/jvm/threadsWaiting": {
             "metric": "jvm.JvmMetrics.ThreadsWaiting",
             "pointInTime": true,
@@ -4210,21 +4030,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_user": {
-            "metric": "cpu_user",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/swap_free": {
-            "metric": "swap_free",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_system": {
-            "metric": "cpu_system",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/exists/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.exists.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -4315,11 +4120,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_shared": {
-            "metric": "mem_shared",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/getProtocolSignature_num_ops": {
             "metric": "rpc.rpc.getProtocolSignature_num_ops",
             "pointInTime": true,
@@ -4340,11 +4140,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_num": {
-            "metric": "cpu_num",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/getProtocolVersion_avg_time": {
             "metric": "rpcdetailed.rpcdetailed.getProtocolVersion_avg_time",
             "pointInTime": true,
@@ -4592,11 +4387,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_idle": {
-            "metric": "cpu_idle",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/rollHLogWriter/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.rollHLogWriter.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -4712,11 +4502,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_wio": {
-            "metric": "cpu_wio",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/getConfiguration/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.getConfiguration.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -4772,11 +4557,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_total": {
-            "metric": "mem_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/rollHLogWriter/aboveOneSec/_num_ops": {
             "metric": "rpc.rpc.rollHLogWriter.aboveOneSec._num_ops",
             "pointInTime": true,
@@ -4912,11 +4692,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_nice": {
-            "metric": "cpu_nice",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/bulkLoadHFiles_num_ops": {
             "metric": "rpc.rpc.bulkLoadHFiles_num_ops",
             "pointInTime": true,
@@ -5362,11 +5137,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_free": {
-            "metric": "mem_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/execCoprocessor/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.execCoprocessor.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -5412,21 +5182,11 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_cached": {
-            "metric": "mem_cached",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/getConfiguration/aboveOneSec/_num_ops": {
             "metric": "rpc.rpc.getConfiguration.aboveOneSec._num_ops",
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/disk/disk_total": {
-            "metric": "disk_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/get/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.get.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -5712,11 +5472,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/disk/disk_free": {
-            "metric": "disk_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/jvm/threadsWaiting": {
             "metric": "jvm.JvmMetrics.ThreadsWaiting",
             "pointInTime": false,
@@ -5762,21 +5517,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_user": {
-            "metric": "cpu_user",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/swap_free": {
-            "metric": "swap_free",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_system": {
-            "metric": "cpu_system",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/exists/aboveOneSec/_avg_time": {
             "metric": "rpc.rpc.exists.aboveOneSec._avg_time",
             "pointInTime": true,
@@ -5867,11 +5607,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_shared": {
-            "metric": "mem_shared",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/getProtocolSignature_num_ops": {
             "metric": "rpc.rpc.getProtocolSignature_num_ops",
             "pointInTime": true,
@@ -5892,11 +5627,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_num": {
-            "metric": "cpu_num",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/rollHLogWriter_num_ops": {
             "metric": "rpc.rpc.rollHLogWriter_num_ops",
             "pointInTime": true,
@@ -6501,11 +6231,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_idle": {
-            "metric": "cpu_idle",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/dfs/journalNode/syncs60s99thPercentileLatencyMicros": {
             "metric": "dfs.JournalNode.Syncs60s99thPercentileLatencyMicros",
             "pointInTime": true,
@@ -6516,11 +6241,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_free": {
-            "metric": "mem_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/dfs/journalNode/syncs300s50thPercentileLatencyMicros": {
             "metric": "dfs.JournalNode.Syncs300s50thPercentileLatencyMicros",
             "pointInTime": true,
@@ -6551,16 +6271,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_cached": {
-            "metric": "mem_cached",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/disk/disk_total": {
-            "metric": "disk_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/dfs/journalNode/lastPromisedEpoch": {
             "metric": "dfs.JournalNode.LastPromisedEpoch",
             "pointInTime": true,
@@ -6586,21 +6296,11 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_wio": {
-            "metric": "cpu_wio",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/acceptRecovery_avg_time": {
             "metric": "rpcdetailed.rpcdetailed.AcceptRecoveryAvgTime",
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_speed": {
-            "metric": "cpu_speed",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/RpcProcessingTime_avg_time": {
             "metric": "rpc.rpc.RpcProcessingTimeAvgTime",
             "pointInTime": true,
@@ -6621,11 +6321,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_total": {
-            "metric": "mem_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/jvm/memHeapCommittedM": {
             "metric": "jvm.JvmMetrics.MemHeapCommittedM",
             "pointInTime": true,
@@ -6696,11 +6391,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_nice": {
-            "metric": "cpu_nice",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/dfs/journalNode/batchesWritten": {
             "metric": "dfs.JournalNode.BatchesWritten",
             "pointInTime": true,
@@ -6736,11 +6426,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/disk/disk_free": {
-            "metric": "disk_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/newEpoch_avg_time": {
             "metric": "rpcdetailed.rpcdetailed.NewEpochAvgTime",
             "pointInTime": true,
@@ -6776,26 +6461,11 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_user": {
-            "metric": "cpu_user",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/swap_free": {
-            "metric": "swap_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/load/load_five": {
             "metric": "load_five",
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_system": {
-            "metric": "cpu_system",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/getJournalState_avg_time": {
             "metric": "rpcdetailed.rpcdetailed.GetJournalStateAvgTime",
             "pointInTime": true,
@@ -6856,11 +6526,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_shared": {
-            "metric": "mem_shared",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/dfs/journalNode/syncs3600s50thPercentileLatencyMicros": {
             "metric": "dfs.JournalNode.Syncs3600s50thPercentileLatencyMicros",
             "pointInTime": true,
@@ -6876,11 +6541,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_num": {
-            "metric": "cpu_num",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/journal_num_ops": {
             "metric": "rpcdetailed.rpcdetailed.JournalNumOps",
             "pointInTime": true,
@@ -7023,11 +6683,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_idle": {
-            "metric": "cpu_idle",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/dfs/journalNode/syncs60s99thPercentileLatencyMicros": {
             "metric": "dfs.JournalNode.Syncs60s99thPercentileLatencyMicros",
             "pointInTime": true,
@@ -7038,11 +6693,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_free": {
-            "metric": "mem_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/dfs/journalNode/syncs300s50thPercentileLatencyMicros": {
             "metric": "dfs.JournalNode.Syncs300s50thPercentileLatencyMicros",
             "pointInTime": true,
@@ -7073,16 +6723,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/memory/mem_cached": {
-            "metric": "mem_cached",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/disk/disk_total": {
-            "metric": "disk_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/dfs/journalNode/lastPromisedEpoch": {
             "metric": "dfs.JournalNode.LastPromisedEpoch",
             "pointInTime": true,
@@ -7108,21 +6748,11 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_wio": {
-            "metric": "cpu_wio",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/acceptRecovery_avg_time": {
             "metric": "rpcdetailed.rpcdetailed.AcceptRecoveryAvgTime",
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_speed": {
-            "metric": "cpu_speed",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpc/RpcProcessingTime_avg_time": {
             "metric": "rpc.rpc.RpcProcessingTimeAvgTime",
             "pointInTime": false,
@@ -7143,11 +6773,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_total": {
-            "metric": "mem_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/jvm/memHeapCommittedM": {
             "metric": "jvm.JvmMetrics.MemHeapCommittedM",
             "pointInTime": false,
@@ -7218,11 +6843,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_nice": {
-            "metric": "cpu_nice",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/dfs/journalNode/batchesWritten": {
             "metric": "dfs.JournalNode.BatchesWritten",
             "pointInTime": true,
@@ -7258,11 +6878,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/disk/disk_free": {
-            "metric": "disk_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/newEpoch_avg_time": {
             "metric": "rpcdetailed.rpcdetailed.NewEpochAvgTime",
             "pointInTime": false,
@@ -7298,26 +6913,11 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_user": {
-            "metric": "cpu_user",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/swap_free": {
-            "metric": "swap_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/load/load_five": {
             "metric": "load_five",
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_system": {
-            "metric": "cpu_system",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/getJournalState_avg_time": {
             "metric": "rpcdetailed.rpcdetailed.GetJournalStateAvgTime",
             "pointInTime": false,
@@ -7378,11 +6978,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/memory/mem_shared": {
-            "metric": "mem_shared",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/dfs/journalNode/syncs3600s50thPercentileLatencyMicros": {
             "metric": "dfs.JournalNode.Syncs3600s50thPercentileLatencyMicros",
             "pointInTime": true,
@@ -7398,11 +6993,6 @@
             "pointInTime": false,
             "temporal": true
           },
-          "metrics/cpu/cpu_num": {
-            "metric": "cpu_num",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/rpcdetailed/journal_num_ops": {
             "metric": "rpcdetailed.rpcdetailed.JournalNumOps",
             "pointInTime": false,

http://git-wip-us.apache.org/repos/asf/ambari/blob/31335a84/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metrics.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metrics.json b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metrics.json
index c2776ab..3399f4a 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metrics.json
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metrics.json
@@ -134,52 +134,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_idle": {
-            "metric": "cpu_idle",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_nice": {
-            "metric": "cpu_nice",
-            "pointInTime": true,
-            "temporal": true
-          },
-
-          "metrics/cpu/cpu_num": {
-            "metric": "cpu_num",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_speed": {
-            "metric": "cpu_speed",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_system": {
-            "metric": "cpu_system",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_user": {
-            "metric": "cpu_user",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_wio": {
-            "metric": "cpu_wio",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/disk/disk_free": {
-            "metric": "disk_free",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/disk/disk_total": {
-            "metric": "disk_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/load_fifteen": {
             "metric": "load_fifteen",
             "pointInTime": true,
@@ -200,26 +154,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_cached": {
-            "metric": "mem_cached",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/mem_free": {
-            "metric": "mem_free",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/mem_shared": {
-            "metric": "mem_shared",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/mem_total": {
-            "metric": "mem_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/disk/part_max_used": {
             "metric": "part_max_used",
             "pointInTime": true,
@@ -245,11 +179,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/swap_free": {
-            "metric": "swap_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/memory/swap_total": {
             "metric": "swap_total",
             "pointInTime": true,
@@ -373,52 +302,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_idle": {
-            "metric": "cpu_idle",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_nice": {
-            "metric": "cpu_nice",
-            "pointInTime": true,
-            "temporal": true
-          },
-
-          "metrics/cpu/cpu_num": {
-            "metric": "cpu_num",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_speed": {
-            "metric": "cpu_speed",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_system": {
-            "metric": "cpu_system",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_user": {
-            "metric": "cpu_user",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_wio": {
-            "metric": "cpu_wio",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/disk/disk_free": {
-            "metric": "disk_free",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/disk/disk_total": {
-            "metric": "disk_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/load_fifteen": {
             "metric": "load_fifteen",
             "pointInTime": true,
@@ -439,26 +322,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_cached": {
-            "metric": "mem_cached",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/mem_free": {
-            "metric": "mem_free",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/mem_shared": {
-            "metric": "mem_shared",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/mem_total": {
-            "metric": "mem_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/disk/part_max_used": {
             "metric": "part_max_used",
             "pointInTime": true,
@@ -484,11 +347,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/swap_free": {
-            "metric": "swap_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/memory/swap_total": {
             "metric": "swap_total",
             "pointInTime": true,
@@ -579,52 +437,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_idle": {
-            "metric": "cpu_idle",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_nice": {
-            "metric": "cpu_nice",
-            "pointInTime": true,
-            "temporal": true
-          },
-
-          "metrics/cpu/cpu_num": {
-            "metric": "cpu_num",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_speed": {
-            "metric": "cpu_speed",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_system": {
-            "metric": "cpu_system",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_user": {
-            "metric": "cpu_user",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_wio": {
-            "metric": "cpu_wio",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/disk/disk_free": {
-            "metric": "disk_free",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/disk/disk_total": {
-            "metric": "disk_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/load_fifteen": {
             "metric": "load_fifteen",
             "pointInTime": true,
@@ -645,26 +457,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_cached": {
-            "metric": "mem_cached",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/mem_free": {
-            "metric": "mem_free",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/mem_shared": {
-            "metric": "mem_shared",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/mem_total": {
-            "metric": "mem_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/disk/part_max_used": {
             "metric": "part_max_used",
             "pointInTime": true,
@@ -690,11 +482,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/swap_free": {
-            "metric": "swap_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/memory/swap_total": {
             "metric": "swap_total",
             "pointInTime": true,
@@ -839,52 +626,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/cpu/cpu_idle": {
-            "metric": "cpu_idle",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_nice": {
-            "metric": "cpu_nice",
-            "pointInTime": true,
-            "temporal": true
-          },
-
-          "metrics/cpu/cpu_num": {
-            "metric": "cpu_num",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_speed": {
-            "metric": "cpu_speed",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_system": {
-            "metric": "cpu_system",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_user": {
-            "metric": "cpu_user",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/cpu/cpu_wio": {
-            "metric": "cpu_wio",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/disk/disk_free": {
-            "metric": "disk_free",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/disk/disk_total": {
-            "metric": "disk_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/load_fifteen": {
             "metric": "load_fifteen",
             "pointInTime": true,
@@ -905,26 +646,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/mem_cached": {
-            "metric": "mem_cached",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/mem_free": {
-            "metric": "mem_free",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/mem_shared": {
-            "metric": "mem_shared",
-            "pointInTime": true,
-            "temporal": true
-          },
-          "metrics/memory/mem_total": {
-            "metric": "mem_total",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/disk/part_max_used": {
             "metric": "part_max_used",
             "pointInTime": true,
@@ -950,11 +671,6 @@
             "pointInTime": true,
             "temporal": true
           },
-          "metrics/memory/swap_free": {
-            "metric": "swap_free",
-            "pointInTime": true,
-            "temporal": true
-          },
           "metrics/memory/swap_total": {
             "metric": "swap_total",
             "pointInTime": true,


Mime
View raw message