You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by av...@apache.org on 2018/08/19 05:06:47 UTC
[ambari] branch trunk updated: [AMBARI-24494] Ambari API does not
return AssignmentManager HBase point in time metrics through API. (#2113)
This is an automated email from the ASF dual-hosted git repository.
avijayan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9070ae9 [AMBARI-24494] Ambari API does not return AssignmentManager HBase point in time metrics through API. (#2113)
9070ae9 is described below
commit 9070ae9e1c5ca346e434820397c10d95caa5a81d
Author: avijayanhwx <av...@hortonworks.com>
AuthorDate: Sat Aug 18 22:06:44 2018 -0700
[AMBARI-24494] Ambari API does not return AssignmentManager HBase point in time metrics through API. (#2113)
---
.../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 +-
.../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 +-
16 files changed, 129 insertions(+), 129 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/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
}
}