Repository: chukwa Updated Branches: refs/heads/master d6e09cfac -> 83baac244
CHUKWA-791. Update quick links url to use IP address. (Eric Yang) Project: http://git-wip-us.apache.org/repos/asf/chukwa/repo Commit: http://git-wip-us.apache.org/repos/asf/chukwa/commit/83baac24 Tree: http://git-wip-us.apache.org/repos/asf/chukwa/tree/83baac24 Diff: http://git-wip-us.apache.org/repos/asf/chukwa/diff/83baac24 Branch: refs/heads/master Commit: 83baac244354fe51d25b70110f0f2d3c8202f53a Parents: d6e09cf Author: Eric Yang <[email protected]> Authored: Sat Dec 5 16:58:06 2015 -0800 Committer: Eric Yang <[email protected]> Committed: Sat Dec 5 16:58:06 2015 -0800 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../chukwa/hicc/rest/DashboardController.java | 22 +++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/chukwa/blob/83baac24/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 61f6b01..eacffbd 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -70,6 +70,8 @@ Trunk (unreleased changes) BUGS + CHUKWA-791. Update quick links url to use IP address. (Eric Yang) + CHUKWA-788. Save ring chart threshold setting in HBase. (Eric Yang) CHUKWA-784. Improve CharFileTailingAdaptorUTF8NewLineEscaped and LocalWriter http://git-wip-us.apache.org/repos/asf/chukwa/blob/83baac24/src/main/java/org/apache/hadoop/chukwa/hicc/rest/DashboardController.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/hadoop/chukwa/hicc/rest/DashboardController.java b/src/main/java/org/apache/hadoop/chukwa/hicc/rest/DashboardController.java index 16133f4..2721694 100644 --- a/src/main/java/org/apache/hadoop/chukwa/hicc/rest/DashboardController.java +++ b/src/main/java/org/apache/hadoop/chukwa/hicc/rest/DashboardController.java @@ -19,6 +19,7 @@ package org.apache.hadoop.chukwa.hicc.rest; import java.io.StringWriter; import java.util.Set; +import java.net.InetAddress; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; @@ -105,20 +106,35 @@ public class DashboardController { if(sourceParts[1].equals("NameNode")) { String[] parts = hadoop.get(DFSConfigKeys.DFS_NAMENODE_HTTP_ADDRESS_KEY).split(":"); StringBuilder buffer = new StringBuilder(); - buffer.append(sourceParts[0]); + try { + InetAddress address = InetAddress.getByName(sourceParts[0]); + buffer.append(address.getHostAddress()); + } catch (Exception e) { + buffer.append(sourceParts[0]); + } buffer.append(":"); buffer.append(parts[1]); nn = buffer.toString(); } else if(sourceParts[1].equals("ResourceManager")) { String[] parts = hadoop.get(YarnConfiguration.RM_WEBAPP_ADDRESS).split(":"); StringBuilder buffer = new StringBuilder(); - buffer.append(sourceParts[0]); + try { + InetAddress address = InetAddress.getByName(sourceParts[0]); + buffer.append(address.getHostAddress()); + } catch (Exception e) { + buffer.append(sourceParts[0]); + } buffer.append(":"); buffer.append(parts[1]); rm = buffer.toString(); } else if(sourceParts[1].equals("Master")) { StringBuilder buffer = new StringBuilder(); - buffer.append(sourceParts[0]); + try { + InetAddress address = InetAddress.getByName(sourceParts[0]); + buffer.append(address.getHostAddress()); + } catch (Exception e) { + buffer.append(sourceParts[0]); + } buffer.append(":"); buffer.append(hconf.getInt("hbase.master.info.port", HConstants.DEFAULT_MASTER_INFOPORT)); hm = buffer.toString();
