diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-19 17:16:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-19 17:16:28 +0300 |
commit | e4384360a16dd9a19d4d2d25d0ef1f2b862ed2a6 (patch) | |
tree | 2fcdfa7dcdb9db8f5208b2562f4b4e803d671243 /doc/administration/monitoring/performance/grafana_configuration.md | |
parent | ffda4e7bcac36987f936b4ba515995a6698698f0 (diff) |
Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42
Diffstat (limited to 'doc/administration/monitoring/performance/grafana_configuration.md')
-rw-r--r-- | doc/administration/monitoring/performance/grafana_configuration.md | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/doc/administration/monitoring/performance/grafana_configuration.md b/doc/administration/monitoring/performance/grafana_configuration.md index b448ac461c8..8b3720ca8a9 100644 --- a/doc/administration/monitoring/performance/grafana_configuration.md +++ b/doc/administration/monitoring/performance/grafana_configuration.md @@ -18,10 +18,10 @@ and Grafana allows you to query the data to display graphs. ## Deprecation of bundled Grafana -Bundled Grafana was an optional Omnibus GitLab service that provided a user interface to GitLab metrics. +Bundled Grafana was an optional service for Linux package installations that provided a user interface to GitLab metrics. -The version of Grafana that is bundled with Omnibus GitLab is no longer supported. If you're using the bundled Grafana, you -should switch to a newer version from [Grafana Labs](https://grafana.com/grafana/). +The version of Grafana that is bundled with Linux package installations is no longer supported. If you're using the +bundled Grafana, you should switch to a newer version from [Grafana Labs](https://grafana.com/grafana/). ### Switch to new Grafana instance @@ -34,7 +34,8 @@ To switch away from bundled Grafana to a newer version of Grafana from Grafana L ### Temporary workaround -In GitLab versions 16.0 to 16.2, you can still force Omnibus GitLab to enable and configure Grafana by setting the following: +In GitLab versions 16.0 to 16.2, you can still force Linux package installations to enable and configure Grafana by +setting the following: - `grafana['enable'] = true`. - `grafana['enable_deprecated_service'] = true`. @@ -92,9 +93,9 @@ GitLab sidebar: and expand **Metrics - Grafana**. 1. Select the **Add a link to Grafana** checkbox. 1. Configure the **Grafana URL**: - - *If Grafana is enabled through Omnibus GitLab and on the same server,* + - If Grafana is enabled through a Linux package installation and on the same server, leave **Grafana URL** unchanged. It should be `/-/grafana`. - - *Otherwise,* enter the full URL of the Grafana instance. + - Otherwise, enter the full URL of the Grafana instance. 1. Select **Save changes**. GitLab displays your link in the **Main menu > Admin > Monitoring > Metrics Dashboard**. |