Set Sidekiq default log format to json

This follow gitlab default value.
See https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/32842

Signed-off-by: Pierre Belloy <p.belloy@axelor.com>

Author: pbe-axelor

README.md

@@ -922,7 +922,7 @@ Below is the complete list of available options that can be used to customize yo
 | `SIDEKIQ_CONCURRENCY` | The number of concurrent sidekiq jobs to run. Defaults to `25` |
 | `SIDEKIQ_SHUTDOWN_TIMEOUT` | Timeout for sidekiq shutdown. Defaults to `4` |
 | `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | Non-zero value enables the SidekiqMemoryKiller. Defaults to `1000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html) |
-| `GITLAB_SIDEKIQ_LOG_FORMAT` | Sidekiq log format that will be used. Defaults to `default` |
+| `GITLAB_SIDEKIQ_LOG_FORMAT` | Sidekiq log format that will be used. Defaults to `json` |
 | `DB_ADAPTER` | The database type. Currently only postgresql is supported. Over 12.1 postgres force. Possible values: `postgresql`. Defaults to `postgresql`. |
 | `DB_ENCODING` | The database encoding. For `DB_ADAPTER` values `postresql` this parameter defaults and `utf8` respectively. |
 | `DB_HOST` | The database server hostname. Defaults to `localhost`. |

assets/runtime/config/gitlabhq/gitlab.yml

@@ -271,7 +271,7 @@ production: &base
 
   ## Sidekiq
   sidekiq:
-    log_format: {{GITLAB_SIDEKIQ_LOG_FORMAT}} # (json is also supported)
+    log_format: {{GITLAB_SIDEKIQ_LOG_FORMAT}} # (default is the original format)
 
   ## Auxiliary jobs
   # Periodically executed jobs, to self-heal GitLab, do external synchronizations, etc.

assets/runtime/env-defaults

@@ -60,7 +60,7 @@ REDIS_DB_NUMBER=${REDIS_DB_NUMBER:-0}
 SIDEKIQ_SHUTDOWN_TIMEOUT=${SIDEKIQ_SHUTDOWN_TIMEOUT:-4}
 SIDEKIQ_CONCURRENCY=${SIDEKIQ_CONCURRENCY:-25}
 SIDEKIQ_MEMORY_KILLER_MAX_RSS=${SIDEKIQ_MEMORY_KILLER_MAX_RSS:-1000000}
-GITLAB_SIDEKIQ_LOG_FORMAT=${GITLAB_SIDEKIQ_LOG_FORMAT:-default}
+GITLAB_SIDEKIQ_LOG_FORMAT=${GITLAB_SIDEKIQ_LOG_FORMAT:-json}
 
 ## UNICORN
 UNICORN_WORKERS=${UNICORN_WORKERS:-3}