Merge pull request #4487 from ViacheslavKlimov/feature/snmp-docker

Docker setup for SNMP transport

@@ -9,6 +9,7 @@ MQTT_TRANSPORT_DOCKER_NAME=tb-mqtt-transport
 HTTP_TRANSPORT_DOCKER_NAME=tb-http-transport
 COAP_TRANSPORT_DOCKER_NAME=tb-coap-transport
 LWM2M_TRANSPORT_DOCKER_NAME=tb-lwm2m-transport
+SNMP_TRANSPORT_DOCKER_NAME=tb-snmp-transport
 
 TB_VERSION=latest
 

@@ -74,3 +74,8 @@ services:
       - queue-aws-sqs.env
     depends_on:
       - zookeeper
+  tb-snmp-transport:
+    env_file:
+      - queue-aws-sqs.env
+    depends_on:
+      - zookeeper

@@ -58,3 +58,6 @@ services:
   tb-lwm2m-transport:
     env_file:
       - queue-confluent.env
+  tb-snmp-transport:
+    env_file:
+      - queue-confluent.env

@@ -85,3 +85,8 @@ services:
       - queue-kafka.env
     depends_on:
       - kafka
+  tb-snmp-transport:
+    env_file:
+      - queue-kafka.env
+    depends_on:
+      - kafka

@@ -50,6 +50,9 @@ services:
   tb-mqtt-transport2:
     volumes:
       - tb-mqtt-transport-log-volume:/var/log/tb-mqtt-transport
+  tb-snmp-transport:
+    volumes:
+      - tb-snmp-transport-log-volume:/var/log/tb-snmp-transport
 
 volumes:
   postgres-db-volume:
@@ -70,3 +73,6 @@ volumes:
   tb-mqtt-transport-log-volume:
     external: true
     name: ${TB_MQTT_TRANSPORT_LOG_VOLUME}
+  tb-snmp-transport-log-volume:
+    external: true
+    name: ${TB_SNMP_TRANSPORT_LOG_VOLUME}

@@ -74,3 +74,8 @@ services:
       - queue-pubsub.env
     depends_on:
       - zookeeper
+  tb-snmp-transport:
+    env_file:
+      - queue-pubsub.env
+    depends_on:
+      - zookeeper

@@ -74,3 +74,8 @@ services:
       - queue-rabbitmq.env
     depends_on:
       - zookeeper
+  tb-snmp-transport:
+    env_file:
+      - queue-rabbitmq.env
+    depends_on:
+      - zookeeper

@@ -72,3 +72,8 @@ services:
       - queue-service-bus.env
     depends_on:
       - zookeeper
+  tb-snmp-transport:
+    env_file:
+      - queue-service-bus.env
+    depends_on:
+      - zookeeper

@@ -217,6 +217,18 @@ services:
       - ./tb-transports/lwm2m/log:/var/log/tb-lwm2m-transport
     depends_on:
       - zookeeper
+  tb-snmp-transport:
+    restart: always
+    image: "${DOCKER_REPO}/${SNMP_TRANSPORT_DOCKER_NAME}:${TB_VERSION}"
+    environment:
+      TB_SERVICE_ID: tb-snmp-transport
+    env_file:
+      - tb-snmp-transport.env
+    volumes:
+      - ./tb-transports/snmp/conf:/config
+      - ./tb-transports/snmp/log:/var/log/tb-snmp-transport
+    depends_on:
+      - zookeeper
   tb-web-ui1:
     restart: always
     image: "${DOCKER_REPO}/${WEB_UI_DOCKER_NAME}:${TB_VERSION}"

@@ -24,3 +24,5 @@ mkdir -p tb-transports/lwm2m/log && sudo chown -R 799:799 tb-transports/lwm2m/lo
 mkdir -p tb-transports/http/log && sudo chown -R 799:799 tb-transports/http/log
 
 mkdir -p tb-transports/mqtt/log && sudo chown -R 799:799 tb-transports/mqtt/log
+
+mkdir -p tb-transports/snmp/log && sudo chown -R 799:799 tb-transports/snmp/log

+ZOOKEEPER_ENABLED=true
+ZOOKEEPER_URL=zookeeper:2181

@@ -32,6 +32,7 @@ public class ThingsBoardDbInstaller extends ExternalResource {
     private final static String TB_LWM2M_TRANSPORT_LOG_VOLUME = "tb-lwm2m-transport-log-test-volume";
     private final static String TB_HTTP_TRANSPORT_LOG_VOLUME = "tb-http-transport-log-test-volume";
     private final static String TB_MQTT_TRANSPORT_LOG_VOLUME = "tb-mqtt-transport-log-test-volume";
+    private final static String TB_SNMP_TRANSPORT_LOG_VOLUME = "tb-snmp-transport-log-test-volume";
 
     private final DockerComposeExecutor dockerCompose;
 
@@ -41,6 +42,7 @@ public class ThingsBoardDbInstaller extends ExternalResource {
     private final String tbLwm2mTransportLogVolume;
     private final String tbHttpTransportLogVolume;
     private final String tbMqttTransportLogVolume;
+    private final String tbSnmpTransportLogVolume;
     private final Map<String, String> env;
 
     public ThingsBoardDbInstaller() {
@@ -57,6 +59,7 @@ public class ThingsBoardDbInstaller extends ExternalResource {
         tbLwm2mTransportLogVolume = project + "_" + TB_LWM2M_TRANSPORT_LOG_VOLUME;
         tbHttpTransportLogVolume = project + "_" + TB_HTTP_TRANSPORT_LOG_VOLUME;
         tbMqttTransportLogVolume = project + "_" + TB_MQTT_TRANSPORT_LOG_VOLUME;
+        tbSnmpTransportLogVolume = project + "_" + TB_SNMP_TRANSPORT_LOG_VOLUME;
 
         dockerCompose = new DockerComposeExecutor(composeFiles, project);
 
@@ -67,6 +70,7 @@ public class ThingsBoardDbInstaller extends ExternalResource {
         env.put("TB_LWM2M_TRANSPORT_LOG_VOLUME", tbLwm2mTransportLogVolume);
         env.put("TB_HTTP_TRANSPORT_LOG_VOLUME", tbHttpTransportLogVolume);
         env.put("TB_MQTT_TRANSPORT_LOG_VOLUME", tbMqttTransportLogVolume);
+        env.put("TB_SNMP_TRANSPORT_LOG_VOLUME", tbSnmpTransportLogVolume);
         dockerCompose.withEnv(env);
     }
 
@@ -96,6 +100,9 @@ public class ThingsBoardDbInstaller extends ExternalResource {
             dockerCompose.withCommand("volume create " + tbMqttTransportLogVolume);
             dockerCompose.invokeDocker();
 
+            dockerCompose.withCommand("volume create " + tbSnmpTransportLogVolume);
+            dockerCompose.invokeDocker();
+
             dockerCompose.withCommand("up -d redis postgres");
             dockerCompose.invokeCompose();
 
@@ -117,9 +124,11 @@ public class ThingsBoardDbInstaller extends ExternalResource {
         copyLogs(tbLwm2mTransportLogVolume, "./target/tb-lwm2m-transport-logs/");
         copyLogs(tbHttpTransportLogVolume, "./target/tb-http-transport-logs/");
         copyLogs(tbMqttTransportLogVolume, "./target/tb-mqtt-transport-logs/");
+        copyLogs(tbSnmpTransportLogVolume, "./target/tb-snmp-transport-logs/");
 
         dockerCompose.withCommand("volume rm -f " + postgresDataVolume + " " + tbLogVolume +
-                " " + tbCoapTransportLogVolume + " " + tbLwm2mTransportLogVolume + " " + tbHttpTransportLogVolume + " " + tbMqttTransportLogVolume);
+                " " + tbCoapTransportLogVolume + " " + tbLwm2mTransportLogVolume + " " + tbHttpTransportLogVolume +
+                " " + tbMqttTransportLogVolume + " " + tbSnmpTransportLogVolume);
         dockerCompose.invokeDocker();
     }
 

@@ -14,13 +14,6 @@
 # limitations under the License.
 #
 
-server:
-  # Server bind address
-  address: "${HTTP_BIND_ADDRESS:0.0.0.0}"
-  # Server bind port
-  port: "${HTTP_BIND_PORT:8085}"
-  # Server SSL configuration
-
 # Zookeeper connection parameters. Used for service discovery.
 zk:
   # Enable/disable zookeeper discovery service.
@@ -36,146 +29,14 @@ zk:
   # Name of the directory in zookeeper 'filesystem'
   zk_dir: "${ZOOKEEPER_NODES_DIR:/thingsboard}"
 
-cluster:
-  stats:
-    enabled: "${TB_CLUSTER_STATS_ENABLED:false}"
-    print_interval_ms: "${TB_CLUSTER_STATS_PRINT_INTERVAL_MS:10000}"
-
-cache:
-  # caffeine or redis
-  type: "${CACHE_TYPE:caffeine}"
-  attributes:
-    # make sure that if cache.type is 'redis' and cache.attributes.enabled is 'true' that you change 'maxmemory-policy' Redis config property to 'allkeys-lru', 'allkeys-lfu' or 'allkeys-random'
-    enabled: "${CACHE_ATTRIBUTES_ENABLED:true}"
-
-caffeine:
-  specs:
-    relations:
-      timeToLiveInMinutes: 1440
-      maxSize: 0
-    deviceCredentials:
-      timeToLiveInMinutes: 1440
-      maxSize: 0
-    devices:
-      timeToLiveInMinutes: 1440
-      maxSize: 0
-    sessions:
-      timeToLiveInMinutes: 1440
-      maxSize: 0
-    assets:
-      timeToLiveInMinutes: 1440
-      maxSize: 0
-    entityViews:
-      timeToLiveInMinutes: 1440
-      maxSize: 0
-    claimDevices:
-      timeToLiveInMinutes: 1
-      maxSize: 0
-    securitySettings:
-      timeToLiveInMinutes: 1440
-      maxSize: 0
-    tenantProfiles:
-      timeToLiveInMinutes: 1440
-      maxSize: 0
-    deviceProfiles:
-      timeToLiveInMinutes: 1440
-      maxSize: 0
-    attributes:
-      timeToLiveInMinutes: 1440
-      maxSize: 100000
-
-redis:
-  # standalone or cluster
-  connection:
-    type: "${REDIS_CONNECTION_TYPE:standalone}"
-  standalone:
-    host: "${REDIS_HOST:localhost}"
-    port: "${REDIS_PORT:6379}"
-    useDefaultClientConfig: "${REDIS_USE_DEFAULT_CLIENT_CONFIG:true}"
-    # this value may be used only if you used not default ClientConfig
-    clientName: "${REDIS_CLIENT_NAME:standalone}"
-    # this value may be used only if you used not default ClientConfig
-    connectTimeout: "${REDIS_CLIENT_CONNECT_TIMEOUT:30000}"
-    # this value may be used only if you used not default ClientConfig
-    readTimeout: "${REDIS_CLIENT_READ_TIMEOUT:60000}"
-    # this value may be used only if you used not default ClientConfig
-    usePoolConfig: "${REDIS_CLIENT_USE_POOL_CONFIG:false}"
-  cluster:
-    # Comma-separated list of "host:port" pairs to bootstrap from.
-    nodes: "${REDIS_NODES:}"
-    # Maximum number of redirects to follow when executing commands across the cluster.
-    max-redirects: "${REDIS_MAX_REDIRECTS:12}"
-    useDefaultPoolConfig: "${REDIS_USE_DEFAULT_POOL_CONFIG:true}"
-  # db index
-  db: "${REDIS_DB:0}"
-  # db password
-  password: "${REDIS_PASSWORD:}"
-  # pool config
-  pool_config:
-    maxTotal: "${REDIS_POOL_CONFIG_MAX_TOTAL:128}"
-    maxIdle: "${REDIS_POOL_CONFIG_MAX_IDLE:128}"
-    minIdle: "${REDIS_POOL_CONFIG_MIN_IDLE:16}"
-    testOnBorrow: "${REDIS_POOL_CONFIG_TEST_ON_BORROW:true}"
-    testOnReturn: "${REDIS_POOL_CONFIG_TEST_ON_RETURN:true}"
-    testWhileIdle: "${REDIS_POOL_CONFIG_TEST_WHILE_IDLE:true}"
-    minEvictableMs: "${REDIS_POOL_CONFIG_MIN_EVICTABLE_MS:60000}"
-    evictionRunsMs: "${REDIS_POOL_CONFIG_EVICTION_RUNS_MS:30000}"
-    maxWaitMills: "${REDIS_POOL_CONFIG_MAX_WAIT_MS:60000}"
-    numberTestsPerEvictionRun: "${REDIS_POOL_CONFIG_NUMBER_TESTS_PER_EVICTION_RUN:3}"
-    blockWhenExhausted: "${REDIS_POOL_CONFIG_BLOCK_WHEN_EXHAUSTED:true}"
-
-# Check new version updates parameters
-updates:
-  # Enable/disable updates checking.
-  enabled: "${UPDATES_ENABLED:true}"
-
-# spring freemarker configuration
-spring.freemarker.checkTemplateLocation: "false"
-
-audit-log:
-  # Enable/disable audit log functionality.
-  enabled: "${AUDIT_LOG_ENABLED:true}"
-  # Specify partitioning size for audit log by tenant id storage. Example MINUTES, HOURS, DAYS, MONTHS
-  by_tenant_partitioning: "${AUDIT_LOG_BY_TENANT_PARTITIONING:MONTHS}"
-  # Number of days as history period if startTime and endTime are not specified
-  default_query_period: "${AUDIT_LOG_DEFAULT_QUERY_PERIOD:30}"
-  # Logging levels per each entity type.
-  # Allowed values: OFF (disable), W (log write operations), RW (log read and write operations)
-  logging-level:
-    mask:
-      "device": "${AUDIT_LOG_MASK_DEVICE:W}"
-      "asset": "${AUDIT_LOG_MASK_ASSET:W}"
-      "dashboard": "${AUDIT_LOG_MASK_DASHBOARD:W}"
-      "customer": "${AUDIT_LOG_MASK_CUSTOMER:W}"
-      "user": "${AUDIT_LOG_MASK_USER:W}"
-      "rule_chain": "${AUDIT_LOG_MASK_RULE_CHAIN:W}"
-      "alarm": "${AUDIT_LOG_MASK_ALARM:W}"
-      "entity_view": "${AUDIT_LOG_MASK_ENTITY_VIEW:W}"
-      "device_profile": "${AUDIT_LOG_MASK_DEVICE_PROFILE:W}"
-  sink:
-    # Type of external sink. possible options: none, elasticsearch
-    type: "${AUDIT_LOG_SINK_TYPE:none}"
-    # Name of the index where audit logs stored
-    # Index name could contain next placeholders (not mandatory):
-    # @{TENANT} - substituted by tenant ID
-    # @{DATE} - substituted by current date in format provided in audit_log.sink.date_format
-    index_pattern: "${AUDIT_LOG_SINK_INDEX_PATTERN:@{TENANT}_AUDIT_LOG_@{DATE}}"
-    # Date format. Details of the pattern could be found here:
-    # https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html
-    date_format: "${AUDIT_LOG_SINK_DATE_FORMAT:YYYY.MM.DD}"
-    scheme_name: "${AUDIT_LOG_SINK_SCHEME_NAME:http}" # http or https
-    host: "${AUDIT_LOG_SINK_HOST:localhost}"
-    port: "${AUDIT_LOG_SINK_PORT:9200}"
-    user_name: "${AUDIT_LOG_SINK_USER_NAME:}"
-    password: "${AUDIT_LOG_SINK_PASSWORD:}"
-
-state:
-  # Should be greater then transport.sessions.report_timeout
-  defaultInactivityTimeoutInSec: "${DEFAULT_INACTIVITY_TIMEOUT:600}"
-  defaultStateCheckIntervalInSec: "${DEFAULT_STATE_CHECK_INTERVAL:60}"
-  persistToTelemetry: "${PERSIST_STATE_TO_TELEMETRY:false}"
-
 transport:
+  snmp:
+    enabled: "${SNMP_ENABLED:true}"
+    response_processing:
+      # parallelism level for executor (workStealingPool) that is responsible for handling responses from SNMP devices
+      parallelism_level: "${SNMP_RESPONSE_PROCESSING_PARALLELISM_LEVEL:20}"
+    # to configure SNMP to work over UDP or TCP
+    underlying_protocol: "${SNMP_UNDERLYING_PROTOCOL:udp}"
   sessions:
     inactivity_timeout: "${TB_TRANSPORT_SESSIONS_INACTIVITY_TIMEOUT:300000}"
     report_timeout: "${TB_TRANSPORT_SESSIONS_REPORT_TIMEOUT:30000}"
@@ -184,23 +45,9 @@ transport:
     type_cast_enabled: "${JSON_TYPE_CAST_ENABLED:true}"
     # Maximum allowed string value length when processing Telemetry/Attributes JSON (0 value disables string value length check)
     max_string_value_length: "${JSON_MAX_STRING_VALUE_LENGTH:0}"
-  # Enable/disable http/mqtt/coap transport protocols (has higher priority than certain protocol's 'enabled' property)
-  api_enabled: "${TB_TRANSPORT_API_ENABLED:true}"
-  # Local LwM2M transport parameters
-  snmp:
-    enabled: "${SNMP_ENABLED:true}"
-    response_processing:
-      # parallelism level for executor (workStealingPool) that is responsible for handling responses from SNMP devices
-      parallelism_level: "${SNMP_RESPONSE_PROCESSING_PARALLELISM_LEVEL:20}"
-    # to configure SNMP to work over UDP or TCP
-    underlying_protocol: "${SNMP_UNDERLYING_PROTOCOL:udp}"
 
 queue:
-  type: "${TB_QUEUE_TYPE:in-memory}" # in-memory or kafka (Apache Kafka) or aws-sqs (AWS SQS) or pubsub (PubSub) or service-bus (Azure Service Bus) or rabbitmq (RabbitMQ)
-  in_memory:
-    stats:
-      # For debug lvl
-      print-interval-ms: "${TB_QUEUE_IN_MEMORY_STATS_PRINT_INTERVAL_MS:60000}"
+  type: "${TB_QUEUE_TYPE:kafka}" # kafka (Apache Kafka) or aws-sqs (AWS SQS) or pubsub (PubSub) or service-bus (Azure Service Bus) or rabbitmq (RabbitMQ)
   kafka:
     bootstrap.servers: "${TB_KAFKA_SERVERS:localhost:9092}"
     acks: "${TB_KAFKA_ACKS:all}"
@@ -209,10 +56,6 @@ queue:
     linger.ms: "${TB_KAFKA_LINGER_MS:1}"
     buffer.memory: "${TB_BUFFER_MEMORY:33554432}"
     replication_factor: "${TB_QUEUE_KAFKA_REPLICATION_FACTOR:1}"
-    max_poll_interval_ms: "${TB_QUEUE_KAFKA_MAX_POLL_INTERVAL_MS:300000}"
-    max_poll_records: "${TB_QUEUE_KAFKA_MAX_POLL_RECORDS:8192}"
-    max_partition_fetch_bytes: "${TB_QUEUE_KAFKA_MAX_PARTITION_FETCH_BYTES:16777216}"
-    fetch_max_bytes: "${TB_QUEUE_KAFKA_FETCH_MAX_BYTES:134217728}"
     use_confluent_cloud: "${TB_QUEUE_KAFKA_USE_CONFLUENT_CLOUD:false}"
     confluent:
       ssl.algorithm: "${TB_QUEUE_KAFKA_CONFLUENT_SSL_ALGORITHM:https}"
@@ -221,11 +64,11 @@ queue:
       security.protocol: "${TB_QUEUE_KAFKA_CONFLUENT_SECURITY_PROTOCOL:SASL_SSL}"
     other:
     topic-properties:
-      rule-engine: "${TB_QUEUE_KAFKA_RE_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1}"
-      core: "${TB_QUEUE_KAFKA_CORE_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1}"
-      transport-api: "${TB_QUEUE_KAFKA_TA_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1}"
-      notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1}"
-      js-executor: "${TB_QUEUE_KAFKA_JE_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:104857600;partitions:100}"
+      rule-engine: "${TB_QUEUE_KAFKA_RE_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
+      core: "${TB_QUEUE_KAFKA_CORE_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
+      transport-api: "${TB_QUEUE_KAFKA_TA_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
+      notifications: "${TB_QUEUE_KAFKA_NOTIFICATIONS_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
+      js-executor: "${TB_QUEUE_KAFKA_JE_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:104857600;partitions:100;min.insync.replicas:1}"
     consumer-stats:
       enabled: "${TB_QUEUE_KAFKA_CONSUMER_STATS_ENABLED:true}"
       print-interval-ms: "${TB_QUEUE_KAFKA_CONSUMER_STATS_MIN_PRINT_INTERVAL_MS:60000}"
@@ -282,7 +125,8 @@ queue:
       notifications: "${TB_QUEUE_RABBIT_MQ_NOTIFICATIONS_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
       js-executor: "${TB_QUEUE_RABBIT_MQ_JE_QUEUE_PROPERTIES:x-max-length-bytes:1048576000;x-message-ttl:604800000}"
   partitions:
-    hash_function_name: "${TB_QUEUE_PARTITIONS_HASH_FUNCTION_NAME:murmur3_128}" # murmur3_32, murmur3_128 or sha256
+    hash_function_name: "${TB_QUEUE_PARTITIONS_HASH_FUNCTION_NAME:murmur3_128}"
+    virtual_nodes_size: "${TB_QUEUE_PARTITIONS_VIRTUAL_NODES_SIZE:16}"
   transport_api:
     requests_topic: "${TB_QUEUE_TRANSPORT_API_REQUEST_TOPIC:tb_transport.api.requests}"
     responses_topic: "${TB_QUEUE_TRANSPORT_API_RESPONSE_TOPIC:tb_transport.api.responses}"
@@ -295,11 +139,11 @@ queue:
     topic: "${TB_QUEUE_CORE_TOPIC:tb_core}"
     poll-interval: "${TB_QUEUE_CORE_POLL_INTERVAL_MS:25}"
     partitions: "${TB_QUEUE_CORE_PARTITIONS:10}"
-    pack-processing-timeout: "${TB_QUEUE_CORE_PACK_PROCESSING_TIMEOUT_MS:2000}"
+    pack-processing-timeout: "${TB_QUEUE_CORE_PACK_PROCESSING_TIMEOUT_MS:60000}"
     usage-stats-topic: "${TB_QUEUE_US_TOPIC:tb_usage_stats}"
     stats:
-      enabled: "${TB_QUEUE_CORE_STATS_ENABLED:true}"
-      print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:60000}"
+      enabled: "${TB_QUEUE_CORE_STATS_ENABLED:false}"
+      print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:10000}"
   js:
     # JS Eval request topic
     request_topic: "${REMOTE_JS_EVAL_REQUEST_TOPIC:js_eval.requests}"
@@ -308,15 +152,13 @@ queue:
     # JS Eval max pending requests
     max_pending_requests: "${REMOTE_JS_MAX_PENDING_REQUESTS:10000}"
     # JS Eval max request timeout
-    max_eval_requests_timeout: "${REMOTE_JS_MAX_EVAL_REQUEST_TIMEOUT:60000}"
-    # JS max request timeout
     max_requests_timeout: "${REMOTE_JS_MAX_REQUEST_TIMEOUT:10000}"
     # JS response poll interval
     response_poll_interval: "${REMOTE_JS_RESPONSE_POLL_INTERVAL_MS:25}"
   rule-engine:
     topic: "${TB_QUEUE_RULE_ENGINE_TOPIC:tb_rule_engine}"
     poll-interval: "${TB_QUEUE_RULE_ENGINE_POLL_INTERVAL_MS:25}"
-    pack-processing-timeout: "${TB_QUEUE_RULE_ENGINE_PACK_PROCESSING_TIMEOUT_MS:2000}"
+    pack-processing-timeout: "${TB_QUEUE_RULE_ENGINE_PACK_PROCESSING_TIMEOUT_MS:60000}"
     stats:
       enabled: "${TB_QUEUE_RULE_ENGINE_STATS_ENABLED:true}"
       print-interval-ms: "${TB_QUEUE_RULE_ENGINE_STATS_PRINT_INTERVAL_MS:60000}"
@@ -325,7 +167,7 @@ queue:
         topic: "${TB_QUEUE_RE_MAIN_TOPIC:tb_rule_engine.main}"
         poll-interval: "${TB_QUEUE_RE_MAIN_POLL_INTERVAL_MS:25}"
         partitions: "${TB_QUEUE_RE_MAIN_PARTITIONS:10}"
-        pack-processing-timeout: "${TB_QUEUE_RE_MAIN_PACK_PROCESSING_TIMEOUT_MS:2000}"
+        pack-processing-timeout: "${TB_QUEUE_RE_MAIN_PACK_PROCESSING_TIMEOUT_MS:60000}"
         submit-strategy:
           type: "${TB_QUEUE_RE_MAIN_SUBMIT_STRATEGY_TYPE:BURST}" # BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL
           # For BATCH only
@@ -336,12 +178,11 @@ queue:
           retries: "${TB_QUEUE_RE_MAIN_PROCESSING_STRATEGY_RETRIES:3}" # Number of retries, 0 is unlimited
           failure-percentage: "${TB_QUEUE_RE_MAIN_PROCESSING_STRATEGY_FAILURE_PERCENTAGE:0}" # Skip retry if failures or timeouts are less then X percentage of messages;
           pause-between-retries: "${TB_QUEUE_RE_MAIN_PROCESSING_STRATEGY_RETRY_PAUSE:3}"# Time in seconds to wait in consumer thread before retries;
-          max-pause-between-retries: "${TB_QUEUE_RE_MAIN_PROCESSING_STRATEGY_MAX_RETRY_PAUSE:3}"# Max allowed time in seconds for pause between retries.
       - name: "${TB_QUEUE_RE_HP_QUEUE_NAME:HighPriority}"
         topic: "${TB_QUEUE_RE_HP_TOPIC:tb_rule_engine.hp}"
         poll-interval: "${TB_QUEUE_RE_HP_POLL_INTERVAL_MS:25}"
         partitions: "${TB_QUEUE_RE_HP_PARTITIONS:10}"
-        pack-processing-timeout: "${TB_QUEUE_RE_HP_PACK_PROCESSING_TIMEOUT_MS:2000}"
+        pack-processing-timeout: "${TB_QUEUE_RE_HP_PACK_PROCESSING_TIMEOUT_MS:60000}"
         submit-strategy:
           type: "${TB_QUEUE_RE_HP_SUBMIT_STRATEGY_TYPE:BURST}" # BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL
           # For BATCH only
@@ -352,12 +193,11 @@ queue:
           retries: "${TB_QUEUE_RE_HP_PROCESSING_STRATEGY_RETRIES:0}" # Number of retries, 0 is unlimited
           failure-percentage: "${TB_QUEUE_RE_HP_PROCESSING_STRATEGY_FAILURE_PERCENTAGE:0}" # Skip retry if failures or timeouts are less then X percentage of messages;
           pause-between-retries: "${TB_QUEUE_RE_HP_PROCESSING_STRATEGY_RETRY_PAUSE:5}"# Time in seconds to wait in consumer thread before retries;
-          max-pause-between-retries: "${TB_QUEUE_RE_HP_PROCESSING_STRATEGY_MAX_RETRY_PAUSE:5}"# Max allowed time in seconds for pause between retries.
       - name: "${TB_QUEUE_RE_SQ_QUEUE_NAME:SequentialByOriginator}"
         topic: "${TB_QUEUE_RE_SQ_TOPIC:tb_rule_engine.sq}"
         poll-interval: "${TB_QUEUE_RE_SQ_POLL_INTERVAL_MS:25}"
         partitions: "${TB_QUEUE_RE_SQ_PARTITIONS:10}"
-        pack-processing-timeout: "${TB_QUEUE_RE_SQ_PACK_PROCESSING_TIMEOUT_MS:2000}"
+        pack-processing-timeout: "${TB_QUEUE_RE_SQ_PACK_PROCESSING_TIMEOUT_MS:60000}"
         submit-strategy:
           type: "${TB_QUEUE_RE_SQ_SUBMIT_STRATEGY_TYPE:SEQUENTIAL_BY_ORIGINATOR}" # BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL
           # For BATCH only
@@ -368,16 +208,11 @@ queue:
           retries: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_RETRIES:3}" # Number of retries, 0 is unlimited
           failure-percentage: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_FAILURE_PERCENTAGE:0}" # Skip retry if failures or timeouts are less then X percentage of messages;
           pause-between-retries: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_RETRY_PAUSE:5}"# Time in seconds to wait in consumer thread before retries;
-          max-pause-between-retries: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_MAX_RETRY_PAUSE:5}"# Max allowed time in seconds for pause between retries.
   transport:
     # For high priority notifications that require minimum latency and processing time
     notifications_topic: "${TB_QUEUE_TRANSPORT_NOTIFICATIONS_TOPIC:tb_transport.notifications}"
     poll_interval: "${TB_QUEUE_TRANSPORT_NOTIFICATIONS_POLL_INTERVAL_MS:25}"
 
-event:
-  debug:
-    max-symbols: "${TB_MAX_DEBUG_EVENT_SYMBOLS:4096}"
-
 service:
   type: "${TB_SERVICE_TYPE:tb-transport}"
   # Unique id for this service (autogenerated if empty)
@@ -387,13 +222,10 @@ service:
 metrics:
   # Enable/disable actuator metrics.
   enabled: "${METRICS_ENABLED:false}"
-  timer:
-    # Metrics percentiles returned by actuator for timer metrics. List of double values (divided by ,).
-    percentiles: "${METRICS_TIMER_PERCENTILES:0.5}"
 
 management:
   endpoints:
     web:
       exposure:
         # Expose metrics endpoint (use value 'prometheus' to enable prometheus metrics).
-        include: '${METRICS_ENDPOINTS_EXPOSE:info}'
+        include: '${METRICS_ENDPOINTS_EXPOSE:info}'
\ No newline at end of file