Browse Source
Merge pull request #13404 from sumin-denys/update-queue-providers
remove all references of not supported queue providers
Andrew Shvayka
1 year ago
GitHub
GPG Key ID:
16 changed files with
1 additions and
283 deletions
docker/compose-utils.sh
docker/docker-compose.aws-sqs.yml
docker/docker-compose.pubsub.yml
docker/docker-compose.rabbitmq.yml
docker/docker-compose.service-bus.yml
docker/queue-aws-sqs.env
docker/queue-pubsub.env
docker/queue-rabbitmq.env
docker/queue-service-bus.env
docker/tb-node/conf/logback.xml
docker/tb-transports/coap/conf/logback.xml
docker/tb-transports/http/conf/logback.xml
docker/tb-transports/lwm2m/conf/logback.xml
docker/tb-transports/mqtt/conf/logback.xml
docker/tb-transports/snmp/conf/logback.xml
docker/tb-vc-executor/conf/logback.xml
@ -42,20 +42,8 @@ function additionalComposeQueueArgs() {
confluent)
ADDITIONAL_COMPOSE_QUEUE_ARGS = "-f docker-compose.confluent.yml"
; ;
aws-sqs)
ADDITIONAL_COMPOSE_QUEUE_ARGS = "-f docker-compose.aws-sqs.yml"
; ;
pubsub)
ADDITIONAL_COMPOSE_QUEUE_ARGS = "-f docker-compose.pubsub.yml"
; ;
rabbitmq)
ADDITIONAL_COMPOSE_QUEUE_ARGS = "-f docker-compose.rabbitmq.yml"
; ;
service-bus)
ADDITIONAL_COMPOSE_QUEUE_ARGS = "-f docker-compose.service-bus.yml"
; ;
*)
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
echo " Unknown Queue service TB_QUEUE_TYPE value specified in the .env file: ' ${ TB_QUEUE_TYPE } '. Should be either 'kafka' or 'confluent'. " >& 2
exit 1
esac
echo $ADDITIONAL_COMPOSE_QUEUE_ARGS
@ -1,61 +0,0 @@
#
# Copyright © 2016-2025 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 : '3.0'
services:
tb-js-executor:
env_file:
- queue-aws-sqs.env
tb-core1:
env_file:
- queue-aws-sqs.env
tb-core2:
env_file:
- queue-aws-sqs.env
tb-rule-engine1:
env_file:
- queue-aws-sqs.env
tb-rule-engine2:
env_file:
- queue-aws-sqs.env
tb-mqtt-transport1:
env_file:
- queue-aws-sqs.env
tb-mqtt-transport2:
env_file:
- queue-aws-sqs.env
tb-http-transport1:
env_file:
- queue-aws-sqs.env
tb-http-transport2:
env_file:
- queue-aws-sqs.env
tb-coap-transport:
env_file:
- queue-aws-sqs.env
tb-lwm2m-transport:
env_file:
- queue-aws-sqs.env
tb-snmp-transport:
env_file:
- queue-aws-sqs.env
tb-vc-executor1:
env_file:
- queue-aws-sqs.env
tb-vc-executor2:
env_file:
- queue-aws-sqs.env
@ -1,61 +0,0 @@
#
# Copyright © 2016-2025 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 : '3.0'
services:
tb-js-executor:
env_file:
- queue-pubsub.env
tb-core1:
env_file:
- queue-pubsub.env
tb-core2:
env_file:
- queue-pubsub.env
tb-rule-engine1:
env_file:
- queue-pubsub.env
tb-rule-engine2:
env_file:
- queue-pubsub.env
tb-mqtt-transport1:
env_file:
- queue-pubsub.env
tb-mqtt-transport2:
env_file:
- queue-pubsub.env
tb-http-transport1:
env_file:
- queue-pubsub.env
tb-http-transport2:
env_file:
- queue-pubsub.env
tb-coap-transport:
env_file:
- queue-pubsub.env
tb-lwm2m-transport:
env_file:
- queue-pubsub.env
tb-snmp-transport:
env_file:
- queue-pubsub.env
tb-vc-executor1:
env_file:
- queue-pubsub.env
tb-vc-executor2:
env_file:
- queue-pubsub.env
@ -1,61 +0,0 @@
#
# Copyright © 2016-2025 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 : '3.0'
services:
tb-js-executor:
env_file:
- queue-rabbitmq.env
tb-core1:
env_file:
- queue-rabbitmq.env
tb-core2:
env_file:
- queue-rabbitmq.env
tb-rule-engine1:
env_file:
- queue-rabbitmq.env
tb-rule-engine2:
env_file:
- queue-rabbitmq.env
tb-mqtt-transport1:
env_file:
- queue-rabbitmq.env
tb-mqtt-transport2:
env_file:
- queue-rabbitmq.env
tb-http-transport1:
env_file:
- queue-rabbitmq.env
tb-http-transport2:
env_file:
- queue-rabbitmq.env
tb-coap-transport:
env_file:
- queue-rabbitmq.env
tb-lwm2m-transport:
env_file:
- queue-rabbitmq.env
tb-snmp-transport:
env_file:
- queue-rabbitmq.env
tb-vc-executor1:
env_file:
- queue-rabbitmq.env
tb-vc-executor2:
env_file:
- queue-rabbitmq.env
@ -1,61 +0,0 @@
#
# Copyright © 2016-2025 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 : '3.0'
services:
tb-js-executor:
env_file:
- queue-service-bus.env
tb-core1:
env_file:
- queue-service-bus.env
tb-core2:
env_file:
- queue-service-bus.env
tb-rule-engine1:
env_file:
- queue-service-bus.env
tb-rule-engine2:
env_file:
- queue-service-bus.env
tb-mqtt-transport1:
env_file:
- queue-service-bus.env
tb-mqtt-transport2:
env_file:
- queue-service-bus.env
tb-http-transport1:
env_file:
- queue-service-bus.env
tb-http-transport2:
env_file:
- queue-service-bus.env
tb-coap-transport:
env_file:
- queue-service-bus.env
tb-lwm2m-transport:
env_file:
- queue-service-bus.env
tb-snmp-transport:
env_file:
- queue-service-bus.env
tb-vc-executor1:
env_file:
- queue-service-bus.env
tb-vc-executor2:
env_file:
- queue-service-bus.env
@ -1,4 +0,0 @@
TB_QUEUE_TYPE = aws-sqs
TB_QUEUE_AWS_SQS_ACCESS_KEY_ID = YOUR_KEY
TB_QUEUE_AWS_SQS_SECRET_ACCESS_KEY = YOUR_SECRET
TB_QUEUE_AWS_SQS_REGION = YOUR_REGION
@ -1,3 +0,0 @@
TB_QUEUE_TYPE = pubsub
TB_QUEUE_PUBSUB_PROJECT_ID = YOUR_PROJECT_ID
TB_QUEUE_PUBSUB_SERVICE_ACCOUNT = YOUR_SERVICE_ACCOUNT
@ -1,5 +0,0 @@
TB_QUEUE_TYPE = rabbitmq
TB_QUEUE_RABBIT_MQ_HOST = localhost
TB_QUEUE_RABBIT_MQ_PORT = 5672
TB_QUEUE_RABBIT_MQ_USERNAME = YOUR_USERNAME
TB_QUEUE_RABBIT_MQ_PASSWORD = YOUR_PASSWORD
@ -1,4 +0,0 @@
TB_QUEUE_TYPE = service-bus
TB_QUEUE_SERVICE_BUS_NAMESPACE_NAME = YOUR_NAMESPACE_NAME
TB_QUEUE_SERVICE_BUS_SAS_KEY_NAME = YOUR_SAS_KEY_NAME
TB_QUEUE_SERVICE_BUS_SAS_KEY = YOUR_SAS_KEY
@ -67,8 +67,6 @@
<!-- MQTT transport debug -->
<!-- <logger name="org.thingsboard.server.transport.mqtt.MqttTransportHandler" level="DEBUG" /> -->
<logger name= "com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level= "OFF" />
<root level= "INFO" >
<appender-ref ref= "fileLogAppender" />
<appender-ref ref= "STDOUT" />
@ -42,8 +42,6 @@
<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" level= "WARN" />
@ -42,8 +42,6 @@
<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" level= "WARN" />
@ -42,7 +42,6 @@
<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" level= "WARN" />
@ -42,7 +42,6 @@
<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" level= "WARN" />
@ -42,7 +42,6 @@
<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" level= "WARN" />
@ -42,7 +42,6 @@
<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" level= "WARN" />
Andrew Shvayka
1 year ago
GitHub