Repository: ambari Updated Branches: refs/heads/branch-2.2 1fa2c5b92 -> 67f264efe
AMBARI-15835 Rate metrics requesting widgets do not show up on Ambari. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/67f264ef Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/67f264ef Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/67f264ef Branch: refs/heads/branch-2.2 Commit: 67f264efed62ad5ebd6019447105eb0f56e57b6c Parents: 1fa2c5b Author: Andrii Tkach <[email protected]> Authored: Wed Apr 13 12:51:57 2016 +0300 Committer: Andrii Tkach <[email protected]> Committed: Wed Apr 13 12:52:20 2016 +0300 ---------------------------------------------------------------------- .../common-services/HBASE/0.96.0.2.0/widgets.json | 6 +++--- .../common-services/HDFS/2.1.0.2.0/widgets.json | 10 +++++----- .../common-services/YARN/2.1.0.2.0/YARN_widgets.json | 6 +++--- .../stacks/HDP/2.3/services/HBASE/widgets.json | 6 +++--- .../stacks/HDP/2.3/services/HDFS/widgets.json | 14 +++++++------- .../stacks/HDP/2.3/services/YARN/YARN_widgets.json | 6 +++--- .../stacks/OTHER/2.0/services/HBASE/widgets.json | 6 +++--- ambari-web/app/mixins/common/widgets/widget_mixin.js | 2 +- 8 files changed, 28 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/67f264ef/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 984a60e..ede9f49 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 @@ -46,11 +46,11 @@ "values": [ { "name": "Read Requests", - "value": "${regionserver.Server.Get_num_ops._sum}" + "value": "${regionserver.Server.Get_num_ops._rate}" }, { "name": "Write Requests", - "value": "${regionserver.Server.Append_num_ops._sum + regionserver.Server.Delete_num_ops._sum + regionserver.Server.Increment_num_ops._sum + regionserver.Server.Mutate_num_ops._sum}" + "value": "${regionserver.Server.Append_num_ops._rate + regionserver.Server.Delete_num_ops._rate + regionserver.Server.Increment_num_ops._rate + regionserver.Server.Mutate_num_ops._rate}" } ], "properties": { @@ -244,7 +244,7 @@ "values": [ { "name": "Updates Blocked Time", - "value": "${regionserver.Server.updatesBlockedTime._sum}" + "value": "${regionserver.Server.updatesBlockedTime._rate}" } ], "properties": { http://git-wip-us.apache.org/repos/asf/ambari/blob/67f264ef/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 db528ff..0f8f105 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 @@ -29,11 +29,11 @@ "values": [ { "name": "GC total count", - "value": "${jvm.JvmMetrics.GcCount}" + "value": "${jvm.JvmMetrics.GcCount._rate}" }, { "name": "GC count of type major collection", - "value": "${jvm.JvmMetrics.GcCountConcurrentMarkSweep}" + "value": "${jvm.JvmMetrics.GcCountConcurrentMarkSweep._rate}" } ], "properties": { @@ -58,7 +58,7 @@ "values": [ { "name": "GC time in major collection", - "value": "${jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep}" + "value": "${jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep._rate}" } ], "properties": { @@ -352,7 +352,7 @@ "values": [ { "name": "HDFS Bytes Read", - "value": "${dfs.datanode.BytesRead}" + "value": "${dfs.datanode.BytesRead._rate}" } ], "properties": { @@ -376,7 +376,7 @@ "values": [ { "name": "HDFS Bytes Written", - "value": "${dfs.datanode.BytesWritten}" + "value": "${dfs.datanode.BytesWritten._rate}" } ], "properties": { http://git-wip-us.apache.org/repos/asf/ambari/blob/67f264ef/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 898ffbd..442d9a2 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 @@ -117,7 +117,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)) * 100}" + "value": "${(yarn.NodeManagerMetrics.ContainersFailed._rate/(yarn.NodeManagerMetrics.ContainersFailed._rate + yarn.NodeManagerMetrics.ContainersCompleted._rate + yarn.NodeManagerMetrics.ContainersLaunched._rate + yarn.NodeManagerMetrics.ContainersIniting._sum + yarn.NodeManagerMetrics.ContainersKilled._rate + yarn.NodeManagerMetrics.ContainersRunning._sum)) * 100}" } ], "properties": { @@ -178,7 +178,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)) * 100}" + "value": "${(yarn.QueueMetrics.Queue=root.AppsFailed._rate/(yarn.QueueMetrics.Queue=root.AppsFailed._rate + yarn.QueueMetrics.Queue=root.AppsKilled._rate + yarn.QueueMetrics.Queue=root.AppsPending + yarn.QueueMetrics.Queue=root.AppsRunning + yarn.QueueMetrics.Queue=root.AppsSubmitted._rate + yarn.QueueMetrics.Queue=root.AppsCompleted._rate)) * 100}" } ], "properties": { @@ -483,7 +483,7 @@ "values": [ { "name": "Container Failures", - "value": "${(yarn.NodeManagerMetrics.ContainersFailed/(yarn.NodeManagerMetrics.ContainersFailed + yarn.NodeManagerMetrics.ContainersCompleted + yarn.NodeManagerMetrics.ContainersLaunched + yarn.NodeManagerMetrics.ContainersIniting + yarn.NodeManagerMetrics.ContainersKilled + yarn.NodeManagerMetrics.ContainersRunning)) * 100}" + "value": "${(yarn.NodeManagerMetrics.ContainersFailed._rate/(yarn.NodeManagerMetrics.ContainersFailed._rate + yarn.NodeManagerMetrics.ContainersCompleted._rate + yarn.NodeManagerMetrics.ContainersLaunched._rate + yarn.NodeManagerMetrics.ContainersIniting + yarn.NodeManagerMetrics.ContainersKilled._rate + yarn.NodeManagerMetrics.ContainersRunning)) * 100}" } ], "properties": { http://git-wip-us.apache.org/repos/asf/ambari/blob/67f264ef/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 364fc1f..d8f4e6a 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 @@ -51,11 +51,11 @@ "values": [ { "name": "Read Requests", - "value": "${regionserver.Server.Get_num_ops._sum + regionserver.Server.ScanNext_num_ops._sum}" + "value": "${regionserver.Server.Get_num_ops._rate + regionserver.Server.ScanNext_num_ops._rate}" }, { "name": "Write Requests", - "value": "${regionserver.Server.Append_num_ops._sum + regionserver.Server.Delete_num_ops._sum + regionserver.Server.Increment_num_ops._sum + regionserver.Server.Mutate_num_ops._sum}" + "value": "${regionserver.Server.Append_num_ops._rate + regionserver.Server.Delete_num_ops._rate + regionserver.Server.Increment_num_ops._rate + regionserver.Server.Mutate_num_ops._rate}" } ], "properties": { @@ -253,7 +253,7 @@ "values": [ { "name": "Updates Blocked Time", - "value": "${regionserver.Server.updatesBlockedTime._sum}" + "value": "${regionserver.Server.updatesBlockedTime._rate}" } ], "properties": { http://git-wip-us.apache.org/repos/asf/ambari/blob/67f264ef/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 c698da3..a19a112 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 @@ -29,11 +29,11 @@ "values": [ { "name": "GC total count", - "value": "${jvm.JvmMetrics.GcCount}" + "value": "${jvm.JvmMetrics.GcCount._rate}" }, { "name": "GC count of type major collection", - "value": "${jvm.JvmMetrics.GcCountConcurrentMarkSweep}" + "value": "${jvm.JvmMetrics.GcCountConcurrentMarkSweep._rate}" } ], "properties": { @@ -58,7 +58,7 @@ "values": [ { "name": "GC time in major collection", - "value": "${jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep}" + "value": "${jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep._rate}" } ], "properties": { @@ -432,7 +432,7 @@ "values": [ { "name": "HDFS Bytes Read", - "value": "${dfs.datanode.BytesRead}" + "value": "${dfs.datanode.BytesRead._rate}" } ], "properties": { @@ -456,7 +456,7 @@ "values": [ { "name": "HDFS Bytes Written", - "value": "${dfs.datanode.BytesWritten}" + "value": "${dfs.datanode.BytesWritten._rate}" } ], "properties": { @@ -571,7 +571,7 @@ "values": [ { "name": "DataNode Process Disk I/O Utilization", - "value": "${((dfs.datanode.BytesRead/dfs.datanode.TotalReadTime)+(dfs.datanode.BytesWritten/dfs.datanode.TotalWriteTime))*50}" + "value": "${((dfs.datanode.BytesRead._rate/dfs.datanode.TotalReadTime._rate)+(dfs.datanode.BytesWritten._rate/dfs.datanode.TotalWriteTime._rate))*50}" } ], "properties": { @@ -613,7 +613,7 @@ "values": [ { "name": "DataNode Process Network I/O Utilization", - "value": "${((dfs.datanode.RemoteBytesRead/dfs.datanode.ReadsFromRemoteClient)+(dfs.datanode.RemoteBytesWritten/dfs.datanode.WritesFromRemoteClient))*50}" + "value": "${((dfs.datanode.RemoteBytesRead._rate/dfs.datanode.ReadsFromRemoteClient._rate)+(dfs.datanode.RemoteBytesWritten._rate/dfs.datanode.WritesFromRemoteClient._rate))*50}" } ], "properties": { http://git-wip-us.apache.org/repos/asf/ambari/blob/67f264ef/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 905e7d7..c2acf1f 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 @@ -146,7 +146,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)) * 100}" + "value": "${(yarn.NodeManagerMetrics.ContainersFailed._rate/(yarn.NodeManagerMetrics.ContainersFailed._rate + yarn.NodeManagerMetrics.ContainersCompleted._rate + yarn.NodeManagerMetrics.ContainersLaunched._rate + yarn.NodeManagerMetrics.ContainersIniting._sum + yarn.NodeManagerMetrics.ContainersKilled._rate + yarn.NodeManagerMetrics.ContainersRunning._sum)) * 100}" } ], "properties": { @@ -207,7 +207,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)) * 100}" + "value": "${(yarn.QueueMetrics.Queue=root.AppsFailed._rate/(yarn.QueueMetrics.Queue=root.AppsFailed._rate + yarn.QueueMetrics.Queue=root.AppsKilled._rate + yarn.QueueMetrics.Queue=root.AppsPending + yarn.QueueMetrics.Queue=root.AppsRunning + yarn.QueueMetrics.Queue=root.AppsSubmitted._rate + yarn.QueueMetrics.Queue=root.AppsCompleted._rate)) * 100}" } ], "properties": { @@ -542,7 +542,7 @@ "values": [ { "name": "Container Failures", - "value": "${(yarn.NodeManagerMetrics.ContainersFailed/(yarn.NodeManagerMetrics.ContainersFailed + yarn.NodeManagerMetrics.ContainersCompleted + yarn.NodeManagerMetrics.ContainersLaunched + yarn.NodeManagerMetrics.ContainersIniting + yarn.NodeManagerMetrics.ContainersKilled + yarn.NodeManagerMetrics.ContainersRunning)) * 100}" + "value": "${(yarn.NodeManagerMetrics.ContainersFailed._rate/(yarn.NodeManagerMetrics.ContainersFailed._rate + yarn.NodeManagerMetrics.ContainersCompleted._rate + yarn.NodeManagerMetrics.ContainersLaunched._rate + yarn.NodeManagerMetrics.ContainersIniting + yarn.NodeManagerMetrics.ContainersKilled._rate + yarn.NodeManagerMetrics.ContainersRunning)) * 100}" } ], "properties": { http://git-wip-us.apache.org/repos/asf/ambari/blob/67f264ef/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 f60660a..402f62b 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 @@ -57,11 +57,11 @@ "values": [ { "name": "Read Requests", - "value": "`${regionserver.Server.Get_num_ops + regionserver.Server.Scan_num_ops}`" + "value": "`${regionserver.Server.Get_num_ops._rate + regionserver.Server.Scan_num_ops._rate}`" }, { "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}`" + "value": "`${metrics.hbase.regionserver.Server.Append_num_ops._rate + metrics.hbase.regionserver.Server.Delete_num_ops._rate + metrics.hbase.regionserver.Server.Increment_num_ops._rate + metrics.hbase.regionserver.Server.Mutate_num_ops._rate}`" } ], "properties": { @@ -175,7 +175,7 @@ "values": [ { "name": "Updated Blocked Time", - "value": "`${regionserver.Server.updatesBlockedTime}`" + "value": "`${regionserver.Server.updatesBlockedTime._rate}`" } ], "properties": { http://git-wip-us.apache.org/repos/asf/ambari/blob/67f264ef/ambari-web/app/mixins/common/widgets/widget_mixin.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/common/widgets/widget_mixin.js b/ambari-web/app/mixins/common/widgets/widget_mixin.js index 09615ad..5a1358a 100644 --- a/ambari-web/app/mixins/common/widgets/widget_mixin.js +++ b/ambari-web/app/mixins/common/widgets/widget_mixin.js @@ -64,7 +64,7 @@ App.WidgetMixin = Ember.Mixin.create({ /** * */ - aggregatorFunc: ['._sum', '._avg', '._min', '._max'], + aggregatorFunc: ['._sum', '._avg', '._min', '._max', '._rate'], /** * @type {boolean}
