diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-31 00:09:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-31 00:09:35 +0300 |
| commit | 5629d98f5325487f66dea52c2d662ea4b46d8c07 (patch) | |
| tree | 79e7ed48781c2643fe556d3215c0fc8bcc5d0e0e /config | |
| parent | 1b26aaa633642ea33f1fb9d7e8680892c8ca795d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/prometheus/self_monitoring_default.yml | 2 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/prometheus/self_monitoring_default.yml b/config/prometheus/self_monitoring_default.yml index 50e6f4585e4..024733bf2f0 100644 --- a/config/prometheus/self_monitoring_default.yml +++ b/config/prometheus/self_monitoring_default.yml @@ -1,4 +1,4 @@ -dashboard: 'Default dashboard' +dashboard: 'Overview' priority: 1 templating: diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 8dd60bcd65c..a4d25ce1578 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -108,6 +108,8 @@ - 1 - - file_hook - 1 +- - flush_counter_increments + - 1 - - gcp_cluster - 1 - - geo |