diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /doc/administration/redis | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'doc/administration/redis')
-rw-r--r-- | doc/administration/redis/replication_and_failover.md | 6 | ||||
-rw-r--r-- | doc/administration/redis/replication_and_failover_external.md | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/administration/redis/replication_and_failover.md b/doc/administration/redis/replication_and_failover.md index 9fde91903e8..37d586b1d32 100644 --- a/doc/administration/redis/replication_and_failover.md +++ b/doc/administration/redis/replication_and_failover.md @@ -646,6 +646,7 @@ persistence classes. | `queues` | Store Sidekiq background jobs. | | `shared_state` | Store session-related and other persistent data. | | `actioncable` | Pub/Sub queue backend for ActionCable. | +| `trace_chunks` | Store [CI trace chunks](../job_logs.md#enable-or-disable-incremental-logging) data. | To make this work with Sentinel: @@ -657,6 +658,7 @@ To make this work with Sentinel: gitlab_rails['redis_queues_instance'] = REDIS_QUEUES_URL gitlab_rails['redis_shared_state_instance'] = REDIS_SHARED_STATE_URL gitlab_rails['redis_actioncable_instance'] = REDIS_ACTIONCABLE_URL + gitlab_rails['redis_trace_chunks_instance'] = REDIS_TRACE_CHUNKS_URL # Configure the Sentinels gitlab_rails['redis_cache_sentinels'] = [ @@ -675,6 +677,10 @@ To make this work with Sentinel: { host: ACTIONCABLE_SENTINEL_HOST, port: 26379 }, { host: ACTIONCABLE_SENTINEL_HOST2, port: 26379 } ] + gitlab_rails['redis_trace_chunks_sentinels'] = [ + { host: TRACE_CHUNKS_SENTINEL_HOST, port: 26379 }, + { host: TRACE_CHUNKS_SENTINEL_HOST2, port: 26379 } + ] ``` Note that: diff --git a/doc/administration/redis/replication_and_failover_external.md b/doc/administration/redis/replication_and_failover_external.md index 141da2f79ec..65ec8eb50e5 100644 --- a/doc/administration/redis/replication_and_failover_external.md +++ b/doc/administration/redis/replication_and_failover_external.md @@ -73,7 +73,7 @@ requirements: instead of a socket. To configure Redis to use TCP connections you need to define both `bind` and `port` in the Redis configuration file. You can bind to all interfaces (`0.0.0.0`) or specify the IP of the desired interface - (e.g., one from an internal network). + (for example, one from an internal network). - Since Redis 3.2, you must define a password to receive external connections (`requirepass`). - If you are using Redis with Sentinel, you also need to define the same |