AMBARI-5261 - Yarn metrics are missing from NODEMANAGER host component

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/metrics.json

@@ -45,7 +45,7 @@
             "temporal": true
           },
           "metrics/yarn/ContainersCompleted": {
-            "metric": "yarn.ContainersCompleted",
+            "metric": "yarn.NodeManagerMetrics.ContainersCompleted",
             "pointInTime": true,
             "temporal": true
           },
@@ -60,7 +60,7 @@
             "temporal": true
           },
           "metrics/yarn/ContainersKilled": {
-            "metric": "yarn.ContainersKilled",
+            "metric": "yarn.NodeManagerMetrics.ContainersKilled",
             "pointInTime": true,
             "temporal": true
           },
@@ -115,7 +115,7 @@
             "temporal": true
           },
           "metrics/yarn/AllocatedGB": {
-            "metric": "yarn.AllocatedGB",
+            "metric": "yarn.NodeManagerMetrics.AllocatedGB",
             "pointInTime": true,
             "temporal": true
           },
@@ -150,7 +150,7 @@
             "temporal": true
           },
           "metrics/yarn/ContainersFailed": {
-            "metric": "yarn.ContainersFailed",
+            "metric": "yarn.NodeManagerMetrics.ContainersFailed",
             "pointInTime": true,
             "temporal": true
           },
@@ -175,7 +175,7 @@
             "temporal": true
           },
           "metrics/yarn/AllocatedContainers": {
-            "metric": "yarn.AllocatedContainers",
+            "metric": "yarn.NodeManagerMetrics.AllocatedContainers",
             "pointInTime": true,
             "temporal": true
           },
@@ -245,7 +245,7 @@
             "temporal": true
           },
           "metrics/yarn/ContainersRunning": {
-            "metric": "yarn.ContainersRunning",
+            "metric": "yarn.NodeManagerMetrics.ContainersRunning",
             "pointInTime": true,
             "temporal": true
           },
@@ -260,7 +260,7 @@
             "temporal": true
           },
           "metrics/yarn/ContainersLaunched": {
-            "metric": "yarn.ContainersLaunched",
+            "metric": "yarn.NodeManagerMetrics.ContainersLaunched",
             "pointInTime": true,
             "temporal": true
           },
@@ -280,7 +280,7 @@
             "temporal": true
           },
           "metrics/yarn/AvailableGB": {
-            "metric": "yarn.AvailableGB",
+            "metric": "yarn.NodeManagerMetrics.AvailableGB",
             "pointInTime": true,
             "temporal": true
           },
@@ -295,7 +295,7 @@
             "temporal": true
           },
           "metrics/yarn/ContainersIniting": {
-            "metric": "yarn.ContainersIniting",
+            "metric": "yarn.NodeManagerMetrics.ContainersIniting",
             "pointInTime": true,
             "temporal": true
           },
@@ -402,7 +402,7 @@
             "temporal": true
           },
           "metrics/yarn/ContainersCompleted": {
-            "metric": "yarn.ContainersCompleted",
+            "metric": "yarn.NodeManagerMetrics.ContainersCompleted",
             "pointInTime": true,
             "temporal": true
           },
@@ -417,7 +417,7 @@
             "temporal": true
           },
           "metrics/yarn/ContainersKilled": {
-            "metric": "yarn.ContainersKilled",
+            "metric": "yarn.NodeManagerMetrics.ContainersKilled",
             "pointInTime": true,
             "temporal": true
           },
@@ -472,7 +472,7 @@
             "temporal": true
           },
           "metrics/yarn/AllocatedGB": {
-            "metric": "yarn.AllocatedGB",
+            "metric": "yarn.NodeManagerMetrics.AllocatedGB",
             "pointInTime": true,
             "temporal": true
           },
@@ -507,7 +507,7 @@
             "temporal": true
           },
           "metrics/yarn/ContainersFailed": {
-            "metric": "yarn.ContainersFailed",
+            "metric": "yarn.NodeManagerMetrics.ContainersFailed",
             "pointInTime": true,
             "temporal": true
           },
@@ -532,7 +532,7 @@
             "temporal": true
           },
           "metrics/yarn/AllocatedContainers": {
-            "metric": "yarn.AllocatedContainers",
+            "metric": "yarn.NodeManagerMetrics.AllocatedContainers",
             "pointInTime": true,
             "temporal": true
           },
@@ -602,7 +602,7 @@
             "temporal": true
           },
           "metrics/yarn/ContainersRunning": {
-            "metric": "yarn.ContainersRunning",
+            "metric": "yarn.NodeManagerMetrics.ContainersRunning",
             "pointInTime": true,
             "temporal": true
           },
@@ -617,7 +617,7 @@
             "temporal": true
           },
           "metrics/yarn/ContainersLaunched": {
-            "metric": "yarn.ContainersLaunched",
+            "metric": "yarn.NodeManagerMetrics.ContainersLaunched",
             "pointInTime": true,
             "temporal": true
           },
@@ -637,7 +637,7 @@
             "temporal": true
           },
           "metrics/yarn/AvailableGB": {
-            "metric": "yarn.AvailableGB",
+            "metric": "yarn.NodeManagerMetrics.AvailableGB",
             "pointInTime": true,
             "temporal": true
           },
@@ -652,7 +652,7 @@
             "temporal": true
           },
           "metrics/yarn/ContainersIniting": {
-            "metric": "yarn.ContainersIniting",
+            "metric": "yarn.NodeManagerMetrics.ContainersIniting",
             "pointInTime": true,
             "temporal": true
           },