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/05/28 23:47:57 UTC

ambari git commit: AMBARI-11511. Update unit and legend name for default widgets. (jaimin)

Repository: ambari
Updated Branches:
  refs/heads/trunk 46e2d3e12 -> 2975e5108


AMBARI-11511. Update unit and legend name for default widgets. (jaimin)


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

Branch: refs/heads/trunk
Commit: 2975e5108d5d20a136c3815cd552abd1c73c4b04
Parents: 46e2d3e
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Thu May 28 14:47:39 2015 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Thu May 28 14:47:46 2015 -0700

----------------------------------------------------------------------
 .../HBASE/0.96.0.2.0/widgets.json               |  6 +--
 .../common-services/HDFS/2.1.0.2.0/widgets.json | 52 +++++++++++++-------
 .../YARN/2.1.0.2.0/YARN_metrics.json            | 12 +++++
 .../YARN/2.1.0.2.0/YARN_widgets.json            | 45 +++++++++--------
 .../stacks/HDP/2.3/services/HBASE/widgets.json  |  8 ++-
 5 files changed, 75 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2975e510/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 3da4fbf..fee81ec 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
@@ -54,7 +54,6 @@
             }
           ],
           "properties": {
-            "display_unit": "Requests",
             "graph_type": "LINE",
             "time_range": "1"
           }
@@ -163,7 +162,6 @@
             }
           ],
           "properties": {
-            "display_unit": "Connections",
             "graph_type": "LINE",
             "time_range": "1"
           }
@@ -294,8 +292,8 @@
           ],
           "values": [
             {
-              "name": "RegionServer widget for CPU utilization",
-              "value": "${(cpu_system._sum + cpu_user._sum + cpu_nice._sum)/(cpu_system._sum + cpu_user._sum + cpu_nice._sum + cpu_idle._sum + cpu_wio._sum)}"
+              "name": "CPU utilization",
+              "value": "${((cpu_system._sum + cpu_user._sum + cpu_nice._sum)/(cpu_system._sum + cpu_user._sum + cpu_nice._sum + cpu_idle._sum + cpu_wio._sum)) * 100}"
             }
           ],
           "properties": {

http://git-wip-us.apache.org/repos/asf/ambari/blob/2975e510/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
index e2fdcb0..5a12381 100644
--- 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
@@ -6,7 +6,7 @@
       "section_name": "HDFS_SUMMARY",
       "widgetLayoutInfo": [
         {
-          "widget_name": "NameNode GC",
+          "widget_name": "NameNode GC count",
           "description": "This widget shows JVM Garbage collection statistics for Active NameNode",
           "widget_type": "GRAPH",
           "is_visible": true,
@@ -19,13 +19,6 @@
               "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",
@@ -39,16 +32,37 @@
               "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": "1"
+          }
+        },
+        {
+          "widget_name": "NameNode GC time",
+          "description": "This widget shows JVM Garbage collection time in major collection for Active NameNode",
+          "widget_type": "GRAPH",
+          "is_visible": true,
+          "metrics": [
+            {
+              "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"
+            }
+          ],
+          "values": [
+            {
+              "name": "GC time in major collection",
+              "value": "${jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep}"
+            }
+          ],
+          "properties": {
+            "display_unit": "ms",
             "graph_type": "LINE",
             "time_range": "1"
           }
@@ -70,12 +84,11 @@
           ],
           "values": [
             {
-              "name": "NN Connection Load",
+              "name": "Open Connections",
               "value": "${rpc.rpc.NumOpenConnections}"
             }
           ],
           "properties": {
-            "display_unit": "Connections",
             "graph_type": "LINE",
             "time_range": "1"
           }
@@ -111,6 +124,7 @@
             }
           ],
           "properties": {
+            "display_unit": "MB",
             "graph_type": "LINE",
             "time_range": "1"
           }
@@ -179,12 +193,12 @@
           ],
           "values": [
             {
-              "name": "CPU utilization on NameNode host",
-              "value": "${(cpu_system + cpu_user + cpu_nice)/(cpu_system + cpu_user + cpu_nice + cpu_idle + cpu_wio)}"
+              "name": "CPU utilization",
+              "value": "${((cpu_system + cpu_user + cpu_nice)/(cpu_system + cpu_user + cpu_nice + cpu_idle + cpu_wio)) * 100}"
             },
             {
-              "name": "Memory utilization on NameNode host",
-              "value": "${(mem_total - mem_free - mem_cached)/mem_total}"
+              "name": "Memory utilization",
+              "value": "${((mem_total - mem_free - mem_cached)/mem_total) * 100}"
             }
           ],
           "properties": {

http://git-wip-us.apache.org/repos/asf/ambari/blob/2975e510/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/YARN_metrics.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/YARN_metrics.json b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/YARN_metrics.json
index c856141..92c32d8 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/YARN_metrics.json
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/YARN_metrics.json
@@ -152,6 +152,18 @@
               "pointInTime": true,
               "temporal": true
             },
+            "metrics/disk/read_bps":{
+              "metric":"read_bps",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
+            "metrics/disk/write_bps":{
+              "metric":"write_bps",
+              "pointInTime":true,
+              "temporal":true,
+              "amsHostMetric":true
+            },
             "metrics/jvm/memHeapCommittedM": {
               "metric": "jvm.JvmMetrics.MemHeapCommittedM",
               "pointInTime": false,

http://git-wip-us.apache.org/repos/asf/ambari/blob/2975e510/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/YARN_widgets.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/YARN_widgets.json b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/YARN_widgets.json
index dca4205..aa27213 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/YARN_widgets.json
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/YARN_widgets.json
@@ -7,7 +7,7 @@
       "widgetLayoutInfo": [
         {
           "widget_name": "Memory Utilization",
-          "description": "Memory Utilization Ratio",
+          "description": "Memory Utilization",
           "widget_type": "GRAPH",
           "is_visible": true,
           "metrics": [
@@ -27,7 +27,7 @@
           "values": [
             {
               "name": "Memory Utilization",
-              "value": "${yarn.QueueMetrics.Queue=root.AllocatedMB._sum / (yarn.QueueMetrics.Queue=root.AvailableMB._sum + yarn.QueueMetrics.Queue=root.AvailableMB._sum)}"
+              "value": "${(yarn.QueueMetrics.Queue=root.AllocatedMB._sum / (yarn.QueueMetrics.Queue=root.AvailableMB._sum + yarn.QueueMetrics.Queue=root.AvailableMB._sum)) * 100}"
             }
           ],
           "properties": {
@@ -38,7 +38,7 @@
         },
         {
           "widget_name": "CPU Utilization",
-          "description": "CPU Utilization Ratio",
+          "description": "CPU Utilization",
           "widget_type": "GRAPH",
           "is_visible": true,
           "metrics": [
@@ -58,7 +58,7 @@
           "values": [
             {
               "name": "Total Allocatable CPU Utilized across NodeManager",
-              "value": "${yarn.QueueMetrics.Queue=root.default.AllocatedVCores._sum / (yarn.QueueMetrics.Queue=root.default.AllocatedVCores._sum + yarn.QueueMetrics.Queue=root.default.AvailableVCores._sum)}"
+              "value": "${(yarn.QueueMetrics.Queue=root.default.AllocatedVCores._sum / (yarn.QueueMetrics.Queue=root.default.AllocatedVCores._sum + yarn.QueueMetrics.Queue=root.default.AvailableVCores._sum)) * 100}"
             }
           ],
           "properties": {
@@ -98,7 +98,7 @@
         },
         {
           "widget_name": "Container Failures",
-          "description": "Ratio of Container Failures",
+          "description": "Container Failures",
           "widget_type": "GRAPH",
           "is_visible": true,
           "metrics": [
@@ -142,7 +142,7 @@
           "values": [
             {
               "name": "Container Failures",
-              "value": "${yarn.NodeManagerMetrics.ContainersFailed._sum/(yarn.NodeManagerMetrics.ContainersFailed._sum + yarn.NodeManagerMetrics.ContainersCompleted._sum + yarn.NodeManagerMetrics.ContainersLaunched._sum + yarn.NodeManagerMetrics.ContainersIniting._sum + yarn.NodeManagerMetrics.ContainersKilled._sum + yarn.NodeManagerMetrics.ContainersRunning._sum)}"
+              "value": "${(yarn.NodeManagerMetrics.ContainersFailed._sum/(yarn.NodeManagerMetrics.ContainersFailed._sum + yarn.NodeManagerMetrics.ContainersCompleted._sum + yarn.NodeManagerMetrics.ContainersLaunched._sum + yarn.NodeManagerMetrics.ContainersIniting._sum + yarn.NodeManagerMetrics.ContainersKilled._sum + yarn.NodeManagerMetrics.ContainersRunning._sum)) * 100}"
             }
           ],
           "properties": {
@@ -153,7 +153,7 @@
         },
         {
           "widget_name": "App Failures",
-          "description": "App Failures ratio",
+          "description": "App Failures",
           "widget_type": "GRAPH",
           "is_visible": true,
           "metrics": [
@@ -197,7 +197,7 @@
           "values": [
             {
               "name": "App Failures",
-              "value": "${yarn.QueueMetrics.Queue=root.AppsFailed/(yarn.QueueMetrics.Queue=root.AppsFailed + yarn.QueueMetrics.Queue=root.AppsKilled + yarn.QueueMetrics.Queue=root.AppsPending + yarn.QueueMetrics.Queue=root.AppsRunning + yarn.QueueMetrics.Queue=root.AppsSubmitted + yarn.QueueMetrics.Queue=root.AppsCompleted)}"
+              "value": "${(yarn.QueueMetrics.Queue=root.AppsFailed/(yarn.QueueMetrics.Queue=root.AppsFailed + yarn.QueueMetrics.Queue=root.AppsKilled + yarn.QueueMetrics.Queue=root.AppsPending + yarn.QueueMetrics.Queue=root.AppsRunning + yarn.QueueMetrics.Queue=root.AppsSubmitted + yarn.QueueMetrics.Queue=root.AppsCompleted)) * 100}"
             }
           ],
           "properties": {
@@ -258,42 +258,47 @@
           ],
           "values": [
             {
-              "name": "Memory utilization on NodeManager hosts",
-              "value": "${(mem_total._sum - mem_free._sum - mem_cached._sum)/mem_total._sum}"
+              "name": "Memory utilization",
+              "value": "${((mem_total._sum - mem_free._sum - mem_cached._sum)/mem_total._sum) * 100}"
             }
           ],
           "properties": {
+            "display_unit": "%",
             "graph_type": "LINE",
             "time_range": "1"
           }
         },
         {
           "widget_name": "Cluster Disk",
-          "description": "NodeManager widget for disk utilization",
-          "default_section_name": "YARN_SUMMARY",
+          "description": "NodeManager widget for Disk throughput",
           "widget_type": "GRAPH",
           "is_visible": true,
           "metrics": [
             {
-              "name": "disk_free._sum",
-              "metric_path": "metrics/disk/disk_free._sum",
+              "name": "read_bps._sum",
+              "metric_path": "metrics/disk/read_bps._sum",
               "service_name": "YARN",
               "component_name": "NODEMANAGER"
             },
             {
-              "name": "disk_total._sum",
-              "metric_path": "metrics/disk/disk_total._sum",
+              "name": "write_bps._sum",
+              "metric_path": "metrics/disk/write_bps._sum",
               "service_name": "YARN",
               "component_name": "NODEMANAGER"
             }
           ],
           "values": [
             {
-              "name": "Disk Utlization",
-              "value": "${(disk_total._sum - disk_free._sum)/disk_total._sum}"
+              "name": "Read throughput",
+              "value": "${read_bps._sum/1048576}"
+            },
+            {
+              "name": "Write throughput",
+              "value": "${write_bps._sum/1048576}"
             }
           ],
           "properties": {
+            "display_unit": "Mbps",
             "graph_type": "LINE",
             "time_range": "1"
           }
@@ -373,8 +378,8 @@
           ],
           "values": [
             {
-              "name": "CPU utilization on NameNode host",
-              "value": "${(cpu_system._sum + cpu_user._sum + cpu_nice._sum)/(cpu_system._sum + cpu_user._sum + cpu_nice._sum + cpu_idle._sum + cpu_wio._sum)}"
+              "name": "CPU utilization",
+              "value": "${((cpu_system._sum + cpu_user._sum + cpu_nice._sum)/(cpu_system._sum + cpu_user._sum + cpu_nice._sum + cpu_idle._sum + cpu_wio._sum)) * 100}"
             }
           ],
           "properties": {

http://git-wip-us.apache.org/repos/asf/ambari/blob/2975e510/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/widgets.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/widgets.json b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/widgets.json
index 9e623f9..a1086f1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/widgets.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/widgets.json
@@ -59,7 +59,6 @@
             }
           ],
           "properties": {
-            "display_unit": "Requests",
             "graph_type": "LINE",
             "time_range": "1"
           }
@@ -175,7 +174,6 @@
             }
           ],
           "properties": {
-            "display_unit": "Connections",
             "graph_type": "LINE",
             "time_range": "1"
           }
@@ -302,8 +300,8 @@
           ],
           "values": [
             {
-              "name": "RegionServer widget for CPU utilization",
-              "value": "${(cpu_system._sum + cpu_user._sum + cpu_nice._sum)/(cpu_system._sum + cpu_user._sum + cpu_nice._sum + cpu_idle._sum + cpu_wio._sum)}"
+              "name": "CPU utilization",
+              "value": "${((cpu_system._sum + cpu_user._sum + cpu_nice._sum)/(cpu_system._sum + cpu_user._sum + cpu_nice._sum + cpu_idle._sum + cpu_wio._sum)) * 100}"
             }
           ],
           "properties": {
@@ -348,7 +346,7 @@
         },
         {
           "widget_name": "Cluster Disk",
-          "description": "RegionServer widget for Disk throughput",
+          "description": "RegionServer widget for Disk throughput.",
           "widget_type": "GRAPH",
           "is_visible": true,
           "metrics": [