Merge branch 'develop/3.4' into vc-fixes

4 years ago · 0e2cbd03aa
48 changed files with 239 additions and 83 deletions
--- a/application/src/main/conf/logback.xml
+++ b/application/src/main/conf/logback.xml
@ -36,6 +36,8 @@

    <logger name="org.thingsboard.server" level="INFO" />
    <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />
+    <logger name="org.apache.kafka.common.utils.AppInfoParser" level="WARN"/>
+    <logger name="org.apache.kafka.clients.consumer.ConsumerConfig" level="WARN"/>

    <root level="INFO">
        <appender-ref ref="fileLogAppender"/>
--- a/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java
+++ b/application/src/main/java/org/thingsboard/server/service/component/AnnotationComponentDiscoveryService.java
@ -161,20 +161,20 @@ public class AnnotationComponentDiscoveryService implements ComponentDiscoverySe
            configurationDescriptor.set("nodeDefinition", node);
            scannedComponent.setConfigurationDescriptor(configurationDescriptor);
            scannedComponent.setClazz(clazzName);
-            log.info("Processing scanned component: {}", scannedComponent);
+            log.debug("Processing scanned component: {}", scannedComponent);
        } catch (Exception e) {
            log.error("Can't initialize component {}, due to {}", def.getBeanClassName(), e.getMessage(), e);
            throw new RuntimeException(e);
        }
        ComponentDescriptor persistedComponent = componentDescriptorService.findByClazz(TenantId.SYS_TENANT_ID, clazzName);
        if (persistedComponent == null) {
-            log.info("Persisting new component: {}", scannedComponent);
+            log.debug("Persisting new component: {}", scannedComponent);
            scannedComponent = componentDescriptorService.saveComponent(TenantId.SYS_TENANT_ID, scannedComponent);
        } else if (scannedComponent.equals(persistedComponent)) {
-            log.info("Component is already persisted: {}", persistedComponent);
+            log.debug("Component is already persisted: {}", persistedComponent);
            scannedComponent = persistedComponent;
        } else {
-            log.info("Component {} will be updated to {}", persistedComponent, scannedComponent);
+            log.debug("Component {} will be updated to {}", persistedComponent, scannedComponent);
            componentDescriptorService.deleteByClazz(TenantId.SYS_TENANT_ID, persistedComponent.getClazz());
            scannedComponent.setId(persistedComponent.getId());
            scannedComponent = componentDescriptorService.saveComponent(TenantId.SYS_TENANT_ID, scannedComponent);
@ -224,7 +224,7 @@ public class AnnotationComponentDiscoveryService implements ComponentDiscoverySe
    @Override
    public void discoverComponents() {
        registerRuleNodeComponents();
-        log.info("Found following definitions: {}", components.values());
+        log.debug("Found following definitions: {}", components.values());
    }

    @Override
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/sync/DefaultEdgeRequestsService.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/sync/DefaultEdgeRequestsService.java
@ -25,6 +25,7 @@ import com.google.common.util.concurrent.SettableFuture;
 import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.Device;
@ -101,6 +102,7 @@ public class DefaultEdgeRequestsService implements EdgeRequestsService {
    @Autowired
    private DeviceService deviceService;

+    @Lazy
    @Autowired
    private TbEntityViewService entityViewService;

--- a/application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java
@ -65,6 +65,7 @@ import org.thingsboard.server.dao.widget.WidgetsBundleService;
 import org.thingsboard.server.service.action.EntityActionService;
 import org.thingsboard.server.service.edge.EdgeNotificationService;
 import org.thingsboard.server.service.executors.DbCallbackExecutorService;
+import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.sync.vc.EntitiesVersionControlService;
 import org.thingsboard.server.service.install.InstallScripts;
 import org.thingsboard.server.service.ota.OtaPackageStateService;
@ -78,6 +79,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 import java.util.stream.Collectors;

@Slf4j
@ -128,8 +130,8 @@ public abstract class AbstractTbEntityService {
    @Autowired
    protected DashboardService dashboardService;

-    @Autowired
-    protected EntitiesVersionControlService vcService;
+    @Autowired(required = false)
+    private EntitiesVersionControlService vcService;
    @Autowired
    protected EntityViewService entityViewService;
    @Lazy
@ -249,4 +251,13 @@ public abstract class AbstractTbEntityService {
        }
        return result;
    }
+
+    protected ListenableFuture<UUID> autoCommit(SecurityUser user, EntityId entityId) throws Exception {
+        if (vcService != null) {
+            return vcService.autoCommit(user, entityId);
+        } else {
+            // We do not support auto-commit for rule engine
+            return Futures.immediateFailedFuture(new RuntimeException("Operation not supported!"));
+        }
+    }
 }
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/asset/DefaultTbAssetService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/asset/DefaultTbAssetService.java
@ -47,7 +47,7 @@ public class DefaultTbAssetService extends AbstractTbEntityService implements Tb
        TenantId tenantId = asset.getTenantId();
        try {
            Asset savedAsset = checkNotNull(assetService.saveAsset(asset));
-            vcService.autoCommit(user, savedAsset.getId());
+            autoCommit(user, savedAsset.getId());
            notificationEntityService.notifyCreateOrUpdateEntity(tenantId, savedAsset.getId(), savedAsset, savedAsset.getCustomerId(), actionType, user);
            return savedAsset;
        } catch (Exception e) {
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/customer/DefaultTbCustomerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/customer/DefaultTbCustomerService.java
@ -42,7 +42,7 @@ public class DefaultTbCustomerService extends AbstractTbEntityService implements
        TenantId tenantId = customer.getTenantId();
        try {
            Customer savedCustomer = checkNotNull(customerService.saveCustomer(customer));
-            vcService.autoCommit(user, savedCustomer.getId());
+            autoCommit(user, savedCustomer.getId());
            notificationEntityService.notifyCreateOrUpdateEntity(tenantId, savedCustomer.getId(), savedCustomer, null, actionType, user);
            return savedCustomer;
        } catch (Exception e) {
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/dashboard/DefaultTbDashboardService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/dashboard/DefaultTbDashboardService.java
@ -48,7 +48,7 @@ public class DefaultTbDashboardService extends AbstractTbEntityService implement
        TenantId tenantId = dashboard.getTenantId();
        try {
            Dashboard savedDashboard = checkNotNull(dashboardService.saveDashboard(dashboard));
-            vcService.autoCommit(user, savedDashboard.getId());
+            autoCommit(user, savedDashboard.getId());
            notificationEntityService.notifyCreateOrUpdateEntity(tenantId, savedDashboard.getId(), savedDashboard,
                    null, actionType, user);
            return savedDashboard;
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/device/DefaultTbDeviceService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/device/DefaultTbDeviceService.java
@ -54,7 +54,7 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
        ActionType actionType = device.getId() == null ? ActionType.ADDED : ActionType.UPDATED;
        try {
            Device savedDevice = checkNotNull(deviceService.saveDeviceWithAccessToken(device, accessToken));
-            vcService.autoCommit(user, savedDevice.getId());
+            autoCommit(user, savedDevice.getId());
            notificationEntityService.notifyCreateOrUpdateDevice(tenantId, savedDevice.getId(), savedDevice.getCustomerId(),
                    savedDevice, oldDevice, actionType, user);

--- a/application/src/main/java/org/thingsboard/server/service/entitiy/deviceProfile/DefaultTbDeviceProfileService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/deviceProfile/DefaultTbDeviceProfileService.java
@ -54,7 +54,7 @@ public class DefaultTbDeviceProfileService extends AbstractTbEntityService imple
                }
            }
            DeviceProfile savedDeviceProfile = checkNotNull(deviceProfileService.saveDeviceProfile(deviceProfile));
-            vcService.autoCommit(user, savedDeviceProfile.getId());
+            autoCommit(user, savedDeviceProfile.getId());
            tbClusterService.onDeviceProfileChange(savedDeviceProfile, null);
            tbClusterService.broadcastEntityStateChangeEvent(tenantId, savedDeviceProfile.getId(),
                    actionType.equals(ActionType.ADDED) ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
--- a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Profile;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
@ -162,6 +163,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
    @Getter
    private boolean persistActivityToTelemetry;

+    @Lazy
    @Autowired
    private QueueService queueService;

--- a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
@ -21,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntitySubtype;
@ -121,6 +122,7 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
    @Autowired
    private ApiUsageStateService apiUsageStateService;

+    @Lazy
    @Autowired
    private QueueService queueService;

--- a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
@ -22,6 +22,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
@ -117,6 +118,7 @@ public class DefaultDataUpdateService implements DataUpdateService {
    @Autowired
    private TenantProfileService tenantProfileService;

+    @Lazy
    @Autowired
    private QueueService queueService;

--- a/application/src/main/resources/logback.xml
+++ b/application/src/main/resources/logback.xml
@ -25,26 +25,31 @@
        </encoder>
    </appender>

-    <logger name="org.thingsboard.server" level="INFO" />
-<!--    <logger name="org.springframework.jdbc.core" level="TRACE" />-->
-<!--    <logger name="org.hibernate.SQL" level="DEBUG" />-->
-<!--    <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE" />-->
-
-<!--    <logger name="org.thingsboard.server.service.queue" level="TRACE" />-->
-<!--    <logger name="org.thingsboard.server.service.transport" level="TRACE" />-->
-<!--    <logger name="org.thingsboard.server.queue.memory.InMemoryStorage" level="DEBUG" />-->
-<!--    <logger name="org.thingsboard.server.service.ttl.AbstractCleanUpService" level="DEBUG" />-->
-
-<!--    <logger name="org.thingsboard.server.service.subscription" level="TRACE"/>-->
-<!--    <logger name="org.thingsboard.server.service.telemetry" level="TRACE"/>-->
-<!--    <logger name="org.eclipse.californium.scandium.DTLSConnector" level="TRACE" />-->
-<!--    <logger name="org.eclipse.californium.scandium.dtls.Handshaker" level="DEBUG" />-->
+    <logger name="org.thingsboard.server" level="INFO"/>
+    <logger name="org.apache.kafka.common.utils.AppInfoParser" level="WARN"/>
+    <logger name="org.apache.kafka.clients.consumer.ConsumerConfig" level="WARN"/>
+    <!-- To enable the logging of scanned rule engine components-->
+    <!--    <logger name="org.thingsboard.server.service.component.AnnotationComponentDiscoveryService" level="DEBUG" />-->
+    <!-- Other useful logs -->
+    <!--    <logger name="org.springframework.jdbc.core" level="TRACE" />-->
+    <!--    <logger name="org.hibernate.SQL" level="DEBUG" />-->
+    <!--    <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE" />-->
+
+    <!--    <logger name="org.thingsboard.server.service.queue" level="TRACE" />-->
+    <!--    <logger name="org.thingsboard.server.service.transport" level="TRACE" />-->
+    <!--    <logger name="org.thingsboard.server.queue.memory.InMemoryStorage" level="DEBUG" />-->
+    <!--    <logger name="org.thingsboard.server.service.ttl.AbstractCleanUpService" level="DEBUG" />-->
+
+    <!--    <logger name="org.thingsboard.server.service.subscription" level="TRACE"/>-->
+    <!--    <logger name="org.thingsboard.server.service.telemetry" level="TRACE"/>-->
+    <!--    <logger name="org.eclipse.californium.scandium.DTLSConnector" level="TRACE" />-->
+    <!--    <logger name="org.eclipse.californium.scandium.dtls.Handshaker" level="DEBUG" />-->

    <!-- Top Rule Nodes by max execution time -->
-<!--    <logger name="org.thingsboard.server.service.queue.TbMsgPackProcessingContext" level="DEBUG" /> -->
+    <!--    <logger name="org.thingsboard.server.service.queue.TbMsgPackProcessingContext" level="DEBUG" /> -->

-<!-- MQTT transport debug -->
-<!--    <logger name="org.thingsboard.server.transport.mqtt.MqttTransportHandler" level="DEBUG" /> -->
+    <!-- MQTT transport debug -->
+    <!--    <logger name="org.thingsboard.server.transport.mqtt.MqttTransportHandler" level="DEBUG" /> -->

    <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />

--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@ -428,6 +428,9 @@ cache:
      timeToLiveInMinutes: "${CACHE_SPECS_VERSION_CONTROL_TASK_TTL:5}"
      maxSize: "${CACHE_SPECS_VERSION_CONTROL_TASK_MAX_SIZE:100000}"

+#Disable this because it is not required.
+spring.data.redis.repositories.enabled: false
+
 redis:
  # standalone or cluster
  connection:
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
@ -18,6 +18,7 @@ package org.thingsboard.server.dao.device;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.exception.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.event.TransactionalEventListener;
 import org.thingsboard.server.common.data.Device;
@ -69,6 +70,7 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
    @Autowired
    private DataValidator<DeviceProfile> deviceProfileValidator;

+    @Lazy
    @Autowired
    private QueueService queueService;

--- a/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueService.java
@ -19,6 +19,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.exception.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.id.QueueId;
@ -43,6 +44,7 @@ public class BaseQueueService extends AbstractEntityService implements QueueServ
    @Autowired
    private QueueDao queueDao;

+    @Lazy
    @Autowired
    private TbTenantProfileCache tenantProfileCache;

--- a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
@ -90,8 +90,8 @@ public class DeviceProfileDataValidator extends DataValidator<DeviceProfile> {
    private DeviceDao deviceDao;
    @Autowired
    private TenantService tenantService;
-    @Autowired
    @Lazy
+    @Autowired
    private QueueService queueService;
    @Autowired
    private OtaPackageService otaPackageService;
--- a/dao/src/main/java/org/thingsboard/server/dao/sqlts/BaseAbstractSqlTimeseriesDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/BaseAbstractSqlTimeseriesDao.java
@ -21,6 +21,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.exception.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.dao.model.sqlts.dictionary.TsKvDictionary;
 import org.thingsboard.server.dao.model.sqlts.dictionary.TsKvDictionaryCompositeKey;
@ -59,7 +60,7 @@ public abstract class BaseAbstractSqlTimeseriesDao extends JpaAbstractDaoListeni
                            TsKvDictionary saved = dictionaryRepository.save(tsKvDictionary);
                            tsKvDictionaryMap.put(saved.getKey(), saved.getKeyId());
                            keyId = saved.getKeyId();
-                        } catch (ConstraintViolationException e) {
+                        } catch (DataIntegrityViolationException | ConstraintViolationException e) {
                            tsKvDictionaryOptional = dictionaryRepository.findById(new TsKvDictionaryCompositeKey(strKey));
                            TsKvDictionary dictionary = tsKvDictionaryOptional.orElseThrow(() -> new RuntimeException("Failed to get TsKvDictionary entity from DB!"));
                            tsKvDictionaryMap.put(dictionary.getKey(), dictionary.getKeyId());
--- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
@ -107,6 +107,7 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantCacheKe
    @Autowired
    private DataValidator<Tenant> tenantValidator;

+    @Lazy
    @Autowired
    private QueueService queueService;

--- a/dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java
@ -116,8 +116,13 @@ public abstract class AbstractBufferedRateExecutor<T extends AsyncTask, F extend
        F result = wrap(task, settableFuture);

        boolean perTenantLimitReached = false;
-        var tenantProfileConfiguration = tenantProfileCache.get(task.getTenantId()).getDefaultProfileConfiguration();
-        if (StringUtils.isNotEmpty(tenantProfileConfiguration.getCassandraQueryTenantRateLimitsConfiguration())) {
+
+        var tenantProfileConfiguration =
+                (task.getTenantId() != null && !TenantId.SYS_TENANT_ID.equals(task.getTenantId()))
+                        ? tenantProfileCache.get(task.getTenantId()).getDefaultProfileConfiguration()
+                        : null;
+        if (tenantProfileConfiguration != null &&
+                StringUtils.isNotEmpty(tenantProfileConfiguration.getCassandraQueryTenantRateLimitsConfiguration())) {
            if (task.getTenantId() == null) {
                log.info("Invalid task received: {}", task);
            } else if (!task.getTenantId().isNullUid()) {
--- a/docker/compose-utils.sh
+++ b/docker/compose-utils.sh
@ -26,7 +26,7 @@ function additionalComposeArgs() {
        ADDITIONAL_COMPOSE_ARGS="-f docker-compose.hybrid.yml"
        ;;
        *)
-        echo "Unknown DATABASE value specified: '${DATABASE}'. Should be either postgres or hybrid." >&2
+        echo "Unknown DATABASE value specified in the .env file: '${DATABASE}'. Should be either 'postgres' or 'hybrid'." >&2
        exit 1
    esac
    echo $ADDITIONAL_COMPOSE_ARGS
@ -55,7 +55,7 @@ function additionalComposeQueueArgs() {
        ADDITIONAL_COMPOSE_QUEUE_ARGS="-f docker-compose.service-bus.yml"
        ;;
        *)
-        echo "Unknown Queue service value specified: '${TB_QUEUE_TYPE}'. Should be either kafka or confluent or aws-sqs or pubsub or rabbitmq or service-bus." >&2
+        echo "Unknown Queue service TB_QUEUE_TYPE value specified in the .env file: '${TB_QUEUE_TYPE}'. Should be either 'kafka' or 'confluent' or 'aws-sqs' or 'pubsub' or 'rabbitmq' or 'service-bus'." >&2
        exit 1
    esac
    echo $ADDITIONAL_COMPOSE_QUEUE_ARGS
@ -85,7 +85,7 @@ function additionalComposeCacheArgs() {
        CACHE_COMPOSE_ARGS="-f docker-compose.redis-cluster.yml"
        ;;
        *)
-        echo "Unknown CACHE value specified: '${CACHE}'. Should be either redis or redis-cluster." >&2
+        echo "Unknown CACHE value specified in the .env file: '${CACHE}'. Should be either 'redis' or 'redis-cluster'." >&2
        exit 1
    esac
    echo $CACHE_COMPOSE_ARGS
@ -102,7 +102,7 @@ function additionalStartupServices() {
        ADDITIONAL_STARTUP_SERVICES="$ADDITIONAL_STARTUP_SERVICES postgres cassandra"
        ;;
        *)
-        echo "Unknown DATABASE value specified: '${DATABASE}'. Should be either postgres or hybrid." >&2
+        echo "Unknown DATABASE value specified in the .env file: '${DATABASE}'. Should be either 'postgres' or 'hybrid'." >&2
        exit 1
    esac

@ -115,7 +115,7 @@ function additionalStartupServices() {
        ADDITIONAL_STARTUP_SERVICES="$ADDITIONAL_STARTUP_SERVICES redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5"
        ;;
        *)
-        echo "Unknown CACHE value specified: '${CACHE}'. Should be either redis or redis-cluster." >&2
+        echo "Unknown CACHE value specified in the .env file: '${CACHE}'. Should be either 'redis' or 'redis-cluster'." >&2
        exit 1
    esac

--- a/docker/docker-compose.cassandra.volumes.yml
+++ b/docker/docker-compose.cassandra.volumes.yml
@ -0,0 +1,27 @@
+#
+# Copyright © 2016-2022 The Thingsboard Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+version: '2.2'
+
+services:
+  cassandra:
+    volumes:
+      - cassandra-volume:/var/lib/cassandra
+
+volumes:
+  cassandra-volume:
+    external: true
+    name: ${CASSANDRA_DATA_VOLUME}
--- a/docker/docker-compose.hybrid.yml
+++ b/docker/docker-compose.hybrid.yml
@ -29,7 +29,7 @@ services:
      - ./tb-node/postgres:/var/lib/postgresql/data
  cassandra:
    restart: always
-    image: "cassandra:3.11.3"
+    image: "cassandra:4.0.4"
    ports:
      - "9042"
    volumes:
@ -38,27 +38,23 @@ services:
    env_file:
      - tb-node.hybrid.env
    depends_on:
-      - zookeeper
      - postgres
      - cassandra
  tb-core2:
    env_file:
      - tb-node.hybrid.env
    depends_on:
-      - zookeeper
      - postgres
      - cassandra
  tb-rule-engine1:
    env_file:
      - tb-node.hybrid.env
    depends_on:
-      - zookeeper
      - postgres
      - cassandra
  tb-rule-engine2:
    env_file:
      - tb-node.hybrid.env
    depends_on:
-      - zookeeper
      - postgres
      - cassandra
--- a/docker/docker-compose.kafka.yml
+++ b/docker/docker-compose.kafka.yml
@ -95,4 +95,4 @@ services:
    env_file:
      - queue-kafka.env
    depends_on:
-      - kafka
+      - kafka
--- a/docker/docker-compose.pubsub.yml
+++ b/docker/docker-compose.pubsub.yml
@ -59,4 +59,3 @@ services:
  tb-vc-executor2:
    env_file:
      - queue-pubsub.env
-
--- a/docker/docker-compose.rabbitmq.yml
+++ b/docker/docker-compose.rabbitmq.yml
@ -58,4 +58,4 @@ services:
      - queue-rabbitmq.env
  tb-vc-executor2:
    env_file:
-      - queue-rabbitmq.env
+      - queue-rabbitmq.env
--- a/docker/docker-create-log-folders.sh
+++ b/docker/docker-create-log-folders.sh
@ -15,7 +15,7 @@
 # limitations under the License.
 #

-mkdir -p tb-node/log/ && sudo chown -R 799:799 tb-node/log/
+mkdir -p tb-node/log && sudo chown -R 799:799 tb-node/log

 mkdir -p tb-transports/coap/log && sudo chown -R 799:799 tb-transports/coap/log

@ -29,23 +29,25 @@ mkdir -p tb-transports/snmp/log && sudo chown -R 799:799 tb-transports/snmp/log

 mkdir -p tb-vc-executor/log && sudo chown -R 799:799 tb-vc-executor/log

-mkdir -p tb-node/postgres/ && sudo chown -R 999:999 tb-node/postgres/
+mkdir -p tb-node/postgres && sudo chown -R 999:999 tb-node/postgres
+
+mkdir -p tb-node/cassandra && sudo chown -R 999:999 tb-node/cassandra

 source .env
 CACHE="${CACHE:-redis}"
 case $CACHE in
    redis)
-    mkdir -p tb-node/redis-data/ && sudo chown -R 1001:0 tb-node/redis-data/
+    mkdir -p tb-node/redis-data && sudo chown -R 1001:1001 tb-node/redis-data
    ;;
    redis-cluster)
-    mkdir -p tb-node/redis-cluster-data-0/ && sudo chown -R 1001:0 tb-node/redis-cluster-data-0/
-    mkdir -p tb-node/redis-cluster-data-1/ && sudo chown -R 1001:0 tb-node/redis-cluster-data-1/
-    mkdir -p tb-node/redis-cluster-data-2/ && sudo chown -R 1001:0 tb-node/redis-cluster-data-2/
-    mkdir -p tb-node/redis-cluster-data-3/ && sudo chown -R 1001:0 tb-node/redis-cluster-data-3/
-    mkdir -p tb-node/redis-cluster-data-4/ && sudo chown -R 1001:0 tb-node/redis-cluster-data-4/
-    mkdir -p tb-node/redis-cluster-data-5/ && sudo chown -R 1001:0 tb-node/redis-cluster-data-5/
+    mkdir -p tb-node/redis-cluster-data-0 && sudo chown -R 1001:1001 tb-node/redis-cluster-data-0
+    mkdir -p tb-node/redis-cluster-data-1 && sudo chown -R 1001:1001 tb-node/redis-cluster-data-1
+    mkdir -p tb-node/redis-cluster-data-2 && sudo chown -R 1001:1001 tb-node/redis-cluster-data-2
+    mkdir -p tb-node/redis-cluster-data-3 && sudo chown -R 1001:1001 tb-node/redis-cluster-data-3
+    mkdir -p tb-node/redis-cluster-data-4 && sudo chown -R 1001:1001 tb-node/redis-cluster-data-4
+    mkdir -p tb-node/redis-cluster-data-5 && sudo chown -R 1001:1001 tb-node/redis-cluster-data-5
    ;;
    *)
-    echo "Unknown CACHE value specified: '${CACHE}'. Should be either redis or redis-cluster." >&2
+    echo "Unknown CACHE value specified in the .env file: '${CACHE}'. Should be either 'redis' or 'redis-cluster'." >&2
    exit 1
 esac
--- a/docker/docker-install-tb.sh
+++ b/docker/docker-install-tb.sh
@ -50,9 +50,14 @@ ADDITIONAL_CACHE_ARGS=$(additionalComposeCacheArgs) || exit $?
 ADDITIONAL_STARTUP_SERVICES=$(additionalStartupServices) || exit $?

 if [ ! -z "${ADDITIONAL_STARTUP_SERVICES// }" ]; then
-    docker-compose -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS up -d $ADDITIONAL_STARTUP_SERVICES
+    docker-compose \
+      -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
+      up -d $ADDITIONAL_STARTUP_SERVICES
 fi

-docker-compose -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS run --no-deps --rm -e INSTALL_TB=true -e LOAD_DEMO=${loadDemo} tb-core1
+docker-compose \
+  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
+  run --no-deps --rm -e INSTALL_TB=true -e LOAD_DEMO=${loadDemo} \
+  tb-core1


--- a/docker/docker-remove-services.sh
+++ b/docker/docker-remove-services.sh
@ -27,4 +27,6 @@ ADDITIONAL_CACHE_ARGS=$(additionalComposeCacheArgs) || exit $?

 ADDITIONAL_COMPOSE_MONITORING_ARGS=$(additionalComposeMonitoringArgs) || exit $?

-docker-compose -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS $ADDITIONAL_COMPOSE_MONITORING_ARGS down -v
+docker-compose \
+  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS $ADDITIONAL_COMPOSE_MONITORING_ARGS \
+  down -v
--- a/docker/docker-start-services.sh
+++ b/docker/docker-start-services.sh
@ -27,4 +27,6 @@ ADDITIONAL_CACHE_ARGS=$(additionalComposeCacheArgs) || exit $?

 ADDITIONAL_COMPOSE_MONITORING_ARGS=$(additionalComposeMonitoringArgs) || exit $?

-docker-compose -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS $ADDITIONAL_COMPOSE_MONITORING_ARGS up -d
+docker-compose \
+  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS $ADDITIONAL_COMPOSE_MONITORING_ARGS \
+  up -d
--- a/docker/docker-stop-services.sh
+++ b/docker/docker-stop-services.sh
@ -27,4 +27,6 @@ ADDITIONAL_CACHE_ARGS=$(additionalComposeCacheArgs) || exit $?

 ADDITIONAL_COMPOSE_MONITORING_ARGS=$(additionalComposeMonitoringArgs) || exit $?

-docker-compose -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS $ADDITIONAL_COMPOSE_MONITORING_ARGS stop
+docker-compose \
+  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS $ADDITIONAL_COMPOSE_MONITORING_ARGS \
+  stop
--- a/docker/docker-update-service.sh
+++ b/docker/docker-update-service.sh
@ -25,5 +25,9 @@ ADDITIONAL_COMPOSE_ARGS=$(additionalComposeArgs) || exit $?

 ADDITIONAL_CACHE_ARGS=$(additionalComposeCacheArgs) || exit $?

-docker-compose -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS pull $@
-docker-compose -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS up -d --no-deps --build $@
+docker-compose \
+  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
+  pull $@
+docker-compose \
+  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
+  up -d --no-deps --build $@
--- a/docker/docker-upgrade-tb.sh
+++ b/docker/docker-upgrade-tb.sh
@ -48,8 +48,16 @@ ADDITIONAL_CACHE_ARGS=$(additionalComposeCacheArgs) || exit $?

 ADDITIONAL_STARTUP_SERVICES=$(additionalStartupServices) || exit $?

-docker-compose -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS pull tb-core1
-
-docker-compose -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS up -d $ADDITIONAL_STARTUP_SERVICES
-
-docker-compose -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS run --no-deps --rm -e UPGRADE_TB=true -e FROM_VERSION=${fromVersion} tb-core1
+docker-compose \
+  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
+  pull \
+  tb-core1
+
+docker-compose \
+  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
+  up -d $ADDITIONAL_STARTUP_SERVICES
+
+docker-compose \
+  -f docker-compose.yml $ADDITIONAL_CACHE_ARGS $ADDITIONAL_COMPOSE_ARGS $ADDITIONAL_COMPOSE_QUEUE_ARGS \
+  run --no-deps --rm -e UPGRADE_TB=true -e FROM_VERSION=${fromVersion} \
+  tb-core1
--- a/msa/black-box-tests/README.md
+++ b/msa/black-box-tests/README.md
@ -26,5 +26,9 @@ As result, in REPOSITORY column, next images should be present:

        mvn clean install -DblackBoxTests.skip=false -DblackBoxTests.redisCluster=true

+- Run the black box tests in the [msa/black-box-tests](../black-box-tests) directory in Hybrid mode (postgres + cassandra):
+
+        mvn clean install -DblackBoxTests.skip=false -DblackBoxTests.hybridMode=true
+


--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
@ -27,6 +27,9 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.UUID;

 import static org.hamcrest.CoreMatchers.containsString;
@ -40,6 +43,7 @@ import static org.junit.Assert.fail;
@Slf4j
 public class ContainerTestSuite {
    final static boolean IS_REDIS_CLUSTER = Boolean.parseBoolean(System.getProperty("blackBoxTests.redisCluster"));
+    final static boolean IS_HYBRID_MODE = Boolean.parseBoolean(System.getProperty("blackBoxTests.hybridMode"));
    private static final String SOURCE_DIR = "./../../docker/";
    private static final String TB_CORE_LOG_REGEXP = ".*Starting polling for events.*";
    private static final String TRANSPORTS_LOG_REGEXP = ".*Going to recalculate partitions.*";
@ -53,6 +57,7 @@ public class ContainerTestSuite {
    public static DockerComposeContainer getTestContainer() {
        if (testContainer == null) {
            log.info("System property of blackBoxTests.redisCluster is {}", IS_REDIS_CLUSTER);
+            log.info("System property of blackBoxTests.hybridMode is {}", IS_HYBRID_MODE);
            boolean skipTailChildContainers = Boolean.valueOf(System.getProperty("blackBoxTests.skipTailChildContainers"));
            try {
                final String targetDir = FileUtils.getTempDirectoryPath() + "/" + "ContainerTestSuite-" + UUID.randomUUID() + "/";
@ -61,7 +66,7 @@ public class ContainerTestSuite {
                replaceInFile(targetDir + "docker-compose.yml", "    container_name: \"${LOAD_BALANCER_NAME}\"", "", "container_name");

                class DockerComposeContainerImpl<SELF extends DockerComposeContainer<SELF>> extends DockerComposeContainer<SELF> {
-                    public DockerComposeContainerImpl(File... composeFiles) {
+                    public DockerComposeContainerImpl(List<File> composeFiles) {
                        super(composeFiles);
                    }

@ -72,19 +77,26 @@ public class ContainerTestSuite {
                    }
                }

-                testContainer = new DockerComposeContainerImpl<>(
+                List<File> composeFiles = new ArrayList<>(Arrays.asList(
                        new File(targetDir + "docker-compose.yml"),
                        new File(targetDir + "docker-compose.volumes.yml"),
-                        new File(targetDir + "docker-compose.postgres.yml"),
+                        IS_HYBRID_MODE
+                                ? new File(targetDir + "docker-compose.hybrid.yml")
+                                : new File(targetDir + "docker-compose.postgres.yml"),
                        new File(targetDir + "docker-compose.postgres.volumes.yml"),
                        new File(targetDir + "docker-compose.kafka.yml"),
                        IS_REDIS_CLUSTER
-                                ? new File("./../../docker/docker-compose.redis-cluster.yml")
-                                : new File("./../../docker/docker-compose.redis.yml"),
+                                ? new File(targetDir + "docker-compose.redis-cluster.yml")
+                                : new File(targetDir + "docker-compose.redis.yml"),
                        IS_REDIS_CLUSTER
-                                ? new File("./../../docker/docker-compose.redis-cluster.volumes.yml")
-                                : new File("./../../docker/docker-compose.redis.volumes.yml")
-                        )
+                                ? new File(targetDir + "docker-compose.redis-cluster.volumes.yml")
+                                : new File(targetDir + "docker-compose.redis.volumes.yml")));
+
+                if (IS_HYBRID_MODE) {
+                    composeFiles.add(new File(targetDir + "docker-compose.cassandra.volumes.yml"));
+                }
+
+                testContainer = new DockerComposeContainerImpl<>(composeFiles)
                        .withPull(false)
                        .withLocalCompose(true)
                        .withTailChildContainers(!skipTailChildContainers)
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ThingsBoardDbInstaller.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ThingsBoardDbInstaller.java
@ -21,6 +21,7 @@ import org.junit.rules.ExternalResource;
 import org.testcontainers.utility.Base58;

 import java.io.File;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@ -32,7 +33,10 @@ import java.util.stream.IntStream;
 public class ThingsBoardDbInstaller extends ExternalResource {

    final static boolean IS_REDIS_CLUSTER = Boolean.parseBoolean(System.getProperty("blackBoxTests.redisCluster"));
+    final static boolean IS_HYBRID_MODE = Boolean.parseBoolean(System.getProperty("blackBoxTests.hybridMode"));
    private final static String POSTGRES_DATA_VOLUME = "tb-postgres-test-data-volume";
+
+    private final static String CASSANDRA_DATA_VOLUME = "tb-cassandra-test-data-volume";
    private final static String REDIS_DATA_VOLUME = "tb-redis-data-volume";
    private final static String REDIS_CLUSTER_DATA_VOLUME = "tb-redis-cluster-data-volume";
    private final static String TB_LOG_VOLUME = "tb-log-test-volume";
@ -46,6 +50,7 @@ public class ThingsBoardDbInstaller extends ExternalResource {
    private final DockerComposeExecutor dockerCompose;

    private final String postgresDataVolume;
+    private final String cassandraDataVolume;

    private final String redisDataVolume;
    private final String redisClusterDataVolume;
@ -60,10 +65,13 @@ public class ThingsBoardDbInstaller extends ExternalResource {

    public ThingsBoardDbInstaller() {
        log.info("System property of blackBoxTests.redisCluster is {}", IS_REDIS_CLUSTER);
-        List<File> composeFiles = Arrays.asList(
+        log.info("System property of blackBoxTests.hybridMode is {}", IS_HYBRID_MODE);
+        List<File> composeFiles = new ArrayList<>(Arrays.asList(
                new File("./../../docker/docker-compose.yml"),
                new File("./../../docker/docker-compose.volumes.yml"),
-                new File("./../../docker/docker-compose.postgres.yml"),
+                IS_HYBRID_MODE
+                       ? new File("./../../docker/docker-compose.hybrid.yml")
+                       : new File("./../../docker/docker-compose.postgres.yml"),
                new File("./../../docker/docker-compose.postgres.volumes.yml"),
                IS_REDIS_CLUSTER
                        ? new File("./../../docker/docker-compose.redis-cluster.yml")
@ -71,12 +79,16 @@ public class ThingsBoardDbInstaller extends ExternalResource {
                IS_REDIS_CLUSTER
                        ? new File("./../../docker/docker-compose.redis-cluster.volumes.yml")
                        : new File("./../../docker/docker-compose.redis.volumes.yml")
-        );
+        ));
+        if (IS_HYBRID_MODE) {
+            composeFiles.add(new File("./../../docker/docker-compose.cassandra.volumes.yml"));
+        }

        String identifier = Base58.randomString(6).toLowerCase();
        String project = identifier + Base58.randomString(6).toLowerCase();

        postgresDataVolume = project + "_" + POSTGRES_DATA_VOLUME;
+        cassandraDataVolume = project + "_" + CASSANDRA_DATA_VOLUME;
        redisDataVolume = project + "_" + REDIS_DATA_VOLUME;
        redisClusterDataVolume = project + "_" + REDIS_CLUSTER_DATA_VOLUME;
        tbLogVolume = project + "_" + TB_LOG_VOLUME;
@ -91,6 +103,9 @@ public class ThingsBoardDbInstaller extends ExternalResource {

        env = new HashMap<>();
        env.put("POSTGRES_DATA_VOLUME", postgresDataVolume);
+        if (IS_HYBRID_MODE) {
+            env.put("CASSANDRA_DATA_VOLUME", cassandraDataVolume);
+        }
        env.put("TB_LOG_VOLUME", tbLogVolume);
        env.put("TB_COAP_TRANSPORT_LOG_VOLUME", tbCoapTransportLogVolume);
        env.put("TB_LWM2M_TRANSPORT_LOG_VOLUME", tbLwm2mTransportLogVolume);
@ -119,6 +134,11 @@ public class ThingsBoardDbInstaller extends ExternalResource {
            dockerCompose.withCommand("volume create " + postgresDataVolume);
            dockerCompose.invokeDocker();

+            if (IS_HYBRID_MODE) {
+                dockerCompose.withCommand("volume create " + cassandraDataVolume);
+                dockerCompose.invokeDocker();
+            }
+
            dockerCompose.withCommand("volume create " + tbLogVolume);
            dockerCompose.invokeDocker();

@ -140,20 +160,23 @@ public class ThingsBoardDbInstaller extends ExternalResource {
            dockerCompose.withCommand("volume create " + tbVcExecutorLogVolume);
            dockerCompose.invokeDocker();

-            String redisService = "";
+            String additionalServices = "";
+            if (IS_HYBRID_MODE) {
+                additionalServices += " cassandra";
+            }
            if (IS_REDIS_CLUSTER) {
                for (int i = 0; i < 6; i++) {
-                    redisService = redisService + " redis-node-" + i;
+                    additionalServices = additionalServices + " redis-node-" + i;
                    dockerCompose.withCommand("volume create " + redisClusterDataVolume + '-' + i);
                    dockerCompose.invokeDocker();
                }
            } else {
-                redisService = "redis";
+                additionalServices += " redis";
                dockerCompose.withCommand("volume create " + redisDataVolume);
                dockerCompose.invokeDocker();
            }

-            dockerCompose.withCommand("up -d postgres " + redisService);
+            dockerCompose.withCommand("up -d postgres" + additionalServices);
            dockerCompose.invokeCompose();

            dockerCompose.withCommand("run --no-deps --rm -e INSTALL_TB=true -e LOAD_DEMO=true tb-core1");
--- a/msa/vc-executor/src/main/conf/logback.xml
+++ b/msa/vc-executor/src/main/conf/logback.xml
@ -35,6 +35,8 @@
    </appender>

    <logger name="org.thingsboard.server" level="INFO" />
+    <logger name="org.apache.kafka.common.utils.AppInfoParser" level="WARN"/>
+    <logger name="org.apache.kafka.clients.consumer.ConsumerConfig" level="WARN"/>

    <root level="INFO">
        <appender-ref ref="fileLogAppender"/>
--- a/msa/vc-executor/src/main/resources/logback.xml
+++ b/msa/vc-executor/src/main/resources/logback.xml
@ -28,6 +28,9 @@
    <logger name="org.thingsboard.server.queue" level="INFO" />
    <logger name="org.thingsboard.server" level="TRACE" />

+    <logger name="org.apache.kafka.common.utils.AppInfoParser" level="WARN"/>
+    <logger name="org.apache.kafka.clients.consumer.ConsumerConfig" level="WARN"/>
+
    <root level="INFO">
        <appender-ref ref="STDOUT"/>
    </root>
--- a/transport/coap/src/main/conf/logback.xml
+++ b/transport/coap/src/main/conf/logback.xml
@ -37,6 +37,8 @@
    <logger name="org.thingsboard.server" level="INFO" />

    <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />
+    <logger name="org.apache.kafka.common.utils.AppInfoParser" level="WARN"/>
+    <logger name="org.apache.kafka.clients.consumer.ConsumerConfig" level="WARN"/>

    <root level="INFO">
        <appender-ref ref="fileLogAppender"/>
--- a/transport/coap/src/main/resources/logback.xml
+++ b/transport/coap/src/main/resources/logback.xml
@ -29,6 +29,9 @@

    <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />

+    <logger name="org.apache.kafka.common.utils.AppInfoParser" level="WARN"/>
+    <logger name="org.apache.kafka.clients.consumer.ConsumerConfig" level="WARN"/>
+
    <root level="INFO">
        <appender-ref ref="STDOUT"/>
    </root>
--- a/transport/http/src/main/conf/logback.xml
+++ b/transport/http/src/main/conf/logback.xml
@ -37,6 +37,8 @@
    <logger name="org.thingsboard.server" level="INFO" />

    <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />
+    <logger name="org.apache.kafka.common.utils.AppInfoParser" level="WARN"/>
+    <logger name="org.apache.kafka.clients.consumer.ConsumerConfig" level="WARN"/>

    <root level="INFO">
        <appender-ref ref="fileLogAppender"/>
--- a/transport/http/src/main/resources/logback.xml
+++ b/transport/http/src/main/resources/logback.xml
@ -29,6 +29,9 @@

    <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />

+    <logger name="org.apache.kafka.common.utils.AppInfoParser" level="WARN"/>
+    <logger name="org.apache.kafka.clients.consumer.ConsumerConfig" level="WARN"/>
+
    <root level="INFO">
        <appender-ref ref="STDOUT"/>
    </root>
--- a/transport/lwm2m/src/main/conf/logback.xml
+++ b/transport/lwm2m/src/main/conf/logback.xml
@ -37,6 +37,8 @@
    <logger name="org.thingsboard.server" level="INFO" />

    <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />
+    <logger name="org.apache.kafka.common.utils.AppInfoParser" level="WARN"/>
+    <logger name="org.apache.kafka.clients.consumer.ConsumerConfig" level="WARN"/>

    <root level="INFO">
        <appender-ref ref="fileLogAppender"/>
--- a/transport/lwm2m/src/main/resources/logback.xml
+++ b/transport/lwm2m/src/main/resources/logback.xml
@ -29,6 +29,9 @@

    <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />

+    <logger name="org.apache.kafka.common.utils.AppInfoParser" level="WARN"/>
+    <logger name="org.apache.kafka.clients.consumer.ConsumerConfig" level="WARN"/>
+
    <root level="INFO">
        <appender-ref ref="STDOUT"/>
    </root>
--- a/transport/mqtt/src/main/conf/logback.xml
+++ b/transport/mqtt/src/main/conf/logback.xml
@ -37,6 +37,8 @@
    <logger name="org.thingsboard.server" level="INFO" />

    <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />
+    <logger name="org.apache.kafka.common.utils.AppInfoParser" level="WARN"/>
+    <logger name="org.apache.kafka.clients.consumer.ConsumerConfig" level="WARN"/>

    <root level="INFO">
        <appender-ref ref="fileLogAppender"/>
--- a/transport/mqtt/src/main/resources/logback.xml
+++ b/transport/mqtt/src/main/resources/logback.xml
@ -29,6 +29,9 @@

    <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />

+    <logger name="org.apache.kafka.common.utils.AppInfoParser" level="WARN"/>
+    <logger name="org.apache.kafka.clients.consumer.ConsumerConfig" level="WARN"/>
+
    <root level="INFO">
        <appender-ref ref="STDOUT"/>
    </root>
--- a/transport/snmp/src/main/conf/logback.xml
+++ b/transport/snmp/src/main/conf/logback.xml
@ -37,6 +37,8 @@
    <logger name="org.thingsboard.server" level="INFO" />

    <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />
+    <logger name="org.apache.kafka.common.utils.AppInfoParser" level="WARN"/>
+    <logger name="org.apache.kafka.clients.consumer.ConsumerConfig" level="WARN"/>

    <root level="INFO">
        <appender-ref ref="fileLogAppender"/>
--- a/transport/snmp/src/main/resources/logback.xml
+++ b/transport/snmp/src/main/resources/logback.xml
@ -29,6 +29,9 @@

    <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />

+    <logger name="org.apache.kafka.common.utils.AppInfoParser" level="WARN"/>
+    <logger name="org.apache.kafka.clients.consumer.ConsumerConfig" level="WARN"/>
+
    <root level="INFO">
        <appender-ref ref="STDOUT"/>
    </root>