From 77f06f29f908ed6f3eebbf37183be572ca0e0a68 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Fri, 23 Jun 2023 14:38:29 -0500 Subject: [PATCH] [v10.0.x] Docs: removes-yum (#70642) Docs: removes-yum (#70634) * removes-yum * Update docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com> * Update docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com> * Update docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com> * incorporates feedback * adds GPG key step * removes duplicate addrepo command --------- Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com> (cherry picked from commit 262af2c47364591a68206d212205d5b2676f8b13) Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> --- .../installation/debian/index.md | 10 ++++++---- .../installation/redhat-rhel-fedora/index.md | 20 +++++++------------ .../installation/suse-opensuse/index.md | 7 +++++++ 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/docs/sources/setup-grafana/installation/debian/index.md b/docs/sources/setup-grafana/installation/debian/index.md index 1c6ad00506d..66348b1e2c4 100644 --- a/docs/sources/setup-grafana/installation/debian/index.md +++ b/docs/sources/setup-grafana/installation/debian/index.md @@ -58,19 +58,21 @@ Complete the following steps to install Grafana from the APT repository: 1. Run the following command to update the list of available packages: ```bash - # Update the list of available packages + # Updates the list of available packages sudo apt-get update ``` -1. Run one of the following commands to install the OSS or Enterprise release: +1. To install Grafana OSS, run the following command: ```bash - # To install the latest OSS release: + # Installs the latest OSS release: sudo apt-get install grafana ``` +1. To install Grafana Enterprise, run the following command: + ```bash - # To install the latest Enterprise release: + # Installs the latest Enterprise release: sudo apt-get install grafana-enterprise ``` diff --git a/docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md b/docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md index d01ab2510c8..df96961b64a 100644 --- a/docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md +++ b/docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md @@ -9,13 +9,13 @@ weight: 200 This topic explains how to install Grafana dependencies, install Grafana on RHEL or Fedora, and start the Grafana server on your system. -You can install Grafana using a YUM repository, using RPM, or by downloading a binary `.tar.gz` file. +You can install Grafana from the RPM repository, from standalone RPM, or with the binary `.tar.gz` file. If you install via RPM or the `.tar.gz` file, then you must manually update Grafana for each new version. -## Install Grafana from the YUM repository +## Install Grafana from the RPM repository -If you install from the YUM repository, then Grafana is automatically updated every time you run `sudo yum update`. +If you install from the RPM repository, then Grafana is automatically updated every time you update your applications. | Grafana Version | Package | Repository | | ------------------ | ------------------ | ------------------------- | @@ -26,7 +26,7 @@ If you install from the YUM repository, then Grafana is automatically updated ev Grafana Enterprise is the recommended and default edition. It is available for free and includes all the features of the OSS edition. You can also upgrade to the [full Enterprise feature set](/products/enterprise/?utm_source=grafana-install-page), which has support for [Enterprise plugins](/grafana/plugins/?enterprise=1&utcm_source=grafana-install-page). {{% /admonition %}} -To install Grafana using a YUM repository, complete the following steps: +To install Grafana from the RPM repository, complete the following steps: 1. Import the GPG key: @@ -35,13 +35,7 @@ To install Grafana using a YUM repository, complete the following steps: sudo rpm --import gpg.key ``` -1. Add a file to your YUM repository using the method of your choice. - - The following example uses `nano` to add a file to the YUM repo. - - ```bash - sudo nano /etc/yum.repos.d/grafana.repo - ``` +1. Create `/etc/yum.repos.d/grafana.repo` with the following content: ```bash [grafana] @@ -64,13 +58,13 @@ To install Grafana using a YUM repository, complete the following steps: 1. To install Grafana OSS, run the following command: ```bash - sudo yum install grafana + sudo dnf install grafana ``` 1. To install Grafana Enterprise, run the following command: ```bash - sudo yum install grafana-enterprise + sudo dnf install grafana-enterprise ``` ## Install the Grafana RPM package manually diff --git a/docs/sources/setup-grafana/installation/suse-opensuse/index.md b/docs/sources/setup-grafana/installation/suse-opensuse/index.md index a5ced20e8a0..98c7eb56dbd 100644 --- a/docs/sources/setup-grafana/installation/suse-opensuse/index.md +++ b/docs/sources/setup-grafana/installation/suse-opensuse/index.md @@ -28,6 +28,13 @@ Grafana Enterprise is the recommended and default edition. It is available for f To install Grafana using the RPM repository, complete the following steps: +1. Import the GPG key: + + ```bash + wget -q -O gpg.key https://rpm.grafana.com/gpg.key + sudo rpm --import gpg.key + ``` + 1. Use zypper to add the grafana repo. ```bash