diff options
| author | Tristan Read <tread@gitlab.com> | 2019-08-27 17:34:45 +0200 |
|---|---|---|
| committer | Tristan Read <tread@gitlab.com> | 2019-08-27 17:52:20 +0200 |
| commit | 4b93b09d0f1fdf44c1c01a6702b4da6ccac0f246 (patch) | |
| tree | 714425fd8a99a1a804c33d00df98af7e6e29e28f | |
| parent | 37707019052e98a3a662cec07134906a2f46e604 (diff) | |
| download | gitlab-ce-4b93b09d0f1fdf44c1c01a6702b4da6ccac0f246.tar.gz | |
Reword and reorder text
| -rw-r--r-- | doc/user/project/integrations/prometheus.md | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index a91b88c5d1d..2089503907c 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -387,23 +387,21 @@ The following requirements must be met for the metric to unfurl: ### Embedding live Grafana charts -It is also possible to embed live [Grafana](../../../omnibus/settings/grafana.html) charts within issues, as a [Direct Linked Rendered Image](https://grafana.com/docs/reference/sharing/#direct-link-rendered-image). +It is also possible to embed live [Grafana](../../../omnibus/settings/grafana.html) charts within issues, as a [Direct Linked Rendered Image](https://grafana.com/docs/reference/sharing/#direct-link-rendered-image). This will work only when the Grafana instance is available to the user attempting to view the embed, either as a public dashboard or within their internal network. -The sharing panel provides the link, as highlighted below. +The sharing dialog within Grafana provides the link, as highlighted below. -[Grafana Direct Linked Rendered Image](img/grafana_live_embed.png) + -Simply copy the link and add an image element in the dashboard as required: +Simply copy the link and add an image tag as [inline HTML](../../markdown.html#inline-html) in your markdown. You may tweak the query params as required. For instance, removing the `&from=` and `&to=` params will give you a live chart. Here is example markup for a live chart from GitLab's public dashboard: ```html -<img src="https://dashboards.gitlab.com/d/RZmbBr7mk/gitlab-triage?orgId=1&refresh=30s&var-env=gprd&var-environment=gprd&var-prometheus=prometheus-01-inf-gprd&var-prometheus_app=prometheus-app-01-inf-gprd&var-backend=All&var-type=All&var-stage=main&panelId=1197&fullscreen"/> +<img src="https://dashboards.gitlab.com/render/d-solo/RZmbBr7mk/gitlab-triage?orgId=1&refresh=30s&var-env=gprd&var-environment=gprd&var-prometheus=prometheus-01-inf-gprd&var-prometheus_app=prometheus-app-01-inf-gprd&var-backend=All&var-type=All&var-stage=main&panelId=1247&width=1000&height=300"/> ``` -This renders as: +This will render like so: -<img src="https://dashboards.gitlab.com/d/RZmbBr7mk/gitlab-triage?orgId=1&refresh=30s&var-env=gprd&var-environment=gprd&var-prometheus=prometheus-01-inf-gprd&var-prometheus_app=prometheus-app-01-inf-gprd&var-backend=All&var-type=All&var-stage=main&panelId=1197&fullscreen"/> - -You may remove the timeframe to get a live chart. +<img src="https://dashboards.gitlab.com/render/d-solo/RZmbBr7mk/gitlab-triage?orgId=1&refresh=30s&var-env=gprd&var-environment=gprd&var-prometheus=prometheus-01-inf-gprd&var-prometheus_app=prometheus-app-01-inf-gprd&var-backend=All&var-type=All&var-stage=main&panelId=1247&width=1000&height=300"/> ## Troubleshooting |