Revert "AMBARI-11934. Sanitize YARN metrics.json. (Ivan Kozlov via Jaimin)"

This reverts commit 6ee32914032850caa452a64e7a2b83658fffecf9.

ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/YARN_metrics.json

@@ -170,7 +170,7 @@
               "temporal": true
             },
             "metrics/mapred/ShuffleOutputsFailed": {
-              "metric": "mapred.ShuffleMetrics.ShuffleOutputsFailed",
+              "metric": "mapred.ShuffleOutputsFailed",
               "pointInTime": true,
               "temporal": true
             },
@@ -185,12 +185,12 @@
               "temporal": true
             },
             "metrics/rpc/rpcAuthorizationFailures": {
-              "metric": "rpc.rpc.RpcAuthorizationFailures",
+              "metric": "rpc.metrics.RpcAuthorizationFailures",
               "pointInTime": false,
               "temporal": true
             },
             "metrics/ugi/loginSuccess_avg_time": {
-              "metric": "ugi.UgiMetrics.LoginSuccessAvgTime",
+              "metric": "ugi.ugi.LoginSuccessAvgTime",
               "pointInTime": false,
               "temporal": true
             },
@@ -345,12 +345,12 @@
               "temporal": true
             },
             "metrics/mapred/ShuffleOutputsOK": {
-              "metric": "mapred.ShuffleMetrics.ShuffleOutputsOK",
+              "metric": "mapred.ShuffleOutputsOK",
               "pointInTime": true,
               "temporal": true
             },
             "metrics/ugi/loginSuccess_num_ops": {
-              "metric": "ugi.UgiMetrics.LoginSuccessNumOps",
+              "metric": "ugi.ugi.LoginSuccessNumOps",
               "pointInTime": false,
               "temporal": true
             },
@@ -364,8 +364,8 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/cpu/cpu_idle": {
-              "metric": "cpu_idle",
+            "metrics/cpu/cpu_aidle": {
+              "metric": "cpu_aidle",
               "pointInTime": true,
               "temporal": true
             },
@@ -395,12 +395,12 @@
               "temporal": true
             },
             "metrics/ugi/loginFailure_num_ops": {
-              "metric": "ugi.UgiMetrics.LoginFailureNumOps",
+              "metric": "ugi.ugi.LoginFailureNumOps",
               "pointInTime": false,
               "temporal": true
             },
             "metrics/mapred/ShuffleConnections": {
-              "metric": "mapred.ShuffleMetrics.ShuffleConnections",
+              "metric": "mapred.ShuffleConnections",
               "pointInTime": true,
               "temporal": true
             },
@@ -410,7 +410,7 @@
               "temporal": true
             },
             "metrics/ugi/loginFailure_avg_time": {
-              "metric": "ugi.UgiMetrics.LoginFailureAvgTime",
+              "metric": "ugi.ugi.LoginFailureAvgTime",
               "pointInTime": false,
               "temporal": true
             },
@@ -430,174 +430,19 @@
               "temporal": true
             },
             "metrics/mapred/ShuffleOutputBytes": {
-              "metric": "mapred.ShuffleMetrics.ShuffleOutputBytes",
+              "metric": "mapred.ShuffleOutputBytes",
               "pointInTime": true,
               "temporal": true
             },
             "metrics/rpc/rpcAuthenticationSuccesses": {
-              "metric": "rpc.rpc.RpcAuthenticationSuccesses",
+              "metric": "rpc.metrics.RpcAuthenticationSuccesses",
               "pointInTime": false,
               "temporal": true
             },
             "metrics/rpc/rpcAuthenticationFailures": {
-              "metric": "rpc.rpc.RpcAuthenticationFailures",
+              "metric": "rpc.metrics.RpcAuthenticationFailures",
               "pointInTime": false,
               "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/GcCountCopy": {
-              "metric": "jvm.JvmMetrics.GcCountCopy",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/GcCountMarkSweepCompact": {
-              "metric": "jvm.JvmMetrics.GcCountMarkSweepCompact",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/GcTimeMillisCopy": {
-              "metric": "jvm.JvmMetrics.GcTimeMillisCopy",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/GcTimeMillisMarkSweepCompact": {
-              "metric": "jvm.JvmMetrics.GcTimeMillisMarkSweepCompact",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/MemHeapMaxM": {
-              "metric": "jvm.JvmMetrics.MemHeapMaxM",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/MemMaxM": {
-              "metric": "jvm.JvmMetrics.MemMaxM",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/MemNonHeapMaxM": {
-              "metric": "jvm.JvmMetrics.MemNonHeapMaxM",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/DroppedPubAll": {
-              "metric": "metricssystem.MetricsSystem.DroppedPubAll",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/NumActiveSinks": {
-              "metric": "metricssystem.MetricsSystem.NumActiveSinks",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/NumActiveSources": {
-              "metric": "metricssystem.MetricsSystem.NumActiveSources",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/NumAllSinks": {
-              "metric": "metricssystem.MetricsSystem.NumAllSinks",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/NumAllSources": {
-              "metric": "metricssystem.MetricsSystem.NumAllSources",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/PublishAvgTime": {
-              "metric": "metricssystem.MetricsSystem.PublishAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/PublishNumOps": {
-              "metric": "metricssystem.MetricsSystem.PublishNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/Sink_timelineAvgTime": {
-              "metric": "metricssystem.MetricsSystem.Sink_timelineAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/Sink_timelineDropped": {
-              "metric": "metricssystem.MetricsSystem.Sink_timelineDropped",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/Sink_timelineNumOps": {
-              "metric": "metricssystem.MetricsSystem.Sink_timelineNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/Sink_timelineQsize": {
-              "metric": "metricssystem.MetricsSystem.Sink_timelineQsize",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/SnapshotAvgTime": {
-              "metric": "metricssystem.MetricsSystem.SnapshotAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/SnapshotNumOps": {
-              "metric": "metricssystem.MetricsSystem.SnapshotNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/rpc/RpcClientBackoff": {
-              "metric": "rpc.rpc.RpcClientBackoff",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetContainerStatusesAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.GetContainerStatusesAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetContainerStatusesNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.GetContainerStatusesNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/HeartbeatAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.HeartbeatAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/HeartbeatNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.HeartbeatNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/StartContainersAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.StartContainersAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/StartContainersNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.StartContainersNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/StopContainersAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.StopContainersAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/StopContainersNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.StopContainersNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/ugi/UgiMetrics/GetGroupsAvgTime": {
-              "metric": "ugi.UgiMetrics.GetGroupsAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/ugi/UgiMetrics/GetGroupsNumOps": {
-              "metric": "ugi.UgiMetrics.GetGroupsNumOps",
-              "pointInTime": true,
-              "temporal": true
             }
           }
         }
@@ -788,7 +633,7 @@
               "temporal": true
             },
             "metrics/mapred/ShuffleOutputsFailed": {
-              "metric": "mapred.ShuffleMetrics.ShuffleOutputsFailed",
+              "metric": "mapred.ShuffleOutputsFailed",
               "pointInTime": true,
               "temporal": true
             },
@@ -803,12 +648,12 @@
               "temporal": true
             },
             "metrics/rpc/rpcAuthorizationFailures": {
-              "metric": "rpc.rpc.RpcAuthorizationFailures",
+              "metric": "rpc.metrics.RpcAuthorizationFailures",
               "pointInTime": false,
               "temporal": true
             },
             "metrics/ugi/loginSuccess_avg_time": {
-              "metric": "ugi.UgiMetrics.LoginSuccessAvgTime",
+              "metric": "ugi.ugi.LoginSuccessAvgTime",
               "pointInTime": false,
               "temporal": true
             },
@@ -862,23 +707,23 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/yarn/AllocatedGB": {
-              "metric": "yarn.NodeManagerMetrics.AllocatedGB",
+            "metrics/yarn/AllocatedVCores": {
+              "metric": "yarn.NodeManagerMetrics.AllocatedVCores",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/yarn/AvailableGB": {
-              "metric": "yarn.NodeManagerMetrics.AvailableGB",
+            "metrics/yarn/AvailableVCores": {
+              "metric": "yarn.NodeManagerMetrics.AvailableVCores",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/yarn/AllocatedVCores": {
-              "metric": "yarn.NodeManagerMetrics.AllocatedVCores",
+            "metrics/yarn/AvailableGB": {
+              "metric": "yarn.NodeManagerMetrics.AvailableGB",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/yarn/AvailableVCores": {
-              "metric": "yarn.NodeManagerMetrics.AvailableVCores",
+            "metrics/yarn/AllocatedGB": {
+              "metric": "yarn.NodeManagerMetrics.AllocatedGB",
               "pointInTime": true,
               "temporal": true
             },
@@ -963,12 +808,12 @@
               "temporal": true
             },
             "metrics/mapred/ShuffleOutputsOK": {
-              "metric": "mapred.ShuffleMetrics.ShuffleOutputsOK",
+              "metric": "mapred.ShuffleOutputsOK",
               "pointInTime": true,
               "temporal": true
             },
             "metrics/ugi/loginSuccess_num_ops": {
-              "metric": "ugi.UgiMetrics.LoginSuccessNumOps",
+              "metric": "ugi.ugi.LoginSuccessNumOps",
               "pointInTime": false,
               "temporal": true
             },
@@ -982,8 +827,8 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/cpu/cpu_idle": {
-              "metric": "cpu_idle",
+            "metrics/cpu/cpu_aidle": {
+              "metric": "cpu_aidle",
               "pointInTime": true,
               "temporal": true
             },
@@ -1013,12 +858,12 @@
               "temporal": true
             },
             "metrics/ugi/loginFailure_num_ops": {
-              "metric": "ugi.UgiMetrics.LoginFailureNumOps",
+              "metric": "ugi.ugi.LoginFailureNumOps",
               "pointInTime": false,
               "temporal": true
             },
             "metrics/mapred/ShuffleConnections": {
-              "metric": "mapred.ShuffleMetrics.ShuffleConnections",
+              "metric": "mapred.ShuffleConnections",
               "pointInTime": true,
               "temporal": true
             },
@@ -1028,7 +873,7 @@
               "temporal": true
             },
             "metrics/ugi/loginFailure_avg_time": {
-              "metric": "ugi.UgiMetrics.LoginFailureAvgTime",
+              "metric": "ugi.ugi.LoginFailureAvgTime",
               "pointInTime": false,
               "temporal": true
             },
@@ -1048,174 +893,19 @@
               "temporal": true
             },
             "metrics/mapred/ShuffleOutputBytes": {
-              "metric": "mapred.ShuffleMetrics.ShuffleOutputBytes",
+              "metric": "mapred.ShuffleOutputBytes",
               "pointInTime": true,
               "temporal": true
             },
             "metrics/rpc/rpcAuthenticationSuccesses": {
-              "metric": "rpc.rpc.RpcAuthenticationSuccesses",
+              "metric": "rpc.metrics.RpcAuthenticationSuccesses",
               "pointInTime": false,
               "temporal": true
             },
             "metrics/rpc/rpcAuthenticationFailures": {
-              "metric": "rpc.rpc.RpcAuthenticationFailures",
+              "metric": "rpc.metrics.RpcAuthenticationFailures",
               "pointInTime": false,
               "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/GcCountCopy": {
-              "metric": "jvm.JvmMetrics.GcCountCopy",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/GcCountMarkSweepCompact": {
-              "metric": "jvm.JvmMetrics.GcCountMarkSweepCompact",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/GcTimeMillisCopy": {
-              "metric": "jvm.JvmMetrics.GcTimeMillisCopy",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/GcTimeMillisMarkSweepCompact": {
-              "metric": "jvm.JvmMetrics.GcTimeMillisMarkSweepCompact",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/MemHeapMaxM": {
-              "metric": "jvm.JvmMetrics.MemHeapMaxM",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/MemMaxM": {
-              "metric": "jvm.JvmMetrics.MemMaxM",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/MemNonHeapMaxM": {
-              "metric": "jvm.JvmMetrics.MemNonHeapMaxM",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/DroppedPubAll": {
-              "metric": "metricssystem.MetricsSystem.DroppedPubAll",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/NumActiveSinks": {
-              "metric": "metricssystem.MetricsSystem.NumActiveSinks",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/NumActiveSources": {
-              "metric": "metricssystem.MetricsSystem.NumActiveSources",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/NumAllSinks": {
-              "metric": "metricssystem.MetricsSystem.NumAllSinks",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/NumAllSources": {
-              "metric": "metricssystem.MetricsSystem.NumAllSources",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/PublishAvgTime": {
-              "metric": "metricssystem.MetricsSystem.PublishAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/PublishNumOps": {
-              "metric": "metricssystem.MetricsSystem.PublishNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/Sink_timelineAvgTime": {
-              "metric": "metricssystem.MetricsSystem.Sink_timelineAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/Sink_timelineDropped": {
-              "metric": "metricssystem.MetricsSystem.Sink_timelineDropped",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/Sink_timelineNumOps": {
-              "metric": "metricssystem.MetricsSystem.Sink_timelineNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/Sink_timelineQsize": {
-              "metric": "metricssystem.MetricsSystem.Sink_timelineQsize",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/SnapshotAvgTime": {
-              "metric": "metricssystem.MetricsSystem.SnapshotAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/SnapshotNumOps": {
-              "metric": "metricssystem.MetricsSystem.SnapshotNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/rpc/RpcClientBackoff": {
-              "metric": "rpc.rpc.RpcClientBackoff",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetContainerStatusesAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.GetContainerStatusesAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetContainerStatusesNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.GetContainerStatusesNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/HeartbeatAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.HeartbeatAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/HeartbeatNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.HeartbeatNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/StartContainersAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.StartContainersAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/StartContainersNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.StartContainersNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/StopContainersAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.StopContainersAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/StopContainersNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.StopContainersNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/ugi/UgiMetrics/GetGroupsAvgTime": {
-              "metric": "ugi.UgiMetrics.GetGroupsAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/ugi/UgiMetrics/GetGroupsNumOps": {
-              "metric": "ugi.UgiMetrics.GetGroupsNumOps",
-              "pointInTime": true,
-              "temporal": true
             }
           }
         }
@@ -1481,7 +1171,7 @@
               "temporal": true
             },
             "metrics/ugi/loginSuccess_avg_time": {
-              "metric": "ugi.UgiMetrics.LoginSuccessAvgTime",
+              "metric": "ugi.ugi.LoginSuccessAvgTime",
               "pointInTime": false,
               "temporal": true
             },
@@ -1711,7 +1401,7 @@
               "temporal": true
             },
             "metrics/ugi/loginSuccess_num_ops": {
-              "metric": "ugi.UgiMetrics.LoginSuccessNumOps",
+              "metric": "ugi.ugi.LoginSuccessNumOps",
               "pointInTime": false,
               "temporal": true
             },
@@ -1745,8 +1435,8 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/cpu/cpu_idle": {
-              "metric": "cpu_idle",
+            "metrics/cpu/cpu_aidle": {
+              "metric": "cpu_aidle",
               "pointInTime": true,
               "temporal": true
             },
@@ -1821,7 +1511,7 @@
               "temporal": true
             },
             "metrics/ugi/loginFailure_num_ops": {
-              "metric": "ugi.UgiMetrics.LoginFailureNumOps",
+              "metric": "ugi.ugi.LoginFailureNumOps",
               "pointInTime": false,
               "temporal": true
             },
@@ -1856,7 +1546,7 @@
               "temporal": true
             },
             "metrics/ugi/loginFailure_avg_time": {
-              "metric": "ugi.UgiMetrics.LoginFailureAvgTime",
+              "metric": "ugi.ugi.LoginFailureAvgTime",
               "pointInTime": false,
               "temporal": true
             },
@@ -1919,201 +1609,6 @@
               "metric": "yarn.QueueMetrics.Queue=(.+).ReservedContainers",
               "pointInTime": false,
               "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/GcCountMarkSweepCompact": {
-              "metric": "jvm.JvmMetrics.GcCountMarkSweepCompact",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/MemHeapMaxM": {
-              "metric": "jvm.JvmMetrics.MemHeapMaxM",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/MemNonHeapMaxM": {
-              "metric": "jvm.JvmMetrics.MemNonHeapMaxM",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/ThreadsBlocked": {
-              "metric": "jvm.JvmMetrics.ThreadsBlocked",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/DroppedPubAll": {
-              "metric": "metricssystem.MetricsSystem.DroppedPubAll",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/NumActiveSinks": {
-              "metric": "metricssystem.MetricsSystem.NumActiveSinks",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/NumActiveSources": {
-              "metric": "metricssystem.MetricsSystem.NumActiveSources",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/NumAllSinks": {
-              "metric": "metricssystem.MetricsSystem.NumAllSinks",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/NumAllSources": {
-              "metric": "metricssystem.MetricsSystem.NumAllSources",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/PublishAvgTime": {
-              "metric": "metricssystem.MetricsSystem.PublishAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/PublishNumOps": {
-              "metric": "metricssystem.MetricsSystem.PublishNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/Sink_timelineAvgTime": {
-              "metric": "metricssystem.MetricsSystem.Sink_timelineAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/Sink_timelineDropped": {
-              "metric": "metricssystem.MetricsSystem.Sink_timelineDropped",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/Sink_timelineNumOps": {
-              "metric": "metricssystem.MetricsSystem.Sink_timelineNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/Sink_timelineQsize": {
-              "metric": "metricssystem.MetricsSystem.Sink_timelineQsize",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/SnapshotAvgTime": {
-              "metric": "metricssystem.MetricsSystem.SnapshotAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/SnapshotNumOps": {
-              "metric": "metricssystem.MetricsSystem.SnapshotNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/rpc/RpcAuthenticationFailures": {
-              "metric": "rpc.rpc.RpcAuthenticationFailures",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/rpc/RpcAuthenticationSuccesses": {
-              "metric": "rpc.rpc.RpcAuthenticationSuccesses",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/rpc/RpcAuthorizationFailures": {
-              "metric": "rpc.rpc.RpcAuthorizationFailures",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/rpc/RpcClientBackoff": {
-              "metric": "rpc.rpc.RpcClientBackoff",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/AllocateNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.AllocateNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetClusterMetricsAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.GetClusterMetricsAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetClusterMetricsNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.GetClusterMetricsNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetClusterNodesAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.GetClusterNodesAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetClusterNodesNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.GetClusterNodesNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetQueueInfoAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.GetQueueInfoAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetQueueInfoNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.GetQueueInfoNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetQueueUserAclsAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.GetQueueUserAclsAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetQueueUserAclsNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.GetQueueUserAclsNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/NodeHeartbeatNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.NodeHeartbeatNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/RegisterNodeManagerAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.RegisterNodeManagerAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/RegisterNodeManagerNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.RegisterNodeManagerNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/ugi/UgiMetrics/GetGroupsAvgTime": {
-              "metric": "ugi.UgiMetrics.GetGroupsAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/ugi/UgiMetrics/GetGroupsNumOps": {
-              "metric": "ugi.UgiMetrics.GetGroupsNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/ClusterMetrics/AMLaunchDelayAvgTime": {
-              "metric": "yarn.ClusterMetrics.AMLaunchDelayAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/ClusterMetrics/AMLaunchDelayNumOps": {
-              "metric": "yarn.ClusterMetrics.AMLaunchDelayNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/ClusterMetrics/AMRegisterDelayAvgTime": {
-              "metric": "yarn.ClusterMetrics.AMRegisterDelayAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/ClusterMetrics/AMRegisterDelayNumOps": {
-              "metric": "yarn.ClusterMetrics.AMRegisterDelayNumOps",
-              "pointInTime": true,
-              "temporal": true
             }
           }
         }
@@ -2582,7 +2077,7 @@
               "temporal": true
             },
             "metrics/ugi/loginSuccess_avg_time": {
-              "metric": "ugi.UgiMetrics.LoginSuccessAvgTime",
+              "metric": "ugi.ugi.LoginSuccessAvgTime",
               "pointInTime": false,
               "temporal": true
             },
@@ -2812,7 +2307,7 @@
               "temporal": true
             },
             "metrics/ugi/loginSuccess_num_ops": {
-              "metric": "ugi.UgiMetrics.LoginSuccessNumOps",
+              "metric": "ugi.ugi.LoginSuccessNumOps",
               "pointInTime": false,
               "temporal": true
             },
@@ -2846,8 +2341,8 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/cpu/cpu_idle": {
-              "metric": "cpu_idle",
+            "metrics/cpu/cpu_aidle": {
+              "metric": "cpu_aidle",
               "pointInTime": true,
               "temporal": true
             },
@@ -2922,7 +2417,7 @@
               "temporal": true
             },
             "metrics/ugi/loginFailure_num_ops": {
-              "metric": "ugi.UgiMetrics.LoginFailureNumOps",
+              "metric": "ugi.ugi.LoginFailureNumOps",
               "pointInTime": false,
               "temporal": true
             },
@@ -2957,7 +2452,7 @@
               "temporal": true
             },
             "metrics/ugi/loginFailure_avg_time": {
-              "metric": "ugi.UgiMetrics.LoginFailureAvgTime",
+              "metric": "ugi.ugi.LoginFailureAvgTime",
               "pointInTime": false,
               "temporal": true
             },
@@ -3020,201 +2515,6 @@
               "metric": "yarn.QueueMetrics.Queue=(.+).ReservedContainers",
               "pointInTime": false,
               "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/GcCountMarkSweepCompact": {
-              "metric": "jvm.JvmMetrics.GcCountMarkSweepCompact",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/MemHeapMaxM": {
-              "metric": "jvm.JvmMetrics.MemHeapMaxM",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/MemNonHeapMaxM": {
-              "metric": "jvm.JvmMetrics.MemNonHeapMaxM",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/jvm/JvmMetrics/ThreadsBlocked": {
-              "metric": "jvm.JvmMetrics.ThreadsBlocked",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/DroppedPubAll": {
-              "metric": "metricssystem.MetricsSystem.DroppedPubAll",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/NumActiveSinks": {
-              "metric": "metricssystem.MetricsSystem.NumActiveSinks",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/NumActiveSources": {
-              "metric": "metricssystem.MetricsSystem.NumActiveSources",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/NumAllSinks": {
-              "metric": "metricssystem.MetricsSystem.NumAllSinks",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/NumAllSources": {
-              "metric": "metricssystem.MetricsSystem.NumAllSources",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/PublishAvgTime": {
-              "metric": "metricssystem.MetricsSystem.PublishAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/PublishNumOps": {
-              "metric": "metricssystem.MetricsSystem.PublishNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/Sink_timelineAvgTime": {
-              "metric": "metricssystem.MetricsSystem.Sink_timelineAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/Sink_timelineDropped": {
-              "metric": "metricssystem.MetricsSystem.Sink_timelineDropped",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/Sink_timelineNumOps": {
-              "metric": "metricssystem.MetricsSystem.Sink_timelineNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/Sink_timelineQsize": {
-              "metric": "metricssystem.MetricsSystem.Sink_timelineQsize",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/SnapshotAvgTime": {
-              "metric": "metricssystem.MetricsSystem.SnapshotAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/metricssystem/MetricsSystem/SnapshotNumOps": {
-              "metric": "metricssystem.MetricsSystem.SnapshotNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/rpc/RpcAuthenticationFailures": {
-              "metric": "rpc.rpc.RpcAuthenticationFailures",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/rpc/RpcAuthenticationSuccesses": {
-              "metric": "rpc.rpc.RpcAuthenticationSuccesses",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/rpc/RpcAuthorizationFailures": {
-              "metric": "rpc.rpc.RpcAuthorizationFailures",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpc/rpc/RpcClientBackoff": {
-              "metric": "rpc.rpc.RpcClientBackoff",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/AllocateNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.AllocateNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetClusterMetricsAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.GetClusterMetricsAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetClusterMetricsNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.GetClusterMetricsNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetClusterNodesAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.GetClusterNodesAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetClusterNodesNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.GetClusterNodesNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetQueueInfoAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.GetQueueInfoAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetQueueInfoNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.GetQueueInfoNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetQueueUserAclsAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.GetQueueUserAclsAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/GetQueueUserAclsNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.GetQueueUserAclsNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/NodeHeartbeatNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.NodeHeartbeatNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/RegisterNodeManagerAvgTime": {
-              "metric": "rpcdetailed.rpcdetailed.RegisterNodeManagerAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/rpcdetailed/rpcdetailed/RegisterNodeManagerNumOps": {
-              "metric": "rpcdetailed.rpcdetailed.RegisterNodeManagerNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/ugi/UgiMetrics/GetGroupsAvgTime": {
-              "metric": "ugi.UgiMetrics.GetGroupsAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/ugi/UgiMetrics/GetGroupsNumOps": {
-              "metric": "ugi.UgiMetrics.GetGroupsNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/ClusterMetrics/AMLaunchDelayAvgTime": {
-              "metric": "yarn.ClusterMetrics.AMLaunchDelayAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/ClusterMetrics/AMLaunchDelayNumOps": {
-              "metric": "yarn.ClusterMetrics.AMLaunchDelayNumOps",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/ClusterMetrics/AMRegisterDelayAvgTime": {
-              "metric": "yarn.ClusterMetrics.AMRegisterDelayAvgTime",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/yarn/ClusterMetrics/AMRegisterDelayNumOps": {
-              "metric": "yarn.ClusterMetrics.AMRegisterDelayNumOps",
-              "pointInTime": true,
-              "temporal": true
             }
           }
         }