summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Lambert <joshua@gitlab.com>2017-04-06 14:43:15 -0400
committerKushal Pandya <kushal@gitlab.com>2017-04-07 00:22:57 +0530
commit312e13661d1c4a3dda90aac822a0a798973fd7c1 (patch)
treec95ae695eb1ceab8a2ddeec440aea28de5580f60
parent7a78e11bdb97674e703cfc6fdd1b0cf7707ceb8f (diff)
downloadgitlab-ce-312e13661d1c4a3dda90aac822a0a798973fd7c1.tar.gz
Document update
-rw-r--r--doc/user/project/integrations/prometheus.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md
index 12d7700176c..21e081d9430 100644
--- a/doc/user/project/integrations/prometheus.md
+++ b/doc/user/project/integrations/prometheus.md
@@ -169,6 +169,14 @@ Clicking on the metrics button will display a new page, showing up to the last
8 hours of performance data. It may take a minute or two for data to appear
after initial deployment.
+## Determining performance impact of a merge
+
+> [Introduced][ce-10408] in GitLab 9.1.
+
+After a merge request has been approved, a sparkline will appear on the merge request page displaying the average memory usage of the application. The sparkline includes thirty minutes of data prior to the merge, a dot to indicate the merge itself, and then will begin capturing thirty minutes of data after the merge.
+
+This sparkline serves as a quick indicator of the impact on memory consumption of the recently merged changes. If there is a problem, action can then be taken to troubleshoot or revert the merge.
+
## Troubleshooting
If the metrics button is not appearing, then one of a few issues may be
@@ -193,4 +201,5 @@ occurring:
[gitlab.com-ip-range]: https://gitlab.com/gitlab-com/infrastructure/issues/434
[ci-environment-slug]: https://docs.gitlab.com/ce/ci/variables/#predefined-variables-environment-variables
[ce-8935]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8935
+[ce-10408]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10408
[promgldocs]: ../../../administration/monitoring/prometheus/index.md