Updated Branches: refs/heads/trunk 8e73a2697 -> 96480991e
AMBARI-2743. Remove RCA DB properties from YARN configs page. (srimanth) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/96480991 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/96480991 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/96480991 Branch: refs/heads/trunk Commit: 96480991e0fae8f0b097e827df975839b78e9d04 Parents: 8e73a26 Author: Srimanth Gunturi <[email protected]> Authored: Mon Jul 29 12:10:05 2013 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Mon Jul 29 12:10:05 2013 -0700 ---------------------------------------------------------------------- .../services/YARN/configuration/yarn-site.xml | 25 -------------------- ambari-web/app/routes/main.js | 19 ++++++++++----- ambari-web/app/views/main/menu.js | 8 ++++--- 3 files changed, 18 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/96480991/ambari-server/src/main/resources/stacks/HDP/2.0.3/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.3/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.3/services/YARN/configuration/yarn-site.xml index fed4933..05bed32 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.3/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.3/services/YARN/configuration/yarn-site.xml @@ -167,30 +167,5 @@ <name>yarn.nodemanager.delete.debug-delay-sec</name> <value>36000</value> </property> - - <property> - <name>yarn.resourcemanager.history-store.class</name> - <value>org.apache.hadoop.yarn.server.resourcemanager.history.db.RMHistoryDBStore</value> - </property> - - <property> - <name>yarn.resourcemanager.history-store.db.user</name> - <value>mapred</value> - </property> - - <property> - <name>yarn.resourcemanager.history-store.db.password</name> - <value>mapred</value> - </property> - - <property> - <name>yarn.resourcemanager.history-store.db.database</name> - <value>jdbc:postgresql:ambarirca</value> - </property> - - <property> - <name>yarn.resourcemanager.history-store.db.driver</name> - <value>org.postgresql.Driver</value> - </property> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/96480991/ambari-web/app/routes/main.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js index af0ae59..c911b30 100644 --- a/ambari-web/app/routes/main.js +++ b/ambari-web/app/routes/main.js @@ -96,12 +96,19 @@ module.exports = Em.Route.extend({ router.transitionTo(event.context); } }), - apps: Em.Route.extend({ - route: '/apps', - connectOutlets: function (router) { - router.get('mainController').connectOutlet('mainApps'); - } - }), + apps: Em.Route.extend({ + route: '/apps', + connectOutlets: function (router) { + if (App.get('isHadoop2Stack')) { + Em.run.next(function () { + router.transitionTo('main.dashboard'); + }); + } else { + router.get('mainAppsController').loadRuns(); + router.get('mainController').connectOutlet('mainApps'); + } + } + }), mirroring: Em.Route.extend({ route: '/mirroring', http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/96480991/ambari-web/app/views/main/menu.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/menu.js b/ambari-web/app/views/main/menu.js index 0ca08d6..ccd3316 100644 --- a/ambari-web/app/views/main/menu.js +++ b/ambari-web/app/views/main/menu.js @@ -17,7 +17,6 @@ */ var App = require('app'); -var stringUtils = require('utils/string_utils'); /** * this menu extended by other with modifying content and itemViewClass.template @@ -31,14 +30,17 @@ App.MainMenuView = Em.CollectionView.extend({ { label:Em.I18n.t('menu.item.dashboard'), routing:'dashboard', active:'active'}, { label:Em.I18n.t('menu.item.heatmaps'), routing:'charts'}, { label:Em.I18n.t('menu.item.services'), routing:'services'}, - { label:Em.I18n.t('menu.item.hosts'), routing:'hosts'}, - { label:Em.I18n.t('menu.item.jobs'), routing:'apps'} + { label:Em.I18n.t('menu.item.hosts'), routing:'hosts'} ]; if (App.supports.mirroring) { result.push({ label:Em.I18n.t('menu.item.mirroring'), routing:'mirroring'}); } + if (!App.get('isHadoop2Stack')) { + result.push({ label:Em.I18n.t('menu.item.jobs'), routing:'apps'}); + } + if (App.get('isAdmin')) { result.push({ label:Em.I18n.t('menu.item.admin'), routing:'admin'}); }
