Use relative URLs in Cluster Controller status page

4 files changed, 17 insertions, 19 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java
index 98648451e1d..65e21ef515f 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java
@@ -48,11 +48,7 @@ public class ContentCluster {
             final ClusterState state,
             final Distribution distribution,
             final FleetControllerOptions options,
-            final EventLog eventLog,
-            String pathPrefix) {
-        if (!pathPrefix.isEmpty()) {
-            pathPrefix += "/" + clusterName;
-        }
+            final EventLog eventLog) {
 
         final VdsClusterHtmlRendrer.Table table =
                 vdsClusterHtmlRendrer.createNewClusterHtmlTable(clusterName, slobrokGenerationCount);
@@ -77,7 +73,7 @@ public class ContentCluster {
                     state,
                     options.maxPrematureCrashes,
                     eventLog,
-                    pathPrefix,
+                    clusterName,
                     localName);
         }
         table.addTable(sb, options.stableStateTimePeriod);
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java
index ec75ba3532d..10c06d43a4b 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java
@@ -67,8 +67,8 @@ public class LegacyIndexPageRequestHandler implements StatusPageServer.RequestHa
                     stateVersionTracker.getVersionedClusterState(),
                     data.getOptions().storageDistribution,
                     data.getOptions(),
-                    eventLog,
-                    request.getPathPrefix());
+                    eventLog
+            );
             // Overview of current config
             data.getOptions().writeHtmlState(content, request);
             // Current cluster state and cluster state history
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyNodePageRequestHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyNodePageRequestHandler.java
index 3a6ed11be10..e797c404bf6 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyNodePageRequestHandler.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyNodePageRequestHandler.java
@@ -45,11 +45,7 @@ public class LegacyNodePageRequestHandler implements StatusPageServer.RequestHan
         content.append("<!-- Answer to request " + request + " -->\n");
         response.writeHtmlHeader(content, "Cluster Controller Status Page - Node status for " + node);
         content.append("<p>UTC time when creating this page: ").append(RealTimer.printDateNoMilliSeconds(currentTime, tz)).append("</p>");
-        String prefix = request.getPathPrefix();
-        if (!prefix.isEmpty()) {
-            prefix += "/" + cluster.getName();
-        }
-        content.append("[ <a href=\"" + prefix + "\">Back to cluster overview</a> ] <br><br>");
+        content.append("[ <a href=\"..\">Back to cluster overview</a> ] <br><br>");
         eventLog.writeHtmlState(content, node);
         NodeInfo nodeInfo = cluster.getNodeInfo(node);
         content.append("<h2>Host info</h2>\n");
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StatusPagesTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StatusPagesTest.java
index b1ae39729ab..2347a040c12 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StatusPagesTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StatusPagesTest.java
@@ -12,8 +12,14 @@ import com.yahoo.vespa.clustercontroller.core.status.statuspage.StatusPageServer
 import com.yahoo.vespa.clustercontroller.utils.communication.http.HttpRequest;
 import com.yahoo.vespa.clustercontroller.utils.communication.http.HttpResult;
 import org.codehaus.jettison.json.JSONObject;
+import org.junit.Test;
 
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
 import java.net.Socket;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -22,11 +28,11 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.TimeZone;
 import java.util.logging.Logger;
-import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 public class StatusPagesTest extends FleetControllerTest {
 
@@ -122,9 +128,9 @@ public class StatusPagesTest extends FleetControllerTest {
             assertTrue(result.toString(true), result.getContent().toString().contains(
                     "mycluster Cluster Controller 0 Status Page"));
             assertTrue(result.toString(true), result.getContent().toString().contains(
-                    "href=\"/clustercontroller-status/v1/mycluster/node=distributor.0\""));
+                    "href=\"mycluster/node=distributor.0\""));
             assertTrue(result.toString(true), result.getContent().toString().contains(
-                    "href=\"/clustercontroller-status/v1/mycluster/node=storage.0\""));
+                    "href=\"mycluster/node=storage.0\""));
         }
         {
             HttpRequest request = new HttpRequest().setPath("/clustercontroller-status/v1/mycluster/node=storage.0");
@@ -133,7 +139,7 @@ public class StatusPagesTest extends FleetControllerTest {
             assertTrue(result.toString(true), result.getContent().toString().contains(
                     "Node status for storage.0"));
             assertTrue(result.toString(true), result.getContent().toString().contains(
-                    "href=\"/clustercontroller-status/v1/mycluster\""));
+                    "href=\"..\""));
         }
         {
             HttpRequest request = new HttpRequest().setPath("/clustercontroller-status/v1/foo");