Repository: ambari Updated Branches: refs/heads/trunk 063da67cc -> cc022804f
AMBARI-6756. Rename Flume component name from 'Flume Agent' to 'Flume' (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cc022804 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cc022804 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cc022804 Branch: refs/heads/trunk Commit: cc022804f1644aa9403e2a32e720ce4d0399df39 Parents: 063da67 Author: Alex Antonenko <hiv...@gmail.com> Authored: Wed Aug 6 19:08:03 2014 +0300 Committer: Alex Antonenko <hiv...@gmail.com> Committed: Wed Aug 6 19:08:03 2014 +0300 ---------------------------------------------------------------------- .../configurations/cluster_level_configs.json | 2 +- ambari-web/app/messages.js | 20 ++++++++++---------- ambari-web/app/utils/helper.js | 2 +- .../test/models/stack_service_component_test.js | 2 +- ambari-web/test/utils/helper_test.js | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/cc022804/ambari-web/app/assets/data/configurations/cluster_level_configs.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/configurations/cluster_level_configs.json b/ambari-web/app/assets/data/configurations/cluster_level_configs.json index 55fa834..ed5af8b 100644 --- a/ambari-web/app/assets/data/configurations/cluster_level_configs.json +++ b/ambari-web/app/assets/data/configurations/cluster_level_configs.json @@ -694,7 +694,7 @@ "cluster_name" : "c1" }, "properties" : { - "content" : "# Flume agents configuration" + "content" : "# Flume configuration" } } ] http://git-wip-us.apache.org/repos/asf/ambari/blob/cc022804/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 68e9d51..50f418a 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1191,11 +1191,11 @@ Em.I18n.translations = { 'services.service.summary.storm.tasks': 'Tasks', 'services.service.summary.storm.nimbus.uptime': 'Nimbus uptime', 'services.service.summary.storm.topologies': 'Topologies', - 'services.service.summary.flume.startAgent': 'Start Agent', - 'services.service.summary.flume.stopAgent': 'Stop Agent', - 'services.service.summary.flume.stop.context': 'Stop Flume Agent {0}', - 'services.service.summary.flume.start.context': 'Start Flume Agent {0}', - 'services.service.summary.flume.noAgents': 'No Flume Agents to display', + 'services.service.summary.flume.startAgent': 'Start Flume', + 'services.service.summary.flume.stopAgent': 'Stop Flume', + 'services.service.summary.flume.stop.context': 'Stop Flume {0}', + 'services.service.summary.flume.start.context': 'Start Flume {0}', + 'services.service.summary.flume.noAgents': 'No Flume to display', 'services.service.info.metrics.flume.channelFillPercent':'Channel Fill Percentage', 'services.service.info.metrics.flume.channelSize':'Channel Size', @@ -1805,7 +1805,7 @@ Em.I18n.translations = { 'dashboard.widgets.DataNodeUp': 'DataNodes Live', 'dashboard.widgets.TaskTrackerUp': 'TaskTrackers Live', 'dashboard.widgets.SuperVisorUp': 'Supervisors Live', - 'dashboard.widgets.FlumeAgentUp': 'Flume Agents Live', + 'dashboard.widgets.FlumeAgentUp': 'Flume Live', 'dashboard.widgets.NameNodeRpc': 'NameNode RPC', 'dashboard.widgets.JobTrackerRpc': 'JobTracker RPC', 'dashboard.widgets.MapReduceSlots': 'MapReduce Slots', @@ -1912,15 +1912,15 @@ Em.I18n.translations = { 'dashboard.services.mapreduce.jobTrackerUptime':'Job Trackers Uptime', 'dashboard.services.mapreduce.chart.label':'Jobs Running', - 'dashboard.services.flume.summary.single':'1 Flume Agent on ', - 'dashboard.services.flume.summary.multiple':'{0} Flume Agents on ', + 'dashboard.services.flume.summary.single':'1 Flume on ', + 'dashboard.services.flume.summary.multiple':'{0} Flume on ', 'dashboard.services.flume.summary.hosts.single':'1 host', 'dashboard.services.flume.summary.hosts.multiple':'{0} hosts', - 'dashboard.services.flume.agentsLabel': 'Flume Agents', + 'dashboard.services.flume.agentsLabel': 'Flume', 'dashboard.services.flume.channels': 'Channels', 'dashboard.services.flume.sources': 'Sources', 'dashboard.services.flume.sinks': 'Sinks', - 'dashboard.services.flume.agent': 'Agent', + 'dashboard.services.flume.agent': '', 'dashboard.services.hbase.summary':'{0} region servers with {1} average load', http://git-wip-us.apache.org/repos/asf/ambari/blob/cc022804/ambari-web/app/utils/helper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js index 61d6e03..a86a42d 100644 --- a/ambari-web/app/utils/helper.js +++ b/ambari-web/app/utils/helper.js @@ -321,7 +321,7 @@ App.format = { 'API': 'API', 'DECOMMISSION_DATANODE': 'Update Exclude File', 'DRPC': 'DRPC', - 'FLUME_HANDLER': 'Flume Agent', + 'FLUME_HANDLER': 'Flume', 'GLUSTERFS': 'GLUSTERFS', 'HBASE': 'HBase', 'HBASE_REGIONSERVER': 'RegionServer', http://git-wip-us.apache.org/repos/asf/ambari/blob/cc022804/ambari-web/test/models/stack_service_component_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/models/stack_service_component_test.js b/ambari-web/test/models/stack_service_component_test.js index b92fcd1..3f0914e 100644 --- a/ambari-web/test/models/stack_service_component_test.js +++ b/ambari-web/test/models/stack_service_component_test.js @@ -178,7 +178,7 @@ var componentPropertiesValidationTests = [ { componentName: 'FLUME_HANDLER', expected: { - displayName: 'Flume Agent', + displayName: 'Flume', minToInstall: 0, maxToInstall: Infinity, isRequired: false, http://git-wip-us.apache.org/repos/asf/ambari/blob/cc022804/ambari-web/test/utils/helper_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/utils/helper_test.js b/ambari-web/test/utils/helper_test.js index 9efb06b..4d2c3b2 100644 --- a/ambari-web/test/utils/helper_test.js +++ b/ambari-web/test/utils/helper_test.js @@ -215,7 +215,7 @@ describe('utils/helper', function() { 'FALCON_CLIENT': 'Falcon Client', 'FALCON_SERVER': 'Falcon Server', 'FALCON_SERVICE_CHECK': 'Falcon Service Check', - 'FLUME_HANDLER': 'Flume Agent', + 'FLUME_HANDLER': 'Flume', 'FLUME_SERVICE_CHECK': 'Flume Service Check', 'GANGLIA_MONITOR': 'Ganglia Monitor', 'GANGLIA_SERVER': 'Ganglia Server',
