diff options
Diffstat (limited to 'doc/operations/metrics')
| -rw-r--r-- | doc/operations/metrics/dashboards/index.md | 3 | ||||
| -rw-r--r-- | doc/operations/metrics/embed_grafana.md | 5 | ||||
| -rw-r--r-- | doc/operations/metrics/img/prometheus_integration_alerts.png | bin | 16084 -> 0 bytes | |||
| -rw-r--r-- | doc/operations/metrics/index.md | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/doc/operations/metrics/dashboards/index.md b/doc/operations/metrics/dashboards/index.md index 152e3dca27d..bd1f75b7b42 100644 --- a/doc/operations/metrics/dashboards/index.md +++ b/doc/operations/metrics/dashboards/index.md @@ -135,9 +135,6 @@ The options are: - **Expand panel** - Displays a larger version of a visualization. To return to the dashboard, select the **Back** button in your browser, or press the <kbd>Escape</kbd> key. ([Introduced](https://gitlab.com/groups/gitlab-org/-/epics/3100) in GitLab 13.0.) -- **View logs** **(ULTIMATE)** - Displays [Logs](../../../user/project/clusters/kubernetes_pod_logs.md), - if they are enabled. If used in conjunction with the [timeline zoom](#timeline-zoom-and-url-sharing) - feature, logs narrow down to the selected time range. ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/122013) in GitLab 12.8.) - **Download CSV** - Data from Prometheus charts on the metrics dashboard can be downloaded as CSV. - [Copy link to chart](../embed.md#embedding-gitlab-managed-kubernetes-metrics) diff --git a/doc/operations/metrics/embed_grafana.md b/doc/operations/metrics/embed_grafana.md index 700bf821a49..2229ba22be7 100644 --- a/doc/operations/metrics/embed_grafana.md +++ b/doc/operations/metrics/embed_grafana.md @@ -54,6 +54,11 @@ To set up the Grafana API in Grafana: 1. For **API Token**, enter the Administrator API token you just generated. 1. Select **Save Changes**. +NOTE: +If the Grafana integration is enabled, any user with read access to the GitLab +project can query metrics from the Prometheus instance. All requests proxied +through GitLab are authenticated with the same Grafana Administrator API token. + ### Generate a link to a panel To generate a link to a panel: diff --git a/doc/operations/metrics/img/prometheus_integration_alerts.png b/doc/operations/metrics/img/prometheus_integration_alerts.png Binary files differdeleted file mode 100644 index 609c5e5196c..00000000000 --- a/doc/operations/metrics/img/prometheus_integration_alerts.png +++ /dev/null diff --git a/doc/operations/metrics/index.md b/doc/operations/metrics/index.md index 916fe6b0ea9..82f093cf432 100644 --- a/doc/operations/metrics/index.md +++ b/doc/operations/metrics/index.md @@ -117,7 +117,7 @@ dashboard is visible to authenticated and non-authenticated users. ## Adding custom metrics -> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28527) from GitLab Premium to GitLab Free in 12.10. +> [Moved](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28527) from GitLab Premium to GitLab Free in 12.10. Custom metrics can be monitored by adding them on the monitoring dashboard page. After saving them, they display on the environment metrics dashboard provided that either: |
