From a7ae05285c80eaa9cc7449cc7d17fc25fdb0842b Mon Sep 17 00:00:00 2001 From: Christopher Moyer <35463610+chri2547@users.noreply.github.com> Date: Wed, 8 Feb 2023 08:23:32 -0600 Subject: [PATCH] Docs: incorporates feedback from PR #62402 (#63065) incorporates feedback from original PR --- .../shared/upgrade/upgrade-common-tasks.md | 20 +++++++++---------- .../upgrade-guide/upgrade-v8.1/index.md | 2 -- .../upgrade-guide/upgrade-v8.2/index.md | 2 -- .../upgrade-guide/upgrade-v8.3/index.md | 2 -- .../upgrade-guide/upgrade-v8.4/index.md | 2 -- .../upgrade-guide/upgrade-v8.5/index.md | 2 -- .../upgrade-guide/upgrade-v9.0/index.md | 2 -- .../upgrade-guide/upgrade-v9.1/index.md | 2 -- .../upgrade-guide/upgrade-v9.2/index.md | 2 -- .../upgrade-guide/upgrade-v9.3/index.md | 3 --- .../upgrade-guide/upgrade-v9.4/index.md | 3 --- 11 files changed, 10 insertions(+), 32 deletions(-) diff --git a/docs/sources/shared/upgrade/upgrade-common-tasks.md b/docs/sources/shared/upgrade/upgrade-common-tasks.md index 6da4b712d99..fb6e35b3004 100644 --- a/docs/sources/shared/upgrade/upgrade-common-tasks.md +++ b/docs/sources/shared/upgrade/upgrade-common-tasks.md @@ -19,16 +19,16 @@ When available, we list all changes with links to pull requests or issues in the Although Grafana automatically upgrades the database on startup, we recommend that you back up your Grafana database so that you can roll back to a previous version, if required. -### sqlite +### SQLite -If you use sqlite, you only need to back up the `grafana.db` file. On Unix systems, the database file is usually located in `/var/lib/grafana/`. +If you use SQLite, you only need to back up the `grafana.db` file. On Unix systems, the database file is usually located in `/var/lib/grafana/`. If you are unsure which database you use and where it is stored, check the Grafana configuration file. If you installed Grafana to a custom location using a binary tar/zip, the database is usually located in `/data`. -### mysql +### MySQL -To back up or restore a mysql Grafana database, run the following commands: +To back up or restore a MySQL Grafana database, run the following commands: ```bash backup: @@ -38,9 +38,9 @@ restore: > mysql -u root -p grafana < grafana_backup.sql ``` -### postgres +### Postgres -To back up or restore a postgres Grafana database, run the following commands: +To back up or restore a Postgres Grafana database, run the following commands: ```bash backup: @@ -84,7 +84,7 @@ To upgrade Grafana installed from the Grafana Labs APT repository, complete the This enables you to upgrade Grafana without the risk of losing your configuration changes. -1. Run the following command. +1. Run the following commands: ```bash sudo apt-get update @@ -105,9 +105,9 @@ To upgrade Grafana installed from the binary `.tar.gz` package, complete the fol 1. Extract the downloaded package and overwrite the existing files. -### Centos or RHEL +### CentOS or RHEL -To upgrade Grafana running on Centos or RHEL, complete the following steps: +To upgrade Grafana running on CentOS or RHEL, complete the following steps: 1. In your current installation of Grafana, save your custom configuration changes to a file named `/conf/custom.ini`. @@ -130,7 +130,7 @@ To upgrade Grafana running in a Docker container, complete the following steps: This enables you to upgrade Grafana without the risk of losing your configuration changes. -1. Run a command similar to the following command. +1. Run a commands similar to the following commands. > **Note:** This is an example. The parameters you enter depend on how you configured your Grafana container. diff --git a/docs/sources/upgrade-guide/upgrade-v8.1/index.md b/docs/sources/upgrade-guide/upgrade-v8.1/index.md index 39b6ff7941c..00500cc4e6d 100644 --- a/docs/sources/upgrade-guide/upgrade-v8.1/index.md +++ b/docs/sources/upgrade-guide/upgrade-v8.1/index.md @@ -1,6 +1,4 @@ --- -aliases: - description: Guide for upgrading to Grafana v8.1 keywords: - grafana diff --git a/docs/sources/upgrade-guide/upgrade-v8.2/index.md b/docs/sources/upgrade-guide/upgrade-v8.2/index.md index 2bb3efe4d78..9dade2c4934 100644 --- a/docs/sources/upgrade-guide/upgrade-v8.2/index.md +++ b/docs/sources/upgrade-guide/upgrade-v8.2/index.md @@ -1,6 +1,4 @@ --- -aliases: - description: Guide for upgrading to Grafana v8.2 keywords: - grafana diff --git a/docs/sources/upgrade-guide/upgrade-v8.3/index.md b/docs/sources/upgrade-guide/upgrade-v8.3/index.md index da7aeaa4777..eee581bcb51 100644 --- a/docs/sources/upgrade-guide/upgrade-v8.3/index.md +++ b/docs/sources/upgrade-guide/upgrade-v8.3/index.md @@ -1,6 +1,4 @@ --- -aliases: - description: Guide for upgrading to Grafana v8.3 keywords: - grafana diff --git a/docs/sources/upgrade-guide/upgrade-v8.4/index.md b/docs/sources/upgrade-guide/upgrade-v8.4/index.md index 1c2d48e845e..30e0bf54af7 100644 --- a/docs/sources/upgrade-guide/upgrade-v8.4/index.md +++ b/docs/sources/upgrade-guide/upgrade-v8.4/index.md @@ -1,6 +1,4 @@ --- -aliases: - description: Guide for upgrading to Grafana v8.4 keywords: - grafana diff --git a/docs/sources/upgrade-guide/upgrade-v8.5/index.md b/docs/sources/upgrade-guide/upgrade-v8.5/index.md index acc32d1c0e1..5f0f06a64f8 100644 --- a/docs/sources/upgrade-guide/upgrade-v8.5/index.md +++ b/docs/sources/upgrade-guide/upgrade-v8.5/index.md @@ -1,6 +1,4 @@ --- -aliases: - description: Guide for upgrading to Grafana v8.5 keywords: - grafana diff --git a/docs/sources/upgrade-guide/upgrade-v9.0/index.md b/docs/sources/upgrade-guide/upgrade-v9.0/index.md index ca5d3dddd36..421baff697c 100644 --- a/docs/sources/upgrade-guide/upgrade-v9.0/index.md +++ b/docs/sources/upgrade-guide/upgrade-v9.0/index.md @@ -1,6 +1,4 @@ --- -aliases: - description: Guide for upgrading to Grafana v9.0 keywords: - grafana diff --git a/docs/sources/upgrade-guide/upgrade-v9.1/index.md b/docs/sources/upgrade-guide/upgrade-v9.1/index.md index 0cf929786f3..900b121c3a8 100644 --- a/docs/sources/upgrade-guide/upgrade-v9.1/index.md +++ b/docs/sources/upgrade-guide/upgrade-v9.1/index.md @@ -1,6 +1,4 @@ --- -aliases: - description: Guide for upgrading to Grafana v9.1 keywords: - grafana diff --git a/docs/sources/upgrade-guide/upgrade-v9.2/index.md b/docs/sources/upgrade-guide/upgrade-v9.2/index.md index 65329f84790..b4dda29c704 100644 --- a/docs/sources/upgrade-guide/upgrade-v9.2/index.md +++ b/docs/sources/upgrade-guide/upgrade-v9.2/index.md @@ -1,6 +1,4 @@ --- -aliases: - description: Guide for upgrading to Grafana v9.2 keywords: - grafana diff --git a/docs/sources/upgrade-guide/upgrade-v9.3/index.md b/docs/sources/upgrade-guide/upgrade-v9.3/index.md index 4a7015373fe..6d74bbbacfa 100644 --- a/docs/sources/upgrade-guide/upgrade-v9.3/index.md +++ b/docs/sources/upgrade-guide/upgrade-v9.3/index.md @@ -1,7 +1,4 @@ --- -aliases: - - ../installation/upgrading/ - - ../setup-grafana/upgrade-grafana/ description: Guide for upgrading to Grafana v9.3 keywords: - grafana diff --git a/docs/sources/upgrade-guide/upgrade-v9.4/index.md b/docs/sources/upgrade-guide/upgrade-v9.4/index.md index b1cc24df4a7..d8fbc3e73ed 100644 --- a/docs/sources/upgrade-guide/upgrade-v9.4/index.md +++ b/docs/sources/upgrade-guide/upgrade-v9.4/index.md @@ -1,7 +1,4 @@ --- -aliases: - - ../installation/upgrading/ - - ../setup-grafana/upgrade-grafana/ description: Guide for upgrading to Grafana v9.4 keywords: - grafana