diff --git a/compose-builder/Makefile b/compose-builder/Makefile index 483e0eb0..3409a552 100644 --- a/compose-builder/Makefile +++ b/compose-builder/Makefile @@ -14,7 +14,7 @@ # *******************************************************************************/ .PHONY: help portainer portainer-down \ - build compose run pull gen \ + build build-canned compose run pull gen \ build-taf taf-compose taf-compose-perf \ get-token upload-tls-cert get-consul-acl-token \ down clean err @@ -607,10 +607,10 @@ endif # Build compose for TAF secure testing (ignore all other compose file options) ifeq (taf-secty, $(filter taf-secty,$(ARGS))) - TOKEN_LIST:=app-http-export,app-mqtt-export,app-functional-tests,scalability-test-mqtt-export,device-modbus,app-external-mqtt-trigger,device-camera + TOKEN_LIST:=app-http-export,app-mqtt-export,app-functional-tests,app-scalability-test-mqtt-export,device-modbus,app-external-mqtt-trigger,device-camera # Note that the services in this list should be separated by ';', but that causes issues with build scripts, so # have to list them individually. - KNOWN_SECRETS_LIST:=redisdb[app-rules-engine],redisdb[app-http-export],redisdb[app-mqtt-export],redisdb[scalability-test-mqtt-export],redisdb[device-modbus],redisdb[device-rest],redisdb[device-virtual],redisdb[device-camera] + KNOWN_SECRETS_LIST:=redisdb[app-rules-engine],redisdb[app-http-export],redisdb[app-mqtt-export],redisdb[app-scalability-test-mqtt-export],redisdb[device-modbus],redisdb[device-rest],redisdb[device-virtual],redisdb[device-camera] EXTRA_PROXY_ROUTE_LIST:=device-modbus.http://edgex-device-modbus:59901 COMPOSE_FILES:= \ @@ -693,10 +693,10 @@ else else # Build compose for TAF secure performance testing (ignore all other compose file options) ifeq (taf-perf, $(filter taf-perf,$(ARGS))) - TOKEN_LIST:=app-http-export,app-mqtt-export,app-functional-tests,scalability-test-mqtt-export + TOKEN_LIST:=app-http-export,app-mqtt-export,app-functional-tests,app-scalability-test-mqtt-export # Note that the services in this list should be separated by ';', but that causes issues with build scripts, so # have to list them individually. - KNOWN_SECRETS_LIST:=redisdb[app-rules-engine],redisdb[app-http-export],redisdb[app-mqtt-export],redisdb[scalability-test-mqtt-export],redisdb[device-rest],redisdb[device-virtual] + KNOWN_SECRETS_LIST:=redisdb[app-rules-engine],redisdb[app-http-export],redisdb[app-mqtt-export],redisdb[app-scalability-test-mqtt-export],redisdb[device-rest],redisdb[device-virtual] EXTRA_PROXY_ROUTE_LIST:=device-modbus.http://edgex-device-modbus:59901 COMPOSE_FILES:= \ @@ -785,7 +785,9 @@ portainer: portainer-down: make -C ${RELEASE_FOLDER} portainer-down -build: +build: build-canned build-taf + +build-canned: make compose ds-rest ds-virtual make compose ds-rest ds-virtual arm64 make compose ds-rest ds-virtual asc-sample @@ -794,6 +796,8 @@ build: make compose ds-rest ds-virtual no-secty arm64 make compose ds-rest ds-virtual asc-sample no-secty make compose ds-rest ds-virtual asc-sample no-secty arm64 + +build-taf: make taf-compose taf-secty make taf-compose taf-no-secty make taf-compose taf-secty arm64 diff --git a/compose-builder/add-mqtt-messagebus.yml b/compose-builder/add-mqtt-messagebus.yml index 604713bf..2e59b80c 100644 --- a/compose-builder/add-mqtt-messagebus.yml +++ b/compose-builder/add-mqtt-messagebus.yml @@ -17,16 +17,45 @@ version: '3.7' services: data: + env_file: + - mqtt-bus.env environment: - MESSAGEQUEUE_TYPE: mqtt - MESSAGEQUEUE_PROTOCOL: tcp - MESSAGEQUEUE_HOST: edgex-mqtt-broker - MESSAGEQUEUE_PORT: 1883 - MESSAGEQUEUE_AUTHMODE: none MESSAGEQUEUE_OPTIONAL_CLIENTID: core-data depends_on: - mqtt-broker + metadata: + env_file: + - mqtt-bus.env + environment: + MESSAGEQUEUE_OPTIONAL_CLIENTID: core-metadata + depends_on: + - mqtt-broker + + command: + env_file: + - mqtt-bus.env + environment: + MESSAGEQUEUE_OPTIONAL_CLIENTID: core-command + depends_on: + - mqtt-broker + + notifications: + env_file: + - mqtt-bus.env + environment: + MESSAGEQUEUE_OPTIONAL_CLIENTID: support-notifications + depends_on: + - mqtt-broker + + scheduler: + env_file: + - mqtt-bus.env + environment: + MESSAGEQUEUE_OPTIONAL_CLIENTID: support-scheduler + depends_on: + - mqtt-broker + app-service-rules: environment: EDGEX_PROFILE: rules-engine diff --git a/compose-builder/add-taf-app-services-secure.yml b/compose-builder/add-taf-app-services-secure.yml index a6be7006..ecbc4ca9 100644 --- a/compose-builder/add-taf-app-services-secure.yml +++ b/compose-builder/add-taf-app-services-secure.yml @@ -44,10 +44,10 @@ services: - common-security.env - common-sec-stage-gate.env environment: - SECRETSTORE_PATH: /v1/secret/edgex/scalability-test-mqtt-export/ - SECRETSTORE_TOKENFILE: /tmp/edgex/secrets/scalability-test-mqtt-export/secrets-token.json + SECRETSTORE_PATH: /app-scalability-test-mqtt-export + SECRETSTORE_TOKENFILE: /tmp/edgex/secrets/app-scalability-test-mqtt-export/secrets-token.json volumes: - edgex-init:/edgex-init:ro,z - - /tmp/edgex/secrets/scalability-test-mqtt-export:/tmp/edgex/secrets/scalability-test-mqtt-export:ro,z + - /tmp/edgex/secrets/app-scalability-test-mqtt-export:/tmp/edgex/secrets/app-scalability-test-mqtt-export:ro,z depends_on: - security-bootstrapper diff --git a/compose-builder/add-taf-app-services.yml b/compose-builder/add-taf-app-services.yml index 328b1d34..185e5263 100644 --- a/compose-builder/add-taf-app-services.yml +++ b/compose-builder/add-taf-app-services.yml @@ -49,7 +49,7 @@ services: - as-common.env - asc-mqtt-export.env environment: - EDGEX_SERVICE_KEY: scalability-test-mqtt-export + EDGEX_SERVICE_KEY: app-scalability-test-mqtt-export SERVICE_HOST: edgex-scalability-test-mqtt-export WRITABLE_PIPELINE_FUNCTIONS_MQTTEXPORT_PARAMETERS_CLIENTID: scalability-test-mqtt-export WRITABLE_LOGLEVEL: DEBUG diff --git a/compose-builder/common.env b/compose-builder/common.env index 113d5b1a..ce504fa2 100644 --- a/compose-builder/common.env +++ b/compose-builder/common.env @@ -24,3 +24,4 @@ CLIENTS_CORE_COMMAND_HOST=edgex-core-command CLIENTS_SUPPORT_NOTIFICATIONS_HOST=edgex-support-notifications CLIENTS_SUPPORT_SCHEDULER_HOST=edgex-support-scheduler DATABASES_PRIMARY_HOST=edgex-redis +MESSAGEQUEUE_HOST=edgex-redis diff --git a/compose-builder/docker-compose-base.yml b/compose-builder/docker-compose-base.yml index 1ea06ea9..94084b99 100644 --- a/compose-builder/docker-compose-base.yml +++ b/compose-builder/docker-compose-base.yml @@ -154,7 +154,6 @@ services: - common.env environment: SERVICE_HOST: edgex-core-data - MESSAGEQUEUE_HOST: edgex-redis depends_on: - consul - database diff --git a/compose-builder/mqtt-bus.env b/compose-builder/mqtt-bus.env new file mode 100644 index 00000000..970d8787 --- /dev/null +++ b/compose-builder/mqtt-bus.env @@ -0,0 +1,5 @@ +MESSAGEQUEUE_TYPE=mqtt +MESSAGEQUEUE_PROTOCOL=tcp +MESSAGEQUEUE_HOST=edgex-mqtt-broker +MESSAGEQUEUE_PORT=1883 +MESSAGEQUEUE_AUTHMODE=none \ No newline at end of file diff --git a/docker-compose-arm64.yml b/docker-compose-arm64.yml index 5f97e4c9..2909703d 100644 --- a/docker-compose-arm64.yml +++ b/docker-compose-arm64.yml @@ -49,6 +49,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -109,6 +110,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -281,6 +283,7 @@ services: DATABASECONFIG_PATH: /run/redis/conf DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -572,6 +575,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis NOTIFICATIONS_SENDER: edgex-core-metadata PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul @@ -631,6 +635,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -801,6 +806,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -950,6 +956,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul diff --git a/docker-compose-no-secty-arm64.yml b/docker-compose-no-secty-arm64.yml index 58f98952..2e2212a9 100644 --- a/docker-compose-no-secty-arm64.yml +++ b/docker-compose-no-secty-arm64.yml @@ -42,6 +42,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-rules-engine TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -71,6 +72,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-command hostname: edgex-core-command @@ -140,6 +142,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul hostname: edgex-redis image: redis:6.2-alpine @@ -224,6 +227,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis NOTIFICATIONS_SENDER: edgex-core-metadata REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-metadata @@ -251,6 +255,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -308,6 +313,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-scheduler hostname: edgex-support-scheduler @@ -339,6 +345,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-sys-mgmt-agent diff --git a/docker-compose-no-secty-with-app-sample-arm64.yml b/docker-compose-no-secty-with-app-sample-arm64.yml index 407f3455..b9629cb6 100644 --- a/docker-compose-no-secty-with-app-sample-arm64.yml +++ b/docker-compose-no-secty-with-app-sample-arm64.yml @@ -42,6 +42,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-rules-engine TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -72,6 +73,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: sample EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-sample TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -101,6 +103,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-command hostname: edgex-core-command @@ -170,6 +173,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul hostname: edgex-redis image: redis:6.2-alpine @@ -254,6 +258,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis NOTIFICATIONS_SENDER: edgex-core-metadata REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-metadata @@ -281,6 +286,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -338,6 +344,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-scheduler hostname: edgex-support-scheduler @@ -369,6 +376,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-sys-mgmt-agent diff --git a/docker-compose-no-secty-with-app-sample.yml b/docker-compose-no-secty-with-app-sample.yml index 64a6bc37..0a9167f0 100644 --- a/docker-compose-no-secty-with-app-sample.yml +++ b/docker-compose-no-secty-with-app-sample.yml @@ -42,6 +42,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-rules-engine TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -72,6 +73,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: sample EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-sample TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -101,6 +103,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-command hostname: edgex-core-command @@ -170,6 +173,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul hostname: edgex-redis image: redis:6.2-alpine @@ -254,6 +258,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis NOTIFICATIONS_SENDER: edgex-core-metadata REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-metadata @@ -281,6 +286,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -338,6 +344,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-scheduler hostname: edgex-support-scheduler @@ -369,6 +376,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-sys-mgmt-agent diff --git a/docker-compose-no-secty.yml b/docker-compose-no-secty.yml index 04a76fa5..2ccdbe7a 100644 --- a/docker-compose-no-secty.yml +++ b/docker-compose-no-secty.yml @@ -42,6 +42,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-rules-engine TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -71,6 +72,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-command hostname: edgex-core-command @@ -140,6 +142,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul hostname: edgex-redis image: redis:6.2-alpine @@ -224,6 +227,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis NOTIFICATIONS_SENDER: edgex-core-metadata REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-metadata @@ -251,6 +255,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -308,6 +313,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-scheduler hostname: edgex-support-scheduler @@ -339,6 +345,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-sys-mgmt-agent diff --git a/docker-compose-with-app-sample-arm64.yml b/docker-compose-with-app-sample-arm64.yml index 9cab35b4..a70c43cc 100644 --- a/docker-compose-with-app-sample-arm64.yml +++ b/docker-compose-with-app-sample-arm64.yml @@ -49,6 +49,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -110,6 +111,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: sample EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -170,6 +172,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -342,6 +345,7 @@ services: DATABASECONFIG_PATH: /run/redis/conf DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -633,6 +637,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis NOTIFICATIONS_SENDER: edgex-core-metadata PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul @@ -692,6 +697,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -862,6 +868,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -1011,6 +1018,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul diff --git a/docker-compose-with-app-sample.yml b/docker-compose-with-app-sample.yml index 6d8f2d8e..e2ed538a 100644 --- a/docker-compose-with-app-sample.yml +++ b/docker-compose-with-app-sample.yml @@ -49,6 +49,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -110,6 +111,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: sample EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -170,6 +172,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -342,6 +345,7 @@ services: DATABASECONFIG_PATH: /run/redis/conf DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -633,6 +637,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis NOTIFICATIONS_SENDER: edgex-core-metadata PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul @@ -692,6 +697,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -862,6 +868,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -1011,6 +1018,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul diff --git a/docker-compose.yml b/docker-compose.yml index 4ff498f5..40254656 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -49,6 +49,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -109,6 +110,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -281,6 +283,7 @@ services: DATABASECONFIG_PATH: /run/redis/conf DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -572,6 +575,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis NOTIFICATIONS_SENDER: edgex-core-metadata PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul @@ -631,6 +635,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -801,6 +806,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -950,6 +956,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul diff --git a/taf/docker-compose-taf-arm64.yml b/taf/docker-compose-taf-arm64.yml index 22943525..57bfab3a 100644 --- a/taf/docker-compose-taf-arm64.yml +++ b/taf/docker-compose-taf-arm64.yml @@ -50,6 +50,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: external-mqtt-trigger EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -115,6 +116,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: functional-tests EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -175,6 +177,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: http-export EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -238,6 +241,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -304,6 +308,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -364,6 +369,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -410,7 +416,7 @@ services: entrypoint: - /edgex-init/consul_wait_install.sh environment: - ADD_REGISTRY_ACL_ROLES: app-http-export,app-mqtt-export,app-functional-tests,scalability-test-mqtt-export,device-modbus,app-external-mqtt-trigger,device-camera + ADD_REGISTRY_ACL_ROLES: app-http-export,app-mqtt-export,app-functional-tests,app-scalability-test-mqtt-export,device-modbus,app-external-mqtt-trigger,device-camera API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: '8100' EDGEX_GROUP: '2001' @@ -536,6 +542,7 @@ services: DATABASECONFIG_PATH: /run/redis/conf DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -946,6 +953,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis NOTIFICATIONS_SENDER: edgex-core-metadata PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul @@ -1032,6 +1040,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -1201,13 +1210,14 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "true" - EDGEX_SERVICE_KEY: scalability-test-mqtt-export + EDGEX_SERVICE_KEY: app-scalability-test-mqtt-export + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault - SECRETSTORE_PATH: /v1/secret/edgex/scalability-test-mqtt-export/ + SECRETSTORE_PATH: /app-scalability-test-mqtt-export SECRETSTORE_PORT: '8200' - SECRETSTORE_TOKENFILE: /tmp/edgex/secrets/scalability-test-mqtt-export/secrets-token.json + SECRETSTORE_TOKENFILE: /tmp/edgex/secrets/app-scalability-test-mqtt-export/secrets-token.json SERVICE_HOST: edgex-scalability-test-mqtt-export SPIFFE_ENDPOINTSOCKET: /tmp/edgex/secrets/spiffe/public/api.sock SPIFFE_TRUSTBUNDLE_PATH: /tmp/edgex/secrets/spiffe/trust/bundle @@ -1245,7 +1255,7 @@ services: user: 2002:2001 volumes: - edgex-init:/edgex-init:ro,z - - /tmp/edgex/secrets/scalability-test-mqtt-export:/tmp/edgex/secrets/scalability-test-mqtt-export:ro,z + - /tmp/edgex/secrets/app-scalability-test-mqtt-export:/tmp/edgex/secrets/app-scalability-test-mqtt-export:ro,z scheduler: command: /support-scheduler -cp=consul.http://edgex-core-consul:8500 --registry --confdir=/res @@ -1269,6 +1279,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -1312,8 +1323,8 @@ services: - security-bootstrapper - vault environment: - ADD_KNOWN_SECRETS: redisdb[app-rules-engine],redisdb[app-http-export],redisdb[app-mqtt-export],redisdb[scalability-test-mqtt-export],redisdb[device-modbus],redisdb[device-rest],redisdb[device-virtual],redisdb[device-camera] - ADD_SECRETSTORE_TOKENS: app-http-export,app-mqtt-export,app-functional-tests,scalability-test-mqtt-export,device-modbus,app-external-mqtt-trigger,device-camera + ADD_KNOWN_SECRETS: redisdb[app-rules-engine],redisdb[app-http-export],redisdb[app-mqtt-export],redisdb[app-scalability-test-mqtt-export],redisdb[device-modbus],redisdb[device-rest],redisdb[device-virtual],redisdb[device-camera] + ADD_SECRETSTORE_TOKENS: app-http-export,app-mqtt-export,app-functional-tests,app-scalability-test-mqtt-export,device-modbus,app-external-mqtt-trigger,device-camera API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: '8100' EDGEX_GROUP: '2001' @@ -1418,6 +1429,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul diff --git a/taf/docker-compose-taf-mqtt-bus-arm64.yml b/taf/docker-compose-taf-mqtt-bus-arm64.yml index d5ef0ea4..de31abd0 100644 --- a/taf/docker-compose-taf-mqtt-bus-arm64.yml +++ b/taf/docker-compose-taf-mqtt-bus-arm64.yml @@ -50,6 +50,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: external-mqtt-trigger EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -115,6 +116,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: functional-tests EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -176,6 +178,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: http-export EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -246,6 +249,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -319,6 +323,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -371,6 +376,7 @@ services: - consul - database - metadata + - mqtt-broker - secretstore-setup - security-bootstrapper entrypoint: @@ -385,6 +391,12 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_AUTHMODE: none + MESSAGEQUEUE_HOST: edgex-mqtt-broker + MESSAGEQUEUE_OPTIONAL_CLIENTID: core-command + MESSAGEQUEUE_PORT: '1883' + MESSAGEQUEUE_PROTOCOL: tcp + MESSAGEQUEUE_TYPE: mqtt PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -431,7 +443,7 @@ services: entrypoint: - /edgex-init/consul_wait_install.sh environment: - ADD_REGISTRY_ACL_ROLES: app-http-export,app-mqtt-export,app-functional-tests,scalability-test-mqtt-export,device-modbus,app-external-mqtt-trigger,device-camera + ADD_REGISTRY_ACL_ROLES: app-http-export,app-mqtt-export,app-functional-tests,app-scalability-test-mqtt-export,device-modbus,app-external-mqtt-trigger,device-camera API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: '8100' EDGEX_GROUP: '2001' @@ -502,7 +514,7 @@ services: MESSAGEQUEUE_AUTHMODE: none MESSAGEQUEUE_HOST: edgex-mqtt-broker MESSAGEQUEUE_OPTIONAL_CLIENTID: core-data - MESSAGEQUEUE_PORT: 1883 + MESSAGEQUEUE_PORT: '1883' MESSAGEQUEUE_PROTOCOL: tcp MESSAGEQUEUE_TYPE: mqtt PROXY_SETUP_HOST: edgex-security-proxy-setup @@ -563,6 +575,7 @@ services: DATABASECONFIG_PATH: /run/redis/conf DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -978,6 +991,7 @@ services: depends_on: - consul - database + - mqtt-broker - notifications - secretstore-setup - security-bootstrapper @@ -993,6 +1007,12 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_AUTHMODE: none + MESSAGEQUEUE_HOST: edgex-mqtt-broker + MESSAGEQUEUE_OPTIONAL_CLIENTID: core-metadata + MESSAGEQUEUE_PORT: '1883' + MESSAGEQUEUE_PROTOCOL: tcp + MESSAGEQUEUE_TYPE: mqtt NOTIFICATIONS_SENDER: edgex-core-metadata PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul @@ -1065,6 +1085,7 @@ services: depends_on: - consul - database + - mqtt-broker - secretstore-setup - security-bootstrapper entrypoint: @@ -1079,6 +1100,12 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_AUTHMODE: none + MESSAGEQUEUE_HOST: edgex-mqtt-broker + MESSAGEQUEUE_OPTIONAL_CLIENTID: support-notifications + MESSAGEQUEUE_PORT: '1883' + MESSAGEQUEUE_PROTOCOL: tcp + MESSAGEQUEUE_TYPE: mqtt PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -1233,13 +1260,14 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "true" - EDGEX_SERVICE_KEY: scalability-test-mqtt-export + EDGEX_SERVICE_KEY: app-scalability-test-mqtt-export + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault - SECRETSTORE_PATH: /v1/secret/edgex/scalability-test-mqtt-export/ + SECRETSTORE_PATH: /app-scalability-test-mqtt-export SECRETSTORE_PORT: '8200' - SECRETSTORE_TOKENFILE: /tmp/edgex/secrets/scalability-test-mqtt-export/secrets-token.json + SECRETSTORE_TOKENFILE: /tmp/edgex/secrets/app-scalability-test-mqtt-export/secrets-token.json SERVICE_HOST: edgex-scalability-test-mqtt-export SPIFFE_ENDPOINTSOCKET: /tmp/edgex/secrets/spiffe/public/api.sock SPIFFE_TRUSTBUNDLE_PATH: /tmp/edgex/secrets/spiffe/trust/bundle @@ -1283,7 +1311,7 @@ services: user: 2002:2001 volumes: - edgex-init:/edgex-init:ro,z - - /tmp/edgex/secrets/scalability-test-mqtt-export:/tmp/edgex/secrets/scalability-test-mqtt-export:ro,z + - /tmp/edgex/secrets/app-scalability-test-mqtt-export:/tmp/edgex/secrets/app-scalability-test-mqtt-export:ro,z scheduler: command: /support-scheduler -cp=consul.http://edgex-core-consul:8500 --registry --confdir=/res @@ -1291,6 +1319,7 @@ services: depends_on: - consul - database + - mqtt-broker - secretstore-setup - security-bootstrapper entrypoint: @@ -1307,6 +1336,12 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_AUTHMODE: none + MESSAGEQUEUE_HOST: edgex-mqtt-broker + MESSAGEQUEUE_OPTIONAL_CLIENTID: support-scheduler + MESSAGEQUEUE_PORT: '1883' + MESSAGEQUEUE_PROTOCOL: tcp + MESSAGEQUEUE_TYPE: mqtt PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -1350,8 +1385,8 @@ services: - security-bootstrapper - vault environment: - ADD_KNOWN_SECRETS: redisdb[app-rules-engine],redisdb[app-http-export],redisdb[app-mqtt-export],redisdb[scalability-test-mqtt-export],redisdb[device-modbus],redisdb[device-rest],redisdb[device-virtual],redisdb[device-camera] - ADD_SECRETSTORE_TOKENS: app-http-export,app-mqtt-export,app-functional-tests,scalability-test-mqtt-export,device-modbus,app-external-mqtt-trigger,device-camera + ADD_KNOWN_SECRETS: redisdb[app-rules-engine],redisdb[app-http-export],redisdb[app-mqtt-export],redisdb[app-scalability-test-mqtt-export],redisdb[device-modbus],redisdb[device-rest],redisdb[device-virtual],redisdb[device-camera] + ADD_SECRETSTORE_TOKENS: app-http-export,app-mqtt-export,app-functional-tests,app-scalability-test-mqtt-export,device-modbus,app-external-mqtt-trigger,device-camera API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: '8100' EDGEX_GROUP: '2001' @@ -1453,6 +1488,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul diff --git a/taf/docker-compose-taf-mqtt-bus.yml b/taf/docker-compose-taf-mqtt-bus.yml index 62d0e3c5..bdcb1232 100644 --- a/taf/docker-compose-taf-mqtt-bus.yml +++ b/taf/docker-compose-taf-mqtt-bus.yml @@ -50,6 +50,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: external-mqtt-trigger EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -115,6 +116,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: functional-tests EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -176,6 +178,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: http-export EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -246,6 +249,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -319,6 +323,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -371,6 +376,7 @@ services: - consul - database - metadata + - mqtt-broker - secretstore-setup - security-bootstrapper entrypoint: @@ -385,6 +391,12 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_AUTHMODE: none + MESSAGEQUEUE_HOST: edgex-mqtt-broker + MESSAGEQUEUE_OPTIONAL_CLIENTID: core-command + MESSAGEQUEUE_PORT: '1883' + MESSAGEQUEUE_PROTOCOL: tcp + MESSAGEQUEUE_TYPE: mqtt PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -431,7 +443,7 @@ services: entrypoint: - /edgex-init/consul_wait_install.sh environment: - ADD_REGISTRY_ACL_ROLES: app-http-export,app-mqtt-export,app-functional-tests,scalability-test-mqtt-export,device-modbus,app-external-mqtt-trigger,device-camera + ADD_REGISTRY_ACL_ROLES: app-http-export,app-mqtt-export,app-functional-tests,app-scalability-test-mqtt-export,device-modbus,app-external-mqtt-trigger,device-camera API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: '8100' EDGEX_GROUP: '2001' @@ -502,7 +514,7 @@ services: MESSAGEQUEUE_AUTHMODE: none MESSAGEQUEUE_HOST: edgex-mqtt-broker MESSAGEQUEUE_OPTIONAL_CLIENTID: core-data - MESSAGEQUEUE_PORT: 1883 + MESSAGEQUEUE_PORT: '1883' MESSAGEQUEUE_PROTOCOL: tcp MESSAGEQUEUE_TYPE: mqtt PROXY_SETUP_HOST: edgex-security-proxy-setup @@ -563,6 +575,7 @@ services: DATABASECONFIG_PATH: /run/redis/conf DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -978,6 +991,7 @@ services: depends_on: - consul - database + - mqtt-broker - notifications - secretstore-setup - security-bootstrapper @@ -993,6 +1007,12 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_AUTHMODE: none + MESSAGEQUEUE_HOST: edgex-mqtt-broker + MESSAGEQUEUE_OPTIONAL_CLIENTID: core-metadata + MESSAGEQUEUE_PORT: '1883' + MESSAGEQUEUE_PROTOCOL: tcp + MESSAGEQUEUE_TYPE: mqtt NOTIFICATIONS_SENDER: edgex-core-metadata PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul @@ -1065,6 +1085,7 @@ services: depends_on: - consul - database + - mqtt-broker - secretstore-setup - security-bootstrapper entrypoint: @@ -1079,6 +1100,12 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_AUTHMODE: none + MESSAGEQUEUE_HOST: edgex-mqtt-broker + MESSAGEQUEUE_OPTIONAL_CLIENTID: support-notifications + MESSAGEQUEUE_PORT: '1883' + MESSAGEQUEUE_PROTOCOL: tcp + MESSAGEQUEUE_TYPE: mqtt PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -1233,13 +1260,14 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "true" - EDGEX_SERVICE_KEY: scalability-test-mqtt-export + EDGEX_SERVICE_KEY: app-scalability-test-mqtt-export + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault - SECRETSTORE_PATH: /v1/secret/edgex/scalability-test-mqtt-export/ + SECRETSTORE_PATH: /app-scalability-test-mqtt-export SECRETSTORE_PORT: '8200' - SECRETSTORE_TOKENFILE: /tmp/edgex/secrets/scalability-test-mqtt-export/secrets-token.json + SECRETSTORE_TOKENFILE: /tmp/edgex/secrets/app-scalability-test-mqtt-export/secrets-token.json SERVICE_HOST: edgex-scalability-test-mqtt-export SPIFFE_ENDPOINTSOCKET: /tmp/edgex/secrets/spiffe/public/api.sock SPIFFE_TRUSTBUNDLE_PATH: /tmp/edgex/secrets/spiffe/trust/bundle @@ -1283,7 +1311,7 @@ services: user: 2002:2001 volumes: - edgex-init:/edgex-init:ro,z - - /tmp/edgex/secrets/scalability-test-mqtt-export:/tmp/edgex/secrets/scalability-test-mqtt-export:ro,z + - /tmp/edgex/secrets/app-scalability-test-mqtt-export:/tmp/edgex/secrets/app-scalability-test-mqtt-export:ro,z scheduler: command: /support-scheduler -cp=consul.http://edgex-core-consul:8500 --registry --confdir=/res @@ -1291,6 +1319,7 @@ services: depends_on: - consul - database + - mqtt-broker - secretstore-setup - security-bootstrapper entrypoint: @@ -1307,6 +1336,12 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_AUTHMODE: none + MESSAGEQUEUE_HOST: edgex-mqtt-broker + MESSAGEQUEUE_OPTIONAL_CLIENTID: support-scheduler + MESSAGEQUEUE_PORT: '1883' + MESSAGEQUEUE_PROTOCOL: tcp + MESSAGEQUEUE_TYPE: mqtt PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -1350,8 +1385,8 @@ services: - security-bootstrapper - vault environment: - ADD_KNOWN_SECRETS: redisdb[app-rules-engine],redisdb[app-http-export],redisdb[app-mqtt-export],redisdb[scalability-test-mqtt-export],redisdb[device-modbus],redisdb[device-rest],redisdb[device-virtual],redisdb[device-camera] - ADD_SECRETSTORE_TOKENS: app-http-export,app-mqtt-export,app-functional-tests,scalability-test-mqtt-export,device-modbus,app-external-mqtt-trigger,device-camera + ADD_KNOWN_SECRETS: redisdb[app-rules-engine],redisdb[app-http-export],redisdb[app-mqtt-export],redisdb[app-scalability-test-mqtt-export],redisdb[device-modbus],redisdb[device-rest],redisdb[device-virtual],redisdb[device-camera] + ADD_SECRETSTORE_TOKENS: app-http-export,app-mqtt-export,app-functional-tests,app-scalability-test-mqtt-export,device-modbus,app-external-mqtt-trigger,device-camera API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: '8100' EDGEX_GROUP: '2001' @@ -1453,6 +1488,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul diff --git a/taf/docker-compose-taf-no-secty-arm64.yml b/taf/docker-compose-taf-no-secty-arm64.yml index d79d520f..433a9e37 100644 --- a/taf/docker-compose-taf-no-secty-arm64.yml +++ b/taf/docker-compose-taf-no-secty-arm64.yml @@ -43,6 +43,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: external-mqtt-trigger EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-external-mqtt-trigger TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -77,6 +78,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: functional-tests EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: app-functional-tests TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -106,6 +108,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: http-export EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-http-export TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -138,6 +141,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-mqtt-export TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -170,6 +174,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-rules-engine TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -199,6 +204,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-command hostname: edgex-core-command @@ -268,6 +274,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul hostname: edgex-redis image: redis:6.2-alpine @@ -415,6 +422,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis NOTIFICATIONS_SENDER: edgex-core-metadata REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-metadata @@ -469,6 +477,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -526,7 +535,8 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "false" - EDGEX_SERVICE_KEY: scalability-test-mqtt-export + EDGEX_SERVICE_KEY: app-scalability-test-mqtt-export + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-scalability-test-mqtt-export TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -560,6 +570,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-scheduler hostname: edgex-support-scheduler @@ -591,6 +602,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-sys-mgmt-agent diff --git a/taf/docker-compose-taf-no-secty-mqtt-bus-arm64.yml b/taf/docker-compose-taf-no-secty-mqtt-bus-arm64.yml index 18ea99ea..65ba0a33 100644 --- a/taf/docker-compose-taf-no-secty-mqtt-bus-arm64.yml +++ b/taf/docker-compose-taf-no-secty-mqtt-bus-arm64.yml @@ -43,6 +43,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: external-mqtt-trigger EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-external-mqtt-trigger TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -77,6 +78,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: functional-tests EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: app-functional-tests TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -107,6 +109,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: http-export EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-http-export TRIGGER_EDGEXMESSAGEBUS_OPTIONAL_AUTHMODE: none @@ -146,6 +149,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-mqtt-export TRIGGER_EDGEXMESSAGEBUS_OPTIONAL_AUTHMODE: none @@ -185,6 +189,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-rules-engine TRIGGER_EDGEXMESSAGEBUS_OPTIONAL_AUTHMODE: none @@ -212,6 +217,7 @@ services: - consul - database - metadata + - mqtt-broker environment: CLIENTS_CORE_COMMAND_HOST: edgex-core-command CLIENTS_CORE_DATA_HOST: edgex-core-data @@ -220,6 +226,12 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_AUTHMODE: none + MESSAGEQUEUE_HOST: edgex-mqtt-broker + MESSAGEQUEUE_OPTIONAL_CLIENTID: core-command + MESSAGEQUEUE_PORT: '1883' + MESSAGEQUEUE_PROTOCOL: tcp + MESSAGEQUEUE_TYPE: mqtt REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-command hostname: edgex-core-command @@ -268,7 +280,7 @@ services: MESSAGEQUEUE_AUTHMODE: none MESSAGEQUEUE_HOST: edgex-mqtt-broker MESSAGEQUEUE_OPTIONAL_CLIENTID: core-data - MESSAGEQUEUE_PORT: 1883 + MESSAGEQUEUE_PORT: '1883' MESSAGEQUEUE_PROTOCOL: tcp MESSAGEQUEUE_TYPE: mqtt REGISTRY_HOST: edgex-core-consul @@ -295,6 +307,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul hostname: edgex-redis image: redis:6.2-alpine @@ -453,6 +466,7 @@ services: depends_on: - consul - database + - mqtt-broker - notifications environment: CLIENTS_CORE_COMMAND_HOST: edgex-core-command @@ -462,6 +476,12 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_AUTHMODE: none + MESSAGEQUEUE_HOST: edgex-mqtt-broker + MESSAGEQUEUE_OPTIONAL_CLIENTID: core-metadata + MESSAGEQUEUE_PORT: '1883' + MESSAGEQUEUE_PROTOCOL: tcp + MESSAGEQUEUE_TYPE: mqtt NOTIFICATIONS_SENDER: edgex-core-metadata REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-metadata @@ -508,6 +528,7 @@ services: depends_on: - consul - database + - mqtt-broker environment: CLIENTS_CORE_COMMAND_HOST: edgex-core-command CLIENTS_CORE_DATA_HOST: edgex-core-data @@ -516,6 +537,12 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_AUTHMODE: none + MESSAGEQUEUE_HOST: edgex-mqtt-broker + MESSAGEQUEUE_OPTIONAL_CLIENTID: support-notifications + MESSAGEQUEUE_PORT: '1883' + MESSAGEQUEUE_PROTOCOL: tcp + MESSAGEQUEUE_TYPE: mqtt REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -583,7 +610,8 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "false" - EDGEX_SERVICE_KEY: scalability-test-mqtt-export + EDGEX_SERVICE_KEY: app-scalability-test-mqtt-export + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-scalability-test-mqtt-export TRIGGER_EDGEXMESSAGEBUS_OPTIONAL_AUTHMODE: none @@ -613,6 +641,7 @@ services: depends_on: - consul - database + - mqtt-broker environment: CLIENTS_CORE_COMMAND_HOST: edgex-core-command CLIENTS_CORE_DATA_HOST: edgex-core-data @@ -623,6 +652,12 @@ services: EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_AUTHMODE: none + MESSAGEQUEUE_HOST: edgex-mqtt-broker + MESSAGEQUEUE_OPTIONAL_CLIENTID: support-scheduler + MESSAGEQUEUE_PORT: '1883' + MESSAGEQUEUE_PROTOCOL: tcp + MESSAGEQUEUE_TYPE: mqtt REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-scheduler hostname: edgex-support-scheduler @@ -654,6 +689,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-sys-mgmt-agent diff --git a/taf/docker-compose-taf-no-secty-mqtt-bus.yml b/taf/docker-compose-taf-no-secty-mqtt-bus.yml index 05e5cfa7..4ca07e70 100644 --- a/taf/docker-compose-taf-no-secty-mqtt-bus.yml +++ b/taf/docker-compose-taf-no-secty-mqtt-bus.yml @@ -43,6 +43,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: external-mqtt-trigger EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-external-mqtt-trigger TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -77,6 +78,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: functional-tests EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: app-functional-tests TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -107,6 +109,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: http-export EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-http-export TRIGGER_EDGEXMESSAGEBUS_OPTIONAL_AUTHMODE: none @@ -146,6 +149,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-mqtt-export TRIGGER_EDGEXMESSAGEBUS_OPTIONAL_AUTHMODE: none @@ -185,6 +189,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-rules-engine TRIGGER_EDGEXMESSAGEBUS_OPTIONAL_AUTHMODE: none @@ -212,6 +217,7 @@ services: - consul - database - metadata + - mqtt-broker environment: CLIENTS_CORE_COMMAND_HOST: edgex-core-command CLIENTS_CORE_DATA_HOST: edgex-core-data @@ -220,6 +226,12 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_AUTHMODE: none + MESSAGEQUEUE_HOST: edgex-mqtt-broker + MESSAGEQUEUE_OPTIONAL_CLIENTID: core-command + MESSAGEQUEUE_PORT: '1883' + MESSAGEQUEUE_PROTOCOL: tcp + MESSAGEQUEUE_TYPE: mqtt REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-command hostname: edgex-core-command @@ -268,7 +280,7 @@ services: MESSAGEQUEUE_AUTHMODE: none MESSAGEQUEUE_HOST: edgex-mqtt-broker MESSAGEQUEUE_OPTIONAL_CLIENTID: core-data - MESSAGEQUEUE_PORT: 1883 + MESSAGEQUEUE_PORT: '1883' MESSAGEQUEUE_PROTOCOL: tcp MESSAGEQUEUE_TYPE: mqtt REGISTRY_HOST: edgex-core-consul @@ -295,6 +307,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul hostname: edgex-redis image: redis:6.2-alpine @@ -453,6 +466,7 @@ services: depends_on: - consul - database + - mqtt-broker - notifications environment: CLIENTS_CORE_COMMAND_HOST: edgex-core-command @@ -462,6 +476,12 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_AUTHMODE: none + MESSAGEQUEUE_HOST: edgex-mqtt-broker + MESSAGEQUEUE_OPTIONAL_CLIENTID: core-metadata + MESSAGEQUEUE_PORT: '1883' + MESSAGEQUEUE_PROTOCOL: tcp + MESSAGEQUEUE_TYPE: mqtt NOTIFICATIONS_SENDER: edgex-core-metadata REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-metadata @@ -508,6 +528,7 @@ services: depends_on: - consul - database + - mqtt-broker environment: CLIENTS_CORE_COMMAND_HOST: edgex-core-command CLIENTS_CORE_DATA_HOST: edgex-core-data @@ -516,6 +537,12 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_AUTHMODE: none + MESSAGEQUEUE_HOST: edgex-mqtt-broker + MESSAGEQUEUE_OPTIONAL_CLIENTID: support-notifications + MESSAGEQUEUE_PORT: '1883' + MESSAGEQUEUE_PROTOCOL: tcp + MESSAGEQUEUE_TYPE: mqtt REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -583,7 +610,8 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "false" - EDGEX_SERVICE_KEY: scalability-test-mqtt-export + EDGEX_SERVICE_KEY: app-scalability-test-mqtt-export + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-scalability-test-mqtt-export TRIGGER_EDGEXMESSAGEBUS_OPTIONAL_AUTHMODE: none @@ -613,6 +641,7 @@ services: depends_on: - consul - database + - mqtt-broker environment: CLIENTS_CORE_COMMAND_HOST: edgex-core-command CLIENTS_CORE_DATA_HOST: edgex-core-data @@ -623,6 +652,12 @@ services: EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_AUTHMODE: none + MESSAGEQUEUE_HOST: edgex-mqtt-broker + MESSAGEQUEUE_OPTIONAL_CLIENTID: support-scheduler + MESSAGEQUEUE_PORT: '1883' + MESSAGEQUEUE_PROTOCOL: tcp + MESSAGEQUEUE_TYPE: mqtt REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-scheduler hostname: edgex-support-scheduler @@ -654,6 +689,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-sys-mgmt-agent diff --git a/taf/docker-compose-taf-no-secty.yml b/taf/docker-compose-taf-no-secty.yml index f759c430..2f82b2fe 100644 --- a/taf/docker-compose-taf-no-secty.yml +++ b/taf/docker-compose-taf-no-secty.yml @@ -43,6 +43,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: external-mqtt-trigger EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-external-mqtt-trigger TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -77,6 +78,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: functional-tests EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: app-functional-tests TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -106,6 +108,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: http-export EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-http-export TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -138,6 +141,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-mqtt-export TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -170,6 +174,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-rules-engine TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -199,6 +204,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-command hostname: edgex-core-command @@ -268,6 +274,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul hostname: edgex-redis image: redis:6.2-alpine @@ -415,6 +422,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis NOTIFICATIONS_SENDER: edgex-core-metadata REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-metadata @@ -469,6 +477,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -526,7 +535,8 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "false" - EDGEX_SERVICE_KEY: scalability-test-mqtt-export + EDGEX_SERVICE_KEY: app-scalability-test-mqtt-export + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-scalability-test-mqtt-export TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -560,6 +570,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-scheduler hostname: edgex-support-scheduler @@ -591,6 +602,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-sys-mgmt-agent diff --git a/taf/docker-compose-taf-perf-arm64.yml b/taf/docker-compose-taf-perf-arm64.yml index 1c7c36cb..09e7d73f 100644 --- a/taf/docker-compose-taf-perf-arm64.yml +++ b/taf/docker-compose-taf-perf-arm64.yml @@ -50,6 +50,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -116,6 +117,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -176,6 +178,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -222,7 +225,7 @@ services: entrypoint: - /edgex-init/consul_wait_install.sh environment: - ADD_REGISTRY_ACL_ROLES: app-http-export,app-mqtt-export,app-functional-tests,scalability-test-mqtt-export + ADD_REGISTRY_ACL_ROLES: app-http-export,app-mqtt-export,app-functional-tests,app-scalability-test-mqtt-export API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: '8100' EDGEX_GROUP: '2001' @@ -348,6 +351,7 @@ services: DATABASECONFIG_PATH: /run/redis/conf DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -639,6 +643,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis NOTIFICATIONS_SENDER: edgex-core-metadata PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul @@ -712,6 +717,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -882,6 +888,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -925,8 +932,8 @@ services: - security-bootstrapper - vault environment: - ADD_KNOWN_SECRETS: redisdb[app-rules-engine],redisdb[app-http-export],redisdb[app-mqtt-export],redisdb[scalability-test-mqtt-export],redisdb[device-rest],redisdb[device-virtual] - ADD_SECRETSTORE_TOKENS: app-http-export,app-mqtt-export,app-functional-tests,scalability-test-mqtt-export + ADD_KNOWN_SECRETS: redisdb[app-rules-engine],redisdb[app-http-export],redisdb[app-mqtt-export],redisdb[app-scalability-test-mqtt-export],redisdb[device-rest],redisdb[device-virtual] + ADD_SECRETSTORE_TOKENS: app-http-export,app-mqtt-export,app-functional-tests,app-scalability-test-mqtt-export API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: '8100' EDGEX_GROUP: '2001' @@ -1031,6 +1038,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul diff --git a/taf/docker-compose-taf-perf-no-secty-arm64.yml b/taf/docker-compose-taf-perf-no-secty-arm64.yml index a966530e..c0c4ced6 100644 --- a/taf/docker-compose-taf-perf-no-secty-arm64.yml +++ b/taf/docker-compose-taf-perf-no-secty-arm64.yml @@ -43,6 +43,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-mqtt-export TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -75,6 +76,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-rules-engine TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -104,6 +106,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-command hostname: edgex-core-command @@ -173,6 +176,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul hostname: edgex-redis image: redis:6.2-alpine @@ -257,6 +261,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis NOTIFICATIONS_SENDER: edgex-core-metadata REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-metadata @@ -298,6 +303,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -355,6 +361,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-scheduler hostname: edgex-support-scheduler @@ -386,6 +393,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-sys-mgmt-agent diff --git a/taf/docker-compose-taf-perf-no-secty.yml b/taf/docker-compose-taf-perf-no-secty.yml index 95bcb335..4cedac13 100644 --- a/taf/docker-compose-taf-perf-no-secty.yml +++ b/taf/docker-compose-taf-perf-no-secty.yml @@ -43,6 +43,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-mqtt-export TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -75,6 +76,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-app-rules-engine TRIGGER_EDGEXMESSAGEBUS_PUBLISHHOST_HOST: edgex-redis @@ -104,6 +106,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-command hostname: edgex-core-command @@ -173,6 +176,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul hostname: edgex-redis image: redis:6.2-alpine @@ -257,6 +261,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis NOTIFICATIONS_SENDER: edgex-core-metadata REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-core-metadata @@ -298,6 +303,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -355,6 +361,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_HOST: edgex-redis REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-support-scheduler hostname: edgex-support-scheduler @@ -386,6 +393,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor REGISTRY_HOST: edgex-core-consul SERVICE_HOST: edgex-sys-mgmt-agent diff --git a/taf/docker-compose-taf-perf.yml b/taf/docker-compose-taf-perf.yml index d411665e..03395db8 100644 --- a/taf/docker-compose-taf-perf.yml +++ b/taf/docker-compose-taf-perf.yml @@ -50,6 +50,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -116,6 +117,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -176,6 +178,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -222,7 +225,7 @@ services: entrypoint: - /edgex-init/consul_wait_install.sh environment: - ADD_REGISTRY_ACL_ROLES: app-http-export,app-mqtt-export,app-functional-tests,scalability-test-mqtt-export + ADD_REGISTRY_ACL_ROLES: app-http-export,app-mqtt-export,app-functional-tests,app-scalability-test-mqtt-export API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: '8100' EDGEX_GROUP: '2001' @@ -348,6 +351,7 @@ services: DATABASECONFIG_PATH: /run/redis/conf DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -639,6 +643,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis NOTIFICATIONS_SENDER: edgex-core-metadata PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul @@ -712,6 +717,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -882,6 +888,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -925,8 +932,8 @@ services: - security-bootstrapper - vault environment: - ADD_KNOWN_SECRETS: redisdb[app-rules-engine],redisdb[app-http-export],redisdb[app-mqtt-export],redisdb[scalability-test-mqtt-export],redisdb[device-rest],redisdb[device-virtual] - ADD_SECRETSTORE_TOKENS: app-http-export,app-mqtt-export,app-functional-tests,scalability-test-mqtt-export + ADD_KNOWN_SECRETS: redisdb[app-rules-engine],redisdb[app-http-export],redisdb[app-mqtt-export],redisdb[app-scalability-test-mqtt-export],redisdb[device-rest],redisdb[device-virtual] + ADD_SECRETSTORE_TOKENS: app-http-export,app-mqtt-export,app-functional-tests,app-scalability-test-mqtt-export API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: '8100' EDGEX_GROUP: '2001' @@ -1031,6 +1038,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul diff --git a/taf/docker-compose-taf.yml b/taf/docker-compose-taf.yml index e28d3304..162c8e94 100644 --- a/taf/docker-compose-taf.yml +++ b/taf/docker-compose-taf.yml @@ -50,6 +50,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: external-mqtt-trigger EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -115,6 +116,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: functional-tests EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -175,6 +177,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: http-export EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -238,6 +241,7 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -304,6 +308,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_PROFILE: rules-engine EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -364,6 +369,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -410,7 +416,7 @@ services: entrypoint: - /edgex-init/consul_wait_install.sh environment: - ADD_REGISTRY_ACL_ROLES: app-http-export,app-mqtt-export,app-functional-tests,scalability-test-mqtt-export,device-modbus,app-external-mqtt-trigger,device-camera + ADD_REGISTRY_ACL_ROLES: app-http-export,app-mqtt-export,app-functional-tests,app-scalability-test-mqtt-export,device-modbus,app-external-mqtt-trigger,device-camera API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: '8100' EDGEX_GROUP: '2001' @@ -536,6 +542,7 @@ services: DATABASECONFIG_PATH: /run/redis/conf DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -946,6 +953,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis NOTIFICATIONS_SENDER: edgex-core-metadata PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul @@ -1032,6 +1040,7 @@ services: CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -1201,13 +1210,14 @@ services: DATABASE_HOST: edgex-redis EDGEX_PROFILE: mqtt-export EDGEX_SECURITY_SECRET_STORE: "true" - EDGEX_SERVICE_KEY: scalability-test-mqtt-export + EDGEX_SERVICE_KEY: app-scalability-test-mqtt-export + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault - SECRETSTORE_PATH: /v1/secret/edgex/scalability-test-mqtt-export/ + SECRETSTORE_PATH: /app-scalability-test-mqtt-export SECRETSTORE_PORT: '8200' - SECRETSTORE_TOKENFILE: /tmp/edgex/secrets/scalability-test-mqtt-export/secrets-token.json + SECRETSTORE_TOKENFILE: /tmp/edgex/secrets/app-scalability-test-mqtt-export/secrets-token.json SERVICE_HOST: edgex-scalability-test-mqtt-export SPIFFE_ENDPOINTSOCKET: /tmp/edgex/secrets/spiffe/public/api.sock SPIFFE_TRUSTBUNDLE_PATH: /tmp/edgex/secrets/spiffe/trust/bundle @@ -1245,7 +1255,7 @@ services: user: 2002:2001 volumes: - edgex-init:/edgex-init:ro,z - - /tmp/edgex/secrets/scalability-test-mqtt-export:/tmp/edgex/secrets/scalability-test-mqtt-export:ro,z + - /tmp/edgex/secrets/app-scalability-test-mqtt-export:/tmp/edgex/secrets/app-scalability-test-mqtt-export:ro,z scheduler: command: /support-scheduler -cp=consul.http://edgex-core-consul:8500 --registry --confdir=/res @@ -1269,6 +1279,7 @@ services: EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data + MESSAGEQUEUE_HOST: edgex-redis PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault @@ -1312,8 +1323,8 @@ services: - security-bootstrapper - vault environment: - ADD_KNOWN_SECRETS: redisdb[app-rules-engine],redisdb[app-http-export],redisdb[app-mqtt-export],redisdb[scalability-test-mqtt-export],redisdb[device-modbus],redisdb[device-rest],redisdb[device-virtual],redisdb[device-camera] - ADD_SECRETSTORE_TOKENS: app-http-export,app-mqtt-export,app-functional-tests,scalability-test-mqtt-export,device-modbus,app-external-mqtt-trigger,device-camera + ADD_KNOWN_SECRETS: redisdb[app-rules-engine],redisdb[app-http-export],redisdb[app-mqtt-export],redisdb[app-scalability-test-mqtt-export],redisdb[device-modbus],redisdb[device-rest],redisdb[device-virtual],redisdb[device-camera] + ADD_SECRETSTORE_TOKENS: app-http-export,app-mqtt-export,app-functional-tests,app-scalability-test-mqtt-export,device-modbus,app-external-mqtt-trigger,device-camera API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: '8100' EDGEX_GROUP: '2001' @@ -1418,6 +1429,7 @@ services: DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" EXECUTORPATH: /sys-mgmt-executor + MESSAGEQUEUE_HOST: edgex-redis METRICSMECHANISM: executor PROXY_SETUP_HOST: edgex-security-proxy-setup REGISTRY_HOST: edgex-core-consul