From 9e1f2e52b5c4a4569928be10ab5c028923a1c6d4 Mon Sep 17 00:00:00 2001 From: lenny Date: Fri, 22 Jan 2021 14:34:50 -0700 Subject: [PATCH] feat: Update profiles for new subsribe topic for V2 DTOs All profiles using ZMQ for MessageBus have `edgex/events` added to existing `SubscribeTopics`. All profiles using MQTT for MessageBus have `edgex/events/#` added to existing `SubscribeTopics`. closes #174 Signed-off-by: lenny --- go.mod | 4 ++++ res/http-export/configuration.toml | 4 ++-- res/mqtt-export/configuration.toml | 4 ++-- res/rules-engine-mqtt/configuration.toml | 4 ++-- res/rules-engine-redis/configuration.toml | 4 ++-- res/rules-engine/configuration.toml | 4 ++-- res/sample/configuration.toml | 4 ++-- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index d25f2502..35d1e56b 100644 --- a/go.mod +++ b/go.mod @@ -3,3 +3,7 @@ module github.com/edgexfoundry/app-service-configurable go 1.15 require github.com/edgexfoundry/app-functions-sdk-go/v2 v2.0.0-dev.4 + +replace ( + github.com/edgexfoundry/app-functions-sdk-go/v2 => ../app-functions-sdk-go +) diff --git a/res/http-export/configuration.toml b/res/http-export/configuration.toml index e505eb41..6caf0a68 100644 --- a/res/http-export/configuration.toml +++ b/res/http-export/configuration.toml @@ -115,8 +115,8 @@ Timeout = "30s" Port = 48080 [Binding] -Type="messagebus" -SubscribeTopics="events" +Type="edgex-messagebus" +SubscribeTopics="events, edgex/events" [MessageBus] Type = "zero" diff --git a/res/mqtt-export/configuration.toml b/res/mqtt-export/configuration.toml index 39d2a8b7..ee10344d 100644 --- a/res/mqtt-export/configuration.toml +++ b/res/mqtt-export/configuration.toml @@ -113,8 +113,8 @@ Timeout = "30s" Port = 48080 [Binding] -Type="messagebus" -SubscribeTopics="events" +Type="edgex-messagebus" +SubscribeTopics="events, edgex/events" [MessageBus] Type = "zero" diff --git a/res/rules-engine-mqtt/configuration.toml b/res/rules-engine-mqtt/configuration.toml index 1b82a13f..f5c76237 100644 --- a/res/rules-engine-mqtt/configuration.toml +++ b/res/rules-engine-mqtt/configuration.toml @@ -38,8 +38,8 @@ Type = "consul" Port = 48080 [Binding] -Type="messagebus" -SubscribeTopics="events" +Type="edgex-messagebus" +SubscribeTopics="events, edgex/events/#" PublishTopic="rules-events" [MessageBus] diff --git a/res/rules-engine-redis/configuration.toml b/res/rules-engine-redis/configuration.toml index 1de2a6b5..b55c8ba9 100644 --- a/res/rules-engine-redis/configuration.toml +++ b/res/rules-engine-redis/configuration.toml @@ -73,8 +73,8 @@ RetryWaitPeriod = "1s" AuthType = 'X-Vault-Token' [Binding] -Type="messagebus" -SubscribeTopics="events" +Type="edgex-messagebus" +SubscribeTopics="events, edgex/events" PublishTopic="rules-events" [MessageBus] diff --git a/res/rules-engine/configuration.toml b/res/rules-engine/configuration.toml index 3fa6fc77..3ab748d1 100644 --- a/res/rules-engine/configuration.toml +++ b/res/rules-engine/configuration.toml @@ -38,8 +38,8 @@ Type = "consul" Port = 48080 [Binding] -Type="messagebus" -SubscribeTopics="events" +Type="edgex-messagebus" +SubscribeTopics="events, edgex/events" PublishTopic="rules-events" [MessageBus] diff --git a/res/sample/configuration.toml b/res/sample/configuration.toml index ea1b8683..6286695c 100644 --- a/res/sample/configuration.toml +++ b/res/sample/configuration.toml @@ -195,8 +195,8 @@ Timeout = "30s" Port = 48080 [Binding] -Type="messagebus" -SubscribeTopics="events" +Type="edgex-messagebus" +SubscribeTopics="events, edgex/events" PublishTopic="example" [MessageBus]