diff --git a/provider/notification-gc/docs/anthos/README.md b/provider/notification-gc/docs/anthos/README.md index 41810569b4951a6375420e02eff38639490b39fd..c5f73f64f2ed973d1445f14131f63876cf6b881b 100644 --- a/provider/notification-gc/docs/anthos/README.md +++ b/provider/notification-gc/docs/anthos/README.md @@ -209,14 +209,14 @@ curl -L -X PATCH 'https://dev.osdu.club/api/partition/v1/partitions/opendes' -H At RabbitMQ should be created set of exchanges and queues. -| topic name | subscription name pattern | description | sensitive? | -|-------------------------------------------------------------------------|--------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------| -| `register-subscriber-control` | `notification-control-topic-{data-partition-id}` | Register subscriber control topic | yes | -| `register-subscriber-control-exchange` | `notification-control-topic-{data-partition-id}` | Register subscriber control delay topic | yes | -| `{topic-name}` e.g. `records-changed` | `notification-{topic-name}-service` | Service topics from [topics.json](https://community.opengroup.org/osdu/platform/system/register/-/blob/master/provider/register-gc/src/main/resources/topics.json) on Register service | yes | -| `{topic-name}-exchange` e.g. `records-changed-exchange` | `notification-{topic-name}-service` | Service delay topics from [topics.json](https://community.opengroup.org/osdu/platform/system/register/-/blob/master/provider/register-gc/src/main/resources/topics.json) on Register service | yes | -| `{topic-name}-publish` e.g. `records-changed-publish` | `notification-{topic-name}-publish` | Publish topics in relation 1-on-1 for each service topic | yes | -| `{topic-name}-publish-exchange` e.g. `records-changed-publish-exchange` | `notification-{topic-name}-publish` | Publish delay topics in relation 1-on-1 for each service topic | yes | +| topic name | subscription name pattern | description | sensitive? | +|--------------------------------------------------------------------------------------|-------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------| +| `register-subscriber-control` | `notification-control-sub` | Register subscriber control topic | yes | +| `notification-control-sub-exchange` | `notification-control-sub` | Register subscriber control delay topic | yes | +| `{topic-name}` e.g. `records-changed` | `notification-{topic-name}-service` | Service topics from [topics.json](https://community.opengroup.org/osdu/platform/system/register/-/blob/master/provider/register-gc/src/main/resources/topics.json) on Register service | yes | +| `notification-{topic-name}-service-exchange` e.g. `records-changed-exchange` | `notification-{topic-name}-service` | Service delay topics from [topics.json](https://community.opengroup.org/osdu/platform/system/register/-/blob/master/provider/register-gc/src/main/resources/topics.json) on Register service | yes | +| `{topic-name}-publish` e.g. `records-changed-publish` | `notification-{topic-name}-publish` | Publish topics in relation 1-on-1 for each service topic | yes | +| `notification-{topic-name}-publish-exchange` e.g. `records-changed-publish-exchange` | `notification-{topic-name}-publish` | Publish delay topics in relation 1-on-1 for each service topic | yes | Control topic name can be overridden by: @@ -226,12 +226,16 @@ Control topic name can be overridden by:  -### Important. Dead lettering configuration +### Important. Retry with delay configuration For every service exchange special delay exchange with postfix `-exchange` and type `x-delayed-message` should exist. Retries and delays configured by `rabbitmqRetryLimit` and `rabbitmqRetryDelay` OQM properties. +Example for `records-changed` topic: + + + ## Keycloak configuration [Keycloak service accounts setup](https://www.keycloak.org/docs/latest/server_admin/#_service_accounts) diff --git a/provider/notification-gc/docs/anthos/pics/Notification-RabbitMQ-Config.png b/provider/notification-gc/docs/anthos/pics/Notification-RabbitMQ-Config.png new file mode 100644 index 0000000000000000000000000000000000000000..3523f523cac123d17fdc3c7835036df1097890dd Binary files /dev/null and b/provider/notification-gc/docs/anthos/pics/Notification-RabbitMQ-Config.png differ diff --git a/provider/notification-gc/docs/gc/README.md b/provider/notification-gc/docs/gc/README.md index 6070a2fa73e91835bde4737c7b2d918ab3115cb4..b2c8bb3ff1ba31344e6b21a810c2fb6f55a5566b 100644 --- a/provider/notification-gc/docs/gc/README.md +++ b/provider/notification-gc/docs/gc/README.md @@ -145,3 +145,7 @@ On the subscription dead lettering settings tab: - Dead letter topic should not be the source topic Notification service uses a common `dead-lettering-notification` topic because dead lettering logic is not supported yet. + +Example for `records-changed` topic: + + \ No newline at end of file diff --git a/provider/notification-gc/docs/gc/pics/Notification-PubSub-Config.png b/provider/notification-gc/docs/gc/pics/Notification-PubSub-Config.png new file mode 100644 index 0000000000000000000000000000000000000000..6f2f0d18cef569f75dd1a991ce438e7e36e22977 Binary files /dev/null and b/provider/notification-gc/docs/gc/pics/Notification-PubSub-Config.png differ