[AMBARI-24494] Ambari API does not return AssignmentManager HBase point in time metrics through API. (#2113)
diff --git a/ambari-metrics-timelineservice/conf/unix/amshbase_metrics_whitelist b/ambari-metrics-timelineservice/conf/unix/amshbase_metrics_whitelist
index 6cf4319..01072e9 100644
--- a/ambari-metrics-timelineservice/conf/unix/amshbase_metrics_whitelist
+++ b/ambari-metrics-timelineservice/conf/unix/amshbase_metrics_whitelist
@@ -22,9 +22,9 @@
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-timelineservice/conf/unix/metrics_whitelist b/ambari-metrics-timelineservice/conf/unix/metrics_whitelist
index 2edac39..fd03d6e 100644
--- a/ambari-metrics-timelineservice/conf/unix/metrics_whitelist
+++ b/ambari-metrics-timelineservice/conf/unix/metrics_whitelist
@@ -305,9 +305,9 @@
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-timelineservice/conf/windows/amshbase_metrics_whitelist b/ambari-metrics-timelineservice/conf/windows/amshbase_metrics_whitelist
index 6cf4319..01072e9 100644
--- a/ambari-metrics-timelineservice/conf/windows/amshbase_metrics_whitelist
+++ b/ambari-metrics-timelineservice/conf/windows/amshbase_metrics_whitelist
@@ -22,9 +22,9 @@
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-timelineservice/conf/windows/metrics_whitelist b/ambari-metrics-timelineservice/conf/windows/metrics_whitelist
index 2edac39..fd03d6e 100644
--- a/ambari-metrics-timelineservice/conf/windows/metrics_whitelist
+++ b/ambari-metrics-timelineservice/conf/windows/metrics_whitelist
@@ -305,9 +305,9 @@
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-timelineservice/src/main/resources/metrics_def/AMS-HBASE.dat b/ambari-metrics-timelineservice/src/main/resources/metrics_def/AMS-HBASE.dat
index de4068b..172d15b 100644
--- a/ambari-metrics-timelineservice/src/main/resources/metrics_def/AMS-HBASE.dat
+++ b/ambari-metrics-timelineservice/src/main/resources/metrics_def/AMS-HBASE.dat
@@ -28,26 +28,26 @@
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-timelineservice/src/main/resources/metrics_def/HBASE_MASTER.dat b/ambari-metrics-timelineservice/src/main/resources/metrics_def/HBASE_MASTER.dat
index bce85f2..c419164 100644
--- a/ambari-metrics-timelineservice/src/main/resources/metrics_def/HBASE_MASTER.dat
+++ b/ambari-metrics-timelineservice/src/main/resources/metrics_def/HBASE_MASTER.dat
@@ -48,33 +48,33 @@
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-timelineservice/src/test/resources/test_data/full_whitelist.dat b/ambari-metrics-timelineservice/src/test/resources/test_data/full_whitelist.dat
index 0e22ffb..0e36c7b 100644
--- a/ambari-metrics-timelineservice/src/test/resources/test_data/full_whitelist.dat
+++ b/ambari-metrics-timelineservice/src/test/resources/test_data/full_whitelist.dat
@@ -84,26 +84,26 @@
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.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 @@
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.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_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-timelineservice/src/test/resources/ui_metrics_def/AMS-HBASE.dat b/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/AMS-HBASE.dat
index 91b524b..f8ea2af 100644
--- a/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/AMS-HBASE.dat
+++ b/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/AMS-HBASE.dat
@@ -13,7 +13,7 @@
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-timelineservice/src/test/resources/ui_metrics_def/HBASE.dat b/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/HBASE.dat
index ae60458..6002750 100644
--- a/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/HBASE.dat
+++ b/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/HBASE.dat
@@ -13,7 +13,7 @@
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-timelineservice/src/test/resources/ui_metrics_def/NAMENODE.dat b/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NAMENODE.dat
index 81360c5..b41c516 100644
--- a/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NAMENODE.dat
+++ b/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NAMENODE.dat
@@ -13,7 +13,7 @@
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-timelineservice/src/test/resources/ui_metrics_def/NIMBUS.dat b/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NIMBUS.dat
index c407266..9805c9c 100644
--- a/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NIMBUS.dat
+++ b/ambari-metrics-timelineservice/src/test/resources/ui_metrics_def/NIMBUS.dat
@@ -12,7 +12,7 @@
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|
