NOISSUE - Fix readers env Prefix(#46)

* update timescale Signed-off-by: ianmuchyri <[email protected]> * remove omitempty to mess resp Signed-off-by: ianmuchyri <[email protected]> * remove domain_id Signed-off-by: ianmuchyri <[email protected]> * update tests Signed-off-by: ianmuchyri <[email protected]> --------- Signed-off-by: ianmuchyri <[email protected]>
absmach · Jan 24, 2025 · 89eaa8e · 89eaa8e
1 parent 82d0a10
commit 89eaa8e
Show file tree

Hide file tree

Showing 22 changed files with 310 additions and 301 deletions.
diff --git a/cmd/timescale-reader/main.go b/cmd/timescale-reader/main.go
@@ -31,8 +31,8 @@ import (
 
 const (
 	svcName           = "timescaledb-reader"
-	envPrefixDB       = "SMQ_TIMESCALE_"
-	envPrefixHTTP     = "SMQ_TIMESCALE_READER_HTTP_"
+	envPrefixDB       = "MG_TIMESCALE_"
+	envPrefixHTTP     = "MG_TIMESCALE_READER_HTTP_"
 	envPrefixAuth     = "SMQ_AUTH_GRPC_"
 	envPrefixClients  = "SMQ_CLIENTS_AUTH_GRPC_"
 	envPrefixChannels = "SMQ_CHANNELS_GRPC_"
@@ -41,9 +41,9 @@ const (
 )
 
 type config struct {
-	LogLevel      string `env:"SMQ_TIMESCALE_READER_LOG_LEVEL"    envDefault:"info"`
-	SendTelemetry bool   `env:"SMQ_SEND_TELEMETRY"                envDefault:"true"`
-	InstanceID    string `env:"SMQ_TIMESCALE_READER_INSTANCE_ID"  envDefault:""`
+	LogLevel      string `env:"MG_TIMESCALE_READER_LOG_LEVEL"    envDefault:"info"`
+	SendTelemetry bool   `env:"SMQ_SEND_TELEMETRY"               envDefault:"true"`
+	InstanceID    string `env:"MG_TIMESCALE_READER_INSTANCE_ID"  envDefault:""`
 }
 
 func main() {
@@ -100,7 +100,7 @@ func main() {
 	}
 	defer clientsHandler.Close()
 
-	logger.Info("ClientsService gRPC client successfully connected to clients gRPC server " + clientsHandler.Secure())
+	logger.Info("Clients service gRPC client successfully connected to clients gRPC server " + clientsHandler.Secure())
 
 	channelsClientCfg := grpcclient.Config{}
 	if err := env.ParseWithOptions(&channelsClientCfg, env.Options{Prefix: envPrefixChannels}); err != nil {

diff --git a/cmd/timescale-writer/main.go b/cmd/timescale-writer/main.go
@@ -34,19 +34,19 @@ import (
 
 const (
 	svcName        = "timescaledb-writer"
-	envPrefixDB    = "SMQ_TIMESCALE_"
-	envPrefixHTTP  = "SMQ_TIMESCALE_WRITER_HTTP_"
+	envPrefixDB    = "MG_TIMESCALE_"
+	envPrefixHTTP  = "MG_TIMESCALE_WRITER_HTTP_"
 	defDB          = "messages"
 	defSvcHTTPPort = "9012"
 )
 
 type config struct {
-	LogLevel      string  `env:"SMQ_TIMESCALE_WRITER_LOG_LEVEL"    envDefault:"info"`
-	ConfigPath    string  `env:"SMQ_TIMESCALE_WRITER_CONFIG_PATH"  envDefault:"/config.toml"`
+	LogLevel      string  `env:"MG_TIMESCALE_WRITER_LOG_LEVEL"     envDefault:"info"`
+	ConfigPath    string  `env:"MG_TIMESCALE_WRITER_CONFIG_PATH"   envDefault:"/config.toml"`
 	BrokerURL     string  `env:"SMQ_MESSAGE_BROKER_URL"            envDefault:"nats://localhost:4222"`
 	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_TIMESCALE_WRITER_INSTANCE_ID"  envDefault:""`
+	InstanceID    string  `env:"MG_TIMESCALE_WRITER_INSTANCE_ID"   envDefault:""`
 	TraceRatio    float64 `env:"SMQ_JAEGER_TRACE_RATIO"            envDefault:"1.0"`
 }
 

diff --git a/consumers/notifiers/smpp/README.md b/consumers/notifiers/smpp/README.md
@@ -34,13 +34,13 @@ default values.
 | MG_SMPP_DST_ADDR_TON              | SMPP destination address TON                                                      |                                |
 | MG_SMPP_SRC_ADDR_NPI              | SMPP source address NPI                                                           |                                |
 | MG_SMPP_DST_ADDR_NPI              | SMPP destination address NPI                                                      |                                |
-| MG_AUTH_GRPC_URL                  | Auth service gRPC URL                                                             | localhost:7001                 |
-| MG_AUTH_GRPC_TIMEOUT              | Auth service gRPC request timeout in seconds                                      | 1s                             |
+| SMQ_AUTH_GRPC_URL                  | Auth service gRPC URL                                                             | localhost:7001                 |
+| SMQ_AUTH_GRPC_TIMEOUT              | Auth service gRPC request timeout in seconds                                      | 1s                             |
 | MG_AUTH_GRPC_CLIENT_TLS           | Auth client TLS flag                                                              | false                          |
 | MG_AUTH_GRPC_CA_CERT              | Path to Auth client CA certs in pem format                                        | ""                             |
-| MG_MESSAGE_BROKER_URL             | Message broker URL                                                                | nats://127.0.0.1:4222          |
-| MG_JAEGER_URL                     | Jaeger server URL                                                                 | http://jaeger:14268/api/traces |
-| MG_SEND_TELEMETRY                 | Send telemetry to magistrala call home server                                     | true                           |
+| SMQ_MESSAGE_BROKER_URL             | Message broker URL                                                                | nats://127.0.0.1:4222          |
+| SMQ_JAEGER_URL                     | Jaeger server URL                                                                 | http://jaeger:14268/api/traces |
+| SMQ_SEND_TELEMETRY                 | Send telemetry to magistrala call home server                                     | true                           |
 | MG_SMPP_NOTIFIER_INSTANCE_ID      | SMPP Notifier instance ID                                                         | ""                             |
 
 ## Usage

diff --git a/consumers/writers/timescale/README.md b/consumers/writers/timescale/README.md
@@ -10,25 +10,25 @@ default values.
 
 | Variable                              | Description                                               | Default                      |
 | ------------------------------------- | --------------------------------------------------------- | ---------------------------- |
-| SMQ_TIMESCALE_WRITER_LOG_LEVEL        | Service log level                                         | info                         |
-| SMQ_TIMESCALE_WRITER_CONFIG_PATH      | Configuration file path with Message broker subjects list | /config.toml                 |
-| SMQ_TIMESCALE_WRITER_HTTP_HOST        | Service HTTP host                                         | localhost                    |
-| SMQ_TIMESCALE_WRITER_HTTP_PORT        | Service HTTP port                                         | 9012                         |
-| SMQ_TIMESCALE_WRITER_HTTP_SERVER_CERT | Service HTTP server certificate path                      | ""                           |
-| SMQ_TIMESCALE_WRITER_HTTP_SERVER_KEY  | Service HTTP server key                                   | ""                           |
-| SMQ_TIMESCALE_HOST                    | Timescale DB host                                         | timescale                    |
-| SMQ_TIMESCALE_PORT                    | Timescale DB port                                         | 5432                         |
-| SMQ_TIMESCALE_USER                    | Timescale user                                            | supermq                      |
-| SMQ_TIMESCALE_PASS                    | Timescale password                                        | supermq                      |
-| SMQ_TIMESCALE_NAME                    | Timescale database name                                   | messages                     |
-| SMQ_TIMESCALE_SSL_MODE                | Timescale SSL mode                                        | disabled                     |
-| SMQ_TIMESCALE_SSL_CERT                | Timescale SSL certificate path                            | ""                           |
-| SMQ_TIMESCALE_SSL_KEY                 | Timescale SSL key                                         | ""                           |
-| SMQ_TIMESCALE_SSL_ROOT_CERT           | Timescale SSL root certificate path                       | ""                           |
+| MG_TIMESCALE_WRITER_LOG_LEVEL        | Service log level                                         | info                         |
+| MG_TIMESCALE_WRITER_CONFIG_PATH      | Configuration file path with Message broker subjects list | /config.toml                 |
+| MG_TIMESCALE_WRITER_HTTP_HOST        | Service HTTP host                                         | localhost                    |
+| MG_TIMESCALE_WRITER_HTTP_PORT        | Service HTTP port                                         | 9012                         |
+| MG_TIMESCALE_WRITER_HTTP_SERVER_CERT | Service HTTP server certificate path                      | ""                           |
+| MG_TIMESCALE_WRITER_HTTP_SERVER_KEY  | Service HTTP server key                                   | ""                           |
+| MG_TIMESCALE_HOST                    | Timescale DB host                                         | timescale                    |
+| MG_TIMESCALE_PORT                    | Timescale DB port                                         | 5432                         |
+| MG_TIMESCALE_USER                    | Timescale user                                            | supermq                      |
+| MG_TIMESCALE_PASS                    | Timescale password                                        | supermq                      |
+| MG_TIMESCALE_NAME                    | Timescale database name                                   | messages                     |
+| MG_TIMESCALE_SSL_MODE                | Timescale SSL mode                                        | disabled                     |
+| MG_TIMESCALE_SSL_CERT                | Timescale SSL certificate path                            | ""                           |
+| MG_TIMESCALE_SSL_KEY                 | Timescale SSL key                                         | ""                           |
+| MG_TIMESCALE_SSL_ROOT_CERT           | Timescale SSL root certificate path                       | ""                           |
 | SMQ_MESSAGE_BROKER_URL                | Message broker instance URL                               | nats://localhost:4222        |
 | SMQ_JAEGER_URL                        | Jaeger server URL                                         | http://jaeger:4318/v1/traces |
 | SMQ_SEND_TELEMETRY                    | Send telemetry to supermq call home server                | true                         |
-| SMQ_TIMESCALE_WRITER_INSTANCE_ID      | Timescale writer instance ID                              | ""                           |
+| MG_TIMESCALE_WRITER_INSTANCE_ID      | Timescale writer instance ID                              | ""                           |
 
 ## Deployment
 
@@ -49,25 +49,25 @@ make timescale-writer
 make install
 
 # Set the environment variables and run the service
-SMQ_TIMESCALE_WRITER_LOG_LEVEL=[Service log level] \
-SMQ_TIMESCALE_WRITER_CONFIG_PATH=[Configuration file path with Message broker subjects list] \
-SMQ_TIMESCALE_WRITER_HTTP_HOST=[Service HTTP host] \
-SMQ_TIMESCALE_WRITER_HTTP_PORT=[Service HTTP port] \
-SMQ_TIMESCALE_WRITER_HTTP_SERVER_CERT=[Service HTTP server cert] \
-SMQ_TIMESCALE_WRITER_HTTP_SERVER_KEY=[Service HTTP server key] \
-SMQ_TIMESCALE_HOST=[Timescale host] \
-SMQ_TIMESCALE_PORT=[Timescale port] \
-SMQ_TIMESCALE_USER=[Timescale user] \
-SMQ_TIMESCALE_PASS=[Timescale password] \
-SMQ_TIMESCALE_NAME=[Timescale database name] \
-SMQ_TIMESCALE_SSL_MODE=[Timescale SSL mode] \
-SMQ_TIMESCALE_SSL_CERT=[Timescale SSL cert] \
-SMQ_TIMESCALE_SSL_KEY=[Timescale SSL key] \
-SMQ_TIMESCALE_SSL_ROOT_CERT=[Timescale SSL Root cert] \
+MG_TIMESCALE_WRITER_LOG_LEVEL=[Service log level] \
+MG_TIMESCALE_WRITER_CONFIG_PATH=[Configuration file path with Message broker subjects list] \
+MG_TIMESCALE_WRITER_HTTP_HOST=[Service HTTP host] \
+MG_TIMESCALE_WRITER_HTTP_PORT=[Service HTTP port] \
+MG_TIMESCALE_WRITER_HTTP_SERVER_CERT=[Service HTTP server cert] \
+MG_TIMESCALE_WRITER_HTTP_SERVER_KEY=[Service HTTP server key] \
+MG_TIMESCALE_HOST=[Timescale host] \
+MG_TIMESCALE_PORT=[Timescale port] \
+MG_TIMESCALE_USER=[Timescale user] \
+MG_TIMESCALE_PASS=[Timescale password] \
+MG_TIMESCALE_NAME=[Timescale database name] \
+MG_TIMESCALE_SSL_MODE=[Timescale SSL mode] \
+MG_TIMESCALE_SSL_CERT=[Timescale SSL cert] \
+MG_TIMESCALE_SSL_KEY=[Timescale SSL key] \
+MG_TIMESCALE_SSL_ROOT_CERT=[Timescale SSL Root cert] \
 SMQ_MESSAGE_BROKER_URL=[Message broker instance URL] \
 SMQ_JAEGER_URL=[Jaeger server URL] \
 SMQ_SEND_TELEMETRY=[Send telemetry to supermq call home server] \
-SMQ_TIMESCALE_WRITER_INSTANCE_ID=[Timescale writer instance ID] \
+MG_TIMESCALE_WRITER_INSTANCE_ID=[Timescale writer instance ID] \
 $GOBIN/supermq-timescale-writer
 ```
 

diff --git a/docker/.env b/docker/.env
@@ -539,32 +539,32 @@ SMQ_POSTGRES_READER_HTTP_SERVER_KEY=
 SMQ_POSTGRES_READER_INSTANCE_ID=
 
 ### Timescale
-SMQ_TIMESCALE_HOST=supermq-timescale
-SMQ_TIMESCALE_PORT=5432
-SMQ_TIMESCALE_USER=supermq
-SMQ_TIMESCALE_PASS=supermq
-SMQ_TIMESCALE_NAME=supermq
-SMQ_TIMESCALE_SSL_MODE=disable
-SMQ_TIMESCALE_SSL_CERT=
-SMQ_TIMESCALE_SSL_KEY=
-SMQ_TIMESCALE_SSL_ROOT_CERT=
+MG_TIMESCALE_HOST=timescale
+MG_TIMESCALE_PORT=5432
+MG_TIMESCALE_USER=supermq
+MG_TIMESCALE_PASS=supermq
+MG_TIMESCALE_NAME=supermq
+MG_TIMESCALE_SSL_MODE=disable
+MG_TIMESCALE_SSL_CERT=
+MG_TIMESCALE_SSL_KEY=
+MG_TIMESCALE_SSL_ROOT_CERT=
 
 ### Timescale Writer
-SMQ_TIMESCALE_WRITER_LOG_LEVEL=debug
-SMQ_TIMESCALE_WRITER_CONFIG_PATH=/config.toml
-SMQ_TIMESCALE_WRITER_HTTP_HOST=timescale-writer
-SMQ_TIMESCALE_WRITER_HTTP_PORT=9012
-SMQ_TIMESCALE_WRITER_HTTP_SERVER_CERT=
-SMQ_TIMESCALE_WRITER_HTTP_SERVER_KEY=
-SMQ_TIMESCALE_WRITER_INSTANCE_ID=
+MG_TIMESCALE_WRITER_LOG_LEVEL=debug
+MG_TIMESCALE_WRITER_CONFIG_PATH=/config.toml
+MG_TIMESCALE_WRITER_HTTP_HOST=timescale-writer
+MG_TIMESCALE_WRITER_HTTP_PORT=9012
+MG_TIMESCALE_WRITER_HTTP_SERVER_CERT=
+MG_TIMESCALE_WRITER_HTTP_SERVER_KEY=
+MG_TIMESCALE_WRITER_INSTANCE_ID=
 
 ### Timescale Reader
-SMQ_TIMESCALE_READER_LOG_LEVEL=debug
-SMQ_TIMESCALE_READER_HTTP_HOST=timescale-reader
-SMQ_TIMESCALE_READER_HTTP_PORT=9011
-SMQ_TIMESCALE_READER_HTTP_SERVER_CERT=
-SMQ_TIMESCALE_READER_HTTP_SERVER_KEY=
-SMQ_TIMESCALE_READER_INSTANCE_ID=
+MG_TIMESCALE_READER_LOG_LEVEL=debug
+MG_TIMESCALE_READER_HTTP_HOST=timescale-reader
+MG_TIMESCALE_READER_HTTP_PORT=9011
+MG_TIMESCALE_READER_HTTP_SERVER_CERT=
+MG_TIMESCALE_READER_HTTP_SERVER_KEY=
+MG_TIMESCALE_READER_INSTANCE_ID=
 
 ### Journal
 SMQ_JOURNAL_LOG_LEVEL=info
@@ -590,4 +590,4 @@ SMQ_GRAFANA_ADMIN_USER=supermq
 SMQ_GRAFANA_ADMIN_PASSWORD=supermq
 
 # Docker image tag
-SMQ_RELEASE_TAG=latest
+MG_RELEASE_TAG=latest
diff --git a/docker/README.md b/docker/README.md
@@ -54,7 +54,7 @@ MG_MESSAGE_BROKER_TYPE=rabbitmq make dockers
 
 ```env
 MG_MESSAGE_BROKER_TYPE=rabbitmq
-MG_MESSAGE_BROKER_URL=${MG_RABBITMQ_URL}
+SMQ_MESSAGE_BROKER_URL=${MG_RABBITMQ_URL}
 ```
 
 For Redis as an events store, you would need to run RabbitMQ or NATS as a message broker. For example, to use Redis as an events store with rabbitmq as a message broker:
@@ -65,7 +65,7 @@ MG_ES_TYPE=redis MG_MESSAGE_BROKER_TYPE=rabbitmq make dockers
 
 ```env
 MG_MESSAGE_BROKER_TYPE=rabbitmq
-MG_MESSAGE_BROKER_URL=${MG_RABBITMQ_URL}
+SMQ_MESSAGE_BROKER_URL=${MG_RABBITMQ_URL}
 MG_ES_TYPE=redis
 MG_ES_URL=${MG_REDIS_URL}
 ```

diff --git a/docker/addons/bootstrap/docker-compose.yml b/docker/addons/bootstrap/docker-compose.yml
@@ -27,7 +27,7 @@ services:
       - magistrala-bootstrap-db-volume:/var/lib/postgresql/data
 
   bootstrap:
-    image: ghcr.io/absmach/magistrala/bootstrap:${SMQ_RELEASE_TAG}
+    image: ghcr.io/absmach/magistrala/bootstrap:${MG_RELEASE_TAG}
     container_name: magistrala-bootstrap
     depends_on:
       - bootstrap-db

diff --git a/docker/addons/certs/docker-compose.yml b/docker/addons/certs/docker-compose.yml
@@ -14,7 +14,7 @@ volumes:
 
 services:
   certs:
-    image: magistrala/certs:${MG_RELEASE_TAG}
+    image: ghcr.io/absmach/magistrala/certs:${MG_RELEASE_TAG}
     container_name: magistrala-certs
     depends_on:
       - am-certs
@@ -49,32 +49,32 @@ services:
       MG_CERTS_SDK_HOST: ${MG_CERTS_SDK_HOST}
       MG_CERTS_SDK_CERTS_URL: ${MG_CERTS_SDK_CERTS_URL}
       MG_CERTS_SDK_TLS_VERIFICATION: ${MG_CERTS_SDK_TLS_VERIFICATION}
-      MG_AUTH_GRPC_URL: ${MG_AUTH_GRPC_URL}
-      MG_AUTH_GRPC_TIMEOUT: ${MG_AUTH_GRPC_TIMEOUT}
-      MG_AUTH_GRPC_CLIENT_CERT: ${MG_AUTH_GRPC_CLIENT_CERT:+/auth-grpc-client.crt}
-      MG_AUTH_GRPC_CLIENT_KEY: ${MG_AUTH_GRPC_CLIENT_KEY:+/auth-grpc-client.key}
-      MG_AUTH_GRPC_SERVER_CA_CERTS: ${MG_AUTH_GRPC_SERVER_CA_CERTS:+/auth-grpc-server-ca.crt}
+      SMQ_AUTH_GRPC_URL: ${SMQ_AUTH_GRPC_URL}
+      SMQ_AUTH_GRPC_TIMEOUT: ${SMQ_AUTH_GRPC_TIMEOUT}
+      SMQ_AUTH_GRPC_CLIENT_CERT: ${SMQ_AUTH_GRPC_CLIENT_CERT:+/auth-grpc-client.crt}
+      SMQ_AUTH_GRPC_CLIENT_KEY: ${SMQ_AUTH_GRPC_CLIENT_KEY:+/auth-grpc-client.key}
+      SMQ_AUTH_GRPC_SERVER_CA_CERTS: ${SMQ_AUTH_GRPC_SERVER_CA_CERTS:+/auth-grpc-server-ca.crt}
       MG_THINGS_URL: ${MG_THINGS_URL}
-      MG_JAEGER_URL: ${MG_JAEGER_URL}
-      MG_JAEGER_TRACE_RATIO: ${MG_JAEGER_TRACE_RATIO}
-      MG_SEND_TELEMETRY: ${MG_SEND_TELEMETRY}
+      SMQ_JAEGER_URL: ${SMQ_JAEGER_URL}
+      SMQ_JAEGER_TRACE_RATIO: ${SMQ_JAEGER_TRACE_RATIO}
+      SMQ_SEND_TELEMETRY: ${SMQ_SEND_TELEMETRY}
       MG_CERTS_INSTANCE_ID: ${MG_CERTS_INSTANCE_ID}
     volumes:
       - ../../ssl/certs/ca.key:/etc/ssl/certs/ca.key
       - ../../ssl/certs/ca.crt:/etc/ssl/certs/ca.crt
       - type: bind
-        source: ${MG_ADDONS_CERTS_PATH_PREFIX}${MG_AUTH_GRPC_CLIENT_CERT:-./ssl/certs/dummy/client_cert}
-        target: /auth-grpc-client${MG_AUTH_GRPC_CLIENT_CERT:+.crt}
+        source: ${MG_ADDONS_CERTS_PATH_PREFIX}${SMQ_AUTH_GRPC_CLIENT_CERT:-./ssl/certs/dummy/client_cert}
+        target: /auth-grpc-client${SMQ_AUTH_GRPC_CLIENT_CERT:+.crt}
         bind:
           create_host_path: true
       - type: bind
-        source: ${MG_ADDONS_CERTS_PATH_PREFIX}${MG_AUTH_GRPC_CLIENT_KEY:-./ssl/certs/dummy/client_key}
-        target: /auth-grpc-client${MG_AUTH_GRPC_CLIENT_KEY:+.key}
+        source: ${MG_ADDONS_CERTS_PATH_PREFIX}${SMQ_AUTH_GRPC_CLIENT_KEY:-./ssl/certs/dummy/client_key}
+        target: /auth-grpc-client${SMQ_AUTH_GRPC_CLIENT_KEY:+.key}
         bind:
           create_host_path: true
       - type: bind
-        source: ${MG_ADDONS_CERTS_PATH_PREFIX}${MG_AUTH_GRPC_SERVER_CA_CERTS:-./ssl/certs/dummy/server_ca}
-        target: /auth-grpc-server-ca${MG_AUTH_GRPC_SERVER_CA_CERTS:+.crt}
+        source: ${MG_ADDONS_CERTS_PATH_PREFIX}${SMQ_AUTH_GRPC_SERVER_CA_CERTS:-./ssl/certs/dummy/server_ca}
+        target: /auth-grpc-server-ca${SMQ_AUTH_GRPC_SERVER_CA_CERTS:+.crt}
         bind:
           create_host_path: true
 
@@ -114,8 +114,8 @@ services:
       AM_CERTS_HTTP_PORT: 9010
       AM_CERTS_GRPC_HOST: magistrala-am-certs
       AM_CERTS_GRPC_PORT: 7012
-      AM_JAEGER_URL: ${MG_JAEGER_URL}
-      AM_JAEGER_TRACE_RATIO: ${MG_JAEGER_TRACE_RATIO}
+      AM_JAEGER_URL: ${SMQ_JAEGER_URL}
+      AM_JAEGER_TRACE_RATIO: ${SMQ_JAEGER_TRACE_RATIO}
     volumes:
       - ./config.yml:/config/config.yml
     ports:

diff --git a/docker/addons/journal/docker-compose.yml b/docker/addons/journal/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       - magistrala-journal-volume:/var/lib/postgresql/data
 
   journal:
-    image: magistrala/journal:${MG_RELEASE_TAG}
+    image: ghcr.io/absmach/magistrala/journal:${MG_RELEASE_TAG}
     container_name: magistrala-journal
     depends_on:
       - journal-db
@@ -51,15 +51,15 @@ services:
       MG_JOURNAL_DB_SSL_CERT: ${MG_JOURNAL_DB_SSL_CERT}
       MG_JOURNAL_DB_SSL_KEY: ${MG_JOURNAL_DB_SSL_KEY}
       MG_JOURNAL_DB_SSL_ROOT_CERT: ${MG_JOURNAL_DB_SSL_ROOT_CERT}
-      MG_AUTH_GRPC_URL: ${MG_AUTH_GRPC_URL}
-      MG_AUTH_GRPC_TIMEOUT: ${MG_AUTH_GRPC_TIMEOUT}
-      MG_AUTH_GRPC_CLIENT_CERT: ${MG_AUTH_GRPC_CLIENT_CERT:+/auth-grpc-client.crt}
-      MG_AUTH_GRPC_CLIENT_KEY: ${MG_AUTH_GRPC_CLIENT_KEY:+/auth-grpc-client.key}
-      MG_AUTH_GRPC_SERVER_CA_CERTS: ${MG_AUTH_GRPC_SERVER_CA_CERTS:+/auth-grpc-server-ca.crt}
+      SMQ_AUTH_GRPC_URL: ${SMQ_AUTH_GRPC_URL}
+      SMQ_AUTH_GRPC_TIMEOUT: ${SMQ_AUTH_GRPC_TIMEOUT}
+      SMQ_AUTH_GRPC_CLIENT_CERT: ${SMQ_AUTH_GRPC_CLIENT_CERT:+/auth-grpc-client.crt}
+      SMQ_AUTH_GRPC_CLIENT_KEY: ${SMQ_AUTH_GRPC_CLIENT_KEY:+/auth-grpc-client.key}
+      SMQ_AUTH_GRPC_SERVER_CA_CERTS: ${SMQ_AUTH_GRPC_SERVER_CA_CERTS:+/auth-grpc-server-ca.crt}
       MG_ES_URL: ${MG_ES_URL}
-      MG_JAEGER_URL: ${MG_JAEGER_URL}
-      MG_JAEGER_TRACE_RATIO: ${MG_JAEGER_TRACE_RATIO}
-      MG_SEND_TELEMETRY: ${MG_SEND_TELEMETRY}
+      SMQ_JAEGER_URL: ${SMQ_JAEGER_URL}
+      SMQ_JAEGER_TRACE_RATIO: ${SMQ_JAEGER_TRACE_RATIO}
+      SMQ_SEND_TELEMETRY: ${SMQ_SEND_TELEMETRY}
       MG_JOURNAL_INSTANCE_ID: ${MG_JOURNAL_INSTANCE_ID}
     ports:
       - ${MG_JOURNAL_HTTP_PORT}:${MG_JOURNAL_HTTP_PORT}