You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2026/10/08 16:28:01 UTC

(streampipes) branch dev updated: feat(#4744): Add configurable system notification displayed on all pages (including Kiosk Mode) (#4931)

This is an automated email from the ASF dual-hosted git repository.

tenthe pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git


The following commit(s) were added to refs/heads/dev by this push:
     new ece23f9757 feat(#4744): Add configurable system notification displayed on all pages (including Kiosk Mode) (#4931)
ece23f9757 is described below

commit ece23f97572c775ec82bffd0a3e4f1d0e24c57d6
Author: Stefanie Sinner <13...@users.noreply.github.com>
AuthorDate: Thu Oct 8 18:27:54 2026 +0200

    feat(#4744): Add configurable system notification displayed on all pages (including Kiosk Mode) (#4931)
---
 .../model/configuration/DefaultGeneralConfig.java  |   1 +
 .../model/configuration/GeneralConfig.java         |   9 ++
 .../configuration/SystemNotificationConfig.java    |  82 +++++++++++++
 ...eralConfig.java => SystemNotificationType.java} |  11 +-
 .../SystemNotificationConfigTest.java              | 128 +++++++++++++++++++++
 .../rest/impl/SystemNotificationResource.java      |  69 +++++++++++
 .../rest/impl/SystemNotificationResourceTest.java  | 105 +++++++++++++++++
 .../service/core/UnauthenticatedInterfaces.java    |   2 +
 .../utils/configuration/ConfigurationBtns.ts       |  14 +++
 .../utils/configuration/ConfigurationUtils.ts      |  17 +++
 .../systemNotification/systemNotification.spec.ts  |  46 ++++++++
 ui/deployment/i18n/de.json                         |  13 +++
 ui/deployment/i18n/en.json                         |  13 +++
 ui/deployment/i18n/pl.json                         |  13 +++
 .../src/lib/apis/system-notification.service.ts    |  62 ++++++++++
 .../src/lib/model/config/general-config.model.ts   |  10 ++
 .../platform-services/src/public-api.ts            |   1 +
 .../general-configuration.component.html           |   2 +
 .../general-configuration.component.ts             |  44 +++++++
 ...ystem-notification-configuration.component.html | 116 +++++++++++++++++++
 .../system-notification-configuration.component.ts |  84 ++++++++++++++
 .../system-notification-appearance.ts              |  22 ++--
 .../system-notification.component.html             |  31 +++++
 .../system-notification.component.scss             |  21 ++--
 .../system-notification.component.ts               | 124 ++++++++++++++++++++
 .../core/components/toolbar/toolbar.component.html |   1 +
 .../core/components/toolbar/toolbar.component.ts   |   2 +
 .../kiosk/dashboard-kiosk.component.html           |  31 ++---
 .../kiosk/dashboard-kiosk.component.scss           |  43 ++++++-
 .../components/kiosk/dashboard-kiosk.component.ts  |   2 +
 .../components/auth-box/auth-box.component.html    |   3 +
 .../components/auth-box/auth-box.component.scss    |  10 ++
 .../components/auth-box/auth-box.component.ts      |   2 +
 33 files changed, 1098 insertions(+), 36 deletions(-)

diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultGeneralConfig.java b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultGeneralConfig.java
index c0b97cfd22..4c30d739f2 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultGeneralConfig.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultGeneralConfig.java
@@ -23,6 +23,7 @@ public class DefaultGeneralConfig {
   public GeneralConfig make() {
     var generalConfig = new GeneralConfig();
     generalConfig.setLinkSettings(new DefaultLinkSettings().make());
+    generalConfig.setSystemNotification(SystemNotificationConfig.disabled());
     return generalConfig;
   }
 }
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/GeneralConfig.java b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/GeneralConfig.java
index 3e37848f90..4b80bdf8d0 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/GeneralConfig.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/GeneralConfig.java
@@ -33,6 +33,7 @@ public class GeneralConfig {
   private List<String> defaultUserRoles;
   private LinkSettings linkSettings;
   private UserAcknowledgment userAcknowledgment;
+  private SystemNotificationConfig systemNotification;
 
   public GeneralConfig() {
   }
@@ -122,4 +123,12 @@ public class GeneralConfig {
   public void setUserAcknowledgment(UserAcknowledgment userAcknowledgment) {
     this.userAcknowledgment = userAcknowledgment;
   }
+
+  public SystemNotificationConfig getSystemNotification() {
+    return systemNotification;
+  }
+
+  public void setSystemNotification(SystemNotificationConfig systemNotification) {
+    this.systemNotification = systemNotification;
+  }
 }
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/SystemNotificationConfig.java b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/SystemNotificationConfig.java
new file mode 100644
index 0000000000..5dbc30e05d
--- /dev/null
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/SystemNotificationConfig.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.model.configuration;
+
+import java.time.Instant;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * Configuration of the system notification that administrators can show to all users.
+ *
+ * @param enabled whether an administrator has switched the notification on.
+ * @param message the text shown to users, rendered in a single line.
+ * @param type the kind of notification, for example a hint or a warning.
+ * @param expiresAtMillis the point in time from which the notification is no longer shown,
+ *     or {@code null} to show it until it is switched off.
+ */
+public record SystemNotificationConfig(boolean enabled,
+                                       String message,
+                                       SystemNotificationType type,
+                                       Long expiresAtMillis) {
+
+  public SystemNotificationConfig {
+    message = Objects.requireNonNullElse(message, "");
+    type = Objects.requireNonNullElse(type, SystemNotificationType.INFO);
+  }
+
+  /**
+   * Creates the state in which users see no system notification.
+   */
+  public static SystemNotificationConfig disabled() {
+    return new SystemNotificationConfig(
+        false, "", SystemNotificationType.INFO, null);
+  }
+
+  /**
+   * Decides whether users should see this notification at the given point in time.
+   *
+   * @param now the point in time to decide for.
+   * @return {@code true} if the notification should be visible then, otherwise {@code false}.
+   */
+  public boolean shouldBeDisplayedAt(Instant now) {
+    return enabled && !message.isBlank() && !hasExpiredAt(now);
+  }
+
+  /**
+   * Checks whether the point at which the notification should disappear has been reached.
+   * Without such a point it only disappears when an administrator switches it off.
+   *
+   * @param now the point in time to check against.
+   * @return whether the notification should no longer be shown.
+   */
+  private boolean hasExpiredAt(Instant now) {
+    return expiry()
+        .map(expiry -> !now.isBefore(expiry))
+        .orElse(false);
+  }
+
+  /**
+   * Returns the point at which the notification stops being shown, or an empty result if no
+   * such point exists.
+   */
+  private Optional<Instant> expiry() {
+    return Optional.ofNullable(expiresAtMillis).map(Instant::ofEpochMilli);
+  }
+}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultGeneralConfig.java b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/SystemNotificationType.java
similarity index 80%
copy from streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultGeneralConfig.java
copy to streampipes-model/src/main/java/org/apache/streampipes/model/configuration/SystemNotificationType.java
index c0b97cfd22..bb38dae907 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultGeneralConfig.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/SystemNotificationType.java
@@ -18,11 +18,8 @@
 
 package org.apache.streampipes.model.configuration;
 
-public class DefaultGeneralConfig {
-
-  public GeneralConfig make() {
-    var generalConfig = new GeneralConfig();
-    generalConfig.setLinkSettings(new DefaultLinkSettings().make());
-    return generalConfig;
-  }
+public enum SystemNotificationType {
+  INFO,
+  WARNING,
+  CRITICAL
 }
diff --git a/streampipes-model/src/test/java/org/apache/streampipes/model/configuration/SystemNotificationConfigTest.java b/streampipes-model/src/test/java/org/apache/streampipes/model/configuration/SystemNotificationConfigTest.java
new file mode 100644
index 0000000000..7c5213d053
--- /dev/null
+++ b/streampipes-model/src/test/java/org/apache/streampipes/model/configuration/SystemNotificationConfigTest.java
@@ -0,0 +1,128 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.model.configuration;
+
+import org.junit.jupiter.api.Test;
+
+import java.time.Duration;
+import java.time.Instant;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Tests for the implementation of the {@link SystemNotificationConfig} class.
+ */
+class SystemNotificationConfigTest {
+
+  private static final Instant NOW = Instant.parse("2026-09-11T12:00:00Z");
+
+  private static final String EMPTY_MESSAGE = "";
+  private static final String MESSAGE = "Maintenance tonight";
+
+  /**
+   * Creates a maintenance notification.
+   */
+  private static SystemNotificationConfig newMaintenance(boolean enabled, Long expiresAtMillis) {
+    return new SystemNotificationConfig(
+        enabled, MESSAGE, SystemNotificationType.CRITICAL, expiresAtMillis);
+  }
+
+  @Test
+  void testSystemNotificationConfig_missingMessage_fallsBackToDefault() {
+    var notification = new SystemNotificationConfig(
+        true, null, SystemNotificationType.WARNING, null);
+    assertEquals(EMPTY_MESSAGE, notification.message());
+  }
+
+  @Test
+  void testSystemNotificationConfig_missingType_fallsBackToDefault() {
+    var notification = new SystemNotificationConfig(
+        true, MESSAGE, null, null);
+    assertEquals(SystemNotificationType.INFO, notification.type());
+  }
+
+  @Test
+  void testDisabled_notificationNotSet_isSwitchedOff() {
+    var notification = SystemNotificationConfig.disabled();
+    assertFalse(notification.enabled());
+  }
+
+  /**
+   * Checks that an enabled notification with a message is shown if no expiry is set.
+   */
+  @Test
+  void testShouldBeDisplayedAt_enabledWithoutExpiry_isShown() {
+    var notification = newMaintenance(true, null);
+    assertTrue(notification.shouldBeDisplayedAt(NOW));
+  }
+
+  /**
+   * Checks that switching a notification off hides it, even if message and expiry would allow
+   * showing it.
+   */
+  @Test
+  void testShouldBeDisplayedAt_switchedOff_isHidden() {
+    var notification = newMaintenance(false, null);
+    assertFalse(notification.shouldBeDisplayedAt(NOW));
+  }
+
+  /**
+   * Checks that a notification without visible text is hidden, so users never see an empty
+   * notification.
+   */
+  @Test
+  void testShouldBeDisplayedAt_blankMessage_isHidden() {
+    var notification = new SystemNotificationConfig(
+        true, "   ", SystemNotificationType.WARNING, null);
+    assertFalse(notification.shouldBeDisplayedAt(NOW));
+  }
+
+  /**
+   * Checks that a notification is still shown shortly before its expiry, so it does not
+   * disappear too early.
+   */
+  @Test
+  void testShouldBeDisplayedAt_oneMinuteBeforeExpiry_isShown() {
+    var expiry = NOW.plus(Duration.ofMinutes(1));
+    var notification = newMaintenance(true, expiry.toEpochMilli());
+    assertTrue(notification.shouldBeDisplayedAt(NOW));
+  }
+
+  /**
+   * Checks that a notification disappears exactly at its expiry.
+   */
+  @Test
+  void testShouldBeDisplayedAt_exactlyAtExpiry_isHidden() {
+    var notification = newMaintenance(true, NOW.toEpochMilli());
+    assertFalse(notification.shouldBeDisplayedAt(NOW));
+  }
+
+  /**
+   * Checks that an expired notification stays hidden, so users never see outdated
+   * announcements.
+   */
+  @Test
+  void testShouldBeDisplayedAt_oneMinuteAfterExpiry_isHidden() {
+    var expiry = NOW.minus(Duration.ofMinutes(1));
+    var notification = newMaintenance(true, expiry.toEpochMilli());
+    assertFalse(notification.shouldBeDisplayedAt(NOW));
+  }
+}
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/SystemNotificationResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/SystemNotificationResource.java
new file mode 100644
index 0000000000..eb9f0225df
--- /dev/null
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/SystemNotificationResource.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.rest.impl;
+
+import org.apache.streampipes.model.configuration.GeneralConfig;
+import org.apache.streampipes.model.configuration.SpCoreConfiguration;
+import org.apache.streampipes.model.configuration.SystemNotificationConfig;
+import org.apache.streampipes.storage.api.system.ISpCoreConfigurationStorage;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.Instant;
+import java.util.Optional;
+
+/**
+ * Answers whether there is a system notification to show right now, and which one.
+ */
+@RestController
+@RequestMapping("/api/v2/system-notification")
+public class SystemNotificationResource {
+
+  private final ISpCoreConfigurationStorage configStorage;
+
+  public SystemNotificationResource(ISpCoreConfigurationStorage configStorage) {
+    this.configStorage = configStorage;
+  }
+
+  /**
+   * Returns the notification that users should see at this moment, or a disabled one if none is
+   * configured or the configured one has expired.
+   */
+  @GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)
+  public SystemNotificationConfig getActiveNotification() {
+    return findConfiguredNotification()
+        .filter(notification -> notification.shouldBeDisplayedAt(Instant.now()))
+        .orElseGet(SystemNotificationConfig::disabled);
+  }
+
+  /**
+   * Reads the stored notification without checking whether it should be shown right now.
+   *
+   * @return the notification, or empty if none is stored, for example on a fresh installation
+   *     or on installations set up before this feature existed.
+   */
+  private Optional<SystemNotificationConfig> findConfiguredNotification() {
+    return Optional.ofNullable(configStorage.get())
+        .map(SpCoreConfiguration::getGeneralConfig)
+        .map(GeneralConfig::getSystemNotification);
+  }
+}
diff --git a/streampipes-rest/src/test/java/org/apache/streampipes/rest/impl/SystemNotificationResourceTest.java b/streampipes-rest/src/test/java/org/apache/streampipes/rest/impl/SystemNotificationResourceTest.java
new file mode 100644
index 0000000000..ab5ec4ba75
--- /dev/null
+++ b/streampipes-rest/src/test/java/org/apache/streampipes/rest/impl/SystemNotificationResourceTest.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.rest.impl;
+
+import org.apache.streampipes.model.configuration.GeneralConfig;
+import org.apache.streampipes.model.configuration.SpCoreConfiguration;
+import org.apache.streampipes.model.configuration.SystemNotificationConfig;
+import org.apache.streampipes.model.configuration.SystemNotificationType;
+import org.apache.streampipes.storage.api.system.ISpCoreConfigurationStorage;
+
+import org.junit.jupiter.api.Test;
+
+import java.time.Duration;
+import java.time.Instant;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * Tests for the implementation of the {@link SystemNotificationResource} class.
+ */
+class SystemNotificationResourceTest {
+
+  private static final String MESSAGE = "Maintenance tonight";
+
+  /**
+   * Creates an enabled maintenance notification.
+   */
+  SystemNotificationConfig newMaintenance(Long expiresAt) {
+    return new SystemNotificationConfig(
+        true, MESSAGE, SystemNotificationType.CRITICAL, expiresAt);
+  }
+
+  /**
+   * Creates a stored configuration that contains the given notification.
+   */
+  SpCoreConfiguration newStoredConfig(SystemNotificationConfig notification) {
+    var generalConfig = new GeneralConfig();
+    var storedConfig = new SpCoreConfiguration();
+    generalConfig.setSystemNotification(notification);
+    storedConfig.setGeneralConfig(generalConfig);
+    return storedConfig;
+  }
+
+  SystemNotificationResource newResource(SpCoreConfiguration storedConfig) {
+    var configStorage = mock(ISpCoreConfigurationStorage.class);
+    when(configStorage.get()).thenReturn(storedConfig);
+    return new SystemNotificationResource(configStorage);
+  }
+
+  /**
+   * Checks that a fresh installation, where nothing is stored yet, leads to no notification
+   * instead of a NullPointerException on this public endpoint.
+   */
+  @Test
+  void testGetActiveNotification_nothingStored_returnsDisabled() {
+    var resource = newResource(null);
+    assertEquals(SystemNotificationConfig.disabled(), resource.getActiveNotification());
+  }
+
+  @Test
+  void testGetActiveNotification_noGeneralConfig_returnsDisabled() {
+    var resource = newResource(new SpCoreConfiguration());
+    assertEquals(SystemNotificationConfig.disabled(), resource.getActiveNotification());
+  }
+
+  @Test
+  void testGetActiveNotification_noStoredNotification_returnsDisabled() {
+    var storedConfig = new SpCoreConfiguration();
+    var resource = newResource(storedConfig);
+    storedConfig.setGeneralConfig(new GeneralConfig());
+    assertEquals(SystemNotificationConfig.disabled(), resource.getActiveNotification());
+  }
+
+  @Test
+  void testGetActiveNotification_expiredNotification_returnsDisabled() {
+    var expiry = Instant.now().minus(Duration.ofMinutes(1));
+    var resource = newResource(newStoredConfig(newMaintenance(expiry.toEpochMilli())));
+    assertEquals(SystemNotificationConfig.disabled(), resource.getActiveNotification());
+  }
+
+  @Test
+  void testGetActiveNotification_activeNotification_returnsStoredNotification() {
+    var notification = newMaintenance(null);
+    var resource = newResource(newStoredConfig(notification));
+    assertEquals(notification, resource.getActiveNotification());
+  }
+}
diff --git a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/UnauthenticatedInterfaces.java b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/UnauthenticatedInterfaces.java
index a151eca694..12b03d3a5f 100644
--- a/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/UnauthenticatedInterfaces.java
+++ b/streampipes-service-core/src/main/java/org/apache/streampipes/service/core/UnauthenticatedInterfaces.java
@@ -45,6 +45,8 @@ public class UnauthenticatedInterfaces {
         "/",
         "/streampipes-backend/",
         "/streampipes-backend/index.html",
+        // the system notification is shown before login and on anonymous dashboards
+        "/api/v2/system-notification",
         // anonymous dashboard access is allowed
         "/api/v3/datalake/dashboard/*/composite",
         "/api/v3/datalake/dashboard/kiosk/*/data"
diff --git a/ui/cypress/support/utils/configuration/ConfigurationBtns.ts b/ui/cypress/support/utils/configuration/ConfigurationBtns.ts
index 1a9e72e5f3..b4e58b6890 100644
--- a/ui/cypress/support/utils/configuration/ConfigurationBtns.ts
+++ b/ui/cypress/support/utils/configuration/ConfigurationBtns.ts
@@ -32,6 +32,20 @@ export class ConfigurationBtns {
         return cy.dataCy('sp-element-general-config-save');
     }
 
+    public static systemNotificationEnabledCheckbox() {
+        return cy
+            .dataCy('system-notification-enabled')
+            .find('input[type="checkbox"]');
+    }
+
+    public static systemNotificationMessageInput() {
+        return cy.dataCy('system-notification-message');
+    }
+
+    public static systemNotification() {
+        return cy.dataCy('system-notification');
+    }
+
     public static newUserGroupBtn() {
         return cy.dataCy('new-user-group-btn');
     }
diff --git a/ui/cypress/support/utils/configuration/ConfigurationUtils.ts b/ui/cypress/support/utils/configuration/ConfigurationUtils.ts
index 8219c18c1f..095981a646 100644
--- a/ui/cypress/support/utils/configuration/ConfigurationUtils.ts
+++ b/ui/cypress/support/utils/configuration/ConfigurationUtils.ts
@@ -16,6 +16,8 @@
  *
  */
 
+import { ConfigurationBtns } from './ConfigurationBtns';
+
 export class ConfigurationUtils {
     public static goToConfigurationExport() {
         cy.visit('#/configuration/export');
@@ -61,4 +63,19 @@ export class ConfigurationUtils {
         cy.contains('[data-cy="label-text"]', labelName).should('not.exist');
         cy.dataCy('no-table-entries').should('be.visible');
     }
+
+    public static enableSystemNotification(message: string) {
+        ConfigurationUtils.goToGeneralConfiguration();
+        ConfigurationBtns.systemNotificationEnabledCheckbox().check();
+        ConfigurationBtns.systemNotificationMessageInput()
+            .clear()
+            .type(message);
+        ConfigurationBtns.generalConfigSaveBtn().click();
+    }
+
+    public static disableSystemNotification() {
+        ConfigurationUtils.goToGeneralConfiguration();
+        ConfigurationBtns.systemNotificationEnabledCheckbox().uncheck();
+        ConfigurationBtns.generalConfigSaveBtn().click();
+    }
 }
diff --git a/ui/cypress/tests/configuration/systemNotification/systemNotification.spec.ts b/ui/cypress/tests/configuration/systemNotification/systemNotification.spec.ts
new file mode 100644
index 0000000000..bef1848c1d
--- /dev/null
+++ b/ui/cypress/tests/configuration/systemNotification/systemNotification.spec.ts
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import { ConfigurationBtns } from '../../../support/utils/configuration/ConfigurationBtns';
+import { ConfigurationUtils } from '../../../support/utils/configuration/ConfigurationUtils';
+
+describe('Show a system notification to all users', () => {
+    const message = 'Maintenance tonight from 8 pm';
+
+    beforeEach('Setup Test', () => {
+        cy.initStreamPipesTest();
+        ConfigurationUtils.enableSystemNotification(message);
+    });
+
+    afterEach('Switch the notification off again', () => {
+        // The reset does not touch the general configuration
+        cy.login();
+        ConfigurationUtils.disableSystemNotification();
+    });
+
+    it('Shows the notification in the toolbar and on the login page', () => {
+        ConfigurationBtns.systemNotification().should('contain.text', message);
+        cy.logout();
+        ConfigurationBtns.systemNotification().should('contain.text', message);
+    });
+
+    it('Hides the notification once it is switched off', () => {
+        ConfigurationUtils.disableSystemNotification();
+        ConfigurationBtns.systemNotification().should('not.exist');
+    });
+});
diff --git a/ui/deployment/i18n/de.json b/ui/deployment/i18n/de.json
index 18a02e4d01..d6e7371b5a 100644
--- a/ui/deployment/i18n/de.json
+++ b/ui/deployment/i18n/de.json
@@ -63,6 +63,7 @@
   "Add Adapter to an existing Asset": "Adapter zu einem bestehenden Asset hinzufügen",
   "Add Filter": "Filter hinzufügen",
   "Add Mapping": "Mapping hinzufügen",
+  "Add a point in time to hide the message automatically, or leave it empty to show it until you switch it off": "Tragen Sie einen Zeitpunkt ein, um die Meldung automatisch auszublenden, oder lassen Sie das Feld leer, dann bleibt sie bis zum Ausschalten sichtbar",
   "Add additional fields to the asset, e.g., to manage responsibilities": "Hinzufügen zusätzlicher Felder zum Asset, z. B. zur Verwaltung von Zuständigkeiten",
   "Add all direct children": "Alle direkten Unterknoten hinzufügen",
   "Add an additional link that links to your support page": "Fügen Sie einen zusätzlichen Link hinzu, der zu Ihrer Support-Seite führt",
@@ -278,6 +279,7 @@
   "Created": "Erstellt",
   "Creating adapter {{adapterName}}": "Adapter erstellen {{adapterName}}",
   "Creating pipeline to persist data stream": "Erstellen einer Pipeline zum Speichern der Daten",
+  "Critical": "Kritisch",
   "Critical datatype changes": "Kritische Datentypänderungen",
   "Current / Target": "Aktuell / Ziel",
   "Current Warning Range: ": "Aktueller Warnbereich: ",
@@ -464,6 +466,7 @@
   "Expand menu": "Menü ausklappen",
   "Expand preview": "Vorschau ausklappen",
   "Expires": "Läuft aus",
+  "Expiry": "Ablaufzeitpunkt",
   "Export": "Exportieren",
   "Export Data": "Daten exportieren",
   "Export Format": "Format exportieren",
@@ -579,6 +582,7 @@
   "Indicator": "Indikator",
   "Indicator font size": "Schriftgröße des Indikators",
   "Info": "Info",
+  "Inform users about maintenance, incidents, or other announcements": "Benutzer über Wartungen, Störungen oder sonstige Hinweise informieren",
   "Initial password": "Ursprüngliches Passwort",
   "Inner Radius": "Innerer Radius",
   "Input": "Eingabe",
@@ -718,6 +722,9 @@
   "Measurement": "Messwert",
   "Median": "Median",
   "Medium Color": "Mittlere Farbe",
+  "Message": "Nachricht",
+  "Message Type": "Art der Meldung",
+  "Message expired": "Meldung abgelaufen",
   "Messages": "Nachrichten",
   "Millisecond": "Millisekunde",
   "Min": "Min",
@@ -950,6 +957,7 @@
   "Reset adapter state": "Adapterstatus zurücksetzen",
   "Reset changes": "Änderungen zurücksetzen",
   "Reset code template": "Codevorlage zurücksetzen",
+  "Reset expiry": "Ablaufzeitpunkt zurücksetzen",
   "Reset filters": "Filter zurücksetzen",
   "Reset password": "Passwort zurücksetzen",
   "Reset script": "Skript zurücksetzen",
@@ -1037,6 +1045,7 @@
   "Select output fields": "Ausgabefelder auswählen",
   "Select programming language": "Programmiersprache auswählen",
   "Select resources to import": "Zu importierende Ressourcen auswählen",
+  "Select the urgency of the message, which also sets its color": "Wählen Sie die Dringlichkeit der Meldung, danach richtet sich auch ihre Farbe",
   "Select transformation template": "Skriptvorlage auswählen",
   "Select visible": "Sichtbare auswählen",
   "Selected Nodes": "Ausgewählte Knoten",
@@ -1083,6 +1092,7 @@
   "Show input fields": "Eingabefelder anzeigen",
   "Show latest time above card": "Neueste Zeit über der Karte anzeigen",
   "Show legend": "Legende anzeigen",
+  "Show message on every page": "Meldung auf jeder Seite anzeigen",
   "Show only recommended settings": "Nur empfohlene Einstellungen anzeigen",
   "Show progress label": "Fortschrittsbeschriftung anzeigen",
   "Show raw data from your data source.": "Zeigen Sie Rohdaten aus Ihrer Datenquelle an.",
@@ -1157,6 +1167,7 @@
   "Sync was not successful": "Synchronisierung war nicht erfolgreich",
   "Sync was successful.": "Die Synchronisierung war erfolgreich.",
   "System Info": "Systeminformationen",
+  "System Notification": "Systembenachrichtigung",
   "Table": "Tabelle",
   "Tags": "Tags",
   "Target field": "Zielfeld",
@@ -1181,6 +1192,7 @@
   "The app name as shown on the login screen and in emails": "Der Name der Anwendung, wie er auf dem Anmeldebildschirm und in E-Mails angezeigt wird",
   "The base URL": "Die Base-URL",
   "The chart will be removed from all dashboards as well. This action cannot be undone!": "Das Diagramm wird auch aus allen Dashboards entfernt. Diese Aktion kann nicht rückgängig gemacht werden!",
+  "The configured message has expired and is no longer shown": "Die konfigurierte Meldung ist abgelaufen und wird nicht mehr angezeigt",
   "The current data selection can't be displayed by this chart.": "Die aktuelle Auswahl kann in diesem Diagramm nicht angezeigt werden.",
   "The current value displayed as a number": "Der aktuelle Wert wird als Zahl angezeigt",
   "The current value displayed in a gauge": "Der aktuelle Wert, der im Gauge-Chart angezeigt wird",
@@ -1196,6 +1208,7 @@
   "The following files already exist. Please rename them.": "Die folgenden Dateien existieren bereits. Bitte umbenennen.",
   "The input data stream does not satisfy the requirements specified by the data processor.": "Der Eingabedatenstrom erfüllt nicht die vom Datenprozessor festgelegten Anforderungen.",
   "The original event is used without transformation. Your script is preserved.": "Das Originalereignis wird ohne Transformation verwendet. Ihr Skript bleibt erhalten.",
+  "The message as shown in the top right corner of every page. Longer messages are cut off after about 60 characters and shown in full on hover": "Die Meldung, wie sie oben rechts auf jeder Seite angezeigt wird. Längere Meldungen werden nach etwa 60 Zeichen abgeschnitten und beim Überfahren mit der Maus vollständig angezeigt",
   "The timestamp must be a UNIX timestamp in milliseconds. Edit the timestamp field or add an ingestion timestamp.": "Der Zeitstempel muss einem UNIX-Zeitstempel in Millisekunden entsprechen. Zeitstempelfeld markieren oder einen Zeitstempel im Skripteditor hinzufügen.",
   "The value should be a number": "Der Wert sollte eine Zahl sein",
   "There was an error while guessing the schema of your configured data stream": "Beim Erkennen des Schemas der Datenquelle ist ein Fehler aufgetreten",
diff --git a/ui/deployment/i18n/en.json b/ui/deployment/i18n/en.json
index 093f2d83ed..93b8960cfb 100644
--- a/ui/deployment/i18n/en.json
+++ b/ui/deployment/i18n/en.json
@@ -63,6 +63,7 @@
   "Add Adapter to an existing Asset": null,
   "Add Filter": null,
   "Add Mapping": null,
+  "Add a point in time to hide the message automatically, or leave it empty to show it until you switch it off": null,
   "Add additional fields to the asset, e.g., to manage responsibilities": null,
   "Add all direct children": null,
   "Add an additional link that links to your support page": null,
@@ -278,6 +279,7 @@
   "Created": null,
   "Creating adapter {{adapterName}}": "Creating adapter {{adapterName}}",
   "Creating pipeline to persist data stream": null,
+  "Critical": null,
   "Critical datatype changes": null,
   "Current / Target": null,
   "Current Warning Range: ": null,
@@ -464,6 +466,7 @@
   "Expand menu": null,
   "Expand preview": null,
   "Expires": null,
+  "Expiry": null,
   "Export": null,
   "Export Data": null,
   "Export Format": null,
@@ -579,6 +582,7 @@
   "Indicator": null,
   "Indicator font size": null,
   "Info": null,
+  "Inform users about maintenance, incidents, or other announcements": null,
   "Initial password": null,
   "Inner Radius": null,
   "Input": null,
@@ -718,6 +722,9 @@
   "Measurement": null,
   "Median": null,
   "Medium Color": null,
+  "Message": null,
+  "Message Type": null,
+  "Message expired": null,
   "Messages": null,
   "Millisecond": null,
   "Min": null,
@@ -950,6 +957,7 @@
   "Reset adapter state": null,
   "Reset changes": null,
   "Reset code template": null,
+  "Reset expiry": null,
   "Reset filters": null,
   "Reset password": null,
   "Reset script": null,
@@ -1037,6 +1045,7 @@
   "Select output fields": null,
   "Select programming language": null,
   "Select resources to import": null,
+  "Select the urgency of the message, which also sets its color": null,
   "Select transformation template": null,
   "Select visible": null,
   "Selected Nodes": null,
@@ -1083,6 +1092,7 @@
   "Show input fields": null,
   "Show latest time above card": null,
   "Show legend": null,
+  "Show message on every page": null,
   "Show only recommended settings": null,
   "Show progress label": null,
   "Show raw data from your data source.": null,
@@ -1157,6 +1167,7 @@
   "Sync was not successful": null,
   "Sync was successful.": null,
   "System Info": null,
+  "System Notification": null,
   "Table": null,
   "Tags": null,
   "Target field": null,
@@ -1181,6 +1192,7 @@
   "The app name as shown on the login screen and in emails": null,
   "The base URL": null,
   "The chart will be removed from all dashboards as well. This action cannot be undone!": null,
+  "The configured message has expired and is no longer shown": null,
   "The current data selection can't be displayed by this chart.": null,
   "The current value displayed as a number": null,
   "The current value displayed in a gauge": null,
@@ -1196,6 +1208,7 @@
   "The following files already exist. Please rename them.": null,
   "The input data stream does not satisfy the requirements specified by the data processor.": null,
   "The original event is used without transformation. Your script is preserved.": null,
+  "The message as shown in the top right corner of every page. Longer messages are cut off after about 60 characters and shown in full on hover": null,
   "The timestamp must be a UNIX timestamp in milliseconds. Edit the timestamp field or add an ingestion timestamp.": null,
   "The value should be a number": null,
   "There was an error while guessing the schema of your configured data stream": null,
diff --git a/ui/deployment/i18n/pl.json b/ui/deployment/i18n/pl.json
index 1591c4daf2..155a9a312a 100644
--- a/ui/deployment/i18n/pl.json
+++ b/ui/deployment/i18n/pl.json
@@ -63,6 +63,7 @@
   "Add Adapter to an existing Asset": "Dodaj adapter do istniejącego zasobu",
   "Add Filter": "Dodaj filtr",
   "Add Mapping": "Dodaj mapowanie",
+  "Add a point in time to hide the message automatically, or leave it empty to show it until you switch it off": "Podaj moment, w którym komunikat ma zostać automatycznie ukryty, lub pozostaw puste, aby wyświetlać go do czasu wyłączenia",
   "Add additional fields to the asset, e.g., to manage responsibilities": "Dodaj dodatkowe pola do zasobu, np. do zarządzania odpowiedzialnościami",
   "Add all direct children": "Dodaj wszystkie bezpośrednie elementy potomne",
   "Add an additional link that links to your support page": "Dodaj dodatkowy link do strony wsparcia",
@@ -278,6 +279,7 @@
   "Created": "Utworzono",
   "Creating adapter {{adapterName}}": "Tworzenie adaptera {{adapterName}}",
   "Creating pipeline to persist data stream": "Tworzenie strumienia do utrwalenia strumienia danych",
+  "Critical": "Krytyczne",
   "Critical datatype changes": "Krytyczne zmiany typów danych",
   "Current / Target": "Bieżąca / Docelowa",
   "Current Warning Range: ": "Bieżący zakres ostrzegawczy: ",
@@ -464,6 +466,7 @@
   "Expand menu": "Rozwiń menu",
   "Expand preview": "Rozwiń podgląd",
   "Expires": "Wygasa",
+  "Expiry": "Wygaśnięcie",
   "Export": "Eksportuj",
   "Export Data": "Eksportuj dane",
   "Export Format": "Format eksportu",
@@ -579,6 +582,7 @@
   "Indicator": "Wskaźnik",
   "Indicator font size": "Rozmiar czcionki wskaźnika",
   "Info": "Informacje",
+  "Inform users about maintenance, incidents, or other announcements": "Informuj użytkowników o pracach serwisowych, awariach lub innych ogłoszeniach",
   "Initial password": "Hasło początkowe",
   "Inner Radius": "Promień wewnętrzny",
   "Input": "Wejście",
@@ -718,6 +722,9 @@
   "Measurement": "Pomiar",
   "Median": "Mediana",
   "Medium Color": "Kolor średni",
+  "Message": "Komunikat",
+  "Message Type": "Rodzaj komunikatu",
+  "Message expired": "Komunikat wygasł",
   "Messages": "Wiadomości",
   "Millisecond": "Milisekunda",
   "Min": "Min",
@@ -950,6 +957,7 @@
   "Reset adapter state": "Zresetuj stan adaptera",
   "Reset changes": "Resetuj zmiany",
   "Reset code template": "Resetuj szablon kodu",
+  "Reset expiry": "Zresetuj wygaśnięcie",
   "Reset filters": "Zresetuj filtry",
   "Reset password": "Resetuj hasło",
   "Reset script": "Zresetuj skrypt",
@@ -1037,6 +1045,7 @@
   "Select output fields": "Wybierz pola wyjściowe",
   "Select programming language": "Wybierz język programowania",
   "Select resources to import": "Wybierz zasoby do zaimportowania",
+  "Select the urgency of the message, which also sets its color": "Wybierz pilność komunikatu, od której zależy również jego kolor",
   "Select transformation template": "Wybierz szablon transformacji",
   "Select visible": "Wybierz widoczne",
   "Selected Nodes": "Wybrane węzły",
@@ -1083,6 +1092,7 @@
   "Show input fields": "Pokaż pola wejściowe",
   "Show latest time above card": "Pokaż najnowszy czas nad kartą",
   "Show legend": "Pokaż legendę",
+  "Show message on every page": "Pokaż komunikat na każdej stronie",
   "Show only recommended settings": "Pokaż tylko zalecane ustawienia",
   "Show progress label": "Pokaż etykietę postępu",
   "Show raw data from your data source.": "Pokaż surowe dane ze źródła.",
@@ -1157,6 +1167,7 @@
   "Sync was not successful": "Synchronizacja nie powiodła się",
   "Sync was successful.": "Synchronizacja zakończyła się powodzeniem.",
   "System Info": "Informacje o systemie",
+  "System Notification": "Powiadomienie systemowe",
   "Table": "Tabela",
   "Tags": "Tagi",
   "Target field": "Pole docelowe",
@@ -1181,6 +1192,7 @@
   "The app name as shown on the login screen and in emails": "Nazwa aplikacji wyświetlana na ekranie logowania i w wiadomościach e-mail",
   "The base URL": "Bazowy URL",
   "The chart will be removed from all dashboards as well. This action cannot be undone!": "Wykres zostanie również usunięty ze wszystkich pulpitów. Tego działania nie można cofnąć!",
+  "The configured message has expired and is no longer shown": "Skonfigurowany komunikat wygasł i nie jest już wyświetlany",
   "The current data selection can't be displayed by this chart.": "Bieżącego wyboru danych nie można wyświetlić na tym wykresie.",
   "The current value displayed as a number": "Bieżąca wartość wyświetlana jako liczba",
   "The current value displayed in a gauge": "Bieżąca wartość wyświetlana na wskaźniku",
@@ -1196,6 +1208,7 @@
   "The following files already exist. Please rename them.": "Następujące pliki już istnieją. Zmień ich nazwy.",
   "The input data stream does not satisfy the requirements specified by the data processor.": "Strumień danych wejściowych nie spełnia wymagań określonych przez procesor danych.",
   "The original event is used without transformation. Your script is preserved.": "Oryginalne zdarzenie jest używane bez przekształcania. Skrypt zostaje zachowany.",
+  "The message as shown in the top right corner of every page. Longer messages are cut off after about 60 characters and shown in full on hover": "Komunikat wyświetlany w prawym górnym rogu każdej strony. Dłuższe komunikaty są skracane po około 60 znakach i wyświetlane w całości po najechaniu kursorem",
   "The timestamp must be a UNIX timestamp in milliseconds. Edit the timestamp field or add an ingestion timestamp.": "Znacznik czasu musi być znacznikiem UNIX w milisekundach. Edytuj pole znacznika czasu lub dodaj znacznik czasu konsumowania zdarzenia.",
   "The value should be a number": "Wartość powinna być liczbą",
   "There was an error while guessing the schema of your configured data stream": "Wystąpił błąd podczas rozpoznawania schematu skonfigurowanego strumień danych",
diff --git a/ui/projects/streampipes/platform-services/src/lib/apis/system-notification.service.ts b/ui/projects/streampipes/platform-services/src/lib/apis/system-notification.service.ts
new file mode 100644
index 0000000000..92551c823d
--- /dev/null
+++ b/ui/projects/streampipes/platform-services/src/lib/apis/system-notification.service.ts
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import { inject, Injectable } from '@angular/core';
+import { HttpClient, HttpContext } from '@angular/common/http';
+import { Observable, Subject } from 'rxjs';
+import { NGX_LOADING_BAR_IGNORED } from '@ngx-loading-bar/http-client';
+import { PlatformServicesCommons } from './commons.service';
+import { SystemNotificationConfig } from '../model/config/general-config.model';
+
+/**
+ * Requests the system notification from the backend and lets the rest of the
+ * application know when an administrator has changed it.
+ */
+@Injectable({
+    providedIn: 'root',
+})
+export class SystemNotificationService {
+    private http = inject(HttpClient);
+    private platformServicesCommons = inject(PlatformServicesCommons);
+
+    private changedSubject = new Subject<void>();
+
+    /**
+     * Emits immediately after a notification was saved. This only reaches the
+     * browser it was saved in, on all other clients the change becomes visible
+     * when they request the notification.
+     */
+    readonly changed$ = this.changedSubject.asObservable();
+
+    getActiveNotification(): Observable<SystemNotificationConfig> {
+        const context = new HttpContext().set(NGX_LOADING_BAR_IGNORED, true);
+        return this.http.get<SystemNotificationConfig>(this.notificationPath, {
+            context,
+        });
+    }
+
+    notifyChanged(): void {
+        this.changedSubject.next();
+    }
+
+    private get notificationPath() {
+        return (
+            this.platformServicesCommons.apiBasePath + '/system-notification'
+        );
+    }
+}
diff --git a/ui/projects/streampipes/platform-services/src/lib/model/config/general-config.model.ts b/ui/projects/streampipes/platform-services/src/lib/model/config/general-config.model.ts
index 512b2d0913..cfa27ea543 100644
--- a/ui/projects/streampipes/platform-services/src/lib/model/config/general-config.model.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/model/config/general-config.model.ts
@@ -24,6 +24,15 @@ export interface UserAcknowledgment {
     text: string;
 }
 
+export type SystemNotificationType = 'INFO' | 'WARNING' | 'CRITICAL';
+
+export interface SystemNotificationConfig {
+    enabled: boolean;
+    message: string;
+    type: SystemNotificationType;
+    expiresAtMillis?: number;
+}
+
 export interface GeneralConfigModel {
     hostname: string;
     port: number;
@@ -35,4 +44,5 @@ export interface GeneralConfigModel {
     appName: string;
     linkSettings: LinkSettings;
     userAcknowledgment: UserAcknowledgment;
+    systemNotification: SystemNotificationConfig;
 }
diff --git a/ui/projects/streampipes/platform-services/src/public-api.ts b/ui/projects/streampipes/platform-services/src/public-api.ts
index b9d84bf1af..03eb25ed91 100644
--- a/ui/projects/streampipes/platform-services/src/public-api.ts
+++ b/ui/projects/streampipes/platform-services/src/public-api.ts
@@ -52,6 +52,7 @@ export * from './lib/apis/privilege.service';
 export * from './lib/apis/role.service';
 export * from './lib/apis/semantic-types-rest.service';
 export * from './lib/apis/service-tags.service';
+export * from './lib/apis/system-notification.service';
 export * from './lib/apis/user.service';
 export * from './lib/apis/user-admin.service';
 export * from './lib/apis/user-group.service';
diff --git a/ui/src/app/configuration/general-configuration/general-configuration.component.html b/ui/src/app/configuration/general-configuration/general-configuration.component.html
index 84140d04b8..b6e6187c9e 100644
--- a/ui/src/app/configuration/general-configuration/general-configuration.component.html
+++ b/ui/src/app/configuration/general-configuration/general-configuration.component.html
@@ -198,6 +198,8 @@
                 </sp-configuration-link-settings>
                 <sp-user-acknowledgment [parentForm]="parentForm">
                 </sp-user-acknowledgment>
+                <sp-system-notification-configuration [parentForm]="parentForm">
+                </sp-system-notification-configuration>
                 <div class="mt-10">
                     <button
                         mat-flat-button
diff --git a/ui/src/app/configuration/general-configuration/general-configuration.component.ts b/ui/src/app/configuration/general-configuration/general-configuration.component.ts
index a3983fea22..f74506ef94 100644
--- a/ui/src/app/configuration/general-configuration/general-configuration.component.ts
+++ b/ui/src/app/configuration/general-configuration/general-configuration.component.ts
@@ -36,6 +36,7 @@ import {
     GeneralConfigService,
     MailConfigService,
     Role,
+    SystemNotificationService,
 } from '@streampipes/platform-services';
 import { Observable, zip } from 'rxjs';
 import { AvailableRolesService } from '../../services/available-roles.service';
@@ -70,6 +71,7 @@ import { MatButton } from '@angular/material/button';
 import { MatIcon } from '@angular/material/icon';
 import { AsyncPipe } from '@angular/common';
 import { TranslatePipe } from '@ngx-translate/core';
+import { SpSystemNotificationConfigurationComponent } from './system-notification/system-notification-configuration.component';
 
 @Component({
     selector: 'sp-general-configuration',
@@ -99,6 +101,7 @@ import { TranslatePipe } from '@ngx-translate/core';
         MatIcon,
         AsyncPipe,
         TranslatePipe,
+        SpSystemNotificationConfigurationComponent,
     ],
 })
 export class GeneralConfigurationComponent implements OnInit {
@@ -109,6 +112,7 @@ export class GeneralConfigurationComponent implements OnInit {
     private appConstants = inject(AppConstants);
     private breadcrumbService = inject(SpBreadcrumbService);
     private tabService = inject(SpConfigurationTabsService);
+    private systemNotificationService = inject(SystemNotificationService);
 
     parentForm: UntypedFormGroup;
     formReady = false;
@@ -153,6 +157,11 @@ export class GeneralConfigurationComponent implements OnInit {
                         title: '',
                         text: '',
                     },
+                    systemNotification: {
+                        enabled: false,
+                        message: '',
+                        type: 'INFO',
+                    },
                 };
             }
             this.mailConfig = configs[1];
@@ -266,6 +275,34 @@ export class GeneralConfigurationComponent implements OnInit {
                 ),
             );
 
+            this.parentForm.addControl(
+                'notificationEnabled',
+                new UntypedFormControl(
+                    this.generalConfig.systemNotification?.enabled || false,
+                ),
+            );
+
+            this.parentForm.addControl(
+                'notificationMessage',
+                new UntypedFormControl(
+                    this.generalConfig.systemNotification?.message || '',
+                ),
+            );
+
+            this.parentForm.addControl(
+                'notificationType',
+                new UntypedFormControl(
+                    this.generalConfig.systemNotification?.type || 'INFO',
+                ),
+            );
+
+            this.parentForm.addControl(
+                'notificationExpiresAtMillis',
+                new UntypedFormControl(
+                    this.generalConfig.systemNotification?.expiresAtMillis,
+                ),
+            );
+
             this.formReady = true;
         });
     }
@@ -311,11 +348,18 @@ export class GeneralConfigurationComponent implements OnInit {
                 title: formValue.termsAcknowledgmentTitle,
                 text: formValue.termsAcknowledgmentText,
             },
+            systemNotification: {
+                enabled: formValue.notificationEnabled,
+                message: formValue.notificationMessage,
+                type: formValue.notificationType,
+                expiresAtMillis: formValue.notificationExpiresAtMillis,
+            },
         };
 
         this.generalConfigService
             .updateGeneralConfig(this.generalConfig)
             .subscribe(_result => {
+                this.systemNotificationService.notifyChanged();
                 this.loadConfig();
             });
     }
diff --git a/ui/src/app/configuration/general-configuration/system-notification/system-notification-configuration.component.html b/ui/src/app/configuration/general-configuration/system-notification/system-notification-configuration.component.html
new file mode 100644
index 0000000000..e6409cd9b3
--- /dev/null
+++ b/ui/src/app/configuration/general-configuration/system-notification/system-notification-configuration.component.html
@@ -0,0 +1,116 @@
+<!--
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
+
+<sp-split-section
+    [title]="'System Notification' | translate"
+    [subtitle]="
+        'Inform users about maintenance, incidents, or other announcements'
+            | translate
+    "
+    [formGroup]="parentForm"
+>
+    <mat-checkbox
+        formControlName="notificationEnabled"
+        data-cy="system-notification-enabled"
+        >{{ 'Show message on every page' | translate }}
+    </mat-checkbox>
+
+    @if (parentForm.get('notificationEnabled').getRawValue()) {
+        @if (expired) {
+            <sp-alert-banner
+                type="warning"
+                [title]="'Message expired' | translate"
+                [description]="
+                    'The configured message has expired and is no longer shown'
+                        | translate
+                "
+            ></sp-alert-banner>
+        }
+
+        <sp-form-field
+            [level]="2"
+            [label]="'Message Type' | translate"
+            [description]="
+                'Select the urgency of the message, which also sets its color'
+                    | translate
+            "
+        >
+            <mat-form-field color="accent">
+                <mat-select
+                    formControlName="notificationType"
+                    data-cy="system-notification-type"
+                >
+                    <mat-option value="INFO">{{
+                        'Info' | translate
+                    }}</mat-option>
+                    <mat-option value="WARNING">{{
+                        'Warning' | translate
+                    }}</mat-option>
+                    <mat-option value="CRITICAL">{{
+                        'Critical' | translate
+                    }}</mat-option>
+                </mat-select>
+            </mat-form-field>
+        </sp-form-field>
+
+        <sp-form-field
+            [level]="2"
+            [label]="'Message' | translate"
+            [description]="
+                'The message as shown in the top right corner of every page. Longer messages are cut off after about 60 characters and shown in full on hover'
+                    | translate
+            "
+        >
+            <mat-form-field color="accent">
+                <input
+                    formControlName="notificationMessage"
+                    fxFlex
+                    matInput
+                    data-cy="system-notification-message"
+                />
+            </mat-form-field>
+        </sp-form-field>
+
+        <sp-form-field
+            [level]="2"
+            [label]="'Expiry' | translate"
+            [description]="
+                'Add a point in time to hide the message automatically, or leave it empty to show it until you switch it off'
+                    | translate
+            "
+        >
+            <sp-date-input
+                [(date)]="expiryDate"
+                data-cy="system-notification-expiry"
+            ></sp-date-input>
+            @if (expiryDate) {
+                <div class="mt-sm">
+                    <button
+                        type="button"
+                        mat-flat-button
+                        class="small-button"
+                        (click)="clearExpiry()"
+                        data-cy="system-notification-clear-expiry"
+                    >
+                        <span>{{ 'Reset expiry' | translate }}</span>
+                    </button>
+                </div>
+            }
+        </sp-form-field>
+    }
+</sp-split-section>
diff --git a/ui/src/app/configuration/general-configuration/system-notification/system-notification-configuration.component.ts b/ui/src/app/configuration/general-configuration/system-notification/system-notification-configuration.component.ts
new file mode 100644
index 0000000000..b7ea2bcff9
--- /dev/null
+++ b/ui/src/app/configuration/general-configuration/system-notification/system-notification-configuration.component.ts
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { FormGroup, ReactiveFormsModule } from '@angular/forms';
+import {
+    DateInputComponent,
+    FormFieldComponent,
+    SpAlertBannerComponent,
+    SplitSectionComponent,
+} from '@streampipes/shared-ui';
+import { MatCheckbox } from '@angular/material/checkbox';
+import { MatFormField } from '@angular/material/form-field';
+import { MatInput } from '@angular/material/input';
+import { MatOption, MatSelect } from '@angular/material/select';
+import { MatButton } from '@angular/material/button';
+import { FlexDirective } from '@ngbracket/ngx-layout/flex';
+import { TranslatePipe } from '@ngx-translate/core';
+import { isValid } from 'date-fns';
+
+@Component({
+    selector: 'sp-system-notification-configuration',
+    templateUrl: './system-notification-configuration.component.html',
+    changeDetection: ChangeDetectionStrategy.Eager,
+    imports: [
+        SplitSectionComponent,
+        ReactiveFormsModule,
+        FormFieldComponent,
+        SpAlertBannerComponent,
+        DateInputComponent,
+        MatCheckbox,
+        MatFormField,
+        MatInput,
+        MatSelect,
+        MatOption,
+        MatButton,
+        FlexDirective,
+        TranslatePipe,
+    ],
+})
+export class SpSystemNotificationConfigurationComponent {
+    @Input()
+    parentForm: FormGroup;
+
+    get expiryDate(): Date {
+        return this.expiresAtMillis
+            ? new Date(this.expiresAtMillis)
+            : undefined;
+    }
+
+    set expiryDate(date: Date) {
+        // sp-date-input reports an invalid date when its field is cleared
+        this.parentForm
+            .get('notificationExpiresAtMillis')
+            .setValue(isValid(date) ? date.getTime() : undefined);
+    }
+
+    get expired(): boolean {
+        return !!this.expiresAtMillis && this.expiresAtMillis <= Date.now();
+    }
+
+    clearExpiry(): void {
+        this.expiryDate = undefined;
+    }
+
+    private get expiresAtMillis(): number {
+        return this.parentForm.get('notificationExpiresAtMillis').value;
+    }
+}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultGeneralConfig.java b/ui/src/app/core/components/system-notification/system-notification-appearance.ts
similarity index 60%
copy from streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultGeneralConfig.java
copy to ui/src/app/core/components/system-notification/system-notification-appearance.ts
index c0b97cfd22..c5601d1e95 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultGeneralConfig.java
+++ b/ui/src/app/core/components/system-notification/system-notification-appearance.ts
@@ -16,13 +16,21 @@
  *
  */
 
-package org.apache.streampipes.model.configuration;
+import { SystemNotificationType } from '@streampipes/platform-services';
+import { SpLabelComponent } from '@streampipes/shared-ui';
 
-public class DefaultGeneralConfig {
+export type NotificationTone = NonNullable<SpLabelComponent['tone']>;
 
-  public GeneralConfig make() {
-    var generalConfig = new GeneralConfig();
-    generalConfig.setLinkSettings(new DefaultLinkSettings().make());
-    return generalConfig;
-  }
+export function toNotificationTone(
+    type: SystemNotificationType,
+): NotificationTone {
+    switch (type) {
+        case 'CRITICAL':
+            // sp-label calls this tone 'error'
+            return 'error';
+        case 'WARNING':
+            return 'warning';
+        default:
+            return 'info';
+    }
 }
diff --git a/ui/src/app/core/components/system-notification/system-notification.component.html b/ui/src/app/core/components/system-notification/system-notification.component.html
new file mode 100644
index 0000000000..58187296c4
--- /dev/null
+++ b/ui/src/app/core/components/system-notification/system-notification.component.html
@@ -0,0 +1,31 @@
+<!--
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
+
+@if (notification?.enabled) {
+    <sp-label
+        [tone]="tone"
+        size="small"
+        variant="solid"
+        shape="badge"
+        [matTooltip]="notification.message"
+        matTooltipPosition="below"
+        data-cy="system-notification"
+    >
+        <span class="notification-text">{{ notification.message }}</span>
+    </sp-label>
+}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultGeneralConfig.java b/ui/src/app/core/components/system-notification/system-notification.component.scss
similarity index 75%
copy from streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultGeneralConfig.java
copy to ui/src/app/core/components/system-notification/system-notification.component.scss
index c0b97cfd22..33fd671e11 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/configuration/DefaultGeneralConfig.java
+++ b/ui/src/app/core/components/system-notification/system-notification.component.scss
@@ -16,13 +16,20 @@
  *
  */
 
-package org.apache.streampipes.model.configuration;
+:host {
+    display: flex;
+    min-width: 0;
+}
 
-public class DefaultGeneralConfig {
+sp-label {
+    min-width: 0;
+    --sp-label-min-width: 0;
+}
 
-  public GeneralConfig make() {
-    var generalConfig = new GeneralConfig();
-    generalConfig.setLinkSettings(new DefaultLinkSettings().make());
-    return generalConfig;
-  }
+.notification-text {
+    display: block;
+    max-width: min(60ch, 40vw);
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
diff --git a/ui/src/app/core/components/system-notification/system-notification.component.ts b/ui/src/app/core/components/system-notification/system-notification.component.ts
new file mode 100644
index 0000000000..44d3e68e23
--- /dev/null
+++ b/ui/src/app/core/components/system-notification/system-notification.component.ts
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import {
+    ChangeDetectionStrategy,
+    Component,
+    DestroyRef,
+    OnInit,
+    inject,
+} from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import {
+    SystemNotificationConfig,
+    SystemNotificationService,
+} from '@streampipes/platform-services';
+import { SpLabelComponent } from '@streampipes/shared-ui';
+import { MatTooltip } from '@angular/material/tooltip';
+import { EMPTY, Subscription, merge, timer } from 'rxjs';
+import { catchError, switchMap } from 'rxjs/operators';
+import {
+    NotificationTone,
+    toNotificationTone,
+} from './system-notification-appearance';
+
+/**
+ * Determines how long it takes for users to see a new notification or a change
+ * to it.
+ */
+const NOTIFICATION_POLL_INTERVAL_MS = 30000;
+
+/**
+ * Holds the longest delay a browser timer supports (32-bit, about 24.8 days).
+ */
+const MAX_TIMER_DELAY_MS = 2 ** 31 - 1;
+
+/**
+ * Displays the system notification an administrator has configured.
+ */
+@Component({
+    selector: 'sp-system-notification',
+    templateUrl: './system-notification.component.html',
+    styleUrls: ['./system-notification.component.scss'],
+    changeDetection: ChangeDetectionStrategy.Eager,
+    imports: [SpLabelComponent, MatTooltip],
+})
+export class SpSystemNotificationComponent implements OnInit {
+    private notificationService = inject(SystemNotificationService);
+    private destroyRef = inject(DestroyRef);
+
+    notification: SystemNotificationConfig;
+
+    private expiryTimer: Subscription;
+
+    ngOnInit(): void {
+        // Reloads on a fixed interval and immediately after an administrator
+        // has saved in this tab
+        merge(
+            timer(0, NOTIFICATION_POLL_INTERVAL_MS),
+            this.notificationService.changed$,
+        )
+            .pipe(
+                switchMap(() =>
+                    this.notificationService
+                        .getActiveNotification()
+                        // Ignores a failed request, so that one error does not
+                        // end further updates
+                        .pipe(catchError(() => EMPTY)),
+                ),
+                takeUntilDestroyed(this.destroyRef),
+            )
+            .subscribe(notification => this.applyNotification(notification));
+    }
+
+    get tone(): NotificationTone {
+        return toNotificationTone(this.notification?.type);
+    }
+
+    private applyNotification(notification: SystemNotificationConfig): void {
+        this.notification = notification;
+        this.expiryTimer?.unsubscribe();
+
+        if (notification.enabled && notification.expiresAtMillis) {
+            this.scheduleHideOnExpiry(notification.expiresAtMillis);
+        }
+    }
+
+    /**
+     * Hides the notification exactly when it expires, not at the next request.
+     *
+     * @param expiresAtMillis when the notification should disappear.
+     */
+    private scheduleHideOnExpiry(expiresAtMillis: number): void {
+        const delay = expiresAtMillis - Date.now();
+
+        if (delay <= 0) {
+            this.notification = undefined;
+            return;
+        }
+        if (delay > MAX_TIMER_DELAY_MS) {
+            // Too far ahead for a timer, so none is started yet. Each response
+            // calls this method again and starts it once the delay fits.
+            return;
+        }
+
+        this.expiryTimer = timer(delay)
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => (this.notification = undefined));
+    }
+}
diff --git a/ui/src/app/core/components/toolbar/toolbar.component.html b/ui/src/app/core/components/toolbar/toolbar.component.html
index d508fc735d..638f194ed5 100644
--- a/ui/src/app/core/components/toolbar/toolbar.component.html
+++ b/ui/src/app/core/components/toolbar/toolbar.component.html
@@ -21,6 +21,7 @@
         <sp-breadcrumb class="toolbar-breadcrumb"></sp-breadcrumb>
         @if (authenticated) {
             <div class="toolbar-actions" fxLayout fxLayoutAlign="end center">
+                <sp-system-notification></sp-system-notification>
                 <sp-asset-browser-toolbar></sp-asset-browser-toolbar>
                 <button
                     mat-icon-button
diff --git a/ui/src/app/core/components/toolbar/toolbar.component.ts b/ui/src/app/core/components/toolbar/toolbar.component.ts
index d735908b4f..45b28e9c1c 100644
--- a/ui/src/app/core/components/toolbar/toolbar.component.ts
+++ b/ui/src/app/core/components/toolbar/toolbar.component.ts
@@ -42,6 +42,7 @@ import { MatTooltip } from '@angular/material/tooltip';
 import { MatIcon } from '@angular/material/icon';
 import { MatDivider } from '@angular/material/divider';
 import { TranslatePipe } from '@ngx-translate/core';
+import { SpSystemNotificationComponent } from '../system-notification/system-notification.component';
 
 @Component({
     selector: 'sp-toolbar',
@@ -62,6 +63,7 @@ import { TranslatePipe } from '@ngx-translate/core';
         MatDivider,
         MatMenuItem,
         TranslatePipe,
+        SpSystemNotificationComponent,
     ],
 })
 export class ToolbarComponent
diff --git a/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.html b/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.html
index a0e65fcea6..501f20d51b 100644
--- a/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.html
+++ b/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.html
@@ -51,19 +51,24 @@
                             >&nbsp;|&nbsp;{{ dashboard?.description }}</span
                         >
                     }
-                    @if (lastUpdatedAt) {
-                        <sp-label
-                            class="last-updated"
-                            icon="update"
-                            tone="info"
-                            size="small"
-                            variant="soft"
-                            shape="rounded"
-                        >
-                            {{ 'Last updated' | translate }}:
-                            {{ formatLastUpdatedAt() }}
-                        </sp-label>
-                    }
+                    <div class="toolbar-end">
+                        @if (lastUpdatedAt) {
+                            <sp-label
+                                class="last-updated"
+                                icon="update"
+                                tone="info"
+                                size="small"
+                                variant="soft"
+                                shape="rounded"
+                            >
+                                {{ 'Last updated' | translate }}:
+                                {{ formatLastUpdatedAt() }}
+                            </sp-label>
+                        }
+                        <sp-system-notification
+                            class="system-notification"
+                        ></sp-system-notification>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.scss b/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.scss
index 3f6e35da54..8affbef9ea 100644
--- a/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.scss
+++ b/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.scss
@@ -36,19 +36,58 @@
     background: var(--color-bg-1);
 }
 
+.standalone-toolbar .sp-toolbar {
+    flex: 1 1 auto;
+    min-width: 0;
+}
+
+.sp-toolbar .md-toolbar-tools {
+    flex: 1 1 auto;
+    min-width: 0;
+}
+
 .dashboard-title {
     margin-left: 2rem;
     font-size: 1.25rem;
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
 
 .dashboard-description {
     font-size: 1.25rem;
     font-weight: normal;
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.toolbar-end {
+    display: flex;
+    flex: 1 1 auto;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    align-items: center;
+    align-content: center;
+    column-gap: var(--space-lg);
+    row-gap: var(--space-2xs);
+    padding-left: 1rem;
 }
 
 .last-updated {
     display: inline-flex;
-    margin-left: auto;
-    padding-left: 1rem;
+    flex: 0 0 auto;
     white-space: nowrap;
 }
+
+.system-notification {
+    flex: 1 1 8rem;
+    min-width: 0;
+    max-width: max-content;
+}
+
+.system-notification:only-child {
+    margin-left: auto;
+}
diff --git a/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.ts b/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.ts
index d2aed6287a..8023149993 100644
--- a/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.ts
+++ b/ui/src/app/dashboard-kiosk/components/kiosk/dashboard-kiosk.component.ts
@@ -48,6 +48,7 @@ import {
 } from '@ngbracket/ngx-layout/flex';
 import { TranslatePipe } from '@ngx-translate/core';
 import { LastUpdatedFormatterService } from '../../../core-services/time-formatting/last-updated-formatter.service';
+import { SpSystemNotificationComponent } from '../../../core/components/system-notification/system-notification.component';
 
 @Component({
     selector: 'sp-dashboard-kiosk',
@@ -62,6 +63,7 @@ import { LastUpdatedFormatterService } from '../../../core-services/time-formatt
         DashboardGridViewComponent,
         SpLabelComponent,
         TranslatePipe,
+        SpSystemNotificationComponent,
     ],
 })
 export class DashboardKioskComponent implements OnInit, OnDestroy {
diff --git a/ui/src/app/login/components/auth-box/auth-box.component.html b/ui/src/app/login/components/auth-box/auth-box.component.html
index 84ad015c9d..97d07b9fd7 100644
--- a/ui/src/app/login/components/auth-box/auth-box.component.html
+++ b/ui/src/app/login/components/auth-box/auth-box.component.html
@@ -22,6 +22,9 @@
     fxLayoutAlign="center center"
     style="min-height: 100vh !important"
 >
+    <div class="system-notification-outer">
+        <sp-system-notification></sp-system-notification>
+    </div>
     <div
         fxFlex.gt-md="50"
         fxFlex.lt-md="100"
diff --git a/ui/src/app/login/components/auth-box/auth-box.component.scss b/ui/src/app/login/components/auth-box/auth-box.component.scss
index 5dd9fcd023..59916a3e19 100644
--- a/ui/src/app/login/components/auth-box/auth-box.component.scss
+++ b/ui/src/app/login/components/auth-box/auth-box.component.scss
@@ -20,6 +20,16 @@
     background: var(--color-menubar-bg);
 }
 
+.full-background {
+    position: relative;
+}
+
+.system-notification-outer {
+    position: absolute;
+    top: var(--space-xl);
+    right: var(--space-xl);
+}
+
 .auth-box-footer {
     margin-bottom: 20px;
     margin-right: 20px;
diff --git a/ui/src/app/login/components/auth-box/auth-box.component.ts b/ui/src/app/login/components/auth-box/auth-box.component.ts
index a82cbfdeb4..53ba3b40e4 100644
--- a/ui/src/app/login/components/auth-box/auth-box.component.ts
+++ b/ui/src/app/login/components/auth-box/auth-box.component.ts
@@ -31,6 +31,7 @@ import {
 } from '@ngbracket/ngx-layout/flex';
 import { RouterLink, RouterLinkActive } from '@angular/router';
 import { TranslatePipe } from '@ngx-translate/core';
+import { SpSystemNotificationComponent } from '../../../core/components/system-notification/system-notification.component';
 
 @Component({
     selector: 'sp-auth-box',
@@ -44,6 +45,7 @@ import { TranslatePipe } from '@ngx-translate/core';
         RouterLink,
         RouterLinkActive,
         TranslatePipe,
+        SpSystemNotificationComponent,
     ],
 })
 export class AuthBoxComponent {