summaryrefslogtreecommitdiff
path: root/doc/README.md
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 /doc/README.md
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 'doc/README.md')
-rw-r--r--doc/README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/README.md b/doc/README.md
index e7712eed5d3..04f713a6c5f 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -47,8 +47,8 @@
- [Migrate GitLab CI to CE/EE](migrate_ci_to_ce/README.md) Follow this guide to migrate your existing GitLab CI data to GitLab CE/EE.
- [Git LFS configuration](workflow/lfs/lfs_administration.md)
- [Housekeeping](administration/housekeeping.md) Keep your Git repository tidy and fast.
-- [GitLab Performance Monitoring](monitoring/performance/introduction.md) Configure GitLab and InfluxDB for measuring performance metrics.
-- [Monitoring uptime](monitoring/health_check.md) Check the server status using the health check endpoint.
+- [GitLab Performance Monitoring](administration/monitoring/performance/introduction.md) Configure GitLab and InfluxDB for measuring performance metrics.
+- [Monitoring uptime](administration/monitoring/health_check.md) Check the server status using the health check endpoint.
- [Debugging Tips](administration/troubleshooting/debug.md) Tips to debug problems when things go wrong
- [Sidekiq Troubleshooting](administration/troubleshooting/sidekiq.md) Debug when Sidekiq appears hung and is not processing jobs.
- [High Availability](administration/high_availability/README.md) Configure multiple servers for scaling or high availability.