Added findMissingToRelatedRuleChains method

Volodymyr Babak
1 parent c5d93d17
Showing 16 changed files with 233 additions and 128 deletions
application/src/main/java/org/thingsboard/server/controller/EdgeController.java
application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java
application/src/main/java/org/thingsboard/server/service/edge/EdgeContextComponent.java
application/src/main/java/org/thingsboard/server/service/edge/EdgeNotificationService.java
application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java
application/src/main/java/org/thingsboard/server/service/edge/rpc/init/SyncEdgeService.java
common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java
dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java
ui-ngx/src/app/core/http/edge.service.ts
ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts
ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts
ui-ngx/src/assets/locale/locale.constant-en_US.json
--- a/application/src/main/java/org/thingsboard/server/controller/EdgeController.java
View file @995bac5
+++ b/application/src/main/java/org/thingsboard/server/controller/EdgeController.java
View file @995bac5
@@ -15,6 +15,9 @@
  */
 package org.thingsboard.server.controller;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -54,6 +57,7 @@ import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -486,14 +490,18 @@ public class EdgeController extends BaseController {
     }
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
-    @RequestMapping(value = "/edge/sync", method = RequestMethod.POST)
-    public void syncEdge(@RequestBody EdgeId edgeId) throws ThingsboardException {
+    @RequestMapping(value = "/edge/sync/{edgeId}", method = RequestMethod.POST)
+    public void syncEdge(@PathVariable("edgeId") String strEdgeId) throws ThingsboardException {
+        checkParameter("edgeId", strEdgeId);
         try {
-            edgeId = checkNotNull(edgeId);
             if (isEdgesEnabled()) {
-                EdgeGrpcSession session = edgeGrpcService.getEdgeGrpcSessionById(edgeId);
+                EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
+                edgeId = checkNotNull(edgeId);
+                SecurityUser user = getCurrentUser();
+                TenantId tenantId = user.getTenantId();
+                EdgeGrpcSession session = edgeGrpcService.getEdgeGrpcSessionById(tenantId, edgeId);
                 Edge edge = session.getEdge();
-                syncEdgeService.sync(edge);
+                syncEdgeService.sync(tenantId, edge);
             } else {
                 throw new ThingsboardException("Edges support disabled", ThingsboardErrorCode.GENERAL);
             }
@@ -522,4 +530,19 @@ public class EdgeController extends BaseController {
             throw new ThingsboardException(e, ThingsboardErrorCode.SUBSCRIPTION_VIOLATION);
         }
     }
+
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/edge/missingToRelatedRuleChains/{edgeId}", method = RequestMethod.GET)
+    @ResponseBody
+    public String findMissingToRelatedRuleChains(@PathVariable("edgeId") String strEdgeId) throws ThingsboardException {
+        try {
+            EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
+            edgeId = checkNotNull(edgeId);
+            SecurityUser user = getCurrentUser();
+            TenantId tenantId = user.getTenantId();
+            return edgeService.findMissingToRelatedRuleChains(tenantId, edgeId);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
 }
--- a/application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java
View file @995bac5
+++ b/application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java
View file @995bac5
@@ -113,11 +113,6 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService {
     }
     @Override
-    public PageData<EdgeEvent> findEdgeEvents(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink) {
-        return edgeEventService.findEdgeEvents(tenantId, edgeId, pageLink, true);
-    }
-
-    @Override
     public Edge setEdgeRootRuleChain(TenantId tenantId, Edge edge, RuleChainId ruleChainId) throws IOException {
         edge.setRootRuleChainId(ruleChainId);
         Edge savedEdge = edgeService.saveEdge(edge);
--- a/application/src/main/java/org/thingsboard/server/service/edge/EdgeContextComponent.java
View file @995bac5
+++ b/application/src/main/java/org/thingsboard/server/service/edge/EdgeContextComponent.java
View file @995bac5
@@ -29,6 +29,7 @@ import org.thingsboard.server.dao.dashboard.DashboardService;
 import org.thingsboard.server.dao.device.DeviceCredentialsService;
 import org.thingsboard.server.dao.device.DeviceProfileService;
 import org.thingsboard.server.dao.device.DeviceService;
+import org.thingsboard.server.dao.edge.EdgeEventService;
 import org.thingsboard.server.dao.edge.EdgeService;
 import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.dao.relation.RelationService;
@@ -76,7 +77,7 @@ public class EdgeContextComponent {
     @Lazy
     @Autowired
-    private EdgeNotificationService edgeNotificationService;
+    private EdgeEventService edgeEventService;
     @Lazy
     @Autowired
--- a/application/src/main/java/org/thingsboard/server/service/edge/EdgeNotificationService.java
View file @995bac5
+++ b/application/src/main/java/org/thingsboard/server/service/edge/EdgeNotificationService.java
View file @995bac5
@@ -16,12 +16,8 @@
 package org.thingsboard.server.service.edge;
 import org.thingsboard.server.common.data.edge.Edge;
-import org.thingsboard.server.common.data.edge.EdgeEvent;
-import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.page.PageData;
-import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.gen.transport.TransportProtos;
@@ -29,8 +25,6 @@ import java.io.IOException;
 public interface EdgeNotificationService {
-    PageData<EdgeEvent> findEdgeEvents(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink);
-
     Edge setEdgeRootRuleChain(TenantId tenantId, Edge edge, RuleChainId ruleChainId) throws IOException;
     void pushNotificationToEdge(TransportProtos.EdgeNotificationMsgProto edgeNotificationMsg, TbCallback callback);
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
View file @995bac5
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
View file @995bac5
@@ -186,11 +186,12 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
         scheduleEdgeEventsCheck(edgeGrpcSession);
     }
-    public EdgeGrpcSession getEdgeGrpcSessionById(EdgeId edgeId) {
+    public EdgeGrpcSession getEdgeGrpcSessionById(TenantId tenantId, EdgeId edgeId) {
         EdgeGrpcSession session = sessions.get(edgeId);
         if (session != null && session.isConnected()) {
             return session;
         } else {
+            log.error("[{}] Edge is not connected [{}]", tenantId, edgeId);
             throw new RuntimeException("Edge is not connected");
         }
     }
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
View file @995bac5
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
View file @995bac5
@@ -170,7 +170,7 @@ public final class EdgeGrpcSession implements Closeable {
                     }
                 }
                 if (connected && requestMsg.getMsgType().equals(RequestMsgType.SYNC_REQUEST_RPC_MESSAGE)) {
-                    ctx.getSyncEdgeService().sync(edge);
+                    ctx.getSyncEdgeService().sync(edge.getTenantId(), edge);
                 }
                 if (connected) {
                     if (requestMsg.getMsgType().equals(RequestMsgType.UPLINK_RPC_MESSAGE) && requestMsg.hasUplinkMsg()) {
@@ -277,7 +277,7 @@ public final class EdgeGrpcSession implements Closeable {
             UUID ifOffset = null;
             boolean success = true;
             do {
-                pageData = ctx.getEdgeNotificationService().findEdgeEvents(edge.getTenantId(), edge.getId(), pageLink);
+                pageData = ctx.getEdgeEventService().findEdgeEvents(edge.getTenantId(), edge.getId(), pageLink, true);
                 if (isConnected() && !pageData.getData().isEmpty()) {
                     log.trace("[{}] [{}] event(s) are going to be processed.", this.sessionId, pageData.getData().size());
                     List<DownlinkMsg> downlinkMsgsPack = convertToDownlinkMsgsPack(pageData.getData());
@@ -938,27 +938,27 @@ public final class EdgeGrpcSession implements Closeable {
             }
             if (uplinkMsg.getRuleChainMetadataRequestMsgCount() > 0) {
                 for (RuleChainMetadataRequestMsg ruleChainMetadataRequestMsg : uplinkMsg.getRuleChainMetadataRequestMsgList()) {
-                    result.add(ctx.getSyncEdgeService().processRuleChainMetadataRequestMsg(edge, ruleChainMetadataRequestMsg));
+                    result.add(ctx.getSyncEdgeService().processRuleChainMetadataRequestMsg(edge.getTenantId(), edge, ruleChainMetadataRequestMsg));
                 }
             }
             if (uplinkMsg.getAttributesRequestMsgCount() > 0) {
                 for (AttributesRequestMsg attributesRequestMsg : uplinkMsg.getAttributesRequestMsgList()) {
-                    result.add(ctx.getSyncEdgeService().processAttributesRequestMsg(edge, attributesRequestMsg));
+                    result.add(ctx.getSyncEdgeService().processAttributesRequestMsg(edge.getTenantId(), edge, attributesRequestMsg));
                 }
             }
             if (uplinkMsg.getRelationRequestMsgCount() > 0) {
                 for (RelationRequestMsg relationRequestMsg : uplinkMsg.getRelationRequestMsgList()) {
-                    result.add(ctx.getSyncEdgeService().processRelationRequestMsg(edge, relationRequestMsg));
+                    result.add(ctx.getSyncEdgeService().processRelationRequestMsg(edge.getTenantId(), edge, relationRequestMsg));
                 }
             }
             if (uplinkMsg.getUserCredentialsRequestMsgCount() > 0) {
                 for (UserCredentialsRequestMsg userCredentialsRequestMsg : uplinkMsg.getUserCredentialsRequestMsgList()) {
-                    result.add(ctx.getSyncEdgeService().processUserCredentialsRequestMsg(edge, userCredentialsRequestMsg));
+                    result.add(ctx.getSyncEdgeService().processUserCredentialsRequestMsg(edge.getTenantId(), edge, userCredentialsRequestMsg));
                 }
             }
             if (uplinkMsg.getDeviceCredentialsRequestMsgCount() > 0) {
                 for (DeviceCredentialsRequestMsg deviceCredentialsRequestMsg : uplinkMsg.getDeviceCredentialsRequestMsgList()) {
-                    result.add(ctx.getSyncEdgeService().processDeviceCredentialsRequestMsg(edge, deviceCredentialsRequestMsg));
+                    result.add(ctx.getSyncEdgeService().processDeviceCredentialsRequestMsg(edge.getTenantId(), edge, deviceCredentialsRequestMsg));
                 }
             }
             if (uplinkMsg.getDeviceRpcCallMsgCount() > 0) {
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java
View file @995bac5
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java
View file @995bac5
@@ -148,35 +148,35 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
     private TbClusterService tbClusterService;
     @Override
-    public void sync(Edge edge) {
-        log.trace("[{}][{}] Staring edge sync process", edge.getTenantId(), edge.getId());
+    public void sync(TenantId tenantId, Edge edge) {
+        log.trace("[{}][{}] Staring edge sync process", tenantId, edge.getId());
         try {
-            syncWidgetsBundleAndWidgetTypes(edge);
+            syncWidgetsBundleAndWidgetTypes(tenantId, edge);
             // TODO: voba - implement this functionality
             // syncAdminSettings(edge);
-            syncRuleChains(edge);
-            syncDeviceProfiles(edge);
-            syncUsers(edge);
-            syncDevices(edge);
-            syncAssets(edge);
-            syncEntityViews(edge);
-            syncDashboards(edge);
+            syncRuleChains(tenantId, edge);
+            syncDeviceProfiles(tenantId, edge);
+            syncUsers(tenantId, edge);
+            syncDevices(tenantId, edge);
+            syncAssets(tenantId, edge);
+            syncEntityViews(tenantId, edge);
+            syncDashboards(tenantId, edge);
         } catch (Exception e) {
-            log.error("[{}][{}] Exception during sync process", edge.getTenantId(), edge.getId(), e);
+            log.error("[{}][{}] Exception during sync process", tenantId, edge.getId(), e);
         }
     }
-    private void syncRuleChains(Edge edge) {
-        log.trace("[{}] syncRuleChains [{}]", edge.getTenantId(), edge.getName());
+    private void syncRuleChains(TenantId tenantId, Edge edge) {
+        log.trace("[{}] syncRuleChains [{}]", tenantId, edge.getName());
         try {
             TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT);
             PageData<RuleChain> pageData;
             do {
-                pageData = ruleChainService.findRuleChainsByTenantIdAndEdgeId(edge.getTenantId(), edge.getId(), pageLink);
+                pageData = ruleChainService.findRuleChainsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
                 if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
                     log.trace("[{}] [{}] rule chains(s) are going to be pushed to edge.", edge.getId(), pageData.getData().size());
                     for (RuleChain ruleChain : pageData.getData()) {
-                        saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.RULE_CHAIN, EdgeEventActionType.ADDED, ruleChain.getId(), null);
+                        saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.RULE_CHAIN, EdgeEventActionType.ADDED, ruleChain.getId(), null);
                     }
                     if (pageData.hasNext()) {
                         pageLink = pageLink.nextPageLink();
@@ -188,17 +188,17 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
         }
     }
-    private void syncDevices(Edge edge) {
-        log.trace("[{}] syncDevices [{}]", edge.getTenantId(), edge.getName());
+    private void syncDevices(TenantId tenantId, Edge edge) {
+        log.trace("[{}] syncDevices [{}]", tenantId, edge.getName());
         try {
             TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT);
             PageData<Device> pageData;
             do {
-                pageData = deviceService.findDevicesByTenantIdAndEdgeId(edge.getTenantId(), edge.getId(), pageLink);
+                pageData = deviceService.findDevicesByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
                 if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
                     log.trace("[{}] [{}] device(s) are going to be pushed to edge.", edge.getId(), pageData.getData().size());
                     for (Device device : pageData.getData()) {
-                        saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.DEVICE, EdgeEventActionType.ADDED, device.getId(), null);
+                        saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.DEVICE, EdgeEventActionType.ADDED, device.getId(), null);
                     }
                     if (pageData.hasNext()) {
                         pageLink = pageLink.nextPageLink();
@@ -210,17 +210,17 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
         }
     }
-    private void syncDeviceProfiles(Edge edge) {
-        log.trace("[{}] syncDeviceProfiles [{}]", edge.getTenantId(), edge.getName());
+    private void syncDeviceProfiles(TenantId tenantId, Edge edge) {
+        log.trace("[{}] syncDeviceProfiles [{}]", tenantId, edge.getName());
         try {
             TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT);
             PageData<DeviceProfile> pageData;
             do {
-                pageData = deviceProfileService.findDeviceProfiles(edge.getTenantId(), pageLink);
+                pageData = deviceProfileService.findDeviceProfiles(tenantId, pageLink);
                 if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
                     log.trace("[{}] [{}] user(s) are going to be pushed to edge.", edge.getId(), pageData.getData().size());
                     for (DeviceProfile deviceProfile : pageData.getData()) {
-                        saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.DEVICE_PROFILE, EdgeEventActionType.ADDED, deviceProfile.getId(), null);
+                        saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.DEVICE_PROFILE, EdgeEventActionType.ADDED, deviceProfile.getId(), null);
                     }
                     if (pageData.hasNext()) {
                         pageLink = pageLink.nextPageLink();
@@ -232,17 +232,17 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
         }
     }
-    private void syncAssets(Edge edge) {
-        log.trace("[{}] syncAssets [{}]", edge.getTenantId(), edge.getName());
+    private void syncAssets(TenantId tenantId, Edge edge) {
+        log.trace("[{}] syncAssets [{}]", tenantId, edge.getName());
         try {
             TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT);
             PageData<Asset> pageData;
             do {
-                pageData = assetService.findAssetsByTenantIdAndEdgeId(edge.getTenantId(), edge.getId(), pageLink);
+                pageData = assetService.findAssetsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
                 if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
                     log.trace("[{}] [{}] asset(s) are going to be pushed to edge.", edge.getId(), pageData.getData().size());
                     for (Asset asset : pageData.getData()) {
-                        saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.ASSET, EdgeEventActionType.ADDED, asset.getId(), null);
+                        saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.ASSET, EdgeEventActionType.ADDED, asset.getId(), null);
                     }
                     if (pageData.hasNext()) {
                         pageLink = pageLink.nextPageLink();
@@ -254,17 +254,17 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
         }
     }
-    private void syncEntityViews(Edge edge) {
-        log.trace("[{}] syncEntityViews [{}]", edge.getTenantId(), edge.getName());
+    private void syncEntityViews(TenantId tenantId, Edge edge) {
+        log.trace("[{}] syncEntityViews [{}]", tenantId, edge.getName());
         try {
             TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT);
             PageData<EntityView> pageData;
             do {
-                pageData = entityViewService.findEntityViewsByTenantIdAndEdgeId(edge.getTenantId(), edge.getId(), pageLink);
+                pageData = entityViewService.findEntityViewsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
                 if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
                     log.trace("[{}] [{}] entity view(s) are going to be pushed to edge.", edge.getId(), pageData.getData().size());
                     for (EntityView entityView : pageData.getData()) {
-                        saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.ENTITY_VIEW, EdgeEventActionType.ADDED, entityView.getId(), null);
+                        saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.ENTITY_VIEW, EdgeEventActionType.ADDED, entityView.getId(), null);
                     }
                     if (pageData.hasNext()) {
                         pageLink = pageLink.nextPageLink();
@@ -276,17 +276,17 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
         }
     }
-    private void syncDashboards(Edge edge) {
-        log.trace("[{}] syncDashboards [{}]", edge.getTenantId(), edge.getName());
+    private void syncDashboards(TenantId tenantId, Edge edge) {
+        log.trace("[{}] syncDashboards [{}]", tenantId, edge.getName());
         try {
             TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT);
             PageData<DashboardInfo> pageData;
             do {
-                pageData = dashboardService.findDashboardsByTenantIdAndEdgeId(edge.getTenantId(), edge.getId(), pageLink);
+                pageData = dashboardService.findDashboardsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
                 if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
                     log.trace("[{}] [{}] dashboard(s) are going to be pushed to edge.", edge.getId(), pageData.getData().size());
                     for (DashboardInfo dashboardInfo : pageData.getData()) {
-                        saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.DASHBOARD, EdgeEventActionType.ADDED, dashboardInfo.getId(), null);
+                        saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.DASHBOARD, EdgeEventActionType.ADDED, dashboardInfo.getId(), null);
                     }
                     if (pageData.hasNext()) {
                         pageLink = pageLink.nextPageLink();
@@ -298,32 +298,32 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
         }
     }
-    private void syncUsers(Edge edge) {
-        log.trace("[{}] syncUsers [{}]", edge.getTenantId(), edge.getName());
+    private void syncUsers(TenantId tenantId, Edge edge) {
+        log.trace("[{}] syncUsers [{}]", tenantId, edge.getName());
         try {
             TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT);
             PageData<User> pageData;
             do {
-                pageData = userService.findTenantAdmins(edge.getTenantId(), pageLink);
-                pushUsersToEdge(pageData, edge);
+                pageData = userService.findTenantAdmins(tenantId, pageLink);
+                pushUsersToEdge(tenantId, pageData, edge);
                 if (pageData.hasNext()) {
                     pageLink = pageLink.nextPageLink();
                 }
             } while (pageData.hasNext());
-            syncCustomerUsers(edge);
+            syncCustomerUsers(tenantId, edge);
         } catch (Exception e) {
             log.error("Exception during loading edge user(s) on sync!", e);
         }
     }
-    private void syncCustomerUsers(Edge edge) {
+    private void syncCustomerUsers(TenantId tenantId, Edge edge) {
         if (edge.getCustomerId() != null && !EntityId.NULL_UUID.equals(edge.getCustomerId().getId())) {
-            saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.CUSTOMER, EdgeEventActionType.ADDED, edge.getCustomerId(), null);
+            saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.CUSTOMER, EdgeEventActionType.ADDED, edge.getCustomerId(), null);
             TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT);
             PageData<User> pageData;
             do {
-                pageData = userService.findCustomerUsers(edge.getTenantId(), edge.getCustomerId(), pageLink);
-                pushUsersToEdge(pageData, edge);
+                pageData = userService.findCustomerUsers(tenantId, edge.getCustomerId(), pageLink);
+                pushUsersToEdge(tenantId, pageData, edge);
                 if (pageData != null && pageData.hasNext()) {
                     pageLink = pageLink.nextPageLink();
                 }
@@ -331,45 +331,45 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
         }
     }
-    private void pushUsersToEdge(PageData<User> pageData, Edge edge) {
+    private void pushUsersToEdge(TenantId tenantId, PageData<User> pageData, Edge edge) {
         if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
             log.trace("[{}] [{}] user(s) are going to be pushed to edge.", edge.getId(), pageData.getData().size());
             for (User user : pageData.getData()) {
-                saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.USER, EdgeEventActionType.ADDED, user.getId(), null);
+                saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.USER, EdgeEventActionType.ADDED, user.getId(), null);
             }
         }
     }
-    private void syncWidgetsBundleAndWidgetTypes(Edge edge) {
-        log.trace("[{}] syncWidgetsBundleAndWidgetTypes [{}]", edge.getTenantId(), edge.getName());
+    private void syncWidgetsBundleAndWidgetTypes(TenantId tenantId, Edge edge) {
+        log.trace("[{}] syncWidgetsBundleAndWidgetTypes [{}]", tenantId, edge.getName());
         List<WidgetsBundle> widgetsBundlesToPush = new ArrayList<>();
         List<WidgetType> widgetTypesToPush = new ArrayList<>();
-        widgetsBundlesToPush.addAll(widgetsBundleService.findAllTenantWidgetsBundlesByTenantId(edge.getTenantId()));
-        widgetsBundlesToPush.addAll(widgetsBundleService.findSystemWidgetsBundles(edge.getTenantId()));
+        widgetsBundlesToPush.addAll(widgetsBundleService.findAllTenantWidgetsBundlesByTenantId(tenantId));
+        widgetsBundlesToPush.addAll(widgetsBundleService.findSystemWidgetsBundles(tenantId));
         try {
             for (WidgetsBundle widgetsBundle: widgetsBundlesToPush) {
-                saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.WIDGETS_BUNDLE, EdgeEventActionType.ADDED, widgetsBundle.getId(), null);
+                saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.WIDGETS_BUNDLE, EdgeEventActionType.ADDED, widgetsBundle.getId(), null);
                 widgetTypesToPush.addAll(widgetTypeService.findWidgetTypesByTenantIdAndBundleAlias(widgetsBundle.getTenantId(), widgetsBundle.getAlias()));
             }
             for (WidgetType widgetType: widgetTypesToPush) {
-                saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.WIDGET_TYPE, EdgeEventActionType.ADDED, widgetType.getId(), null);
+                saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.WIDGET_TYPE, EdgeEventActionType.ADDED, widgetType.getId(), null);
             }
         } catch (Exception e) {
             log.error("Exception during loading widgets bundle(s) and widget type(s) on sync!", e);
         }
     }
-    private void syncAdminSettings(Edge edge) {
-        log.trace("[{}] syncAdminSettings [{}]", edge.getTenantId(), edge.getName());
+    private void syncAdminSettings(TenantId tenantId, Edge edge) {
+        log.trace("[{}] syncAdminSettings [{}]", tenantId, edge.getName());
         try {
             AdminSettings systemMailSettings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail");
-            saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.ADMIN_SETTINGS, EdgeEventActionType.UPDATED, null, mapper.valueToTree(systemMailSettings));
+            saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.ADMIN_SETTINGS, EdgeEventActionType.UPDATED, null, mapper.valueToTree(systemMailSettings));
             AdminSettings tenantMailSettings = convertToTenantAdminSettings(systemMailSettings.getKey(), (ObjectNode) systemMailSettings.getJsonValue());
-            saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.ADMIN_SETTINGS, EdgeEventActionType.UPDATED, null, mapper.valueToTree(tenantMailSettings));
+            saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.ADMIN_SETTINGS, EdgeEventActionType.UPDATED, null, mapper.valueToTree(tenantMailSettings));
             AdminSettings systemMailTemplates = loadMailTemplates();
-            saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.ADMIN_SETTINGS, EdgeEventActionType.UPDATED, null, mapper.valueToTree(systemMailTemplates));
+            saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.ADMIN_SETTINGS, EdgeEventActionType.UPDATED, null, mapper.valueToTree(systemMailTemplates));
             AdminSettings tenantMailTemplates = convertToTenantAdminSettings(systemMailTemplates.getKey(), (ObjectNode) systemMailTemplates.getJsonValue());
-            saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.ADMIN_SETTINGS, EdgeEventActionType.UPDATED, null, mapper.valueToTree(tenantMailTemplates));
+            saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.ADMIN_SETTINGS, EdgeEventActionType.UPDATED, null, mapper.valueToTree(tenantMailTemplates));
         } catch (Exception e) {
             log.error("Can't load admin settings", e);
         }
@@ -428,13 +428,13 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
     }
     @Override
-    public ListenableFuture<Void> processRuleChainMetadataRequestMsg(Edge edge, RuleChainMetadataRequestMsg ruleChainMetadataRequestMsg) {
-        log.trace("[{}] processRuleChainMetadataRequestMsg [{}][{}]", edge.getTenantId(), edge.getName(), ruleChainMetadataRequestMsg);
+    public ListenableFuture<Void> processRuleChainMetadataRequestMsg(TenantId tenantId, Edge edge, RuleChainMetadataRequestMsg ruleChainMetadataRequestMsg) {
+        log.trace("[{}] processRuleChainMetadataRequestMsg [{}][{}]", tenantId, edge.getName(), ruleChainMetadataRequestMsg);
         SettableFuture<Void> futureToSet = SettableFuture.create();
         if (ruleChainMetadataRequestMsg.getRuleChainIdMSB() != 0 && ruleChainMetadataRequestMsg.getRuleChainIdLSB() != 0) {
             RuleChainId ruleChainId =
                     new RuleChainId(new UUID(ruleChainMetadataRequestMsg.getRuleChainIdMSB(), ruleChainMetadataRequestMsg.getRuleChainIdLSB()));
-            ListenableFuture<EdgeEvent> future = saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.RULE_CHAIN_METADATA, EdgeEventActionType.ADDED, ruleChainId, null);
+            ListenableFuture<EdgeEvent> future = saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.RULE_CHAIN_METADATA, EdgeEventActionType.ADDED, ruleChainId, null);
             Futures.addCallback(future, new FutureCallback<EdgeEvent>() {
                 @Override
                 public void onSuccess(@Nullable EdgeEvent result) {
@@ -452,8 +452,8 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
     }
     @Override
-    public ListenableFuture<Void> processAttributesRequestMsg(Edge edge, AttributesRequestMsg attributesRequestMsg) {
-        log.trace("[{}] processAttributesRequestMsg [{}][{}]", edge.getTenantId(), edge.getName(), attributesRequestMsg);
+    public ListenableFuture<Void> processAttributesRequestMsg(TenantId tenantId, Edge edge, AttributesRequestMsg attributesRequestMsg) {
+        log.trace("[{}] processAttributesRequestMsg [{}][{}]", tenantId, edge.getName(), attributesRequestMsg);
         EntityId entityId = EntityIdFactory.getByTypeAndUuid(
                 EntityType.valueOf(attributesRequestMsg.getEntityType()),
                 new UUID(attributesRequestMsg.getEntityIdMSB(), attributesRequestMsg.getEntityIdLSB()));
@@ -461,7 +461,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
         if (type != null) {
             SettableFuture<Void> futureToSet = SettableFuture.create();
             String scope = attributesRequestMsg.getScope();
-            ListenableFuture<List<AttributeKvEntry>> ssAttrFuture = attributesService.findAll(edge.getTenantId(), entityId, scope);
+            ListenableFuture<List<AttributeKvEntry>> ssAttrFuture = attributesService.findAll(tenantId, entityId, scope);
             Futures.addCallback(ssAttrFuture, new FutureCallback<List<AttributeKvEntry>>() {
                         @Override
                         public void onSuccess(@Nullable List<AttributeKvEntry> ssAttributes) {
@@ -484,7 +484,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
                                     entityData.put("scope", scope);
                                     JsonNode body = mapper.valueToTree(entityData);
                                     log.debug("Sending attributes data msg, entityId [{}], attributes [{}]", entityId, body);
-                                    saveEdgeEvent(edge.getTenantId(),
+                                    saveEdgeEvent(tenantId,
                                             edge.getId(),
                                             type,
                                             EdgeEventActionType.ATTRIBUTES_UPDATED,
@@ -495,7 +495,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
                                     throw new RuntimeException("[" + edge.getName() + "] Failed to send attribute updates to the edge", e);
                                 }
                             } else {
-                                log.trace("[{}][{}] No attributes found for entity {} [{}]", edge.getTenantId(),
+                                log.trace("[{}][{}] No attributes found for entity {} [{}]", tenantId,
                                         edge.getName(),
                                         entityId.getEntityType(),
                                         entityId.getId());
@@ -511,21 +511,21 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
                     }, dbCallbackExecutorService);
             return futureToSet;
         } else {
-            log.warn("[{}] Type doesn't supported {}", edge.getTenantId(), entityId.getEntityType());
+            log.warn("[{}] Type doesn't supported {}", tenantId, entityId.getEntityType());
             return Futures.immediateFuture(null);
         }
     }
     @Override
-    public ListenableFuture<Void> processRelationRequestMsg(Edge edge, RelationRequestMsg relationRequestMsg) {
-        log.trace("[{}] processRelationRequestMsg [{}][{}]", edge.getTenantId(), edge.getName(), relationRequestMsg);
+    public ListenableFuture<Void> processRelationRequestMsg(TenantId tenantId, Edge edge, RelationRequestMsg relationRequestMsg) {
+        log.trace("[{}] processRelationRequestMsg [{}][{}]", tenantId, edge.getName(), relationRequestMsg);
         EntityId entityId = EntityIdFactory.getByTypeAndUuid(
                 EntityType.valueOf(relationRequestMsg.getEntityType()),
                 new UUID(relationRequestMsg.getEntityIdMSB(), relationRequestMsg.getEntityIdLSB()));
         List<ListenableFuture<List<EntityRelation>>> futures = new ArrayList<>();
-        futures.add(findRelationByQuery(edge, entityId, EntitySearchDirection.FROM));
-        futures.add(findRelationByQuery(edge, entityId, EntitySearchDirection.TO));
+        futures.add(findRelationByQuery(tenantId, edge, entityId, EntitySearchDirection.FROM));
+        futures.add(findRelationByQuery(tenantId, edge, entityId, EntitySearchDirection.TO));
         ListenableFuture<List<List<EntityRelation>>> relationsListFuture = Futures.allAsList(futures);
         SettableFuture<Void> futureToSet = SettableFuture.create();
         Futures.addCallback(relationsListFuture, new FutureCallback<List<List<EntityRelation>>>() {
@@ -539,7 +539,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
                                         try {
                                             if (!relation.getFrom().getEntityType().equals(EntityType.EDGE) &&
                                                     !relation.getTo().getEntityType().equals(EntityType.EDGE)) {
-                                                saveEdgeEvent(edge.getTenantId(),
+                                                saveEdgeEvent(tenantId,
                                                         edge.getId(),
                                                         EdgeEventType.RELATION,
                                                         EdgeEventActionType.ADDED,
@@ -563,26 +563,26 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
                     @Override
                     public void onFailure(Throwable t) {
-                        log.error("[{}] Can't find relation by query. Entity id [{}]", edge.getTenantId(), entityId, t);
+                        log.error("[{}] Can't find relation by query. Entity id [{}]", tenantId, entityId, t);
                         futureToSet.setException(t);
                     }
                 }, dbCallbackExecutorService);
         return futureToSet;
     }
-    private ListenableFuture<List<EntityRelation>> findRelationByQuery(Edge edge, EntityId entityId, EntitySearchDirection direction) {
+    private ListenableFuture<List<EntityRelation>> findRelationByQuery(TenantId tenantId, Edge edge, EntityId entityId, EntitySearchDirection direction) {
         EntityRelationsQuery query = new EntityRelationsQuery();
         query.setParameters(new RelationsSearchParameters(entityId, direction, -1, false));
-        return relationService.findByQuery(edge.getTenantId(), query);
+        return relationService.findByQuery(tenantId, query);
     }
     @Override
-    public ListenableFuture<Void> processDeviceCredentialsRequestMsg(Edge edge, DeviceCredentialsRequestMsg deviceCredentialsRequestMsg) {
-        log.trace("[{}] processDeviceCredentialsRequestMsg [{}][{}]", edge.getTenantId(), edge.getName(), deviceCredentialsRequestMsg);
+    public ListenableFuture<Void> processDeviceCredentialsRequestMsg(TenantId tenantId, Edge edge, DeviceCredentialsRequestMsg deviceCredentialsRequestMsg) {
+        log.trace("[{}] processDeviceCredentialsRequestMsg [{}][{}]", tenantId, edge.getName(), deviceCredentialsRequestMsg);
         SettableFuture<Void> futureToSet = SettableFuture.create();
         if (deviceCredentialsRequestMsg.getDeviceIdMSB() != 0 && deviceCredentialsRequestMsg.getDeviceIdLSB() != 0) {
             DeviceId deviceId = new DeviceId(new UUID(deviceCredentialsRequestMsg.getDeviceIdMSB(), deviceCredentialsRequestMsg.getDeviceIdLSB()));
-            ListenableFuture<EdgeEvent> future = saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.DEVICE, EdgeEventActionType.CREDENTIALS_UPDATED, deviceId, null);
+            ListenableFuture<EdgeEvent> future = saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.DEVICE, EdgeEventActionType.CREDENTIALS_UPDATED, deviceId, null);
             Futures.addCallback(future, new FutureCallback<EdgeEvent>() {
                 @Override
                 public void onSuccess(@Nullable EdgeEvent result) {
@@ -600,12 +600,12 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
     }
     @Override
-    public ListenableFuture<Void> processUserCredentialsRequestMsg(Edge edge, UserCredentialsRequestMsg userCredentialsRequestMsg) {
-        log.trace("[{}] processUserCredentialsRequestMsg [{}][{}]", edge.getTenantId(), edge.getName(), userCredentialsRequestMsg);
+    public ListenableFuture<Void> processUserCredentialsRequestMsg(TenantId tenantId, Edge edge, UserCredentialsRequestMsg userCredentialsRequestMsg) {
+        log.trace("[{}] processUserCredentialsRequestMsg [{}][{}]", tenantId, edge.getName(), userCredentialsRequestMsg);
         SettableFuture<Void> futureToSet = SettableFuture.create();
         if (userCredentialsRequestMsg.getUserIdMSB() != 0 && userCredentialsRequestMsg.getUserIdLSB() != 0) {
             UserId userId = new UserId(new UUID(userCredentialsRequestMsg.getUserIdMSB(), userCredentialsRequestMsg.getUserIdLSB()));
-            ListenableFuture<EdgeEvent> future = saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.USER, EdgeEventActionType.CREDENTIALS_UPDATED, userId, null);
+            ListenableFuture<EdgeEvent> future = saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.USER, EdgeEventActionType.CREDENTIALS_UPDATED, userId, null);
             Futures.addCallback(future, new FutureCallback<EdgeEvent>() {
                 @Override
                 public void onSuccess(@Nullable EdgeEvent result) {
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/SyncEdgeService.java
View file @995bac5
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/SyncEdgeService.java
View file @995bac5
@@ -17,6 +17,7 @@ package org.thingsboard.server.service.edge.rpc.init;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.gen.edge.AttributesRequestMsg;
 import org.thingsboard.server.gen.edge.DeviceCredentialsRequestMsg;
 import org.thingsboard.server.gen.edge.RelationRequestMsg;
@@ -25,15 +26,15 @@ import org.thingsboard.server.gen.edge.UserCredentialsRequestMsg;
 public interface SyncEdgeService {
-    void sync(Edge edge);
+    void sync(TenantId tenantId, Edge edge);
-    ListenableFuture<Void> processRuleChainMetadataRequestMsg(Edge edge, RuleChainMetadataRequestMsg ruleChainMetadataRequestMsg);
+    ListenableFuture<Void> processRuleChainMetadataRequestMsg(TenantId tenantId, Edge edge, RuleChainMetadataRequestMsg ruleChainMetadataRequestMsg);
-    ListenableFuture<Void> processAttributesRequestMsg(Edge edge, AttributesRequestMsg attributesRequestMsg);
+    ListenableFuture<Void> processAttributesRequestMsg(TenantId tenantId, Edge edge, AttributesRequestMsg attributesRequestMsg);
-    ListenableFuture<Void> processRelationRequestMsg(Edge edge, RelationRequestMsg relationRequestMsg);
+    ListenableFuture<Void> processRelationRequestMsg(TenantId tenantId, Edge edge, RelationRequestMsg relationRequestMsg);
-    ListenableFuture<Void> processDeviceCredentialsRequestMsg(Edge edge, DeviceCredentialsRequestMsg deviceCredentialsRequestMsg);
+    ListenableFuture<Void> processDeviceCredentialsRequestMsg(TenantId tenantId, Edge edge, DeviceCredentialsRequestMsg deviceCredentialsRequestMsg);
-    ListenableFuture<Void> processUserCredentialsRequestMsg(Edge edge, UserCredentialsRequestMsg userCredentialsRequestMsg);
+    ListenableFuture<Void> processUserCredentialsRequestMsg(TenantId tenantId, Edge edge, UserCredentialsRequestMsg userCredentialsRequestMsg);
 }
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java
View file @995bac5
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java
View file @995bac5
@@ -91,4 +91,6 @@ public interface EdgeService {
     Object checkInstance(Object request);
     Object activateInstance(String licenseSecret, String releaseDate);
+
+    String findMissingToRelatedRuleChains(TenantId tenantId, EdgeId edgeId);
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
View file @995bac5
+++ b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
View file @995bac5
@@ -15,6 +15,9 @@
  */
 package org.thingsboard.server.dao.edge;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.base.Function;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
@@ -43,6 +46,8 @@ import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
+import org.thingsboard.server.common.data.edge.EdgeEventType;
 import org.thingsboard.server.common.data.edge.EdgeInfo;
 import org.thingsboard.server.common.data.edge.EdgeSearchQuery;
 import org.thingsboard.server.common.data.id.CustomerId;
@@ -55,10 +60,12 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.relation.EntitySearchDirection;
 import org.thingsboard.server.common.data.relation.RelationTypeGroup;
 import org.thingsboard.server.common.data.rule.RuleChain;
+import org.thingsboard.server.common.data.rule.RuleChainConnectionInfo;
 import org.thingsboard.server.dao.customer.CustomerDao;
 import org.thingsboard.server.dao.entity.AbstractEntityService;
 import org.thingsboard.server.dao.exception.DataValidationException;
@@ -100,6 +107,8 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
     public static final String INCORRECT_CUSTOMER_ID = "Incorrect customerId ";
     public static final String INCORRECT_EDGE_ID = "Incorrect edgeId ";
+    private static final ObjectMapper mapper = new ObjectMapper();
+
     private static final int DEFAULT_LIMIT = 100;
     private RestTemplate restTemplate;
@@ -583,6 +592,52 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
         return this.restTemplate.postForEntity(EDGE_LICENSE_SERVER_ENDPOINT + "/api/license/activateInstance?licenseSecret={licenseSecret}&releaseDate={releaseDate}", (Object) null, Object.class, params);
     }
+    @Override
+    public String findMissingToRelatedRuleChains(TenantId tenantId, EdgeId edgeId) {
+        List<RuleChain> edgeRuleChains = findEdgeRuleChains(tenantId, edgeId);
+        List<RuleChainId> edgeRuleChainIds = edgeRuleChains.stream().map(IdBased::getId).collect(Collectors.toList());
+        ObjectNode result = mapper.createObjectNode();
+        for (RuleChain edgeRuleChain : edgeRuleChains) {
+            List<RuleChainConnectionInfo> connectionInfos =
+                    ruleChainService.loadRuleChainMetaData(edgeRuleChain.getTenantId(), edgeRuleChain.getId()).getRuleChainConnections();
+            if (connectionInfos != null && !connectionInfos.isEmpty()) {
+                List<RuleChainId> connectedRuleChains =
+                        connectionInfos.stream().map(RuleChainConnectionInfo::getTargetRuleChainId).collect(Collectors.toList());
+                List<String> missingRuleChains = new ArrayList<>();
+                for (RuleChainId connectedRuleChain : connectedRuleChains) {
+                    if (!edgeRuleChainIds.contains(connectedRuleChain)) {
+                        RuleChain ruleChainById = ruleChainService.findRuleChainById(tenantId, connectedRuleChain);
+                        missingRuleChains.add(ruleChainById.getName());
+                    }
+                }
+                if (!missingRuleChains.isEmpty()) {
+                    ArrayNode array = mapper.createArrayNode();
+                    for (String missingRuleChain : missingRuleChains) {
+                        array.add(missingRuleChain);
+                    }
+                    result.set(edgeRuleChain.getName(), array);
+                }
+            }
+        }
+        return result.toString();
+    }
+
+    private List<RuleChain> findEdgeRuleChains(TenantId tenantId, EdgeId edgeId) {
+        List<RuleChain> result = new ArrayList<>();
+        TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT);
+        PageData<RuleChain> pageData;
+        do {
+            pageData = ruleChainService.findRuleChainsByTenantIdAndEdgeId(tenantId, edgeId, pageLink);
+            if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
+                result.addAll(pageData.getData());
+                if (pageData.hasNext()) {
+                    pageLink = pageLink.nextPageLink();
+                }
+            }
+        } while (pageData != null && pageData.hasNext());
+        return result;
+    }
+
     private void initRestTemplate() {
         boolean jdkHttpClientEnabled = isNotEmpty(System.getProperty("tb.proxy.jdk")) && System.getProperty("tb.proxy.jdk").equalsIgnoreCase("true");
         boolean systemProxyEnabled = isNotEmpty(System.getProperty("tb.proxy.system")) && System.getProperty("tb.proxy.system").equalsIgnoreCase("true");
--- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
View file @995bac5
+++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
View file @995bac5
@@ -749,9 +749,9 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
                         }
                     }
                     if (ruleChain.isRoot() && RuleChainType.EDGE.equals(ruleChain.getType())) {
-                        RuleChain defaultRootEdgeRuleChain = getEdgeTemplateRootRuleChain(ruleChain.getTenantId());
-                        if (defaultRootEdgeRuleChain != null && !defaultRootEdgeRuleChain.getId().equals(ruleChain.getId())) {
-                            throw new DataValidationException("Another default root edge rule chain is present in scope of current tenant!");
+                        RuleChain edgeTemplateRootRuleChain = getEdgeTemplateRootRuleChain(ruleChain.getTenantId());
+                        if (edgeTemplateRootRuleChain != null && !edgeTemplateRootRuleChain.getId().equals(ruleChain.getId())) {
+                            throw new DataValidationException("Another edge template root rule chain is present in scope of current tenant!");
                         }
                     }
                 }
--- a/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java
View file @995bac5
+++ b/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java
View file @995bac5
@@ -2678,7 +2678,7 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
     public Optional<RuleChain> setAutoAssignToEdgeRuleChain(RuleChainId ruleChainId) {
         try {
-            ResponseEntity<RuleChain> ruleChain = restTemplate.postForEntity(baseURL + "/api/ruleChain/{ruleChainId}/defaultEdge", null, RuleChain.class, ruleChainId.getId());
+            ResponseEntity<RuleChain> ruleChain = restTemplate.postForEntity(baseURL + "/api/ruleChain/{ruleChainId}/autoAssignToEdge", null, RuleChain.class, ruleChainId.getId());
             return Optional.ofNullable(ruleChain.getBody());
         } catch (HttpClientErrorException exception) {
             if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
@@ -2691,7 +2691,7 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
     public Optional<RuleChain> unsetAutoAssignToEdgeRuleChain(RuleChainId ruleChainId) {
         try {
-            ResponseEntity<RuleChain> ruleChain = restTemplate.exchange(baseURL + "/api/ruleChain/{ruleChainId}/defaultEdge", HttpMethod.DELETE, HttpEntity.EMPTY, RuleChain.class, ruleChainId.getId());
+            ResponseEntity<RuleChain> ruleChain = restTemplate.exchange(baseURL + "/api/ruleChain/{ruleChainId}/autoAssignToEdge", HttpMethod.DELETE, HttpEntity.EMPTY, RuleChain.class, ruleChainId.getId());
             return Optional.ofNullable(ruleChain.getBody());
         } catch (HttpClientErrorException exception) {
             if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
@@ -2703,7 +2703,7 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
     }
     public List<RuleChain> getAutoAssignToEdgeRuleChains() {
-        return restTemplate.exchange(baseURL + "/api/ruleChain/defaultEdgeRuleChains",
+        return restTemplate.exchange(baseURL + "/api/ruleChain/autoAssignToEdgeRuleChains",
                 HttpMethod.GET,
                 HttpEntity.EMPTY,
                 new ParameterizedTypeReference<List<RuleChain>>() {
--- a/ui-ngx/src/app/core/http/edge.service.ts
View file @995bac5
+++ b/ui-ngx/src/app/core/http/edge.service.ts
View file @995bac5
@@ -97,7 +97,11 @@ export class EdgeService {
       defaultHttpOptionsFromConfig(config));
   }
-  public syncEdge(edgeId: EdgeId, config?: RequestConfig) {
-    return this.http.post(`/api/edge/sync`, edgeId, defaultHttpOptionsFromConfig(config));
+  public syncEdge(edgeId: string, config?: RequestConfig) {
+    return this.http.post(`/api/edge/sync/${edgeId}`, edgeId, defaultHttpOptionsFromConfig(config));
+  }
+
+  public findMissingToRelatedRuleChains(edgeId: string, config?: RequestConfig): Observable<string> {
+    return this.http.get<string>(`/api/edge/missingToRelatedRuleChains/${edgeId}`, defaultHttpOptionsFromConfig(config));
   }
 }
--- a/ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts
View file @995bac5
+++ b/ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts
View file @995bac5
@@ -483,7 +483,7 @@ export class EdgesTableConfigResolver implements Resolve<EntityTableConfig<EdgeI
     if ($event) {
       $event.stopPropagation();
     }
-    this.edgeService.syncEdge(edge.id).subscribe(
+    this.edgeService.syncEdge(edge.id.id).subscribe(
       () => {
         this.store.dispatch(new ActionNotificationShow(
           {
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts
View file @995bac5
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts
View file @995bac5
@@ -45,10 +45,16 @@ import {
   AddEntitiesToEdgeDialogData
 } from "@home/dialogs/add-entities-to-edge-dialog.component";
 import { MatDialog } from "@angular/material/dialog";
-import { isUndefined } from "@core/utils";
+import { isNotEmptyStr, isUndefined } from "@core/utils";
 import { PageLink } from "@shared/models/page/page-link";
 import { Edge } from "@shared/models/edge.models";
-import { map, mergeMap } from "rxjs/operators";
+import { mergeMap } from "rxjs/operators";
+import {
+  ConnectorType,
+  createFormConfig,
+  GatewayFormConnectorModel
+} from "@home/components/widget/lib/gateway/gateway-form.models";
+import { formattedError } from "@angular/compiler";
 @Injectable()
 export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<RuleChain>> {
@@ -401,7 +407,28 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
     }).afterClosed()
       .subscribe((res) => {
         if (res) {
-          this.config.table.updateData();
+          this.edgeService.findMissingToRelatedRuleChains(this.config.componentsData.edgeId).subscribe(
+            (missingRuleChains) => {
+              if (missingRuleChains && Object.keys(missingRuleChains).length > 0) {
+                let formattedMissingRuleChains: Array<string> = new Array<string>();
+                for (const missingRuleChain of Object.keys(missingRuleChains)) {
+                  const arrayOfMissingRuleChains = missingRuleChains[missingRuleChain];
+                  const tmp = "- '" + missingRuleChain + "': '" + arrayOfMissingRuleChains.join("', ") + "'";
+                  formattedMissingRuleChains.push(tmp);
+                }
+                const message = this.translate.instant('edge.missing-related-rule-chains-text',
+                  {missingRuleChains: formattedMissingRuleChains.join("<br>")});
+                this.dialogService.alert(this.translate.instant('edge.missing-related-rule-chains-title'),
+                  message, this.translate.instant('action.close'), true).subscribe(
+                  () => {
+                    this.config.table.updateData();
+                  }
+                );
+              } else {
+                this.config.table.updateData();
+              }
+            }
+          )
         }
       }
     )
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
View file @995bac5
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
View file @995bac5
@@ -1210,7 +1210,9 @@
       "pending": "Pending",
       "downlinks": "Downlinks",
       "no-downlinks-prompt": "No downlinks found",
-      "sync-process-started-successfully": "Sync process started successfully!"
+      "sync-process-started-successfully": "Sync process started successfully!",
+      "missing-related-rule-chains-title": "Edge has missing related rule chain(s)",
+      "missing-related-rule-chains-text": "Assigned to edge rule chain(s) use rule nodes that forward message(s) to rule chain(s) that are not assigned to this edge. <br><br> List of missing rule chain(s): <br> {{missingRuleChains}}"
     },
     "edge-event": {
       "type-dashboard": "Dashboard",
@@ -2087,15 +2089,15 @@
         "unassign-rulechains-from-edge-text": "After the confirmation all selected rulechains will be unassigned and won't be accessible by the edge.",
         "assign-rulechain-to-edge-title": "Assign Rule Chain(s) To Edge",
         "assign-rulechain-to-edge-text": "Please select the rulechains to assign to the edge",
-        "set-edge-template-root-rulechain": "Make rule chain edge template root",
+        "set-edge-template-root-rulechain": "Make rule chain as edge template root",
         "set-edge-template-root-rulechain-title": "Are you sure you want to make the rule chain '{{ruleChainName}}' edge template root?",
         "set-edge-template-root-rulechain-text": "After the confirmation the rule chain will become edge template root and will be root rule chain for a newly created edges.",
         "invalid-rulechain-type-error": "Unable to import rule chain: Invalid rule chain type. Expected type is {{expectedRuleChainType}}.",
         "set-auto-assign-to-edge": "Assign rule chain to edge(s) on creation",
         "set-auto-assign-to-edge-title": "Are you sure you want to assign the edge rule chain '{{ruleChainName}}' to edge(s) on creation?",
         "set-auto-assign-to-edge-text": "After the confirmation the edge rule chain will be automatically assigned to edge(s) on creation.",
-        "unset-auto-assign-to-edge": "Unset assign rule chain to edge(s) on creation",
-        "unset-auto-assign-to-edge-title": "Are you sure you want to unset assign the edge rule chain '{{ruleChainName}}' to edge(s) on creation?",
+        "unset-auto-assign-to-edge": "Do not assign rule chain to edge(s) on creation",
+        "unset-auto-assign-to-edge-title": "Are you sure you do not want to assign the edge rule chain '{{ruleChainName}}' to edge(s) on creation?",
         "unset-auto-assign-to-edge-text": "After the confirmation the edge rule chain will no longer be automatically assigned to edge(s) on creation.",
         "unassign-rulechain-title": "Are you sure you want to unassign the rulechain '{{ruleChainName}}'?",
         "unassign-rulechains": "Unassign rulechains"