Merge pull request #22168 from vespa-engine/ean/improve-notification-message

Do not push notifications for none-production environments

5 files changed, 45 insertions, 7 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
index 893b7a1b1dc..935ba17eed6 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
@@ -81,6 +81,9 @@ public interface ZoneRegistry {
     /** Returns a URL where an informative dashboard can be found. */
     URI dashboardUrl();
 
+    /** Returns a URL which displays information about the given tenant. */
+    URI dashboardUrl(TenantName id);
+
     /** Returns a URL which displays information about the given application. */
     URI dashboardUrl(ApplicationId id);
 
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 ca8f6a3ae33..48e663e7feb 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
@@ -13,7 +13,6 @@ import com.yahoo.config.provision.zone.ZoneApi;
 import com.yahoo.container.jdisc.secretstore.SecretStore;
 import com.yahoo.jdisc.Metric;
 import com.yahoo.transaction.Mutex;
-import com.yahoo.vespa.curator.Lock;
 import com.yahoo.vespa.flags.FlagSource;
 import com.yahoo.vespa.hosted.controller.api.integration.ServiceRegistry;
 import com.yahoo.vespa.hosted.controller.api.integration.maven.MavenRepository;
@@ -124,7 +123,7 @@ public class Controller extends AbstractComponent {
         auditLogger = new AuditLogger(curator, clock);
         jobControl = new JobControl(new JobControlFlags(curator, flagSource));
         archiveBucketDb = new CuratorArchiveBucketDb(this);
-        notifier = new Notifier(curator, serviceRegistry.mailer());
+        notifier = new Notifier(curator, serviceRegistry.zoneRegistry(), serviceRegistry.mailer());
         notificationsDb = new NotificationsDb(this);
         supportAccessControl = new SupportAccessControl(this);
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notify/Notifier.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notify/Notifier.java
index 594908a3bc1..7692752f3ca 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notify/Notifier.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notify/Notifier.java
@@ -1,16 +1,21 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.notify;
 
+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.organization.Mail;
 import com.yahoo.vespa.hosted.controller.api.integration.organization.Mailer;
 import com.yahoo.vespa.hosted.controller.api.integration.organization.MailerException;
+import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneRegistry;
 import com.yahoo.vespa.hosted.controller.notification.Notification;
 import com.yahoo.vespa.hosted.controller.notification.NotificationSource;
 import com.yahoo.vespa.hosted.controller.persistence.CuratorDb;
 import com.yahoo.vespa.hosted.controller.tenant.CloudTenant;
 import com.yahoo.vespa.hosted.controller.tenant.TenantContacts;
 
+import java.net.URI;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
@@ -25,12 +30,14 @@ import java.util.stream.Collectors;
  */
 public class Notifier {
     private final CuratorDb curatorDb;
+    private final ZoneRegistry zoneRegistry;
     private final Mailer mailer;
 
     private static final Logger log = Logger.getLogger(Notifier.class.getName());
 
-    public Notifier(CuratorDb curatorDb, Mailer mailer) {
+    public Notifier(CuratorDb curatorDb, ZoneRegistry zoneRegistry, Mailer mailer) {
         this.curatorDb = Objects.requireNonNull(curatorDb);
+        this.zoneRegistry = Objects.requireNonNull(zoneRegistry);
         this.mailer = Objects.requireNonNull(mailer);
     }
 
@@ -56,7 +63,12 @@ public class Notifier {
 
     private boolean skipSource(NotificationSource source) {
         // Limit sources to production systems only. Dev and test systems cause too much noise at the moment.
-        return source.jobType().map(t -> !t.isProduction()).orElse(false);
+        if (source.zoneId().map(z -> z.environment() != Environment.prod).orElse(false)) {
+            return true;
+        } else if (source.jobType().map(t -> !t.isProduction()).orElse(false)) {
+            return true;
+        }
+        return false;
     }
 
     public void dispatch(Notification notification) {
@@ -82,12 +94,30 @@ public class Notifier {
     }
 
     private Mail mailOf(Notification n, Collection<String> recipients) {
-        var subject = Text.format("[%s] Vespa Notification for %s", n.level().toString().toUpperCase(), n.type().name());
+        var source = n.source();
+        var subject = Text.format("[%s] %s Vespa Notification for %s - %s", n.level().toString().toUpperCase(), n.type().name(), source.tenant(), source.application());
         var body = new StringBuilder();
         body.append("Source: ").append(n.source().toString()).append("\n")
                 .append("\n")
-                .append(String.join("\n", n.messages()));
+                .append(String.join("\n", n.messages()))
+                .append("\n")
+                .append(url(source).toString());
         return new Mail(recipients, subject.toString(), body.toString());
     }
 
+    private URI url(NotificationSource source) {
+        if (source.application().isPresent() && source.instance().isPresent()) {
+            if (source.jobType().isPresent() && source.runNumber().isPresent()) {
+                return zoneRegistry.dashboardUrl(
+                        new RunId(ApplicationId.from(source.tenant(),
+                                source.application().get(),
+                                source.instance().get()),
+                                source.jobType().get(),
+                                source.runNumber().getAsLong()));
+            }
+            return zoneRegistry.dashboardUrl(ApplicationId.from(source.tenant(), source.application().get(), source.instance().get()));
+        }
+        return zoneRegistry.dashboardUrl(source.tenant());
+    }
+
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java
index 1f4218af1b6..1d8dba321a2 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneRegistryMock.java
@@ -199,6 +199,11 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry
     }
 
     @Override
+    public URI dashboardUrl(TenantName tenantName) {
+        return URI.create("https://dashboard.tld/" + tenantName);
+    }
+
+    @Override
     public URI dashboardUrl(RunId id) {
         return URI.create("https://dashboard.tld/" + id.application() + "/" + id.type().jobName() + "/" + id.number());
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDbTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDbTest.java
index 28be68cf850..75b9b108377 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDbTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDbTest.java
@@ -15,6 +15,7 @@ import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.RunId;
 import com.yahoo.vespa.hosted.controller.api.integration.stubs.MockMailer;
 import com.yahoo.vespa.hosted.controller.application.TenantAndApplicationId;
+import com.yahoo.vespa.hosted.controller.integration.ZoneRegistryMock;
 import com.yahoo.vespa.hosted.controller.notify.Notifier;
 import com.yahoo.vespa.hosted.controller.persistence.MockCuratorDb;
 import com.yahoo.vespa.hosted.controller.tenant.CloudTenant;
@@ -69,7 +70,7 @@ public class NotificationsDbTest {
     private final ManualClock clock = new ManualClock(Instant.ofEpochSecond(12345));
     private final MockCuratorDb curatorDb = new MockCuratorDb(SystemName.Public);
     private final MockMailer mailer = new MockMailer();
-    private final NotificationsDb notificationsDb = new NotificationsDb(clock, curatorDb, new Notifier(curatorDb, mailer));
+    private final NotificationsDb notificationsDb = new NotificationsDb(clock, curatorDb, new Notifier(curatorDb, new ZoneRegistryMock(SystemName.cd), mailer));
 
     @Test
     public void list_test() {