Repository: ambari Updated Branches: refs/heads/branch-2.2 b6e5bc0da -> f7594bdc0
AMBARI-15357: Rename Service Action 'HAWQ Check' to 'HAWQ Config Check' (gowtam tadi via bhuvnesh2703) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f7594bdc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f7594bdc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f7594bdc Branch: refs/heads/branch-2.2 Commit: f7594bdc097c8d6d55736a73f177f9f37770b83b Parents: b6e5bc0 Author: Bhuvnesh Chaudhary <[email protected]> Authored: Mon Mar 14 12:22:06 2016 -0700 Committer: Bhuvnesh Chaudhary <[email protected]> Committed: Mon Mar 14 12:22:06 2016 -0700 ---------------------------------------------------------------------- ambari-web/app/messages.js | 14 ++++++++------ .../app/views/main/host/hosts_table_menu_view.js | 10 ++++++++++ 2 files changed, 18 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f7594bdc/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index eaf924f..14f751e 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1683,10 +1683,10 @@ Em.I18n.translations = { 'services.service.actions.run.immediateStopHawqService.label':'Stop HAWQ Service (Immediate Mode)', 'services.service.actions.run.immediateStopHawqSegment.label':'Stop (Immediate Mode)', 'services.service.actions.run.immediateStopHawqSegment.context':'Stop HAWQ Segment (Immediate Mode)', - 'services.service.actions.run.resyncHawqStandby.context':'Re-Sync HAWQ Standby', - 'services.service.actions.run.resyncHawqStandby.label':'Re-Synchronize HAWQ Standby', + 'services.service.actions.run.resyncHawqStandby.context':'Re-Sync HAWQ Standby Master', + 'services.service.actions.run.resyncHawqStandby.label':'Re-Synchronize HAWQ Standby Master', 'services.service.actions.run.clearHawqCache.label':'Clear HAWQ\'s HDFS Metadata Cache', - 'services.service.actions.run.runHawqCheck.label':'Run HAWQ Check', + 'services.service.actions.run.runHawqCheck.label':'Run HAWQ Config Check', 'services.service.actions.manage_configuration_groups.short':'Manage Config Groups', 'services.service.actions.serviceActions':'Service Actions', 'services.service.summary.unknown':'unknown', @@ -2575,6 +2575,8 @@ Em.I18n.translations = { 'dashboard.services.yarn.memory.msg': '{0} used / {1} reserved / {2} available', 'dashboard.services.yarn.queues': 'Queues', 'dashboard.services.yarn.queues.msg': '{0} Queues', + 'dashboard.services.hawq.hawqSegments':'HAWQ Segments', + 'dashboard.services.pxf.pxfHosts':'PXF Hosts', 'dashboard.services.flume.summary.title':'Flume installed on {0} host{1} ({2} agent{3})', 'dashboard.services.flume.summary.configure':'Configure Agents', @@ -2878,7 +2880,7 @@ Em.I18n.translations = { 'admin.addHawqStandby.wizard.step4.task3.title': 'Start HAWQ Service', 'admin.addHawqStandby.wizard.step4.notice.inProgress':'Please wait while HAWQ Standby Master is being deployed.', 'admin.addHawqStandby.wizard.step4.notice.completed':'HAWQ Standby Master has been added successfully.', - 'admin.removeHawqStandby.button.enable': 'Remove HAWQ Standby', + 'admin.removeHawqStandby.button.enable': 'Remove HAWQ Standby Master', 'admin.removeHawqStandby.wizard.header': 'Remove HAWQ Standby Wizard', 'admin.removeHawqStandby.wizard.step1.header': 'Get Started', 'admin.removeHawqStandby.wizard.step1.body':'This wizard walks you through the process of removing the HAWQ Standby Master ' + @@ -2895,7 +2897,7 @@ Em.I18n.translations = { 'admin.removeHawqStandby.wizard.step2.confirm.host.body':'<b>Review HAWQ Standby Master role changes.</b>', 'admin.removeHawqStandby.wizard.step2.confirmPopup.body': 'Do you wish to continue with removing HAWQ Standby Master? Please confirm, before proceeding as you will not be able to rollback from Ambari.', 'admin.removeHawqStandby.wizard.step3.header': 'Finalize Setup', - 'admin.removeHawqStandby.wizard.step3.task0.title': 'Remove HAWQ Standby', + 'admin.removeHawqStandby.wizard.step3.task0.title': 'Remove HAWQ Standby Master', 'admin.removeHawqStandby.wizard.step3.task1.title': 'Stop HAWQ Service', 'admin.removeHawqStandby.wizard.step3.task2.title': 'Reconfigure HAWQ', 'admin.removeHawqStandby.wizard.step3.task3.title': 'Delete Role: HAWQ Standby', @@ -2903,7 +2905,7 @@ Em.I18n.translations = { 'admin.removeHawqStandby.closePopup':'Remove HAWQ Standby Wizard is in progress. You must allow the wizard to' + ' complete for Ambari to be in usable state. If you choose to quit, you must follow manual instructions to' + ' get back to a stable state. Are you sure you want to exit the wizard?', - 'admin.removeHawqStandby.wizard.step3.notice.inProgress':'Please wait while HAWQ Standby is being removed', + 'admin.removeHawqStandby.wizard.step3.notice.inProgress':'Please wait while HAWQ Standby Master is being removed', 'admin.removeHawqStandby.wizard.step3.notice.completed':'HAWQ Standby has been removed successfully.', 'admin.removeHawqStandby.wizard.step3.removeHawqStandbyCommand.context': 'Execute HAWQ Standby remove command', 'admin.removeHawqStandby.wizard.step3.save.configuration.note': 'This configuration was created by Remove HAWQ Standby wizard', http://git-wip-us.apache.org/repos/asf/ambari/blob/f7594bdc/ambari-web/app/views/main/host/hosts_table_menu_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/host/hosts_table_menu_view.js b/ambari-web/app/views/main/host/hosts_table_menu_view.js index d4962e4..53638d4 100644 --- a/ambari-web/app/views/main/host/hosts_table_menu_view.js +++ b/ambari-web/app/views/main/host/hosts_table_menu_view.js @@ -45,6 +45,16 @@ App.HostTableMenuView = Em.View.extend({ componentNameFormatted: Em.I18n.t('dashboard.services.yarn.nodeManagers') }), Em.Object.create({ + serviceName: 'HAWQ', + componentName: 'HAWQSEGMENT', + componentNameFormatted: Em.I18n.t('dashboard.services.hawq.hawqSegments') + }), + Em.Object.create({ + serviceName: 'PXF', + componentName: 'PXF', + componentNameFormatted: Em.I18n.t('dashboard.services.pxf.pxfHosts') + }), + Em.Object.create({ serviceName: 'HBASE', componentName: 'HBASE_REGIONSERVER', masterComponentName: 'HBASE_MASTER',
