Alarm Search Text

application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java

@@ -164,7 +164,7 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc
         if (ctx != null) {
             log.debug("[{}][{}] Updating existing subscriptions using: {}", session.getSessionId(), cmd.getCmdId(), cmd);
             if (cmd.getLatestCmd() != null || cmd.getTsCmd() != null || cmd.getHistoryCmd() != null) {
-                clearSubs(ctx);
+                ctx.clearSubscriptions();
             }
         } else {
             log.debug("[{}][{}] Creating new subscription using: {}", session.getSessionId(), cmd.getCmdId(), cmd);
@@ -259,19 +259,19 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc
         EntityDataQuery edq = new EntityDataQuery(adq.getEntityFilter(), edpl, adq.getEntityFields(), adq.getLatestValues(), adq.getKeyFilters());
         PageData<EntityData> entitiesData = entityService.findEntityDataByQuery(ctx.getTenantId(), ctx.getCustomerId(), edq);
         List<EntityData> entities = entitiesData.getData();
-        ctx.setEntitiesData(entitiesData);
+        ctx.setData(entitiesData);
         ctx.cancelTasks();
+        ctx.clearSubscriptions();
         if (entities.isEmpty()) {
             AlarmDataUpdate update = new AlarmDataUpdate(cmd.getCmdId(), new PageData<>(Collections.emptyList(), 1, 0, false), null);
             wsService.sendWsMsg(ctx.getSessionId(), update);
         } else {
             ctx.fetchAlarms();
+            ctx.createSubscriptions(cmd.getQuery().getLatestValues(), true);
             if (adq.getPageLink().getTimeWindow() > 0) {
-                ctx.createSubscriptions();
                 TbAlarmDataSubCtx finalCtx = ctx;
                 ScheduledFuture<?> task = scheduler.scheduleWithFixedDelay(
-                        finalCtx::cleanupOldAlarms,
+                        finalCtx::cleanupOldAlarms, dynamicPageLinkRefreshInterval, dynamicPageLinkRefreshInterval, TimeUnit.SECONDS);
-                        dynamicPageLinkRefreshInterval, dynamicPageLinkRefreshInterval, TimeUnit.SECONDS);
                 finalCtx.setRefreshTask(task);
             }
         }
@@ -280,12 +280,10 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc
     private void refreshDynamicQuery(TenantId tenantId, CustomerId customerId, TbEntityDataSubCtx finalCtx) {
         try {
             long start = System.currentTimeMillis();
-            TbEntityDataSubCtx.TbEntityDataSubCtxUpdateResult result = finalCtx.update(entityService.findEntityDataByQuery(tenantId, customerId, finalCtx.getQuery()));
+            finalCtx.update(entityService.findEntityDataByQuery(tenantId, customerId, finalCtx.getQuery()));
             long end = System.currentTimeMillis();
             dynamicQueryInvocationCnt.incrementAndGet();
             dynamicQueryTimeSpent.addAndGet(end - start);
-            result.getSubsToCancel().forEach(subId -> localSubscriptionService.cancelSubscription(finalCtx.getSessionId(), subId));
-            result.getSubsToAdd().forEach(localSubscriptionService::addSubscription);
         } catch (Exception e) {
             log.warn("[{}][{}] Failed to refresh query", finalCtx.getSessionId(), finalCtx.getCmdId(), e);
         }
@@ -304,10 +302,6 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc
         }
     }
 
-    private void clearSubs(TbAbstractDataSubCtx ctx) {
-        ctx.clearSubscriptions();
-    }
-
     private TbEntityDataSubCtx createSubCtx(TelemetryWebSocketSessionRef sessionRef, EntityDataCmd cmd) {
         Map<Integer, TbAbstractDataSubCtx> sessionSubs = subscriptionsBySessionId.computeIfAbsent(sessionRef.getSessionId(), k -> new HashMap<>());
         TbEntityDataSubCtx ctx = new TbEntityDataSubCtx(serviceId, wsService, localSubscriptionService, sessionRef, cmd.getCmdId());
@@ -391,7 +385,7 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc
             }
             wsService.sendWsMsg(ctx.getSessionId(), update);
             if (subscribe) {
-                createTelemetrySubscriptions(ctx, keys.stream().map(key -> new EntityKey(EntityKeyType.TIME_SERIES, key)).collect(Collectors.toList()), false);
+                ctx.createSubscriptions(keys.stream().map(key -> new EntityKey(EntityKeyType.TIME_SERIES, key)).collect(Collectors.toList()), false);
             }
             ctx.getData().getData().forEach(ed -> ed.getTimeseries().clear());
             return ctx;
@@ -440,7 +434,7 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc
                         update = new EntityDataUpdate(ctx.getCmdId(), null, ctx.getData().getData());
                     }
                     wsService.sendWsMsg(ctx.getSessionId(), update);
-                    createTelemetrySubscriptions(ctx, latestCmd.getKeys());
+                    ctx.createSubscriptions(latestCmd.getKeys(), true);
                 }
 
                 @Override
@@ -456,19 +450,10 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc
                 wsService.sendWsMsg(ctx.getSessionId(), update);
                 ctx.setInitialDataSent(true);
             }
-            createTelemetrySubscriptions(ctx, latestCmd.getKeys());
+            ctx.createSubscriptions(latestCmd.getKeys(), true);
         }
     }
 
-    private void createTelemetrySubscriptions(TbEntityDataSubCtx ctx, List<EntityKey> keys) {
-        createTelemetrySubscriptions(ctx, keys, true);
-    }
-
-    private void createTelemetrySubscriptions(TbEntityDataSubCtx ctx, List<EntityKey> keys, boolean latest) {
-        List<TbSubscription> tbSubs = ctx.createSubscriptions(keys, latest);
-        tbSubs.forEach(sub -> localSubscriptionService.addSubscription(sub));
-    }
-
     private Map<String, TsValue> toTsValue(List<TsKvEntry> data) {
         return data.stream().collect(Collectors.toMap(TsKvEntry::getKey, value -> new TsValue(value.getTs(), value.getValueAsString())));
     }
@@ -481,7 +466,7 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc
     private void cleanupAndCancel(TbAbstractDataSubCtx ctx) {
         if (ctx != null) {
             ctx.cancelTasks();
-            clearSubs(ctx);
+            ctx.clearSubscriptions();
         }
     }
 

application/src/main/java/org/thingsboard/server/service/subscription/TbAbstractDataSubCtx.java

@@ -22,11 +22,21 @@ import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.query.AbstractDataQuery;
+import org.thingsboard.server.common.data.query.EntityData;
+import org.thingsboard.server.common.data.query.EntityKey;
+import org.thingsboard.server.common.data.query.EntityKeyType;
+import org.thingsboard.server.common.data.query.TsValue;
 import org.thingsboard.server.service.telemetry.TelemetryWebSocketService;
 import org.thingsboard.server.service.telemetry.TelemetryWebSocketSessionRef;
+import org.thingsboard.server.service.telemetry.sub.TelemetrySubscriptionUpdate;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ScheduledFuture;
 
@@ -39,10 +49,13 @@ public abstract class TbAbstractDataSubCtx<T extends AbstractDataQuery> {
     protected final TbLocalSubscriptionService localSubscriptionService;
     protected final TelemetryWebSocketSessionRef sessionRef;
     protected final int cmdId;
+    protected final Map<Integer, EntityId> subToEntityIdMap;
+
+    @Getter
+    protected PageData<EntityData> data;
     @Getter
     @Setter
     protected T query;
-    protected Map<Integer, EntityId> subToEntityIdMap;
     @Setter
     protected volatile ScheduledFuture<?> refreshTask;
 
@@ -53,6 +66,7 @@ public abstract class TbAbstractDataSubCtx<T extends AbstractDataQuery> {
         this.localSubscriptionService = localSubscriptionService;
         this.sessionRef = sessionRef;
         this.cmdId = cmdId;
+        this.subToEntityIdMap = new HashMap<>();
     }
 
     public String getSessionId() {
@@ -67,7 +81,7 @@ public abstract class TbAbstractDataSubCtx<T extends AbstractDataQuery> {
         return sessionRef.getSecurityCtx().getCustomerId();
     }
 
-    public void clearSubscriptions(){
+    public void clearSubscriptions() {
         if (subToEntityIdMap != null) {
             for (Integer subId : subToEntityIdMap.keySet()) {
                 localSubscriptionService.cancelSubscription(sessionRef.getSessionId(), subId);
@@ -76,6 +90,10 @@ public abstract class TbAbstractDataSubCtx<T extends AbstractDataQuery> {
         }
     }
 
+    public void setData(PageData<EntityData> data) {
+        this.data = data;
+    }
+
     public void setRefreshTask(ScheduledFuture<?> task) {
         this.refreshTask = task;
     }
@@ -87,4 +105,103 @@ public abstract class TbAbstractDataSubCtx<T extends AbstractDataQuery> {
         }
     }
 
+
+    public void createSubscriptions(List<EntityKey> keys, boolean resultToLatestValues) {
+        Map<EntityKeyType, List<EntityKey>> keysByType = getEntityKeyByTypeMap(keys);
+        for (EntityData entityData : data.getData()) {
+            List<TbSubscription> entitySubscriptions = addSubscriptions(entityData, keysByType, resultToLatestValues);
+            entitySubscriptions.forEach(localSubscriptionService::addSubscription);
+        }
+    }
+
+    protected Map<EntityKeyType, List<EntityKey>> getEntityKeyByTypeMap(List<EntityKey> keys) {
+        Map<EntityKeyType, List<EntityKey>> keysByType = new HashMap<>();
+        keys.forEach(key -> keysByType.computeIfAbsent(key.getType(), k -> new ArrayList<>()).add(key));
+        return keysByType;
+    }
+
+    protected List<TbSubscription> addSubscriptions(EntityData entityData, Map<EntityKeyType, List<EntityKey>> keysByType, boolean resultToLatestValues) {
+        List<TbSubscription> subscriptionList = new ArrayList<>();
+        keysByType.forEach((keysType, keysList) -> {
+            int subIdx = sessionRef.getSessionSubIdSeq().incrementAndGet();
+            subToEntityIdMap.put(subIdx, entityData.getEntityId());
+            switch (keysType) {
+                case TIME_SERIES:
+                    subscriptionList.add(createTsSub(entityData, subIdx, keysList, resultToLatestValues));
+                    break;
+                case CLIENT_ATTRIBUTE:
+                    subscriptionList.add(createAttrSub(entityData, subIdx, keysType, TbAttributeSubscriptionScope.CLIENT_SCOPE, keysList));
+                    break;
+                case SHARED_ATTRIBUTE:
+                    subscriptionList.add(createAttrSub(entityData, subIdx, keysType, TbAttributeSubscriptionScope.SHARED_SCOPE, keysList));
+                    break;
+                case SERVER_ATTRIBUTE:
+                    subscriptionList.add(createAttrSub(entityData, subIdx, keysType, TbAttributeSubscriptionScope.SERVER_SCOPE, keysList));
+                    break;
+                case ATTRIBUTE:
+                    subscriptionList.add(createAttrSub(entityData, subIdx, keysType, TbAttributeSubscriptionScope.ANY_SCOPE, keysList));
+                    break;
+            }
+        });
+        return subscriptionList;
+    }
+
+    private TbSubscription createAttrSub(EntityData entityData, int subIdx, EntityKeyType keysType, TbAttributeSubscriptionScope scope, List<EntityKey> subKeys) {
+        Map<String, Long> keyStates = buildKeyStats(entityData, keysType, subKeys);
+        log.trace("[{}][{}][{}] Creating attributes subscription for [{}] with keys: {}", serviceId, cmdId, subIdx, entityData.getEntityId(), keyStates);
+        return TbAttributeSubscription.builder()
+                .serviceId(serviceId)
+                .sessionId(sessionRef.getSessionId())
+                .subscriptionId(subIdx)
+                .tenantId(sessionRef.getSecurityCtx().getTenantId())
+                .entityId(entityData.getEntityId())
+                .updateConsumer((s, subscriptionUpdate) -> sendWsMsg(s, subscriptionUpdate, keysType))
+                .allKeys(false)
+                .keyStates(keyStates)
+                .scope(scope)
+                .build();
+    }
+
+    private TbSubscription createTsSub(EntityData entityData, int subIdx, List<EntityKey> subKeys, boolean resultToLatestValues) {
+        Map<String, Long> keyStates = buildKeyStats(entityData, EntityKeyType.TIME_SERIES, subKeys);
+        if (entityData.getTimeseries() != null) {
+            entityData.getTimeseries().forEach((k, v) -> {
+                long ts = Arrays.stream(v).map(TsValue::getTs).max(Long::compareTo).orElse(0L);
+                log.trace("[{}][{}] Updating key: {} with ts: {}", serviceId, cmdId, k, ts);
+                keyStates.put(k, ts);
+            });
+        }
+        log.trace("[{}][{}][{}] Creating time-series subscription for [{}] with keys: {}", serviceId, cmdId, subIdx, entityData.getEntityId(), keyStates);
+        return TbTimeseriesSubscription.builder()
+                .serviceId(serviceId)
+                .sessionId(sessionRef.getSessionId())
+                .subscriptionId(subIdx)
+                .tenantId(sessionRef.getSecurityCtx().getTenantId())
+                .entityId(entityData.getEntityId())
+                .updateConsumer((sessionId, subscriptionUpdate) -> sendWsMsg(sessionId, subscriptionUpdate, EntityKeyType.TIME_SERIES, resultToLatestValues))
+                .allKeys(false)
+                .keyStates(keyStates)
+                .build();
+    }
+
+    private void sendWsMsg(String sessionId, TelemetrySubscriptionUpdate subscriptionUpdate, EntityKeyType keyType) {
+        sendWsMsg(sessionId, subscriptionUpdate, keyType, true);
+    }
+
+    private Map<String, Long> buildKeyStats(EntityData entityData, EntityKeyType keysType, List<EntityKey> subKeys) {
+        Map<String, Long> keyStates = new HashMap<>();
+        subKeys.forEach(key -> keyStates.put(key.getKey(), 0L));
+        if (entityData.getLatest() != null) {
+            Map<String, TsValue> currentValues = entityData.getLatest().get(keysType);
+            if (currentValues != null) {
+                currentValues.forEach((k, v) -> {
+                    log.trace("[{}][{}] Updating key: {} with ts: {}", serviceId, cmdId, k, v.getTs());
+                    keyStates.put(k, v.getTs());
+                });
+            }
+        }
+        return keyStates;
+    }
+
+    abstract void sendWsMsg(String sessionId, TelemetrySubscriptionUpdate subscriptionUpdate, EntityKeyType keyType, boolean resultToLatestValues);
 }

application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmDataSubCtx.java

@@ -27,16 +27,23 @@ import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataPageLink;
 import org.thingsboard.server.common.data.query.AlarmDataQuery;
 import org.thingsboard.server.common.data.query.EntityData;
+import org.thingsboard.server.common.data.query.EntityKey;
+import org.thingsboard.server.common.data.query.EntityKeyType;
+import org.thingsboard.server.common.data.query.TsValue;
 import org.thingsboard.server.dao.alarm.AlarmService;
 import org.thingsboard.server.service.telemetry.TelemetryWebSocketService;
 import org.thingsboard.server.service.telemetry.TelemetryWebSocketSessionRef;
 import org.thingsboard.server.service.telemetry.cmd.v2.AlarmDataUpdate;
 import org.thingsboard.server.service.telemetry.sub.AlarmSubscriptionUpdate;
+import org.thingsboard.server.service.telemetry.sub.TelemetrySubscriptionUpdate;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -50,6 +57,8 @@ public class TbAlarmDataSubCtx extends TbAbstractDataSubCtx<AlarmDataQuery> {
     @Getter
     @Setter
     private final HashMap<AlarmId, AlarmData> alarmsMap;
+
+    private final List<Integer> alarmSubscriptions;
     @Getter
     @Setter
     private PageData<AlarmData> alarms;
@@ -65,20 +74,22 @@ public class TbAlarmDataSubCtx extends TbAbstractDataSubCtx<AlarmDataQuery> {
         this.alarmService = alarmService;
         this.entitiesMap = new LinkedHashMap<>();
         this.alarmsMap = new HashMap<>();
+        this.alarmSubscriptions = new ArrayList<>();
     }
 
     public void fetchAlarms() {
         PageData<AlarmData> alarms = alarmService.findAlarmDataByQueryForEntities(getTenantId(), getCustomerId(),
-                query.getPageLink(), getOrderedEntityIds());
+                query, getOrderedEntityIds());
         alarms = setAndMergeAlarmsData(alarms);
         AlarmDataUpdate update = new AlarmDataUpdate(cmdId, alarms, null);
         wsService.sendWsMsg(getSessionId(), update);
     }
 
-    public void setEntitiesData(PageData<EntityData> entitiesData) {
+    public void setData(PageData<EntityData> data) {
+        super.setData(data);
         entitiesMap.clear();
-        tooManyEntities = entitiesData.hasNext();
+        tooManyEntities = data.hasNext();
-        for (EntityData entityData : entitiesData.getData()) {
+        for (EntityData entityData : data.getData()) {
             entitiesMap.put(entityData.getEntityId(), entityData);
         }
     }
@@ -103,9 +114,13 @@ public class TbAlarmDataSubCtx extends TbAbstractDataSubCtx<AlarmDataQuery> {
         return this.alarms;
     }
 
-    public void createSubscriptions() {
+    @Override
-        clearSubscriptions();
+    public void createSubscriptions(List<EntityKey> keys, boolean resultToLatestValues) {
-        this.subToEntityIdMap = new HashMap<>();
+        super.createSubscriptions(keys, resultToLatestValues);
+        createAlarmSubscriptions();
+    }
+
+    public void createAlarmSubscriptions() {
         AlarmDataPageLink pageLink = query.getPageLink();
         long startTs = System.currentTimeMillis() - pageLink.getTimeWindow();
         for (EntityData entityData : entitiesMap.values()) {
@@ -126,6 +141,28 @@ public class TbAlarmDataSubCtx extends TbAbstractDataSubCtx<AlarmDataQuery> {
         }
     }
 
+    @Override
+    void sendWsMsg(String sessionId, TelemetrySubscriptionUpdate subscriptionUpdate, EntityKeyType keyType, boolean resultToLatestValues) {
+        EntityId entityId = subToEntityIdMap.get(subscriptionUpdate.getSubscriptionId());
+        if (entityId != null) {
+            Map<String, TsValue> latestUpdate = new HashMap<>();
+            subscriptionUpdate.getData().forEach((k, v) -> {
+                Object[] data = (Object[]) v.get(0);
+                latestUpdate.put(k, new TsValue((Long) data[0], (String) data[1]));
+            });
+            EntityData entityData = entitiesMap.get(entityId);
+            entityData.getLatest().computeIfAbsent(keyType, tmp -> new HashMap<>()).putAll(latestUpdate);
+            log.trace("[{}][{}][{}][{}] Received subscription update: {}", sessionId, cmdId, subscriptionUpdate.getSubscriptionId(), keyType, subscriptionUpdate);
+            List<AlarmData> update = alarmsMap.values().stream().filter(alarm -> entityId.equals(alarm.getEntityId())).map(alarm -> {
+                alarm.getLatest().computeIfAbsent(keyType, tmp -> new HashMap<>()).putAll(latestUpdate);
+                return alarm;
+            }).collect(Collectors.toList());
+            wsService.sendWsMsg(sessionId, new AlarmDataUpdate(cmdId, null, update));
+        } else {
+            log.trace("[{}][{}][{}][{}] Received stale subscription update: {}", sessionId, cmdId, subscriptionUpdate.getSubscriptionId(), keyType, subscriptionUpdate);
+        }
+    }
+
     private void sendWsMsg(String sessionId, AlarmSubscriptionUpdate subscriptionUpdate) {
         Alarm alarm = subscriptionUpdate.getAlarm();
         AlarmId alarmId = alarm.getId();
@@ -141,6 +178,7 @@ public class TbAlarmDataSubCtx extends TbAbstractDataSubCtx<AlarmDataQuery> {
             if (onCurrentPage) {
                 if (matchesFilter) {
                     AlarmData updated = new AlarmData(alarm, current.getOriginatorName(), current.getEntityId());
+                    updated.getLatest().putAll(current.getLatest());
                     alarmsMap.put(alarmId, updated);
                     wsService.sendWsMsg(sessionId, new AlarmDataUpdate(cmdId, null, Collections.singletonList(updated)));
                 } else {

application/src/main/java/org/thingsboard/server/service/subscription/TbEntityDataSubCtx.java

@@ -57,8 +57,6 @@ public class TbEntityDataSubCtx extends TbAbstractDataSubCtx<EntityDataQuery> {
     @Setter
     private TimeSeriesCmd tsCmd;
     @Getter
-    private PageData<EntityData> data;
-    @Getter
     @Setter
     private boolean initialDataSent;
     private TimeSeriesCmd curTsCmd;
@@ -70,110 +68,8 @@ public class TbEntityDataSubCtx extends TbAbstractDataSubCtx<EntityDataQuery> {
         super(serviceId, wsService, localSubscriptionService, sessionRef, cmdId);
     }
 
-    public void setData(PageData<EntityData> data) {
+    @Override
-        this.data = data;
+    protected void sendWsMsg(String sessionId, TelemetrySubscriptionUpdate subscriptionUpdate, EntityKeyType keyType, boolean resultToLatestValues) {
-    }
-
-    public List<TbSubscription> createSubscriptions(List<EntityKey> keys, boolean resultToLatestValues) {
-        this.subToEntityIdMap = new HashMap<>();
-        List<TbSubscription> tbSubs = new ArrayList<>();
-        Map<EntityKeyType, List<EntityKey>> keysByType = getEntityKeyByTypeMap(keys);
-        for (EntityData entityData : data.getData()) {
-            tbSubs.addAll(addSubscriptions(entityData, keysByType, resultToLatestValues));
-        }
-        return tbSubs;
-    }
-
-    private Map<EntityKeyType, List<EntityKey>> getEntityKeyByTypeMap(List<EntityKey> keys) {
-        Map<EntityKeyType, List<EntityKey>> keysByType = new HashMap<>();
-        keys.forEach(key -> keysByType.computeIfAbsent(key.getType(), k -> new ArrayList<>()).add(key));
-        return keysByType;
-    }
-
-    private List<TbSubscription> addSubscriptions(EntityData entityData, Map<EntityKeyType, List<EntityKey>> keysByType, boolean resultToLatestValues) {
-        List<TbSubscription> subscriptionList = new ArrayList<>();
-        keysByType.forEach((keysType, keysList) -> {
-            int subIdx = sessionRef.getSessionSubIdSeq().incrementAndGet();
-            subToEntityIdMap.put(subIdx, entityData.getEntityId());
-            switch (keysType) {
-                case TIME_SERIES:
-                    subscriptionList.add(createTsSub(entityData, subIdx, keysList, resultToLatestValues));
-                    break;
-                case CLIENT_ATTRIBUTE:
-                    subscriptionList.add(createAttrSub(entityData, subIdx, keysType, TbAttributeSubscriptionScope.CLIENT_SCOPE, keysList));
-                    break;
-                case SHARED_ATTRIBUTE:
-                    subscriptionList.add(createAttrSub(entityData, subIdx, keysType, TbAttributeSubscriptionScope.SHARED_SCOPE, keysList));
-                    break;
-                case SERVER_ATTRIBUTE:
-                    subscriptionList.add(createAttrSub(entityData, subIdx, keysType, TbAttributeSubscriptionScope.SERVER_SCOPE, keysList));
-                    break;
-                case ATTRIBUTE:
-                    subscriptionList.add(createAttrSub(entityData, subIdx, keysType, TbAttributeSubscriptionScope.ANY_SCOPE, keysList));
-                    break;
-            }
-        });
-        return subscriptionList;
-    }
-
-    private TbSubscription createAttrSub(EntityData entityData, int subIdx, EntityKeyType keysType, TbAttributeSubscriptionScope scope, List<EntityKey> subKeys) {
-        Map<String, Long> keyStates = buildKeyStats(entityData, keysType, subKeys);
-        log.trace("[{}][{}][{}] Creating attributes subscription for [{}] with keys: {}", serviceId, cmdId, subIdx, entityData.getEntityId(), keyStates);
-        return TbAttributeSubscription.builder()
-                .serviceId(serviceId)
-                .sessionId(sessionRef.getSessionId())
-                .subscriptionId(subIdx)
-                .tenantId(sessionRef.getSecurityCtx().getTenantId())
-                .entityId(entityData.getEntityId())
-                .updateConsumer((s, subscriptionUpdate) -> sendWsMsg(s, subscriptionUpdate, keysType))
-                .allKeys(false)
-                .keyStates(keyStates)
-                .scope(scope)
-                .build();
-    }
-
-    private TbSubscription createTsSub(EntityData entityData, int subIdx, List<EntityKey> subKeys, boolean resultToLatestValues) {
-        Map<String, Long> keyStates = buildKeyStats(entityData, EntityKeyType.TIME_SERIES, subKeys);
-        if (entityData.getTimeseries() != null) {
-            entityData.getTimeseries().forEach((k, v) -> {
-                long ts = Arrays.stream(v).map(TsValue::getTs).max(Long::compareTo).orElse(0L);
-                log.trace("[{}][{}] Updating key: {} with ts: {}", serviceId, cmdId, k, ts);
-                keyStates.put(k, ts);
-            });
-        }
-        log.trace("[{}][{}][{}] Creating time-series subscription for [{}] with keys: {}", serviceId, cmdId, subIdx, entityData.getEntityId(), keyStates);
-        return TbTimeseriesSubscription.builder()
-                .serviceId(serviceId)
-                .sessionId(sessionRef.getSessionId())
-                .subscriptionId(subIdx)
-                .tenantId(sessionRef.getSecurityCtx().getTenantId())
-                .entityId(entityData.getEntityId())
-                .updateConsumer((sessionId, subscriptionUpdate) -> sendWsMsg(sessionId, subscriptionUpdate, EntityKeyType.TIME_SERIES, resultToLatestValues))
-                .allKeys(false)
-                .keyStates(keyStates)
-                .build();
-    }
-
-    private Map<String, Long> buildKeyStats(EntityData entityData, EntityKeyType keysType, List<EntityKey> subKeys) {
-        Map<String, Long> keyStates = new HashMap<>();
-        subKeys.forEach(key -> keyStates.put(key.getKey(), 0L));
-        if (entityData.getLatest() != null) {
-            Map<String, TsValue> currentValues = entityData.getLatest().get(keysType);
-            if (currentValues != null) {
-                currentValues.forEach((k, v) -> {
-                    log.trace("[{}][{}] Updating key: {} with ts: {}", serviceId, cmdId, k, v.getTs());
-                    keyStates.put(k, v.getTs());
-                });
-            }
-        }
-        return keyStates;
-    }
-
-    private void sendWsMsg(String sessionId, TelemetrySubscriptionUpdate subscriptionUpdate, EntityKeyType keyType) {
-        sendWsMsg(sessionId, subscriptionUpdate, keyType, true);
-    }
-
-    private void sendWsMsg(String sessionId, TelemetrySubscriptionUpdate subscriptionUpdate, EntityKeyType keyType, boolean resultToLatestValues) {
         EntityId entityId = subToEntityIdMap.get(subscriptionUpdate.getSubscriptionId());
         if (entityId != null) {
             log.trace("[{}][{}][{}][{}] Received subscription update: {}", sessionId, cmdId, subscriptionUpdate.getSubscriptionId(), keyType, subscriptionUpdate);
@@ -272,8 +168,8 @@ public class TbEntityDataSubCtx extends TbAbstractDataSubCtx<EntityDataQuery> {
     private EntityData getDataForEntity(EntityId entityId) {
         return data.getData().stream().filter(item -> item.getEntityId().equals(entityId)).findFirst().orElse(null);
     }
-    
+
-    public TbEntityDataSubCtxUpdateResult update(PageData<EntityData> newData) {
+    public void update(PageData<EntityData> newData) {
         Map<EntityId, EntityData> oldDataMap;
         if (data != null && !data.getData().isEmpty()) {
             oldDataMap = data.getData().stream().collect(Collectors.toMap(EntityData::getEntityId, Function.identity()));
@@ -283,7 +179,6 @@ public class TbEntityDataSubCtx extends TbAbstractDataSubCtx<EntityDataQuery> {
         Map<EntityId, EntityData> newDataMap = newData.getData().stream().collect(Collectors.toMap(EntityData::getEntityId, Function.identity()));
         if (oldDataMap.size() == newDataMap.size() && oldDataMap.keySet().equals(newDataMap.keySet())) {
             log.trace("[{}][{}] No updates to entity data found", sessionRef.getSessionId(), cmdId);
-            return TbEntityDataSubCtxUpdateResult.EMPTY;
         } else {
             this.data = newData;
             List<Integer> subIdsToCancel = new ArrayList<>();
@@ -322,7 +217,8 @@ public class TbEntityDataSubCtx extends TbAbstractDataSubCtx<EntityDataQuery> {
                 }
             }
             wsService.sendWsMsg(sessionRef.getSessionId(), new EntityDataUpdate(cmdId, data, null));
-            return new TbEntityDataSubCtxUpdateResult(subIdsToCancel, subsToAdd);
+            subIdsToCancel.forEach(subId -> localSubscriptionService.cancelSubscription(getSessionId(), subId));
+            subsToAdd.forEach(localSubscriptionService::addSubscription);
         }
     }
 
@@ -330,14 +226,4 @@ public class TbEntityDataSubCtx extends TbAbstractDataSubCtx<EntityDataQuery> {
         curTsCmd = cmd.getTsCmd();
         latestValueCmd = cmd.getLatestCmd();
     }
-
-    @Data
-    @AllArgsConstructor
-    public static class TbEntityDataSubCtxUpdateResult {
-
-        private static TbEntityDataSubCtxUpdateResult EMPTY = new TbEntityDataSubCtxUpdateResult(Collections.emptyList(), Collections.emptyList());
-
-        private List<Integer> subsToCancel;
-        private List<TbSubscription> subsToAdd;
-    }
 }

application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java

@@ -45,6 +45,7 @@ import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataPageLink;
+import org.thingsboard.server.common.data.query.AlarmDataQuery;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
@@ -149,8 +150,8 @@ public class DefaultAlarmSubscriptionService extends AbstractSubscriptionService
     }
 
     @Override
-    public PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId, CustomerId customerId, AlarmDataPageLink pageLink, Collection<EntityId> orderedEntityIds) {
+    public PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId, CustomerId customerId, AlarmDataQuery query, Collection<EntityId> orderedEntityIds) {
-        return alarmService.findAlarmDataByQueryForEntities(tenantId, customerId, pageLink, orderedEntityIds);
+        return alarmService.findAlarmDataByQueryForEntities(tenantId, customerId, query, orderedEntityIds);
     }
 
     @Override

common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmService.java

@@ -59,5 +59,5 @@ public interface AlarmService {
     ListenableFuture<Alarm> findLatestByOriginatorAndType(TenantId tenantId, EntityId originator, String type);
 
     PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId, CustomerId customerId,
-                                                        AlarmDataPageLink pageLink, Collection<EntityId> orderedEntityIds);
+                                                        AlarmDataQuery query, Collection<EntityId> orderedEntityIds);
 }

common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmDataQuery.java

@@ -16,6 +16,7 @@
 package org.thingsboard.server.common.data.query;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Getter;
 import lombok.ToString;
 
 import java.util.List;
@@ -23,6 +24,9 @@ import java.util.List;
 @ToString
 public class AlarmDataQuery extends AbstractDataQuery<AlarmDataPageLink> {
 
+    @Getter
+    protected List<EntityKey> alarmFields;
+
     public AlarmDataQuery() {
     }
 
@@ -30,12 +34,13 @@ public class AlarmDataQuery extends AbstractDataQuery<AlarmDataPageLink> {
         super(entityFilter);
     }
 
-    public AlarmDataQuery(EntityFilter entityFilter, AlarmDataPageLink pageLink, List<EntityKey> entityFields, List<EntityKey> latestValues, List<KeyFilter> keyFilters) {
+    public AlarmDataQuery(EntityFilter entityFilter, AlarmDataPageLink pageLink, List<EntityKey> entityFields, List<EntityKey> latestValues, List<KeyFilter> keyFilters, List<EntityKey> alarmFields) {
         super(entityFilter, pageLink, entityFields, latestValues, keyFilters);
+        this.alarmFields = alarmFields;
     }
 
     @JsonIgnore
     public AlarmDataQuery next() {
-        return new AlarmDataQuery(getEntityFilter(), getPageLink().nextPageLink(), entityFields, latestValues, keyFilters);
+        return new AlarmDataQuery(getEntityFilter(), getPageLink().nextPageLink(), entityFields, latestValues, keyFilters, alarmFields);
     }
 }

dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java

@@ -47,5 +47,5 @@ public interface AlarmDao extends Dao<Alarm> {
     PageData<AlarmInfo> findAlarms(TenantId tenantId, AlarmQuery query);
 
     PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId, CustomerId customerId,
-                                                        AlarmDataPageLink pageLink, Collection<EntityId> orderedEntityIds);
+                                                        AlarmDataQuery query, Collection<EntityId> orderedEntityIds);
 }

dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java

@@ -133,10 +133,10 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
 
     @Override
     public PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId, CustomerId customerId,
-                                                               AlarmDataPageLink pageLink, Collection<EntityId> orderedEntityIds) {
+                                                               AlarmDataQuery query, Collection<EntityId> orderedEntityIds) {
         validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
         validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
-        return alarmDao.findAlarmDataByQueryForEntities(tenantId, customerId, pageLink, orderedEntityIds);
+        return alarmDao.findAlarmDataByQueryForEntities(tenantId, customerId, query, orderedEntityIds);
     }
 
     @Override

dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java

@@ -57,7 +57,7 @@ public interface AlarmRepository extends CrudRepository<AlarmEntity, UUID> {
             "AND (a.originatorId = :affectedEntityId or re.fromId IS NOT NULL) " +
             "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
             "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-            "AND (:alarmStatuses IS NULL OR a.status in :alarmStatuses) " +
+            "AND ((:alarmStatuses) IS NULL OR a.status in (:alarmStatuses)) " +
             "AND (LOWER(a.type) LIKE LOWER(CONCAT(:searchText, '%'))" +
             "OR LOWER(a.severity) LIKE LOWER(CONCAT(:searchText, '%'))" +
             "OR LOWER(a.status) LIKE LOWER(CONCAT(:searchText, '%')))",
@@ -71,7 +71,7 @@ public interface AlarmRepository extends CrudRepository<AlarmEntity, UUID> {
                     "AND (a.originatorId = :affectedEntityId or re.fromId IS NOT NULL) " +
                     "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
                     "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-                    "AND (:alarmStatuses IS NULL OR a.status in :alarmStatuses) " +
+                    "AND ((:alarmStatuses) IS NULL OR a.status in (:alarmStatuses)) " +
                     "AND (LOWER(a.type) LIKE LOWER(CONCAT(:searchText, '%'))" +
                     "OR LOWER(a.severity) LIKE LOWER(CONCAT(:searchText, '%'))" +
                     "OR LOWER(a.status) LIKE LOWER(CONCAT(:searchText, '%')))")
@@ -80,7 +80,7 @@ public interface AlarmRepository extends CrudRepository<AlarmEntity, UUID> {
                                      @Param("affectedEntityType") String affectedEntityType,
                                      @Param("startTime") Long startTime,
                                      @Param("endTime") Long endTime,
-                                     @Param("alarmStatuses") Set<AlarmStatus> alarmStatuses,
+                                     @Param("alarmStatuses") List<AlarmStatus> alarmStatuses,
                                      @Param("searchText") String searchText,
                                      Pageable pageable);
 

dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java

@@ -32,6 +32,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataPageLink;
+import org.thingsboard.server.common.data.query.AlarmDataQuery;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.alarm.AlarmDao;
 import org.thingsboard.server.dao.model.sql.AlarmEntity;
@@ -40,6 +41,7 @@ import org.thingsboard.server.dao.sql.JpaAbstractDao;
 import org.thingsboard.server.dao.sql.query.AlarmQueryRepository;
 import org.thingsboard.server.dao.util.SqlDao;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -112,7 +114,7 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
                         affectedEntity.getEntityType().name(),
                         query.getPageLink().getStartTime(),
                         query.getPageLink().getEndTime(),
-                        statusSet,
+                        new ArrayList<>(statusSet),
                         Objects.toString(query.getPageLink().getTextSearch(), ""),
                         DaoUtil.toPageable(query.getPageLink())
                 )
@@ -120,7 +122,7 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
     }
 
     @Override
-    public PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId, CustomerId customerId, AlarmDataPageLink pageLink, Collection<EntityId> orderedEntityIds) {
+    public PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId, CustomerId customerId, AlarmDataQuery query, Collection<EntityId> orderedEntityIds) {
-        return alarmQueryRepository.findAlarmDataByQueryForEntities(tenantId, customerId, pageLink, orderedEntityIds);
+        return alarmQueryRepository.findAlarmDataByQueryForEntities(tenantId, customerId, query, orderedEntityIds);
     }
 }

dao/src/main/java/org/thingsboard/server/dao/sql/audit/AuditLogRepository.java

@@ -33,7 +33,7 @@ public interface AuditLogRepository extends PagingAndSortingRepository<AuditLogE
             "a.tenantId = :tenantId " +
             "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
             "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-            "AND (:actionTypes IS NULL OR a.actionType in :actionTypes) " +
+            "AND ((:actionTypes) IS NULL OR a.actionType in (:actionTypes)) " +
             "AND (LOWER(a.entityType) LIKE LOWER(CONCAT(:textSearch, '%'))" +
             "OR LOWER(a.entityName) LIKE LOWER(CONCAT(:textSearch, '%'))" +
             "OR LOWER(a.userName) LIKE LOWER(CONCAT(:textSearch, '%'))" +
@@ -53,7 +53,7 @@ public interface AuditLogRepository extends PagingAndSortingRepository<AuditLogE
             "AND a.entityType = :entityType AND a.entityId = :entityId " +
             "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
             "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-            "AND (:actionTypes IS NULL OR a.actionType in :actionTypes) " +
+            "AND ((:actionTypes) IS NULL OR a.actionType in (:actionTypes)) " +
             "AND (LOWER(a.entityName) LIKE LOWER(CONCAT(:textSearch, '%'))" +
             "OR LOWER(a.userName) LIKE LOWER(CONCAT(:textSearch, '%'))" +
             "OR LOWER(a.actionType) LIKE LOWER(CONCAT(:textSearch, '%'))" +
@@ -73,7 +73,7 @@ public interface AuditLogRepository extends PagingAndSortingRepository<AuditLogE
             "AND a.customerId = :customerId " +
             "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
             "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-            "AND (:actionTypes IS NULL OR a.actionType in :actionTypes) " +
+            "AND ((:actionTypes) IS NULL OR a.actionType in (:actionTypes)) " +
             "AND (LOWER(a.entityType) LIKE LOWER(CONCAT(:textSearch, '%'))" +
             "OR LOWER(a.entityName) LIKE LOWER(CONCAT(:textSearch, '%'))" +
             "OR LOWER(a.userName) LIKE LOWER(CONCAT(:textSearch, '%'))" +
@@ -93,7 +93,7 @@ public interface AuditLogRepository extends PagingAndSortingRepository<AuditLogE
             "AND a.userId = :userId " +
             "AND (:startTime IS NULL OR a.createdTime >= :startTime) " +
             "AND (:endTime IS NULL OR a.createdTime <= :endTime) " +
-            "AND (:actionTypes IS NULL OR a.actionType in :actionTypes) " +
+            "AND ((:actionTypes) IS NULL OR a.actionType in (:actionTypes)) " +
             "AND (LOWER(a.entityType) LIKE LOWER(CONCAT(:textSearch, '%'))" +
             "OR LOWER(a.entityName) LIKE LOWER(CONCAT(:textSearch, '%'))" +
             "OR LOWER(a.actionType) LIKE LOWER(CONCAT(:textSearch, '%'))" +

dao/src/main/java/org/thingsboard/server/dao/sql/query/AlarmQueryRepository.java

@@ -21,12 +21,13 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataPageLink;
+import org.thingsboard.server.common.data.query.AlarmDataQuery;
 
 import java.util.Collection;
 
 public interface AlarmQueryRepository {
 
     PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId, CustomerId customerId,
-                                                        AlarmDataPageLink pageLink, Collection<EntityId> orderedEntityIds);
+                                                        AlarmDataQuery query, Collection<EntityId> orderedEntityIds);
 
 }

dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java

@@ -16,6 +16,7 @@
 package org.thingsboard.server.dao.sql.query;
 
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Repository;
@@ -29,16 +30,20 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataPageLink;
+import org.thingsboard.server.common.data.query.AlarmDataQuery;
 import org.thingsboard.server.common.data.query.EntityDataSortOrder;
+import org.thingsboard.server.common.data.query.EntityKey;
 import org.thingsboard.server.common.data.query.EntityKeyType;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.util.SqlDao;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -48,6 +53,7 @@ import java.util.stream.Collectors;
 public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
 
     private static final Map<String, String> alarmFieldColumnMap = new HashMap<>();
+    private static final List<String> uniqueAlarmFields = new ArrayList<>();
 
     static {
         alarmFieldColumnMap.put("createdTime", ModelConstants.CREATED_TIME_PROPERTY);
@@ -66,6 +72,8 @@ public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
         alarmFieldColumnMap.put("originator_id", ModelConstants.ALARM_ORIGINATOR_ID_PROPERTY);
         alarmFieldColumnMap.put("originator_type", ModelConstants.ALARM_ORIGINATOR_TYPE_PROPERTY);
         alarmFieldColumnMap.put("originator", "originator_name");
+
+        uniqueAlarmFields.addAll(new HashSet<>(alarmFieldColumnMap.values()));
     }
 
     public static final String SELECT_ORIGINATOR_NAME = " CASE" +
@@ -109,7 +117,8 @@ public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
 
     @Override
     public PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId, CustomerId customerId,
-                                                               AlarmDataPageLink pageLink, Collection<EntityId> orderedEntityIds) {
+                                                               AlarmDataQuery query, Collection<EntityId> orderedEntityIds) {
+        AlarmDataPageLink pageLink = query.getPageLink();
         QueryContext ctx = new QueryContext();
         ctx.addUuidListParameter("entity_ids", orderedEntityIds.stream().map(EntityId::getId).collect(Collectors.toList()));
 
@@ -208,10 +217,15 @@ public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
             }
         }
 
-        String countQuery = fromPart.toString() + wherePart.toString();
+        String textSearchQuery = buildTextSearchQuery(ctx, query.getAlarmFields(), pageLink.getTextSearch());
-        int totalElements = jdbcTemplate.queryForObject(String.format("select count(*) %s", countQuery), ctx, Integer.class);
+        String mainQuery = selectPart.toString() + fromPart.toString() + wherePart.toString();
+        if (!textSearchQuery.isEmpty()) {
+            mainQuery = String.format("select * from (%s) a WHERE %s", mainQuery, textSearchQuery);
+        }
+        String countQuery = mainQuery;
+        int totalElements = jdbcTemplate.queryForObject(String.format("select count(*) from (%s) result", countQuery), ctx, Integer.class);
 
-        String dataQuery = selectPart.toString() + countQuery + sortPart;
+        String dataQuery = mainQuery + sortPart;
 
         int startIndex = pageLink.getPageSize() * pageLink.getPage();
         if (pageLink.getPageSize() > 0) {
@@ -221,6 +235,24 @@ public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
         return AlarmDataAdapter.createAlarmData(pageLink, rows, totalElements, orderedEntityIds);
     }
 
+    private String buildTextSearchQuery(QueryContext ctx, List<EntityKey> selectionMapping, String searchText) {
+        if (!StringUtils.isEmpty(searchText) && selectionMapping != null && !selectionMapping.isEmpty()) {
+            String lowerSearchText = searchText.toLowerCase() + "%";
+            List<String> searchPredicates = selectionMapping.stream()
+                    .map(mapping -> alarmFieldColumnMap.get(mapping.getKey()))
+                    .filter(Objects::nonNull)
+                    .map(mapping -> {
+                                String paramName = mapping + "_lowerSearchText";
+                                ctx.addStringParameter(paramName, lowerSearchText);
+                                return String.format("LOWER(cast(%s as varchar)) LIKE concat('%%', :%s, '%%')", mapping, paramName);
+                            }
+                    ).collect(Collectors.toList());
+            return String.format("%s", String.join(" or ", searchPredicates));
+        } else {
+            return "";
+        }
+    }
+
     private String buildPermissionsQuery(TenantId tenantId, CustomerId customerId, QueryContext ctx) {
         StringBuilder permissionsQuery = new StringBuilder();
         ctx.addUuidParameter("permissions_tenant_id", tenantId.getId());

dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java

@@ -38,6 +38,7 @@ import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataPageLink;
 import org.thingsboard.server.common.data.query.AlarmDataQuery;
+import org.thingsboard.server.common.data.query.DeviceTypeFilter;
 import org.thingsboard.server.common.data.query.EntityDataSortOrder;
 import org.thingsboard.server.common.data.query.EntityKey;
 import org.thingsboard.server.common.data.query.EntityKeyType;
@@ -261,10 +262,10 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         pageLink.setSeverityList(Arrays.asList(AlarmSeverity.CRITICAL, AlarmSeverity.WARNING));
         pageLink.setStatusList(Arrays.asList(AlarmSearchStatus.ACTIVE));
 
-        PageData<AlarmData> tenantAlarms = alarmService.findAlarmDataByQueryForEntities(tenantId, new CustomerId(CustomerId.NULL_UUID), pageLink, Arrays.asList(tenantDevice.getId(), customerDevice.getId()));
+        PageData<AlarmData> tenantAlarms = alarmService.findAlarmDataByQueryForEntities(tenantId, new CustomerId(CustomerId.NULL_UUID), toQuery(pageLink), Arrays.asList(tenantDevice.getId(), customerDevice.getId()));
         Assert.assertEquals(2, tenantAlarms.getData().size());
 
-        PageData<AlarmData> customerAlarms = alarmService.findAlarmDataByQueryForEntities(tenantId, customer.getId(), pageLink, Arrays.asList(tenantDevice.getId(), customerDevice.getId()));
+        PageData<AlarmData> customerAlarms = alarmService.findAlarmDataByQueryForEntities(tenantId, customer.getId(), toQuery(pageLink), Arrays.asList(tenantDevice.getId(), customerDevice.getId()));
         Assert.assertEquals(1, customerAlarms.getData().size());
         Assert.assertEquals(deviceAlarm, customerAlarms.getData().get(0));
 
@@ -277,7 +278,14 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
         Assert.assertEquals(tenantAlarm, alarms.getData().get(0));
+    }
+
+    private AlarmDataQuery toQuery(AlarmDataPageLink pageLink){
+        return toQuery(pageLink, Collections.EMPTY_LIST);
+    }
 
+    private AlarmDataQuery toQuery(AlarmDataPageLink pageLink, List<EntityKey> alarmFields){
+        return new AlarmDataQuery(new DeviceTypeFilter(), pageLink, null, null, null, alarmFields);
     }
 
     @Test
@@ -314,7 +322,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         pageLink.setSeverityList(Arrays.asList(AlarmSeverity.CRITICAL, AlarmSeverity.WARNING));
         pageLink.setStatusList(Arrays.asList(AlarmSearchStatus.ACTIVE));
 
-        PageData<AlarmData> alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, new CustomerId(CustomerId.NULL_UUID), pageLink, Collections.singletonList(childId));
+        PageData<AlarmData> alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, new CustomerId(CustomerId.NULL_UUID), toQuery(pageLink), Collections.singletonList(childId));
 
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
@@ -330,13 +338,13 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         pageLink.setSeverityList(Arrays.asList(AlarmSeverity.CRITICAL, AlarmSeverity.WARNING));
         pageLink.setStatusList(Arrays.asList(AlarmSearchStatus.ACTIVE));
 
-        alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, new CustomerId(CustomerId.NULL_UUID), pageLink, Collections.singletonList(childId));
+        alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, new CustomerId(CustomerId.NULL_UUID), toQuery(pageLink), Collections.singletonList(childId));
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
         Assert.assertEquals(created, new Alarm(alarms.getData().get(0)));
 
         pageLink.setSearchPropagatedAlarms(true);
-        alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, new CustomerId(CustomerId.NULL_UUID), pageLink, Collections.singletonList(childId));
+        alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, new CustomerId(CustomerId.NULL_UUID), toQuery(pageLink), Collections.singletonList(childId));
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
         Assert.assertEquals(created, new Alarm(alarms.getData().get(0)));
@@ -357,7 +365,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         pageLink.setSeverityList(Arrays.asList(AlarmSeverity.CRITICAL, AlarmSeverity.WARNING));
         pageLink.setStatusList(Arrays.asList(AlarmSearchStatus.ACTIVE));
 
-        alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, new CustomerId(CustomerId.NULL_UUID), pageLink, Collections.singletonList(childId));
+        alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, new CustomerId(CustomerId.NULL_UUID), toQuery(pageLink), Collections.singletonList(childId));
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
         Assert.assertEquals(created, alarms.getData().get(0));
@@ -373,7 +381,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         pageLink.setSeverityList(Arrays.asList(AlarmSeverity.CRITICAL, AlarmSeverity.WARNING));
         pageLink.setStatusList(Arrays.asList(AlarmSearchStatus.ACTIVE));
 
-        alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, new CustomerId(CustomerId.NULL_UUID), pageLink, Collections.singletonList(parentId));
+        alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, new CustomerId(CustomerId.NULL_UUID), toQuery(pageLink), Collections.singletonList(parentId));
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
         Assert.assertEquals(created, alarms.getData().get(0));
@@ -418,7 +426,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         pageLink.setSeverityList(Arrays.asList(AlarmSeverity.CRITICAL, AlarmSeverity.WARNING));
         pageLink.setStatusList(Arrays.asList(AlarmSearchStatus.ACTIVE));
 
-        alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, new CustomerId(CustomerId.NULL_UUID), pageLink, Collections.singletonList(parentId));
+        alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, new CustomerId(CustomerId.NULL_UUID), toQuery(pageLink), Collections.singletonList(parentId));
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
         Assert.assertEquals(created, alarms.getData().get(0));
@@ -436,7 +444,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
         pageLink.setSeverityList(Arrays.asList(AlarmSeverity.CRITICAL, AlarmSeverity.WARNING));
         pageLink.setStatusList(Arrays.asList(AlarmSearchStatus.ACTIVE));
 
-        alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, new CustomerId(CustomerId.NULL_UUID), pageLink, Collections.singletonList(childId));
+        alarms = alarmService.findAlarmDataByQueryForEntities(tenantId, new CustomerId(CustomerId.NULL_UUID), toQuery(pageLink), Collections.singletonList(childId));
         Assert.assertNotNull(alarms.getData());
         Assert.assertEquals(1, alarms.getData().size());
         Assert.assertEquals(created, alarms.getData().get(0));

rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/RuleEngineAlarmService.java

@@ -33,6 +33,7 @@ import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.query.AlarmData;
 import org.thingsboard.server.common.data.query.AlarmDataPageLink;
+import org.thingsboard.server.common.data.query.AlarmDataQuery;
 
 import java.util.Collection;
 import java.util.List;
@@ -60,5 +61,5 @@ public interface RuleEngineAlarmService {
 
     AlarmSeverity findHighestAlarmSeverity(TenantId tenantId, EntityId entityId, AlarmSearchStatus alarmSearchStatus, AlarmStatus alarmStatus);
 
-    PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId, CustomerId customerId, AlarmDataPageLink pageLink, Collection<EntityId> orderedEntityIds);
+    PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId, CustomerId customerId, AlarmDataQuery query, Collection<EntityId> orderedEntityIds);
 }