Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 054c35c39 -> 2c941026f


AMBARI-15224. On Trunk, UI has missing names for components which have alert 
information associated with them (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2c941026
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2c941026
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2c941026

Branch: refs/heads/branch-2.2
Commit: 2c941026fb1e8420c14b35d094c13ea11bab405d
Parents: 054c35c
Author: Alex Antonenko <hiv...@gmail.com>
Authored: Mon Feb 29 16:45:48 2016 +0200
Committer: Alex Antonenko <hiv...@gmail.com>
Committed: Wed Mar 9 17:43:57 2016 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/global/update_controller.js | 1 +
 ambari-web/app/mappers/service_metrics_mapper.js       | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2c941026/ambari-web/app/controllers/global/update_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/update_controller.js 
b/ambari-web/app/controllers/global/update_controller.js
index e4ff3e7..e192512 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -445,6 +445,7 @@ App.UpdateController = Em.Controller.extend({
       realUrl = '/components/?' + flumeHandlerParam + atsHandlerParam + 
haComponents +
         'ServiceComponentInfo/category=MASTER&fields=' +
         'ServiceComponentInfo/service_name,' +
+        'host_components/HostRoles/display_name,' +
         'host_components/HostRoles/host_name,' +
         'host_components/HostRoles/state,' +
         'host_components/HostRoles/maintenance_state,' +

http://git-wip-us.apache.org/repos/asf/ambari/blob/2c941026/ambari-web/app/mappers/service_metrics_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js 
b/ambari-web/app/mappers/service_metrics_mapper.js
index 9dbd26d..cd341b2 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -150,6 +150,7 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
   config3: {
     work_status: 'HostRoles.state',
     passive_state: 'HostRoles.maintenance_state',
+    display_name: 'HostRoles.display_name',
     component_name: 'HostRoles.component_name',
     host_id: 'HostRoles.host_name',
     host_name: 'HostRoles.host_name',

Reply via email to