Переглянути джерело

AMBARI-15835 Rate metrics requesting widgets do not show up on Ambari. (atkach)

Andrii Tkach 9 роки тому
батько
коміт
4db1ddac65

+ 3 - 3
ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/widgets.json

@@ -46,11 +46,11 @@
           "values": [
           "values": [
             {
             {
               "name": "Read Requests",
               "name": "Read Requests",
-              "value": "${regionserver.Server.Get_num_ops._sum}"
+              "value": "${regionserver.Server.Get_num_ops._rate}"
             },
             },
             {
             {
               "name": "Write Requests",
               "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": {
           "properties": {
@@ -244,7 +244,7 @@
           "values": [
           "values": [
             {
             {
               "name": "Updates Blocked Time",
               "name": "Updates Blocked Time",
-              "value": "${regionserver.Server.updatesBlockedTime._sum}"
+              "value": "${regionserver.Server.updatesBlockedTime._rate}"
             }
             }
           ],
           ],
           "properties": {
           "properties": {

+ 5 - 5
ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/widgets.json

@@ -29,11 +29,11 @@
           "values": [
           "values": [
             {
             {
               "name": "GC total count",
               "name": "GC total count",
-              "value": "${jvm.JvmMetrics.GcCount}"
+              "value": "${jvm.JvmMetrics.GcCount._rate}"
             },
             },
             {
             {
               "name": "GC count of type major collection",
               "name": "GC count of type major collection",
-              "value": "${jvm.JvmMetrics.GcCountConcurrentMarkSweep}"
+              "value": "${jvm.JvmMetrics.GcCountConcurrentMarkSweep._rate}"
             }
             }
           ],
           ],
           "properties": {
           "properties": {
@@ -58,7 +58,7 @@
           "values": [
           "values": [
             {
             {
               "name": "GC time in major collection",
               "name": "GC time in major collection",
-              "value": "${jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep}"
+              "value": "${jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep._rate}"
             }
             }
           ],
           ],
           "properties": {
           "properties": {
@@ -352,7 +352,7 @@
           "values": [
           "values": [
             {
             {
               "name": "HDFS Bytes Read",
               "name": "HDFS Bytes Read",
-              "value": "${dfs.datanode.BytesRead}"
+              "value": "${dfs.datanode.BytesRead._rate}"
             }
             }
           ],
           ],
           "properties": {
           "properties": {
@@ -376,7 +376,7 @@
           "values": [
           "values": [
             {
             {
               "name": "HDFS Bytes Written",
               "name": "HDFS Bytes Written",
-              "value": "${dfs.datanode.BytesWritten}"
+              "value": "${dfs.datanode.BytesWritten._rate}"
             }
             }
           ],
           ],
           "properties": {
           "properties": {

+ 3 - 3
ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/YARN_widgets.json

@@ -117,7 +117,7 @@
           "values": [
           "values": [
             {
             {
               "name": "Container Failures",
               "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": {
           "properties": {
@@ -178,7 +178,7 @@
           "values": [
           "values": [
             {
             {
               "name": "App Failures",
               "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": {
           "properties": {
@@ -483,7 +483,7 @@
           "values": [
           "values": [
             {
             {
               "name": "Container Failures",
               "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": {
           "properties": {

+ 3 - 3
ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/widgets.json

@@ -51,11 +51,11 @@
           "values": [
           "values": [
             {
             {
               "name": "Read Requests",
               "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",
               "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": {
           "properties": {
@@ -253,7 +253,7 @@
           "values": [
           "values": [
             {
             {
               "name": "Updates Blocked Time",
               "name": "Updates Blocked Time",
-              "value": "${regionserver.Server.updatesBlockedTime._sum}"
+              "value": "${regionserver.Server.updatesBlockedTime._rate}"
             }
             }
           ],
           ],
           "properties": {
           "properties": {

+ 7 - 7
ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/widgets.json

@@ -29,11 +29,11 @@
           "values": [
           "values": [
             {
             {
               "name": "GC total count",
               "name": "GC total count",
-              "value": "${jvm.JvmMetrics.GcCount}"
+              "value": "${jvm.JvmMetrics.GcCount._rate}"
             },
             },
             {
             {
               "name": "GC count of type major collection",
               "name": "GC count of type major collection",
-              "value": "${jvm.JvmMetrics.GcCountConcurrentMarkSweep}"
+              "value": "${jvm.JvmMetrics.GcCountConcurrentMarkSweep._rate}"
             }
             }
           ],
           ],
           "properties": {
           "properties": {
@@ -58,7 +58,7 @@
           "values": [
           "values": [
             {
             {
               "name": "GC time in major collection",
               "name": "GC time in major collection",
-              "value": "${jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep}"
+              "value": "${jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep._rate}"
             }
             }
           ],
           ],
           "properties": {
           "properties": {
@@ -432,7 +432,7 @@
           "values": [
           "values": [
             {
             {
               "name": "HDFS Bytes Read",
               "name": "HDFS Bytes Read",
-              "value": "${dfs.datanode.BytesRead}"
+              "value": "${dfs.datanode.BytesRead._rate}"
             }
             }
           ],
           ],
           "properties": {
           "properties": {
@@ -456,7 +456,7 @@
           "values": [
           "values": [
             {
             {
               "name": "HDFS Bytes Written",
               "name": "HDFS Bytes Written",
-              "value": "${dfs.datanode.BytesWritten}"
+              "value": "${dfs.datanode.BytesWritten._rate}"
             }
             }
           ],
           ],
           "properties": {
           "properties": {
@@ -571,7 +571,7 @@
           "values": [
           "values": [
             {
             {
               "name": "DataNode Process Disk I/O Utilization",
               "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": {
           "properties": {
@@ -613,7 +613,7 @@
           "values": [
           "values": [
             {
             {
               "name": "DataNode Process Network I/O Utilization",
               "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": {
           "properties": {

+ 3 - 3
ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/YARN_widgets.json

@@ -146,7 +146,7 @@
           "values": [
           "values": [
             {
             {
               "name": "Container Failures",
               "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": {
           "properties": {
@@ -207,7 +207,7 @@
           "values": [
           "values": [
             {
             {
               "name": "App Failures",
               "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": {
           "properties": {
@@ -542,7 +542,7 @@
           "values": [
           "values": [
             {
             {
               "name": "Container Failures",
               "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": {
           "properties": {

+ 3 - 3
ambari-server/src/test/resources/stacks/OTHER/2.0/services/HBASE/widgets.json

@@ -57,11 +57,11 @@
           "values": [
           "values": [
             {
             {
               "name": "Read Requests",
               "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",
               "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": {
           "properties": {
@@ -175,7 +175,7 @@
           "values": [
           "values": [
             {
             {
               "name": "Updated Blocked Time",
               "name": "Updated Blocked Time",
-              "value": "`${regionserver.Server.updatesBlockedTime}`"
+              "value": "`${regionserver.Server.updatesBlockedTime._rate}`"
             }
             }
           ],
           ],
           "properties": {
           "properties": {

+ 1 - 1
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}
    * @type {boolean}