diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-05-19 13:11:01 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-05-19 13:11:01 +0000 |
| commit | 3ad8235513fcdc677129e933742cd42f0dfc6fec (patch) | |
| tree | f3c2c854c5e38810843a453f7b74fe1dc3b12b62 | |
| parent | 39a9265969b0a41d9f2e9948f026eb61ade0883e (diff) | |
| parent | 21ed05a5fde151a0835b9f601a5795d0496090c7 (diff) | |
| download | gitlab-ce-3ad8235513fcdc677129e933742cd42f0dfc6fec.tar.gz | |
Merge branch '32583-update-prometheus-merge-request-widget-documentation' into 'master'
Update Prometheus Merge Request widget documentation
Closes #32583
See merge request !11531
| -rw-r--r-- | doc/user/project/integrations/img/merge_request_performance.png | bin | 0 -> 66775 bytes | |||
| -rw-r--r-- | doc/user/project/integrations/prometheus.md | 10 |
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/user/project/integrations/img/merge_request_performance.png b/doc/user/project/integrations/img/merge_request_performance.png Binary files differnew file mode 100644 index 00000000000..93b2626fed7 --- /dev/null +++ b/doc/user/project/integrations/img/merge_request_performance.png diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index b71d6981d1e..7aa6d070a1b 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -171,11 +171,15 @@ after initial deployment. ## Determining performance impact of a merge -> [Introduced][ce-10408] in GitLab 9.1. +> [Introduced][ce-10408] in GitLab 9.2. -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. +Developers can view the performance impact of their changes within the merge request workflow. When a source branch has been deployed to an environment, a sparkline will appear showing the average memory consumption of the app. The dot indicates when the current changes were deployed, with up to 30 minutes of performance data displayed before and after. The sparkline will be updated after each commit has been deployed. -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. +Once merged and the target branch has been redeployed, the sparkline will switch to show the new environments this revision has been deployed to. + +Performance data will be available for the duration it is persisted on the Prometheus server. + + ## Troubleshooting |
