From 9a84ff2fcd9d82dd8c2390e4832ed58ec5707bce Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Wed, 3 Dec 2025 15:56:29 +0200
Subject: [PATCH 1/2] fixed TbAlarmStatusSubscription update matcher

---
 .../TbAlarmStatusSubscription.java            |  2 +-
 .../server/controller/WebsocketApiTest.java   | 52 +++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java
index 524ce37834..e1b5d2ddfa 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java
@@ -53,7 +53,7 @@ public class TbAlarmStatusSubscription extends TbSubscription<AlarmSubscriptionU
     }
 
     public boolean matches(AlarmInfo alarm) {
-        return !alarm.isCleared() && (this.typeList == null || this.typeList.contains(alarm.getType())) &&
+        return alarm.getOriginator().equals(getEntityId()) && !alarm.isCleared() && (this.typeList == null || this.typeList.contains(alarm.getType())) &&
                 (this.severityList == null || this.severityList.contains(alarm.getSeverity()));
     }
 
diff --git a/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java b/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java
index bebdd5ecb9..6dacf50592 100644
--- a/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java
@@ -34,6 +34,7 @@ import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
+import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
@@ -58,6 +59,7 @@ import org.thingsboard.server.common.data.query.KeyFilter;
 import org.thingsboard.server.common.data.query.NumericFilterPredicate;
 import org.thingsboard.server.common.data.query.SingleEntityFilter;
 import org.thingsboard.server.common.data.query.TsValue;
+import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.service.subscription.SubscriptionErrorCode;
 import org.thingsboard.server.service.subscription.TbAttributeSubscriptionScope;
@@ -478,6 +480,56 @@ public class WebsocketApiTest extends AbstractControllerTest {
         Assert.assertFalse(alarmStatusUpdate5.isActive());
     }
 
+    @Test
+    public void testAlarmStatusWsCmdForPropagatedAlarms() throws Exception {
+        loginTenantAdmin();
+        Device device = new Device();
+        device.setName("Test device");
+        device.setLabel("Label");
+        device.setType("default");
+        device = doPost("/api/device", device, Device.class);
+
+        Asset asset = new Asset();
+        asset.setName("My asset");
+        asset.setType("default");
+        asset = doPost("/api/asset", asset, Asset.class);
+
+        EntityRelation entityRelation = new EntityRelation(asset.getId(), device.getId(), "CONTAINS");
+        doPost("/api/relation", entityRelation);
+
+        AlarmStatusCmd cmd = new AlarmStatusCmd(1, asset.getId(), null, List.of(AlarmSeverity.CRITICAL));
+        getWsClient().send(cmd);
+
+        AlarmStatusUpdate update = JacksonUtil.fromString(getWsClient().waitForReply(), AlarmStatusUpdate.class);
+        Assert.assertEquals(1, update.getCmdId());
+        Assert.assertFalse(update.isActive());
+
+        //create alarm
+        getWsClient().registerWaitForUpdate();
+
+        Alarm alarm = Alarm.builder()
+                .originator(device.getId())
+                .severity(AlarmSeverity.CRITICAL)
+                .type("test_type")
+                .propagate(true)
+                .build();
+
+        alarm = doPost("/api/alarm", alarm, Alarm.class);
+        Assert.assertNotNull(alarm);
+
+        // check no update for asset
+        String msg = getWsClient().waitForUpdate(TimeUnit.SECONDS.toMillis(1));
+        Assert.assertNull(msg);
+
+        // check device
+        AlarmStatusCmd deviceCmd = new AlarmStatusCmd(2, device.getId(), null, List.of(AlarmSeverity.CRITICAL));
+        getWsClient().send(deviceCmd);
+
+        AlarmStatusUpdate deviceUpdate = JacksonUtil.fromString(getWsClient().waitForReply(), AlarmStatusUpdate.class);
+        Assert.assertEquals(2, deviceUpdate.getCmdId());
+        Assert.assertTrue(deviceUpdate.isActive());
+    }
+
     @Test
     public void testAlarmStatusWsCmdWithMaxAlarmsCacheSize() throws Exception {
         loginTenantAdmin();

From 82fc91f113b40ac492534ff61152427ddbb85e57 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Thu, 4 Dec 2025 12:50:59 +0200
Subject: [PATCH 2/2] refactoring

---
 .../server/service/subscription/TbAlarmStatusSubCtx.java       | 3 +++
 .../server/service/subscription/TbAlarmStatusSubscription.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubCtx.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubCtx.java
index b3cd136726..6b3d38e8eb 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubCtx.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubCtx.java
@@ -95,6 +95,9 @@ public class TbAlarmStatusSubCtx extends TbAbstractSubCtx {
     private void handleAlarmStatusSubscriptionUpdate(TbSubscription<AlarmSubscriptionUpdate> sub, AlarmSubscriptionUpdate subscriptionUpdate) {
         try {
             AlarmInfo alarm = subscriptionUpdate.getAlarm();
+            if (!alarm.getOriginator().equals(subscription.getEntityId())) {
+                return;
+            }
             Set<UUID> alarmsIds = subscription.getAlarmIds();
             if (alarmsIds.contains(alarm.getId().getId())) {
                 if (!subscription.matches(alarm) || subscriptionUpdate.isAlarmDeleted()) {
diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java
index e1b5d2ddfa..524ce37834 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java
@@ -53,7 +53,7 @@ public class TbAlarmStatusSubscription extends TbSubscription<AlarmSubscriptionU
     }
 
     public boolean matches(AlarmInfo alarm) {
-        return alarm.getOriginator().equals(getEntityId()) && !alarm.isCleared() && (this.typeList == null || this.typeList.contains(alarm.getType())) &&
+        return !alarm.isCleared() && (this.typeList == null || this.typeList.contains(alarm.getType())) &&
                 (this.severityList == null || this.severityList.contains(alarm.getSeverity()));
     }