summaryrefslogtreecommitdiff
path: root/app/views/admin
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-10-11 13:44:09 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-10-11 13:44:09 +0000
commit4a8cb230c6ba28ccdcd6da91855005e4fa0c46bf (patch)
treec0da5d6f86a00dda2ca643b4027f044123f506dc /app/views/admin
parent38978fa53ffb7b263f987cb1fca84722c83b2fec (diff)
parent44d5be2e8a248657165f932d859a3be4f1ee9089 (diff)
downloadgitlab-ce-4a8cb230c6ba28ccdcd6da91855005e4fa0c46bf.tar.gz
Merge branch 'docs/refactor-monitoring' into 'master'
Move monitoring/ to new location ## What does this MR do? Move monitoring/ to new location. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/3349 ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [ ] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [ ] Make sure internal links pointing to the document in question are not broken. - [ ] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [ ] If working on CE, submit an MR to EE with the changes as well. See merge request !6518
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/application_settings/_form.html.haml6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 0d79ca7dc52..c4c68cd7891 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -221,7 +221,11 @@
%fieldset
%legend Metrics
%p
- These settings require a restart to take effect.
+ Setup InfluxDB 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.
+ = link_to icon('question-circle'), help_page_path('administration/monitoring/performance/introduction')
.form-group
.col-sm-offset-2.col-sm-10
.checkbox