diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /config/README.md | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'config/README.md')
-rw-r--r-- | config/README.md | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/config/README.md b/config/README.md index 7f3125cefd2..be5bd442fd8 100644 --- a/config/README.md +++ b/config/README.md @@ -147,3 +147,34 @@ searched): 3. the configuration file pointed to by the `GITLAB_REDIS_CONFIG_FILE` environment variable 4. the configuration file `resque.yml` + +## redis.trace_chunks.yml + +If configured, `redis.trace_chunks.yml` overrides the +`resque.yml` settings to configure the Redis database instance +used for clients of `::Gitlab::Redis::TraceChunks` which stores CI trace chunks. + +Settings here can be overridden by the environment variable +`GITLAB_REDIS_TRACE_CHUNKS_CONFIG_FILE` which provides +an alternate location for configuration settings. + +The order of precedence for the URL used to connect to the Redis instance +used for `trace_chunks` is: +1. URL from a configuration file pointed to by the +`GITLAB_REDIS_TRACE_CHUNKS_CONFIG_FILE` environment variable +2. URL from `redis.trace_chunks.yml` +3. URL from a configuration file pointed to by the +`GITLAB_REDIS_CONFIG_FILE` environment variable +4. URL from `resque.yml` +5. `redis://localhost:6383` + +The order of precedence for all other configuration settings for `trace_chunks` +are selected from only the first of the following files found (if a setting +is not provided in an earlier file, the remainder of the files are not +searched): +1. the configuration file pointed to by the +`GITLAB_REDIS_TRACE_CHUNKS_CONFIG_FILE` environment variable +2. the configuration file `redis.trace_chunks.yml` +3. the configuration file pointed to by the +`GITLAB_REDIS_CONFIG_FILE` environment variable +4. the configuration file `resque.yml` |