feat: use RabbitMQ as default MQTT and Message Broker

Signed-off-by: Rodney Osodo <socials@rodneyosodo.com>
absmach · Feb 11, 2025 · ea5e23f · ea5e23f
1 parent e98d585
commit ea5e23f
Show file tree

Hide file tree

Showing 26 changed files with 175 additions and 198 deletions.
diff --git a/Makefile b/Makefile
@@ -29,13 +29,13 @@ INTERNAL_PROTO_FILES := $(shell find $(INTERNAL_PROTO_DIR) -name "*.proto" | sed
 ifneq ($(SMQ_MESSAGE_BROKER_TYPE),)
     SMQ_MESSAGE_BROKER_TYPE := $(SMQ_MESSAGE_BROKER_TYPE)
 else
-    SMQ_MESSAGE_BROKER_TYPE=nats
+    SMQ_MESSAGE_BROKER_TYPE=rabbitmq
 endif
 
 ifneq ($(SMQ_ES_TYPE),)
     SMQ_ES_TYPE := $(SMQ_ES_TYPE)
 else
-    SMQ_ES_TYPE=nats
+    SMQ_ES_TYPE=rabbitmq
 endif
 
 define compile_service

diff --git a/cmd/auth/main.go b/cmd/auth/main.go
@@ -74,7 +74,7 @@ type config struct {
 	SpicedbSchemaFile   string        `env:"SMQ_SPICEDB_SCHEMA_FILE"          envDefault:"./docker/spicedb/schema.zed"`
 	SpicedbPreSharedKey string        `env:"SMQ_SPICEDB_PRE_SHARED_KEY"       envDefault:"12345678"`
 	TraceRatio          float64       `env:"SMQ_JAEGER_TRACE_RATIO"           envDefault:"1.0"`
-	ESURL               string        `env:"SMQ_ES_URL"                       envDefault:"nats://localhost:4222"`
+	ESURL               string        `env:"SMQ_ES_URL"                       envDefault:"amqp://guest:guest@rabbitmq:5672/"`
 }
 
 func main() {

diff --git a/cmd/channels/main.go b/cmd/channels/main.go
@@ -79,7 +79,7 @@ type config struct {
 	InstanceID          string  `env:"SMQ_CHANNELS_INSTANCE_ID"         envDefault:""`
 	JaegerURL           url.URL `env:"SMQ_JAEGER_URL"                   envDefault:"http://localhost:4318/v1/traces"`
 	SendTelemetry       bool    `env:"SMQ_SEND_TELEMETRY"               envDefault:"true"`
-	ESURL               string  `env:"SMQ_ES_URL"                       envDefault:"nats://localhost:4222"`
+	ESURL               string  `env:"SMQ_ES_URL"                       envDefault:"amqp://guest:guest@rabbitmq:5672/"`
 	ESConsumerName      string  `env:"SMQ_CHANNELS_EVENT_CONSUMER"      envDefault:"channels"`
 	TraceRatio          float64 `env:"SMQ_JAEGER_TRACE_RATIO"           envDefault:"1.0"`
 	SpicedbHost         string  `env:"SMQ_SPICEDB_HOST"                 envDefault:"localhost"`

diff --git a/cmd/clients/main.go b/cmd/clients/main.go
@@ -87,7 +87,7 @@ type config struct {
 	CacheKeyDuration    time.Duration `env:"SMQ_CLIENTS_CACHE_KEY_DURATION" envDefault:"10m"`
 	JaegerURL           url.URL       `env:"SMQ_JAEGER_URL"                 envDefault:"http://localhost:4318/v1/traces"`
 	SendTelemetry       bool          `env:"SMQ_SEND_TELEMETRY"             envDefault:"true"`
-	ESURL               string        `env:"SMQ_ES_URL"                     envDefault:"nats://localhost:4222"`
+	ESURL               string        `env:"SMQ_ES_URL"                     envDefault:"amqp://guest:guest@rabbitmq:5672/"`
 	ESConsumerName      string        `env:"SMQ_CLIENTS_EVENT_CONSUMER"     envDefault:"clients"`
 	TraceRatio          float64       `env:"SMQ_JAEGER_TRACE_RATIO"         envDefault:"1.0"`
 	SpicedbHost         string        `env:"SMQ_SPICEDB_HOST"               envDefault:"localhost"`

diff --git a/cmd/coap/main.go b/cmd/coap/main.go
@@ -43,12 +43,12 @@ const (
 
 type config struct {
 	LogLevel      string  `env:"SMQ_COAP_ADAPTER_LOG_LEVEL"   envDefault:"info"`
-	BrokerURL     string  `env:"SMQ_MESSAGE_BROKER_URL"       envDefault:"nats://localhost:4222"`
+	BrokerURL     string  `env:"SMQ_MESSAGE_BROKER_URL"       envDefault:"amqp://guest:guest@rabbitmq:5672/"`
 	JaegerURL     url.URL `env:"SMQ_JAEGER_URL"               envDefault:"http://localhost:4318/v1/traces"`
 	SendTelemetry bool    `env:"SMQ_SEND_TELEMETRY"           envDefault:"true"`
 	InstanceID    string  `env:"SMQ_COAP_ADAPTER_INSTANCE_ID" envDefault:""`
 	TraceRatio    float64 `env:"SMQ_JAEGER_TRACE_RATIO"       envDefault:"1.0"`
-	ESURL         string  `env:"SMQ_ES_URL"                   envDefault:"nats://localhost:4222"`
+	ESURL         string  `env:"SMQ_ES_URL"                   envDefault:"amqp://guest:guest@rabbitmq:5672/"`
 }
 
 func main() {

diff --git a/cmd/domains/main.go b/cmd/domains/main.go
@@ -79,7 +79,7 @@ type config struct {
 	SpicedbSchemaFile   string        `env:"SMQ_SPICEDB_SCHEMA_FILE"          envDefault:"schema.zed"`
 	SpicedbPreSharedKey string        `env:"SMQ_SPICEDB_PRE_SHARED_KEY"       envDefault:"12345678"`
 	TraceRatio          float64       `env:"SMQ_JAEGER_TRACE_RATIO"           envDefault:"1.0"`
-	ESURL               string        `env:"SMQ_ES_URL"                       envDefault:"nats://localhost:4222"`
+	ESURL               string        `env:"SMQ_ES_URL"                       envDefault:"amqp://guest:guest@rabbitmq:5672/"`
 }
 
 func main() {

diff --git a/cmd/groups/main.go b/cmd/groups/main.go
@@ -78,7 +78,7 @@ type config struct {
 	InstanceID          string  `env:"SMQ_GROUPS_INSTANCE_ID"        envDefault:""`
 	JaegerURL           url.URL `env:"SMQ_JAEGER_URL"                envDefault:"http://localhost:4318/v1/traces"`
 	SendTelemetry       bool    `env:"SMQ_SEND_TELEMETRY"            envDefault:"true"`
-	ESURL               string  `env:"SMQ_ES_URL"                    envDefault:"nats://localhost:4222"`
+	ESURL               string  `env:"SMQ_ES_URL"                    envDefault:"amqp://guest:guest@rabbitmq:5672/"`
 	ESConsumerName      string  `env:"SMQ_GROUPS_EVENT_CONSUMER"     envDefault:"groups"`
 	TraceRatio          float64 `env:"SMQ_JAEGER_TRACE_RATIO"        envDefault:"1.0"`
 	SpicedbHost         string  `env:"SMQ_SPICEDB_HOST"              envDefault:"localhost"`

diff --git a/cmd/http/main.go b/cmd/http/main.go
@@ -55,12 +55,12 @@ const (
 
 type config struct {
 	LogLevel      string  `env:"SMQ_HTTP_ADAPTER_LOG_LEVEL"   envDefault:"info"`
-	BrokerURL     string  `env:"SMQ_MESSAGE_BROKER_URL"       envDefault:"nats://localhost:4222"`
+	BrokerURL     string  `env:"SMQ_MESSAGE_BROKER_URL"       envDefault:"amqp://guest:guest@rabbitmq:5672/"`
 	JaegerURL     url.URL `env:"SMQ_JAEGER_URL"               envDefault:"http://localhost:4318/v1/traces"`
 	SendTelemetry bool    `env:"SMQ_SEND_TELEMETRY"           envDefault:"true"`
 	InstanceID    string  `env:"SMQ_HTTP_ADAPTER_INSTANCE_ID" envDefault:""`
 	TraceRatio    float64 `env:"SMQ_JAEGER_TRACE_RATIO"       envDefault:"1.0"`
-	ESURL         string  `env:"SMQ_ES_URL"                   envDefault:"nats://localhost:4222"`
+	ESURL         string  `env:"SMQ_ES_URL"                   envDefault:"amqp://guest:guest@rabbitmq:5672/"`
 }
 
 func main() {

diff --git a/cmd/journal/main.go b/cmd/journal/main.go
@@ -51,7 +51,7 @@ const (
 
 type config struct {
 	LogLevel      string  `env:"SMQ_JOURNAL_LOG_LEVEL"   envDefault:"info"`
-	ESURL         string  `env:"SMQ_ES_URL"              envDefault:"nats://localhost:4222"`
+	ESURL         string  `env:"SMQ_ES_URL"              envDefault:"amqp://guest:guest@rabbitmq:5672/"`
 	JaegerURL     url.URL `env:"SMQ_JAEGER_URL"          envDefault:"http://localhost:4318/v1/traces"`
 	SendTelemetry bool    `env:"SMQ_SEND_TELEMETRY"      envDefault:"true"`
 	InstanceID    string  `env:"SMQ_JOURNAL_INSTANCE_ID" envDefault:""`

diff --git a/cmd/mqtt/main.go b/cmd/mqtt/main.go
@@ -66,10 +66,10 @@ type config struct {
 	HTTPTargetPath        string        `env:"SMQ_MQTT_ADAPTER_WS_TARGET_PATH"               envDefault:"/mqtt"`
 	Instance              string        `env:"SMQ_MQTT_ADAPTER_INSTANCE"                     envDefault:""`
 	JaegerURL             url.URL       `env:"SMQ_JAEGER_URL"                                envDefault:"http://localhost:4318/v1/traces"`
-	BrokerURL             string        `env:"SMQ_MESSAGE_BROKER_URL"                        envDefault:"nats://localhost:4222"`
+	BrokerURL             string        `env:"SMQ_MESSAGE_BROKER_URL"                        envDefault:"amqp://guest:guest@rabbitmq:5672/"`
 	SendTelemetry         bool          `env:"SMQ_SEND_TELEMETRY"                            envDefault:"true"`
 	InstanceID            string        `env:"SMQ_MQTT_ADAPTER_INSTANCE_ID"                  envDefault:""`
-	ESURL                 string        `env:"SMQ_ES_URL"                                    envDefault:"nats://localhost:4222"`
+	ESURL                 string        `env:"SMQ_ES_URL"                                    envDefault:"amqp://guest:guest@rabbitmq:5672/"`
 	TraceRatio            float64       `env:"SMQ_JAEGER_TRACE_RATIO"                        envDefault:"1.0"`
 }
 

diff --git a/cmd/users/main.go b/cmd/users/main.go
@@ -78,7 +78,7 @@ type config struct {
 	JaegerURL           url.URL       `env:"SMQ_JAEGER_URL"                envDefault:"http://localhost:4318/v1/traces"`
 	SendTelemetry       bool          `env:"SMQ_SEND_TELEMETRY"            envDefault:"true"`
 	InstanceID          string        `env:"SMQ_USERS_INSTANCE_ID"         envDefault:""`
-	ESURL               string        `env:"SMQ_ES_URL"                    envDefault:"nats://localhost:4222"`
+	ESURL               string        `env:"SMQ_ES_URL"                    envDefault:"amqp://guest:guest@rabbitmq:5672/"`
 	TraceRatio          float64       `env:"SMQ_JAEGER_TRACE_RATIO"        envDefault:"1.0"`
 	SelfRegister        bool          `env:"SMQ_USERS_ALLOW_SELF_REGISTER" envDefault:"false"`
 	OAuthUIRedirectURL  string        `env:"SMQ_OAUTH_UI_REDIRECT_URL"     envDefault:"http://localhost:9095/domains"`

diff --git a/cmd/ws/main.go b/cmd/ws/main.go
@@ -51,12 +51,12 @@ const (
 
 type config struct {
 	LogLevel      string  `env:"SMQ_WS_ADAPTER_LOG_LEVEL"    envDefault:"info"`
-	BrokerURL     string  `env:"SMQ_MESSAGE_BROKER_URL"      envDefault:"nats://localhost:4222"`
+	BrokerURL     string  `env:"SMQ_MESSAGE_BROKER_URL"      envDefault:"amqp://guest:guest@rabbitmq:5672/"`
 	JaegerURL     url.URL `env:"SMQ_JAEGER_URL"              envDefault:"http://localhost:4318/v1/traces"`
 	SendTelemetry bool    `env:"SMQ_SEND_TELEMETRY"          envDefault:"true"`
 	InstanceID    string  `env:"SMQ_WS_ADAPTER_INSTANCE_ID"  envDefault:""`
 	TraceRatio    float64 `env:"SMQ_JAEGER_TRACE_RATIO"      envDefault:"1.0"`
-	ESURL         string  `env:"SMQ_ES_URL"                  envDefault:"nats://localhost:4222"`
+	ESURL         string  `env:"SMQ_ES_URL"                  envDefault:"amqp://guest:guest@rabbitmq:5672/"`
 }
 
 func main() {

diff --git a/coap/README.md b/coap/README.md
@@ -6,27 +6,27 @@ SuperMQ CoAP adapter provides an [CoAP](http://coap.technology/) API for sending
 
 The service is configured using the environment variables presented in the following table. Note that any unset variables will be replaced with their default values.
 
-| Variable                           | Description                                                                         | Default                           |
-| ---------------------------------- | ----------------------------------------------------------------------------------- | --------------------------------- |
-| SMQ_COAP_ADAPTER_LOG_LEVEL         | Log level for the CoAP Adapter (debug, info, warn, error)                           | info                              |
-| SMQ_COAP_ADAPTER_HOST              | CoAP service listening host                                                         | ""                                |
-| SMQ_COAP_ADAPTER_PORT              | CoAP service listening port                                                         | 5683                              |
-| SMQ_COAP_ADAPTER_SERVER_CERT       | CoAP service server certificate                                                     | ""                                |
-| SMQ_COAP_ADAPTER_SERVER_KEY        | CoAP service server key                                                             | ""                                |
-| SMQ_COAP_ADAPTER_HTTP_HOST         | Service HTTP listening host                                                         | ""                                |
-| SMQ_COAP_ADAPTER_HTTP_PORT         | Service listening port                                                              | 5683                              |
-| SMQ_COAP_ADAPTER_HTTP_SERVER_CERT  | Service server certificate                                                          | ""                                |
-| SMQ_COAP_ADAPTER_HTTP_SERVER_KEY   | Service server key                                                                  | ""                                |
-| SMQ_CLIENTS_AUTH_GRPC_URL          | Clients service Auth gRPC URL                                                       | <localhost:7000>                  |
-| SMQ_CLIENTS_AUTH_GRPC_TIMEOUT      | Clients service Auth gRPC request timeout in seconds                                | 1s                                |
-| SMQ_CLIENTS_AUTH_GRPC_CLIENT_CERT  | Path to the PEM encoded clients service Auth gRPC client certificate file           | ""                                |
-| SMQ_CLIENTS_AUTH_GRPC_CLIENT_KEY   | Path to the PEM encoded clients service Auth gRPC client key file                   | ""                                |
-| SMQ_CLIENTS_AUTH_GRPC_SERVER_CERTS | Path to the PEM encoded clients server Auth gRPC server trusted CA certificate file | ""                                |
-| SMQ_MESSAGE_BROKER_URL             | Message broker instance URL                                                         | <nats://localhost:4222>           |
-| SMQ_JAEGER_URL                     | Jaeger server URL                                                                   | <http://localhost:4318/v1/traces> |
-| SMQ_JAEGER_TRACE_RATIO             | Jaeger sampling ratio                                                               | 1.0                               |
-| SMQ_SEND_TELEMETRY                 | Send telemetry to magistrala call home server                                       | true                              |
-| SMQ_COAP_ADAPTER_INSTANCE_ID       | CoAP adapter instance ID                                                            | ""                                |
+| Variable                           | Description                                                                         | Default                             |
+| ---------------------------------- | ----------------------------------------------------------------------------------- | ----------------------------------- |
+| SMQ_COAP_ADAPTER_LOG_LEVEL         | Log level for the CoAP Adapter (debug, info, warn, error)                           | info                                |
+| SMQ_COAP_ADAPTER_HOST              | CoAP service listening host                                                         | ""                                  |
+| SMQ_COAP_ADAPTER_PORT              | CoAP service listening port                                                         | 5683                                |
+| SMQ_COAP_ADAPTER_SERVER_CERT       | CoAP service server certificate                                                     | ""                                  |
+| SMQ_COAP_ADAPTER_SERVER_KEY        | CoAP service server key                                                             | ""                                  |
+| SMQ_COAP_ADAPTER_HTTP_HOST         | Service HTTP listening host                                                         | ""                                  |
+| SMQ_COAP_ADAPTER_HTTP_PORT         | Service listening port                                                              | 5683                                |
+| SMQ_COAP_ADAPTER_HTTP_SERVER_CERT  | Service server certificate                                                          | ""                                  |
+| SMQ_COAP_ADAPTER_HTTP_SERVER_KEY   | Service server key                                                                  | ""                                  |
+| SMQ_CLIENTS_AUTH_GRPC_URL          | Clients service Auth gRPC URL                                                       | <localhost:7000>                    |
+| SMQ_CLIENTS_AUTH_GRPC_TIMEOUT      | Clients service Auth gRPC request timeout in seconds                                | 1s                                  |
+| SMQ_CLIENTS_AUTH_GRPC_CLIENT_CERT  | Path to the PEM encoded clients service Auth gRPC client certificate file           | ""                                  |
+| SMQ_CLIENTS_AUTH_GRPC_CLIENT_KEY   | Path to the PEM encoded clients service Auth gRPC client key file                   | ""                                  |
+| SMQ_CLIENTS_AUTH_GRPC_SERVER_CERTS | Path to the PEM encoded clients server Auth gRPC server trusted CA certificate file | ""                                  |
+| SMQ_MESSAGE_BROKER_URL             | Message broker instance URL                                                         | <amqp://guest:guest@rabbitmq:5672/> |
+| SMQ_JAEGER_URL                     | Jaeger server URL                                                                   | <http://localhost:4318/v1/traces>   |
+| SMQ_JAEGER_TRACE_RATIO             | Jaeger sampling ratio                                                               | 1.0                                 |
+| SMQ_SEND_TELEMETRY                 | Send telemetry to magistrala call home server                                       | true                                |
+| SMQ_COAP_ADAPTER_INSTANCE_ID       | CoAP adapter instance ID                                                            | ""                                  |
 
 ## Deployment
 
@@ -62,7 +62,7 @@ SMQ_CLIENTS_AUTH_GRPC_TIMEOUT=1s \
 SMQ_CLIENTS_AUTH_GRPC_CLIENT_CERT="" \
 SMQ_CLIENTS_AUTH_GRPC_CLIENT_KEY="" \
 SMQ_CLIENTS_AUTH_GRPC_SERVER_CERTS="" \
-SMQ_MESSAGE_BROKER_URL=nats://localhost:4222 \
+SMQ_MESSAGE_BROKER_URL=amqp://guest:guest@rabbitmq:5672/ \
 SMQ_JAEGER_URL=http://localhost:14268/api/traces \
 SMQ_JAEGER_TRACE_RATIO=1.0 \
 SMQ_SEND_TELEMETRY=true \

diff --git a/docker/.env b/docker/.env
@@ -34,8 +34,8 @@ SMQ_RABBITMQ_MQTT_QOS=2
 SMQ_RABBITMQ_WS_TARGET_PATH=/
 
 ## Message Broker
-SMQ_MESSAGE_BROKER_TYPE=nats
-SMQ_MESSAGE_BROKER_URL=${SMQ_NATS_URL}
+SMQ_MESSAGE_BROKER_TYPE=rabbitmq
+SMQ_MESSAGE_BROKER_URL=${SMQ_RABBITMQ_URL}
 
 ## MQTT Broker
 SMQ_MQTT_BROKER_TYPE=rabbitmq