Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge

Volodymyr Babak
2 parents 02d1bad0 0e7af5a6
Showing 17 changed files with 114 additions and 125 deletions
application/src/main/java/org/thingsboard/server/controller/AlarmController.java
application/src/main/java/org/thingsboard/server/controller/AssetController.java
application/src/main/java/org/thingsboard/server/controller/AuthController.java
application/src/main/java/org/thingsboard/server/controller/BaseController.java
application/src/main/java/org/thingsboard/server/controller/CustomerController.java
application/src/main/java/org/thingsboard/server/controller/DashboardController.java
application/src/main/java/org/thingsboard/server/controller/DeviceController.java
application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java
application/src/main/java/org/thingsboard/server/controller/EdgeController.java
application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
application/src/main/java/org/thingsboard/server/controller/EntityViewController.java
application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
application/src/main/java/org/thingsboard/server/controller/UserController.java
application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java
application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java
application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java
ui-ngx/src/assets/locale/locale.constant-en_US.json
--- a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
View file @555778b
+++ b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
View file @555778b
@@ -95,8 +95,7 @@ public class AlarmController extends BaseController {
                     getCurrentUser().getCustomerId(),
                     alarm.getId() == null ? ActionType.ADDED : ActionType.UPDATED, null);
-            sendNotificationMsgToEdgeService(getTenantId(), savedAlarm.getId(), EntityType.ALARM,
-                    alarm.getId() == null ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);
+            sendEntityNotificationMsg(getTenantId(), savedAlarm.getId(), alarm.getId() == null ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);
             return savedAlarm;
         } catch (Exception e) {
@@ -115,7 +114,7 @@ public class AlarmController extends BaseController {
             AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
             checkAlarmId(alarmId, Operation.WRITE);
-            sendNotificationMsgToEdgeService(getTenantId(), alarmId, EntityType.ALARM, EdgeEventActionType.DELETED);
+            sendEntityNotificationMsg(getTenantId(), alarmId, EdgeEventActionType.DELETED);
             return alarmService.deleteAlarm(getTenantId(), alarmId);
          } catch (Exception e) {
@@ -137,7 +136,7 @@ public class AlarmController extends BaseController {
             alarm.setStatus(alarm.getStatus().isCleared() ? AlarmStatus.CLEARED_ACK : AlarmStatus.ACTIVE_ACK);
             logEntityAction(alarm.getOriginator(), alarm, getCurrentUser().getCustomerId(), ActionType.ALARM_ACK, null);
-            sendNotificationMsgToEdgeService(getTenantId(), alarmId, EntityType.ALARM, EdgeEventActionType.ALARM_ACK);
+            sendEntityNotificationMsg(getTenantId(), alarmId, EdgeEventActionType.ALARM_ACK);
         } catch (Exception e) {
             throw handleException(e);
         }
@@ -157,7 +156,7 @@ public class AlarmController extends BaseController {
             alarm.setStatus(alarm.getStatus().isAck() ? AlarmStatus.CLEARED_ACK : AlarmStatus.CLEARED_UNACK);
             logEntityAction(alarm.getOriginator(), alarm, getCurrentUser().getCustomerId(), ActionType.ALARM_CLEAR, null);
-            sendNotificationMsgToEdgeService(getTenantId(), alarmId, EntityType.ALARM, EdgeEventActionType.ALARM_CLEAR);
+            sendEntityNotificationMsg(getTenantId(), alarmId, EdgeEventActionType.ALARM_CLEAR);
         } catch (Exception e) {
             throw handleException(e);
         }
--- a/application/src/main/java/org/thingsboard/server/controller/AssetController.java
View file @555778b
+++ b/application/src/main/java/org/thingsboard/server/controller/AssetController.java
View file @555778b
@@ -113,7 +113,7 @@ public class AssetController extends BaseController {
                     asset.getId() == null ? ActionType.ADDED : ActionType.UPDATED, null);
             if (asset.getId() != null) {
-                sendNotificationMsgToEdgeService(savedAsset.getTenantId(), savedAsset.getId(), EntityType.ASSET, EdgeEventActionType.UPDATED);
+                sendEntityNotificationMsg(savedAsset.getTenantId(), savedAsset.getId(), EdgeEventActionType.UPDATED);
             }
             return savedAsset;
@@ -141,7 +141,7 @@ public class AssetController extends BaseController {
                     asset.getCustomerId(),
                     ActionType.DELETED, null, strAssetId);
-            sendDeleteNotificationMsgToEdgeService(getTenantId(), assetId, EntityType.ASSET, relatedEdgeIds);
+            sendDeleteNotificationMsg(getTenantId(), assetId, relatedEdgeIds);
         } catch (Exception e) {
             logEntityAction(emptyId(EntityType.ASSET),
                     null,
@@ -171,7 +171,7 @@ public class AssetController extends BaseController {
                     savedAsset.getCustomerId(),
                     ActionType.ASSIGNED_TO_CUSTOMER, null, strAssetId, strCustomerId, customer.getName());
-            sendNotificationMsgToEdgeService(savedAsset.getTenantId(), savedAsset.getId(),
+            sendEntityAssignToCustomerNotificationMsg(savedAsset.getTenantId(), savedAsset.getId(),
                     customerId, EdgeEventActionType.ASSIGNED_TO_CUSTOMER);
             return savedAsset;
@@ -205,7 +205,7 @@ public class AssetController extends BaseController {
                     asset.getCustomerId(),
                     ActionType.UNASSIGNED_FROM_CUSTOMER, null, strAssetId, customer.getId().toString(), customer.getName());
-            sendNotificationMsgToEdgeService(savedAsset.getTenantId(), savedAsset.getId(),
+            sendEntityAssignToCustomerNotificationMsg(savedAsset.getTenantId(), savedAsset.getId(),
                     customer.getId(), EdgeEventActionType.UNASSIGNED_FROM_CUSTOMER);
             return savedAsset;
@@ -442,7 +442,7 @@ public class AssetController extends BaseController {
                     savedAsset.getCustomerId(),
                     ActionType.ASSIGNED_TO_EDGE, null, strAssetId, strEdgeId, edge.getName());
-            sendNotificationMsgToEdgeService(getTenantId(), edgeId, savedAsset.getId(), EntityType.ASSET, EdgeEventActionType.ASSIGNED_TO_EDGE);
+            sendEntityAssignToEdgeNotificationMsg(getTenantId(), edgeId, savedAsset.getId(), EdgeEventActionType.ASSIGNED_TO_EDGE);
             return  savedAsset;
         } catch (Exception e) {
@@ -475,7 +475,7 @@ public class AssetController extends BaseController {
                     asset.getCustomerId(),
                     ActionType.UNASSIGNED_FROM_EDGE, null, strAssetId, strEdgeId, edge.getName());
-            sendNotificationMsgToEdgeService(getTenantId(), edgeId, savedAsset.getId(), EntityType.ASSET, EdgeEventActionType.UNASSIGNED_FROM_EDGE);
+            sendEntityAssignToEdgeNotificationMsg(getTenantId(), edgeId, savedAsset.getId(), EdgeEventActionType.UNASSIGNED_FROM_EDGE);
             return savedAsset;
         } catch (Exception e) {
--- a/application/src/main/java/org/thingsboard/server/controller/AuthController.java
View file @555778b
+++ b/application/src/main/java/org/thingsboard/server/controller/AuthController.java
View file @555778b
@@ -33,7 +33,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.rule.engine.api.MailService;
-import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
@@ -120,7 +119,7 @@ public class AuthController extends BaseController {
             userCredentials.setPassword(passwordEncoder.encode(newPassword));
             userService.replaceUserCredentials(securityUser.getTenantId(), userCredentials);
-            sendNotificationMsgToEdgeService(getTenantId(), userCredentials.getUserId(), EntityType.USER, EdgeEventActionType.CREDENTIALS_UPDATED);
+            sendEntityNotificationMsg(getTenantId(), userCredentials.getUserId(), EdgeEventActionType.CREDENTIALS_UPDATED);
         } catch (Exception e) {
             throw handleException(e);
@@ -230,7 +229,7 @@ public class AuthController extends BaseController {
                 }
             }
-            sendNotificationMsgToEdgeService(user.getTenantId(), user.getId(), EntityType.USER, EdgeEventActionType.CREDENTIALS_UPDATED);
+            sendEntityNotificationMsg(user.getTenantId(), user.getId(), EdgeEventActionType.CREDENTIALS_UPDATED);
             JwtToken accessToken = tokenFactory.createAccessJwtToken(securityUser);
             JwtToken refreshToken = refreshTokenRepository.requestRefreshToken(securityUser);
--- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java
View file @555778b
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
View file @555778b
@@ -927,35 +927,7 @@ public abstract class BaseController {
         return null;
     }
-    protected void sendNotificationMsgToEdgeService(TenantId tenantId, EdgeId edgeId, CustomerId customerId, EdgeEventActionType action) {
-        if (!edgesEnabled) {
-            return;
-        }
-        try {
-            sendNotificationMsgToEdgeService(tenantId, edgeId, null, json.writeValueAsString(customerId), EdgeEventType.EDGE, action);
-        } catch (Exception e) {
-            log.warn("Failed to push assign/unassign to/from customer to core: {}", customerId, e);
-        }
-    }
-
-    protected void sendNotificationMsgToEdgeService(TenantId tenantId, EntityId entityId, CustomerId customerId, EdgeEventActionType action) {
-        if (!edgesEnabled) {
-            return;
-        }
-        EdgeEventType type = EdgeUtils.getEdgeEventTypeByEntityType(entityId.getEntityType());
-        try {
-            if (type != null) {
-                sendNotificationMsgToEdgeService(tenantId, null, entityId, json.writeValueAsString(customerId), type, action);
-            }
-        } catch (Exception e) {
-            log.warn("Failed to push assign/unassign to/from customer to core: {}", customerId, e);
-        }
-    }
-
-    protected void sendNotificationMsgToEdgeService(TenantId tenantId, EntityRelation relation, EdgeEventActionType action) {
-        if (!edgesEnabled) {
-            return;
-        }
+    protected void sendRelationNotificationMsg(TenantId tenantId, EntityRelation relation, EdgeEventActionType action) {
         try {
             if (!relation.getFrom().getEntityType().equals(EntityType.EDGE) &&
                     !relation.getTo().getEntityType().equals(EntityType.EDGE)) {
@@ -966,45 +938,46 @@ public abstract class BaseController {
         }
     }
-    protected List<EdgeId> findRelatedEdgeIds(TenantId tenantId, EntityId entityId) {
-        if (!edgesEnabled) {
-            return null;
+    protected void sendDeleteNotificationMsg(TenantId tenantId, EntityId entityId, List<EdgeId> edgeIds) {
+        if (edgeIds != null && !edgeIds.isEmpty()) {
+            for (EdgeId edgeId : edgeIds) {
+                sendNotificationMsgToEdgeService(tenantId, edgeId, entityId, null, null, EdgeEventActionType.DELETED);
+            }
         }
-        List<EdgeId> result = null;
+    }
+
+    protected void sendEntityAssignToCustomerNotificationMsg(TenantId tenantId, EntityId entityId, CustomerId customerId, EdgeEventActionType action) {
         try {
-            result = edgeService.findRelatedEdgeIdsByEntityId(tenantId, entityId).get();
+            sendNotificationMsgToEdgeService(tenantId, null, entityId, json.writeValueAsString(customerId), null, action);
         } catch (Exception e) {
-            log.error("[{}] can't find related edge ids for entity [{}]", tenantId, entityId, e);
+            log.warn("Failed to push assign/unassign to/from customer to core: {}", customerId, e);
         }
-        return result;
     }
-    protected void sendDeleteNotificationMsgToEdgeService(TenantId tenantId, EntityId entityId, EntityType entityType, List<EdgeId> edgeIds) {
-        if (!edgesEnabled) {
-            return;
-        }
-        if (edgeIds != null && !edgeIds.isEmpty()) {
-            for (EdgeId edgeId : edgeIds) {
-                sendNotificationMsgToEdgeService(tenantId, edgeId, entityId, entityType, EdgeEventActionType.DELETED);
-            }
-        }
+    protected void sendEntityNotificationMsg(TenantId tenantId, EntityId entityId, EdgeEventActionType action) {
+        sendNotificationMsgToEdgeService(tenantId, null, entityId, null, null, action);
     }
-    protected void sendNotificationMsgToEdgeService(TenantId tenantId, EntityId entityId, EntityType entityType, EdgeEventActionType action) {
-        sendNotificationMsgToEdgeService(tenantId, null, entityId, entityType, action);
+    protected void sendEntityAssignToEdgeNotificationMsg(TenantId tenantId, EdgeId edgeId, EntityId entityId, EdgeEventActionType action) {
+        sendNotificationMsgToEdgeService(tenantId, edgeId, entityId, null, null, action);
     }
-    protected void sendNotificationMsgToEdgeService(TenantId tenantId, EdgeId edgeId, EntityId entityId, EntityType entityType, EdgeEventActionType action) {
+    private void sendNotificationMsgToEdgeService(TenantId tenantId, EdgeId edgeId, EntityId entityId, String body, EdgeEventType type, EdgeEventActionType action) {
         if (!edgesEnabled) {
             return;
         }
-        EdgeEventType type = EdgeUtils.getEdgeEventTypeByEntityType(entityType);
-        if (type != null) {
-            sendNotificationMsgToEdgeService(tenantId, edgeId, entityId, null, type, action);
+        if (type == null) {
+            if (entityId != null) {
+                type = EdgeUtils.getEdgeEventTypeByEntityType(entityId.getEntityType());
+            } else {
+                log.trace("[{}] entity id and type are null. Ignoring this notification", tenantId);
+                return;
+            }
+            if (type == null) {
+                log.trace("[{}] edge event type is null. Ignoring this notification [{}]", tenantId, entityId);
+                return;
+            }
         }
-    }
-
-    private void sendNotificationMsgToEdgeService(TenantId tenantId, EdgeId edgeId, EntityId entityId, String body, EdgeEventType type, EdgeEventActionType action) {
         TransportProtos.EdgeNotificationMsgProto.Builder builder = TransportProtos.EdgeNotificationMsgProto.newBuilder();
         builder.setTenantIdMSB(tenantId.getId().getMostSignificantBits());
         builder.setTenantIdLSB(tenantId.getId().getLeastSignificantBits());
@@ -1028,6 +1001,19 @@ public abstract class BaseController {
                 TransportProtos.ToCoreMsg.newBuilder().setEdgeNotificationMsg(msg).build(), null);
     }
+    protected List<EdgeId> findRelatedEdgeIds(TenantId tenantId, EntityId entityId) {
+        if (!edgesEnabled) {
+            return null;
+        }
+        List<EdgeId> result = null;
+        try {
+            result = edgeService.findRelatedEdgeIdsByEntityId(tenantId, entityId).get();
+        } catch (Exception e) {
+            log.error("[{}] can't find related edge ids for entity [{}]", tenantId, entityId, e);
+        }
+        return result;
+    }
+
     private void addTimeseries(ObjectNode entityNode, List<TsKvEntry> timeseries) throws Exception {
         if (timeseries != null && !timeseries.isEmpty()) {
             ArrayNode result = entityNode.putArray("timeseries");
--- a/application/src/main/java/org/thingsboard/server/controller/CustomerController.java
View file @555778b
+++ b/application/src/main/java/org/thingsboard/server/controller/CustomerController.java
View file @555778b
@@ -113,7 +113,7 @@ public class CustomerController extends BaseController {
                     customer.getId() == null ? ActionType.ADDED : ActionType.UPDATED, null);
             if (customer.getId() != null) {
-                sendNotificationMsgToEdgeService(savedCustomer.getTenantId(), savedCustomer.getId(), EntityType.CUSTOMER, EdgeEventActionType.UPDATED);
+                sendEntityNotificationMsg(savedCustomer.getTenantId(), savedCustomer.getId(), EdgeEventActionType.UPDATED);
             }
             return savedCustomer;
@@ -143,7 +143,7 @@ public class CustomerController extends BaseController {
                     customer.getId(),
                     ActionType.DELETED, null, strCustomerId);
-            sendDeleteNotificationMsgToEdgeService(getTenantId(), customerId, EntityType.CUSTOMER, relatedEdgeIds);
+            sendDeleteNotificationMsg(getTenantId(), customerId, relatedEdgeIds);
         } catch (Exception e) {
             logEntityAction(emptyId(EntityType.CUSTOMER),
--- a/application/src/main/java/org/thingsboard/server/controller/DashboardController.java
View file @555778b
+++ b/application/src/main/java/org/thingsboard/server/controller/DashboardController.java
View file @555778b
@@ -118,7 +118,7 @@ public class DashboardController extends BaseController {
                     dashboard.getId() == null ? ActionType.ADDED : ActionType.UPDATED, null);
             if (dashboard.getId() != null) {
-                sendNotificationMsgToEdgeService(savedDashboard.getTenantId(), savedDashboard.getId(), EntityType.DASHBOARD, EdgeEventActionType.UPDATED);
+                sendEntityNotificationMsg(savedDashboard.getTenantId(), savedDashboard.getId(), EdgeEventActionType.UPDATED);
             }
             return savedDashboard;
@@ -147,7 +147,7 @@ public class DashboardController extends BaseController {
                     null,
                     ActionType.DELETED, null, strDashboardId);
-            sendDeleteNotificationMsgToEdgeService(getTenantId(), dashboardId, EntityType.DASHBOARD, relatedEdgeIds);
+            sendDeleteNotificationMsg(getTenantId(), dashboardId, relatedEdgeIds);
         } catch (Exception e) {
             logEntityAction(emptyId(EntityType.DASHBOARD),
@@ -179,7 +179,7 @@ public class DashboardController extends BaseController {
                     customerId,
                     ActionType.ASSIGNED_TO_CUSTOMER, null, strDashboardId, strCustomerId, customer.getName());
-            sendNotificationMsgToEdgeService(savedDashboard.getTenantId(), savedDashboard.getId(), customerId, EdgeEventActionType.ASSIGNED_TO_CUSTOMER);
+            sendEntityAssignToCustomerNotificationMsg(savedDashboard.getTenantId(), savedDashboard.getId(), customerId, EdgeEventActionType.ASSIGNED_TO_CUSTOMER);
             return savedDashboard;
         } catch (Exception e) {
@@ -211,7 +211,7 @@ public class DashboardController extends BaseController {
                     customerId,
                     ActionType.UNASSIGNED_FROM_CUSTOMER, null, strDashboardId, customer.getId().toString(), customer.getName());
-            sendNotificationMsgToEdgeService(savedDashboard.getTenantId(), savedDashboard.getId(), customerId, EdgeEventActionType.UNASSIGNED_FROM_CUSTOMER);
+            sendEntityAssignToCustomerNotificationMsg(savedDashboard.getTenantId(), savedDashboard.getId(), customerId, EdgeEventActionType.UNASSIGNED_FROM_CUSTOMER);
             return savedDashboard;
         } catch (Exception e) {
@@ -268,7 +268,7 @@ public class DashboardController extends BaseController {
                     logEntityAction(dashboardId, savedDashboard,
                             customerId,
                             ActionType.ASSIGNED_TO_CUSTOMER, null, strDashboardId, customerId.toString(), customerInfo.getTitle());
-                    sendNotificationMsgToEdgeService(savedDashboard.getTenantId(), savedDashboard.getId(), customerId, EdgeEventActionType.ASSIGNED_TO_CUSTOMER);
+                    sendEntityAssignToCustomerNotificationMsg(savedDashboard.getTenantId(), savedDashboard.getId(), customerId, EdgeEventActionType.ASSIGNED_TO_CUSTOMER);
                 }
                 for (CustomerId customerId : removedCustomerIds) {
                     ShortCustomerInfo customerInfo = dashboard.getAssignedCustomerInfo(customerId);
@@ -276,7 +276,7 @@ public class DashboardController extends BaseController {
                     logEntityAction(dashboardId, dashboard,
                             customerId,
                             ActionType.UNASSIGNED_FROM_CUSTOMER, null, strDashboardId, customerId.toString(), customerInfo.getTitle());
-                    sendNotificationMsgToEdgeService(savedDashboard.getTenantId(), savedDashboard.getId(), customerId, EdgeEventActionType.UNASSIGNED_FROM_CUSTOMER);
+                    sendEntityAssignToCustomerNotificationMsg(savedDashboard.getTenantId(), savedDashboard.getId(), customerId, EdgeEventActionType.UNASSIGNED_FROM_CUSTOMER);
                 }
                 return savedDashboard;
             }
@@ -320,7 +320,7 @@ public class DashboardController extends BaseController {
                     logEntityAction(dashboardId, savedDashboard,
                             customerId,
                             ActionType.ASSIGNED_TO_CUSTOMER, null, strDashboardId, customerId.toString(), customerInfo.getTitle());
-                    sendNotificationMsgToEdgeService(savedDashboard.getTenantId(), savedDashboard.getId(), customerId, EdgeEventActionType.ASSIGNED_TO_CUSTOMER);
+                    sendEntityAssignToCustomerNotificationMsg(savedDashboard.getTenantId(), savedDashboard.getId(), customerId, EdgeEventActionType.ASSIGNED_TO_CUSTOMER);
                 }
                 return savedDashboard;
             }
@@ -364,7 +364,7 @@ public class DashboardController extends BaseController {
                     logEntityAction(dashboardId, dashboard,
                             customerId,
                             ActionType.UNASSIGNED_FROM_CUSTOMER, null, strDashboardId, customerId.toString(), customerInfo.getTitle());
-                    sendNotificationMsgToEdgeService(savedDashboard.getTenantId(), savedDashboard.getId(), customerId, EdgeEventActionType.UNASSIGNED_FROM_CUSTOMER);
+                    sendEntityAssignToCustomerNotificationMsg(savedDashboard.getTenantId(), savedDashboard.getId(), customerId, EdgeEventActionType.UNASSIGNED_FROM_CUSTOMER);
                 }
                 return savedDashboard;
             }
@@ -511,7 +511,7 @@ public class DashboardController extends BaseController {
                     null,
                     ActionType.ASSIGNED_TO_EDGE, null, strDashboardId, strEdgeId, edge.getName());
-            sendNotificationMsgToEdgeService(getTenantId(), edgeId, savedDashboard.getId(), EntityType.DASHBOARD, EdgeEventActionType.ASSIGNED_TO_EDGE);
+            sendEntityAssignToEdgeNotificationMsg(getTenantId(), edgeId, savedDashboard.getId(), EdgeEventActionType.ASSIGNED_TO_EDGE);
             return savedDashboard;
         } catch (Exception e) {
@@ -543,7 +543,7 @@ public class DashboardController extends BaseController {
                     null,
                     ActionType.UNASSIGNED_FROM_EDGE, null, strDashboardId, strEdgeId, edge.getName());
-            sendNotificationMsgToEdgeService(getTenantId(), edgeId, savedDashboard.getId(), EntityType.DASHBOARD, EdgeEventActionType.UNASSIGNED_FROM_EDGE);
+            sendEntityAssignToEdgeNotificationMsg(getTenantId(), edgeId, savedDashboard.getId(), EdgeEventActionType.UNASSIGNED_FROM_EDGE);
             return savedDashboard;
         } catch (Exception e) {
--- a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
View file @555778b
+++ b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
View file @555778b
@@ -132,7 +132,7 @@ public class DeviceController extends BaseController {
                     device.getId() == null ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
             if (device.getId() != null) {
-                sendNotificationMsgToEdgeService(savedDevice.getTenantId(), savedDevice.getId(), EntityType.DEVICE, EdgeEventActionType.UPDATED);
+                sendEntityNotificationMsg(savedDevice.getTenantId(), savedDevice.getId(), EdgeEventActionType.UPDATED);
             }
             logEntityAction(savedDevice.getId(), savedDevice,
@@ -172,7 +172,7 @@ public class DeviceController extends BaseController {
                     device.getCustomerId(),
                     ActionType.DELETED, null, strDeviceId);
-            sendDeleteNotificationMsgToEdgeService(getTenantId(), deviceId, EntityType.DEVICE, relatedEdgeIds);
+            sendDeleteNotificationMsg(getTenantId(), deviceId, relatedEdgeIds);
             deviceStateService.onDeviceDeleted(device);
         } catch (Exception e) {
@@ -204,7 +204,7 @@ public class DeviceController extends BaseController {
                     savedDevice.getCustomerId(),
                     ActionType.ASSIGNED_TO_CUSTOMER, null, strDeviceId, strCustomerId, customer.getName());
-            sendNotificationMsgToEdgeService(savedDevice.getTenantId(), savedDevice.getId(),
+            sendEntityAssignToCustomerNotificationMsg(savedDevice.getTenantId(), savedDevice.getId(),
                     customerId, EdgeEventActionType.ASSIGNED_TO_CUSTOMER);
             return savedDevice;
@@ -235,7 +235,7 @@ public class DeviceController extends BaseController {
                     device.getCustomerId(),
                     ActionType.UNASSIGNED_FROM_CUSTOMER, null, strDeviceId, customer.getId().toString(), customer.getName());
-            sendNotificationMsgToEdgeService(savedDevice.getTenantId(), savedDevice.getId(),
+            sendEntityAssignToCustomerNotificationMsg(savedDevice.getTenantId(), savedDevice.getId(),
                     customer.getId(), EdgeEventActionType.UNASSIGNED_FROM_CUSTOMER);
             return savedDevice;
@@ -303,7 +303,8 @@ public class DeviceController extends BaseController {
             //log.info("0 LwM2M CredentialsUpdate start)
             tbClusterService.pushMsgToCore(new DeviceCredentialsUpdateNotificationMsg(getCurrentUser().getTenantId(), deviceCredentials.getDeviceId(), result), null);
-            sendNotificationMsgToEdgeService(getTenantId(), device.getId(), EntityType.DEVICE, EdgeEventActionType.CREDENTIALS_UPDATED);
+            sendEntityNotificationMsg(getTenantId(), device.getId(), EdgeEventActionType.CREDENTIALS_UPDATED);
+
             logEntityAction(device.getId(), device,
                     device.getCustomerId(),
                     ActionType.CREDENTIALS_UPDATED, null, deviceCredentials);
@@ -666,7 +667,7 @@ public class DeviceController extends BaseController {
                     savedDevice.getCustomerId(),
                     ActionType.ASSIGNED_TO_EDGE, null, strDeviceId, strEdgeId, edge.getName());
-            sendNotificationMsgToEdgeService(getTenantId(), edgeId, savedDevice.getId(), EntityType.DEVICE, EdgeEventActionType.ASSIGNED_TO_EDGE);
+            sendEntityAssignToEdgeNotificationMsg(getTenantId(), edgeId, savedDevice.getId(), EdgeEventActionType.ASSIGNED_TO_EDGE);
             return savedDevice;
         } catch (Exception e) {
@@ -700,7 +701,7 @@ public class DeviceController extends BaseController {
                     device.getCustomerId(),
                     ActionType.UNASSIGNED_FROM_EDGE, null, strDeviceId, strEdgeId, edge.getName());
-            sendNotificationMsgToEdgeService(getTenantId(), edgeId, savedDevice.getId(), EntityType.DEVICE, EdgeEventActionType.UNASSIGNED_FROM_EDGE);
+            sendEntityAssignToEdgeNotificationMsg(getTenantId(), edgeId, savedDevice.getId(), EdgeEventActionType.UNASSIGNED_FROM_EDGE);
             return savedDevice;
         } catch (Exception e) {
--- a/application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java
View file @555778b
+++ b/application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java
View file @555778b
@@ -154,7 +154,7 @@ public class DeviceProfileController extends BaseController {
                     null,
                     created ? ActionType.ADDED : ActionType.UPDATED, null);
-            sendNotificationMsgToEdgeService(getTenantId(), savedDeviceProfile.getId(), EntityType.DEVICE_PROFILE,
+            sendEntityNotificationMsg(getTenantId(), savedDeviceProfile.getId(),
                     deviceProfile.getId() == null ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);
             return savedDeviceProfile;
@@ -182,7 +182,7 @@ public class DeviceProfileController extends BaseController {
                     null,
                     ActionType.DELETED, null, strDeviceProfileId);
-            sendNotificationMsgToEdgeService(getTenantId(), deviceProfile.getId(), EntityType.DEVICE_PROFILE, EdgeEventActionType.DELETED);
+            sendEntityNotificationMsg(getTenantId(), deviceProfile.getId(), EdgeEventActionType.DELETED);
         } catch (Exception e) {
             logEntityAction(emptyId(EntityType.DEVICE_PROFILE),
                     null,
--- a/application/src/main/java/org/thingsboard/server/controller/EdgeController.java
View file @555778b
+++ b/application/src/main/java/org/thingsboard/server/controller/EdgeController.java
View file @555778b
@@ -216,7 +216,7 @@ public class EdgeController extends BaseController {
                     savedEdge.getCustomerId(),
                     ActionType.ASSIGNED_TO_CUSTOMER, null, strEdgeId, strCustomerId, customer.getName());
-            sendNotificationMsgToEdgeService(savedEdge.getTenantId(), savedEdge.getId(),
+            sendEntityAssignToCustomerNotificationMsg(savedEdge.getTenantId(), savedEdge.getId(),
                     customerId, EdgeEventActionType.ASSIGNED_TO_CUSTOMER);
             return savedEdge;
@@ -250,7 +250,7 @@ public class EdgeController extends BaseController {
                     edge.getCustomerId(),
                     ActionType.UNASSIGNED_FROM_CUSTOMER, null, strEdgeId, customer.getId().toString(), customer.getName());
-            sendNotificationMsgToEdgeService(savedEdge.getTenantId(), savedEdge.getId(),
+            sendEntityAssignToCustomerNotificationMsg(savedEdge.getTenantId(), savedEdge.getId(),
                     customer.getId(), EdgeEventActionType.UNASSIGNED_FROM_CUSTOMER);
             return savedEdge;
--- a/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
View file @555778b
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
View file @555778b
@@ -70,7 +70,7 @@ public class EntityRelationController extends BaseController {
             logEntityAction(relation.getTo(), null, getCurrentUser().getCustomerId(),
                     ActionType.RELATION_ADD_OR_UPDATE, null, relation);
-            sendNotificationMsgToEdgeService(getTenantId(), relation, EdgeEventActionType.RELATION_ADD_OR_UPDATE);
+            sendRelationNotificationMsg(getTenantId(), relation, EdgeEventActionType.RELATION_ADD_OR_UPDATE);
         } catch (Exception e) {
             logEntityAction(relation.getFrom(), null, getCurrentUser().getCustomerId(),
                     ActionType.RELATION_ADD_OR_UPDATE, e, relation);
@@ -109,7 +109,7 @@ public class EntityRelationController extends BaseController {
             logEntityAction(relation.getTo(), null, getCurrentUser().getCustomerId(),
                     ActionType.RELATION_DELETED, null, relation);
-            sendNotificationMsgToEdgeService(getTenantId(), relation, EdgeEventActionType.RELATION_DELETED);
+            sendRelationNotificationMsg(getTenantId(), relation, EdgeEventActionType.RELATION_DELETED);
         } catch (Exception e) {
             logEntityAction(relation.getFrom(), null, getCurrentUser().getCustomerId(),
                     ActionType.RELATION_DELETED, e, relation);
--- a/application/src/main/java/org/thingsboard/server/controller/EntityViewController.java
View file @555778b
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityViewController.java
View file @555778b
@@ -163,7 +163,7 @@ public class EntityViewController extends BaseController {
                     entityView.getId() == null ? ActionType.ADDED : ActionType.UPDATED, null);
             if (entityView.getId() != null) {
-                sendNotificationMsgToEdgeService(savedEntityView.getTenantId(), savedEntityView.getId(), EntityType.ENTITY_VIEW, EdgeEventActionType.UPDATED);
+                sendEntityNotificationMsg(savedEntityView.getTenantId(), savedEntityView.getId(), EdgeEventActionType.UPDATED);
             }
             return savedEntityView;
@@ -368,7 +368,7 @@ public class EntityViewController extends BaseController {
             logEntityAction(entityViewId, entityView, entityView.getCustomerId(),
                     ActionType.DELETED, null, strEntityViewId);
-            sendDeleteNotificationMsgToEdgeService(getTenantId(), entityViewId, EntityType.ENTITY_VIEW, relatedEdgeIds);
+            sendDeleteNotificationMsg(getTenantId(), entityViewId, relatedEdgeIds);
         } catch (Exception e) {
             logEntityAction(emptyId(EntityType.ENTITY_VIEW),
                     null,
@@ -410,7 +410,7 @@ public class EntityViewController extends BaseController {
                     savedEntityView.getCustomerId(),
                     ActionType.ASSIGNED_TO_CUSTOMER, null, strEntityViewId, strCustomerId, customer.getName());
-            sendNotificationMsgToEdgeService(savedEntityView.getTenantId(), savedEntityView.getId(),
+            sendEntityAssignToCustomerNotificationMsg(savedEntityView.getTenantId(), savedEntityView.getId(),
                     customerId, EdgeEventActionType.ASSIGNED_TO_CUSTOMER);
             return savedEntityView;
@@ -439,7 +439,7 @@ public class EntityViewController extends BaseController {
                     entityView.getCustomerId(),
                     ActionType.UNASSIGNED_FROM_CUSTOMER, null, strEntityViewId, customer.getId().toString(), customer.getName());
-            sendNotificationMsgToEdgeService(savedEntityView.getTenantId(), savedEntityView.getId(),
+            sendEntityAssignToCustomerNotificationMsg(savedEntityView.getTenantId(), savedEntityView.getId(),
                     customer.getId(), EdgeEventActionType.UNASSIGNED_FROM_CUSTOMER);
             return savedEntityView;
@@ -633,7 +633,7 @@ public class EntityViewController extends BaseController {
                     savedEntityView.getCustomerId(),
                     ActionType.ASSIGNED_TO_EDGE, null, strEntityViewId, strEdgeId, edge.getName());
-            sendNotificationMsgToEdgeService(getTenantId(), edgeId, savedEntityView.getId(), EntityType.ENTITY_VIEW, EdgeEventActionType.ASSIGNED_TO_EDGE);
+            sendEntityAssignToEdgeNotificationMsg(getTenantId(), edgeId, savedEntityView.getId(), EdgeEventActionType.ASSIGNED_TO_EDGE);
             return savedEntityView;
         } catch (Exception e) {
@@ -663,7 +663,7 @@ public class EntityViewController extends BaseController {
                     entityView.getCustomerId(),
                     ActionType.UNASSIGNED_FROM_EDGE, null, strEntityViewId, strEdgeId, edge.getName());
-            sendNotificationMsgToEdgeService(getTenantId(), edgeId, savedEntityView.getId(), EntityType.ENTITY_VIEW, EdgeEventActionType.UNASSIGNED_FROM_EDGE);
+            sendEntityAssignToEdgeNotificationMsg(getTenantId(), edgeId, savedEntityView.getId(), EdgeEventActionType.UNASSIGNED_FROM_EDGE);
             return savedEntityView;
         } catch (Exception e) {
--- a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
View file @555778b
+++ b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
View file @555778b
@@ -152,7 +152,7 @@ public class RuleChainController extends BaseController {
             if (RuleChainType.EDGE.equals(savedRuleChain.getType())) {
                 if (!created) {
-                    sendNotificationMsgToEdgeService(savedRuleChain.getTenantId(), savedRuleChain.getId(), EntityType.RULE_CHAIN, EdgeEventActionType.UPDATED);
+                    sendEntityNotificationMsg(savedRuleChain.getTenantId(), savedRuleChain.getId(), EdgeEventActionType.UPDATED);
                 }
             }
@@ -254,8 +254,8 @@ public class RuleChainController extends BaseController {
                     ActionType.UPDATED, null, ruleChainMetaData);
             if (RuleChainType.EDGE.equals(ruleChain.getType())) {
-                sendNotificationMsgToEdgeService(ruleChain.getTenantId(),
-                        ruleChain.getId(), EntityType.RULE_CHAIN, EdgeEventActionType.UPDATED);
+                sendEntityNotificationMsg(ruleChain.getTenantId(),
+                        ruleChain.getId(), EdgeEventActionType.UPDATED);
             }
             return savedRuleChainMetaData;
@@ -325,7 +325,7 @@ public class RuleChainController extends BaseController {
                     ActionType.DELETED, null, strRuleChainId);
             if (RuleChainType.EDGE.equals(ruleChain.getType())) {
-                sendDeleteNotificationMsgToEdgeService(ruleChain.getTenantId(), ruleChain.getId(), EntityType.RULE_CHAIN, relatedEdgeIds);
+                sendDeleteNotificationMsg(ruleChain.getTenantId(), ruleChain.getId(), relatedEdgeIds);
             }
         } catch (Exception e) {
@@ -487,7 +487,7 @@ public class RuleChainController extends BaseController {
                     null,
                     ActionType.ASSIGNED_TO_EDGE, null, strRuleChainId, strEdgeId, edge.getName());
-            sendNotificationMsgToEdgeService(getTenantId(), edgeId, savedRuleChain.getId(), EntityType.RULE_CHAIN, EdgeEventActionType.ASSIGNED_TO_EDGE);
+            sendEntityAssignToEdgeNotificationMsg(getTenantId(), edgeId, savedRuleChain.getId(), EdgeEventActionType.ASSIGNED_TO_EDGE);
             return savedRuleChain;
         } catch (Exception e) {
@@ -519,7 +519,7 @@ public class RuleChainController extends BaseController {
                     null,
                     ActionType.UNASSIGNED_FROM_EDGE, null, strRuleChainId, strEdgeId, edge.getName());
-            sendNotificationMsgToEdgeService(getTenantId(), edgeId, savedRuleChain.getId(), EntityType.RULE_CHAIN, EdgeEventActionType.UNASSIGNED_FROM_EDGE);
+            sendEntityAssignToEdgeNotificationMsg(getTenantId(), edgeId, savedRuleChain.getId(), EdgeEventActionType.UNASSIGNED_FROM_EDGE);
             return savedRuleChain;
         } catch (Exception e) {
--- a/application/src/main/java/org/thingsboard/server/controller/UserController.java
View file @555778b
+++ b/application/src/main/java/org/thingsboard/server/controller/UserController.java
View file @555778b
@@ -168,7 +168,7 @@ public class UserController extends BaseController {
                     savedUser.getCustomerId(),
                     user.getId() == null ? ActionType.ADDED : ActionType.UPDATED, null);
-            sendNotificationMsgToEdgeService(getTenantId(), savedUser.getId(), EntityType.USER,
+            sendEntityNotificationMsg(getTenantId(), savedUser.getId(),
                     user.getId() == null ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);
             return savedUser;
@@ -249,7 +249,7 @@ public class UserController extends BaseController {
                     user.getCustomerId(),
                     ActionType.DELETED, null, strUserId);
-            sendDeleteNotificationMsgToEdgeService(getTenantId(), userId, EntityType.USER, relatedEdgeIds);
+            sendDeleteNotificationMsg(getTenantId(), userId, relatedEdgeIds);
         } catch (Exception e) {
             logEntityAction(emptyId(EntityType.USER),
--- a/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java
View file @555778b
+++ b/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java
View file @555778b
@@ -73,7 +73,7 @@ public class WidgetTypeController extends BaseController {
             checkEntity(widgetType.getId(), widgetType, Resource.WIDGET_TYPE);
             WidgetType savedWidgetType = widgetTypeService.saveWidgetType(widgetType);
-            sendNotificationMsgToEdgeService(getTenantId(), savedWidgetType.getId(), EntityType.WIDGET_TYPE,
+            sendEntityNotificationMsg(getTenantId(), savedWidgetType.getId(),
                     widgetType.getId() == null ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);
             return checkNotNull(savedWidgetType);
@@ -92,7 +92,7 @@ public class WidgetTypeController extends BaseController {
             checkWidgetTypeId(widgetTypeId, Operation.DELETE);
             widgetTypeService.deleteWidgetType(getCurrentUser().getTenantId(), widgetTypeId);
-            sendNotificationMsgToEdgeService(getTenantId(), widgetTypeId, EntityType.WIDGET_TYPE, EdgeEventActionType.DELETED);
+            sendEntityNotificationMsg(getTenantId(), widgetTypeId, EdgeEventActionType.DELETED);
         } catch (Exception e) {
             throw handleException(e);
--- a/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java
View file @555778b
+++ b/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java
View file @555778b
@@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
-import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -72,7 +71,7 @@ public class WidgetsBundleController extends BaseController {
             checkEntity(widgetsBundle.getId(), widgetsBundle, Resource.WIDGETS_BUNDLE);
             WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
-            sendNotificationMsgToEdgeService(getTenantId(), savedWidgetsBundle.getId(), EntityType.WIDGETS_BUNDLE,
+            sendEntityNotificationMsg(getTenantId(), savedWidgetsBundle.getId(),
                     widgetsBundle.getId() == null ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);
             return checkNotNull(savedWidgetsBundle);
@@ -91,7 +90,7 @@ public class WidgetsBundleController extends BaseController {
             checkWidgetsBundleId(widgetsBundleId, Operation.DELETE);
             widgetsBundleService.deleteWidgetsBundle(getTenantId(), widgetsBundleId);
-            sendNotificationMsgToEdgeService(getTenantId(), widgetsBundleId, EntityType.WIDGETS_BUNDLE, EdgeEventActionType.DELETED);
+            sendEntityNotificationMsg(getTenantId(), widgetsBundleId, EdgeEventActionType.DELETED);
         } catch (Exception e) {
             throw handleException(e);
--- a/application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java
View file @555778b
+++ b/application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java
View file @555778b
@@ -263,19 +263,7 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService {
             case ADDED:
             case UPDATED:
             case DELETED:
-                PageLink pageLink = new PageLink(DEFAULT_LIMIT);
-                PageData<Edge> pageData;
-                do {
-                    pageData = edgeService.findEdgesByTenantId(tenantId, pageLink);
-                    if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
-                        for (Edge edge : pageData.getData()) {
-                            saveEdgeEvent(tenantId, edge.getId(), type, actionType, entityId, null);
-                        }
-                        if (pageData.hasNext()) {
-                            pageLink = pageLink.nextPageLink();
-                        }
-                    }
-                } while (pageData != null && pageData.hasNext());
+                processActionForAllEdges(tenantId, type, actionType, entityId);
                 break;
         }
     }
@@ -495,6 +483,22 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService {
             }, dbCallbackExecutorService);
         }
     }
+
+    private void processActionForAllEdges(TenantId tenantId, EdgeEventType type, EdgeEventActionType actionType, EntityId entityId) {
+        PageLink pageLink = new PageLink(DEFAULT_LIMIT);
+        PageData<Edge> pageData;
+        do {
+            pageData = edgeService.findEdgesByTenantId(tenantId, pageLink);
+            if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
+                for (Edge edge : pageData.getData()) {
+                    saveEdgeEvent(tenantId, edge.getId(), type, actionType, entityId, null);
+                }
+                if (pageData.hasNext()) {
+                    pageLink = pageLink.nextPageLink();
+                }
+            }
+        } while (pageData != null && pageData.hasNext());
+    }
 }
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
View file @555778b
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
View file @555778b
@@ -1257,6 +1257,7 @@
         "unassign-from-edge": "Unassign from edge",
         "dashboards": "Edge Dashboards",
         "manage-edge-rulechains": "Edge rule chains",
+        "rulechain-template": "Rule chain template",
         "edge-key": "Edge key",
         "copy-edge-key": "Copy Edge key",
         "edge-key-copied-message": "Edge key has been copied to clipboard",