ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From atk...@apache.org
Subject ambari git commit: AMBARI-15385 Counter values need to request for rate function to maintain parity. (atkach)
Date Mon, 14 Mar 2016 10:48:13 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 2708e80ab -> 3b487edf4


AMBARI-15385 Counter values need to request for rate function to maintain parity. (atkach)


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

Branch: refs/heads/branch-2.2
Commit: 3b487edf4c7d92045753a26ed83cb116091c960a
Parents: 2708e80
Author: Andrii Tkach <atkach@hortonworks.com>
Authored: Fri Mar 11 15:26:41 2016 +0200
Committer: Andrii Tkach <atkach@hortonworks.com>
Committed: Mon Mar 14 12:46:53 2016 +0200

----------------------------------------------------------------------
 .../HBASE/0.96.0.2.0/widgets.json               | 24 ++++-----
 .../common-services/HDFS/2.1.0.2.0/widgets.json | 20 ++++----
 .../YARN/2.1.0.2.0/YARN_widgets.json            | 48 +++++++++---------
 .../stacks/HDP/2.3/services/HBASE/widgets.json  | 28 +++++------
 .../stacks/HDP/2.3/services/HDFS/widgets.json   | 52 ++++++++++----------
 .../HDP/2.3/services/YARN/YARN_widgets.json     | 48 +++++++++---------
 .../OTHER/2.0/services/HBASE/widgets.json       | 28 +++++------
 .../service/widgets/create/expression_view.js   |  2 +-
 8 files changed, 125 insertions(+), 125 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3b487edf/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 9b45034..984a60e 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
@@ -13,32 +13,32 @@
           "is_visible": true,
           "metrics": [
             {
-              "name": "regionserver.Server.Get_num_ops._sum",
-              "metric_path": "metrics/hbase/regionserver/Server/Get_num_ops._sum",
+              "name": "regionserver.Server.Get_num_ops._rate",
+              "metric_path": "metrics/hbase/regionserver/Server/Get_num_ops._rate",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"
             },
             {
-              "name": "regionserver.Server.Append_num_ops._sum",
-              "metric_path": "metrics/hbase/regionserver/Server/Append_num_ops._sum",
+              "name": "regionserver.Server.Append_num_ops._rate",
+              "metric_path": "metrics/hbase/regionserver/Server/Append_num_ops._rate",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"
             },
             {
-              "name": "regionserver.Server.Delete_num_ops._sum",
-              "metric_path": "metrics/hbase/regionserver/Server/Delete_num_ops._sum",
+              "name": "regionserver.Server.Delete_num_ops._rate",
+              "metric_path": "metrics/hbase/regionserver/Server/Delete_num_ops._rate",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"
             },
             {
-              "name": "regionserver.Server.Increment_num_ops._sum",
-              "metric_path": "metrics/hbase/regionserver/Server/Increment_num_ops._sum",
+              "name": "regionserver.Server.Increment_num_ops._rate",
+              "metric_path": "metrics/hbase/regionserver/Server/Increment_num_ops._rate",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"
             },
             {
-              "name": "regionserver.Server.Mutate_num_ops._sum",
-              "metric_path": "metrics/hbase/regionserver/Server/Mutate_num_ops._sum",
+              "name": "regionserver.Server.Mutate_num_ops._rate",
+              "metric_path": "metrics/hbase/regionserver/Server/Mutate_num_ops._rate",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"
             }
@@ -235,8 +235,8 @@
           "is_visible": true,
           "metrics": [
             {
-              "name": "regionserver.Server.updatesBlockedTime._sum",
-              "metric_path": "metrics/hbase/regionserver/Server/updatesBlockedTime._sum",
+              "name": "regionserver.Server.updatesBlockedTime._rate",
+              "metric_path": "metrics/hbase/regionserver/Server/updatesBlockedTime._rate",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"
             }

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b487edf/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 2d4877f..db528ff 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
@@ -12,15 +12,15 @@
           "is_visible": true,
           "metrics": [
             {
-              "name": "jvm.JvmMetrics.GcCount",
-              "metric_path": "metrics/jvm/gcCount",
+              "name": "jvm.JvmMetrics.GcCount._rate",
+              "metric_path": "metrics/jvm/gcCount._rate",
               "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",
+              "name": "jvm.JvmMetrics.GcCountConcurrentMarkSweep._rate",
+              "metric_path": "metrics/jvm/GcCountConcurrentMarkSweep._rate",
               "service_name": "HDFS",
               "component_name": "NAMENODE",
               "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active"
@@ -48,8 +48,8 @@
           "is_visible": true,
           "metrics": [
             {
-              "name": "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep",
-              "metric_path": "metrics/jvm/GcTimeMillisConcurrentMarkSweep",
+              "name": "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep._rate",
+              "metric_path": "metrics/jvm/GcTimeMillisConcurrentMarkSweep._rate",
               "service_name": "HDFS",
               "component_name": "NAMENODE",
               "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active"
@@ -343,8 +343,8 @@
           "is_visible": true,
           "metrics": [
             {
-              "name": "dfs.datanode.BytesRead",
-              "metric_path": "metrics/dfs/datanode/bytes_read",
+              "name": "dfs.datanode.BytesRead._rate",
+              "metric_path": "metrics/dfs/datanode/bytes_read._rate",
               "service_name": "HDFS",
               "component_name": "DATANODE"
             }
@@ -367,8 +367,8 @@
           "is_visible": false,
           "metrics": [
             {
-              "name": "dfs.datanode.BytesWritten",
-              "metric_path": "metrics/dfs/datanode/bytes_written",
+              "name": "dfs.datanode.BytesWritten._rate",
+              "metric_path": "metrics/dfs/datanode/bytes_written._rate",
               "service_name": "HDFS",
               "component_name": "DATANODE"
             }

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b487edf/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 fedee4d..898ffbd 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
@@ -78,20 +78,20 @@
           "is_visible": true,
           "metrics": [
             {
-              "name": "yarn.NodeManagerMetrics.ContainersFailed._sum",
-              "metric_path": "metrics/yarn/ContainersFailed._sum",
+              "name": "yarn.NodeManagerMetrics.ContainersFailed._rate",
+              "metric_path": "metrics/yarn/ContainersFailed._rate",
               "service_name": "YARN",
               "component_name": "NODEMANAGER"
             },
             {
-              "name": "yarn.NodeManagerMetrics.ContainersCompleted._sum",
-              "metric_path": "metrics/yarn/ContainersCompleted._sum",
+              "name": "yarn.NodeManagerMetrics.ContainersCompleted._rate",
+              "metric_path": "metrics/yarn/ContainersCompleted._rate",
               "service_name": "YARN",
               "component_name": "NODEMANAGER"
             },
             {
-              "name": "yarn.NodeManagerMetrics.ContainersLaunched._sum",
-              "metric_path": "metrics/yarn/ContainersLaunched._sum",
+              "name": "yarn.NodeManagerMetrics.ContainersLaunched._rate",
+              "metric_path": "metrics/yarn/ContainersLaunched._rate",
               "service_name": "YARN",
               "component_name": "NODEMANAGER"
             },
@@ -102,8 +102,8 @@
               "component_name": "NODEMANAGER"
             },
             {
-              "name": "yarn.NodeManagerMetrics.ContainersKilled._sum",
-              "metric_path": "metrics/yarn/ContainersKilled._sum",
+              "name": "yarn.NodeManagerMetrics.ContainersKilled._rate",
+              "metric_path": "metrics/yarn/ContainersKilled._rate",
               "service_name": "YARN",
               "component_name": "NODEMANAGER"
             },
@@ -133,15 +133,15 @@
           "is_visible": true,
           "metrics": [
             {
-              "name": "yarn.QueueMetrics.Queue=root.AppsFailed",
-              "metric_path": "metrics/yarn/Queue/root/AppsFailed",
+              "name": "yarn.QueueMetrics.Queue=root.AppsFailed._rate",
+              "metric_path": "metrics/yarn/Queue/root/AppsFailed._rate",
               "service_name": "YARN",
               "component_name": "RESOURCEMANAGER",
               "host_component_criteria": "host_components/HostRoles/ha_state=ACTIVE"
             },
             {
-              "name": "yarn.QueueMetrics.Queue=root.AppsKilled",
-              "metric_path": "metrics/yarn/Queue/root/AppsKilled",
+              "name": "yarn.QueueMetrics.Queue=root.AppsKilled._rate",
+              "metric_path": "metrics/yarn/Queue/root/AppsKilled._rate",
               "service_name": "YARN",
               "component_name": "RESOURCEMANAGER",
               "host_component_criteria": "host_components/HostRoles/ha_state=ACTIVE"
@@ -161,15 +161,15 @@
               "host_component_criteria": "host_components/HostRoles/ha_state=ACTIVE"
             },
             {
-              "name": "yarn.QueueMetrics.Queue=root.AppsSubmitted",
-              "metric_path": "metrics/yarn/Queue/root/AppsSubmitted",
+              "name": "yarn.QueueMetrics.Queue=root.AppsSubmitted._rate",
+              "metric_path": "metrics/yarn/Queue/root/AppsSubmitted._rate",
               "service_name": "YARN",
               "component_name": "RESOURCEMANAGER",
               "host_component_criteria": "host_components/HostRoles/ha_state=ACTIVE"
             },
             {
-              "name": "yarn.QueueMetrics.Queue=root.AppsCompleted",
-              "metric_path": "metrics/yarn/Queue/root/AppsCompleted",
+              "name": "yarn.QueueMetrics.Queue=root.AppsCompleted._rate",
+              "metric_path": "metrics/yarn/Queue/root/AppsCompleted._rate",
               "service_name": "YARN",
               "component_name": "RESOURCEMANAGER",
               "host_component_criteria": "host_components/HostRoles/ha_state=ACTIVE"
@@ -444,20 +444,20 @@
           "is_visible": false,
           "metrics": [
             {
-              "name": "yarn.NodeManagerMetrics.ContainersFailed",
-              "metric_path": "metrics/yarn/ContainersFailed",
+              "name": "yarn.NodeManagerMetrics.ContainersFailed._rate",
+              "metric_path": "metrics/yarn/ContainersFailed._rate",
               "service_name": "YARN",
               "component_name": "NODEMANAGER"
             },
             {
-              "name": "yarn.NodeManagerMetrics.ContainersCompleted",
-              "metric_path": "metrics/yarn/ContainersCompleted",
+              "name": "yarn.NodeManagerMetrics.ContainersCompleted._rate",
+              "metric_path": "metrics/yarn/ContainersCompleted._rate",
               "service_name": "YARN",
               "component_name": "NODEMANAGER"
             },
             {
-              "name": "yarn.NodeManagerMetrics.ContainersLaunched",
-              "metric_path": "metrics/yarn/ContainersLaunched",
+              "name": "yarn.NodeManagerMetrics.ContainersLaunched._rate",
+              "metric_path": "metrics/yarn/ContainersLaunched._rate",
               "service_name": "YARN",
               "component_name": "NODEMANAGER"
             },
@@ -468,8 +468,8 @@
               "component_name": "NODEMANAGER"
             },
             {
-              "name": "yarn.NodeManagerMetrics.ContainersKilled",
-              "metric_path": "metrics/yarn/ContainersKilled",
+              "name": "yarn.NodeManagerMetrics.ContainersKilled._rate",
+              "metric_path": "metrics/yarn/ContainersKilled._rate",
               "service_name": "YARN",
               "component_name": "NODEMANAGER"
             },

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b487edf/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 a0f5ba9..364fc1f 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
@@ -12,38 +12,38 @@
           "is_visible": true,
           "metrics": [
             {
-              "name": "regionserver.Server.Get_num_ops._sum",
-              "metric_path": "metrics/hbase/regionserver/Server/Get_num_ops._sum",
+              "name": "regionserver.Server.Get_num_ops._rate",
+              "metric_path": "metrics/hbase/regionserver/Server/Get_num_ops._rate",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"
             },
             {
-              "name": "regionserver.Server.ScanNext_num_ops._sum",
-              "metric_path": "metrics/hbase/regionserver/Server/ScanNext_num_ops._sum",
+              "name": "regionserver.Server.ScanNext_num_ops._rate",
+              "metric_path": "metrics/hbase/regionserver/Server/ScanNext_num_ops._rate",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"
             },
             {
-              "name": "regionserver.Server.Append_num_ops._sum",
-              "metric_path": "metrics/hbase/regionserver/Server/Append_num_ops._sum",
+              "name": "regionserver.Server.Append_num_ops._rate",
+              "metric_path": "metrics/hbase/regionserver/Server/Append_num_ops._rate",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"
             },
             {
-              "name": "regionserver.Server.Delete_num_ops._sum",
-              "metric_path": "metrics/hbase/regionserver/Server/Delete_num_ops._sum",
+              "name": "regionserver.Server.Delete_num_ops._rate",
+              "metric_path": "metrics/hbase/regionserver/Server/Delete_num_ops._rate",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"
             },
             {
-              "name": "regionserver.Server.Increment_num_ops._sum",
-              "metric_path": "metrics/hbase/regionserver/Server/Increment_num_ops._sum",
+              "name": "regionserver.Server.Increment_num_ops._rate",
+              "metric_path": "metrics/hbase/regionserver/Server/Increment_num_ops._rate",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"
             },
             {
-              "name": "regionserver.Server.Mutate_num_ops._sum",
-              "metric_path": "metrics/hbase/regionserver/Server/Mutate_num_ops._sum",
+              "name": "regionserver.Server.Mutate_num_ops._rate",
+              "metric_path": "metrics/hbase/regionserver/Server/Mutate_num_ops._rate",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"
             }
@@ -244,8 +244,8 @@
           "is_visible": true,
           "metrics": [
             {
-              "name": "regionserver.Server.updatesBlockedTime._sum",
-              "metric_path": "metrics/hbase/regionserver/Server/updatesBlockedTime._sum",
+              "name": "regionserver.Server.updatesBlockedTime._rate",
+              "metric_path": "metrics/hbase/regionserver/Server/updatesBlockedTime._rate",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"
             }

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b487edf/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/widgets.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/widgets.json b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/widgets.json
index 800def9..c698da3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/widgets.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/widgets.json
@@ -12,15 +12,15 @@
           "is_visible": true,
           "metrics": [
             {
-              "name": "jvm.JvmMetrics.GcCount",
-              "metric_path": "metrics/jvm/gcCount",
+              "name": "jvm.JvmMetrics.GcCount._rate",
+              "metric_path": "metrics/jvm/gcCount._rate",
               "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",
+              "name": "jvm.JvmMetrics.GcCountConcurrentMarkSweep._rate",
+              "metric_path": "metrics/jvm/GcCountConcurrentMarkSweep._rate",
               "service_name": "HDFS",
               "component_name": "NAMENODE",
               "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active"
@@ -48,8 +48,8 @@
           "is_visible": true,
           "metrics": [
             {
-              "name": "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep",
-              "metric_path": "metrics/jvm/GcTimeMillisConcurrentMarkSweep",
+              "name": "jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep._rate",
+              "metric_path": "metrics/jvm/GcTimeMillisConcurrentMarkSweep._rate",
               "service_name": "HDFS",
               "component_name": "NAMENODE",
               "host_component_criteria": "host_components/metrics/dfs/FSNamesystem/HAState=active"
@@ -423,8 +423,8 @@
           "is_visible": true,
           "metrics": [
             {
-              "name": "dfs.datanode.BytesRead",
-              "metric_path": "metrics/dfs/datanode/bytes_read",
+              "name": "dfs.datanode.BytesRead._rate",
+              "metric_path": "metrics/dfs/datanode/bytes_read._rate",
               "service_name": "HDFS",
               "component_name": "DATANODE"
             }
@@ -447,8 +447,8 @@
           "is_visible": false,
           "metrics": [
             {
-              "name": "dfs.datanode.BytesWritten",
-              "metric_path": "metrics/dfs/datanode/bytes_written",
+              "name": "dfs.datanode.BytesWritten._rate",
+              "metric_path": "metrics/dfs/datanode/bytes_written._rate",
               "service_name": "HDFS",
               "component_name": "DATANODE"
             }
@@ -544,26 +544,26 @@
           "is_visible": false,
           "metrics": [
             {
-              "name": "dfs.datanode.BytesRead",
-              "metric_path": "metrics/dfs/datanode/bytes_read",
+              "name": "dfs.datanode.BytesRead._rate",
+              "metric_path": "metrics/dfs/datanode/bytes_read._rate",
               "service_name": "HDFS",
               "component_name": "DATANODE"
             },
             {
-              "name": "dfs.datanode.BytesWritten",
-              "metric_path": "metrics/dfs/datanode/bytes_written",
+              "name": "dfs.datanode.BytesWritten._rate",
+              "metric_path": "metrics/dfs/datanode/bytes_written._rate",
               "service_name": "HDFS",
               "component_name": "DATANODE"
             },
             {
-              "name": "dfs.datanode.TotalReadTime",
-              "metric_path": "metrics/dfs/datanode/TotalReadTime",
+              "name": "dfs.datanode.TotalReadTime._rate",
+              "metric_path": "metrics/dfs/datanode/TotalReadTime._rate",
               "service_name": "HDFS",
               "component_name": "DATANODE"
             },
             {
-              "name": "dfs.datanode.TotalWriteTime",
-              "metric_path": "metrics/dfs/datanode/TotalWriteTime",
+              "name": "dfs.datanode.TotalWriteTime._rate",
+              "metric_path": "metrics/dfs/datanode/TotalWriteTime._rate",
               "service_name": "HDFS",
               "component_name": "DATANODE"
             }
@@ -586,26 +586,26 @@
           "is_visible": false,
           "metrics": [
             {
-              "name": "dfs.datanode.RemoteBytesRead",
-              "metric_path": "metrics/dfs/datanode/RemoteBytesRead",
+              "name": "dfs.datanode.RemoteBytesRead._rate",
+              "metric_path": "metrics/dfs/datanode/RemoteBytesRead._rate",
               "service_name": "HDFS",
               "component_name": "DATANODE"
             },
             {
-              "name": "dfs.datanode.ReadsFromRemoteClient",
-              "metric_path": "metrics/dfs/datanode/reads_from_remote_client",
+              "name": "dfs.datanode.ReadsFromRemoteClient._rate",
+              "metric_path": "metrics/dfs/datanode/reads_from_remote_client._rate",
               "service_name": "HDFS",
               "component_name": "DATANODE"
             },
             {
-              "name": "dfs.datanode.RemoteBytesWritten",
-              "metric_path": "metrics/dfs/datanode/RemoteBytesWritten",
+              "name": "dfs.datanode.RemoteBytesWritten._rate",
+              "metric_path": "metrics/dfs/datanode/RemoteBytesWritten._rate",
               "service_name": "HDFS",
               "component_name": "DATANODE"
             },
             {
-              "name": "dfs.datanode.WritesFromRemoteClient",
-              "metric_path": "metrics/dfs/datanode/writes_from_remote_client",
+              "name": "dfs.datanode.WritesFromRemoteClient._rate",
+              "metric_path": "metrics/dfs/datanode/writes_from_remote_client._rate",
               "service_name": "HDFS",
               "component_name": "DATANODE"
             }

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b487edf/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/YARN_widgets.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/YARN_widgets.json
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/YARN_widgets.json
index 5179470..905e7d7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/YARN_widgets.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/YARN_widgets.json
@@ -107,20 +107,20 @@
           "is_visible": true,
           "metrics": [
             {
-              "name": "yarn.NodeManagerMetrics.ContainersFailed._sum",
-              "metric_path": "metrics/yarn/ContainersFailed._sum",
+              "name": "yarn.NodeManagerMetrics.ContainersFailed._rate",
+              "metric_path": "metrics/yarn/ContainersFailed._rate",
               "service_name": "YARN",
               "component_name": "NODEMANAGER"
             },
             {
-              "name": "yarn.NodeManagerMetrics.ContainersCompleted._sum",
-              "metric_path": "metrics/yarn/ContainersCompleted._sum",
+              "name": "yarn.NodeManagerMetrics.ContainersCompleted._rate",
+              "metric_path": "metrics/yarn/ContainersCompleted._rate",
               "service_name": "YARN",
               "component_name": "NODEMANAGER"
             },
             {
-              "name": "yarn.NodeManagerMetrics.ContainersLaunched._sum",
-              "metric_path": "metrics/yarn/ContainersLaunched._sum",
+              "name": "yarn.NodeManagerMetrics.ContainersLaunched._rate",
+              "metric_path": "metrics/yarn/ContainersLaunched._rate",
               "service_name": "YARN",
               "component_name": "NODEMANAGER"
             },
@@ -131,8 +131,8 @@
               "component_name": "NODEMANAGER"
             },
             {
-              "name": "yarn.NodeManagerMetrics.ContainersKilled._sum",
-              "metric_path": "metrics/yarn/ContainersKilled._sum",
+              "name": "yarn.NodeManagerMetrics.ContainersKilled._rate",
+              "metric_path": "metrics/yarn/ContainersKilled._rate",
               "service_name": "YARN",
               "component_name": "NODEMANAGER"
             },
@@ -162,15 +162,15 @@
           "is_visible": true,
           "metrics": [
             {
-              "name": "yarn.QueueMetrics.Queue=root.AppsFailed",
-              "metric_path": "metrics/yarn/Queue/root/AppsFailed",
+              "name": "yarn.QueueMetrics.Queue=root.AppsFailed._rate",
+              "metric_path": "metrics/yarn/Queue/root/AppsFailed._rate",
               "service_name": "YARN",
               "component_name": "RESOURCEMANAGER",
               "host_component_criteria": "host_components/HostRoles/ha_state=ACTIVE"
             },
             {
-              "name": "yarn.QueueMetrics.Queue=root.AppsKilled",
-              "metric_path": "metrics/yarn/Queue/root/AppsKilled",
+              "name": "yarn.QueueMetrics.Queue=root.AppsKilled._rate",
+              "metric_path": "metrics/yarn/Queue/root/AppsKilled._rate",
               "service_name": "YARN",
               "component_name": "RESOURCEMANAGER",
               "host_component_criteria": "host_components/HostRoles/ha_state=ACTIVE"
@@ -190,15 +190,15 @@
               "host_component_criteria": "host_components/HostRoles/ha_state=ACTIVE"
             },
             {
-              "name": "yarn.QueueMetrics.Queue=root.AppsSubmitted",
-              "metric_path": "metrics/yarn/Queue/root/AppsSubmitted",
+              "name": "yarn.QueueMetrics.Queue=root.AppsSubmitted._rate",
+              "metric_path": "metrics/yarn/Queue/root/AppsSubmitted._rate",
               "service_name": "YARN",
               "component_name": "RESOURCEMANAGER",
               "host_component_criteria": "host_components/HostRoles/ha_state=ACTIVE"
             },
             {
-              "name": "yarn.QueueMetrics.Queue=root.AppsCompleted",
-              "metric_path": "metrics/yarn/Queue/root/AppsCompleted",
+              "name": "yarn.QueueMetrics.Queue=root.AppsCompleted._rate",
+              "metric_path": "metrics/yarn/Queue/root/AppsCompleted._rate",
               "service_name": "YARN",
               "component_name": "RESOURCEMANAGER",
               "host_component_criteria": "host_components/HostRoles/ha_state=ACTIVE"
@@ -503,20 +503,20 @@
           "is_visible": false,
           "metrics": [
             {
-              "name": "yarn.NodeManagerMetrics.ContainersFailed",
-              "metric_path": "metrics/yarn/ContainersFailed",
+              "name": "yarn.NodeManagerMetrics.ContainersFailed._rate",
+              "metric_path": "metrics/yarn/ContainersFailed._rate",
               "service_name": "YARN",
               "component_name": "NODEMANAGER"
             },
             {
-              "name": "yarn.NodeManagerMetrics.ContainersCompleted",
-              "metric_path": "metrics/yarn/ContainersCompleted",
+              "name": "yarn.NodeManagerMetrics.ContainersCompleted._rate",
+              "metric_path": "metrics/yarn/ContainersCompleted._rate",
               "service_name": "YARN",
               "component_name": "NODEMANAGER"
             },
             {
-              "name": "yarn.NodeManagerMetrics.ContainersLaunched",
-              "metric_path": "metrics/yarn/ContainersLaunched",
+              "name": "yarn.NodeManagerMetrics.ContainersLaunched._rate",
+              "metric_path": "metrics/yarn/ContainersLaunched._rate",
               "service_name": "YARN",
               "component_name": "NODEMANAGER"
             },
@@ -527,8 +527,8 @@
               "component_name": "NODEMANAGER"
             },
             {
-              "name": "yarn.NodeManagerMetrics.ContainersKilled",
-              "metric_path": "metrics/yarn/ContainersKilled",
+              "name": "yarn.NodeManagerMetrics.ContainersKilled._rate",
+              "metric_path": "metrics/yarn/ContainersKilled._rate",
               "service_name": "YARN",
               "component_name": "NODEMANAGER"
             },

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b487edf/ambari-server/src/test/resources/stacks/OTHER/2.0/services/HBASE/widgets.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/OTHER/2.0/services/HBASE/widgets.json
b/ambari-server/src/test/resources/stacks/OTHER/2.0/services/HBASE/widgets.json
index 70a7fa0..f60660a 100644
--- a/ambari-server/src/test/resources/stacks/OTHER/2.0/services/HBASE/widgets.json
+++ b/ambari-server/src/test/resources/stacks/OTHER/2.0/services/HBASE/widgets.json
@@ -11,44 +11,44 @@
           "is_visible": true,
           "metrics": [
             {
-              "name": "regionserver.Server.Get_num_ops",
-              "ambari_id": "metrics/hbase/regionserver/Server/Get_num_ops",
+              "name": "regionserver.Server.Get_num_ops._rate",
+              "ambari_id": "metrics/hbase/regionserver/Server/Get_num_ops._rate",
               "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",
+              "name": "regionserver.Server.Scan_num_ops._rate",
+              "ambari_id": "metrics/hbase/regionserver/Server/Scan_num_ops._rate",
               "category": "",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"
             },
             {
-              "name": "regionserver.Server.Append_num_ops",
-              "ambari_id": "metrics/hbase/regionserver/Server/Append_num_ops",
+              "name": "regionserver.Server.Append_num_ops._rate",
+              "ambari_id": "metrics/hbase/regionserver/Server/Append_num_ops._rate",
               "category": "",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"
             },
             {
-              "name": "regionserver.Server.Delete_num_ops",
-              "ambari_id": "metrics/hbase/regionserver/Server/Delete_num_ops",
+              "name": "regionserver.Server.Delete_num_ops._rate",
+              "ambari_id": "metrics/hbase/regionserver/Server/Delete_num_ops._rate",
               "category": "",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"
             },
             {
-              "name": "regionserver.Server.Increment_num_ops",
-              "ambari_id": "metrics/hbase/regionserver/Server/Increment_num_ops",
+              "name": "regionserver.Server.Increment_num_ops._rate",
+              "ambari_id": "metrics/hbase/regionserver/Server/Increment_num_ops._rate",
               "category": "",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"
             },
             {
-              "name": "regionserver.Server.Mutate_num_ops",
-              "ambari_id": "metrics/hbase/regionserver/Server/Mutate_num_ops",
+              "name": "regionserver.Server.Mutate_num_ops._rate",
+              "ambari_id": "metrics/hbase/regionserver/Server/Mutate_num_ops._rate",
               "category": "",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"
@@ -165,8 +165,8 @@
           "is_visible": true,
           "metrics": [
             {
-              "name": "regionserver.Server.updatesBlockedTime",
-              "ambari_id": "metrics/hbase/regionserver/Server/updatesBlockedTime",
+              "name": "regionserver.Server.updatesBlockedTime._rate",
+              "ambari_id": "metrics/hbase/regionserver/Server/updatesBlockedTime._rate",
               "category": "",
               "service_name": "HBASE",
               "component_name": "HBASE_REGIONSERVER"

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b487edf/ambari-web/app/views/main/service/widgets/create/expression_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/widgets/create/expression_view.js b/ambari-web/app/views/main/service/widgets/create/expression_view.js
index 30c5451..9a903de 100644
--- a/ambari-web/app/views/main/service/widgets/create/expression_view.js
+++ b/ambari-web/app/views/main/service/widgets/create/expression_view.js
@@ -43,7 +43,7 @@ App.WidgetWizardExpressionView = Em.View.extend({
    * @type {Array}
    * @const
    */
-  AGGREGATE_FUNCTIONS: ['avg', 'sum', 'min', 'max'],
+  AGGREGATE_FUNCTIONS: ['avg', 'sum', 'min', 'max', 'rate'],
 
   /**
    * @type {RegExp}


Mime
View raw message