AMBARI-1028. MapReduce & HDFS summaries should use ServiceComponentInfo values. (Srimanth Gunturi via yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/AMBARI-666@1418964 13f79535-47bb-0310-9956-ffa450edef68

AMBARI-666-CHANGES.txt

@@ -484,6 +484,9 @@ AMBARI-666 branch (unreleased changes)
   OPTIMIZATIONS
 
   BUG FIXES
+ 
+  AMBARI-1028. MapReduce & HDFS summaries should use ServiceComponentInfo
+  values. (Srimanth Gunturi via yusaku)
 
   AMBARI-1017. Alerts not showing up in Ambari UI due to model refactoring.
   (Srimanth Gunturi via yusaku)

ambari-web/app/mappers/services_mapper.js

@@ -66,11 +66,11 @@ App.servicesMapper = App.QuickDataMapper.create({
     decommision_data_nodes:'decommission_data_nodes',
     capacity_used:'nameNodeComponent.ServiceComponentInfo.CapacityUsed',
     capacity_total:'nameNodeComponent.ServiceComponentInfo.CapacityTotal',
-    dfs_total_blocks:'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.BlocksTotal',
-    dfs_corrupt_blocks:'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.CorruptBlocks',
-    dfs_missing_blocks:'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.MissingBlocks',
-    dfs_under_replicated_blocks:'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.UnderReplicatedBlocks',
-    dfs_total_files:'nameNodeComponent.host_components[0].metrics.dfs.FSNamesystem.FilesTotal',
+    dfs_total_blocks:'nameNodeComponent.ServiceComponentInfo.BlocksTotal',
+    dfs_corrupt_blocks:'nameNodeComponent.ServiceComponentInfo.CorruptBlocks',
+    dfs_missing_blocks:'nameNodeComponent.ServiceComponentInfo.MissingBlocks',
+    dfs_under_replicated_blocks:'nameNodeComponent.ServiceComponentInfo.UnderReplicatedBlocks',
+    dfs_total_files:'nameNodeComponent.ServiceComponentInfo.TotalFiles',
     upgrade_status:'nameNodeComponent.ServiceComponentInfo.UpgradeFinalized',
     safe_mode_status:'nameNodeComponent.ServiceComponentInfo.Safemode'
   },
@@ -87,16 +87,16 @@ App.servicesMapper = App.QuickDataMapper.create({
     gray_list_trackers:'gray_list_trackers',
     map_slots:'map_slots',
     reduce_slots:'reduce_slots',
-    jobs_submitted:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.jobs_submitted',
-    jobs_completed:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.jobs_completed',
-    map_slots_occupied:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.occupied_map_slots',
-    map_slots_reserved:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.reserved_map_slots',
-    reduce_slots_occupied:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.occupied_reduce_slots',
-    reduce_slots_reserved:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.reserved_reduce_slots',
-    maps_running:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.running_maps',
-    maps_waiting:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.waiting_maps',
-    reduces_running:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.running_reduces',
-    reduces_waiting:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.waiting_reduces',
+    jobs_submitted:'jobTrackerComponent.ServiceComponentInfo.jobtracker.jobs_submitted',
+    jobs_completed:'jobTrackerComponent.ServiceComponentInfo.jobtracker.jobs_completed',
+    map_slots_occupied:'jobTrackerComponent.ServiceComponentInfo.jobtracker.occupied_map_slots',
+    map_slots_reserved:'jobTrackerComponent.ServiceComponentInfo.jobtracker.reserved_map_slots',
+    reduce_slots_occupied:'jobTrackerComponent.ServiceComponentInfo.jobtracker.occupied_reduce_slots',
+    reduce_slots_reserved:'jobTrackerComponent.ServiceComponentInfo.jobtracker.reserved_reduce_slots',
+    maps_running:'jobTrackerComponent.ServiceComponentInfo.jobtracker.running_maps',
+    maps_waiting:'jobTrackerComponent.ServiceComponentInfo.jobtracker.waiting_maps',
+    reduces_running:'jobTrackerComponent.ServiceComponentInfo.jobtracker.running_reduces',
+    reduces_waiting:'jobTrackerComponent.ServiceComponentInfo.jobtracker.waiting_reduces',
     trackers_decommisioned:'jobTrackerComponent.host_components[0].metrics.mapred.jobtracker.trackers_decommissioned'
   },