1 files changed, 21 insertions, 71 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationFormatter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationFormatter.java
index f753f22608d..e9b38f7a122 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationFormatter.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationFormatter.java
@@ -1,17 +1,14 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.notification;
 
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.Environment;
 import com.yahoo.text.Text;
-import com.yahoo.vespa.hosted.controller.api.integration.deployment.RunId;
-import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneRegistry;
-import org.apache.http.client.utils.URIBuilder;
+import com.yahoo.vespa.hosted.controller.api.integration.ConsoleUrls;
 
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.function.Function;
+
+import static com.yahoo.vespa.hosted.controller.notification.Notifier.notificationLink;
 
 /**
  * Created a NotificationContent for a given Notification.
@@ -21,10 +18,10 @@ import java.util.function.Function;
  * @author enygaard
  */
 public class NotificationFormatter {
-    private final ZoneRegistry zoneRegistry;
+    private final ConsoleUrls consoleUrls;
 
-    public NotificationFormatter(ZoneRegistry zoneRegistry) {
-        this.zoneRegistry = Objects.requireNonNull(zoneRegistry);
+    public NotificationFormatter(ConsoleUrls consoleUrls) {
+        this.consoleUrls = Objects.requireNonNull(consoleUrls);
     }
 
     public FormattedNotification format(Notification n) {
@@ -34,20 +31,18 @@ public class NotificationFormatter {
             case testPackage -> testPackage(n);
             case reindex -> reindex(n);
             case feedBlock -> feedBlock(n);
-            default -> new FormattedNotification(n, n.type().name(), "", zoneRegistry.dashboardUrl(n.source().tenant()));
+            default -> new FormattedNotification(n, n.type().name(), "", consoleUrls.tenantOverview(n.source().tenant()));
         };
     }
 
     private FormattedNotification applicationPackage(Notification n) {
         var source = n.source();
         var application = requirePresent(source.application(), "application");
-        var instance = requirePresent(source.instance(), "instance");
-        var message = Text.format("Application package for %s.%s has %s",
+        var message = Text.format("Application package for %s%s has %s",
                 application,
-                instance,
+                source.instance().map(instance -> "." + instance.value()).orElse(""),
                 levelText(n.level(), n.messages().size()));
-        var uri = zoneRegistry.dashboardUrl(ApplicationId.from(source.tenant(), application, instance));
-        return new FormattedNotification(n, "Application package", message, uri);
+        return new FormattedNotification(n, "Application package", message, notificationLink(consoleUrls, n.source()));
     }
 
     private FormattedNotification deployment(Notification n) {
@@ -57,7 +52,7 @@ public class NotificationFormatter {
                 requirePresent(source.application(), "application"),
                 requirePresent(source.instance(), "instance"),
                 levelText(n.level(), n.messages().size()));
-        return new FormattedNotification(n,"Deployment", message, jobLink(n.source()));
+        return new FormattedNotification(n,"Deployment", message, notificationLink(consoleUrls, n.source()));
     }
 
     private FormattedNotification testPackage(Notification n) {
@@ -67,68 +62,23 @@ public class NotificationFormatter {
                 n.messages().size() > 1 ? "are problems" : "is a problem",
                 application,
                 source.instance().map(i -> "."+i).orElse(""));
-        var uri = zoneRegistry.dashboardUrl(source.tenant(), application);
-        return new FormattedNotification(n, "Test package", message, uri);
+        return new FormattedNotification(n, "Test package", message, notificationLink(consoleUrls, n.source()));
     }
 
     private FormattedNotification reindex(Notification n) {
         var message = Text.format("%s is reindexing", clusterInfo(n.source()));
-        var source = n.source();
-        var application = requirePresent(source.application(), "application");
-        var instance = requirePresent(source.instance(), "instance");
-        var clusterId = requirePresent(source.clusterId(), "clusterId");
-        var zone = requirePresent(source.zoneId(), "zoneId");
-        var instanceURI = zoneRegistry.dashboardUrl(ApplicationId.from(source.tenant(), application, instance));
-        try {
-            var uri = new URIBuilder(instanceURI)
-                    .setParameter(
-                            String.format("%s.%s.%s", instance, zone.environment(), zone.region()),
-                            String.format("clusters,%s=status", clusterId.value()))
-                    .build();
-            return new FormattedNotification(n, "Reindex", message, uri);
-        } catch (URISyntaxException e) {
-            throw new IllegalArgumentException(e);
-        }
+        var application = requirePresent(n.source().application(), "application");
+        var instance = requirePresent(n.source().instance(), "instance");
+        var clusterId = requirePresent(n.source().clusterId(), "clusterId");
+        var zone = requirePresent(n.source().zoneId(), "zoneId");
+        return new FormattedNotification(n, "Reindex", message,
+                consoleUrls.clusterReindexing(ApplicationId.from(n.source().tenant(), application, instance), zone, clusterId));
     }
 
     private FormattedNotification feedBlock(Notification n) {
-        String type;
-        if (n.level() == Notification.Level.warning) {
-            type = "Nearly feed blocked";
-        } else {
-            type = "Feed blocked";
-        }
+        String type = n.level() == Notification.Level.warning ? "Nearly feed blocked" : "Feed blocked";
         var message = Text.format("%s is %s", clusterInfo(n.source()), type.toLowerCase());
-        var source = n.source();
-        var application = requirePresent(source.application(), "application");
-        var instance = requirePresent(source.instance(), "instance");
-        var clusterId = requirePresent(source.clusterId(), "clusterId");
-        var zone = requirePresent(source.zoneId(), "zoneId");
-        var instanceURI = zoneRegistry.dashboardUrl(ApplicationId.from(source.tenant(), application, instance));
-        try {
-            var uri = new URIBuilder(instanceURI)
-                    .setParameter(
-                            String.format("%s.%s.%s", instance, zone.environment(), zone.region()),
-                            String.format("clusters,%s", clusterId.value()))
-                    .build();
-            return new FormattedNotification(n, type, message, uri);
-        } catch (URISyntaxException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    private URI jobLink(NotificationSource source) {
-        var application = requirePresent(source.application(), "application");
-        var instance = requirePresent(source.instance(), "instance");
-        var jobType = requirePresent(source.jobType(), "jobType");
-        var runNumber = source.runNumber().orElseThrow(() -> new MissingOptionalException("runNumber"));
-        var applicationId = ApplicationId.from(source.tenant(), application, instance);
-        Function<Environment, URI> link = (Environment env) -> zoneRegistry.dashboardUrl(new RunId(applicationId, jobType, runNumber));
-        var environment = jobType.zone().environment();
-        return switch (environment) {
-            case dev, perf -> link.apply(environment);
-            default -> link.apply(Environment.prod);
-        };
+        return new FormattedNotification(n, type, message, notificationLink(consoleUrls, n.source()));
     }
 
     private String jobText(NotificationSource source) {