commit 4f13ac6

Merge: b0745e1 90d5ef3 Author: Willy Kloucek <34452982+wkloucek@users.noreply.github.com> Date: Thu Mar 24 13:08:15 2022 +0100 Merge pull request #3192 from owncloud/nats-check-for-error [full-ci] use NATS JetStream
owncloud · Mar 24, 2022 · 6f62f2f · 6f62f2f
1 parent f482046
commit 6f62f2f
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 14 deletions.
diff --git a/extensions/_includes/audit-config-example.yaml b/extensions/_includes/audit-config-example.yaml
@@ -11,7 +11,7 @@ debug:
   zpages: false
 events:
   endpoint: 127.0.0.1:9233
-  cluster: test-cluster
+  cluster: ocis-cluster
   consumergroup: audit
 auditlog:
   logtoconsole: true

diff --git a/extensions/_includes/audit_configvars.md b/extensions/_includes/audit_configvars.md
@@ -7,7 +7,7 @@
 | AUDIT_DEBUG_PPROF | bool | false | |
 | AUDIT_DEBUG_ZPAGES | bool | false | |
 | AUDIT_EVENTS_ENDPOINT | string | 127.0.0.1:9233 | the address of the streaming service|
-| AUDIT_EVENTS_CLUSTER | string | test-cluster | the clusterID of the streaming service. Mandatory when using nats|
+| AUDIT_EVENTS_CLUSTER | string | ocis-cluster | the clusterID of the streaming service. Mandatory when using nats|
 | AUDIT_EVENTS_GROUP | string | audit | the customergroup of the service. One group will only get one vopy of an event|
 | AUDIT_LOG_TO_CONSOLE | bool | true | logs to Stdout if true|
 | AUDIT_LOG_TO_FILE | bool | false | logs to file if true|

diff --git a/extensions/_includes/nats-config-example.yaml b/extensions/_includes/nats-config-example.yaml
@@ -12,3 +12,5 @@ debug:
 nats:
   host: 127.0.0.1
   port: 9233
+  clusterid: ocis-cluster
+  storedir: ~/.ocis/nats
diff --git a/extensions/_includes/nats_configvars.md b/extensions/_includes/nats_configvars.md
@@ -7,4 +7,6 @@
 | NATS_DEBUG_PPROF | bool | false | |
 | NATS_DEBUG_ZPAGES | bool | false | |
 | NATS_NATS_HOST | string | 127.0.0.1 | |
-| NATS_NATS_PORT | int | 9233 | |
+| NATS_NATS_PORT | int | 9233 | |
+| NATS_NATS_CLUSTER_ID | string | ocis-cluster | |
+| NATS_NATS_STORE_DIR | string | ~/.ocis/nats | |
diff --git a/extensions/_includes/notifications-config-example.yaml b/extensions/_includes/notifications-config-example.yaml
@@ -17,7 +17,7 @@ notifications:
     password: godisdead
   events:
     endpoint: 127.0.0.1:9233
-    cluster: test-cluster
+    cluster: ocis-cluster
     consumergroup: notifications
   revagateway: 127.0.0.1:9142
   machineauthsecret: change-me-please
diff --git a/extensions/_includes/notifications_configvars.md b/extensions/_includes/notifications_configvars.md
@@ -11,7 +11,7 @@
 | NOTIFICATIONS_SMTP_SENDER | string | god@example.com | |
 | NOTIFICATIONS_SMTP_PASSWORD | string | godisdead | |
 | NOTIFICATIONS_EVENTS_ENDPOINT | string | 127.0.0.1:9233 | |
-| NOTIFICATIONS_EVENTS_CLUSTER | string | test-cluster | |
+| NOTIFICATIONS_EVENTS_CLUSTER | string | ocis-cluster | |
 | NOTIFICATIONS_EVENTS_GROUP | string | notifications | |
 | REVA_GATEWAY;NOTIFICATIONS_REVA_GATEWAY | string | 127.0.0.1:9142 | |
 | OCIS_MACHINE_AUTH_API_KEY;NOTIFICATIONS_MACHINE_AUTH_API_KEY | string | change-me-please | |
diff --git a/extensions/_includes/storage-config-example.yaml b/extensions/_includes/storage-config-example.yaml
@@ -461,7 +461,7 @@ reva:
     userstoragemountid: ""
     events:
       address: 127.0.0.1:9233
-      clusterid: test-cluster
+      clusterid: ocis-cluster
   storageshares:
     port:
       maxcpus: ""

diff --git a/grpc_apis/ocis/messages/accounts/v0/grpc.md b/grpc_apis/ocis/messages/accounts/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.accounts.v0"
 url: /grpc_apis/ocis_messages_accounts_v0
-date: 2022-03-24T10:00:59Z
+date: 2022-03-24T12:10:04Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/messages/settings/v0/grpc.md b/grpc_apis/ocis/messages/settings/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.settings.v0"
 url: /grpc_apis/ocis_messages_settings_v0
-date: 2022-03-24T10:00:59Z
+date: 2022-03-24T12:10:04Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/messages/store/v0/grpc.md b/grpc_apis/ocis/messages/store/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.store.v0"
 url: /grpc_apis/ocis_messages_store_v0
-date: 2022-03-24T10:00:59Z
+date: 2022-03-24T12:10:04Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/messages/thumbnails/v0/grpc.md b/grpc_apis/ocis/messages/thumbnails/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.thumbnails.v0"
 url: /grpc_apis/ocis_messages_thumbnails_v0
-date: 2022-03-24T10:00:59Z
+date: 2022-03-24T12:10:04Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/services/accounts/v0/grpc.md b/grpc_apis/ocis/services/accounts/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.accounts.v0"
 url: /grpc_apis/ocis_services_accounts_v0
-date: 2022-03-24T10:00:59Z
+date: 2022-03-24T12:10:04Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/services/settings/v0/grpc.md b/grpc_apis/ocis/services/settings/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.settings.v0"
 url: /grpc_apis/ocis_services_settings_v0
-date: 2022-03-24T10:00:59Z
+date: 2022-03-24T12:10:04Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/services/store/v0/grpc.md b/grpc_apis/ocis/services/store/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.store.v0"
 url: /grpc_apis/ocis_services_store_v0
-date: 2022-03-24T10:00:59Z
+date: 2022-03-24T12:10:04Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/services/thumbnails/v0/grpc.md b/grpc_apis/ocis/services/thumbnails/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.thumbnails.v0"
 url: /grpc_apis/ocis_services_thumbnails_v0
-date: 2022-03-24T10:00:59Z
+date: 2022-03-24T12:10:04Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---