This is an automated email from the ASF dual-hosted git repository.

avijayan pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new d7dba90  [AMBARI-24494] Ambari API does not return AssignmentManager 
HBase point in time metrics through API. (#2104)
d7dba90 is described below

commit d7dba90c34af4d8ba0579d86e6b65e9b43acdd2d
Author: avijayanhwx <[email protected]>
AuthorDate: Fri Aug 17 07:00:17 2018 -0700

    [AMBARI-24494] Ambari API does not return AssignmentManager HBase point in 
time metrics through API. (#2104)
---
 .../conf/unix/amshbase_metrics_whitelist           |   6 +-
 .../conf/unix/metrics_whitelist                    |   6 +-
 .../conf/windows/amshbase_metrics_whitelist        |   6 +-
 .../conf/windows/metrics_whitelist                 |   6 +-
 .../src/main/resources/metrics_def/AMS-HBASE.dat   |  38 ++---
 .../main/resources/metrics_def/HBASE_MASTER.dat    |  54 +++----
 .../test/resources/test_data/full_whitelist.dat    | 114 +++++++--------
 .../test/resources/ui_metrics_def/AMS-HBASE.dat    |   2 +-
 .../src/test/resources/ui_metrics_def/HBASE.dat    |   2 +-
 .../src/test/resources/ui_metrics_def/NAMENODE.dat |   2 +-
 .../src/test/resources/ui_metrics_def/NIMBUS.dat   |   2 +-
 .../AMBARI_METRICS/0.1.0/metrics.json              | 152 ++++++++++----------
 .../grafana-dashboards/HDP/grafana-hbase-misc.json |   6 +-
 .../default/grafana-ams-hbase-misc.json            |   6 +-
 .../files/service-metrics/AMBARI_METRICS.txt       |  38 ++---
 .../0.1.0/package/files/service-metrics/HBASE.txt  |  76 +++++-----
 .../common-services/HBASE/0.96.0.2.0/metrics.json  | 160 ++++++++++-----------
 .../stacks/HDP/2.3/services/HBASE/metrics.json     | 160 ++++++++++-----------
 .../PERF/1.0/services/FAKEHBASE/metrics.json       | 160 ++++++++++-----------
 .../test/resources/hbase_hbasemaster_jmx_2.json    |   4 +-
 .../app/controllers/global/update_controller.js    |   2 +-
 ambari-web/app/mappers/service_metrics_mapper.js   |   4 +-
 .../controllers/global/update_controller_test.js   |   2 +-
 ambari-web/test/mappers/service_mapper_test.js     |   8 +-
 24 files changed, 508 insertions(+), 508 deletions(-)

diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/amshbase_metrics_whitelist
 
b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/amshbase_metrics_whitelist
index 6cf4319..01072e9 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/amshbase_metrics_whitelist
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/amshbase_metrics_whitelist
@@ -22,9 +22,9 @@ jvm.RegionServer.JvmMetrics.ThreadsRunnable
 jvm.RegionServer.JvmMetrics.ThreadsTerminated
 jvm.RegionServer.JvmMetrics.ThreadsTimedWaiting
 jvm.RegionServer.JvmMetrics.ThreadsWaiting
-master.AssignmentManger.ritCount
-master.AssignmentManger.ritCountOverThreshold
-master.AssignmentManger.ritOldestAge
+master.AssignmentManager.ritCount
+master.AssignmentManager.ritCountOverThreshold
+master.AssignmentManager.ritOldestAge
 master.Master.TotalCallTime_num_ops
 master.Master.exceptions
 master.Server.averageLoad
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/metrics_whitelist 
b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/metrics_whitelist
index 2edac39..fd03d6e 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/metrics_whitelist
+++ b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/metrics_whitelist
@@ -305,9 +305,9 @@ kafka.server.ReplicaManager.UnderReplicatedPartitions
 load_fifteen
 load_five
 load_one
-master.AssignmentManger.ritCount
-master.AssignmentManger.ritCountOverThreshold
-master.AssignmentManger.ritOldestAge
+master.AssignmentManager.ritCount
+master.AssignmentManager.ritCountOverThreshold
+master.AssignmentManager.ritOldestAge
 master.Master.QueueCallTime_median
 master.Master.TotalCallTime_num_ops
 master.Master.exceptions
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/conf/windows/amshbase_metrics_whitelist
 
b/ambari-metrics/ambari-metrics-timelineservice/conf/windows/amshbase_metrics_whitelist
index 6cf4319..01072e9 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/conf/windows/amshbase_metrics_whitelist
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/conf/windows/amshbase_metrics_whitelist
@@ -22,9 +22,9 @@ jvm.RegionServer.JvmMetrics.ThreadsRunnable
 jvm.RegionServer.JvmMetrics.ThreadsTerminated
 jvm.RegionServer.JvmMetrics.ThreadsTimedWaiting
 jvm.RegionServer.JvmMetrics.ThreadsWaiting
-master.AssignmentManger.ritCount
-master.AssignmentManger.ritCountOverThreshold
-master.AssignmentManger.ritOldestAge
+master.AssignmentManager.ritCount
+master.AssignmentManager.ritCountOverThreshold
+master.AssignmentManager.ritOldestAge
 master.Master.TotalCallTime_num_ops
 master.Master.exceptions
 master.Server.averageLoad
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/conf/windows/metrics_whitelist 
b/ambari-metrics/ambari-metrics-timelineservice/conf/windows/metrics_whitelist
index 2edac39..fd03d6e 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/conf/windows/metrics_whitelist
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/conf/windows/metrics_whitelist
@@ -305,9 +305,9 @@ kafka.server.ReplicaManager.UnderReplicatedPartitions
 load_fifteen
 load_five
 load_one
-master.AssignmentManger.ritCount
-master.AssignmentManger.ritCountOverThreshold
-master.AssignmentManger.ritOldestAge
+master.AssignmentManager.ritCount
+master.AssignmentManager.ritCountOverThreshold
+master.AssignmentManager.ritOldestAge
 master.Master.QueueCallTime_median
 master.Master.TotalCallTime_num_ops
 master.Master.exceptions
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/AMS-HBASE.dat
 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/AMS-HBASE.dat
index de4068b..172d15b 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/AMS-HBASE.dat
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/AMS-HBASE.dat
@@ -28,26 +28,26 @@ jvm.JvmMetrics.ThreadsNew
 jvm.JvmMetrics.ThreadsRunnable
 jvm.JvmMetrics.ThreadsTerminated
 jvm.JvmMetrics.ThreadsTimedWaiting
-master.AssignmentManger.Assign_75th_percentile
-master.AssignmentManger.Assign_95th_percentile
-master.AssignmentManger.Assign_99th_percentile
-master.AssignmentManger.Assign_max
-master.AssignmentManger.Assign_mean
-master.AssignmentManger.Assign_median
-master.AssignmentManger.Assign_min
+master.AssignmentManager.Assign_75th_percentile
+master.AssignmentManager.Assign_95th_percentile
+master.AssignmentManager.Assign_99th_percentile
+master.AssignmentManager.Assign_max
+master.AssignmentManager.Assign_mean
+master.AssignmentManager.Assign_median
+master.AssignmentManager.Assign_min
 jvm.JvmMetrics.ThreadsWaiting
-master.AssignmentManger.Assign_num_ops
-master.AssignmentManger.BulkAssign_75th_percentile
-master.AssignmentManger.BulkAssign_95th_percentile
-master.AssignmentManger.BulkAssign_99th_percentile
-master.AssignmentManger.BulkAssign_max
-master.AssignmentManger.BulkAssign_mean
-master.AssignmentManger.BulkAssign_median
-master.AssignmentManger.BulkAssign_min
-master.AssignmentManger.BulkAssign_num_ops
-master.AssignmentManger.ritCount
-master.AssignmentManger.ritCountOverThreshold
-master.AssignmentManger.ritOldestAge
+master.AssignmentManager.Assign_num_ops
+master.AssignmentManager.BulkAssign_75th_percentile
+master.AssignmentManager.BulkAssign_95th_percentile
+master.AssignmentManager.BulkAssign_99th_percentile
+master.AssignmentManager.BulkAssign_max
+master.AssignmentManager.BulkAssign_mean
+master.AssignmentManager.BulkAssign_median
+master.AssignmentManager.BulkAssign_min
+master.AssignmentManager.BulkAssign_num_ops
+master.AssignmentManager.ritCount
+master.AssignmentManager.ritCountOverThreshold
+master.AssignmentManager.ritOldestAge
 master.Balancer.BalancerCluster_75th_percentile
 master.Balancer.BalancerCluster_95th_percentile
 master.Balancer.BalancerCluster_99th_percentile
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/HBASE_MASTER.dat
 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/HBASE_MASTER.dat
index bce85f2..c419164 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/HBASE_MASTER.dat
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/HBASE_MASTER.dat
@@ -48,33 +48,33 @@ jvm.Master.JvmMetrics.ThreadsRunnable
 jvm.Master.JvmMetrics.ThreadsTerminated
 jvm.Master.JvmMetrics.ThreadsTimedWaiting
 jvm.Master.JvmMetrics.ThreadsWaiting
-master.AssignmentManger.Assign_25th_percentile
-master.AssignmentManger.Assign_75th_percentile
-master.AssignmentManger.Assign_90th_percentile
-master.AssignmentManger.Assign_95th_percentile
-master.AssignmentManger.Assign_98th_percentile
-master.AssignmentManger.Assign_99.9th_percentile
-master.AssignmentManger.Assign_99th_percentile
-master.AssignmentManger.Assign_max
-master.AssignmentManger.Assign_mean
-master.AssignmentManger.Assign_median
-master.AssignmentManger.Assign_min
-master.AssignmentManger.Assign_num_ops
-master.AssignmentManger.BulkAssign_25th_percentile
-master.AssignmentManger.BulkAssign_75th_percentile
-master.AssignmentManger.BulkAssign_90th_percentile
-master.AssignmentManger.BulkAssign_95th_percentile
-master.AssignmentManger.BulkAssign_98th_percentile
-master.AssignmentManger.BulkAssign_99.9th_percentile
-master.AssignmentManger.BulkAssign_99th_percentile
-master.AssignmentManger.BulkAssign_max
-master.AssignmentManger.BulkAssign_mean
-master.AssignmentManger.BulkAssign_median
-master.AssignmentManger.BulkAssign_min
-master.AssignmentManger.BulkAssign_num_ops
-master.AssignmentManger.ritCount
-master.AssignmentManger.ritCountOverThreshold
-master.AssignmentManger.ritOldestAge
+master.AssignmentManager.Assign_25th_percentile
+master.AssignmentManager.Assign_75th_percentile
+master.AssignmentManager.Assign_90th_percentile
+master.AssignmentManager.Assign_95th_percentile
+master.AssignmentManager.Assign_98th_percentile
+master.AssignmentManager.Assign_99.9th_percentile
+master.AssignmentManager.Assign_99th_percentile
+master.AssignmentManager.Assign_max
+master.AssignmentManager.Assign_mean
+master.AssignmentManager.Assign_median
+master.AssignmentManager.Assign_min
+master.AssignmentManager.Assign_num_ops
+master.AssignmentManager.BulkAssign_25th_percentile
+master.AssignmentManager.BulkAssign_75th_percentile
+master.AssignmentManager.BulkAssign_90th_percentile
+master.AssignmentManager.BulkAssign_95th_percentile
+master.AssignmentManager.BulkAssign_98th_percentile
+master.AssignmentManager.BulkAssign_99.9th_percentile
+master.AssignmentManager.BulkAssign_99th_percentile
+master.AssignmentManager.BulkAssign_max
+master.AssignmentManager.BulkAssign_mean
+master.AssignmentManager.BulkAssign_median
+master.AssignmentManager.BulkAssign_min
+master.AssignmentManager.BulkAssign_num_ops
+master.AssignmentManager.ritCount
+master.AssignmentManager.ritCountOverThreshold
+master.AssignmentManager.ritOldestAge
 master.Balancer.BalancerCluster_25th_percentile
 master.Balancer.BalancerCluster_75th_percentile
 master.Balancer.BalancerCluster_90th_percentile
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/test_data/full_whitelist.dat
 
b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/test_data/full_whitelist.dat
index 0e22ffb..0e36c7b 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/test_data/full_whitelist.dat
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/test_data/full_whitelist.dat
@@ -84,26 +84,26 @@ jvm.JvmMetrics.ThreadsNew
 jvm.JvmMetrics.ThreadsRunnable
 jvm.JvmMetrics.ThreadsTerminated
 jvm.JvmMetrics.ThreadsTimedWaiting
-master.AssignmentManger.Assign_75th_percentile
-master.AssignmentManger.Assign_95th_percentile
-master.AssignmentManger.Assign_99th_percentile
-master.AssignmentManger.Assign_max
-master.AssignmentManger.Assign_mean
-master.AssignmentManger.Assign_median
-master.AssignmentManger.Assign_min
+master.AssignmentManager.Assign_75th_percentile
+master.AssignmentManager.Assign_95th_percentile
+master.AssignmentManager.Assign_99th_percentile
+master.AssignmentManager.Assign_max
+master.AssignmentManager.Assign_mean
+master.AssignmentManager.Assign_median
+master.AssignmentManager.Assign_min
 jvm.JvmMetrics.ThreadsWaiting
-master.AssignmentManger.Assign_num_ops
-master.AssignmentManger.BulkAssign_75th_percentile
-master.AssignmentManger.BulkAssign_95th_percentile
-master.AssignmentManger.BulkAssign_99th_percentile
-master.AssignmentManger.BulkAssign_max
-master.AssignmentManger.BulkAssign_mean
-master.AssignmentManger.BulkAssign_median
-master.AssignmentManger.BulkAssign_min
-master.AssignmentManger.BulkAssign_num_ops
-master.AssignmentManger.ritCount
-master.AssignmentManger.ritCountOverThreshold
-master.AssignmentManger.ritOldestAge
+master.AssignmentManager.Assign_num_ops
+master.AssignmentManager.BulkAssign_75th_percentile
+master.AssignmentManager.BulkAssign_95th_percentile
+master.AssignmentManager.BulkAssign_99th_percentile
+master.AssignmentManager.BulkAssign_max
+master.AssignmentManager.BulkAssign_mean
+master.AssignmentManager.BulkAssign_median
+master.AssignmentManager.BulkAssign_min
+master.AssignmentManager.BulkAssign_num_ops
+master.AssignmentManager.ritCount
+master.AssignmentManager.ritCountOverThreshold
+master.AssignmentManager.ritOldestAge
 master.Balancer.BalancerCluster_75th_percentile
 master.Balancer.BalancerCluster_95th_percentile
 master.Balancer.BalancerCluster_99th_percentile
@@ -346,26 +346,26 @@ jvm.JvmMetrics.ThreadsNew
 jvm.JvmMetrics.ThreadsRunnable
 jvm.JvmMetrics.ThreadsTerminated
 jvm.JvmMetrics.ThreadsTimedWaiting
-master.AssignmentManger.Assign_75th_percentile
-master.AssignmentManger.Assign_95th_percentile
-master.AssignmentManger.Assign_99th_percentile
-master.AssignmentManger.Assign_max
-master.AssignmentManger.Assign_mean
-master.AssignmentManger.Assign_median
-master.AssignmentManger.Assign_min
+master.AssignmentManager.Assign_75th_percentile
+master.AssignmentManager.Assign_95th_percentile
+master.AssignmentManager.Assign_99th_percentile
+master.AssignmentManager.Assign_max
+master.AssignmentManager.Assign_mean
+master.AssignmentManager.Assign_median
+master.AssignmentManager.Assign_min
 jvm.JvmMetrics.ThreadsWaiting
-master.AssignmentManger.Assign_num_ops
-master.AssignmentManger.BulkAssign_75th_percentile
-master.AssignmentManger.BulkAssign_95th_percentile
-master.AssignmentManger.BulkAssign_99th_percentile
-master.AssignmentManger.BulkAssign_max
-master.AssignmentManger.BulkAssign_mean
-master.AssignmentManger.BulkAssign_median
-master.AssignmentManger.BulkAssign_min
-master.AssignmentManger.BulkAssign_num_ops
-master.AssignmentManger.ritCount
-master.AssignmentManger.ritCountOverThreshold
-master.AssignmentManger.ritOldestAge
+master.AssignmentManager.Assign_num_ops
+master.AssignmentManager.BulkAssign_75th_percentile
+master.AssignmentManager.BulkAssign_95th_percentile
+master.AssignmentManager.BulkAssign_99th_percentile
+master.AssignmentManager.BulkAssign_max
+master.AssignmentManager.BulkAssign_mean
+master.AssignmentManager.BulkAssign_median
+master.AssignmentManager.BulkAssign_min
+master.AssignmentManager.BulkAssign_num_ops
+master.AssignmentManager.ritCount
+master.AssignmentManager.ritCountOverThreshold
+master.AssignmentManager.ritOldestAge
 master.Balancer.BalancerCluster_75th_percentile
 master.Balancer.BalancerCluster_95th_percentile
 master.Balancer.BalancerCluster_99th_percentile
@@ -648,13 +648,13 @@ regionserver.Server.compactedCellsSize
 jvm.JvmMetrics.ThreadsRunnable
 jvm.JvmMetrics.ThreadsTerminated
 jvm.JvmMetrics.ThreadsTimedWaiting
-master.AssignmentManger.Assign_75th_percentile
-master.AssignmentManger.Assign_95th_percentile
-master.AssignmentManger.Assign_99th_percentile
-master.AssignmentManger.Assign_max
+master.AssignmentManager.Assign_75th_percentile
+master.AssignmentManager.Assign_95th_percentile
+master.AssignmentManager.Assign_99th_percentile
+master.AssignmentManager.Assign_max
 regionserver.Server.Append_95th_percentile
-master.AssignmentManger.Assign_mean
-master.AssignmentManger.Assign_median
+master.AssignmentManager.Assign_mean
+master.AssignmentManager.Assign_median
 regionserver.Replication.sink.appliedOps
 regionserver.Replication.sink.appliedBatches
 regionserver.Replication.sink.ageOfLastAppliedOp
@@ -664,30 +664,30 @@ regionserver.RegionServer.queueSize
 regionserver.RegionServer.numOpenConnections
 regionserver.RegionServer.numCallsInPriorityQueue
 regionserver.Server.Replay_num_ops
-master.AssignmentManger.Assign_min
-master.AssignmentManger.Assign_num_ops
+master.AssignmentManager.Assign_min
+master.AssignmentManager.Assign_num_ops
 regionserver.Server.checkMutateFailedCount
 regionserver.RegionServer.exceptions.RegionTooBusyException
 regionserver.RegionServer.exceptions.RegionMovedException
 regionserver.RegionServer.exceptions.OutOfOrderScannerNextException
-master.AssignmentManger.BulkAssign_75th_percentile
-master.AssignmentManger.BulkAssign_95th_percentile
+master.AssignmentManager.BulkAssign_75th_percentile
+master.AssignmentManager.BulkAssign_95th_percentile
 regionserver.RegionServer.exceptions.FailedSanityCheckException
 regionserver.RegionServer.exceptions
 regionserver.RegionServer.authorizationSuccesses
 regionserver.RegionServer.authenticationSuccesses
 regionserver.RegionServer.authenticationFailures
 regionserver.RegionServer.TotalCallTime_num_ops
-master.AssignmentManger.BulkAssign_99th_percentile
+master.AssignmentManager.BulkAssign_99th_percentile
 jvm.JvmMetrics.ThreadsWaiting
 regionserver.RegionServer.TotalCallTime_median
 regionserver.RegionServer.TotalCallTime_mean
-master.AssignmentManger.BulkAssign_max
+master.AssignmentManager.BulkAssign_max
 regionserver.RegionServer.TotalCallTime_95th_percentile
 regionserver.RegionServer.TotalCallTime_75th_percentile
 regionserver.RegionServer.QueueCallTime_num_ops
-master.AssignmentManger.BulkAssign_mean
-master.AssignmentManger.BulkAssign_median
+master.AssignmentManager.BulkAssign_mean
+master.AssignmentManager.BulkAssign_median
 regionserver.RegionServer.QueueCallTime_median
 regionserver.RegionServer.QueueCallTime_mean
 regionserver.RegionServer.QueueCallTime_max
@@ -697,12 +697,12 @@ regionserver.RegionServer.ProcessCallTime_num_ops
 regionserver.RegionServer.ProcessCallTime_median
 regionserver.RegionServer.ProcessCallTime_mean
 regionserver.Server.ScanNext_num_ops
-master.AssignmentManger.BulkAssign_num_ops
-master.AssignmentManger.BulkAssign_min
+master.AssignmentManager.BulkAssign_num_ops
+master.AssignmentManager.BulkAssign_min
 regionserver.RegionServer.ProcessCallTime_95th_percentile
-master.AssignmentManger.ritCount
-master.AssignmentManger.ritCountOverThreshold
-master.AssignmentManger.ritOldestAge
+master.AssignmentManager.ritCount
+master.AssignmentManager.ritCountOverThreshold
+master.AssignmentManager.ritOldestAge
 master.Balancer.BalancerCluster_75th_percentile
 master.Balancer.BalancerCluster_95th_percentile
 master.Balancer.BalancerCluster_99th_percentile
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/AMS-HBASE.dat
 
b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/AMS-HBASE.dat
index 91b524b..f8ea2af 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/AMS-HBASE.dat
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/AMS-HBASE.dat
@@ -13,7 +13,7 @@ dfs.FSNamesystem.Snapshots
 dfs.FSNamesystem.TransactionsSinceLastLogRoll
 master.Server.averageLoad
 jvm.JvmMetrics.MemHeapUsedM
-master.AssignmentManger.ritCount
+master.AssignmentManager.ritCount
 dfs.FSNamesystem.PendingDataNodeMessageCount
 dfs.FSNamesystem.StaleDataNodes
 |hostname|
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/HBASE.dat
 
b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/HBASE.dat
index ae60458..6002750 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/HBASE.dat
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/HBASE.dat
@@ -13,7 +13,7 @@ dfs.FSNamesystem.Snapshots
 dfs.FSNamesystem.TransactionsSinceLastLogRoll
 master.Server.averageLoad
 jvm.JvmMetrics.MemHeapUsedM
-master.AssignmentManger.ritCount
+master.AssignmentManager.ritCount
 dfs.FSNamesystem.PendingDataNodeMessageCount
 dfs.FSNamesystem.StaleDataNodes
 |hostname|
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NAMENODE.dat
 
b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NAMENODE.dat
index 81360c5..b41c516 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NAMENODE.dat
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NAMENODE.dat
@@ -13,7 +13,7 @@ dfs.FSNamesystem.Snapshots
 dfs.FSNamesystem.TransactionsSinceLastLogRoll
 master.Server.averageLoad
 jvm.JvmMetrics.MemHeapUsedM
-master.AssignmentManger.ritCount
+master.AssignmentManager.ritCount
 dfs.FSNamesystem.PendingDataNodeMessageCount
 dfs.FSNamesystem.StaleDataNodes
 |hostname|
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NIMBUS.dat
 
b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NIMBUS.dat
index c407266..9805c9c 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NIMBUS.dat
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NIMBUS.dat
@@ -12,7 +12,7 @@ jvm.JvmMetrics.MemHeapCommittedM
 dfs.FSNamesystem.Snapshots
 dfs.FSNamesystem.TransactionsSinceLastLogRoll
 master.Server.averageLoad
-jvm.JvmMetrics.MemHeapUsedM,master.AssignmentManger.ritCount
+jvm.JvmMetrics.MemHeapUsedM,master.AssignmentManager.ritCount
 dfs.FSNamesystem.PendingDataNodeMessageCount
 dfs.FSNamesystem.StaleDataNodes
 |hostname|
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metrics.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metrics.json
index c12e09a..7b7563b 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metrics.json
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metrics.json
@@ -260,98 +260,98 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/Assign_75th_percentile": {
-              "metric": "master.AssignmentManger.Assign_75th_percentile",
+            "metrics/hbase/master/AssignmentManager/Assign_75th_percentile": {
+              "metric": "master.AssignmentManager.Assign_75th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/Assign_95th_percentile": {
-              "metric": "master.AssignmentManger.Assign_95th_percentile",
+            "metrics/hbase/master/AssignmentManager/Assign_95th_percentile": {
+              "metric": "master.AssignmentManager.Assign_95th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/Assign_99th_percentile": {
-              "metric": "master.AssignmentManger.Assign_99th_percentile",
+            "metrics/hbase/master/AssignmentManager/Assign_99th_percentile": {
+              "metric": "master.AssignmentManager.Assign_99th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/Assign_max": {
-              "metric": "master.AssignmentManger.Assign_max",
+            "metrics/hbase/master/AssignmentManager/Assign_max": {
+              "metric": "master.AssignmentManager.Assign_max",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/Assign_mean": {
-              "metric": "master.AssignmentManger.Assign_mean",
+            "metrics/hbase/master/AssignmentManager/Assign_mean": {
+              "metric": "master.AssignmentManager.Assign_mean",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/Assign_median": {
-              "metric": "master.AssignmentManger.Assign_median",
+            "metrics/hbase/master/AssignmentManager/Assign_median": {
+              "metric": "master.AssignmentManager.Assign_median",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/Assign_min": {
-              "metric": "master.AssignmentManger.Assign_min",
+            "metrics/hbase/master/AssignmentManager/Assign_min": {
+              "metric": "master.AssignmentManager.Assign_min",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/Assign_num_ops": {
-              "metric": "master.AssignmentManger.Assign_num_ops",
+            "metrics/hbase/master/AssignmentManager/Assign_num_ops": {
+              "metric": "master.AssignmentManager.Assign_num_ops",
               "pointInTime": true,
               "temporal": true
             },
-            
"metrics/hbase/master/assignmentManger/BulkAssign_75th_percentile": {
-              "metric": "master.AssignmentManger.BulkAssign_75th_percentile",
+            
"metrics/hbase/master/AssignmentManager/BulkAssign_75th_percentile": {
+              "metric": "master.AssignmentManager.BulkAssign_75th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            
"metrics/hbase/master/assignmentManger/BulkAssign_95th_percentile": {
-              "metric": "master.AssignmentManger.BulkAssign_95th_percentile",
+            
"metrics/hbase/master/AssignmentManager/BulkAssign_95th_percentile": {
+              "metric": "master.AssignmentManager.BulkAssign_95th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            
"metrics/hbase/master/assignmentManger/BulkAssign_99th_percentile": {
-              "metric": "master.AssignmentManger.BulkAssign_99th_percentile",
+            
"metrics/hbase/master/AssignmentManager/BulkAssign_99th_percentile": {
+              "metric": "master.AssignmentManager.BulkAssign_99th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/BulkAssign_max": {
-              "metric": "master.AssignmentManger.BulkAssign_max",
+            "metrics/hbase/master/AssignmentManager/BulkAssign_max": {
+              "metric": "master.AssignmentManager.BulkAssign_max",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/BulkAssign_mean": {
-              "metric": "master.AssignmentManger.BulkAssign_mean",
+            "metrics/hbase/master/AssignmentManager/BulkAssign_mean": {
+              "metric": "master.AssignmentManager.BulkAssign_mean",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/BulkAssign_median": {
-              "metric": "master.AssignmentManger.BulkAssign_median",
+            "metrics/hbase/master/AssignmentManager/BulkAssign_median": {
+              "metric": "master.AssignmentManager.BulkAssign_median",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/BulkAssign_min": {
-              "metric": "master.AssignmentManger.BulkAssign_min",
+            "metrics/hbase/master/AssignmentManager/BulkAssign_min": {
+              "metric": "master.AssignmentManager.BulkAssign_min",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/BulkAssign_num_ops": {
-              "metric": "master.AssignmentManger.BulkAssign_num_ops",
+            "metrics/hbase/master/AssignmentManager/BulkAssign_num_ops": {
+              "metric": "master.AssignmentManager.BulkAssign_num_ops",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/ritCount": {
-              "metric": "master.AssignmentManger.ritCount",
+            "metrics/hbase/master/AssignmentManager/ritCount": {
+              "metric": "master.AssignmentManager.ritCount",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/ritCountOverThreshold": {
-              "metric": "master.AssignmentManger.ritCountOverThreshold",
+            "metrics/hbase/master/AssignmentManager/ritCountOverThreshold": {
+              "metric": "master.AssignmentManager.ritCountOverThreshold",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/ritOldestAge": {
-              "metric": "master.AssignmentManger.ritOldestAge",
+            "metrics/hbase/master/AssignmentManager/ritOldestAge": {
+              "metric": "master.AssignmentManager.ritOldestAge",
               "pointInTime": true,
               "temporal": true
             },
@@ -1494,98 +1494,98 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/Assign_75th_percentile": {
-              "metric": "master.AssignmentManger.Assign_75th_percentile",
+            "metrics/hbase/master/AssignmentManager/Assign_75th_percentile": {
+              "metric": "master.AssignmentManager.Assign_75th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/Assign_95th_percentile": {
-              "metric": "master.AssignmentManger.Assign_95th_percentile",
+            "metrics/hbase/master/AssignmentManager/Assign_95th_percentile": {
+              "metric": "master.AssignmentManager.Assign_95th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/Assign_99th_percentile": {
-              "metric": "master.AssignmentManger.Assign_99th_percentile",
+            "metrics/hbase/master/AssignmentManager/Assign_99th_percentile": {
+              "metric": "master.AssignmentManager.Assign_99th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/Assign_max": {
-              "metric": "master.AssignmentManger.Assign_max",
+            "metrics/hbase/master/AssignmentManager/Assign_max": {
+              "metric": "master.AssignmentManager.Assign_max",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/Assign_mean": {
-              "metric": "master.AssignmentManger.Assign_mean",
+            "metrics/hbase/master/AssignmentManager/Assign_mean": {
+              "metric": "master.AssignmentManager.Assign_mean",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/Assign_median": {
-              "metric": "master.AssignmentManger.Assign_median",
+            "metrics/hbase/master/AssignmentManager/Assign_median": {
+              "metric": "master.AssignmentManager.Assign_median",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/Assign_min": {
-              "metric": "master.AssignmentManger.Assign_min",
+            "metrics/hbase/master/AssignmentManager/Assign_min": {
+              "metric": "master.AssignmentManager.Assign_min",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/Assign_num_ops": {
-              "metric": "master.AssignmentManger.Assign_num_ops",
+            "metrics/hbase/master/AssignmentManager/Assign_num_ops": {
+              "metric": "master.AssignmentManager.Assign_num_ops",
               "pointInTime": true,
               "temporal": true
             },
-            
"metrics/hbase/master/assignmentManger/BulkAssign_75th_percentile": {
-              "metric": "master.AssignmentManger.BulkAssign_75th_percentile",
+            
"metrics/hbase/master/AssignmentManager/BulkAssign_75th_percentile": {
+              "metric": "master.AssignmentManager.BulkAssign_75th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            
"metrics/hbase/master/assignmentManger/BulkAssign_95th_percentile": {
-              "metric": "master.AssignmentManger.BulkAssign_95th_percentile",
+            
"metrics/hbase/master/AssignmentManager/BulkAssign_95th_percentile": {
+              "metric": "master.AssignmentManager.BulkAssign_95th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            
"metrics/hbase/master/assignmentManger/BulkAssign_99th_percentile": {
-              "metric": "master.AssignmentManger.BulkAssign_99th_percentile",
+            
"metrics/hbase/master/AssignmentManager/BulkAssign_99th_percentile": {
+              "metric": "master.AssignmentManager.BulkAssign_99th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/BulkAssign_max": {
-              "metric": "master.AssignmentManger.BulkAssign_max",
+            "metrics/hbase/master/AssignmentManager/BulkAssign_max": {
+              "metric": "master.AssignmentManager.BulkAssign_max",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/BulkAssign_mean": {
-              "metric": "master.AssignmentManger.BulkAssign_mean",
+            "metrics/hbase/master/AssignmentManager/BulkAssign_mean": {
+              "metric": "master.AssignmentManager.BulkAssign_mean",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/BulkAssign_median": {
-              "metric": "master.AssignmentManger.BulkAssign_median",
+            "metrics/hbase/master/AssignmentManager/BulkAssign_median": {
+              "metric": "master.AssignmentManager.BulkAssign_median",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/BulkAssign_min": {
-              "metric": "master.AssignmentManger.BulkAssign_min",
+            "metrics/hbase/master/AssignmentManager/BulkAssign_min": {
+              "metric": "master.AssignmentManager.BulkAssign_min",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/BulkAssign_num_ops": {
-              "metric": "master.AssignmentManger.BulkAssign_num_ops",
+            "metrics/hbase/master/AssignmentManager/BulkAssign_num_ops": {
+              "metric": "master.AssignmentManager.BulkAssign_num_ops",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/ritCount": {
-              "metric": "master.AssignmentManger.ritCount",
+            "metrics/hbase/master/AssignmentManager/ritCount": {
+              "metric": "master.AssignmentManager.ritCount",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/ritCountOverThreshold": {
-              "metric": "master.AssignmentManger.ritCountOverThreshold",
+            "metrics/hbase/master/AssignmentManager/ritCountOverThreshold": {
+              "metric": "master.AssignmentManager.ritCountOverThreshold",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/hbase/master/assignmentManger/ritOldestAge": {
-              "metric": "master.AssignmentManger.ritOldestAge",
+            "metrics/hbase/master/AssignmentManager/ritOldestAge": {
+              "metric": "master.AssignmentManager.ritOldestAge",
               "pointInTime": true,
               "temporal": true
             },
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hbase-misc.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hbase-misc.json
index a58a87a..ac26bfd 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hbase-misc.json
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/HDP/grafana-hbase-misc.json
@@ -86,7 +86,7 @@
               "app": "hbase",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "master.AssignmentManger.ritCount",
+              "metric": "master.AssignmentManager.ritCount",
               "precision": "default",
               "refId": "A",
               "templatedHost": ""
@@ -155,7 +155,7 @@
               "app": "hbase",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "master.AssignmentManger.ritCountOverThreshold",
+              "metric": "master.AssignmentManager.ritCountOverThreshold",
               "precision": "default",
               "refId": "A",
               "templatedHost": ""
@@ -224,7 +224,7 @@
               "app": "hbase",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "master.AssignmentManger.ritOldestAge",
+              "metric": "master.AssignmentManager.ritOldestAge",
               "precision": "default",
               "refId": "A",
               "templatedHost": ""
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ams-hbase-misc.json
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ams-hbase-misc.json
index a79c715..d06e46d 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ams-hbase-misc.json
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/default/grafana-ams-hbase-misc.json
@@ -86,7 +86,7 @@
               "app": "ams-hbase",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "master.AssignmentManger.ritCount",
+              "metric": "master.AssignmentManager.ritCount",
               "precision": "default",
               "refId": "A",
               "templatedHost": "%"
@@ -155,7 +155,7 @@
               "app": "ams-hbase",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "master.AssignmentManger.ritCountOverThreshold",
+              "metric": "master.AssignmentManager.ritCountOverThreshold",
               "precision": "default",
               "refId": "A",
               "templatedHost": "%"
@@ -224,7 +224,7 @@
               "app": "ams-hbase",
               "downsampleAggregator": "avg",
               "errors": {},
-              "metric": "master.AssignmentManger.ritOldestAge",
+              "metric": "master.AssignmentManager.ritOldestAge",
               "precision": "default",
               "refId": "A",
               "templatedHost": "%"
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/AMBARI_METRICS.txt
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/AMBARI_METRICS.txt
index 6693503..9c0e20b 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/AMBARI_METRICS.txt
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/AMBARI_METRICS.txt
@@ -27,26 +27,26 @@ jvm.JvmMetrics.ThreadsNew
 jvm.JvmMetrics.ThreadsRunnable
 jvm.JvmMetrics.ThreadsTerminated
 jvm.JvmMetrics.ThreadsTimedWaiting
-master.AssignmentManger.Assign_75th_percentile
-master.AssignmentManger.Assign_95th_percentile
-master.AssignmentManger.Assign_99th_percentile
-master.AssignmentManger.Assign_max
-master.AssignmentManger.Assign_mean
-master.AssignmentManger.Assign_median
-master.AssignmentManger.Assign_min
+master.AssignmentManager.Assign_75th_percentile
+master.AssignmentManager.Assign_95th_percentile
+master.AssignmentManager.Assign_99th_percentile
+master.AssignmentManager.Assign_max
+master.AssignmentManager.Assign_mean
+master.AssignmentManager.Assign_median
+master.AssignmentManager.Assign_min
 jvm.JvmMetrics.ThreadsWaiting
-master.AssignmentManger.Assign_num_ops
-master.AssignmentManger.BulkAssign_75th_percentile
-master.AssignmentManger.BulkAssign_95th_percentile
-master.AssignmentManger.BulkAssign_99th_percentile
-master.AssignmentManger.BulkAssign_max
-master.AssignmentManger.BulkAssign_mean
-master.AssignmentManger.BulkAssign_median
-master.AssignmentManger.BulkAssign_min
-master.AssignmentManger.BulkAssign_num_ops
-master.AssignmentManger.ritCount
-master.AssignmentManger.ritCountOverThreshold
-master.AssignmentManger.ritOldestAge
+master.AssignmentManager.Assign_num_ops
+master.AssignmentManager.BulkAssign_75th_percentile
+master.AssignmentManager.BulkAssign_95th_percentile
+master.AssignmentManager.BulkAssign_99th_percentile
+master.AssignmentManager.BulkAssign_max
+master.AssignmentManager.BulkAssign_mean
+master.AssignmentManager.BulkAssign_median
+master.AssignmentManager.BulkAssign_min
+master.AssignmentManager.BulkAssign_num_ops
+master.AssignmentManager.ritCount
+master.AssignmentManager.ritCountOverThreshold
+master.AssignmentManager.ritOldestAge
 master.Balancer.BalancerCluster_75th_percentile
 master.Balancer.BalancerCluster_95th_percentile
 master.Balancer.BalancerCluster_99th_percentile
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HBASE.txt
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HBASE.txt
index 0067403..dbbd706 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HBASE.txt
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HBASE.txt
@@ -27,26 +27,26 @@ jvm.JvmMetrics.ThreadsNew
 jvm.JvmMetrics.ThreadsRunnable
 jvm.JvmMetrics.ThreadsTerminated
 jvm.JvmMetrics.ThreadsTimedWaiting
-master.AssignmentManger.Assign_75th_percentile
-master.AssignmentManger.Assign_95th_percentile
-master.AssignmentManger.Assign_99th_percentile
-master.AssignmentManger.Assign_max
-master.AssignmentManger.Assign_mean
-master.AssignmentManger.Assign_median
-master.AssignmentManger.Assign_min
+master.AssignmentManager.Assign_75th_percentile
+master.AssignmentManager.Assign_95th_percentile
+master.AssignmentManager.Assign_99th_percentile
+master.AssignmentManager.Assign_max
+master.AssignmentManager.Assign_mean
+master.AssignmentManager.Assign_median
+master.AssignmentManager.Assign_min
 jvm.JvmMetrics.ThreadsWaiting
-master.AssignmentManger.Assign_num_ops
-master.AssignmentManger.BulkAssign_75th_percentile
-master.AssignmentManger.BulkAssign_95th_percentile
-master.AssignmentManger.BulkAssign_99th_percentile
-master.AssignmentManger.BulkAssign_max
-master.AssignmentManger.BulkAssign_mean
-master.AssignmentManger.BulkAssign_median
-master.AssignmentManger.BulkAssign_min
-master.AssignmentManger.BulkAssign_num_ops
-master.AssignmentManger.ritCount
-master.AssignmentManger.ritCountOverThreshold
-master.AssignmentManger.ritOldestAge
+master.AssignmentManager.Assign_num_ops
+master.AssignmentManager.BulkAssign_75th_percentile
+master.AssignmentManager.BulkAssign_95th_percentile
+master.AssignmentManager.BulkAssign_99th_percentile
+master.AssignmentManager.BulkAssign_max
+master.AssignmentManager.BulkAssign_mean
+master.AssignmentManager.BulkAssign_median
+master.AssignmentManager.BulkAssign_min
+master.AssignmentManager.BulkAssign_num_ops
+master.AssignmentManager.ritCount
+master.AssignmentManager.ritCountOverThreshold
+master.AssignmentManager.ritOldestAge
 master.Balancer.BalancerCluster_75th_percentile
 master.Balancer.BalancerCluster_95th_percentile
 master.Balancer.BalancerCluster_99th_percentile
@@ -329,13 +329,13 @@ regionserver.Server.compactedCellsSize
 jvm.JvmMetrics.ThreadsRunnable
 jvm.JvmMetrics.ThreadsTerminated
 jvm.JvmMetrics.ThreadsTimedWaiting
-master.AssignmentManger.Assign_75th_percentile
-master.AssignmentManger.Assign_95th_percentile
-master.AssignmentManger.Assign_99th_percentile
-master.AssignmentManger.Assign_max
+master.AssignmentManager.Assign_75th_percentile
+master.AssignmentManager.Assign_95th_percentile
+master.AssignmentManager.Assign_99th_percentile
+master.AssignmentManager.Assign_max
 regionserver.Server.Append_95th_percentile
-master.AssignmentManger.Assign_mean
-master.AssignmentManger.Assign_median
+master.AssignmentManager.Assign_mean
+master.AssignmentManager.Assign_median
 regionserver.Replication.sink.appliedOps
 regionserver.Replication.sink.appliedBatches
 regionserver.Replication.sink.ageOfLastAppliedOp
@@ -345,30 +345,30 @@ regionserver.RegionServer.queueSize
 regionserver.RegionServer.numOpenConnections
 regionserver.RegionServer.numCallsInPriorityQueue
 regionserver.Server.Replay_num_ops
-master.AssignmentManger.Assign_min
-master.AssignmentManger.Assign_num_ops
+master.AssignmentManager.Assign_min
+master.AssignmentManager.Assign_num_ops
 regionserver.Server.checkMutateFailedCount
 regionserver.RegionServer.exceptions.RegionTooBusyException
 regionserver.RegionServer.exceptions.RegionMovedException
 regionserver.RegionServer.exceptions.OutOfOrderScannerNextException
-master.AssignmentManger.BulkAssign_75th_percentile
-master.AssignmentManger.BulkAssign_95th_percentile
+master.AssignmentManager.BulkAssign_75th_percentile
+master.AssignmentManager.BulkAssign_95th_percentile
 regionserver.RegionServer.exceptions.FailedSanityCheckException
 regionserver.RegionServer.exceptions
 regionserver.RegionServer.authorizationSuccesses
 regionserver.RegionServer.authenticationSuccesses
 regionserver.RegionServer.authenticationFailures
 regionserver.RegionServer.TotalCallTime_num_ops
-master.AssignmentManger.BulkAssign_99th_percentile
+master.AssignmentManager.BulkAssign_99th_percentile
 jvm.JvmMetrics.ThreadsWaiting
 regionserver.RegionServer.TotalCallTime_median
 regionserver.RegionServer.TotalCallTime_mean
-master.AssignmentManger.BulkAssign_max
+master.AssignmentManager.BulkAssign_max
 regionserver.RegionServer.TotalCallTime_95th_percentile
 regionserver.RegionServer.TotalCallTime_75th_percentile
 regionserver.RegionServer.QueueCallTime_num_ops
-master.AssignmentManger.BulkAssign_mean
-master.AssignmentManger.BulkAssign_median
+master.AssignmentManager.BulkAssign_mean
+master.AssignmentManager.BulkAssign_median
 regionserver.RegionServer.QueueCallTime_median
 regionserver.RegionServer.QueueCallTime_mean
 regionserver.RegionServer.QueueCallTime_max
@@ -378,12 +378,12 @@ regionserver.RegionServer.ProcessCallTime_num_ops
 regionserver.RegionServer.ProcessCallTime_median
 regionserver.RegionServer.ProcessCallTime_mean
 regionserver.Server.ScanNext_num_ops
-master.AssignmentManger.BulkAssign_num_ops
-master.AssignmentManger.BulkAssign_min
+master.AssignmentManager.BulkAssign_num_ops
+master.AssignmentManager.BulkAssign_min
 regionserver.RegionServer.ProcessCallTime_95th_percentile
-master.AssignmentManger.ritCount
-master.AssignmentManger.ritCountOverThreshold
-master.AssignmentManger.ritOldestAge
+master.AssignmentManager.ritCount
+master.AssignmentManager.ritCountOverThreshold
+master.AssignmentManager.ritOldestAge
 master.Balancer.BalancerCluster_75th_percentile
 master.Balancer.BalancerCluster_95th_percentile
 master.Balancer.BalancerCluster_99th_percentile
diff --git 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
index 1a0d355..283fa98 100644
--- 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
+++ 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
@@ -3632,98 +3632,98 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_75th_percentile": {
-              "metric":"master.AssignmentManger.Assign_75th_percentile",
+            "metrics/master/AssignmentManager/Assign_75th_percentile": {
+              "metric":"master.AssignmentManager.Assign_75th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_95th_percentile": {
-              "metric":"master.AssignmentManger.Assign_95th_percentile",
+            "metrics/master/AssignmentManager/Assign_95th_percentile": {
+              "metric":"master.AssignmentManager.Assign_95th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_99th_percentile": {
-              "metric":"master.AssignmentManger.Assign_99th_percentile",
+            "metrics/master/AssignmentManager/Assign_99th_percentile": {
+              "metric":"master.AssignmentManager.Assign_99th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_max": {
-              "metric":"master.AssignmentManger.Assign_max",
+            "metrics/master/AssignmentManager/Assign_max": {
+              "metric":"master.AssignmentManager.Assign_max",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_mean": {
-              "metric":"master.AssignmentManger.Assign_mean",
+            "metrics/master/AssignmentManager/Assign_mean": {
+              "metric":"master.AssignmentManager.Assign_mean",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_median": {
-              "metric":"master.AssignmentManger.Assign_median",
+            "metrics/master/AssignmentManager/Assign_median": {
+              "metric":"master.AssignmentManager.Assign_median",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_min": {
-              "metric":"master.AssignmentManger.Assign_min",
+            "metrics/master/AssignmentManager/Assign_min": {
+              "metric":"master.AssignmentManager.Assign_min",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_num_ops": {
-              "metric":"master.AssignmentManger.Assign_num_ops",
+            "metrics/master/AssignmentManager/Assign_num_ops": {
+              "metric":"master.AssignmentManager.Assign_num_ops",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_75th_percentile": {
-              "metric":"master.AssignmentManger.BulkAssign_75th_percentile",
+            "metrics/master/AssignmentManager/BulkAssign_75th_percentile": {
+              "metric":"master.AssignmentManager.BulkAssign_75th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_95th_percentile": {
-              "metric":"master.AssignmentManger.BulkAssign_95th_percentile",
+            "metrics/master/AssignmentManager/BulkAssign_95th_percentile": {
+              "metric":"master.AssignmentManager.BulkAssign_95th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_99th_percentile": {
-              "metric":"master.AssignmentManger.BulkAssign_99th_percentile",
+            "metrics/master/AssignmentManager/BulkAssign_99th_percentile": {
+              "metric":"master.AssignmentManager.BulkAssign_99th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_max": {
-              "metric":"master.AssignmentManger.BulkAssign_max",
+            "metrics/master/AssignmentManager/BulkAssign_max": {
+              "metric":"master.AssignmentManager.BulkAssign_max",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_mean": {
-              "metric":"master.AssignmentManger.BulkAssign_mean",
+            "metrics/master/AssignmentManager/BulkAssign_mean": {
+              "metric":"master.AssignmentManager.BulkAssign_mean",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_median": {
-              "metric":"master.AssignmentManger.BulkAssign_median",
+            "metrics/master/AssignmentManager/BulkAssign_median": {
+              "metric":"master.AssignmentManager.BulkAssign_median",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_min": {
-              "metric":"master.AssignmentManger.BulkAssign_min",
+            "metrics/master/AssignmentManager/BulkAssign_min": {
+              "metric":"master.AssignmentManager.BulkAssign_min",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_num_ops": {
-              "metric":"master.AssignmentManger.BulkAssign_num_ops",
+            "metrics/master/AssignmentManager/BulkAssign_num_ops": {
+              "metric":"master.AssignmentManager.BulkAssign_num_ops",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/ritCount": {
-              "metric":"master.AssignmentManger.ritCount",
+            "metrics/master/AssignmentManager/ritCount": {
+              "metric":"master.AssignmentManager.ritCount",
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/ritCountOverThreshold": {
-              "metric":"master.AssignmentManger.ritCountOverThreshold",
+            "metrics/master/AssignmentManager/ritCountOverThreshold": {
+              "metric":"master.AssignmentManager.ritCountOverThreshold",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/ritOldestAge": {
-              "metric":"master.AssignmentManger.ritOldestAge",
+            "metrics/master/AssignmentManager/ritOldestAge": {
+              "metric":"master.AssignmentManager.ritOldestAge",
               "pointInTime": true,
               "temporal": true
             },
@@ -5169,8 +5169,8 @@
               "pointInTime": true,
               "temporal": false
             },
-            "metrics/master/AssignmentManger/ritCount": {
-              "metric": 
"Hadoop:service=HBase,name=Master,sub=AssignmentManger.ritCount",
+            "metrics/master/AssignmentManager/ritCount": {
+              "metric": 
"Hadoop:service=HBase,name=Master,sub=AssignmentManager.ritCount",
               "pointInTime": true,
               "temporal": false
             },
@@ -6674,98 +6674,98 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_75th_percentile": {
-              "metric":"master.AssignmentManger.Assign_75th_percentile",
+            "metrics/master/AssignmentManager/Assign_75th_percentile": {
+              "metric":"master.AssignmentManager.Assign_75th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_95th_percentile": {
-              "metric":"master.AssignmentManger.Assign_95th_percentile",
+            "metrics/master/AssignmentManager/Assign_95th_percentile": {
+              "metric":"master.AssignmentManager.Assign_95th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_99th_percentile": {
-              "metric":"master.AssignmentManger.Assign_99th_percentile",
+            "metrics/master/AssignmentManager/Assign_99th_percentile": {
+              "metric":"master.AssignmentManager.Assign_99th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_max": {
-              "metric":"master.AssignmentManger.Assign_max",
+            "metrics/master/AssignmentManager/Assign_max": {
+              "metric":"master.AssignmentManager.Assign_max",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_mean": {
-              "metric":"master.AssignmentManger.Assign_mean",
+            "metrics/master/AssignmentManager/Assign_mean": {
+              "metric":"master.AssignmentManager.Assign_mean",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_median": {
-              "metric":"master.AssignmentManger.Assign_median",
+            "metrics/master/AssignmentManager/Assign_median": {
+              "metric":"master.AssignmentManager.Assign_median",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_min": {
-              "metric":"master.AssignmentManger.Assign_min",
+            "metrics/master/AssignmentManager/Assign_min": {
+              "metric":"master.AssignmentManager.Assign_min",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_num_ops": {
-              "metric":"master.AssignmentManger.Assign_num_ops",
+            "metrics/master/AssignmentManager/Assign_num_ops": {
+              "metric":"master.AssignmentManager.Assign_num_ops",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_75th_percentile": {
-              "metric":"master.AssignmentManger.BulkAssign_75th_percentile",
+            "metrics/master/AssignmentManager/BulkAssign_75th_percentile": {
+              "metric":"master.AssignmentManager.BulkAssign_75th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_95th_percentile": {
-              "metric":"master.AssignmentManger.BulkAssign_95th_percentile",
+            "metrics/master/AssignmentManager/BulkAssign_95th_percentile": {
+              "metric":"master.AssignmentManager.BulkAssign_95th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_99th_percentile": {
-              "metric":"master.AssignmentManger.BulkAssign_99th_percentile",
+            "metrics/master/AssignmentManager/BulkAssign_99th_percentile": {
+              "metric":"master.AssignmentManager.BulkAssign_99th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_max": {
-              "metric":"master.AssignmentManger.BulkAssign_max",
+            "metrics/master/AssignmentManager/BulkAssign_max": {
+              "metric":"master.AssignmentManager.BulkAssign_max",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_mean": {
-              "metric":"master.AssignmentManger.BulkAssign_mean",
+            "metrics/master/AssignmentManager/BulkAssign_mean": {
+              "metric":"master.AssignmentManager.BulkAssign_mean",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_median": {
-              "metric":"master.AssignmentManger.BulkAssign_median",
+            "metrics/master/AssignmentManager/BulkAssign_median": {
+              "metric":"master.AssignmentManager.BulkAssign_median",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_min": {
-              "metric":"master.AssignmentManger.BulkAssign_min",
+            "metrics/master/AssignmentManager/BulkAssign_min": {
+              "metric":"master.AssignmentManager.BulkAssign_min",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_num_ops": {
-              "metric":"master.AssignmentManger.BulkAssign_num_ops",
+            "metrics/master/AssignmentManager/BulkAssign_num_ops": {
+              "metric":"master.AssignmentManager.BulkAssign_num_ops",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/ritCount": {
-              "metric":"master.AssignmentManger.ritCount",
+            "metrics/master/AssignmentManager/ritCount": {
+              "metric":"master.AssignmentManager.ritCount",
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/ritCountOverThreshold": {
-              "metric":"master.AssignmentManger.ritCountOverThreshold",
+            "metrics/master/AssignmentManager/ritCountOverThreshold": {
+              "metric":"master.AssignmentManager.ritCountOverThreshold",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/ritOldestAge": {
-              "metric":"master.AssignmentManger.ritOldestAge",
+            "metrics/master/AssignmentManager/ritOldestAge": {
+              "metric":"master.AssignmentManager.ritOldestAge",
               "pointInTime": true,
               "temporal": true
             },
@@ -7701,8 +7701,8 @@
               "pointInTime": true,
               "temporal": false
             },
-            "metrics/master/AssignmentManger/ritCount": {
-              "metric": 
"Hadoop:service=HBase,name=Master,sub=AssignmentManger.ritCount",
+            "metrics/master/AssignmentManager/ritCount": {
+              "metric": 
"Hadoop:service=HBase,name=Master,sub=AssignmentManager.ritCount",
               "pointInTime": true,
               "temporal": false
             },
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metrics.json 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metrics.json
index bf1fa6e..8e0c503 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metrics.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metrics.json
@@ -3582,98 +3582,98 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_75th_percentile": {
-              "metric":"master.AssignmentManger.Assign_75th_percentile",
+            "metrics/master/AssignmentManager/Assign_75th_percentile": {
+              "metric":"master.AssignmentManager.Assign_75th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_95th_percentile": {
-              "metric":"master.AssignmentManger.Assign_95th_percentile",
+            "metrics/master/AssignmentManager/Assign_95th_percentile": {
+              "metric":"master.AssignmentManager.Assign_95th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_99th_percentile": {
-              "metric":"master.AssignmentManger.Assign_99th_percentile",
+            "metrics/master/AssignmentManager/Assign_99th_percentile": {
+              "metric":"master.AssignmentManager.Assign_99th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_max": {
-              "metric":"master.AssignmentManger.Assign_max",
+            "metrics/master/AssignmentManager/Assign_max": {
+              "metric":"master.AssignmentManager.Assign_max",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_mean": {
-              "metric":"master.AssignmentManger.Assign_mean",
+            "metrics/master/AssignmentManager/Assign_mean": {
+              "metric":"master.AssignmentManager.Assign_mean",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_median": {
-              "metric":"master.AssignmentManger.Assign_median",
+            "metrics/master/AssignmentManager/Assign_median": {
+              "metric":"master.AssignmentManager.Assign_median",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_min": {
-              "metric":"master.AssignmentManger.Assign_min",
+            "metrics/master/AssignmentManager/Assign_min": {
+              "metric":"master.AssignmentManager.Assign_min",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_num_ops": {
-              "metric":"master.AssignmentManger.Assign_num_ops",
+            "metrics/master/AssignmentManager/Assign_num_ops": {
+              "metric":"master.AssignmentManager.Assign_num_ops",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_75th_percentile": {
-              "metric":"master.AssignmentManger.BulkAssign_75th_percentile",
+            "metrics/master/AssignmentManager/BulkAssign_75th_percentile": {
+              "metric":"master.AssignmentManager.BulkAssign_75th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_95th_percentile": {
-              "metric":"master.AssignmentManger.BulkAssign_95th_percentile",
+            "metrics/master/AssignmentManager/BulkAssign_95th_percentile": {
+              "metric":"master.AssignmentManager.BulkAssign_95th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_99th_percentile": {
-              "metric":"master.AssignmentManger.BulkAssign_99th_percentile",
+            "metrics/master/AssignmentManager/BulkAssign_99th_percentile": {
+              "metric":"master.AssignmentManager.BulkAssign_99th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_max": {
-              "metric":"master.AssignmentManger.BulkAssign_max",
+            "metrics/master/AssignmentManager/BulkAssign_max": {
+              "metric":"master.AssignmentManager.BulkAssign_max",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_mean": {
-              "metric":"master.AssignmentManger.BulkAssign_mean",
+            "metrics/master/AssignmentManager/BulkAssign_mean": {
+              "metric":"master.AssignmentManager.BulkAssign_mean",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_median": {
-              "metric":"master.AssignmentManger.BulkAssign_median",
+            "metrics/master/AssignmentManager/BulkAssign_median": {
+              "metric":"master.AssignmentManager.BulkAssign_median",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_min": {
-              "metric":"master.AssignmentManger.BulkAssign_min",
+            "metrics/master/AssignmentManager/BulkAssign_min": {
+              "metric":"master.AssignmentManager.BulkAssign_min",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_num_ops": {
-              "metric":"master.AssignmentManger.BulkAssign_num_ops",
+            "metrics/master/AssignmentManager/BulkAssign_num_ops": {
+              "metric":"master.AssignmentManager.BulkAssign_num_ops",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/ritCount": {
-              "metric":"master.AssignmentManger.ritCount",
+            "metrics/master/AssignmentManager/ritCount": {
+              "metric":"master.AssignmentManager.ritCount",
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/ritCountOverThreshold": {
-              "metric":"master.AssignmentManger.ritCountOverThreshold",
+            "metrics/master/AssignmentManager/ritCountOverThreshold": {
+              "metric":"master.AssignmentManager.ritCountOverThreshold",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/ritOldestAge": {
-              "metric":"master.AssignmentManger.ritOldestAge",
+            "metrics/master/AssignmentManager/ritOldestAge": {
+              "metric":"master.AssignmentManager.ritOldestAge",
               "pointInTime": true,
               "temporal": true
             },
@@ -5119,8 +5119,8 @@
               "pointInTime": true,
               "temporal": false
             },
-            "metrics/master/AssignmentManger/ritCount": {
-              "metric": 
"Hadoop:service=HBase,name=Master,sub=AssignmentManger.ritCount",
+            "metrics/master/AssignmentManager/ritCount": {
+              "metric": 
"Hadoop:service=HBase,name=Master,sub=AssignmentManager.ritCount",
               "pointInTime": true,
               "temporal": false
             },
@@ -6624,98 +6624,98 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_75th_percentile": {
-              "metric":"master.AssignmentManger.Assign_75th_percentile",
+            "metrics/master/AssignmentManager/Assign_75th_percentile": {
+              "metric":"master.AssignmentManager.Assign_75th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_95th_percentile": {
-              "metric":"master.AssignmentManger.Assign_95th_percentile",
+            "metrics/master/AssignmentManager/Assign_95th_percentile": {
+              "metric":"master.AssignmentManager.Assign_95th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_99th_percentile": {
-              "metric":"master.AssignmentManger.Assign_99th_percentile",
+            "metrics/master/AssignmentManager/Assign_99th_percentile": {
+              "metric":"master.AssignmentManager.Assign_99th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_max": {
-              "metric":"master.AssignmentManger.Assign_max",
+            "metrics/master/AssignmentManager/Assign_max": {
+              "metric":"master.AssignmentManager.Assign_max",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_mean": {
-              "metric":"master.AssignmentManger.Assign_mean",
+            "metrics/master/AssignmentManager/Assign_mean": {
+              "metric":"master.AssignmentManager.Assign_mean",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_median": {
-              "metric":"master.AssignmentManger.Assign_median",
+            "metrics/master/AssignmentManager/Assign_median": {
+              "metric":"master.AssignmentManager.Assign_median",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_min": {
-              "metric":"master.AssignmentManger.Assign_min",
+            "metrics/master/AssignmentManager/Assign_min": {
+              "metric":"master.AssignmentManager.Assign_min",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_num_ops": {
-              "metric":"master.AssignmentManger.Assign_num_ops",
+            "metrics/master/AssignmentManager/Assign_num_ops": {
+              "metric":"master.AssignmentManager.Assign_num_ops",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_75th_percentile": {
-              "metric":"master.AssignmentManger.BulkAssign_75th_percentile",
+            "metrics/master/AssignmentManager/BulkAssign_75th_percentile": {
+              "metric":"master.AssignmentManager.BulkAssign_75th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_95th_percentile": {
-              "metric":"master.AssignmentManger.BulkAssign_95th_percentile",
+            "metrics/master/AssignmentManager/BulkAssign_95th_percentile": {
+              "metric":"master.AssignmentManager.BulkAssign_95th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_99th_percentile": {
-              "metric":"master.AssignmentManger.BulkAssign_99th_percentile",
+            "metrics/master/AssignmentManager/BulkAssign_99th_percentile": {
+              "metric":"master.AssignmentManager.BulkAssign_99th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_max": {
-              "metric":"master.AssignmentManger.BulkAssign_max",
+            "metrics/master/AssignmentManager/BulkAssign_max": {
+              "metric":"master.AssignmentManager.BulkAssign_max",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_mean": {
-              "metric":"master.AssignmentManger.BulkAssign_mean",
+            "metrics/master/AssignmentManager/BulkAssign_mean": {
+              "metric":"master.AssignmentManager.BulkAssign_mean",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_median": {
-              "metric":"master.AssignmentManger.BulkAssign_median",
+            "metrics/master/AssignmentManager/BulkAssign_median": {
+              "metric":"master.AssignmentManager.BulkAssign_median",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_min": {
-              "metric":"master.AssignmentManger.BulkAssign_min",
+            "metrics/master/AssignmentManager/BulkAssign_min": {
+              "metric":"master.AssignmentManager.BulkAssign_min",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_num_ops": {
-              "metric":"master.AssignmentManger.BulkAssign_num_ops",
+            "metrics/master/AssignmentManager/BulkAssign_num_ops": {
+              "metric":"master.AssignmentManager.BulkAssign_num_ops",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/ritCount": {
-              "metric":"master.AssignmentManger.ritCount",
+            "metrics/master/AssignmentManager/ritCount": {
+              "metric":"master.AssignmentManager.ritCount",
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/ritCountOverThreshold": {
-              "metric":"master.AssignmentManger.ritCountOverThreshold",
+            "metrics/master/AssignmentManager/ritCountOverThreshold": {
+              "metric":"master.AssignmentManager.ritCountOverThreshold",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/ritOldestAge": {
-              "metric":"master.AssignmentManger.ritOldestAge",
+            "metrics/master/AssignmentManager/ritOldestAge": {
+              "metric":"master.AssignmentManager.ritOldestAge",
               "pointInTime": true,
               "temporal": true
             },
@@ -7651,8 +7651,8 @@
               "pointInTime": true,
               "temporal": false
             },
-            "metrics/master/AssignmentManger/ritCount": {
-              "metric": 
"Hadoop:service=HBase,name=Master,sub=AssignmentManger.ritCount",
+            "metrics/master/AssignmentManager/ritCount": {
+              "metric": 
"Hadoop:service=HBase,name=Master,sub=AssignmentManager.ritCount",
               "pointInTime": true,
               "temporal": false
             },
diff --git 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/metrics.json
 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/metrics.json
index a9ad8fa..5ef9e1d 100644
--- 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/metrics.json
+++ 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHBASE/metrics.json
@@ -3582,98 +3582,98 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_75th_percentile": {
-              "metric":"master.AssignmentManger.Assign_75th_percentile",
+            "metrics/master/AssignmentManager/Assign_75th_percentile": {
+              "metric":"master.AssignmentManager.Assign_75th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_95th_percentile": {
-              "metric":"master.AssignmentManger.Assign_95th_percentile",
+            "metrics/master/AssignmentManager/Assign_95th_percentile": {
+              "metric":"master.AssignmentManager.Assign_95th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_99th_percentile": {
-              "metric":"master.AssignmentManger.Assign_99th_percentile",
+            "metrics/master/AssignmentManager/Assign_99th_percentile": {
+              "metric":"master.AssignmentManager.Assign_99th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_max": {
-              "metric":"master.AssignmentManger.Assign_max",
+            "metrics/master/AssignmentManager/Assign_max": {
+              "metric":"master.AssignmentManager.Assign_max",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_mean": {
-              "metric":"master.AssignmentManger.Assign_mean",
+            "metrics/master/AssignmentManager/Assign_mean": {
+              "metric":"master.AssignmentManager.Assign_mean",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_median": {
-              "metric":"master.AssignmentManger.Assign_median",
+            "metrics/master/AssignmentManager/Assign_median": {
+              "metric":"master.AssignmentManager.Assign_median",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_min": {
-              "metric":"master.AssignmentManger.Assign_min",
+            "metrics/master/AssignmentManager/Assign_min": {
+              "metric":"master.AssignmentManager.Assign_min",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_num_ops": {
-              "metric":"master.AssignmentManger.Assign_num_ops",
+            "metrics/master/AssignmentManager/Assign_num_ops": {
+              "metric":"master.AssignmentManager.Assign_num_ops",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_75th_percentile": {
-              "metric":"master.AssignmentManger.BulkAssign_75th_percentile",
+            "metrics/master/AssignmentManager/BulkAssign_75th_percentile": {
+              "metric":"master.AssignmentManager.BulkAssign_75th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_95th_percentile": {
-              "metric":"master.AssignmentManger.BulkAssign_95th_percentile",
+            "metrics/master/AssignmentManager/BulkAssign_95th_percentile": {
+              "metric":"master.AssignmentManager.BulkAssign_95th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_99th_percentile": {
-              "metric":"master.AssignmentManger.BulkAssign_99th_percentile",
+            "metrics/master/AssignmentManager/BulkAssign_99th_percentile": {
+              "metric":"master.AssignmentManager.BulkAssign_99th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_max": {
-              "metric":"master.AssignmentManger.BulkAssign_max",
+            "metrics/master/AssignmentManager/BulkAssign_max": {
+              "metric":"master.AssignmentManager.BulkAssign_max",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_mean": {
-              "metric":"master.AssignmentManger.BulkAssign_mean",
+            "metrics/master/AssignmentManager/BulkAssign_mean": {
+              "metric":"master.AssignmentManager.BulkAssign_mean",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_median": {
-              "metric":"master.AssignmentManger.BulkAssign_median",
+            "metrics/master/AssignmentManager/BulkAssign_median": {
+              "metric":"master.AssignmentManager.BulkAssign_median",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_min": {
-              "metric":"master.AssignmentManger.BulkAssign_min",
+            "metrics/master/AssignmentManager/BulkAssign_min": {
+              "metric":"master.AssignmentManager.BulkAssign_min",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_num_ops": {
-              "metric":"master.AssignmentManger.BulkAssign_num_ops",
+            "metrics/master/AssignmentManager/BulkAssign_num_ops": {
+              "metric":"master.AssignmentManager.BulkAssign_num_ops",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/ritCount": {
-              "metric":"master.AssignmentManger.ritCount",
+            "metrics/master/AssignmentManager/ritCount": {
+              "metric":"master.AssignmentManager.ritCount",
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/ritCountOverThreshold": {
-              "metric":"master.AssignmentManger.ritCountOverThreshold",
+            "metrics/master/AssignmentManager/ritCountOverThreshold": {
+              "metric":"master.AssignmentManager.ritCountOverThreshold",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/ritOldestAge": {
-              "metric":"master.AssignmentManger.ritOldestAge",
+            "metrics/master/AssignmentManager/ritOldestAge": {
+              "metric":"master.AssignmentManager.ritOldestAge",
               "pointInTime": true,
               "temporal": true
             },
@@ -5119,8 +5119,8 @@
               "pointInTime": true,
               "temporal": false
             },
-            "metrics/master/AssignmentManger/ritCount": {
-              "metric": 
"Hadoop:service=HBase,name=Master,sub=AssignmentManger.ritCount",
+            "metrics/master/AssignmentManager/ritCount": {
+              "metric": 
"Hadoop:service=HBase,name=Master,sub=AssignmentManager.ritCount",
               "pointInTime": true,
               "temporal": false
             },
@@ -6624,98 +6624,98 @@
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_75th_percentile": {
-              "metric":"master.AssignmentManger.Assign_75th_percentile",
+            "metrics/master/AssignmentManager/Assign_75th_percentile": {
+              "metric":"master.AssignmentManager.Assign_75th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_95th_percentile": {
-              "metric":"master.AssignmentManger.Assign_95th_percentile",
+            "metrics/master/AssignmentManager/Assign_95th_percentile": {
+              "metric":"master.AssignmentManager.Assign_95th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_99th_percentile": {
-              "metric":"master.AssignmentManger.Assign_99th_percentile",
+            "metrics/master/AssignmentManager/Assign_99th_percentile": {
+              "metric":"master.AssignmentManager.Assign_99th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_max": {
-              "metric":"master.AssignmentManger.Assign_max",
+            "metrics/master/AssignmentManager/Assign_max": {
+              "metric":"master.AssignmentManager.Assign_max",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_mean": {
-              "metric":"master.AssignmentManger.Assign_mean",
+            "metrics/master/AssignmentManager/Assign_mean": {
+              "metric":"master.AssignmentManager.Assign_mean",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_median": {
-              "metric":"master.AssignmentManger.Assign_median",
+            "metrics/master/AssignmentManager/Assign_median": {
+              "metric":"master.AssignmentManager.Assign_median",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_min": {
-              "metric":"master.AssignmentManger.Assign_min",
+            "metrics/master/AssignmentManager/Assign_min": {
+              "metric":"master.AssignmentManager.Assign_min",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/Assign_num_ops": {
-              "metric":"master.AssignmentManger.Assign_num_ops",
+            "metrics/master/AssignmentManager/Assign_num_ops": {
+              "metric":"master.AssignmentManager.Assign_num_ops",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_75th_percentile": {
-              "metric":"master.AssignmentManger.BulkAssign_75th_percentile",
+            "metrics/master/AssignmentManager/BulkAssign_75th_percentile": {
+              "metric":"master.AssignmentManager.BulkAssign_75th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_95th_percentile": {
-              "metric":"master.AssignmentManger.BulkAssign_95th_percentile",
+            "metrics/master/AssignmentManager/BulkAssign_95th_percentile": {
+              "metric":"master.AssignmentManager.BulkAssign_95th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_99th_percentile": {
-              "metric":"master.AssignmentManger.BulkAssign_99th_percentile",
+            "metrics/master/AssignmentManager/BulkAssign_99th_percentile": {
+              "metric":"master.AssignmentManager.BulkAssign_99th_percentile",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_max": {
-              "metric":"master.AssignmentManger.BulkAssign_max",
+            "metrics/master/AssignmentManager/BulkAssign_max": {
+              "metric":"master.AssignmentManager.BulkAssign_max",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_mean": {
-              "metric":"master.AssignmentManger.BulkAssign_mean",
+            "metrics/master/AssignmentManager/BulkAssign_mean": {
+              "metric":"master.AssignmentManager.BulkAssign_mean",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_median": {
-              "metric":"master.AssignmentManger.BulkAssign_median",
+            "metrics/master/AssignmentManager/BulkAssign_median": {
+              "metric":"master.AssignmentManager.BulkAssign_median",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_min": {
-              "metric":"master.AssignmentManger.BulkAssign_min",
+            "metrics/master/AssignmentManager/BulkAssign_min": {
+              "metric":"master.AssignmentManager.BulkAssign_min",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/BulkAssign_num_ops": {
-              "metric":"master.AssignmentManger.BulkAssign_num_ops",
+            "metrics/master/AssignmentManager/BulkAssign_num_ops": {
+              "metric":"master.AssignmentManager.BulkAssign_num_ops",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/ritCount": {
-              "metric":"master.AssignmentManger.ritCount",
+            "metrics/master/AssignmentManager/ritCount": {
+              "metric":"master.AssignmentManager.ritCount",
               "pointInTime": false,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/ritCountOverThreshold": {
-              "metric":"master.AssignmentManger.ritCountOverThreshold",
+            "metrics/master/AssignmentManager/ritCountOverThreshold": {
+              "metric":"master.AssignmentManager.ritCountOverThreshold",
               "pointInTime": true,
               "temporal": true
             },
-            "metrics/master/AssignmentManger/ritOldestAge": {
-              "metric":"master.AssignmentManger.ritOldestAge",
+            "metrics/master/AssignmentManager/ritOldestAge": {
+              "metric":"master.AssignmentManager.ritOldestAge",
               "pointInTime": true,
               "temporal": true
             },
@@ -7651,8 +7651,8 @@
               "pointInTime": true,
               "temporal": false
             },
-            "metrics/master/AssignmentManger/ritCount": {
-              "metric": 
"Hadoop:service=HBase,name=Master,sub=AssignmentManger.ritCount",
+            "metrics/master/AssignmentManager/ritCount": {
+              "metric": 
"Hadoop:service=HBase,name=Master,sub=AssignmentManager.ritCount",
               "pointInTime": true,
               "temporal": false
             },
diff --git a/ambari-server/src/test/resources/hbase_hbasemaster_jmx_2.json 
b/ambari-server/src/test/resources/hbase_hbasemaster_jmx_2.json
index b5e63b8..372d12c 100644
--- a/ambari-server/src/test/resources/hbase_hbasemaster_jmx_2.json
+++ b/ambari-server/src/test/resources/hbase_hbasemaster_jmx_2.json
@@ -39,8 +39,8 @@
     },
     "ObjectPendingFinalizationCount" : 0
   }, {
-    "name" : "Hadoop:service=HBase,name=Master,sub=AssignmentManger",
-    "modelerType" : "Master,sub=AssignmentManger",
+    "name" : "Hadoop:service=HBase,name=Master,sub=AssignmentManager",
+    "modelerType" : "Master,sub=AssignmentManager",
     "tag.Context" : "master",
     "tag.Hostname" : "c6401.ambari.apache.org",
     "ritOldestAge" : 0,
diff --git a/ambari-web/app/controllers/global/update_controller.js 
b/ambari-web/app/controllers/global/update_controller.js
index 2bcbd08..5d6b15de 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -67,7 +67,7 @@ App.UpdateController = Em.Controller.extend({
              "host_components/metrics/hbase/master/MasterStartTime," +
              "host_components/metrics/hbase/master/MasterActiveTime," +
              "host_components/metrics/hbase/master/AverageLoad," +
-             "host_components/metrics/master/AssignmentManger/ritCount",
+             "host_components/metrics/master/AssignmentManager/ritCount",
     'STORM': 
'metrics/api/v1/cluster/summary,metrics/api/v1/topology/summary,metrics/api/v1/nimbus/summary',
     'HDFS': 'host_components/metrics/dfs/namenode/ClusterId'
   },
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js 
b/ambari-web/app/mappers/service_metrics_mapper.js
index e780d78..f2c1a02 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -737,8 +737,8 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
           var activeHostComponentIndex = 
component.host_components.indexOf(activeMaster);
           self.setActiveAsFirstHostComponent(component, 
activeHostComponentIndex);
           var regionsArray = null;
-          if (!Em.none(Em.get(component.host_components[0], 
'metrics.master.AssignmentManger.ritCount'))) {
-            regionsArray = 
App.parseJSON(component.host_components[0].metrics.master.AssignmentManger.ritCount);
+          if (!Em.none(Em.get(component.host_components[0], 
'metrics.master.AssignmentManager.ritCount'))) {
+            regionsArray = 
App.parseJSON(component.host_components[0].metrics.master.AssignmentManager.ritCount);
           }
           //regions_in_transition can have various type of value: null, array 
or int
           if (Array.isArray(regionsArray)) {
diff --git a/ambari-web/test/controllers/global/update_controller_test.js 
b/ambari-web/test/controllers/global/update_controller_test.js
index f199fa9..dabb4e1 100644
--- a/ambari-web/test/controllers/global/update_controller_test.js
+++ b/ambari-web/test/controllers/global/update_controller_test.js
@@ -161,7 +161,7 @@ describe('App.UpdateController', function () {
         "host_components/metrics/hbase/master/MasterStartTime," +
         "host_components/metrics/hbase/master/MasterActiveTime," +
         "host_components/metrics/hbase/master/AverageLoad," +
-        "host_components/metrics/master/AssignmentManger/ritCount"]
+        "host_components/metrics/master/AssignmentManager/ritCount"]
       },
       {
         title: 'STORM service',
diff --git a/ambari-web/test/mappers/service_mapper_test.js 
b/ambari-web/test/mappers/service_mapper_test.js
index 2b5e7d1..3ee0757 100644
--- a/ambari-web/test/mappers/service_mapper_test.js
+++ b/ambari-web/test/mappers/service_mapper_test.js
@@ -45,7 +45,7 @@ describe('App.serviceMetricsMapper', function () {
                       }
                     },
                     master: {
-                      AssignmentManger: {
+                      AssignmentManager: {
                         ritCount: 0
                       }
                     }
@@ -76,7 +76,7 @@ describe('App.serviceMetricsMapper', function () {
                       }
                     },
                     master: {
-                      AssignmentManger: {
+                      AssignmentManager: {
                         ritCount: 0
                       }
                     }
@@ -107,7 +107,7 @@ describe('App.serviceMetricsMapper', function () {
                       }
                     },
                     master: {
-                      AssignmentManger: {
+                      AssignmentManager: {
                         ritCount: 0
                       }
                     }
@@ -138,7 +138,7 @@ describe('App.serviceMetricsMapper', function () {
                       }
                     },
                     master: {
-                      AssignmentManger: {
+                      AssignmentManager: {
                         ritCount: 0
                       }
                     }

Reply via email to