diff --git a/doc/administration/monitoring/performance/grafana_configuration.md b/doc/administration/monitoring/performance/grafana_configuration.md index dc4c3749b239a936d441656f40d668bc90c90aa5..e353e03f55709b7e3eb313a3e25ee12af556236b 100644 --- a/doc/administration/monitoring/performance/grafana_configuration.md +++ b/doc/administration/monitoring/performance/grafana_configuration.md @@ -17,9 +17,6 @@ DETAILS: series metrics through graphs and dashboards. GitLab writes performance data to Prometheus, and Grafana allows you to query the data to display graphs. -WARNING: -Grafana bundled with GitLab was deprecated GitLab 16.0 and [removed](#grafana-bundled-with-gitlab-removed) in GitLab 16.3. - ## Import GitLab dashboards You can import a set of default dashboards to start displaying information. GitLab has published a set of default @@ -66,24 +63,3 @@ configuration screen: - No scopes appear. - The `read_user` scope is included. - -<!--- start_remove The following content will be removed on remove_date: '2023-12-22' --> - -## 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 -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 - -To switch away from bundled Grafana to a newer version of Grafana from Grafana Labs: - -1. Set up a version of Grafana from Grafana Labs. -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 --> diff --git a/doc/update/versions/gitlab_16_changes.md b/doc/update/versions/gitlab_16_changes.md index 09992873593bcc1c0bda744de823a0b86b782f4c..15e6f751069b93a67e9ac44d7876bcd026038837 100644 --- a/doc/update/versions/gitlab_16_changes.md +++ b/doc/update/versions/gitlab_16_changes.md @@ -669,9 +669,8 @@ Specific information applies to Linux package installations: Prior to upgrading, administrators of Linux package installations must ensure the installation is using [PostgreSQL 13](https://docs.gitlab.com/omnibus/settings/database.html#upgrade-packaged-postgresql-server). -- Grafana that was bundled with GitLab is deprecated and is no longer supported. It is - [removed](../../administration/monitoring/performance/grafana_configuration.md#grafana-bundled-with-gitlab-removed) in - GitLab 16.3. +- Grafana that was bundled with GitLab is deprecated and is no longer supported. + It is removed in GitLab 16.3. - This upgrades `openssh-server` to `1:8.9p1-3`. Using `ssh-keyscan -t rsa` with older OpenSSH clients to obtain public key information is no longer viable because of