git commit: AMBARI-7601 Service pluggability: refactor UI code to externalize metrics graph definition to a single file (salvi via jaoki)
Repository: ambari Updated Branches: refs/heads/branch-1.7.0 2414e599e -> c0b54499b AMBARI-7601 Service pluggability: refactor UI code to externalize metrics graph definition to a single file (salvi via jaoki) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c0b54499 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c0b54499 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c0b54499 Branch: refs/heads/branch-1.7.0 Commit: c0b54499b202f1829bcc441f7344e6bf69eb7db7 Parents: 2414e59 Author: Jun Aoki Authored: Thu Oct 16 14:56:19 2014 -0700 Committer: Jun Aoki Committed: Thu Oct 16 14:56:19 2014 -0700 -- ambari-web/app/assets/test/tests.js | 2 + ambari-web/app/data/service_graph_config.js | 93 +++ .../app/views/main/service/info/summary.js | 96 ++-- .../views/main/service/info/summary_test.js | 24 - 4 files changed, 146 insertions(+), 69 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/c0b54499/ambari-web/app/assets/test/tests.js -- diff --git a/ambari-web/app/assets/test/tests.js b/ambari-web/app/assets/test/tests.js index b54452a..8682af3 100644 --- a/ambari-web/app/assets/test/tests.js +++ b/ambari-web/app/assets/test/tests.js @@ -163,6 +163,8 @@ var files = ['test/init_model_test', 'test/views/main/charts/heatmap/heatmap_host_test', 'test/views/main/service/item_test', 'test/views/main/service/info/config_test', + 'test/views/main/service/info/summary_test', + 'test/views/main/mirroring/edit_dataset_view_test', 'test/views/common/configs/services_config_test', 'test/views/wizard/step3/hostLogPopupBody_view_test', 'test/views/wizard/step3/hostWarningPopupBody_view_test', http://git-wip-us.apache.org/repos/asf/ambari/blob/c0b54499/ambari-web/app/data/service_graph_config.js -- diff --git a/ambari-web/app/data/service_graph_config.js b/ambari-web/app/data/service_graph_config.js new file mode 100644 index 000..51a9f9e --- /dev/null +++ b/ambari-web/app/data/service_graph_config.js @@ -0,0 +1,93 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +var App = require('app'); + +/** +This determines the graphs to display on the service page under each service. + +This is based on the name of the object associated with it. + +The name of the object is of the format: 'App.ChartServiceMetrics' where +is one of the items below. +**/ +App.service_graph_config = { + 'hdfs': [ + 'HDFS_SpaceUtilization', + 'HDFS_FileOperations', + 'HDFS_BlockStatus', + 'HDFS_IO', + 'HDFS_RPC', + 'HDFS_GC', + 'HDFS_JVMHeap', + 'HDFS_JVMThreads' + ], + + 'yarn': [ + 'YARN_AllocatedMemory', + 'YARN_QMR', + 'YARN_AllocatedContainer', + 'YARN_NMS', + 'YARN_ApplicationCurrentStates', + 'YARN_ApplicationFinishedStates', + 'YARN_RPC', + 'YARN_GC', + 'YARN_JVMThreads', + 'YARN_JVMHeap' + ], + + 'mapreduce': [ + 'MapReduce_JobsStatus', + 'MapReduce_TasksRunningWaiting', + 'MapReduce_MapSlots', + 'MapReduce_ReduceSlots', + 'MapReduce_GC', + 'MapReduce_RPC', + 'MapReduce_JVMHeap', + 'MapReduce_JVMThreads' + ], + + 'hbase': [ + 'HBASE_ClusterRequests', + 'HBASE_RegionServerReadWriteRequests', + 'HBASE_RegionServerRegions', + 'HBASE_RegionServerQueueSize', + 'HBASE_HlogSplitTime', + 'HBASE_HlogSplitSize' + ], + + 'flume': [ + 'Flume_ChannelSizeMMA', + 'Flume_ChannelSizeSum', + 'Flu
git commit: AMBARI-7601 Service pluggability: refactor UI code to externalize metrics graph definition to a single file (salvi via jaoki)
Repository: ambari Updated Branches: refs/heads/trunk 1be4506a4 -> 1cf2b9852 AMBARI-7601 Service pluggability: refactor UI code to externalize metrics graph definition to a single file (salvi via jaoki) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1cf2b985 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1cf2b985 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1cf2b985 Branch: refs/heads/trunk Commit: 1cf2b98520914f32ac33685951fc24cfadb55be6 Parents: 1be4506 Author: Jun Aoki Authored: Thu Oct 16 14:55:36 2014 -0700 Committer: Jun Aoki Committed: Thu Oct 16 14:55:36 2014 -0700 -- ambari-web/app/assets/test/tests.js | 2 + ambari-web/app/data/service_graph_config.js | 93 +++ .../app/views/main/service/info/summary.js | 96 ++-- .../views/main/service/info/summary_test.js | 24 - 4 files changed, 146 insertions(+), 69 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/1cf2b985/ambari-web/app/assets/test/tests.js -- diff --git a/ambari-web/app/assets/test/tests.js b/ambari-web/app/assets/test/tests.js index 1dff1b2..65082ab 100644 --- a/ambari-web/app/assets/test/tests.js +++ b/ambari-web/app/assets/test/tests.js @@ -167,6 +167,8 @@ var files = ['test/init_model_test', 'test/views/main/charts/heatmap/heatmap_host_test', 'test/views/main/service/item_test', 'test/views/main/service/info/config_test', + 'test/views/main/service/info/summary_test', + 'test/views/main/mirroring/edit_dataset_view_test', 'test/views/common/configs/services_config_test', 'test/views/wizard/step3/hostLogPopupBody_view_test', 'test/views/wizard/step3/hostWarningPopupBody_view_test', http://git-wip-us.apache.org/repos/asf/ambari/blob/1cf2b985/ambari-web/app/data/service_graph_config.js -- diff --git a/ambari-web/app/data/service_graph_config.js b/ambari-web/app/data/service_graph_config.js new file mode 100644 index 000..51a9f9e --- /dev/null +++ b/ambari-web/app/data/service_graph_config.js @@ -0,0 +1,93 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +var App = require('app'); + +/** +This determines the graphs to display on the service page under each service. + +This is based on the name of the object associated with it. + +The name of the object is of the format: 'App.ChartServiceMetrics' where +is one of the items below. +**/ +App.service_graph_config = { + 'hdfs': [ + 'HDFS_SpaceUtilization', + 'HDFS_FileOperations', + 'HDFS_BlockStatus', + 'HDFS_IO', + 'HDFS_RPC', + 'HDFS_GC', + 'HDFS_JVMHeap', + 'HDFS_JVMThreads' + ], + + 'yarn': [ + 'YARN_AllocatedMemory', + 'YARN_QMR', + 'YARN_AllocatedContainer', + 'YARN_NMS', + 'YARN_ApplicationCurrentStates', + 'YARN_ApplicationFinishedStates', + 'YARN_RPC', + 'YARN_GC', + 'YARN_JVMThreads', + 'YARN_JVMHeap' + ], + + 'mapreduce': [ + 'MapReduce_JobsStatus', + 'MapReduce_TasksRunningWaiting', + 'MapReduce_MapSlots', + 'MapReduce_ReduceSlots', + 'MapReduce_GC', + 'MapReduce_RPC', + 'MapReduce_JVMHeap', + 'MapReduce_JVMThreads' + ], + + 'hbase': [ + 'HBASE_ClusterRequests', + 'HBASE_RegionServerReadWriteRequests', + 'HBASE_RegionServerRegions', + 'HBASE_RegionServerQueueSize', + 'HBASE_HlogSplitTime', + 'HBASE_HlogSplitSize' + ], + + 'flume': [ + 'Flume_ChannelSizeMMA', + 'Flume_ChannelSizeSum', + 'Flume_IncommingMM