Fix mock, move kibana stuff to hosted and add some doc

2 files changed, 12 insertions, 23 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java
index 37e35560179..f50958f0e66 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java
@@ -153,18 +153,7 @@ public class Controller extends AbstractComponent {
     public Clock clock() { return clock; }
 
     public Optional<URI> getLogServerUrl(DeploymentId deploymentId) {
-        String kibanaQuery = "/#/discover?_g=()&_a=(columns:!(_source)," +
-                             "index:'logstash-*',interval:auto," +
-                             "query:(query_string:(analyze_wildcard:!t,query:'" +
-                             "HV-tenant:%22" + deploymentId.applicationId().tenant().value() + "%22%20" +
-                             "AND%20HV-application:%22" + deploymentId.applicationId().application().value() + "%22%20" +
-                             "AND%20HV-region:%22" + deploymentId.zone().region().value() + "%22%20" +
-                             "AND%20HV-instance:%22" + deploymentId.applicationId().instance().value() + "%22%20" +
-                             "AND%20HV-environment:%22" + deploymentId.zone().environment().value() + "%22'))," +
-                             "sort:!('@timestamp',desc))";
-
-        URI kibanaPath = URI.create(kibanaQuery);
-        return zoneRegistry.getLogServerUri(deploymentId.zone()).map(uri -> uri.resolve(kibanaPath));
+        return zoneRegistry.getLogServerUri(deploymentId);
     }
 
     public List<URI> getConfigServerUris(ZoneId zoneId) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java
index 086e9ff2d1b..206ced18bac 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java
@@ -3,11 +3,11 @@ package com.yahoo.vespa.hosted.controller;
 
 import com.google.inject.Inject;
 import com.yahoo.component.AbstractComponent;
-import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.ZoneId;
+import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
 import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneRegistry;
 
 import java.net.URI;
@@ -80,25 +80,25 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry
     }
 
     @Override
-    public Optional<URI> getLogServerUri(Environment environment, RegionName region) {
-        return Optional.of(ZoneId.from(environment, region))
-                .map(z -> URI.create(String.format("http://log.%s.%s.test", environment.value(), region.value())));
+    public Optional<URI> getLogServerUri(DeploymentId deploymentId) {
+        return Optional.of(deploymentId.zone())
+                .map(z -> URI.create(String.format("http://log.%s.test", deploymentId.zone().value())));
     }
 
     @Override
-    public Optional<Duration> getDeploymentTimeToLive(Environment environment, RegionName region) {
-        return Optional.ofNullable(deploymentTimeToLive.get(ZoneId.from(environment, region)));
+    public Duration getDeploymentTimeToLive(ZoneId zoneId) {
+        return deploymentTimeToLive.get(zoneId);
     }
 
     @Override
-    public Optional<RegionName> getDefaultRegion(Environment environment) {
-        return Optional.ofNullable(defaultRegionForEnvironment.get(environment));
+    public RegionName getDefaultRegion(Environment environment) {
+        return defaultRegionForEnvironment.get(environment);
     }
 
     @Override
-    public URI getMonitoringSystemUri(Environment environment, RegionName name, ApplicationId application) {
-        return URI.create("http://monitoring-system.test/?environment=" + environment.value() + "&region="
-                                  + name.value() + "&application=" + application.toShortString());
+    public URI getMonitoringSystemUri(DeploymentId deploymentId) {
+        return URI.create("http://monitoring-system.test/?environment=" + deploymentId.zone().environment().value() + "&region="
+                                  + deploymentId.zone().region().value() + "&application=" + deploymentId.applicationId().toShortString());
     }
 
     @Override