Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-10-06 15:09:57 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-10-06 15:09:57 +0300
commit41927736d5442ed13c41e79decc5900c77a8abf6 (patch)
tree1d32364f636ab780c7dcf654acb9f32ce24cebdc /doc/administration/monitoring
parent51b241d38ec6f0692f3844a4574d6bd2da12b22d (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/monitoring')
-rw-r--r--doc/administration/monitoring/performance/grafana_configuration.md14
1 files changed, 9 insertions, 5 deletions
diff --git a/doc/administration/monitoring/performance/grafana_configuration.md b/doc/administration/monitoring/performance/grafana_configuration.md
index ba0fed0fac1..a69eb67e77e 100644
--- a/doc/administration/monitoring/performance/grafana_configuration.md
+++ b/doc/administration/monitoring/performance/grafana_configuration.md
@@ -14,8 +14,7 @@ series metrics through graphs and dashboards. GitLab writes performance data to
and Grafana allows you to query the data to display graphs.
WARNING:
-Grafana bundled with GitLab was deprecated GitLab 16.0 and removed in GitLab 16.3.
-For more information, see [deprecation notes](#deprecation-of-bundled-grafana).
+Grafana bundled with GitLab was deprecated GitLab 16.0 and [removed](#grafana-bundled-with-gitlab-removed) in GitLab 16.3.
## Import GitLab dashboards
@@ -65,12 +64,15 @@ configuration screen:
- No scopes appear.
- The `read_user` scope is included.
-## Deprecation of bundled Grafana
+<!--- start_remove The following content will be removed on remove_date: '2023-12-22' -->
-Bundled Grafana was an optional service for Linux package installations that provided a user interface to GitLab metrics.
+## Grafana bundled with GitLab (removed)
+
+Grafana bundled with GitLab was an optional service for Linux package installations that provided a user interface to
+GitLab metrics.
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/).
+Grafana that came bundled with GitLab, you should switch to a newer version from [Grafana Labs](https://grafana.com/grafana/).
### Switch to new Grafana instance
@@ -80,3 +82,5 @@ To switch away from bundled Grafana to a newer version of Grafana from Grafana L
1. [Export the existing dashboards](https://grafana.com/docs/grafana/latest/dashboards/manage-dashboards/#export-a-dashboard) from bundled Grafana.
1. [Import the existing dashboards](https://grafana.com/docs/grafana/latest/dashboards/manage-dashboards/#import-a-dashboard) in the new Grafana instance.
1. [Configure GitLab](#integrate-with-gitlab-ui) to use the new Grafana instance.
+
+<!--- end_remove -->