Repository: ambari Updated Branches: refs/heads/branch-1.7.0 27e85f624 -> 626bf2a19
AMBARI-8057. Flume: Clicking on host in Flume agent table does not show agent graph sections (srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/626bf2a1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/626bf2a1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/626bf2a1 Branch: refs/heads/branch-1.7.0 Commit: 626bf2a19738783b0ab67c6fd78291d5f7ca8793 Parents: 27e85f6 Author: Srimanth Gunturi <[email protected]> Authored: Thu Oct 30 18:45:06 2014 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Thu Oct 30 18:45:06 2014 -0700 ---------------------------------------------------------------------- .../HDP/2.0.6/services/FLUME/configuration/flume-conf.xml | 4 +++- ambari-web/app/templates/main/service/services/flume.hbs | 2 +- ambari-web/app/utils/config.js | 6 ++++++ ambari-web/app/views/main/service/services/flume.js | 10 +++++++--- 4 files changed, 17 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/626bf2a1/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-conf.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-conf.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-conf.xml index 74a4c15..8ff764b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-conf.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-conf.xml @@ -23,7 +23,9 @@ <configuration supports_final="false"> <property> <name>content</name> - <description>Describe all the Flume agent configurations</description> + <description>Flume agent configurations. + Specifying the configuration here applies to all hosts in this configuration-group. Please use host specific configuration-groups to provide different configurations on different hosts. + For configuring multiple agents on the same host, provide the combined agent configurations here. Each agent should have a different name.</description> <value> # Flume agent config </value> http://git-wip-us.apache.org/repos/asf/ambari/blob/626bf2a1/ambari-web/app/templates/main/service/services/flume.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/services/flume.hbs b/ambari-web/app/templates/main/service/services/flume.hbs index 5bdf242..7d6a386 100644 --- a/ambari-web/app/templates/main/service/services/flume.hbs +++ b/ambari-web/app/templates/main/service/services/flume.hbs @@ -36,7 +36,7 @@ <tbody class="flume-agent-table-tbody"> {{#view view.agentView contentBinding="host"}} <td {{bindAttr rowspan="host.rowspan"}} id="flume-host-agent-row" class="agent-host-name"> - <a href="javascript:void(null)" {{action showDetails host.agents}}> + <a class="agent-host-link" href="javascript:void(null)" {{action click host target="view"}}> {{host.hostName}} </a> </td> http://git-wip-us.apache.org/repos/asf/ambari/blob/626bf2a1/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index 75eda91..ecaa9ae 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -262,6 +262,12 @@ App.config = Em.Object.create({ config.category = categoryMetaData.get('name'); if (!isAdvanced) config.isUserProperty = true; } + if (isAdvanced) { + var advancedProperty = advancedConfigs.filterProperty('filename', config.filename).findProperty('name', config.name); + if (advancedProperty) { + config.description = advancedProperty.description; + } + } } else { var advancedProperty = null; var configType = this.getConfigTagFromFileName(config.filename); http://git-wip-us.apache.org/repos/asf/ambari/blob/626bf2a1/ambari-web/app/views/main/service/services/flume.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/service/services/flume.js b/ambari-web/app/views/main/service/services/flume.js index b2d29d3..4be5018 100644 --- a/ambari-web/app/views/main/service/services/flume.js +++ b/ambari-web/app/views/main/service/services/flume.js @@ -70,9 +70,13 @@ App.MainDashboardServiceFlumeView = App.TableView.extend({ click: function (e) { var numberOfAgents = this.get('content.agents').length; - if($(e.target).attr('id') == "flume-host-agent-row"){ - $(e.currentTarget).parents("table:first").find('tr').removeClass('highlight'); - $(e.currentTarget).addClass('highlight').nextAll("tr").slice(0,numberOfAgents - 1).addClass('highlight'); + if($(e.target).attr('class') == "agent-host-name" || $(e.target).attr('class') == "agent-host-link"){ + var currentTargetRow = $(e.currentTarget); + if ($(e.target).attr('class') == "agent-host-link") { + currentTargetRow = currentTargetRow.parent(".agent-host-name").parent(); + } + currentTargetRow.parents("table:first").find('tr').removeClass('highlight'); + currentTargetRow.addClass('highlight').nextAll("tr").slice(0,numberOfAgents - 1).addClass('highlight'); this.get('parentView').showAgentInfo(this.get('content')); } }
