diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java index f0a497ad375d..f10a544f8943 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java @@ -66,4 +66,8 @@ public interface SCMMXBean extends ServiceRuntimeInfo { Map getContainerStateCount(); Map getRuleStatusMetrics(); + + String getScmId(); + + String getClusterId(); } diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java index 352e34abea96..3cf12e75d235 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java @@ -1141,4 +1141,12 @@ public Map getRuleStatusMetrics() { public PipelineChoosePolicy getPipelineChoosePolicy() { return this.pipelineChoosePolicy; } + + public String getScmId() { + return getScmStorageConfig().getScmId(); + } + + public String getClusterId() { + return getScmStorageConfig().getClusterID(); + } } diff --git a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html index efed59d53e8b..4e900bbe3785 100644 --- a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html +++ b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html @@ -14,6 +14,20 @@ See the License for the specific language governing permissions and limitations under the License. --> +

SCM Information

+ + + + + + + + + + + +
Scm Id:{{$ctrl.overview.jmx.ScmId}}
Cluster Id:{{$ctrl.overview.jmx.ClusterId}}
+

Node counts