Commit 3da03c79 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'tr-embed-metrics-frontend-docs' into 'master'

Embed metrics charts in issues - docs

See merge request gitlab-org/gitlab-ce!30849
parents f9290e5b d6d75da9
...@@ -619,6 +619,10 @@ versions of the app, all without leaving GitLab. ...@@ -619,6 +619,10 @@ versions of the app, all without leaving GitLab.
Add a [button to the Monitoring dashboard](../user/project/operations/linking_to_an_external_dashboard.md) linking directly to your existing external dashboards. Add a [button to the Monitoring dashboard](../user/project/operations/linking_to_an_external_dashboard.md) linking directly to your existing external dashboards.
#### Embedding metrics in GitLab Flavored Markdown
Metric charts can be embedded within GitLab Flavored Markdown. See [Embedding Metrics within GitLab Flavored Markdown](../user/project/integrations/prometheus.md#embedding-metric-charts-within-gitlab-flavored-markdown) for more details.
### Web terminals ### Web terminals
> Web terminals were added in GitLab 8.15 and are only available to project Maintainers and Owners. > Web terminals were added in GitLab 8.15 and are only available to project Maintainers and Owners.
......
...@@ -533,6 +533,10 @@ This snippet links to `<wiki_root>/miscellaneous.md`: ...@@ -533,6 +533,10 @@ This snippet links to `<wiki_root>/miscellaneous.md`:
[Link to Related Page](/miscellaneous.md) [Link to Related Page](/miscellaneous.md)
``` ```
### Embedding metrics in GitLab Flavored Markdown
Metric charts can be embedded within GitLab Flavored Markdown. See [Embedding Metrics within GitLab flavored Markdown](../user/project/integrations/prometheus.md#embedding-metric-charts-within-gitlab-flavored-markdown) for more details.
## Standard markdown and extensions in GitLab ## Standard markdown and extensions in GitLab
All standard markdown formatting should work as expected within GitLab. Some standard All standard markdown formatting should work as expected within GitLab. Some standard
......
...@@ -354,6 +354,27 @@ Prometheus server. ...@@ -354,6 +354,27 @@ Prometheus server.
![Merge Request with Performance Impact](img/merge_request_performance.png) ![Merge Request with Performance Impact](img/merge_request_performance.png)
## Embedding metric charts within Gitlab Flavored Markdown
> [Introduced][ce-29691] in GitLab 12.2.
> Requires [Kubernetes](prometheus_library/kubernetes.md) metrics.
It is possible to display metrics charts within [GitLab Flavored Markdown](../../markdown.md#gitlab-flavored-markdown-gfm).
To display a metric chart, include a link of the form `https://<root_url>/<project>/environments/<environment_id>/metrics`.
The following requirements must be met for the metric to unfurl:
- The `<environment_id>` must correspond to a real environment.
- Prometheus must be monitoring the environment.
- The GitLab instance must be configured to receive data from the environment.
- The user must be allowed access to the monitoring dashboard for the environment ([Reporter or higher](../../permissions.md)).
- The dashboard must have data within the last 8 hours.
If all of the above are true, then the metric will unfurl as seen below:
![Embedded Metrics](img/embed_metrics.png)
## Troubleshooting ## Troubleshooting
If the "No data found" screen continues to appear, it could be due to: If the "No data found" screen continues to appear, it could be due to:
...@@ -376,4 +397,5 @@ If the "No data found" screen continues to appear, it could be due to: ...@@ -376,4 +397,5 @@ If the "No data found" screen continues to appear, it could be due to:
[ci-environment-slug]: ../../../ci/variables/#predefined-environment-variables [ci-environment-slug]: ../../../ci/variables/#predefined-environment-variables
[ce-8935]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8935 [ce-8935]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8935
[ce-10408]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10408 [ce-10408]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10408
[ce-29691]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/29691
[promgldocs]: ../../../administration/monitoring/prometheus/index.md [promgldocs]: ../../../administration/monitoring/prometheus/index.md
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment