AMBARI-10814. Edit Widget: Display name of a widget is not updated. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/47907b96 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/47907b96 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/47907b96 Branch: refs/heads/trunk Commit: 47907b96105015979190cc87ace79f643456f959 Parents: 69ab430 Author: Jaimin Jetly <[email protected]> Authored: Tue Apr 28 21:44:50 2015 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Tue Apr 28 21:44:50 2015 -0700 ---------------------------------------------------------------------- .../HBASE/0.96.0.2.0/metrics.json | 2 +- .../HBASE/0.96.0.2.0/widgets.json | 225 +++++++++++------ .../common-services/HDFS/2.1.0.2.0/widgets.json | 16 +- .../common-services/YARN/2.1.0.2.0/widgets.json | 10 - .../resources/stacks/HDP/2.0.6/widgets.json | 9 +- .../stacks/HDP/2.3/services/HBASE/widgets.json | 247 +++++++++++++------ ambari-web/app/app.js | 4 + .../service/widgets/create/step3_controller.js | 15 +- .../service/widgets/create/wizard_controller.js | 5 +- .../main/service/widgets/edit_controller.js | 3 - ambari-web/app/mappers/widget_mapper.js | 1 - .../app/mixins/common/widgets/widget_mixin.js | 71 +++--- ambari-web/app/models/widget.js | 1 - ambari-web/app/routes/main.js | 1 - .../modal_popups/widget_browser_popup.hbs | 2 +- .../templates/common/widget/gauge_widget.hbs | 2 +- .../templates/common/widget/graph_widget.hbs | 2 +- .../templates/common/widget/heatmap_widget.hbs | 2 +- .../templates/common/widget/number_widget.hbs | 2 +- .../templates/common/widget/template_widget.hbs | 2 +- .../templates/main/charts/heatmap_dropdown.hbs | 2 +- .../main/service/info/heatmap_dropdown.hbs | 2 +- .../main/service/widgets/create/step3.hbs | 2 +- ambari-web/app/utils/helper.js | 15 ++ .../views/common/widget/gauge_widget_view.js | 8 +- .../views/common/widget/graph_widget_view.js | 4 +- .../views/common/widget/number_widget_view.js | 10 +- ambari-web/app/views/main/service/item.js | 4 +- 28 files changed, 416 insertions(+), 253 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/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 1682a00..8d08d9b 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 @@ -353,7 +353,7 @@ }, "metrics/hbase/regionserver/Server/percentFilesLocal": { "metric": "regionserver.Server.percentFilesLocal", - "pointInTime": false, + "pointInTime": true, "temporal": true }, "metrics/hbase/regionserver/Server/updatesBlockedTime": { http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/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 9af9e2b..949f273 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 @@ -7,44 +7,37 @@ "widgetLayoutInfo": [ { "widget_name": "Reads and Writes", - "display_name": "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/hbase/regionserver/Server/Get_num_ops", + "name": "regionserver.Server.Get_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Get_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "regionserver.Server.ScanNext_num_ops", - "metric_path": "metrics/hbase/regionserver/Server/ScanNext_num_ops", + "name": "regionserver.Server.Append_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Append_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "regionserver.Server.Append_num_ops", - "metric_path": "metrics/hbase/regionserver/Server/Append_num_ops", + "name": "regionserver.Server.Delete_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Delete_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "regionserver.Server.Delete_num_ops", - "metric_path": "metrics/hbase/regionserver/Server/Delete_num_ops", + "name": "regionserver.Server.Increment_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Increment_num_ops._sum", "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", + "name": "regionserver.Server.Mutate_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Mutate_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" } @@ -52,11 +45,11 @@ "values": [ { "name": "Read Requests", - "value": "${regionserver.Server.Get_num_ops}" + "value": "${regionserver.Server.Get_num_ops._sum}" }, { "name": "Write Requests", - "value": "${regionserver.Server.Append_num_ops + regionserver.Server.Delete_num_ops + regionserver.Server.Increment_num_ops + regionserver.Server.Mutate_num_ops}" + "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}" } ], "properties": { @@ -67,14 +60,25 @@ }, { "widget_name": "Read Latency", - "display_name": "Read Latency", "description": "Widget shows 95% Read Latency", "widget_type": "GRAPH", "is_visible": true, "metrics": [ { - "name": "regionserver.Server.Get_95th_percentile", - "metric_path": "metrics/hbase/regionserver/Server/Get_95th_percentile", + "name": "regionserver.Server.Get_95th_percentile._min", + "metric_path": "metrics/hbase/regionserver/Server/Get_95th_percentile._min", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Get_95th_percentile._avg", + "metric_path": "metrics/hbase/regionserver/Server/Get_95th_percentile._avg", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Get_95th_percentile._max", + "metric_path": "metrics/hbase/regionserver/Server/Get_95th_percentile._max", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" } @@ -82,15 +86,15 @@ "values": [ { "name": "Cluster wide minimum of 95% Read Latency", - "value": "${regionserver.Server.Get_95th_percentile}" + "value": "${regionserver.Server.Get_95th_percentile._min}" }, { "name": "Weighted average of 95% read Latency", - "value": "${regionserver.Server.Get_95th_percentile}" + "value": "${regionserver.Server.Get_95th_percentile._avg}" }, { "name": "Cluster wide maximum of 95% read Latency", - "value": "${regionserver.Server.Get_95th_percentile}" + "value": "${regionserver.Server.Get_95th_percentile._max}" } ], "properties": { @@ -101,32 +105,109 @@ }, { "widget_name": "Write Latency", - "display_name": "Write Latency", "description": "This widget shows 95th percentile of the write latency.", "widget_type": "GRAPH", "is_visible": true, "metrics": [ { - "name": "regionserver.Server.Mutate_95th_percentile", - "metric_path": "metrics/hbase/regionserver/Server/Mutate_95th_percentile", + "name": "regionserver.Server.Mutate_95th_percentile._min", + "metric_path": "metrics/hbase/regionserver/Server/Mutate_95th_percentile._min", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Increment_95th_percentile._min", + "metric_path": "metrics/hbase/regionserver/Server/Increment_95th_percentile._min", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Append_95th_percentile._min", + "metric_path": "metrics/hbase/regionserver/Server/Append_95th_percentile._min", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Delete_95th_percentile._min", + "metric_path": "metrics/hbase/regionserver/Server/Delete_95th_percentile._min", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Mutate_95th_percentile._avg", + "metric_path": "metrics/hbase/regionserver/Server/Mutate_95th_percentile._avg", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Increment_95th_percentile._avg", + "metric_path": "metrics/hbase/regionserver/Server/Increment_95th_percentile._avg", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Append_95th_percentile._avg", + "metric_path": "metrics/hbase/regionserver/Server/Append_95th_percentile._avg", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Delete_95th_percentile._avg", + "metric_path": "metrics/hbase/regionserver/Server/Delete_95th_percentile._avg", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Mutate_95th_percentile._max", + "metric_path": "metrics/hbase/regionserver/Server/Mutate_95th_percentile._max", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Increment_95th_percentile._max", + "metric_path": "metrics/hbase/regionserver/Server/Increment_95th_percentile._max", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Append_95th_percentile._max", + "metric_path": "metrics/hbase/regionserver/Server/Append_95th_percentile._max", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Delete_95th_percentile._max", + "metric_path": "metrics/hbase/regionserver/Server/Delete_95th_percentile._max", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Get_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Get_num_ops._sum", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Append_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Append_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "regionserver.Server.Increment_95th_percentile", - "metric_path": "metrics/hbase/regionserver/Server/Increment_95th_percentile", + "name": "regionserver.Server.Delete_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Delete_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "regionserver.Server.Append_95th_percentile", - "metric_path": "metrics/hbase/regionserver/Server/Append_95th_percentile", + "name": "regionserver.Server.Increment_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Increment_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "regionserver.Server.Delete_95th_percentile", - "metric_path": "metrics/hbase/regionserver/Server/Delete_95th_percentile", + "name": "regionserver.Server.Mutate_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Mutate_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" } @@ -134,15 +215,15 @@ "values": [ { "name": "Cluster wide minimum of 95% write Latency", - "value": "${regionserver.Server.Mutate_95th_percentile + regionserver.Server.Increment_95th_percentile + regionserver.Server.Append_95th_percentile + regionserver.Server.Delete_95th_percentile}" + "value": "${regionserver.Server.Mutate_95th_percentile._min + regionserver.Server.Increment_95th_percentile._min + regionserver.Server.Append_95th_percentile._min + regionserver.Server.Delete_95th_percentile._min}" }, { "name": "Weighted average of 95% write Latency", - "value": "${regionserver.Server.Mutate_95th_percentile + regionserver.Server.Increment_95th_percentile + regionserver.Server.Append_95th_percentile + regionserver.Server.Delete_95th_percentile}" + "value": "${((regionserver.Server.Mutate_95th_percentile._avg * regionserver.Server.Mutate_num_ops._sum) + (regionserver.Server.Increment_95th_percentile._avg * regionserver.Server.Increment_num_ops._sum) + (regionserver.Server.Append_95th_percentile._avg * regionserver.Server.Append_num_ops._sum) + (regionserver.Server.Delete_95th_percentile._avg * regionserver.Server.Delete_num_ops._sum))/(regionserver.Server.Append_num_ops._sum + regionserver.Server.Delete_num_ops._sum + regionserver.Server.Increment_num_ops._sum + regionserver.Server.Mutate_num_ops._sum)}" }, { "name": "Cluster wide maximum of 95% write Latency", - "value": "${regionserver.Server.Mutate_95th_percentile + regionserver.Server.Increment_95th_percentile + regionserver.Server.Append_95th_percentile + regionserver.Server.Delete_95th_percentile}" + "value": "${regionserver.Server.Mutate_95th_percentile._max + regionserver.Server.Increment_95th_percentile._max + regionserver.Server.Append_95th_percentile._max + regionserver.Server.Delete_95th_percentile._max}" } ], "properties": { @@ -153,14 +234,13 @@ }, { "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": "regionserver.RegionServer.numOpenConnections", - "metric_path": "metrics/hbase/ipc/IPC/numOpenConnections", + "name": "regionserver.RegionServer.numOpenConnections._sum", + "metric_path": "metrics/hbase/ipc/IPC/numOpenConnections._sum", "category": "", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" @@ -169,7 +249,7 @@ "values": [ { "name": "Open Connections", - "value": "${regionserver.RegionServer.numOpenConnections}" + "value": "${regionserver.RegionServer.numOpenConnections._sum}" } ], "properties": { @@ -180,19 +260,18 @@ }, { "widget_name": "Request Handlers", - "display_name": "Request Handlers", "widget_type": "GRAPH", "is_visible": true, "metrics": [ { - "name": "regionserver.RegionServer.numActiveHandler", - "metric_path": "metrics/hbase/ipc/IPC/numActiveHandler", + "name": "regionserver.RegionServer.numActiveHandler._sum", + "metric_path": "metrics/hbase/ipc/IPC/numActiveHandler._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "regionserver.RegionServer.numCallsInGeneralQueue", - "metric_path": "metrics/hbase/ipc/IPC/numCallsInGeneralQueue", + "name": "regionserver.RegionServer.numCallsInGeneralQueue._sum", + "metric_path": "metrics/hbase/ipc/IPC/numCallsInGeneralQueue._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" } @@ -200,11 +279,11 @@ "values": [ { "name": "Active Handlers", - "value": "${regionserver.RegionServer.numActiveHandler}" + "value": "${regionserver.RegionServer.numActiveHandler._sum}" }, { "name": "Calls in General Queue", - "value": "${regionserver.RegionServer.numCallsInGeneralQueue}" + "value": "${regionserver.RegionServer.numCallsInGeneralQueue._sum}" } ], "properties": { @@ -214,14 +293,13 @@ }, { "widget_name": "Files Local", - "display_name": "Files Local", "description": "This widget shows weighted average for local files.", "widget_type": "NUMBER", "is_visible": true, "metrics": [ { - "name": "regionserver.Server.percentFilesLocal", - "metric_path": "metrics/hbase/regionserver/percentFilesLocal", + "name": "regionserver.Server.percentFilesLocal._avg", + "metric_path": "metrics/hbase/regionserver/Server/percentFilesLocal._avg", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" } @@ -229,23 +307,24 @@ "values": [ { "name": "Files Local", - "value": "${regionserver.Server.percentFilesLocal}" + "value": "${regionserver.Server.percentFilesLocal._avg}" } ], "properties": { - "display_unit": "%" + "display_unit": "%", + "error_threshold":"25", + "warning_threshold": "75" } }, { "widget_name": "Blocked Updates", - "display_name": "Blocked Updates", "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", + "name": "regionserver.Server.updatesBlockedTime._sum", + "metric_path": "metrics/hbase/regionserver/Server/updatesBlockedTime._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" } @@ -253,7 +332,7 @@ "values": [ { "name": "Updates Blocked Time", - "value": "${regionserver.Server.updatesBlockedTime}" + "value": "${regionserver.Server.updatesBlockedTime._sum}" } ], "properties": { @@ -264,14 +343,13 @@ }, { "widget_name": "Cluster CPU", - "display_name": "Cluster CPU", "description": "ReqionServer widget for CPU utilization", "widget_type": "GRAPH", "is_visible": true, "metrics": [ { - "name": "cpu_idle", - "metric_path": "metrics/cpu/cpu_idle", + "name": "cpu_idle._avg", + "metric_path": "metrics/cpu/cpu_idle._avg", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" } @@ -279,7 +357,7 @@ "values": [ { "name": "CPU Idle", - "value": "${cpu_idle}" + "value": "${cpu_idle._avg}" } ], "properties": { @@ -289,20 +367,19 @@ }, { "widget_name": "Cluster Network", - "display_name": "Cluster Network", "description": "ReqionServer widget for network utilization", "widget_type": "GRAPH", "is_visible": true, "metrics": [ { - "name": "pkts_in", - "metric_path": "metrics/network/pkts_in", + "name": "pkts_in._avg", + "metric_path": "metrics/network/pkts_in._avg", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "pkts_out", - "metric_path": "metrics/network/pkts_out", + "name": "pkts_out._avg", + "metric_path": "metrics/network/pkts_out._avg", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" } @@ -310,11 +387,11 @@ "values": [ { "name": "Packets In", - "value": "${pkts_in}" + "value": "${pkts_in._avg}" }, { "name": "Packets Out", - "value": "${disk_free}" + "value": "${pkts_out._avg}" } ], "properties": { @@ -324,14 +401,13 @@ }, { "widget_name": "Cluster Disk", - "display_name": "Cluster Disk", "description": "ReqionServer widget for disk utilization", "widget_type": "GRAPH", "is_visible": true, "metrics": [ { - "name": "disk_free", - "metric_path": "metrics/disk/disk_free", + "name": "disk_free._avg", + "metric_path": "metrics/disk/disk_free._avg", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" } @@ -339,7 +415,7 @@ "values": [ { "name": "Disk Free", - "value": "${disk_free}" + "value": "${disk_free._avg}" } ], "properties": { @@ -356,7 +432,6 @@ "widgetLayoutInfo": [ { "widget_name": "HBASE_COMPACTION_QUEUE_SIZE", - "display_name": "HBase Compaction Queue Size", "description": "", "widget_type": "HEATMAP", "is_visible": true, @@ -381,7 +456,6 @@ }, { "widget_name": "HBASE_MEMSTORE_SIZES", - "display_name": "HBase Memstore Sizes", "description": "", "widget_type": "HEATMAP", "is_visible": false, @@ -406,7 +480,6 @@ }, { "widget_name": "HBASE_READ_REQUEST", - "display_name": "HBase Read Request Count", "description": "", "widget_type": "HEATMAP", "is_visible": false, @@ -430,7 +503,6 @@ }, { "widget_name": "HBASE_WRITE_REQUEST", - "display_name": "HBase Write Request Count", "description": "", "widget_type": "HEATMAP", "is_visible": false, @@ -454,7 +526,6 @@ }, { "widget_name": "HBASE_REGIONS", - "display_name": "HBase Regions", "description": "", "widget_type": "HEATMAP", "is_visible": false, http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/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 5731c7e..1ff75ec 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 @@ -7,7 +7,6 @@ "widgetLayoutInfo": [ { "widget_name": "GC Statistics", - "display_name": "GC Statistics", "description": "This widget shows JVM Garbage collection statistics for Active NameNode", "widget_type": "GRAPH", "is_visible": true, @@ -56,7 +55,6 @@ }, { "widget_name": "Client connections", - "display_name": "Client connections", "description": "Number of open connections for Active NameNode.", "widget_type": "GRAPH", "is_visible": true, @@ -84,7 +82,6 @@ }, { "widget_name": "NameNode JVM Heap Statistics", - "display_name": "NameNode JVM Heap Statistics", "widget_type": "GRAPH", "is_visible": true, "metrics": [ @@ -120,7 +117,6 @@ }, { "widget_name": "NameNode CPU and RAM Utilization", - "display_name": "NameNode CPU and RAM Utilization", "widget_type": "GRAPH", "is_visible": true, "metrics": [ @@ -156,7 +152,6 @@ }, { "widget_name": "RPC Queue Wait time", - "display_name": "RPC Queue Wait time", "widget_type": "NUMBER", "is_visible": true, "metrics": [ @@ -179,8 +174,7 @@ } }, { - "widget_name": "RPC_PROCESSING_TIME", - "display_name": "RPC Processing time", + "widget_name": "RPC Processing time", "widget_type": "NUMBER", "is_visible": true, "metrics": [ @@ -204,7 +198,6 @@ }, { "widget_name": "Corrupted Blocks", - "display_name": "Corrupted Blocks", "widget_type": "NUMBER", "is_visible": true, "metrics": [ @@ -226,7 +219,6 @@ }, { "widget_name": "Under Replicated Blocks", - "display_name": "Under Replicated Blocks", "widget_type": "NUMBER", "is_visible": true, "metrics": [ @@ -250,7 +242,6 @@ }, { "layout_name": "default_hdfs_heatmap", - "display_name": "HDFS Heatmaps", "section_name": "HDFS_HEATMAPS", "widgetLayoutInfo": [ { @@ -280,7 +271,6 @@ }, { "widget_name": "HDFS Bytes Written", - "display_name": "HDFS Bytes Written", "description": "", "widget_type": "HEATMAP", "is_visible": false, @@ -305,7 +295,6 @@ }, { "widget_name": "DataNode Garbage Collection Time", - "display_name": "DataNode Garbage Collection Time", "description": "", "widget_type": "HEATMAP", "is_visible": false, @@ -330,7 +319,6 @@ }, { "widget_name": "DataNode JVM Heap Memory Used", - "display_name": "DataNode JVM Heap Memory Used", "description": "", "widget_type": "HEATMAP", "is_visible": false, @@ -355,7 +343,6 @@ }, { "widget_name": "DataNode JVM Heap Memory Committed", - "display_name": "DataNode JVM Heap Memory Committed", "description": "", "widget_type": "HEATMAP", "is_visible": false, @@ -423,7 +410,6 @@ }, { "widget_name": "DataNode Process Network I/O Utilization", - "display_name": "DataNode Process Network I/O Utilization", "description": "", "widget_type": "HEATMAP", "is_visible": false, http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/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 index 7b67cd8..6b62b80 100644 --- 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 @@ -7,7 +7,6 @@ "widgetLayoutInfo": [ { "widget_name": "NodeManager RAM Utilization", - "display_name": "NodeManager RAM Utilization", "description": "", "widget_type": "GRAPH", "is_visible": true, @@ -43,7 +42,6 @@ }, { "widget_name": "NodeManager CPU Utilization", - "display_name": "NodeManager CPU Utilization", "description": "", "widget_type": "GRAPH", "is_visible": true, @@ -79,7 +77,6 @@ }, { "widget_name": "NodeManager Disk and Network Utilization", - "display_name": "NodeManager Disk and Network Utilization", "description": "", "widget_type": "GRAPH", "is_visible": true, @@ -127,7 +124,6 @@ }, { "widget_name": "NodeManager Container Failures", - "display_name": "NodeManager Container Failures", "description": "", "widget_type": "GRAPH", "is_visible": true, @@ -160,7 +156,6 @@ "widgetLayoutInfo": [ { "widget_name": "NodeManager GC Time", - "display_name": "NodeManager GC Time", "description": "", "widget_type": "HEATMAP", "is_visible": true, @@ -185,7 +180,6 @@ }, { "widget_name": "NodeManager JVM Heap Memory Used", - "display_name": "NodeManager JVM Heap Memory Used", "description": "", "widget_type": "HEATMAP", "is_visible": false, @@ -210,7 +204,6 @@ }, { "widget_name": "NodeManager Memory used %", - "display_name": "NodeManager Memory used %", "description": "", "widget_type": "HEATMAP", "is_visible": false, @@ -241,7 +234,6 @@ }, { "widget_name": "Allocated Containers", - "display_name": "Allocated Containers", "description": "", "widget_type": "HEATMAP", "is_visible": false, @@ -266,7 +258,6 @@ }, { "widget_name": "NodeManager RAM Utilized", - "display_name": "NodeManager RAM Utilized", "description": "", "widget_type": "HEATMAP", "is_visible": false, @@ -291,7 +282,6 @@ }, { "widget_name": "NodeManager CPU Utilized", - "display_name": "NodeManager CPU Utilized", "description": "", "widget_type": "HEATMAP", "is_visible": false, http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/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 index 2343616..3176354 100644 --- 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 @@ -6,8 +6,7 @@ "section_name": "SYSTEM_HEATMAPS", "widgetLayoutInfo": [ { - "widget_name": "HOST_DISK_USED", - "display_name": "Host Disk Space Used %", + "widget_name": "Host Disk Space Used %", "description": "", "widget_type": "HEATMAP", "is_visible": true, @@ -35,8 +34,7 @@ } }, { - "widget_name": "HOST_MEMORY_USED", - "display_name": "Host Memory Used %", + "widget_name": "Host Memory Used %", "description": "", "widget_type": "HEATMAP", "is_visible": false, @@ -69,8 +67,7 @@ } }, { - "widget_name": "HOST_CPU_WAIT_IO", - "display_name": "Host CPU Wait IO %", + "widget_name": "Host CPU Wait IO %", "description": "", "widget_type": "HEATMAP", "is_visible": false, http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/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 db5aee1..2f92e15 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 @@ -7,44 +7,43 @@ "widgetLayoutInfo": [ { "widget_name": "Reads and Writes", - "display_name": "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/hbase/regionserver/Server/Get_num_ops", + "name": "regionserver.Server.Get_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Get_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "regionserver.Server.ScanNext_num_ops", - "metric_path": "metrics/hbase/regionserver/Server/ScanNext_num_ops", + "name": "regionserver.Server.ScanNext_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/ScanNext_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "regionserver.Server.Append_num_ops", - "metric_path": "metrics/hbase/regionserver/Server/Append_num_ops", + "name": "regionserver.Server.Append_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Append_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "regionserver.Server.Delete_num_ops", - "metric_path": "metrics/hbase/regionserver/Server/Delete_num_ops", + "name": "regionserver.Server.Delete_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Delete_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "regionserver.Server.Increment_num_ops", - "metric_path": "metrics/hbase/regionserver/Server/Increment_num_ops", + "name": "regionserver.Server.Increment_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Increment_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "regionserver.Server.Mutate_num_ops", - "metric_path": "metrics/hbase/regionserver/Server/Mutate_num_ops", + "name": "regionserver.Server.Mutate_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Mutate_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" } @@ -52,11 +51,11 @@ "values": [ { "name": "Read Requests", - "value": "${regionserver.Server.Get_num_ops + regionserver.Server.ScanNext_num_ops}" + "value": "${regionserver.Server.Get_num_ops._sum + regionserver.Server.ScanNext_num_ops._sum}" }, { "name": "Write Requests", - "value": "${regionserver.Server.Append_num_ops + regionserver.Server.Delete_num_ops + regionserver.Server.Increment_num_ops + regionserver.Server.Mutate_num_ops}" + "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}" } ], "properties": { @@ -67,20 +66,55 @@ }, { "widget_name": "Read Latency", - "display_name": "Read Latency", "description": "Widget shows 95% Read Latency", "widget_type": "GRAPH", "is_visible": true, "metrics": [ { - "name": "regionserver.Server.Get_95th_percentile", - "metric_path": "metrics/hbase/regionserver/Server/Get_95th_percentile", + "name": "regionserver.Server.Get_95th_percentile._min", + "metric_path": "metrics/hbase/regionserver/Server/Get_95th_percentile._min", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "regionserver.Server.ScanNext_95th_percentile", - "metric_path": "metrics/hbase/regionserver/Server/ScanNext_95th_percentile", + "name": "regionserver.Server.Get_95th_percentile._avg", + "metric_path": "metrics/hbase/regionserver/Server/Get_95th_percentile._avg", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Get_95th_percentile._max", + "metric_path": "metrics/hbase/regionserver/Server/Get_95th_percentile._max", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.ScanNext_95th_percentile._min", + "metric_path": "metrics/hbase/regionserver/Server/ScanNext_95th_percentile._min", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.ScanNext_95th_percentile._avg", + "metric_path": "metrics/hbase/regionserver/Server/ScanNext_95th_percentile._avg", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.ScanNext_95th_percentile._max", + "metric_path": "metrics/hbase/regionserver/Server/ScanNext_95th_percentile._max", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Get_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Get_num_ops._sum", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.ScanNext_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/ScanNext_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" } @@ -88,15 +122,15 @@ "values": [ { "name": "Cluster wide minimum of 95% Read Latency", - "value": "${regionserver.Server.Get_95th_percentile + regionserver.Server.ScanNext_95th_percentile}" + "value": "${regionserver.Server.Get_95th_percentile._min + regionserver.Server.ScanNext_95th_percentile._min}" }, { "name": "Weighted average of 95% Read Latency", - "value": "${regionserver.Server.Get_95th_percentile + regionserver.Server.ScanNext_95th_percentile}" + "value": "${((regionserver.Server.Get_95th_percentile._avg * regionserver.Server.Get_num_ops._sum) + (regionserver.Server.ScanNext_95th_percentile._avg * regionserver.Server.ScanNext_num_ops._sum))/(regionserver.Server.Get_num_ops._sum + regionserver.Server.ScanNext_num_ops._sum)}" }, { "name": "Cluster wide maximum of 95% Read Latency", - "value": "${regionserver.Server.Get_95th_percentile + regionserver.Server.ScanNext_95th_percentile}" + "value": "${regionserver.Server.Get_95th_percentile._max + regionserver.Server.ScanNext_95th_percentile._max}" } ], "properties": { @@ -107,32 +141,109 @@ }, { "widget_name": "Write Latency", - "display_name": "Write Latency", "description": "This widget shows 95th percentile of the write latency.", "widget_type": "GRAPH", "is_visible": true, "metrics": [ { - "name": "regionserver.Server.Mutate_95th_percentile", - "metric_path": "metrics/hbase/regionserver/Server/Mutate_95th_percentile", + "name": "regionserver.Server.Mutate_95th_percentile._min", + "metric_path": "metrics/hbase/regionserver/Server/Mutate_95th_percentile._min", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Increment_95th_percentile._min", + "metric_path": "metrics/hbase/regionserver/Server/Increment_95th_percentile._min", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Append_95th_percentile._min", + "metric_path": "metrics/hbase/regionserver/Server/Append_95th_percentile._min", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Delete_95th_percentile._min", + "metric_path": "metrics/hbase/regionserver/Server/Delete_95th_percentile._min", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Mutate_95th_percentile._avg", + "metric_path": "metrics/hbase/regionserver/Server/Mutate_95th_percentile._avg", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Increment_95th_percentile._avg", + "metric_path": "metrics/hbase/regionserver/Server/Increment_95th_percentile._avg", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Append_95th_percentile._avg", + "metric_path": "metrics/hbase/regionserver/Server/Append_95th_percentile._avg", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Delete_95th_percentile._avg", + "metric_path": "metrics/hbase/regionserver/Server/Delete_95th_percentile._avg", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Mutate_95th_percentile._max", + "metric_path": "metrics/hbase/regionserver/Server/Mutate_95th_percentile._max", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Increment_95th_percentile._max", + "metric_path": "metrics/hbase/regionserver/Server/Increment_95th_percentile._max", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Append_95th_percentile._max", + "metric_path": "metrics/hbase/regionserver/Server/Append_95th_percentile._max", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Delete_95th_percentile._max", + "metric_path": "metrics/hbase/regionserver/Server/Delete_95th_percentile._max", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Get_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Get_num_ops._sum", + "service_name": "HBASE", + "component_name": "HBASE_REGIONSERVER" + }, + { + "name": "regionserver.Server.Append_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Append_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "regionserver.Server.Increment_95th_percentile", - "metric_path": "metrics/hbase/regionserver/Server/Increment_95th_percentile", + "name": "regionserver.Server.Delete_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Delete_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "regionserver.Server.Append_95th_percentile", - "metric_path": "metrics/hbase/regionserver/Server/Append_95th_percentile", + "name": "regionserver.Server.Increment_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Increment_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "regionserver.Server.Delete_95th_percentile", - "metric_path": "metrics/hbase/regionserver/Server/Delete_95th_percentile", + "name": "regionserver.Server.Mutate_num_ops._sum", + "metric_path": "metrics/hbase/regionserver/Server/Mutate_num_ops._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" } @@ -140,15 +251,15 @@ "values": [ { "name": "Cluster wide minimum of 95% write Latency", - "value": "${regionserver.Server.Mutate_95th_percentile + regionserver.Server.Increment_95th_percentile + regionserver.Server.Append_95th_percentile + regionserver.Server.Delete_95th_percentile}" + "value": "${regionserver.Server.Mutate_95th_percentile._min + regionserver.Server.Increment_95th_percentile._min + regionserver.Server.Append_95th_percentile._min + regionserver.Server.Delete_95th_percentile._min}" }, { "name": "Weighted average of 95% write Latency", - "value": "${regionserver.Server.Mutate_95th_percentile + regionserver.Server.Increment_95th_percentile + regionserver.Server.Append_95th_percentile + regionserver.Server.Delete_95th_percentile}" + "value": "${((regionserver.Server.Mutate_95th_percentile._avg * regionserver.Server.Mutate_num_ops._sum) + (regionserver.Server.Increment_95th_percentile._avg * regionserver.Server.Increment_num_ops._sum) + (regionserver.Server.Append_95th_percentile._avg * regionserver.Server.Append_num_ops._sum) + (regionserver.Server.Delete_95th_percentile._avg * regionserver.Server.Delete_num_ops._sum))/(regionserver.Server.Append_num_ops._sum + regionserver.Server.Delete_num_ops._sum + regionserver.Server.Increment_num_ops._sum + regionserver.Server.Mutate_num_ops._sum)}" }, { "name": "Cluster wide maximum of 95% write Latency", - "value": "${regionserver.Server.Mutate_95th_percentile + regionserver.Server.Increment_95th_percentile + regionserver.Server.Append_95th_percentile + regionserver.Server.Delete_95th_percentile}" + "value": "${regionserver.Server.Mutate_95th_percentile._max + regionserver.Server.Increment_95th_percentile._max + regionserver.Server.Append_95th_percentile._max + regionserver.Server.Delete_95th_percentile._max}" } ], "properties": { @@ -159,14 +270,13 @@ }, { "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": "regionserver.RegionServer.numOpenConnections", - "metric_path": "metrics/hbase/ipc/IPC/numOpenConnections", + "name": "regionserver.RegionServer.numOpenConnections._sum", + "metric_path": "metrics/hbase/ipc/IPC/numOpenConnections._sum", "category": "", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" @@ -175,7 +285,7 @@ "values": [ { "name": "Open Connections", - "value": "${regionserver.RegionServer.numOpenConnections}" + "value": "${regionserver.RegionServer.numOpenConnections._sum}" } ], "properties": { @@ -186,19 +296,18 @@ }, { "widget_name": "Request Handlers", - "display_name": "Request Handlers", "widget_type": "GRAPH", "is_visible": true, "metrics": [ { - "name": "regionserver.RegionServer.numActiveHandler", - "metric_path": "metrics/hbase/ipc/IPC/numActiveHandler", + "name": "regionserver.RegionServer.numActiveHandler._sum", + "metric_path": "metrics/hbase/ipc/IPC/numActiveHandler._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "regionserver.RegionServer.numCallsInGeneralQueue", - "metric_path": "metrics/hbase/ipc/IPC/numCallsInGeneralQueue", + "name": "regionserver.RegionServer.numCallsInGeneralQueue._sum", + "metric_path": "metrics/hbase/ipc/IPC/numCallsInGeneralQueue._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" } @@ -206,11 +315,11 @@ "values": [ { "name": "Active Handlers", - "value": "${regionserver.RegionServer.numActiveHandler}" + "value": "${regionserver.RegionServer.numActiveHandler._sum}" }, { "name": "Calls in General Queue", - "value": "${regionserver.RegionServer.numCallsInGeneralQueue}" + "value": "${regionserver.RegionServer.numCallsInGeneralQueue._sum}" } ], "properties": { @@ -220,14 +329,13 @@ }, { "widget_name": "Files Local", - "display_name": "Files Local", "description": "This widget shows weighted average for local files.", "widget_type": "NUMBER", "is_visible": true, "metrics": [ { - "name": "regionserver.Server.percentFilesLocal", - "metric_path": "metrics/hbase/regionserver/percentFilesLocal", + "name": "regionserver.Server.percentFilesLocal._avg", + "metric_path": "metrics/hbase/regionserver/Server/percentFilesLocal._avg", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" } @@ -235,7 +343,7 @@ "values": [ { "name": "Files Local", - "value": "${regionserver.Server.percentFilesLocal}" + "value": "${regionserver.Server.percentFilesLocal._avg}" } ], "properties": { @@ -246,14 +354,13 @@ }, { "widget_name": "Blocked Updates", - "display_name": "Blocked Updates", "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", + "name": "regionserver.Server.updatesBlockedTime._sum", + "metric_path": "metrics/hbase/regionserver/Server/updatesBlockedTime._sum", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" } @@ -261,7 +368,7 @@ "values": [ { "name": "Updates Blocked Time", - "value": "${regionserver.Server.updatesBlockedTime}" + "value": "${regionserver.Server.updatesBlockedTime._sum}" } ], "properties": { @@ -272,14 +379,13 @@ }, { "widget_name": "Cluster CPU", - "display_name": "Cluster CPU", "description": "ReqionServer widget for CPU utilization", "widget_type": "GRAPH", "is_visible": true, "metrics": [ { - "name": "cpu_idle", - "metric_path": "metrics/cpu/cpu_idle", + "name": "cpu_idle._avg", + "metric_path": "metrics/cpu/cpu_idle._avg", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" } @@ -287,7 +393,7 @@ "values": [ { "name": "CPU Idle", - "value": "${cpu_idle}" + "value": "${cpu_idle._avg}" } ], "properties": { @@ -297,20 +403,19 @@ }, { "widget_name": "Cluster Network", - "display_name": "Cluster Network", "description": "ReqionServer widget for network utilization", "widget_type": "GRAPH", "is_visible": true, "metrics": [ { - "name": "pkts_in", - "metric_path": "metrics/network/pkts_in", + "name": "pkts_in._avg", + "metric_path": "metrics/network/pkts_in._avg", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" }, { - "name": "pkts_out", - "metric_path": "metrics/network/pkts_out", + "name": "pkts_out._avg", + "metric_path": "metrics/network/pkts_out._avg", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" } @@ -318,11 +423,11 @@ "values": [ { "name": "Packets In", - "value": "${pkts_in}" + "value": "${pkts_in._avg}" }, { "name": "Packets Out", - "value": "${disk_free}" + "value": "${pkts_out._avg}" } ], "properties": { @@ -332,14 +437,13 @@ }, { "widget_name": "Cluster Disk", - "display_name": "Cluster Disk", "description": "ReqionServer widget for disk utilization", "widget_type": "GRAPH", "is_visible": true, "metrics": [ { - "name": "disk_free", - "metric_path": "metrics/disk/disk_free", + "name": "disk_free._avg", + "metric_path": "metrics/disk/disk_free._avg", "service_name": "HBASE", "component_name": "HBASE_REGIONSERVER" } @@ -347,7 +451,7 @@ "values": [ { "name": "Disk Free", - "value": "${disk_free}" + "value": "${disk_free._avg}" } ], "properties": { @@ -364,7 +468,6 @@ "widgetLayoutInfo": [ { "widget_name": "HBase Compaction Queue Size", - "display_name": "HBase Compaction Queue Size", "description": "", "widget_type": "HEATMAP", "is_visible": true, @@ -389,7 +492,6 @@ }, { "widget_name": "HBase Memstore Sizes", - "display_name": "HBase Memstore Sizes", "description": "", "widget_type": "HEATMAP", "is_visible": false, @@ -414,7 +516,6 @@ }, { "widget_name": "HBase Read Request Count", - "display_name": "HBase Read Request Count", "description": "", "widget_type": "HEATMAP", "is_visible": false, @@ -438,7 +539,6 @@ }, { "widget_name": "HBase Write Request Count", - "display_name": "HBase Write Request Count", "description": "", "widget_type": "HEATMAP", "is_visible": false, @@ -462,7 +562,6 @@ }, { "widget_name": "HBase Regions", - "display_name": "HBase Regions", "description": "", "widget_type": "HEATMAP", "is_visible": false, http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/app.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/app.js b/ambari-web/app/app.js index abb826b..4817c27 100644 --- a/ambari-web/app/app.js +++ b/ambari-web/app/app.js @@ -261,6 +261,10 @@ module.exports = Em.Application.create({ return App.StackService.find().filterProperty('isNoConfigTypes').mapProperty('serviceName'); }.property('App.router.clusterController.isLoaded'), + servicesWithHeatmapTab: function () { + return App.StackService.find().filterProperty('hasHeatmapSection').mapProperty('serviceName'); + }.property('App.router.clusterController.isLoaded'), + monitoring: function () { return App.StackService.find().filterProperty('isMonitoringService').mapProperty('serviceName'); }.property('App.router.clusterController.isLoaded'), http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js b/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js index a8134a9..02d677e 100644 --- a/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js +++ b/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js @@ -43,11 +43,6 @@ App.WidgetWizardStep3Controller = Em.Controller.extend({ /** * @type {string} */ - widgetDisplayName: '', - - /** - * @type {string} - */ widgetAuthor: '', /** @@ -86,8 +81,7 @@ App.WidgetWizardStep3Controller = Em.Controller.extend({ this.set('widgetValues', this.get('content.widgetValues')); this.set('widgetMetrics', this.get('content.widgetMetrics')); this.set('widgetAuthor', App.router.get('loginName')); - this.set('widgetName', this.get('content.widgetDisplayName')); - this.set('widgetDisplayName', this.get('content.widgetDisplayName')); + this.set('widgetName', this.get('content.widgetName')); this.set('widgetDescription', this.get('content.widgetDescription')); this.get('scopes').forEach(function (scope) { scope.set('checked', scope.get('name').toUpperCase() == this.get('content.widgetScope')); @@ -100,18 +94,17 @@ App.WidgetWizardStep3Controller = Em.Controller.extend({ //TODO: Following computed property needs to be implemented. Next button should be enabled when there is no validation error and all required fields are filled isSubmitDisabled: function () { - return !this.get('widgetDisplayName'); - }.property('widgetDisplayName'), + return !(this.get('widgetName') && this.get('widgetDescription')); + }.property('widgetName', 'widgetDescription'), /** * collect all needed data to create new widget - * @returns {{WidgetInfo: {cluster_name: *, widget_name: *, display_name: *, widget_type: *, description: *, scope: string, metrics: *, values: *, properties: *}}} + * @returns {{WidgetInfo: {cluster_name: *, widget_name: *, widget_type: *, description: *, scope: string, metrics: *, values: *, properties: *}}} */ collectWidgetData: function () { return { WidgetInfo: { widget_name: this.get('widgetName'), - display_name: this.get('widgetDisplayName'), widget_type: this.get('content.widgetType'), description: this.get('widgetDescription'), scope: this.get('widgetScope.name').toUpperCase(), http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js b/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js index ad66f4e..2b9ae91 100644 --- a/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js +++ b/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js @@ -91,7 +91,6 @@ App.WidgetWizardController = App.WizardController.extend({ dataSets: [], templateValue: null, widgetName: null, - widgetDisplayName: null, widgetDescription: null, widgetScope: null }), @@ -252,8 +251,8 @@ App.WidgetWizardController = App.WizardController.extend({ * @returns {$.ajax} */ postWidgetDefinition: function (data) { - //TODO set correct widget name when adding new one, now widget name the same as to display name - data.WidgetInfo.widget_name = data.WidgetInfo.display_name; + //TODO remove setting diplay_name once API supports it + data.WidgetInfo.display_name = data.WidgetInfo.widget_name; return App.ajax.send({ name: 'widgets.wizard.add', sender: this, http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/controllers/main/service/widgets/edit_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/widgets/edit_controller.js b/ambari-web/app/controllers/main/service/widgets/edit_controller.js index 402c8a7..bbd2594 100644 --- a/ambari-web/app/controllers/main/service/widgets/edit_controller.js +++ b/ambari-web/app/controllers/main/service/widgets/edit_controller.js @@ -79,7 +79,6 @@ App.WidgetEditController = App.WidgetWizardController.extend({ dataSets: [], templateValue: null, widgetName: null, - widgetDisplayName: null, widgetDescription: null, widgetScope: null, widgetId: null @@ -112,7 +111,6 @@ App.WidgetEditController = App.WidgetWizardController.extend({ callback: function () { this.load('widgetName'); this.load('widgetDescription'); - this.load('widgetDisplayName'); } } ] @@ -164,7 +162,6 @@ App.WidgetEditController = App.WidgetWizardController.extend({ this.save('widgetValues', []); this.save('widgetName', ''); this.save('widgetDescription', ''); - this.save('widgetDisplayName', ''); this.save('widgetScope', ''); this.save('allMetrics', []); this.save('expressions', []); http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/mappers/widget_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/widget_mapper.js b/ambari-web/app/mappers/widget_mapper.js index 695a57e..0250b2b 100644 --- a/ambari-web/app/mappers/widget_mapper.js +++ b/ambari-web/app/mappers/widget_mapper.js @@ -25,7 +25,6 @@ App.widgetMapper = App.QuickDataMapper.create({ widget_name: 'widget_name', default_order: 'default_order', widget_type: 'widget_type', - display_name: 'display_name', service_name: 'service_name', section_name: 'section_name', time_created: 'time_created', http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/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 8e5e110..bf0a422 100644 --- a/ambari-web/app/mixins/common/widgets/widget_mixin.js +++ b/ambari-web/app/mixins/common/widgets/widget_mixin.js @@ -45,6 +45,11 @@ App.WidgetMixin = Ember.Mixin.create({ metrics: [], /** + * + */ + aggregatorFunc: ['._sum', '._avg', '._min', '._max'], + + /** * @type {boolean} */ isLoaded: false, @@ -73,7 +78,7 @@ App.WidgetMixin = Ember.Mixin.create({ for (var i in requestData) { request = requestData[i]; requestCounter++; - if (this.get('content.widgetType') === 'HEATMAP'){ + if (this.get('content.widgetType') === 'HEATMAP') { if (request.service_name === 'STACK') { this.getHostsMetrics(request).complete(function () { requestCounter--; @@ -185,21 +190,20 @@ App.WidgetMixin = Ember.Mixin.create({ hostName: request.host_name, metricPaths: request.metric_paths.join(',') } - }).done(function(metricData) { + }).done(function (metricData) { self.getMetricsSuccessCallback(metricData); dfd.resolve(); - }).fail(function(data){ + }).fail(function (data) { dfd.reject(); }); } - }).fail(function(data){ + }).fail(function (data) { dfd.reject(); }); return dfd.promise(); }, - /** * make GET call to server in order to fetch host-component names * @param {object} request @@ -225,13 +229,24 @@ App.WidgetMixin = Ember.Mixin.create({ */ getMetricsSuccessCallback: function (data) { var metrics = []; - - this.get('content.metrics').forEach(function (_metric) { - if (!Em.isNone(Em.get(data, _metric.metric_path.replace(/\//g, '.')))) { - _metric.data = Em.get(data, _metric.metric_path.replace(/\//g, '.')); - this.get('metrics').pushObject(_metric); - } - }, this); + if (this.get('content.metrics')) { + this.get('content.metrics').forEach(function (_metric) { + var metric_path; + this.aggregatorFunc.forEach(function (_func) { + if (_metric.metric_path.endsWith(_func)) { + // truncate aggregator function suffixed at the end of the metric + metric_path = _metric.metric_path.substring(0, _metric.metric_path.indexOf(_func)); + } + }, this); + if (!metric_path) { + metric_path = _metric.metric_path; + } + if (!Em.isNone(Em.get(data, metric_path.replace(/\//g, '.')))) { + _metric.data = Em.get(data, metric_path.replace(/\//g, '.')); + this.get('metrics').pushObject(_metric); + } + }, this); + } }, /** @@ -239,8 +254,8 @@ App.WidgetMixin = Ember.Mixin.create({ * @param {object} request * @return {$.ajax} */ - getHostComponentsMetrics: function(request) { - request.metric_paths.forEach(function(_metric,index){ + getHostComponentsMetrics: function (request) { + request.metric_paths.forEach(function (_metric, index) { request.metric_paths[index] = "host_components/" + _metric; }); return App.ajax.send({ @@ -256,21 +271,21 @@ App.WidgetMixin = Ember.Mixin.create({ }, - getHostComponentsMetricsSuccessCallback: function(data) { + getHostComponentsMetricsSuccessCallback: function (data) { var metrics = this.get('content.metrics'); - data.host_components.forEach(function(item){ + data.host_components.forEach(function (item) { metrics.forEach(function (_metric) { if (!Em.isNone(Em.get(item, _metric.metric_path.replace(/\//g, '.')))) { - var metric = $.extend({},_metric,true); - metric.data = Em.get(item, _metric.metric_path.replace(/\//g, '.')); + var metric = $.extend({}, _metric, true); + metric.data = Em.get(item, _metric.metric_path.replace(/\//g, '.')); metric.hostName = item.HostRoles.host_name; this.get('metrics').pushObject(metric); } }, this); - },this); + }, this); }, - getHostsMetrics: function(request) { + getHostsMetrics: function (request) { return App.ajax.send({ name: 'widgets.hosts.metrics.get', sender: this, @@ -281,18 +296,18 @@ App.WidgetMixin = Ember.Mixin.create({ }); }, - getHostsMetricsSuccessCallback: function(data) { + getHostsMetricsSuccessCallback: function (data) { var metrics = this.get('content.metrics'); - data.items.forEach(function(item){ - metrics.forEach(function (_metric,index) { + data.items.forEach(function (item) { + metrics.forEach(function (_metric, index) { if (!Em.isNone(Em.get(item, _metric.metric_path.replace(/\//g, '.')))) { - var metric = $.extend({},_metric,true); - metric.data = Em.get(item, _metric.metric_path.replace(/\//g, '.')); + var metric = $.extend({}, _metric, true); + metric.data = Em.get(item, _metric.metric_path.replace(/\//g, '.')); metric.hostName = item.Hosts.host_name; this.get('metrics').pushObject(metric); } }, this); - },this); + }, this); }, /** @@ -412,7 +427,7 @@ App.WidgetMixin = Ember.Mixin.create({ cloneWidget: function (event) { var self = this; return App.showConfirmationPopup( - function() { + function () { self.postWidgetDefinition(); }, Em.I18n.t('widget.clone.body').format(self.get('content.displayName')), @@ -464,7 +479,7 @@ App.WidgetMixin = Ember.Mixin.create({ }); }, - postWidgetDefinitionSuccessCallback: function() { + postWidgetDefinitionSuccessCallback: function () { }, http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/models/widget.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/widget.js b/ambari-web/app/models/widget.js index 5dbd685..100c5fb 100644 --- a/ambari-web/app/models/widget.js +++ b/ambari-web/app/models/widget.js @@ -32,7 +32,6 @@ App.Widget = DS.Model.extend({ */ widgetType: DS.attr('string'), layout: DS.belongsTo('App.WidgetLayout'), - displayName: DS.attr('string'), description: DS.attr('string'), serviceName: DS.attr('string'), timeCreated: DS.attr('number'), http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/routes/main.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js index 42fb206..c0a7082 100644 --- a/ambari-web/app/routes/main.js +++ b/ambari-web/app/routes/main.js @@ -583,7 +583,6 @@ module.exports = Em.Route.extend(App.RouterRedirections, { widgetController.save('widgetMetrics', context.get('metrics')); widgetController.save('widgetValues', context.get('values')); widgetController.save('widgetName', context.get('widgetName')); - widgetController.save('widgetDisplayName', context.get('displayName')); widgetController.save('widgetDescription', context.get('description')); widgetController.save('widgetScope', context.get('scope')); widgetController.save('widgetId', context.get('id')); http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/templates/common/modal_popups/widget_browser_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/modal_popups/widget_browser_popup.hbs b/ambari-web/app/templates/common/modal_popups/widget_browser_popup.hbs index 0b88018..939931c 100644 --- a/ambari-web/app/templates/common/modal_popups/widget_browser_popup.hbs +++ b/ambari-web/app/templates/common/modal_popups/widget_browser_popup.hbs @@ -46,7 +46,7 @@ <a class="widget-icon-image" target="_blank"><img {{bindAttr src="widget.iconPath"}}></a> </div> <div class="label-description span8"> - <p class="label-text">{{widget.displayName}}</p> + <p class="label-text">{{widget.widgetName}}</p> <p class="description-text">{{widget.description}}</p> </div> <div class="is-shared-icon pull-left"> http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/templates/common/widget/gauge_widget.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/widget/gauge_widget.hbs b/ambari-web/app/templates/common/widget/gauge_widget.hbs index 7ba1600..c398af9 100644 --- a/ambari-web/app/templates/common/widget/gauge_widget.hbs +++ b/ambari-web/app/templates/common/widget/gauge_widget.hbs @@ -21,7 +21,7 @@ <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}> <i class="icon-remove-sign icon-large"></i> </a> - <div class="caption title span11">{{view.content.displayName}}</div> + <div class="caption title span11">{{view.content.widgetName}}</div> <a class="corner-icon pull-right" href="#" {{action cloneWidget target="view"}}> <i class="icon-copy"></i> </a> http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/templates/common/widget/graph_widget.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/widget/graph_widget.hbs b/ambari-web/app/templates/common/widget/graph_widget.hbs index 6fffd92..53da312 100644 --- a/ambari-web/app/templates/common/widget/graph_widget.hbs +++ b/ambari-web/app/templates/common/widget/graph_widget.hbs @@ -21,7 +21,7 @@ <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}> <i class="icon-remove-sign icon-large"></i> </a> - <div class="caption title span11">{{view.content.displayName}}</div> + <div class="caption title span11">{{view.content.widgetName}}</div> <a class="corner-icon pull-right" href="#" {{action cloneWidget target="view"}}> <i class="icon-copy"></i> </a> http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/templates/common/widget/heatmap_widget.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/widget/heatmap_widget.hbs b/ambari-web/app/templates/common/widget/heatmap_widget.hbs index 215fb1c..98dcbb4 100644 --- a/ambari-web/app/templates/common/widget/heatmap_widget.hbs +++ b/ambari-web/app/templates/common/widget/heatmap_widget.hbs @@ -20,7 +20,7 @@ <div class="span10 heatmap-content"> <h4 id="heatmap-metric-loading"> <span id="heatmap-metric-title"> - {{view.content.displayName}} + {{view.content.widgetName}} {{#unless view.isLoaded}} <i class='icon-spinner icon-spin icon-small'></i> {{/unless}} http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/templates/common/widget/number_widget.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/widget/number_widget.hbs b/ambari-web/app/templates/common/widget/number_widget.hbs index 6bb82e3..1c531b9 100644 --- a/ambari-web/app/templates/common/widget/number_widget.hbs +++ b/ambari-web/app/templates/common/widget/number_widget.hbs @@ -21,7 +21,7 @@ <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}> <i class="icon-remove-sign icon-large"></i> </a> - <div class="caption title span11">{{view.content.displayName}}</div> + <div class="caption title span11">{{view.content.widgetName}}</div> <a class="corner-icon pull-right" href="#" {{action cloneWidget target="view"}}> <i class="icon-copy"></i> </a> http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/templates/common/widget/template_widget.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/widget/template_widget.hbs b/ambari-web/app/templates/common/widget/template_widget.hbs index 0d5cc27..6036bb9 100644 --- a/ambari-web/app/templates/common/widget/template_widget.hbs +++ b/ambari-web/app/templates/common/widget/template_widget.hbs @@ -21,7 +21,7 @@ <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}> <i class="icon-remove-sign icon-large"></i> </a> - <div class="caption title span11">{{view.content.displayName}}</div> + <div class="caption title span11">{{view.content.widgetName}}</div> <a class="corner-icon pull-right" href="#" {{action cloneWidget target="view"}}> <i class="icon-copy"></i> </a> http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs b/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs index 8904d49..a2cc193 100644 --- a/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs +++ b/ambari-web/app/templates/main/charts/heatmap_dropdown.hbs @@ -28,7 +28,7 @@ <ul class="dropdown-menu"> {{#each heatmap in category.heatmaps}} <li> - <a tabindex="-1" {{action showHeatMapMetric heatmap target="controller"}}>{{heatmap.display_name}}</a> + <a tabindex="-1" {{action showHeatMapMetric heatmap target="controller"}}>{{heatmap.widget_name}}</a> </li> {{/each}} </ul> http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs b/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs index 8986c45..811a253 100644 --- a/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs +++ b/ambari-web/app/templates/main/service/info/heatmap_dropdown.hbs @@ -25,7 +25,7 @@ <ul class="dropdown-menu"> {{#each heatmap in controller.allHeatmaps}} <li class="heatmap-metrics-dropdown-links"> - <a tabindex="-1" {{action showHeatMapMetric heatmap target="controller"}}>{{heatmap.display_name}}</a> + <a tabindex="-1" {{action showHeatMapMetric heatmap target="controller"}}>{{heatmap.widget_name}}</a> </li> {{/each}} </ul> http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/templates/main/service/widgets/create/step3.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/widgets/create/step3.hbs b/ambari-web/app/templates/main/service/widgets/create/step3.hbs index 47beb74..126db15 100644 --- a/ambari-web/app/templates/main/service/widgets/create/step3.hbs +++ b/ambari-web/app/templates/main/service/widgets/create/step3.hbs @@ -22,7 +22,7 @@ <form> <div class="row-fluid"> <div class="span2 title">{{t widget.create.wizard.step3.widgetName}}</div> - <div class="span10">{{view Ember.TextField valueBinding="widgetDisplayName"}}</div> + <div class="span10">{{view Ember.TextField valueBinding="widgetName"}}</div> </div> <div class="row-fluid"> http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/utils/helper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js index 5606192..146caae 100644 --- a/ambari-web/app/utils/helper.js +++ b/ambari-web/app/utils/helper.js @@ -191,6 +191,21 @@ Number.prototype.toDaysHoursMinutes = function () { return formatted; }; + + +/** + * + * @param bound1 {Number} + * @param bound2 {Number} + * @return {boolean} + */ +Number.prototype.isInRange = function (bound1, bound2) { + var upperBound, lowerBound; + upperBound = bound1 > bound2 ? bound1: bound2; + lowerBound = bound1 < bound2 ? bound1: bound2; + return this > lowerBound && this < upperBound; +}; + /** Sort an array by the key specified in the argument. Handle only native js objects as element of array, not the Ember's object. http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/views/common/widget/gauge_widget_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/widget/gauge_widget_view.js b/ambari-web/app/views/common/widget/gauge_widget_view.js index 3acfa10..3e951cb 100644 --- a/ambari-web/app/views/common/widget/gauge_widget_view.js +++ b/ambari-web/app/views/common/widget/gauge_widget_view.js @@ -79,17 +79,17 @@ App.GaugeWidgetView = Em.View.extend(App.WidgetMixin, { contentColor: function () { var used = parseFloat(this.get('parentView.value')) * this.get('FACTOR'); - var thresh1 = parseFloat(this.get('warningThreshold')) * this.get('FACTOR'); - var thresh2 = parseFloat(this.get('errorThreshold')) * this.get('FACTOR'); + var threshold1 = parseFloat(this.get('warningThreshold')) * this.get('FACTOR'); + var threshold2 = parseFloat(this.get('errorThreshold')) * this.get('FACTOR'); var color_green = App.healthStatusGreen; var color_red = App.healthStatusRed; var color_orange = App.healthStatusOrange; - if (isNaN(thresh1) || isNaN(thresh2) || used <= thresh1) { + if (isNaN(threshold1) || (isNaN(threshold2) && used <= threshold1) || (!isNaN(threshold2) && (threshold1 > threshold2) && (used > threshold1)) || (!isNaN(threshold2) && (threshold1 < threshold2) && (used <= threshold1))) { this.set('palette', new Rickshaw.Color.Palette({ scheme: [ '#FFFFFF', color_green ].reverse() })); return color_green; - } else if (used <= thresh2) { + } else if (!isNaN(threshold2) && used.isInRange(threshold1, threshold2)) { this.set('palette', new Rickshaw.Color.Palette({ scheme: [ '#FFFFFF', color_orange ].reverse() })); http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/views/common/widget/graph_widget_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/widget/graph_widget_view.js b/ambari-web/app/views/common/widget/graph_widget_view.js index bfe8306..e6d854e 100644 --- a/ambari-web/app/views/common/widget/graph_widget_view.js +++ b/ambari-web/app/views/common/widget/graph_widget_view.js @@ -253,8 +253,8 @@ App.GraphWidgetView = Em.View.extend(App.WidgetMixin, { }.property('parentView.content.properties.graph_type'), title: function () { - return this.get('parentView.content.displayName'); - }.property('parentView.content.displayName'), + return this.get('parentView.content.widgetName'); + }.property('parentView.content.widgetName'), transformToSeries: function (seriesData) { var seriesArray = []; http://git-wip-us.apache.org/repos/asf/ambari/blob/47907b96/ambari-web/app/views/common/widget/number_widget_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/widget/number_widget_view.js b/ambari-web/app/views/common/widget/number_widget_view.js index fc8a53b..cdc7823 100644 --- a/ambari-web/app/views/common/widget/number_widget_view.js +++ b/ambari-web/app/views/common/widget/number_widget_view.js @@ -29,7 +29,7 @@ App.NumberWidgetView = Em.View.extend(App.WidgetMixin, { displayValue: function () { var value = parseFloat(this.get('value')); if (isNaN(value)) return Em.I18n.t('common.na'); - var value = value % 1 != 0? value.toFixed(2): value; + value = value % 1 != 0? value.toFixed(2): value; var unit = this.get('content.properties.display_unit')? this.get('content.properties.display_unit'): ''; return value + unit; }.property('value'), @@ -46,14 +46,14 @@ App.NumberWidgetView = Em.View.extend(App.WidgetMixin, { */ contentColor: function () { var value = parseFloat(this.get('value')); - var warningThreshold = parseFloat(this.get('content.properties.warning_threshold')); - var errorThreshold = parseFloat(this.get('content.properties.error_threshold')); + var threshold1 = parseFloat(this.get('content.properties.warning_threshold')); + var threshold2 = parseFloat(this.get('content.properties.error_threshold')); if (isNaN(value)) { return 'grey'; - } else if (isNaN(warningThreshold) || isNaN(errorThreshold) || value <= warningThreshold) { + } else if (isNaN(threshold1) || (isNaN(threshold2) && value <= threshold1) || (!isNaN(threshold2) && (threshold1 > threshold2) && (value > threshold1)) || (!isNaN(threshold2) && (threshold1 < threshold2) && (value <= threshold1))) { return 'green'; - } else if (value <= errorThreshold) { + } else if (!isNaN(threshold2) && value.isInRange(threshold1, threshold2)) { return 'orange'; } else { return 'red';
