diff options
| author | Eirik Nygaard <eirik.nygaard@yahooinc.com> | 2022-04-26 14:12:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-26 14:12:36 +0200 |
| commit | 9566733ee27adc8f6c4b541eb2f4a1bfe2aca59d (patch) | |
| tree | 780667f25623d69ab7f83d83e206b21eb9ce5d30 /controller-server/src/main | |
| parent | 8af573cd341d7b80a5a0b9d12e4af921dcfa49f7 (diff) | |
| parent | 20fd51daffdda837cad866a6eab3378079d6c35c (diff) | |
Merge pull request #22236 from vespa-engine/ean/link-to-application
Notifications should link to tenant and application name combination
Diffstat (limited to 'controller-server/src/main')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notify/Notifier.java | 21 |
1 files changed, 12 insertions, 9 deletions
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 7692752f3ca..19d5cd8c1b3 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 @@ -106,16 +106,19 @@ public class Notifier { } 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())); + if (source.application().isPresent()) { + if (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(ApplicationId.from(source.tenant(), source.application().get(), source.instance().get())); + return zoneRegistry.dashboardUrl(source.tenant(), source.application().get()); } return zoneRegistry.dashboardUrl(source.tenant()); } |