diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 18:40:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 18:40:28 +0300 |
commit | b595cb0c1dec83de5bdee18284abe86614bed33b (patch) | |
tree | 8c3d4540f193c5ff98019352f554e921b3a41a72 /config/gitlab.yml.example | |
parent | 2f9104a328fc8a4bddeaa4627b595166d24671d0 (diff) |
Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r-- | config/gitlab.yml.example | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 841e7670e45..78ddc0afa3a 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -540,6 +540,10 @@ production: &base ci_platform_metrics_update_cron_worker: cron: "47 9 * * *" + # Periodically update ci_runner_versions table with up-to-date versions and status. + ci_runner_versions_reconciliation_worker: + cron: "20 * * * *" + # GitLab EE only jobs. These jobs are automatically enabled for an EE # installation, and ignored for a CE installation. ee_cron_jobs: @@ -661,12 +665,6 @@ production: &base gitlab_ci: # Default project notifications settings: - # - # Send emails only on broken builds (default: true) - # all_broken_builds: true - # - # Add pusher to recipients list (default: false) - # add_pusher: true # The location where build traces are stored (default: builds/). Relative paths are relative to Rails.root # builds_path: builds/ @@ -1266,24 +1264,29 @@ production: &base ip_whitelist: - 127.0.0.0/8 - # Sidekiq exporter is webserver built in to Sidekiq to expose Prometheus metrics + # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: # enabled: true # log_enabled: false # address: localhost # port: 8082 + # tls_enabled: false + # tls_cert_path: /path/to/cert.pem + # tls_key_path: /path/to/key.pem sidekiq_health_checks: # enabled: true # address: localhost # port: 8092 - # Web exporter is a dedicated Rack server running alongside Puma to expose Prometheus metrics - # It runs alongside the `/metrics` endpoints to ease the publish of metrics + # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: # enabled: true # address: localhost # port: 8083 + # tls_enabled: false + # tls_cert_path: /path/to/cert.pem + # tls_key_path: /path/to/key.pem ## Prometheus settings # Do not modify these settings here. They should be modified in /etc/gitlab/gitlab.rb @@ -1294,6 +1297,9 @@ production: &base prometheus: # enabled: true # server_address: 'localhost:9090' + snowplow_micro: + enabled: true + address: '127.0.0.1:9091' ## Consul settings consul: |