You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2015/04/15 01:05:29 UTC

[1/2] ambari git commit: AMBARI-10393. Update widgets.json for HBase and add for HDFS and YARN. (jaimin)

Repository: ambari
Updated Branches:
  refs/heads/trunk dcbf12ef9 -> 2e528164e


http://git-wip-us.apache.org/repos/asf/ambari/blob/2e528164/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/widgets.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/widgets.json b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/widgets.json
new file mode 100644
index 0000000..a9e233f
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/widgets.json
@@ -0,0 +1,320 @@
+{
+  "layouts": [
+    {
+      "layout_name": "default_yarn_dashboard",
+      "display_name": "Standard YARN Dashboard",
+      "section_name": "YARN_SUMMARY",
+      "widgetLayoutInfo": [
+        {
+          "widget_name": "NM_RAM_UTILIZATION",
+          "display_name": "NodeManager RAM Utilization",
+          "description": "",
+          "widget_type": "GRAPH",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "yarn.NodeManagerMetrics.AllocatedGB",
+              "metric_path": "metrics/yarn/AllocatedGB",
+              "service_name": "YARN",
+              "component_name": "NODEMANAGER"
+            },
+            {
+              "name": "proc_total",
+              "metric_path": "metrics/process/proc_total",
+              "service_name": "YARN",
+              "component_name": "NODEMANAGER"
+            }
+          ],
+          "values": [
+            {
+              "name": "Total Allocatable RAM Utilized across NodeManager",
+              "value": "${yarn.NodeManagerMetrics.AllocatedGB}"
+            },
+            {
+              "name": "NodeManager total processes",
+              "value": "${proc_total}"
+            }
+          ],
+          "properties": {
+            "display_unit": "",
+            "graph_type": "LINE",
+            "time_range": "86400000"
+          }
+        },
+        {
+          "widget_name": "NM_CPU_UTILIZATION",
+          "display_name": "NodeManager CPU Utilization",
+          "description": "",
+          "widget_type": "GRAPH",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "yarn.NodeManagerMetrics.AllocatedVCores",
+              "metric_path": "metrics/yarn/AllocatedVCores",
+              "service_name": "YARN",
+              "component_name": "NODEMANAGER"
+            },
+            {
+              "name": "cpu_idle",
+              "metric_path": "metrics/cpu/cpu_idle",
+              "service_name": "YARN",
+              "component_name": "NODEMANAGER"
+            }
+          ],
+          "values": [
+            {
+              "name": "Total Allocatable CPU Utilized across NodeManager",
+              "value": "${yarn.NodeManagerMetrics.AllocatedVCores}"
+            },
+            {
+              "name": "NodeManager CPU Idle",
+              "value": "${cpu_idle}"
+            }
+          ],
+          "properties": {
+            "display_unit": "",
+            "graph_type": "LINE",
+            "time_range": "86400000"
+          }
+        },
+        {
+          "widget_name": "NM_DISK_NETWORK_IO",
+          "display_name": "NodeManager Disk and Network Utilization",
+          "description": "",
+          "widget_type": "GRAPH",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "read_bytes",
+              "metric_path": "metrics/disk/read_bytes",
+              "service_name": "YARN",
+              "component_name": "NODEMANAGER"
+            },
+            {
+              "name": "write_bytes",
+              "metric_path": "metrics/disk/write_bytes",
+              "service_name": "YARN",
+              "component_name": "NODEMANAGER"
+            },
+            {
+              "name": "bytes_in",
+              "metric_path": "metrics/network/bytes_in",
+              "service_name": "YARN",
+              "component_name": "NODEMANAGER"
+            },
+            {
+              "name": "bytes_out",
+              "metric_path": "metrics/network/bytes_out",
+              "service_name": "YARN",
+              "component_name": "NODEMANAGER"
+            }
+          ],
+          "values": [
+            {
+              "name": "DISK IO",
+              "value": "${read_bytes + write_bytes}"
+            },
+            {
+              "name": "Network IO",
+              "value": "${bytes_in + bytes_out}"
+            }
+          ],
+          "properties": {
+            "display_unit": "",
+            "graph_type": "LINE",
+            "time_range": "86400000"
+          }
+        },
+        {
+          "widget_name": "NM_CONTAINER_FAILURES",
+          "display_name": "NodeManager Container Failures",
+          "description": "",
+          "widget_type": "GRAPH",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "yarn.NodeManagerMetrics.ContainersFailed",
+              "metric_path": "metrics/yarn/ContainersFailed",
+              "service_name": "YARN",
+              "component_name": "NODEMANAGER"
+            }
+          ],
+          "values": [
+            {
+              "name": "NodeManager Container Failures",
+              "value": "${yarn.NodeManagerMetrics.ContainersFailed}"
+            }
+          ],
+          "properties": {
+            "display_unit": "",
+            "graph_type": "LINE",
+            "time_range": "86400000"
+          }
+        }
+      ]
+    },
+    {
+      "layout_name": "default_yarn_heatmap",
+      "display_name": "YARN Heatmaps",
+      "section_name": "YARN_HEATMAPS",
+      "widgetLayoutInfo": [
+        {
+          "widget_name": "NM_GC_TIME",
+          "display_name": "NodeManager Garbage Collection Time",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "Hadoop:service=NodeManager,name=JvmMetrics.GcTimeMillis",
+              "metric_path": "metrics/jvm/gcTimeMillis",
+              "service_name": "YARN",
+              "component_name": "NODEMANAGER"
+            }
+          ],
+          "values": [
+            {
+              "name": "NodeManager Garbage Collection Time",
+              "value": "${Hadoop:service=NodeManager,name=JvmMetrics.GcTimeMillis}"
+            }
+          ],
+          "properties": {
+            "display_unit": "ms",
+            "max_limit": "10000"
+          }
+        },
+        {
+          "widget_name": "NM_JVM_Heap_Used",
+          "display_name": "NodeManager JVM Heap Memory Used",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": false,
+          "metrics": [
+            {
+              "name": "Hadoop:service=NodeManager,name=JvmMetrics.MemHeapUsedM",
+              "metric_path": "metrics/jvm/memHeapUsedM",
+              "service_name": "YARN",
+              "component_name": "NODEMANAGER"
+            }
+          ],
+          "values": [
+            {
+              "name": "NodeManager JVM Heap Memory Used",
+              "value": "${Hadoop:service=NodeManager,name=JvmMetrics.MemHeapUsedM}"
+            }
+          ],
+          "properties": {
+            "display_unit": "MB",
+            "max_limit": "512"
+          }
+        },
+        {
+          "widget_name": "YARN_MEMORY_USED",
+          "display_name": "YARN Memory used %",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": false,
+          "metrics": [
+            {
+              "name": "yarn.NodeManagerMetrics.AllocatedGB",
+              "metric_path": "metrics/yarn/AllocatedGB",
+              "service_name": "YARN",
+              "component_name": "NODEMANAGER"
+            },
+            {
+              "name": "yarn.NodeManagerMetrics.AvailableGB",
+              "metric_path": "metrics/yarn/AvailableGB",
+              "service_name": "YARN",
+              "component_name": "NODEMANAGER"
+            }
+          ],
+          "values": [
+            {
+              "name": "YARN Memory used %",
+              "value": "${yarn.NodeManagerMetrics.AllocatedGB/(yarn.NodeManagerMetrics.AvailableGB + yarn.NodeManagerMetrics.AllocatedGB)}"
+            }
+          ],
+          "properties": {
+            "display_unit": "%",
+            "max_limit": "100"
+          }
+        },
+        {
+          "widget_name": "ALLOCATED_CONTAINER",
+          "display_name": "Allocated Containers",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": false,
+          "metrics": [
+            {
+              "name": "yarn.NodeManagerMetrics.AllocatedContainers",
+              "metric_path": "metrics/yarn/AllocatedContainers",
+              "service_name": "YARN",
+              "component_name": "NODEMANAGER"
+            }
+          ],
+          "values": [
+            {
+              "name": "Allocated Containers",
+              "value": "${yarn.NodeManagerMetrics.AllocatedContainers}"
+            }
+          ],
+          "properties": {
+            "display_unit": "",
+            "max_limit": "100"
+          }
+        },
+        {
+          "widget_name": "NM_RAM_UTILIZED",
+          "display_name": "NodeManager RAM Utilized",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": false,
+          "metrics": [
+            {
+              "name": "yarn.NodeManagerMetrics.AllocatedGB",
+              "metric_path": "metrics/yarn/AllocatedGB",
+              "service_name": "YARN",
+              "component_name": "NODEMANAGER"
+            }
+          ],
+          "values": [
+            {
+              "name": "NodeManager RAM Utilized",
+              "value": "${yarn.NodeManagerMetrics.AllocatedGB}"
+            }
+          ],
+          "properties": {
+            "display_unit": "",
+            "max_limit": "100"
+          }
+        },
+        {
+          "widget_name": "NM_CPU_UTILIZED",
+          "display_name": "NodeManager CPU Utilized",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": false,
+          "metrics": [
+            {
+              "name": "yarn.NodeManagerMetrics.AllocatedVCores",
+              "metric_path": "metrics/yarn/AllocatedVCores",
+              "service_name": "YARN",
+              "component_name": "NODEMANAGER"
+            }
+          ],
+          "values": [
+            {
+              "name": "NodeManager CPU Utilized",
+              "value": "${yarn.NodeManagerMetrics.AllocatedVCores}"
+            }
+          ],
+          "properties": {
+            "display_unit": "",
+            "max_limit": "100"
+          }
+        }
+      ]
+    }
+  ]
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/2e528164/ambari-server/src/main/resources/stacks/HDP/2.0.6/widgets.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/widgets.json b/ambari-server/src/main/resources/stacks/HDP/2.0.6/widgets.json
new file mode 100644
index 0000000..7935750
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/widgets.json
@@ -0,0 +1,98 @@
+{
+  "layouts": [
+    {
+      "layout_name": "default_system_heatmap",
+      "display_name": "Heatmaps",
+      "section_name": "SYSTEM_METRICS_HEATMAPS",
+      "widgetLayoutInfo": [
+        {
+          "widget_name": "HOST_DISK_USED",
+          "display_name": "Host Disk Space Used %",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "disk_free",
+              "metric_path": "metrics/disk/disk_free",
+              "service_name": "STACK"
+            },
+            {
+              "name": "disk_total",
+              "metric_path": "metrics/disk/disk_total",
+              "service_name": "STACK"
+            }
+          ],
+          "values": [
+            {
+              "name": "Host Disk Space Used %",
+              "value": "${((disk_total-disk_free)/disk_total)*100}"
+            }
+          ],
+          "properties": {
+            "display_unit": "%",
+            "max_limit": "100"
+          }
+        },
+        {
+          "widget_name": "HOST_MEMORY_USED",
+          "display_name": "Host Memory Used %",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": false,
+          "metrics": [
+            {
+              "name": "mem_total",
+              "metric_path": "metrics/memory/mem_total",
+              "service_name": "STACK"
+            },
+            {
+              "name": "mem_free",
+              "metric_path": "metrics/memory/mem_free",
+              "service_name": "STACK"
+            },
+            {
+              "name": "mem_cached",
+              "metric_path": "metrics/memory/mem_cached",
+              "service_name": "STACK"
+            }
+          ],
+          "values": [
+            {
+              "name": "Host Memory Used %",
+              "value": "${((mem_total-mem_free-mem_cached)/mem_total)*100}"
+            }
+          ],
+          "properties": {
+            "display_unit": "%",
+            "max_limit": "100"
+          }
+        },
+        {
+          "widget_name": "HOST_CPU_WAIT_IO",
+          "display_name": "Host CPU Wait IO %",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": false,
+          "metrics": [
+            {
+              "name": "cpu_wio",
+              "metric_path": "metrics/cpu/cpu_wio",
+              "service_name": "STACK"
+            }
+          ],
+          "values": [
+            {
+              "name": "Host Memory Used %",
+              "value": "${cpu_wio*100}"
+            }
+          ],
+          "properties": {
+            "display_unit": "%",
+            "max_limit": "100"
+          }
+        }
+      ]
+    }
+  ]
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/2e528164/ambari-web/app/assets/data/widget_layouts/HBASE/default_dashboard.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/widget_layouts/HBASE/default_dashboard.json b/ambari-web/app/assets/data/widget_layouts/HBASE/default_dashboard.json
new file mode 100644
index 0000000..0636541
--- /dev/null
+++ b/ambari-web/app/assets/data/widget_layouts/HBASE/default_dashboard.json
@@ -0,0 +1,132 @@
+{
+  "href": "http://c6401.ambari.apache.org:8080/api/v1/clusters/c1/widget_layouts/6",
+  "widgets": [
+    {
+      "href": "http://c6401.ambari.apache.org:8080/api/v1/clusters/c1/widgets/29",
+      "id": 29,
+      "metrics": "[{\"name\":\"regionserver.Server.Get_num_ops\",\"metric_path\":\"metrics/jvm/gcCount\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"},{\"name\":\"regionserver.Server.ScanNext_num_ops\",\"metric_path\":\"metrics/hbase/regionserver/Server/ScanNext_num_ops\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"},{\"name\":\"regionserver.Server.Append_num_ops\",\"metric_path\":\"metrics/hbase/regionserver/Server/Append_num_ops\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"},{\"name\":\"regionserver.Server.Delete_num_ops\",\"metric_path\":\"metrics/hbase/regionserver/Server/Delete_num_ops\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"},{\"name\":\"regionserver.Server.Increment_num_ops\",\"metric_path\":\"metrics/hbase/regionserver/Server/Increment_num_ops\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"},{\"name\":\"regionserver.Server.Mutate_num_ops\",\"metric_pa
 th\":\"metrics/hbase/regionserver/Server/Mutate_num_ops\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"}]",
+      "author": "ambari",
+      "description": "This widget shows all the read requests and write requests on all regions for a RegionServer",
+      "scope": "CLUSTER",
+      "properties": "{\"display_unit\":\"Requests\",\"graph_type\":\"LINE\",\"time_range\":\"86400000\"}",
+      "widget_name": "RS_READS_WRITES",
+      "widget_type": "GRAPH",
+      "time_created": 1428990958952,
+      "display_name": "RegionServer Reads and Writes",
+      "values": "[{\"name\":\"Read Requests\",\"value\":\"${regionserver.Server.Get_num_ops + regionserver.Server.ScanNext_num_ops}\"},{\"name\":\"Write Requests\",\"value\":\"${regionserver.Server.Append_num_ops + regionserver.Server.Delete_num_ops + regionserver.Server.Increment_num_ops + regionserver.Server.Mutate_num_ops}\"}]",
+      "cluster_name": "c1"
+    },
+    {
+      "href": "http://c6401.ambari.apache.org:8080/api/v1/clusters/c1/widgets/30",
+      "id": 30,
+      "metrics": "[{\"name\":\"regionserver.Server.Get_95th_percentile\",\"metric_path\":\"metrics/hbase/regionserver/Server/Get_95th_percentile\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"},{\"name\":\"regionserver.Server.ScanNext_95th_percentile\",\"metric_path\":\"metrics/hbase/regionserver/Server/ScanNext_95th_percentile\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"}]",
+      "author": "ambari",
+      "description": "This widget shows 95th percentile of the read latency.",
+      "scope": "CLUSTER",
+      "properties": "{\"display_unit\":\"%\"}",
+      "widget_name": "READ_LATENCY_95",
+      "widget_type": "NUMBER",
+      "time_created": 1428990958952,
+      "display_name": "95% Read Latency",
+      "values": "[{\"name\":\"95% Read Latency\",\"value\":\"${regionserver.Server.Get_95th_percentile + regionserver.Server.ScanNext_95th_percentile}\"}]",
+      "cluster_name": "c1"
+    },
+    {
+      "href": "http://c6401.ambari.apache.org:8080/api/v1/clusters/c1/widgets/31",
+      "id": 31,
+      "metrics": "[{\"name\":\"regionserver.Server.Mutate_95th_percentile\",\"metric_path\":\"metrics/hbase/regionserver/Server/Mutate_95th_percentile\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"},{\"name\":\"regionserver.Server.Increment_95th_percentile\",\"metric_path\":\"metrics/hbase/regionserver/Server/Increment_95th_percentile\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"},{\"name\":\"regionserver.Server.Append_95th_percentile\",\"metric_path\":\"metrics/hbase/regionserver/Server/Append_95th_percentile\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"},{\"name\":\"regionserver.Server.Delete_95th_percentile\",\"metric_path\":\"metrics/hbase/regionserver/Server/Delete_95th_percentile\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"}]",
+      "author": "ambari",
+      "description": "This widget shows 95th percentile of the write latency.",
+      "scope": "CLUSTER",
+      "properties": "{\"display_unit\":\"%\"}",
+      "widget_name": "WRITE_LATENCY_95",
+      "widget_type": "NUMBER",
+      "time_created": 1428990958952,
+      "display_name": "95% Write Latency",
+      "values": "[{\"name\":\"95% Write Latency\",\"value\":\"${regionserver.Server.Mutate_95th_percentile + regionserver.Server.Increment_95th_percentile + regionserver.Server.Append_95th_percentile + regionserver.Server.Delete_95th_percentile}\"}]",
+      "cluster_name": "c1"
+    },
+    {
+      "href": "http://c6401.ambari.apache.org:8080/api/v1/clusters/c1/widgets/32",
+      "id": 32,
+      "metrics": "[{\"name\":\"ipc.IPC.numOpenConnections\",\"metric_path\":\"metrics/hbase/ipc/IPC/numOpenConnections\",\"category\":\"\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"}]",
+      "author": "ambari",
+      "description": "This widget shows number of current open connections",
+      "scope": "CLUSTER",
+      "properties": "{\"display_unit\":\"Connections\",\"graph_type\":\"LINE\",\"time_range\":\"86400000\"}",
+      "widget_name": "OPEN_CONNECTIONS",
+      "widget_type": "GRAPH",
+      "time_created": 1428990958952,
+      "display_name": "Open Connections",
+      "values": "[{\"name\":\"Open Connections\",\"value\":\"${ipc.IPC.numOpenConnections}\"}]",
+      "cluster_name": "c1"
+    },
+    {
+      "href": "http://c6401.ambari.apache.org:8080/api/v1/clusters/c1/widgets/33",
+      "id": 33,
+      "metrics": "[{\"name\":\"ipc.IPC.numOpenConnections\",\"metric_path\":\"metrics/hbase/ipc/IPC/numOpenConnections\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"},{\"name\":\"ipc.IPC.numCallsInGeneralQueue\",\"metric_path\":\"metrics/hbase/ipc/IPC/numOpenConnections\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"}]",
+      "author": "ambari",
+      "description": null,
+      "scope": "CLUSTER",
+      "properties": "{\"graph_type\":\"LINE\",\"time_range\":\"86400000\"}",
+      "widget_name": "ACTIVE_HANDLER",
+      "widget_type": "GRAPH",
+      "time_created": 1428990958952,
+      "display_name": "Active Handlers vs Calls in General Queue",
+      "values": "[{\"name\":\"Active Handlers\",\"value\":\"${ipc.IPC.numActiveHandler}\"},{\"name\":\"Calls in General Queue\",\"value\":\"${ipc.IPC.numCallsInGeneralQueue}\"}]",
+      "cluster_name": "c1"
+    },
+    {
+      "href": "http://c6401.ambari.apache.org:8080/api/v1/clusters/c1/widgets/34",
+      "id": 34,
+      "metrics": "[{\"name\":\"regionserver.Server.percentFilesLocal\",\"metric_path\":\"metrics/hbase/regionserver/percentFilesLocal\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"}]",
+      "author": "ambari",
+      "description": "This widget shows percentage of files local.",
+      "scope": "CLUSTER",
+      "properties": "{\"display_unit\":\"%\"}",
+      "widget_name": "FILES_LOCAL",
+      "widget_type": "NUMBER",
+      "time_created": 1428990958952,
+      "display_name": "Files Local",
+      "values": "[{\"name\":\"Files Local\",\"value\":\"${regionserver.Server.percentFilesLocal}\"}]",
+      "cluster_name": "c1"
+    },
+    {
+      "href": "http://c6401.ambari.apache.org:8080/api/v1/clusters/c1/widgets/35",
+      "id": 35,
+      "metrics": "[{\"name\":\"regionserver.Server.updatesBlockedTime\",\"metric_path\":\"metrics/hbase/regionserver/Server/updatesBlockedTime\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"}]",
+      "author": "ambari",
+      "description": "Updated Blocked Time",
+      "scope": "CLUSTER",
+      "properties": "{\"display_unit\":\"seconds\",\"graph_type\":\"LINE\",\"time_range\":\"86400000\"}",
+      "widget_name": "UPDATED_BLOCKED_TIME",
+      "widget_type": "GRAPH",
+      "time_created": 1428990958952,
+      "display_name": "Updated Blocked Time",
+      "values": "[{\"name\":\"Updated Blocked Time\",\"value\":\"${regionserver.Server.updatesBlockedTime}\"}]",
+      "cluster_name": "c1"
+    },
+    {
+      "href": "http://c6401.ambari.apache.org:8080/api/v1/clusters/c1/widgets/36",
+      "id": 36,
+      "metrics": "[{\"name\":\"cpu_idle\",\"metric_path\":\"metrics/cpu/cpu_idle\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"},{\"name\":\"disk_free\",\"metric_path\":\"metrics/disk/disk_free\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"},{\"name\":\"pkts_in\",\"metric_path\":\"metrics/network/pkts_in\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"},{\"name\":\"pkts_out\",\"metric_path\":\"metrics/network/pkts_out\",\"service_name\":\"HBASE\",\"component_name\":\"HBASE_REGIONSERVER\"}]",
+      "author": "ambari",
+      "description": "ReqionServer widget for Host CPU, Network and Disk Utilization",
+      "scope": "CLUSTER",
+      "properties": "{\"graph_type\":\"LINE\",\"time_range\":\"86400000\"}",
+      "widget_name": "RS_HOST_METRICS",
+      "widget_type": "GRAPH",
+      "time_created": 1428990958952,
+      "display_name": "ReqionServer System Metrics",
+      "values": "[{\"name\":\"CPU Idle\",\"value\":\"${cpu_idle}\"},{\"name\":\"Disk Free\",\"value\":\"${disk_free}\"},{\"name\":\"Network Packets In/Out\",\"value\":\"${pkts_in + pkts_out}\"}]",
+      "cluster_name": "c1"
+    }
+  ],
+  "cluster_name": "c1",
+  "display_name": "Standard HBase Dashboard",
+  "id": 6,
+  "layout_name": "default_hbase_dashboard",
+  "scope": "CLUSTER",
+  "section_name": "HBASE_SUMMARY",
+  "user_name": "ambari"
+}
\ No newline at end of file


[2/2] ambari git commit: AMBARI-10393. Update widgets.json for HBase and add for HDFS and YARN. (jaimin)

Posted by ja...@apache.org.
AMBARI-10393. Update widgets.json for HBase and add for HDFS and YARN. (jaimin)


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

Branch: refs/heads/trunk
Commit: 2e528164e296ba8ae0b7be7d8a93c692072f92e8
Parents: dcbf12e
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Tue Apr 14 16:04:37 2015 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Tue Apr 14 16:04:51 2015 -0700

----------------------------------------------------------------------
 .../HBASE/0.96.0.2.0/metrics.json               |  15 +
 .../HBASE/0.96.0.2.0/widgets.json               | 596 ++++++++++++------
 .../common-services/HDFS/2.1.0.2.0/metrics.json | 259 ++++++--
 .../common-services/HDFS/2.1.0.2.0/widgets.json | 470 +++++++++++++++
 .../common-services/YARN/2.1.0.2.0/metrics.json | 602 ++++++++-----------
 .../common-services/YARN/2.1.0.2.0/widgets.json | 320 ++++++++++
 .../resources/stacks/HDP/2.0.6/widgets.json     |  98 +++
 .../widget_layouts/HBASE/default_dashboard.json | 132 ++++
 8 files changed, 1907 insertions(+), 585 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2e528164/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 7bbf7be..627667b 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
@@ -770,6 +770,11 @@
               "pointInTime": false,
               "temporal": true
             },
+            "metrics/hbase/regionserver/Server/ScanNext_num_ops": {
+              "metric": "regionserver.Server.ScanNext_num_ops",
+              "pointInTime": false,
+              "temporal": true
+            },
             "metrics/hbase/regionserver/Server/Append_num_ops": {
               "metric": "regionserver.Server.Append_num_ops",
               "pointInTime": false,
@@ -785,11 +790,21 @@
               "pointInTime": false,
               "temporal": true
             },
+            "metrics/hbase/regionserver/Server/Increment_num_ops": {
+              "metric": "regionserver.Server.Increment_num_ops",
+              "pointInTime": false,
+              "temporal": true
+            },
             "metrics/hbase/regionserver/Server/Get_95th_percentile": {
               "metric": "regionserver.Server.Get_95th_percentile",
               "pointInTime": false,
               "temporal": true
             },
+            "metrics/hbase/regionserver/Server/ScanNext_95th_percentile": {
+              "metric": "regionserver.Server.ScanNext_95th_percentile",
+              "pointInTime": false,
+              "temporal": true
+            },
             "metrics/hbase/regionserver/Server/Mutate_95th_percentile": {
               "metric": "regionserver.Server.Mutate_95th_percentile",
               "pointInTime": false,

http://git-wip-us.apache.org/repos/asf/ambari/blob/2e528164/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/widgets.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/widgets.json b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/widgets.json
index a64a2c8..ece1b03 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/widgets.json
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/widgets.json
@@ -1,192 +1,434 @@
 {
   "layouts": [
-  {
-    "layout_name": "default_hbase_layout",
-    "section_name": "HBASE_SUMMARY",
-    "widgetLayoutInfo": [
-      {
-        "widget_name": "RS_READS_WRITES",
-        "display_name": "RegionServer Reads and Writes",
-        "description": "This widget shows all the read requests and write requests on all regions for a RegionServer",
-        "widget_type": "GRAPH",
-        "is_visible": true,
-        "metrics": [
-          {
-            "name": "regionserver.Server.Get_num_ops",
-            "ambari_id": "metrics/hbase/regionserver/Server/Get_num_ops",
-            "category": "",
-            "service_name": "HBASE",
-            "component_name": "HBASE_REGIONSERVER",
-            "host_component_criteria": "isActive=true"
-          },
-          {
-            "name": "regionserver.Server.Scan_num_ops",
-            "ambari_id": "metrics/hbase/regionserver/Server/Scan_num_ops",
-            "category": "",
-            "service_name": "HBASE",
-            "component_name": "HBASE_REGIONSERVER"
-          },
-          {
-            "name": "regionserver.Server.Append_num_ops",
-            "ambari_id": "metrics/hbase/regionserver/Server/Append_num_ops",
-            "category": "",
-            "service_name": "HBASE",
-            "component_name": "HBASE_REGIONSERVER"
-          },
-          {
-            "name": "regionserver.Server.Delete_num_ops",
-            "ambari_id": "metrics/hbase/regionserver/Server/Delete_num_ops",
-            "category": "",
-            "service_name": "HBASE",
-            "component_name": "HBASE_REGIONSERVER"
-          },
-          {
-            "name": "regionserver.Server.Increment_num_ops",
-            "ambari_id": "metrics/hbase/regionserver/Server/Increment_num_ops",
-            "category": "",
-            "service_name": "HBASE",
-            "component_name": "HBASE_REGIONSERVER"
-          },
-          {
-            "name": "regionserver.Server.Mutate_num_ops",
-            "ambari_id": "metrics/hbase/regionserver/Server/Mutate_num_ops",
-            "category": "",
-            "service_name": "HBASE",
-            "component_name": "HBASE_REGIONSERVER"
+    {
+      "layout_name": "default_hbase_dashboard",
+      "display_name": "Standard HBase Dashboard",
+      "section_name": "HBASE_SUMMARY",
+      "widgetLayoutInfo": [
+        {
+          "widget_name": "RS_READS_WRITES",
+          "display_name": "RegionServer Reads and Writes",
+          "description": "This widget shows all the read requests and write requests on all regions for a RegionServer",
+          "widget_type": "GRAPH",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "regionserver.Server.Get_num_ops",
+              "metric_path": "metrics/jvm/gcCount",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            },
+            {
+              "name": "regionserver.Server.ScanNext_num_ops",
+              "metric_path": "metrics/hbase/regionserver/Server/ScanNext_num_ops",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            },
+            {
+              "name": "regionserver.Server.Append_num_ops",
+              "metric_path": "metrics/hbase/regionserver/Server/Append_num_ops",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            },
+            {
+              "name": "regionserver.Server.Delete_num_ops",
+              "metric_path": "metrics/hbase/regionserver/Server/Delete_num_ops",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            },
+            {
+              "name": "regionserver.Server.Increment_num_ops",
+              "metric_path": "metrics/hbase/regionserver/Server/Increment_num_ops",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            },
+            {
+              "name": "regionserver.Server.Mutate_num_ops",
+              "metric_path": "metrics/hbase/regionserver/Server/Mutate_num_ops",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            }
+          ],
+          "values": [
+            {
+              "name": "Read Requests",
+              "value": "${regionserver.Server.Get_num_ops + regionserver.Server.ScanNext_num_ops}"
+            },
+            {
+              "name": "Write Requests",
+              "value": "${regionserver.Server.Append_num_ops + regionserver.Server.Delete_num_ops + regionserver.Server.Increment_num_ops + regionserver.Server.Mutate_num_ops}"
+            }
+          ],
+          "properties": {
+            "display_unit": "Requests",
+            "graph_type": "LINE",
+            "time_range": "86400000"
           }
-        ],
-        "values": [
-          {
-            "name": "Read Requests",
-            "value": "`${regionserver.Server.Get_num_ops + regionserver.Server.Scan_num_ops}`"
-          },
-          {
-            "name": "Write Requests",
-            "value": "`${metrics.hbase.regionserver.Server.Append_num_ops + metrics.hbase.regionserver.Server.Delete_num_ops + metrics.hbase.regionserver.Server.Increment_num_ops + metrics.hbase.regionserver.Server.Mutate_num_ops}`"
+        },
+        {
+          "widget_name": "READ_LATENCY_95",
+          "display_name": "95% Read Latency",
+          "description": "This widget shows 95th percentile of the read latency.",
+          "widget_type": "NUMBER",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "regionserver.Server.Get_95th_percentile",
+              "metric_path": "metrics/hbase/regionserver/Server/Get_95th_percentile",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            },
+            {
+              "name": "regionserver.Server.ScanNext_95th_percentile",
+              "metric_path": "metrics/hbase/regionserver/Server/ScanNext_95th_percentile",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            }
+          ],
+          "values": [
+            {
+              "name": "95% Read Latency",
+              "value": "${regionserver.Server.Get_95th_percentile + regionserver.Server.ScanNext_95th_percentile}"
+            }
+          ],
+          "properties": {
+            "display_unit": "%"
           }
-        ],
-        "properties": {
-          "display_unit": "Requests",
-          "graph_type": "LINE",
-          "time_ranger": "1 week"
-        }
-      },
-      {
-        "widget_name": "OPEN_CONNECTIONS",
-        "display_name": "Open Connections",
-        "description": "This widget shows number of current open connections",
-        "widget_type": "GRAPH",
-        "is_visible": true,
-        "metrics": [
-          {
-            "name": "ipc.IPC.numOpenConnections",
-            "ambari_id": "metrics/hbase/ipc/IPC/numOpenConnections",
-            "category": "",
-            "service_name": "HBASE",
-            "component_name": "HBASE_REGIONSERVER"
+        },
+        {
+          "widget_name": "WRITE_LATENCY_95",
+          "display_name": "95% Write Latency",
+          "description": "This widget shows 95th percentile of the write latency.",
+          "widget_type": "NUMBER",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "regionserver.Server.Mutate_95th_percentile",
+              "metric_path": "metrics/hbase/regionserver/Server/Mutate_95th_percentile",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            },
+            {
+              "name": "regionserver.Server.Increment_95th_percentile",
+              "metric_path": "metrics/hbase/regionserver/Server/Increment_95th_percentile",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            },
+            {
+              "name": "regionserver.Server.Append_95th_percentile",
+              "metric_path": "metrics/hbase/regionserver/Server/Append_95th_percentile",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            },
+            {
+              "name": "regionserver.Server.Delete_95th_percentile",
+              "metric_path": "metrics/hbase/regionserver/Server/Delete_95th_percentile",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            }
+          ],
+          "values": [
+            {
+              "name": "95% Write Latency",
+              "value": "${regionserver.Server.Mutate_95th_percentile + regionserver.Server.Increment_95th_percentile + regionserver.Server.Append_95th_percentile + regionserver.Server.Delete_95th_percentile}"
+            }
+          ],
+          "properties": {
+            "display_unit": "%"
           }
-        ],
-        "values": [
-          {
-            "name": "Open Connections",
-            "value": "`${ipc.IPC.numOpenConnections}`"
+        },
+        {
+          "widget_name": "OPEN_CONNECTIONS",
+          "display_name": "Open Connections",
+          "description": "This widget shows number of current open connections",
+          "widget_type": "GRAPH",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "ipc.IPC.numOpenConnections",
+              "metric_path": "metrics/hbase/ipc/IPC/numOpenConnections",
+              "category": "",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            }
+          ],
+          "values": [
+            {
+              "name": "Open Connections",
+              "value": "${ipc.IPC.numOpenConnections}"
+            }
+          ],
+          "properties": {
+            "display_unit": "Connections",
+            "graph_type": "LINE",
+            "time_range": "86400000"
           }
-        ],
-        "properties": {
-          "display_unit": "Connections",
-          "graph_type": "STACK",
-          "time_ranger": "1 hour"
-        }
-      },
-      {
-        "widget_name": "ACTIVE_HANDLER",
-        "display_name": "Active Handlers vs Calls in General Queue",
-        "widget_type": "GRAPH",
-        "is_visible": true,
-        "metrics": [
-          {
-            "name": "ipc.IPC.numOpenConnections",
-            "ambari_id": "metrics/hbase/ipc/IPC/numOpenConnections",
-            "category": "",
-            "service_name": "HBASE",
-            "component_name": "HBASE_REGIONSERVER"
-          },
-          {
-            "name": "ipc.IPC.numCallsInGeneralQueue",
-            "ambari_id": "metrics/hbase/ipc/IPC/numOpenConnections",
-            "category": "",
-            "service_name": "HBASE",
-            "component_name": "HBASE_REGIONSERVER"
+        },
+        {
+          "widget_name": "ACTIVE_HANDLER",
+          "display_name": "Active Handlers vs Calls in General Queue",
+          "widget_type": "GRAPH",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "ipc.IPC.numOpenConnections",
+              "metric_path": "metrics/hbase/ipc/IPC/numOpenConnections",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            },
+            {
+              "name": "ipc.IPC.numCallsInGeneralQueue",
+              "metric_path": "metrics/hbase/ipc/IPC/numOpenConnections",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            }
+          ],
+          "values": [
+            {
+              "name": "Active Handlers",
+              "value": "${ipc.IPC.numActiveHandler}"
+            },
+            {
+              "name": "Calls in General Queue",
+              "value": "${ipc.IPC.numCallsInGeneralQueue}"
+            }
+          ],
+          "properties": {
+            "graph_type": "LINE",
+            "time_range": "86400000"
           }
-        ],
-        "values": [
-          {
-            "name": "Active Handlers",
-            "value": "`${ipc.IPC.numActiveHandler}`"
-          },
-          {
-            "name": "Calls in General Queue",
-            "value": "`${ipc.IPC.numCallsInGeneralQueue}`"
+        },
+        {
+          "widget_name": "FILES_LOCAL",
+          "display_name": "Files Local",
+          "description": "This widget shows percentage of files local.",
+          "widget_type": "NUMBER",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "regionserver.Server.percentFilesLocal",
+              "metric_path": "metrics/hbase/regionserver/percentFilesLocal",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            }
+          ],
+          "values": [
+            {
+              "name": "Files Local",
+              "value": "${regionserver.Server.percentFilesLocal}"
+            }
+          ],
+          "properties": {
+            "display_unit": "%"
           }
-        ],
-        "properties": {
-          "graph_type": "LINE",
-          "time_ranger": "1 hour"
-        }
-      },
-      {
-        "widget_name": "FILES_LOCAL",
-        "display_name": "Files Local",
-        "description": "This widget shows percentage of files local.",
-        "widget_type": "NUMBER",
-        "is_visible": true,
-        "metrics": [
-          {
-            "name": "regionserver.Server.percentFilesLocal",
-            "ambari_id": "metrics/hbase/regionserver/percentFilesLocal",
-            "category": "",
-            "service_name": "HBASE",
-            "component_name": "HBASE_REGIONSERVER"
+        },
+        {
+          "widget_name": "UPDATES_BLOCKED_TIME",
+          "display_name": "Updates Blocked Time",
+          "description": "Number of milliseconds updates have been blocked so the memstore can be flushed",
+          "widget_type": "GRAPH",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "regionserver.Server.updatesBlockedTime",
+              "metric_path": "metrics/hbase/regionserver/Server/updatesBlockedTime",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            }
+          ],
+          "values": [
+            {
+              "name": "Updates Blocked Time",
+              "value": "${regionserver.Server.updatesBlockedTime}"
+            }
+          ],
+          "properties": {
+            "display_unit": "ms",
+            "graph_type": "LINE",
+            "time_range": "86400000"
           }
-        ],
-        "values": [
-          {
-            "name": "Files Local",
-            "value": "`${regionserver.Server.percentFilesLocal}`"
+        },
+        {
+          "widget_name": "RS_HOST_METRICS",
+          "display_name": "ReqionServer System Metrics",
+          "description": "ReqionServer widget for Host CPU, Network and Disk Utilization",
+          "widget_type": "GRAPH",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "cpu_idle",
+              "metric_path": "metrics/cpu/cpu_idle",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            },
+            {
+              "name": "disk_free",
+              "metric_path": "metrics/disk/disk_free",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            },
+            {
+              "name": "pkts_in",
+              "metric_path": "metrics/network/pkts_in",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            },
+            {
+              "name": "pkts_out",
+              "metric_path": "metrics/network/pkts_out",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            }
+          ],
+          "values": [
+            {
+              "name": "CPU Idle",
+              "value": "${cpu_idle}"
+            },
+            {
+              "name": "Disk Free",
+              "value": "${disk_free}"
+            },
+            {
+              "name": "Network Packets In/Out",
+              "value": "${pkts_in + pkts_out}"
+            }
+          ],
+          "properties": {
+            "graph_type": "LINE",
+            "time_range": "86400000"
           }
-        ],
-        "properties": {
-          "display_unit": "%"
         }
-      },
-      {
-        "widget_name": "UPDATED_BLOCKED_TIME",
-        "display_name": "Updated Blocked Time",
-        "description": "",
-        "widget_type": "GRAPH",
-        "is_visible": true,
-        "metrics": [
-          {
-            "name": "regionserver.Server.updatesBlockedTime",
-            "ambari_id": "metrics/hbase/regionserver/Server/updatesBlockedTime",
-            "category": "",
-            "service_name": "HBASE",
-            "component_name": "HBASE_REGIONSERVER"
+      ]
+    },
+    {
+      "layout_name": "default_hbase_heatmap",
+      "display_name": "HBase Heatmaps",
+      "section_name": "HBASE_HEATMAPS",
+      "widgetLayoutInfo": [
+        {
+          "widget_name": "HBASE_COMPACTION_QUEUE_SIZE",
+          "display_name": "HBase Compaction Queue Size",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "Hadoop:service=HBase,name=RegionServer,sub=Server.compactionQueueLength",
+              "metric_path": "metrics/hbase/regionserver/compactionQueueSize",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            }
+          ],
+          "values": [
+            {
+              "name": "HBase Compaction Queue Size",
+              "value": "${Hadoop:service=HBase,name=RegionServer,sub=Server.compactionQueueLength} "
+            }
+          ],
+          "properties": {
+            "display_unit": "",
+            "max_limit": "10"
+          }
+        },
+        {
+          "widget_name": "HBASE_MEMSTORE_SIZES",
+          "display_name": "HBase Memstore Sizes",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": false,
+          "metrics": [
+            {
+              "name": "Hadoop:service=HBase,name=RegionServer,sub=Server.memStoreSize",
+              "metric_path": "metrics/hbase/regionserver/memstoreSize",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            }
+          ],
+          "values": [
+            {
+              "name": "HBase Memstore Sizes",
+              "value": "${Hadoop:service=HBase,name=RegionServer,sub=Server.memStoreSize}"
+            }
+          ],
+          "properties": {
+            "display_unit": "B",
+            "max_limit": "104857600"
+          }
+        },
+        {
+          "widget_name": "HBASE_READ_REQUEST",
+          "display_name": "HBase Read Request Count",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": false,
+          "metrics": [
+            {
+              "name": "Hadoop:service=HBase,name=RegionServer,sub=Server.readRequestCount",
+              "metric_path": "metrics/hbase/regionserver/readRequestsCount",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            }
+          ],
+          "values": [
+            {
+              "name": "HBase Read Request Count",
+              "value": "${Hadoop:service=HBase,name=RegionServer,sub=Server.readRequestCount}"
+            }
+          ],
+          "properties": {
+            "max_limit": "200"
+          }
+        },
+        {
+          "widget_name": "HBASE_WRITE_REQUEST",
+          "display_name": "HBase Write Request Count",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": false,
+          "metrics": [
+            {
+              "name": "Hadoop:service=HBase,name=RegionServer,sub=Server.writeRequestCount",
+              "metric_path": "metrics/hbase/regionserver/writeRequestsCount",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            }
+          ],
+          "values": [
+            {
+              "name": "HBase Write Request Count",
+              "value": "${Hadoop:service=HBase,name=RegionServer,sub=Server.writeRequestCount}"
+            }
+          ],
+          "properties": {
+            "max_limit": "200"
           }
-        ],
-        "values": [
-          {
-            "name": "Updated Blocked Time",
-            "value": "`${regionserver.Server.updatesBlockedTime}`"
+        },
+        {
+          "widget_name": "HBASE_REGIONS",
+          "display_name": "HBase Regions",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": false,
+          "metrics": [
+            {
+              "name": "Hadoop:service=HBase,name=RegionServer,sub=Server.regionCount",
+              "metric_path": "metrics/hbase/regionserver/regions",
+              "service_name": "HBASE",
+              "component_name": "HBASE_REGIONSERVER"
+            }
+          ],
+          "values": [
+            {
+              "name": "HBase Regions",
+              "value": "${Hadoop:service=HBase,name=RegionServer,sub=Server.regionCount}"
+            }
+          ],
+          "properties": {
+            "max_limit": "10"
           }
-        ],
-        "properties": {
-          "display_unit": "seconds",
-          "graph_type": "LINE",
-          "time_ranger": "1 day"
         }
-      }
-    ]
-  }
-]
+      ]
+    }
+  ]
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/2e528164/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 6fc808e..07f36bb 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
@@ -1356,6 +1356,180 @@
         "type": "ganglia",
         "metrics": {
           "default": {
+            "metrics/cpu/cpu_idle":{
+              "metric":"cpu_idle",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/cpu/cpu_nice":{
+              "metric":"cpu_nice",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/cpu/cpu_system":{
+              "metric":"cpu_system",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/cpu/cpu_user":{
+              "metric":"cpu_user",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/cpu/cpu_wio":{
+              "metric":"cpu_wio",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/disk_free":{
+              "metric":"disk_free",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/disk_total":{
+              "metric":"disk_total",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/load/load_fifteen":{
+              "metric":"load_fifteen",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/load/load_five":{
+              "metric":"load_five",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/load/load_one":{
+              "metric":"load_one",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_buffers":{
+              "metric":"mem_buffers",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_cached":{
+              "metric":"mem_cached",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_free":{
+              "metric":"mem_free",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_shared":{
+              "metric":"mem_shared",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/mem_total":{
+              "metric":"mem_total",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/swap_free":{
+              "metric":"swap_free",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/memory/swap_total":{
+              "metric":"swap_total",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/network/bytes_in":{
+              "metric":"bytes_in",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/network/bytes_out":{
+              "metric":"bytes_out",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/network/pkts_in":{
+              "metric":"pkts_in",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/network/pkts_out":{
+              "metric":"pkts_out",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/process/proc_run":{
+              "metric":"proc_run",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/process/proc_total":{
+              "metric":"proc_total",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/read_count":{
+              "metric":"read_count",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/write_count":{
+              "metric":"write_count",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/read_bytes":{
+              "metric":"read_bytes",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/write_bytes":{
+              "metric":"write_bytes",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/read_time":{
+              "metric":"read_time",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/write_time":{
+              "metric":"write_time",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
             "metrics/dfs/FSNamesystem/TotalLoad": {
               "metric": "dfs.FSNamesystem.TotalLoad",
               "pointInTime": false,
@@ -1411,11 +1585,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/load/load_one": {
-              "metric": "load_one",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/rpcdetailed/renewLease_num_ops": {
               "metric": "rpcdetailed.rpcdetailed.RenewLeaseNumOps",
               "pointInTime": true,
@@ -1456,11 +1625,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/process/proc_run": {
-              "metric": "proc_run",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/dfs/FSNamesystem/CapacityUsedGB": {
               "metric": "dfs.FSNamesystem.CapacityUsedGB",
               "pointInTime": false,
@@ -1471,11 +1635,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/memory/swap_total": {
-              "metric": "swap_total",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/dfs/namenode/FilesDeleted": {
               "metric": "dfs.namenode.FilesDeleted",
               "pointInTime": true,
@@ -1496,11 +1655,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/process/proc_total": {
-              "metric": "proc_total",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/dfs/namenode/blockReport_avg_time": {
               "metric": "dfs.namenode.BlockReportAvgTime",
               "pointInTime": false,
@@ -1561,21 +1715,11 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/network/bytes_in": {
-              "metric": "bytes_in",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/rpcdetailed/setSafeMode_num_ops": {
               "metric": "rpcdetailed.rpcdetailed.SetSafeModeNumOps",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/network/pkts_out": {
-              "metric": "pkts_out",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/jvm/memNonHeapCommittedM": {
               "metric": "jvm.JvmMetrics.MemNonHeapCommittedM",
               "pointInTime": false,
@@ -1681,11 +1825,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/network/pkts_in": {
-              "metric": "pkts_in",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/rpcdetailed/getEditLogSize_num_ops": {
               "metric": "rpcdetailed.rpcdetailed.GetEditLogManifestNumOps",
               "pointInTime": false,
@@ -1781,6 +1920,16 @@
               "pointInTime": false,
               "temporal": true
             },
+            "metrics/jvm/GcTimeMillisConcurrentMarkSweep": {
+              "metric": "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/jvm/GcCountConcurrentMarkSweep": {
+              "metric": "jvm.JvmMetrics.GcCountConcurrentMarkSweep",
+              "pointInTime": false,
+              "temporal": true
+            },
             "metrics/rpc/ReceivedBytes": {
               "metric": "rpc.rpc.ReceivedBytes",
               "pointInTime": false,
@@ -1831,11 +1980,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/memory/mem_buffers": {
-              "metric": "mem_buffers",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/jvm/gcTimeMillis": {
               "metric": "jvm.JvmMetrics.GcTimeMillis",
               "pointInTime": false,
@@ -1861,16 +2005,6 @@
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/network/bytes_out": {
-              "metric": "bytes_out",
-              "pointInTime": true,
-              "temporal": true
-            },
-            "metrics/load/load_five": {
-              "metric": "load_five",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/dfs/FSNamesystem/CapacityRemainingGB": {
               "metric": "dfs.FSNamesystem.CapacityRemainingGB",
               "pointInTime": false,
@@ -1921,11 +2055,6 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/load/load_fifteen": {
-              "metric": "load_fifteen",
-              "pointInTime": true,
-              "temporal": true
-            },
             "metrics/jvm/logInfo": {
               "metric": "jvm.JvmMetrics.LogInfo",
               "pointInTime": false,
@@ -4522,6 +4651,11 @@
               "pointInTime": true,
               "temporal": true
             },
+            "metrics/dfs/datanode/remote_bytes_written": {
+              "metric": "dfs.datanode.RemoteBytesWritten",
+              "pointInTime": true,
+              "temporal": true
+            },
             "metrics/rpc/getClosestRowBefore_num_ops": {
               "metric": "rpc.rpc.getClosestRowBefore_num_ops",
               "pointInTime": true,
@@ -5442,6 +5576,11 @@
               "pointInTime": true,
               "temporal": true
             },
+            "metrics/dfs/datanode/remote_bytes_read": {
+              "metric": "dfs.datanode.RemoteBytesRead",
+              "pointInTime": true,
+              "temporal": true
+            },
             "metrics/rpc/splitRegion/aboveOneSec/_num_ops": {
               "metric": "rpc.rpc.splitRegion.aboveOneSec._num_ops",
               "pointInTime": true,
@@ -5482,6 +5621,11 @@
               "pointInTime": true,
               "temporal": true
             },
+            "metrics/dfs/datanode/total_read_time": {
+              "metric": "dfs.datanode.TotalReadTime",
+              "pointInTime": true,
+              "temporal": true
+            },
             "metrics/rpc/put/aboveOneSec/_num_ops": {
               "metric": "rpc.rpc.put.aboveOneSec._num_ops",
               "pointInTime": true,
@@ -5557,6 +5701,11 @@
               "pointInTime": true,
               "temporal": true
             },
+            "metrics/dfs/datanode/total_write_time": {
+              "metric": "dfs.datanode.TotalWriteTime",
+              "pointInTime": true,
+              "temporal": true
+            },
             "metrics/rpc/unlockRow/aboveOneSec/_avg_time": {
               "metric": "rpc.rpc.unlockRow.aboveOneSec._avg_time",
               "pointInTime": true,

http://git-wip-us.apache.org/repos/asf/ambari/blob/2e528164/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/widgets.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/widgets.json b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/widgets.json
new file mode 100644
index 0000000..8332d25
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/widgets.json
@@ -0,0 +1,470 @@
+{
+  "layouts": [
+    {
+      "layout_name": "default_hdfs_dashboard",
+      "display_name": "Standard HDFS Dashboard",
+      "section_name": "HDFS_SUMMARY",
+      "widgetLayoutInfo": [
+        {
+          "widget_name": "GC_STATISTICS",
+          "display_name": "Garbage Collection Statistics",
+          "description": "This widget shows JVM Garbage collection statistics for Active NameNode",
+          "widget_type": "GRAPH",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "jvm.JvmMetrics.GcCount",
+              "metric_path": "metrics/jvm/gcCount",
+              "service_name": "HDFS",
+              "component_name": "NAMENODE",
+              "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active"
+            },
+            {
+              "name": "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep",
+              "metric_path": "metrics/jvm/GcTimeMillisConcurrentMarkSweep",
+              "service_name": "HDFS",
+              "component_name": "NAMENODE",
+              "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active"
+            },
+            {
+              "name": "jvm.JvmMetrics.GcCountConcurrentMarkSweep",
+              "metric_path": "metrics/jvm/GcCountConcurrentMarkSweep",
+              "service_name": "HDFS",
+              "component_name": "NAMENODE",
+              "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active"
+            }
+          ],
+          "values": [
+            {
+              "name": "GC total count",
+              "value": "${jvm.JvmMetrics.GcCount}"
+            },
+            {
+              "name": "GC time in major collection",
+              "value": "${jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep}"
+            },
+            {
+              "name": "GC count of type major collection",
+              "value": "${jvm.JvmMetrics.GcCountConcurrentMarkSweep}"
+            }
+          ],
+          "properties": {
+            "display_unit": "Requests",
+            "graph_type": "LINE",
+            "time_range": "86400000"
+          }
+        },
+        {
+          "widget_name": "NUM_OPEN_CONNECTIONS",
+          "display_name": "Client connections",
+          "description": "Number of open connections for Active NameNode.",
+          "widget_type": "GRAPH",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "rpc.rpc.NumOpenConnections",
+              "metric_path": "metrics/rpc/NumOpenConnections",
+              "category": "",
+              "service_name": "HDFS",
+              "component_name": "NAMENODE",
+              "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active"
+            }
+          ],
+          "values": [
+            {
+              "name": "Client connections",
+              "value": "${rpc.rpc.NumOpenConnections}"
+            }
+          ],
+          "properties": {
+            "display_unit": "Connections",
+            "graph_type": "LINE",
+            "time_range": "86400000"
+          }
+        },
+        {
+          "widget_name": "JVM_HEAP_STATISTICS",
+          "display_name": "NameNode JVM Heap Statistics",
+          "widget_type": "GRAPH",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "jvm.JvmMetrics.MemHeapCommittedM",
+              "metric_path": "metrics/jvm/memHeapCommittedM",
+              "service_name": "HDFS",
+              "component_name": "NAMENODE",
+              "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active"
+            },
+            {
+              "name": "jvm.JvmMetrics.MemHeapUsedM",
+              "metric_path": "metrics/jvm/memHeapUsedM",
+              "service_name": "HDFS",
+              "component_name": "NAMENODE",
+              "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active"
+            }
+          ],
+          "values": [
+            {
+              "name": "JVM heap committed",
+              "value": "${jvm.JvmMetrics.MemHeapCommittedM}"
+            },
+            {
+              "name": "JVM heap used",
+              "value": "${jvm.JvmMetrics.MemHeapUsedM}"
+            }
+          ],
+          "properties": {
+            "graph_type": "LINE",
+            "time_range": "86400000"
+          }
+        },
+        {
+          "widget_name": "NN_CPU_RAM_UTILIZATION",
+          "display_name": "NameNode CPU and RAM Utilization",
+          "widget_type": "GRAPH",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "cpu_idle",
+              "metric_path": "metrics/cpu/cpu_idle",
+              "service_name": "HDFS",
+              "component_name": "NAMENODE",
+              "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active"
+            },
+            {
+              "name": "proc_total",
+              "metric_path": "metrics/process/proc_total",
+              "service_name": "HDFS",
+              "component_name": "NAMENODE",
+              "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active"
+            }
+          ],
+          "values": [
+            {
+              "name": "CPU Idle on NameNode host",
+              "value": "${cpu_idle}"
+            },
+            {
+              "name": "Total Processes on NameNode host",
+              "value": "${proc_total}"
+            }
+          ],
+          "properties": {
+            "graph_type": "LINE",
+            "time_range": "86400000"
+          }
+        },
+        {
+          "widget_name": "RPC_QUEUE_WAIT",
+          "display_name": "RPC Queue Wait time",
+          "widget_type": "NUMBER",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "Hadoop:service=NameNode,name=RpcActivity.RpcQueueTimeAvgTime",
+              "metric_path": "metrics/rpc/RpcQueueTime_avg_time",
+              "service_name": "HDFS",
+              "component_name": "NAMENODE",
+              "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active"
+            }
+          ],
+          "values": [
+            {
+              "name": "RPC Queue Wait time",
+              "value": "${Hadoop:service=NameNode,name=RpcActivity.RpcQueueTimeAvgTime}"
+            }
+          ],
+          "properties": {
+            "display_unit": "ms"
+          }
+        },
+        {
+          "widget_name": "RPC_PROCESSING_TIME",
+          "display_name": "RPC Processing time",
+          "widget_type": "NUMBER",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "Hadoop:service=DataNode,name=RpcActivity.RpcProcessingTimeAvgTime",
+              "metric_path": "metrics/rpc/RpcProcessingTime_avg_time",
+              "service_name": "HDFS",
+              "component_name": "NAMENODE",
+              "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active"
+            }
+          ],
+          "values": [
+            {
+              "name": "RPC Processing time",
+              "value": "${Hadoop:service=DataNode,name=RpcActivity.RpcProcessingTimeAvgTime}"
+            }
+          ],
+          "properties": {
+            "display_unit": "ms"
+          }
+        },
+        {
+          "widget_name": "CORRUPTED_BLOCKS",
+          "display_name": "Corrupted Blocks",
+          "widget_type": "NUMBER",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "Hadoop:service=DataNode,name=DataNode.CorruptBlocks",
+              "metric_path": "metrics/dfs/FSNamesystem/CorruptBlocks",
+              "service_name": "HDFS",
+              "component_name": "DATANODE"
+            }
+          ],
+          "values": [
+            {
+              "name": "Corrupted Blocks",
+              "value": "${Hadoop:service=DataNode,name=DataNode.CorruptBlocks}"
+            }
+          ],
+          "properties": {
+          }
+        },
+        {
+          "widget_name": "UNDER_REPLICATED_BLOCKS",
+          "display_name": "Under Replicated Blocks",
+          "widget_type": "NUMBER",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "Hadoop:service=NameNode,name=FSNamesystem.UnderReplicatedBlocks",
+              "metric_path": "metrics/dfs/FSNamesystem/UnderReplicatedBlocks",
+              "service_name": "HDFS",
+              "component_name": "DATANODE"
+            }
+          ],
+          "values": [
+            {
+              "name": "Under Replicated Blocks",
+              "value": "${Hadoop:service=NameNode,name=FSNamesystem.UnderReplicatedBlocks}"
+            }
+          ],
+          "properties": {
+          }
+        }
+      ]
+    },
+    {
+      "layout_name": "default_hdfs_heatmap",
+      "display_name": "HDFS Heatmaps",
+      "section_name": "HDFS_HEATMAPS",
+      "widgetLayoutInfo": [
+        {
+          "widget_name": "HDFS_BYTES_READ",
+          "display_name": "HDFS Bytes Read",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": true,
+          "metrics": [
+            {
+              "name": "dfs.datanode.BytesRead",
+              "metric_path": "metrics/dfs/datanode/bytes_read",
+              "service_name": "HDFS",
+              "component_name": "DATANODE"
+            }
+          ],
+          "values": [
+            {
+              "name": "HDFS Bytes Read",
+              "value": "${dfs.datanode.BytesRead}"
+            }
+          ],
+          "properties": {
+            "display_unit": "MB",
+            "max_limit": "1024"
+          }
+        },
+        {
+          "widget_name": "HDFS_BYTES_WRITE",
+          "display_name": "HDFS Bytes Written",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": false,
+          "metrics": [
+            {
+              "name": "dfs.datanode.BytesWritten",
+              "metric_path": "metrics/dfs/datanode/bytes_read",
+              "service_name": "HDFS",
+              "component_name": "DATANODE"
+            }
+          ],
+          "values": [
+            {
+              "name": "HDFS Bytes Written",
+              "value": "${dfs.datanode.BytesWritten}"
+            }
+          ],
+          "properties": {
+            "display_unit": "MB",
+            "max_limit": "1024"
+          }
+        },
+        {
+          "widget_name": "DN_GC_TIME",
+          "display_name": "DataNode Garbage Collection Time",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": false,
+          "metrics": [
+            {
+              "name": "Hadoop:service=DataNode,name=JvmMetrics.GcTimeMillis",
+              "metric_path": "metrics/jvm/gcTimeMillis",
+              "service_name": "HDFS",
+              "component_name": "DATANODE"
+            }
+          ],
+          "values": [
+            {
+              "name": "DataNode Garbage Collection Time",
+              "value": "${Hadoop:service=DataNode,name=JvmMetrics.GcTimeMillis}"
+            }
+          ],
+          "properties": {
+            "display_unit": "ms",
+            "max_limit": "10000"
+          }
+        },
+        {
+          "widget_name": "DN_JVM_HEAP_USED",
+          "display_name": "DataNode JVM Heap Memory Used",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": false,
+          "metrics": [
+            {
+              "name": "Hadoop:service=DataNode,name=JvmMetrics.MemHeapUsedM",
+              "metric_path": "metrics/jvm/memHeapUsedM",
+              "service_name": "HDFS",
+              "component_name": "DATANODE"
+            }
+          ],
+          "values": [
+            {
+              "name": "DataNode JVM Heap Memory Used",
+              "value": "${Hadoop:service=DataNode,name=JvmMetrics.MemHeapUsedM}"
+            }
+          ],
+          "properties": {
+            "display_unit": "MB",
+            "max_limit": "512"
+          }
+        },
+        {
+          "widget_name": "DN_JVM_HEAP_COMMITTED",
+          "display_name": "DataNode JVM Heap Memory Committed",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": false,
+          "metrics": [
+            {
+              "name": "Hadoop:service=DataNode,name=JvmMetrics.MemHeapCommittedM",
+              "metric_path": "metrics/jvm/memHeapCommittedM",
+              "service_name": "HDFS",
+              "component_name": "DATANODE"
+            }
+          ],
+          "values": [
+            {
+              "name": "DataNode JVM Heap Memory Committed",
+              "value": "${Hadoop:service=DataNode,name=JvmMetrics.MemHeapCommittedM}"
+            }
+          ],
+          "properties": {
+            "display_unit": "MB",
+            "max_limit": "512"
+          }
+        },
+        {
+          "widget_name": "DN_DISK_IO",
+          "display_name": "DataNode Process Disk I/O Utilization",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": false,
+          "metrics": [
+            {
+              "name": "dfs.datanode.BytesRead",
+              "metric_path": "metrics/dfs/datanode/bytes_read",
+              "service_name": "HDFS",
+              "component_name": "DATANODE"
+            },
+            {
+              "name": "dfs.datanode.BytesWritten",
+              "metric_path": "metrics/dfs/datanode/bytes_written",
+              "service_name": "HDFS",
+              "component_name": "DATANODE"
+            },
+            {
+              "name": "dfs.datanode.TotalReadTime",
+              "metric_path": "metrics/dfs/datanode/total_read_time",
+              "service_name": "HDFS",
+              "component_name": "DATANODE"
+            },
+            {
+              "name": "dfs.datanode.TotalWriteTime",
+              "metric_path": "metrics/dfs/datanode/total_write_time",
+              "service_name": "HDFS",
+              "component_name": "DATANODE"
+            }
+          ],
+          "values": [
+            {
+              "name": "DataNode Process Disk I/O Utilization",
+              "value": "${(((dfs.datanode.BytesRead/dfs.datanode.TotalReadTime)+(dfs.datanode.BytesWritten/dfs.datanode.TotalWriteTime))*50}"
+            }
+          ],
+          "properties": {
+            "display_unit": "%",
+            "max_limit": "100"
+          }
+        },
+        {
+          "widget_name": "DN_NETWORK_IO",
+          "display_name": "DataNode Process Network I/O Utilization",
+          "description": "",
+          "widget_type": "HEATMAP",
+          "is_visible": false,
+          "metrics": [
+            {
+              "name": "dfs.datanode.RemoteBytesRead",
+              "metric_path": "metrics/dfs/datanode/remote_bytes_read",
+              "service_name": "HDFS",
+              "component_name": "DATANODE"
+            },
+            {
+              "name": "dfs.datanode.ReadsFromRemoteClient",
+              "metric_path": "metrics/dfs/datanode/reads_from_remote_client",
+              "service_name": "HDFS",
+              "component_name": "DATANODE"
+            },
+            {
+              "name": "dfs.datanode.RemoteBytesWritten",
+              "metric_path": "metrics/dfs/datanode/remote_bytes_written",
+              "service_name": "HDFS",
+              "component_name": "DATANODE"
+            },
+            {
+              "name": "dfs.datanode.WritesFromRemoteClient",
+              "metric_path": "metrics/dfs/datanode/writes_from_remote_client",
+              "service_name": "HDFS",
+              "component_name": "DATANODE"
+            }
+          ],
+          "values": [
+            {
+              "name": "DataNode Process Network I/O Utilization",
+              "value": "${((dfs.datanode.RemoteBytesRead/dfs.datanode.ReadsFromRemoteClient)+(dfs.datanode.RemoteBytesWritten/dfs.datanode.WritesFromRemoteClient))*50}"
+            }
+          ],
+          "properties": {
+            "display_unit": "%",
+            "max_limit": "100"
+          }
+        }
+      ]
+    }
+  ]
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/2e528164/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metrics.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metrics.json b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metrics.json
index 327d10c..dc7dcbd 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metrics.json
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metrics.json
@@ -242,6 +242,11 @@
               "pointInTime": true,
               "temporal": true
             },
+            "metrics/yarn/AllocatedVCores": {
+              "metric": "yarn.NodeManagerMetrics.AllocatedVCores",
+              "pointInTime": true,
+              "temporal": true
+            },
             "metrics/disk/part_max_used": {
               "metric": "part_max_used",
               "pointInTime": true,
@@ -575,287 +580,250 @@
               "temporal": true,
               "amsHostMetric": true
             },
-            "default": {
-              "metrics/jvm/memHeapCommittedM": {
-                "metric": "jvm.JvmMetrics.MemHeapCommittedM",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/mapred/ShuffleOutputsFailed": {
-                "metric": "mapred.ShuffleOutputsFailed",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/jvm/threadsRunnable": {
-                "metric": "jvm.JvmMetrics.ThreadsRunnable",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/jvm/threadsNew": {
-                "metric": "jvm.JvmMetrics.ThreadsNew",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/rpc/rpcAuthorizationFailures": {
-                "metric": "rpc.metrics.RpcAuthorizationFailures",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/ugi/loginSuccess_avg_time": {
-                "metric": "ugi.ugi.LoginSuccessAvgTime",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/rpc/RpcQueueTime_avg_time": {
-                "metric": "rpc.rpc.RpcQueueTimeAvgTime",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/yarn/ContainersCompleted": {
-                "metric": "yarn.NodeManagerMetrics.ContainersCompleted",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/rpc/SentBytes": {
-                "metric": "rpc.rpc.SentBytes",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/jvm/memNonHeapUsedM": {
-                "metric": "jvm.JvmMetrics.MemNonHeapUsedM",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/yarn/ContainersKilled": {
-                "metric": "yarn.NodeManagerMetrics.ContainersKilled",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/jvm/logWarn": {
-                "metric": "jvm.JvmMetrics.LogWarn",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/jvm/threadsTimedWaiting": {
-                "metric": "jvm.JvmMetrics.ThreadsTimedWaiting",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/jvm/gcCount": {
-                "metric": "jvm.JvmMetrics.GcCount",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/process/proc_run": {
-                "metric": "proc_run",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/memory/swap_total": {
-                "metric": "swap_total",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/rpc/ReceivedBytes": {
-                "metric": "rpc.rpc.ReceivedBytes",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/jvm/threadsBlocked": {
-                "metric": "jvm.JvmMetrics.ThreadsBlocked",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/rpc/RpcQueueTime_num_ops": {
-                "metric": "rpc.rpc.RpcQueueTimeNumOps",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/process/proc_total": {
-                "metric": "proc_total",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/yarn/AllocatedGB": {
-                "metric": "yarn.NodeManagerMetrics.AllocatedGB",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/disk/part_max_used": {
-                "metric": "part_max_used",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/rpc/NumOpenConnections": {
-                "metric": "rpc.rpc.NumOpenConnections",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/jvm/memHeapUsedM": {
-                "metric": "jvm.JvmMetrics.MemHeapUsedM",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/jvm/threadsWaiting": {
-                "metric": "jvm.JvmMetrics.ThreadsWaiting",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/mapred/ShuffleOutputsOK": {
-                "metric": "mapred.ShuffleOutputsOK",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/yarn/ContainersFailed": {
-                "metric": "yarn.NodeManagerMetrics.ContainersFailed",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/memory/mem_buffers": {
-                "metric": "mem_buffers",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/ugi/loginSuccess_num_ops": {
-                "metric": "ugi.ugi.LoginSuccessNumOps",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/jvm/gcTimeMillis": {
-                "metric": "jvm.JvmMetrics.GcTimeMillis",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/yarn/AllocatedContainers": {
-                "metric": "yarn.NodeManagerMetrics.AllocatedContainers",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/jvm/threadsTerminated": {
-                "metric": "jvm.JvmMetrics.ThreadsTerminated",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/network/bytes_out": {
-                "metric": "bytes_out",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/cpu/cpu_aidle": {
-                "metric": "cpu_aidle",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/network/bytes_in": {
-                "metric": "bytes_in",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/boottime": {
-                "metric": "boottime",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/network/pkts_out": {
-                "metric": "pkts_out",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/jvm/memNonHeapCommittedM": {
-                "metric": "jvm.JvmMetrics.MemNonHeapCommittedM",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/rpc/callQueueLen": {
-                "metric": "rpc.rpc.CallQueueLength",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/yarn/ContainersRunning": {
-                "metric": "yarn.NodeManagerMetrics.ContainersRunning",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/jvm/logInfo": {
-                "metric": "jvm.JvmMetrics.LogInfo",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/yarn/ContainersLaunched": {
-                "metric": "yarn.NodeManagerMetrics.ContainersLaunched",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/rpc/RpcProcessingTime_num_ops": {
-                "metric": "rpc.rpc.RpcProcessingTimeNumOps",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/ugi/loginFailure_num_ops": {
-                "metric": "ugi.ugi.LoginFailureNumOps",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/yarn/AvailableGB": {
-                "metric": "yarn.NodeManagerMetrics.AvailableGB",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/mapred/ShuffleConnections": {
-                "metric": "mapred.ShuffleConnections",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/yarn/ContainersIniting": {
-                "metric": "yarn.NodeManagerMetrics.ContainersIniting",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/jvm/logError": {
-                "metric": "jvm.JvmMetrics.LogError",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/ugi/loginFailure_avg_time": {
-                "metric": "ugi.ugi.LoginFailureAvgTime",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/rpc/rpcAuthorizationSuccesses": {
-                "metric": "rpc.rpc.RpcAuthorizationSuccesses",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/jvm/logFatal": {
-                "metric": "jvm.JvmMetrics.LogFatal",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/rpc/RpcProcessingTime_avg_time": {
-                "metric": "rpc.rpc.RpcProcessingTimeAvgTime",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/mapred/ShuffleOutputBytes": {
-                "metric": "mapred.ShuffleOutputBytes",
-                "pointInTime": true,
-                "temporal": true
-              },
-              "metrics/rpc/rpcAuthenticationSuccesses": {
-                "metric": "rpc.metrics.RpcAuthenticationSuccesses",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/rpc/rpcAuthenticationFailures": {
-                "metric": "rpc.metrics.RpcAuthenticationFailures",
-                "pointInTime": false,
-                "temporal": true
-              },
-              "metrics/network/pkts_in": {
-                "metric": "pkts_in",
-                "pointInTime": true,
-                "temporal": true
-              }
+            "metrics/jvm/memHeapCommittedM": {
+              "metric": "jvm.JvmMetrics.MemHeapCommittedM",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/mapred/ShuffleOutputsFailed": {
+              "metric": "mapred.ShuffleOutputsFailed",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/jvm/threadsRunnable": {
+              "metric": "jvm.JvmMetrics.ThreadsRunnable",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/jvm/threadsNew": {
+              "metric": "jvm.JvmMetrics.ThreadsNew",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/rpc/rpcAuthorizationFailures": {
+              "metric": "rpc.metrics.RpcAuthorizationFailures",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/ugi/loginSuccess_avg_time": {
+              "metric": "ugi.ugi.LoginSuccessAvgTime",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/rpc/RpcQueueTime_avg_time": {
+              "metric": "rpc.rpc.RpcQueueTimeAvgTime",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/yarn/ContainersCompleted": {
+              "metric": "yarn.NodeManagerMetrics.ContainersCompleted",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/rpc/SentBytes": {
+              "metric": "rpc.rpc.SentBytes",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/jvm/memNonHeapUsedM": {
+              "metric": "jvm.JvmMetrics.MemNonHeapUsedM",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/yarn/ContainersKilled": {
+              "metric": "yarn.NodeManagerMetrics.ContainersKilled",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/jvm/logWarn": {
+              "metric": "jvm.JvmMetrics.LogWarn",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/jvm/threadsTimedWaiting": {
+              "metric": "jvm.JvmMetrics.ThreadsTimedWaiting",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/jvm/gcCount": {
+              "metric": "jvm.JvmMetrics.GcCount",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/rpc/ReceivedBytes": {
+              "metric": "rpc.rpc.ReceivedBytes",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/jvm/threadsBlocked": {
+              "metric": "jvm.JvmMetrics.ThreadsBlocked",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/rpc/RpcQueueTime_num_ops": {
+              "metric": "rpc.rpc.RpcQueueTimeNumOps",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/yarn/AllocatedVCores": {
+              "metric": "yarn.NodeManagerMetrics.AllocatedVCores",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/yarn/AllocatedGB": {
+              "metric": "yarn.NodeManagerMetrics.AllocatedGB",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/disk/part_max_used": {
+              "metric": "part_max_used",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/rpc/NumOpenConnections": {
+              "metric": "rpc.rpc.NumOpenConnections",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/jvm/memHeapUsedM": {
+              "metric": "jvm.JvmMetrics.MemHeapUsedM",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/jvm/threadsWaiting": {
+              "metric": "jvm.JvmMetrics.ThreadsWaiting",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/mapred/ShuffleOutputsOK": {
+              "metric": "mapred.ShuffleOutputsOK",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/yarn/ContainersFailed": {
+              "metric": "yarn.NodeManagerMetrics.ContainersFailed",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/ugi/loginSuccess_num_ops": {
+              "metric": "ugi.ugi.LoginSuccessNumOps",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/jvm/gcTimeMillis": {
+              "metric": "jvm.JvmMetrics.GcTimeMillis",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/yarn/AllocatedContainers": {
+              "metric": "yarn.NodeManagerMetrics.AllocatedContainers",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/jvm/threadsTerminated": {
+              "metric": "jvm.JvmMetrics.ThreadsTerminated",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/cpu/cpu_aidle": {
+              "metric": "cpu_aidle",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/boottime": {
+              "metric": "boottime",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/jvm/memNonHeapCommittedM": {
+              "metric": "jvm.JvmMetrics.MemNonHeapCommittedM",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/rpc/callQueueLen": {
+              "metric": "rpc.rpc.CallQueueLength",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/yarn/ContainersRunning": {
+              "metric": "yarn.NodeManagerMetrics.ContainersRunning",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/jvm/logInfo": {
+              "metric": "jvm.JvmMetrics.LogInfo",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/yarn/ContainersLaunched": {
+              "metric": "yarn.NodeManagerMetrics.ContainersLaunched",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/rpc/RpcProcessingTime_num_ops": {
+              "metric": "rpc.rpc.RpcProcessingTimeNumOps",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/ugi/loginFailure_num_ops": {
+              "metric": "ugi.ugi.LoginFailureNumOps",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/yarn/AvailableGB": {
+              "metric": "yarn.NodeManagerMetrics.AvailableGB",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/mapred/ShuffleConnections": {
+              "metric": "mapred.ShuffleConnections",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/yarn/ContainersIniting": {
+              "metric": "yarn.NodeManagerMetrics.ContainersIniting",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/jvm/logError": {
+              "metric": "jvm.JvmMetrics.LogError",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/ugi/loginFailure_avg_time": {
+              "metric": "ugi.ugi.LoginFailureAvgTime",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/rpc/rpcAuthorizationSuccesses": {
+              "metric": "rpc.rpc.RpcAuthorizationSuccesses",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/jvm/logFatal": {
+              "metric": "jvm.JvmMetrics.LogFatal",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/rpc/RpcProcessingTime_avg_time": {
+              "metric": "rpc.rpc.RpcProcessingTimeAvgTime",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/mapred/ShuffleOutputBytes": {
+              "metric": "mapred.ShuffleOutputBytes",
+              "pointInTime": true,
+              "temporal": true
+            },
+            "metrics/rpc/rpcAuthenticationSuccesses": {
+              "metric": "rpc.metrics.RpcAuthenticationSuccesses",
+              "pointInTime": false,
+              "temporal": true
+            },
+            "metrics/rpc/rpcAuthenticationFailures": {
+              "metric": "rpc.metrics.RpcAuthenticationFailures",
+              "pointInTime": false,
+              "temporal": true
             }
           }
         }
@@ -2836,8 +2804,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/jvm/MemNonHeapUsedM": {
               "metric": "Hadoop:service=JobHistoryServer,name=JvmMetrics.MemNonHeapUsedM",
               "pointInTime": true,
@@ -2943,8 +2909,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/Memory/HeapMemoryMax": {
               "metric": "java.lang:type=Memory.HeapMemoryUsage[max]",
               "pointInTime": true,
@@ -2985,8 +2949,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/MBeanServerDelegate/MBeanServerId": {
               "metric": "JMImplementation:type=MBeanServerDelegate.MBeanServerId",
               "pointInTime": true,
@@ -3022,8 +2984,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/StartupProgress/ElapsedTime": {
               "metric": "Hadoop:service=JobHistoryServer,name=StartupProgress.ElapsedTime",
               "pointInTime": true,
@@ -3114,15 +3074,11 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/HotSpotDiagnostic/DiagnosticOptions": {
               "metric": "com.sun.management:type=HotSpotDiagnostic.DiagnosticOptions",
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/MemoryManager/MemoryPoolNames": {
               "metric": "java.lang:type=MemoryManager,name=CodeCacheManager.MemoryPoolNames",
               "pointInTime": true,
@@ -3143,15 +3099,11 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/Logging/LoggerNames": {
               "metric": "java.util.logging:type=Logging.LoggerNames",
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/UgiMetrics/LoginSuccessNumOps": {
               "metric": "Hadoop:service=JobHistoryServer,name=UgiMetrics.LoginSuccessNumOps",
               "pointInTime": true,
@@ -3172,8 +3124,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/MemoryPool/SurvivorSpace/CollectionUsage": {
               "metric": "java.lang:type=MemoryPool,name=Survivor Space.CollectionUsage",
               "pointInTime": true,
@@ -3234,8 +3184,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/Threading/ThreadAllocatedMemoryEnabled": {
               "metric": "java.lang:type=Threading.ThreadAllocatedMemoryEnabled",
               "pointInTime": true,
@@ -3316,8 +3264,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/ClassLoading/LoadedClassCount": {
               "metric": "java.lang:type=ClassLoading.LoadedClassCount",
               "pointInTime": true,
@@ -3338,8 +3284,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/Runtime/BootClassPath": {
               "metric": "java.lang:type=Runtime.BootClassPath",
               "pointInTime": true,
@@ -3420,8 +3364,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/OperatingSystem/MaxFileDescriptorCount": {
               "metric": "java.lang:type=OperatingSystem.MaxFileDescriptorCount",
               "pointInTime": true,
@@ -3497,8 +3439,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/MemoryPool/PermGen/CollectionUsage": {
               "metric": "java.lang:type=MemoryPool,name=Perm Gen.CollectionUsage",
               "pointInTime": true,
@@ -3574,8 +3514,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/BufferPool/mapred/Count": {
               "metric": "java.nio:type=BufferPool,name=mapped.Count",
               "pointInTime": true,
@@ -3616,8 +3554,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/GarbageCollector/MarkSweepCompact/LastGcInfo": {
               "metric": "java.lang:type=GarbageCollector,name=MarkSweepCompact.LastGcInfo",
               "pointInTime": true,
@@ -3678,8 +3614,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/MemoryPool/CodeCache/CollectionUsage": {
               "metric": "java.lang:type=MemoryPool,name=Code Cache.CollectionUsage",
               "pointInTime": true,
@@ -3740,7 +3674,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
             "metrics/MemoryPool/EdenSpace/CollectionUsage": {
               "metric": "java.lang:type=MemoryPool,name=Eden Space.CollectionUsage",
               "pointInTime": true,
@@ -3801,7 +3734,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
             "metrics/MemoryPool/TenuredGen/CollectionUsage": {
               "metric": "java.lang:type=MemoryPool,name=Tenured Gen.CollectionUsage",
               "pointInTime": true,
@@ -4168,8 +4100,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/jvm/MemNonHeapUsedM": {
               "metric": "Hadoop:service=JobHistoryServer,name=JvmMetrics.MemNonHeapUsedM",
               "pointInTime": true,
@@ -4275,8 +4205,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/Memory/HeapMemoryMax": {
               "metric": "java.lang:type=Memory.HeapMemoryUsage[max]",
               "pointInTime": true,
@@ -4317,8 +4245,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/MBeanServerDelegate/MBeanServerId": {
               "metric": "JMImplementation:type=MBeanServerDelegate.MBeanServerId",
               "pointInTime": true,
@@ -4354,8 +4280,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/StartupProgress/ElapsedTime": {
               "metric": "Hadoop:service=JobHistoryServer,name=StartupProgress.ElapsedTime",
               "pointInTime": true,
@@ -4446,15 +4370,11 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/HotSpotDiagnostic/DiagnosticOptions": {
               "metric": "com.sun.management:type=HotSpotDiagnostic.DiagnosticOptions",
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/MemoryManager/MemoryPoolNames": {
               "metric": "java.lang:type=MemoryManager,name=CodeCacheManager.MemoryPoolNames",
               "pointInTime": true,
@@ -4475,15 +4395,11 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/Logging/LoggerNames": {
               "metric": "java.util.logging:type=Logging.LoggerNames",
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/UgiMetrics/LoginSuccessNumOps": {
               "metric": "Hadoop:service=JobHistoryServer,name=UgiMetrics.LoginSuccessNumOps",
               "pointInTime": true,
@@ -4504,8 +4420,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/MemoryPool/SurvivorSpace/CollectionUsage": {
               "metric": "java.lang:type=MemoryPool,name=Survivor Space.CollectionUsage",
               "pointInTime": true,
@@ -4566,8 +4480,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/Threading/ThreadAllocatedMemoryEnabled": {
               "metric": "java.lang:type=Threading.ThreadAllocatedMemoryEnabled",
               "pointInTime": true,
@@ -4648,8 +4560,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/ClassLoading/LoadedClassCount": {
               "metric": "java.lang:type=ClassLoading.LoadedClassCount",
               "pointInTime": true,
@@ -4670,8 +4580,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/Runtime/BootClassPath": {
               "metric": "java.lang:type=Runtime.BootClassPath",
               "pointInTime": true,
@@ -4752,8 +4660,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/OperatingSystem/MaxFileDescriptorCount": {
               "metric": "java.lang:type=OperatingSystem.MaxFileDescriptorCount",
               "pointInTime": true,
@@ -4829,8 +4735,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/MemoryPool/PermGen/CollectionUsage": {
               "metric": "java.lang:type=MemoryPool,name=Perm Gen.CollectionUsage",
               "pointInTime": true,
@@ -4906,8 +4810,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/BufferPool/mapred/Count": {
               "metric": "java.nio:type=BufferPool,name=mapped.Count",
               "pointInTime": true,
@@ -4948,8 +4850,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/GarbageCollector/MarkSweepCompact/LastGcInfo": {
               "metric": "java.lang:type=GarbageCollector,name=MarkSweepCompact.LastGcInfo",
               "pointInTime": true,
@@ -5010,8 +4910,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
-
             "metrics/MemoryPool/CodeCache/CollectionUsage": {
               "metric": "java.lang:type=MemoryPool,name=Code Cache.CollectionUsage",
               "pointInTime": true,
@@ -5072,7 +4970,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
             "metrics/MemoryPool/EdenSpace/CollectionUsage": {
               "metric": "java.lang:type=MemoryPool,name=Eden Space.CollectionUsage",
               "pointInTime": true,
@@ -5133,7 +5030,6 @@
               "pointInTime": true,
               "temporal": false
             },
-
             "metrics/MemoryPool/TenuredGen/CollectionUsage": {
               "metric": "java.lang:type=MemoryPool,name=Tenured Gen.CollectionUsage",
               "pointInTime": true,