diff options
author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-05-19 16:10:15 +0300 |
---|---|---|
committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-02 20:45:57 +0300 |
commit | cf932df2348dc3ccd06ca557b68edc60f518c893 (patch) | |
tree | 8a0df00bc4bb080953a356cc2db314e86496b8ad /app | |
parent | c28546177e2b4d5f7f3cc0e5b3a7b404206565fb (diff) |
Add Prometheus metrics configuration
+ Cleanup Gemfile
Diffstat (limited to 'app')
-rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index e1b4e34cd2b..3c020c71832 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -232,9 +232,9 @@ = f.number_field :container_registry_token_expire_delay, class: 'form-control' %fieldset - %legend Metrics + %legend Metrics - Influx %p - Setup InfluxDB to measure a wide variety of statistics like the time spent + Setup Influx to measure a wide variety of statistics like the time spent in running SQL queries. These settings require a = link_to 'restart', help_page_path('administration/restart_gitlab') to take effect. @@ -297,6 +297,21 @@ results in fewer but larger UDP packets being sent. %fieldset + %legend Metrics - Prometheus + %p + Setup Prometheus to measure a variety of statistics that partially overlap and complement Influx based metrics. + This setting requires a + = link_to 'restart', help_page_path('administration/restart_gitlab') + to take effect. + = link_to icon('question-circle'), help_page_path('administration/monitoring/performance/introduction') + .form-group + .col-sm-offset-2.col-sm-10 + .checkbox + = f.label :prometheus_metrics_enabled do + = f.check_box :prometheus_metrics_enabled + Enable Prometheus Metrics + + %fieldset %legend Background Jobs %p These settings require a restart to take effect. |