diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-21 09:06:33 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-08-23 10:08:20 +0000 |
| commit | 38e796bae337123f66aa1d0c8d2bbd4248783d8d (patch) | |
| tree | 51d56f93a84f2e17131e14e3b4fae80028126177 | |
| parent | 8e15396b8b35353f392ce1a667c7d12415a058ed (diff) | |
| download | gitlab-ce-38e796bae337123f66aa1d0c8d2bbd4248783d8d.tar.gz | |
Merge branch '62971-embed-specific-metrics-chart-in-issue-docs' into 'master'
Embed specific metrics chart in issue docs
See merge request gitlab-org/gitlab-ce!31900
(cherry picked from commit aed489bf901745ced6618e680913d0d213998923)
482642b0 Adds specific metric styles and prop
146243da Updated styles, removed css :D
0a5d49f7 Adds docs for embedding chart
4bbb0ddf Simpler null checks
758a195b Fix some wrapping issues
d6550ad4 Fix lint and prop type
675639cc Remove everything that isn't docs
eb27d0f1 Apply suggestion to doc/user/project/integrations/prometheus.md
364e7219 Compress generate_link_to_chart.png image
| -rw-r--r-- | doc/user/project/integrations/img/generate_link_to_chart.png | bin | 0 -> 35573 bytes | |||
| -rw-r--r-- | doc/user/project/integrations/prometheus.md | 4 |
2 files changed, 4 insertions, 0 deletions
diff --git a/doc/user/project/integrations/img/generate_link_to_chart.png b/doc/user/project/integrations/img/generate_link_to_chart.png Binary files differnew file mode 100644 index 00000000000..03e018969b1 --- /dev/null +++ b/doc/user/project/integrations/img/generate_link_to_chart.png diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index 01e8fb76425..e2f45b8a32f 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -369,6 +369,10 @@ It is possible to display metrics charts within [GitLab Flavored Markdown](../.. To display a metric chart, include a link of the form `https://<root_url>/<project>/environments/<environment_id>/metrics`. +A single chart may also be embedded. You can generate a link to the chart via the dropdown located on the right side of the chart: + + + The following requirements must be met for the metric to unfurl: - The `<environment_id>` must correspond to a real environment. |
