opensource/magistrala
1
0
Fork 0
mirror of https://github.com/absmach/magistrala.git synced 2026-06-23 04:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NOISSUE - Update env vars for events store (#91)

Browse Source 
- Rename env vars `MG_ES_STORE_TYPE` to `MG_ES_TYPE`
- Rename env var `MG_ES_STORE_URL` to `MG_ES_URL`
- User one env variables `MG_ES_URL` instead of every service having their own env variables
- Config default env var for `MG_ES_URL` at code level to be `nats://localhost:4222` instead of `redis://localhost:6379/0`

Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com>
This commit is contained in:
b1ackd0t
2023-11-29 13:29:22 +03:00
committed by GitHub
parent 3362f1a71a
commit 4f1b7ea614
17 changed files with 28 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/cd.yml
+1 -1
View File
@@ -28,7 +28,7 @@ jobs:
- name: Compile check for redis
run: |
MG_ES_STORE_TYPE=redis make mqtt
MG_ES_TYPE=redis make mqtt
- name: Set up Docker Build
uses: docker/setup-buildx-action@v3
.github/workflows/ci.yml
+1 -1
View File
@@ -34,7 +34,7 @@ jobs:
- name: Compile check for redis
run: |
MG_ES_STORE_TYPE=redis make mqtt
MG_ES_TYPE=redis make mqtt
- name: Build Binaries
run: |
Makefile
+9 -9
View File
@@ -34,15 +34,15 @@ else
MG_MQTT_BROKER_TYPE=nats
endif
ifneq ($(MG_ES_STORE_TYPE),)
MG_ES_STORE_TYPE := $(MG_ES_STORE_TYPE)
ifneq ($(MG_ES_TYPE),)
MG_ES_TYPE := $(MG_ES_TYPE)
else
MG_ES_STORE_TYPE=nats
MG_ES_TYPE=nats
endif
define compile_service
CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) \
go build -tags $(MG_MESSAGE_BROKER_TYPE) --tags $(MG_ES_STORE_TYPE) -ldflags "-s -w \
go build -tags $(MG_MESSAGE_BROKER_TYPE) --tags $(MG_ES_TYPE) -ldflags "-s -w \
-X 'github.com/absmach/magistrala.BuildTime=$(TIME)' \
-X 'github.com/absmach/magistrala.Version=$(VERSION)' \
-X 'github.com/absmach/magistrala.Commit=$(COMMIT)'" \
@@ -232,13 +232,13 @@ else
endif
run: check_certs change_config
ifeq ($(MG_ES_STORE_TYPE), redis)
sed -i "s/MG_ES_STORE_TYPE=.*/MG_ES_STORE_TYPE=redis/" docker/.env
sed -i "s/MG_ES_STORE_URL=.*/MG_ES_STORE_URL=$$\{MG_REDIS_URL}/" docker/.env
ifeq ($(MG_ES_TYPE), redis)
sed -i "s/MG_ES_TYPE=.*/MG_ES_TYPE=redis/" docker/.env
sed -i "s/MG_ES_URL=.*/MG_ES_URL=$$\{MG_REDIS_URL}/" docker/.env
docker-compose -f docker/docker-compose.yml --profile $(DOCKER_PROFILE) --profile redis -p $(DOCKER_PROJECT) $(DOCKER_COMPOSE_COMMAND) $(args)
else
sed -i "s,MG_ES_STORE_TYPE=.*,MG_ES_STORE_TYPE=$$\{MG_MESSAGE_BROKER_TYPE}," docker/.env
sed -i "s,MG_ES_STORE_URL=.*,MG_ES_STORE_URL=$$\{MG_$(shell echo ${MG_MESSAGE_BROKER_TYPE} | tr 'a-z' 'A-Z')_URL\}," docker/.env
sed -i "s,MG_ES_TYPE=.*,MG_ES_TYPE=$$\{MG_MESSAGE_BROKER_TYPE}," docker/.env
sed -i "s,MG_ES_URL=.*,MG_ES_URL=$$\{MG_$(shell echo ${MG_MESSAGE_BROKER_TYPE} | tr 'a-z' 'A-Z')_URL\}," docker/.env
docker-compose -f docker/docker-compose.yml --profile $(DOCKER_PROFILE) -p $(DOCKER_PROJECT) $(DOCKER_COMPOSE_COMMAND) $(args)
endif
cmd/bootstrap/main.go
+1 -1
View File
@@ -55,7 +55,7 @@ type config struct {
JaegerURL url.URL `env:"MG_JAEGER_URL" envDefault:"http://jaeger:14268/api/traces"`
SendTelemetry bool `env:"MG_SEND_TELEMETRY" envDefault:"true"`
InstanceID string `env:"MG_BOOTSTRAP_INSTANCE_ID" envDefault:""`
ESURL string `env:"MG_BOOTSTRAP_ES_URL" envDefault:"redis://localhost:6379/0"`
ESURL string `env:"MG_ES_URL" envDefault:"nats://localhost:4222"`
TraceRatio float64 `env:"MG_JAEGER_TRACE_RATIO" envDefault:"1.0"`
}
cmd/lora/main.go
+1 -1
View File
@@ -58,7 +58,7 @@ type config struct {
JaegerURL url.URL `env:"MG_JAEGER_URL" envDefault:"http://jaeger:14268/api/traces"`
SendTelemetry bool `env:"MG_SEND_TELEMETRY" envDefault:"true"`
InstanceID string `env:"MG_LORA_ADAPTER_INSTANCE_ID" envDefault:""`
ESURL string `env:"MG_LORA_ADAPTER_ES_URL" envDefault:"redis://localhost:6379/0"`
ESURL string `env:"MG_ES_URL" envDefault:"nats://localhost:4222"`
RouteMapURL string `env:"MG_LORA_ADAPTER_ROUTE_MAP_URL" envDefault:"redis://localhost:6379/0"`
TraceRatio float64 `env:"MG_JAEGER_TRACE_RATIO" envDefault:"1.0"`
}
cmd/mqtt/main.go
+1 -1
View File
@@ -59,7 +59,7 @@ type config struct {
BrokerURL string `env:"MG_MESSAGE_BROKER_URL" envDefault:"nats://localhost:4222"`
SendTelemetry bool `env:"MG_SEND_TELEMETRY" envDefault:"true"`
InstanceID string `env:"MG_MQTT_ADAPTER_INSTANCE_ID" envDefault:""`
ESURL string `env:"MG_MQTT_ADAPTER_ES_URL" envDefault:"redis://localhost:6379/0"`
ESURL string `env:"MG_ES_URL" envDefault:"nats://localhost:4222"`
TraceRatio float64 `env:"MG_JAEGER_TRACE_RATIO" envDefault:"1.0"`
}
cmd/opcua/main.go
+1 -1
View File
@@ -52,7 +52,7 @@ type config struct {
JaegerURL url.URL `env:"MG_JAEGER_URL" envDefault:"http://jaeger:14268/api/traces"`
SendTelemetry bool `env:"MG_SEND_TELEMETRY" envDefault:"true"`
InstanceID string `env:"MG_OPCUA_ADAPTER_INSTANCE_ID" envDefault:""`
ESURL string `env:"MG_OPCUA_ADAPTER_ES_URL" envDefault:"redis://localhost:6379/0"`
ESURL string `env:"MG_ES_URL" envDefault:"nats://localhost:4222"`
RouteMapURL string `env:"MG_OPCUA_ADAPTER_ROUTE_MAP_URL" envDefault:"redis://localhost:6379/0"`
TraceRatio float64 `env:"MG_JAEGER_TRACE_RATIO" envDefault:"1.0"`
}
cmd/things/main.go
+1 -1
View File
@@ -68,7 +68,7 @@ type config struct {
CacheKeyDuration time.Duration `env:"MG_THINGS_CACHE_KEY_DURATION" envDefault:"10m"`
SendTelemetry bool `env:"MG_SEND_TELEMETRY" envDefault:"true"`
InstanceID string `env:"MG_THINGS_INSTANCE_ID" envDefault:""`
ESURL string `env:"MG_THINGS_ES_URL" envDefault:"redis://localhost:6379/0"`
ESURL string `env:"MG_ES_URL" envDefault:"nats://localhost:4222"`
CacheURL string `env:"MG_THINGS_CACHE_URL" envDefault:"redis://localhost:6379/0"`
TraceRatio float64 `env:"MG_JAEGER_TRACE_RATIO" envDefault:"1.0"`
}
cmd/twins/main.go
+1 -1
View File
@@ -56,7 +56,7 @@ type config struct {
JaegerURL url.URL `env:"MG_JAEGER_URL" envDefault:"http://jaeger:14268/api/traces"`
SendTelemetry bool `env:"MG_SEND_TELEMETRY" envDefault:"true"`
InstanceID string `env:"MG_TWINS_INSTANCE_ID" envDefault:""`
ESURL string `env:"MG_TWINS_ES_URL" envDefault:"redis://localhost:6379/0"`
ESURL string `env:"MG_ES_URL" envDefault:"nats://localhost:4222"`
CacheURL string `env:"MG_TWINS_CACHE_URL" envDefault:"redis://localhost:6379/0"`
TraceRatio float64 `env:"MG_JAEGER_TRACE_RATIO" envDefault:"1.0"`
}
cmd/users/main.go
+1 -1
View File
@@ -66,7 +66,7 @@ type config struct {
JaegerURL url.URL `env:"MG_JAEGER_URL" envDefault:"http://localhost:14268/api/traces"`
SendTelemetry bool `env:"MG_SEND_TELEMETRY" envDefault:"true"`
InstanceID string `env:"MG_USERS_INSTANCE_ID" envDefault:""`
ESURL string `env:"MG_USERS_ES_URL" envDefault:"nats://localhost:4222"`
ESURL string `env:"MG_ES_URL" envDefault:"nats://localhost:4222"`
TraceRatio float64 `env:"MG_JAEGER_TRACE_RATIO" envDefault:"1.0"`
SelfRegister bool `env:"MF_USERS_ALLOW_SELF_REGISTER" envDefault:"false"`
PassRegex *regexp.Regexp
docker/.env
+2 -19
View File
@@ -54,8 +54,8 @@ MG_REDIS_TCP_PORT=6379
MG_REDIS_URL=redis://es-redis:${MG_REDIS_TCP_PORT}/0
## Event Store
MG_ES_STORE_TYPE=${MG_MESSAGE_BROKER_TYPE}
MG_ES_STORE_URL=${MG_NATS_URL}
MG_ES_TYPE=${MG_MESSAGE_BROKER_TYPE}
MG_ES_URL=${MG_NATS_URL}
## Jaeger
MG_JAEGER_COLLECTOR_OTLP_ENABLED=true
@@ -144,9 +144,6 @@ MG_USERS_DB_SSL_MODE=disable
MG_USERS_DB_SSL_CERT=
MG_USERS_DB_SSL_KEY=
MG_USERS_DB_SSL_ROOT_CERT=
MG_USERS_ES_URL=es-redis:${MG_REDIS_TCP_PORT}
MG_USERS_ES_PASS=
MG_USERS_ES_DB=
MG_USERS_RESET_PWD_TEMPLATE=users.tmpl
MG_USERS_INSTANCE_ID=
MF_USERS_ALLOW_SELF_REGISTER=true
@@ -179,9 +176,6 @@ MG_THINGS_AUTH_GRPC_PORT=7000
MG_THINGS_AUTH_GRPC_SERVER_CERT=${GRPC_MTLS:+./ssl/certs/things-grpc-server.crt}${GRPC_TLS:+./ssl/certs/things-grpc-server.crt}
MG_THINGS_AUTH_GRPC_SERVER_KEY=${GRPC_MTLS:+./ssl/certs/things-grpc-server.key}${GRPC_TLS:+./ssl/certs/things-grpc-server.key}
MG_THINGS_AUTH_GRPC_SERVER_CA_CERTS=${GRPC_MTLS:+./ssl/certs/ca.crt}${GRPC_TLS:+./ssl/certs/ca.crt}
MG_THINGS_ES_URL=es-redis:${MG_REDIS_TCP_PORT}
MG_THINGS_ES_PASS=
MG_THINGS_ES_DB=0
MG_THINGS_CACHE_URL=redis://things-redis:${MG_REDIS_TCP_PORT}/0
MG_THINGS_DB_HOST=things-db
MG_THINGS_DB_PORT=5432
@@ -216,8 +210,6 @@ MG_MQTT_ADAPTER_MQTT_PORT=1883
MG_MQTT_ADAPTER_FORWARDER_TIMEOUT=30s
MG_MQTT_ADAPTER_WS_PORT=8080
MG_MQTT_ADAPTER_INSTANCE=
MG_MQTT_ADAPTER_ES_URL=es-redis:${MG_REDIS_TCP_PORT}
MG_MQTT_ADAPTER_ES_PASS=
MG_MQTT_ADAPTER_INSTANCE_ID=
MG_MQTT_ADAPTER_ES_DB=0
@@ -246,9 +238,6 @@ MG_WS_ADAPTER_INSTANCE_ID=
MG_BOOTSTRAP_LOG_LEVEL=debug
MG_BOOTSTRAP_ENCRYPT_KEY=v7aT0HGxJxt2gULzr3RHwf4WIf6DusPphG5Ftm2bNCWD8mTpyr
MG_BOOTSTRAP_EVENT_CONSUMER=bootstrap
MG_BOOTSTRAP_ES_URL=es-redis:${MG_REDIS_TCP_PORT}
MG_BOOTSTRAP_ES_PASS=
MG_BOOTSTRAP_ES_DB=0
MG_BOOTSTRAP_HTTP_HOST=bootstrap
MG_BOOTSTRAP_HTTP_PORT=9013
MG_BOOTSTRAP_HTTP_SERVER_CERT=
@@ -349,9 +338,6 @@ MG_OPCUA_ADAPTER_HTTP_HOST=opcua-adapter
MG_OPCUA_ADAPTER_HTTP_PORT=8188
MG_OPCUA_ADAPTER_HTTP_SERVER_CERT=
MG_OPCUA_ADAPTER_HTTP_SERVER_KEY=
MG_OPCUA_ADAPTER_ES_URL=es-redis:${MG_REDIS_TCP_PORT}
MG_OPCUA_ADAPTER_ES_PASS=
MG_OPCUA_ADAPTER_ES_DB=0
MG_OPCUA_ADAPTER_ROUTE_MAP_URL=redis://opcua-redis:${MG_REDIS_TCP_PORT}/0
MG_OPCUA_ADAPTER_INSTANCE_ID=
@@ -502,9 +488,6 @@ MG_TWINS_HTTP_PORT=9018
MG_TWINS_HTTP_SERVER_CERT=
MG_TWINS_HTTP_SERVER_KEY=
MG_TWINS_CACHE_URL=redis://twins-redis:${MG_REDIS_TCP_PORT}/0
MG_THINGS_ES_URL=es-redis:${MG_REDIS_TCP_PORT}
MG_THINGS_ES_PASS=
MG_THINGS_ES_DB=0
MG_TWINS_DB_HOST=twins-db
MG_TWINS_DB_PORT=27018
MG_TWINS_DB_NAME=twins
docker/addons/bootstrap/docker-compose.yml
+1 -1
View File
@@ -41,7 +41,7 @@ services:
MG_BOOTSTRAP_LOG_LEVEL: ${MG_BOOTSTRAP_LOG_LEVEL}
MG_BOOTSTRAP_ENCRYPT_KEY: ${MG_BOOTSTRAP_ENCRYPT_KEY}
MG_BOOTSTRAP_EVENT_CONSUMER: ${MG_BOOTSTRAP_EVENT_CONSUMER}
MG_BOOTSTRAP_ES_URL: ${MG_ES_STORE_URL}
MG_ES_URL: ${MG_ES_URL}
MG_BOOTSTRAP_HTTP_HOST: ${MG_BOOTSTRAP_HTTP_HOST}
MG_BOOTSTRAP_HTTP_PORT: ${MG_BOOTSTRAP_HTTP_PORT}
MG_BOOTSTRAP_HTTP_SERVER_CERT: ${MG_BOOTSTRAP_HTTP_SERVER_CERT}
docker/addons/lora-adapter/docker-compose.yml
+1 -1
View File
@@ -36,7 +36,7 @@ services:
MG_LORA_ADAPTER_HTTP_SERVER_CERT: ${MG_LORA_ADAPTER_HTTP_SERVER_CERT}
MG_LORA_ADAPTER_HTTP_SERVER_KEY: ${MG_LORA_ADAPTER_HTTP_SERVER_KEY}
MG_LORA_ADAPTER_ROUTE_MAP_URL: ${MG_LORA_ADAPTER_ROUTE_MAP_URL}
MG_LORA_ADAPTER_ES_URL: ${MG_ES_STORE_URL}
MG_ES_URL: ${MG_ES_URL}
MG_MESSAGE_BROKER_URL: ${MG_MESSAGE_BROKER_URL}
MG_JAEGER_URL: ${MG_JAEGER_URL}
MG_JAEGER_TRACE_RATIO: ${MG_JAEGER_TRACE_RATIO}
docker/addons/opcua-adapter/docker-compose.yml
+1 -1
View File
@@ -36,7 +36,7 @@ services:
MG_OPCUA_ADAPTER_HTTP_PORT: ${MG_OPCUA_ADAPTER_HTTP_PORT}
MG_OPCUA_ADAPTER_HTTP_SERVER_CERT: ${MG_OPCUA_ADAPTER_HTTP_SERVER_CERT}
MG_OPCUA_ADAPTER_HTTP_SERVER_KEY: ${MG_OPCUA_ADAPTER_HTTP_SERVER_KEY}
MG_OPCUA_ADAPTER_ES_URL: ${MG_ES_STORE_URL}
MG_ES_URL: ${MG_ES_URL}
MG_OPCUA_ADAPTER_ROUTE_MAP_URL: ${MG_OPCUA_ADAPTER_ROUTE_MAP_URL}
MG_MESSAGE_BROKER_URL: ${MG_MESSAGE_BROKER_URL}
MG_JAEGER_URL: ${MG_JAEGER_URL}
docker/addons/twins/docker-compose.yml
+1 -1
View File
@@ -52,7 +52,7 @@ services:
MG_TWINS_HTTP_SERVER_CERT: ${MG_TWINS_HTTP_SERVER_CERT}
MG_TWINS_HTTP_SERVER_KEY: ${MG_TWINS_HTTP_SERVER_KEY}
MG_TWINS_CACHE_URL: ${MG_TWINS_CACHE_URL}
MG_TWINS_ES_URL: ${MG_ES_STORE_URL}
MG_ES_URL: ${MG_ES_URL}
MG_THINGS_STANDALONE_ID: ${MG_THINGS_STANDALONE_ID}
MG_THINGS_STANDALONE_TOKEN: ${MG_THINGS_STANDALONE_TOKEN}
MG_TWINS_DB_HOST: ${MG_TWINS_DB_HOST}
docker/docker-compose.yml
+3 -3
View File
@@ -213,7 +213,7 @@ services:
MG_THINGS_AUTH_GRPC_SERVER_KEY: ${MG_THINGS_AUTH_GRPC_SERVER_KEY:+/things-grpc-server.key}
MG_THINGS_AUTH_GRPC_SERVER_CA_CERTS: ${MG_THINGS_AUTH_GRPC_SERVER_CA_CERTS:+/things-grpc-server-ca.crt}
MG_THINGS_AUTH_GRPC_CLIENT_CA_CERTS: ${MG_THINGS_AUTH_GRPC_CLIENT_CA_CERTS:+/things-grpc-client-ca.crt}
MG_THINGS_ES_URL: ${MG_ES_STORE_URL}
MG_ES_URL: ${MG_ES_URL}
MG_THINGS_CACHE_URL: ${MG_THINGS_CACHE_URL}
MG_THINGS_DB_HOST: ${MG_THINGS_DB_HOST}
MG_THINGS_DB_PORT: ${MG_THINGS_DB_PORT}
@@ -335,7 +335,7 @@ services:
MG_EMAIL_FROM_ADDRESS: ${MG_EMAIL_FROM_ADDRESS}
MG_EMAIL_FROM_NAME: ${MG_EMAIL_FROM_NAME}
MG_EMAIL_TEMPLATE: ${MG_EMAIL_TEMPLATE}
MG_USERS_ES_URL: ${MG_ES_STORE_URL}
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}
@@ -401,7 +401,7 @@ services:
MG_MQTT_ADAPTER_WS_TARGET_PORT: ${MG_MQTT_ADAPTER_WS_TARGET_PORT}
MG_MQTT_ADAPTER_WS_TARGET_PATH: ${MG_MQTT_ADAPTER_WS_TARGET_PATH}
MG_MQTT_ADAPTER_INSTANCE: ${MG_MQTT_ADAPTER_INSTANCE}
MG_MQTT_ADAPTER_ES_URL: ${MG_ES_STORE_URL}
MG_ES_URL: ${MG_ES_URL}
MG_THINGS_AUTH_GRPC_URL: ${MG_THINGS_AUTH_GRPC_URL}
MG_THINGS_AUTH_GRPC_TIMEOUT: ${MG_THINGS_AUTH_GRPC_TIMEOUT}
MG_THINGS_AUTH_GRPC_CLIENT_CERT: ${MG_THINGS_AUTH_GRPC_CLIENT_CERT:+/things-grpc-client.crt}
scripts/ci.sh
+1 -1
View File
@@ -72,7 +72,7 @@ setup_mg() {
echo "Compile check for rabbitmq..."
MG_MESSAGE_BROKER_TYPE=rabbitmq make http
echo "Compile check for redis..."
MG_ES_STORE_TYPE=redis make http
MG_ES_TYPE=redis make http
make -j$NPROC
}