Updated Branches: refs/heads/trunk a1322cecd -> a718fc45d
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a718fc45/ambari-web/app/views/main/service/info/metrics/yarn/tasks_running_waiting.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/service/info/metrics/yarn/tasks_running_waiting.js b/ambari-web/app/views/main/service/info/metrics/yarn/tasks_running_waiting.js new file mode 100644 index 0000000..f1fc6dc --- /dev/null +++ b/ambari-web/app/views/main/service/info/metrics/yarn/tasks_running_waiting.js @@ -0,0 +1,65 @@ +/** + * 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'); + +/** + * @class + * + * This is a view for showing cluster CPU metrics + * + * @extends App.ChartLinearTimeView + * @extends Ember.Object + * @extends Ember.View + */ +App.ChartServiceMetricsYARN_TasksRunningWaiting = App.ChartLinearTimeView.extend({ + id: "service-metrics-yarn-tasks-running-waiting", + title: Em.I18n.t('services.service.info.metrics.mapreduce.tasksRunningWaiting'), + renderer: 'line', + + ajaxIndex: 'service.metrics.mapreduce.tasks_running_waiting', + + transformToSeries: function (jsonData) { + var seriesArray = []; + if (jsonData && jsonData.metrics && jsonData.metrics.mapred && jsonData.metrics.mapred.jobtracker) { + for ( var name in jsonData.metrics.mapred.jobtracker) { + var displayName; + var seriesData = jsonData.metrics.mapred.jobtracker[name]; + switch (name) { + case "running_maps": + displayName = Em.I18n.t('services.service.info.metrics.mapreduce.tasksRunningWaiting.displayNames.runningMaps'); + break; + case "running_reduces": + displayName = Em.I18n.t('services.service.info.metrics.mapreduce.tasksRunningWaiting.displayNames.runningReduces'); + break; + case "waiting_maps": + displayName = Em.I18n.t('services.service.info.metrics.mapreduce.tasksRunningWaiting.displayNames.waitingMaps'); + break; + case "waiting_reduces": + displayName = Em.I18n.t('services.service.info.metrics.mapreduce.tasksRunningWaiting.displayNames.waitingReduces'); + break; + default: + break; + } + if (seriesData) { + seriesArray.push(this.transformData(seriesData, displayName)); + } + } + } + return seriesArray; + } +}); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a718fc45/ambari-web/app/views/main/service/info/summary.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/service/info/summary.js b/ambari-web/app/views/main/service/info/summary.js index 5cbe478..34a776c 100644 --- a/ambari-web/app/views/main/service/info/summary.js +++ b/ambari-web/app/views/main/service/info/summary.js @@ -36,6 +36,7 @@ App.MainServiceInfoSummaryView = Em.View.extend({ attributes:null, serviceStatus:{ hdfs:false, + yarn:false, mapreduce:false, mapreduce2:false, hbase:false, @@ -126,6 +127,11 @@ App.MainServiceInfoSummaryView = Em.View.extend({ return result; }.property('controller.content'), + historyServerUI: function(){ + var service=this.get('controller.content'); + return (App.singleNodeInstall ? "http://"; + App.singleNodeAlias + ":19888" : "http://"; + service.get("hostComponents").findProperty('isMaster', true).get("host").get("publicHostName")+":19888"); + }.property('controller.content'), + monitors: function () { var result = ''; var service = this.get('controller.content'); @@ -267,6 +273,9 @@ App.MainServiceInfoSummaryView = Em.View.extend({ case 'hdfs': svc = App.HDFSService.find().objectAt(0); break; + case 'yarn': + svc = App.YARNService.find().objectAt(0); + break; case 'mapreduce': svc = App.MapReduceService.find().objectAt(0); break; @@ -320,6 +329,16 @@ App.MainServiceInfoSummaryView = Em.View.extend({ App.ChartServiceMetricsHDFS_JVMHeap.extend(), App.ChartServiceMetricsHDFS_JVMThreads.extend()]]; break; + case 'yarn': + graphs = [ /*[App.ChartServiceMetricsYARN_JobsStatus.extend(), + App.ChartServiceMetricsYARN_TasksRunningWaiting.extend(), + App.ChartServiceMetricsYARN_MapSlots.extend(), + App.ChartServiceMetricsYARN_ReduceSlots.extend()],*/ + [App.ChartServiceMetricsYARN_RPC.extend(), + App.ChartServiceMetricsYARN_GC.extend(), + App.ChartServiceMetricsYARN_JVMHeap.extend(), + App.ChartServiceMetricsYARN_JVMThreads.extend()]]; + break; case 'mapreduce': graphs = [ [App.ChartServiceMetricsMapReduce_JobsStatus.extend(), App.ChartServiceMetricsMapReduce_TasksRunningWaiting.extend(), http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a718fc45/ambari-web/app/views/main/service/menu.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/service/menu.js b/ambari-web/app/views/main/service/menu.js index 5cd9377..c00cb3e 100644 --- a/ambari-web/app/views/main/service/menu.js +++ b/ambari-web/app/views/main/service/menu.js @@ -21,7 +21,7 @@ var App = require('app'); App.MainServiceMenuView = Em.CollectionView.extend({ content:function () { var items = App.router.get('mainServiceController.content').filter(function(item){ - if(['PIG', 'SQOOP', 'HCATALOG'].contains(item.get('id'))){ + if(['PIG', 'SQOOP', 'HCATALOG', 'TEZ'].contains(item.get('id'))){ return false; } return true; http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a718fc45/ambari-web/test/installer/step2_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/installer/step2_test.js b/ambari-web/test/installer/step2_test.js index 5971c8f..238d64b 100644 --- a/ambari-web/test/installer/step2_test.js +++ b/ambari-web/test/installer/step2_test.js @@ -20,7 +20,6 @@ var App = require('app'); var Ember = require('ember'); require('controllers/wizard/step2_controller'); require('models/host'); -require('models/host_component'); require('messages'); describe('App.WizardStep2Controller', function () { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a718fc45/ambari-web/test/installer/step5_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/installer/step5_test.js b/ambari-web/test/installer/step5_test.js index aaff8ab..c304b18 100644 --- a/ambari-web/test/installer/step5_test.js +++ b/ambari-web/test/installer/step5_test.js @@ -19,8 +19,6 @@ var Ember = require('ember'); var App = require('app'); require('controllers/wizard/step5_controller'); -var components = require('data/service_components'); - describe('App.WizardStep5Controller', function () { var controller = App.WizardStep5Controller.create(); @@ -101,9 +99,7 @@ describe('App.WizardStep5Controller', function () { expect(controller.getHostForComponent(test.hosts.length, scheme).host_name).to.equal(test.hosts[test.equals[index]]); }); }); - }); - }); describe('#getZooKeeperServer', function() { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a718fc45/ambari-web/vendor/styles/cubism.css ---------------------------------------------------------------------- diff --git a/ambari-web/vendor/styles/cubism.css b/ambari-web/vendor/styles/cubism.css index b572148..9a3b43f 100644 --- a/ambari-web/vendor/styles/cubism.css +++ b/ambari-web/vendor/styles/cubism.css @@ -43,7 +43,7 @@ #dag_viewer rect { fill: #ccc; stroke: #333; - stroke-width: 1px; + stroke-width: 1.5px; } #dag_viewer rect.finished { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a718fc45/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php ---------------------------------------------------------------------- diff --git a/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php b/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php index cc26bd0..a8cc963 100644 --- a/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php +++ b/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php @@ -389,6 +389,13 @@ function hdp_mon_generate_response( $response_data ) case "FLUME": $pieces[0] = "FLUME"; break; + case "JOBHISTORY": + $pieces[0] = "MAPREDUCE2"; + break; + case "RESOURCEMANAGER": + case "NODEMANAGER": + $pieces[0] = "YARN"; + break; case "NAGIOS": case "HDFS": case "MAPREDUCE":
