From bda60f3458f7de6886be0c723b80e8937e56e477 Mon Sep 17 00:00:00 2001 From: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> Date: Mon, 8 Nov 2021 11:43:34 -0500 Subject: [PATCH] Updated a few install topics with references to "Hosted Grafana" (#41106) --- docs/sources/installation/debian.md | 6 +++--- docs/sources/installation/docker.md | 6 ++---- docs/sources/installation/mac.md | 2 +- docs/sources/installation/rpm.md | 8 ++++---- docs/sources/whatsnew/whats-new-in-v7-5.md | 2 +- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index ad0bc53c541..1a352329c2e 100644 --- a/docs/sources/installation/debian.md +++ b/docs/sources/installation/debian.md @@ -10,11 +10,11 @@ weight = 200 This page explains how to install Grafana dependencies, download and install Grafana, get the service up and running on your Debian or Ubuntu system, and also describes the installation package details. -**Note on upgrading:** While the process for upgrading Grafana is very similar to installing Grafana, there are some key backup steps you should perform. Read [Upgrading Grafana]({{< relref "upgrading.md" >}}) for tips and guidance on updating an existing installation. +## Note on upgrading -## Hosted Grafana +While the process for upgrading Grafana is very similar to installing Grafana, there are some key backup steps you should perform. Read [Upgrading Grafana]({{< relref "upgrading.md" >}}) for tips and guidance on updating an existing installation. -You can run Grafana on your own hardware or use [Grafana Cloud](https://grafana.com/products/cloud/features/#cloud-dashboards-grafana) and get Grafana without the overhead of installing, maintaining, and scaling your observability stack. The free forever plan includes Grafana, 10K Prometheus series, 50 GB logs and more. [Create a free account to get started](https://grafana.com/auth/sign-up/create-user?pg=docs-grafana-install&plcmt=in-text). +> **Note:** You can use [Grafana Cloud](https://grafana.com/products/cloud/features/#cloud-logs) to avoid the overhead of installing, maintaining, and scaling your observability stack. The free forever plan includes Grafana, 10K Prometheus series, 50 GB logs, and more.[Create a free account to get started](https://grafana.com/auth/sign-up/create-user?pg=docs-grafana-install&plcmt=in-text). ## 1. Download and install diff --git a/docs/sources/installation/docker.md b/docs/sources/installation/docker.md index 7da62401838..fbb80fa3eed 100755 --- a/docs/sources/installation/docker.md +++ b/docs/sources/installation/docker.md @@ -16,11 +16,9 @@ You can install and run Grafana using the official Docker images. Our docker ima Each edition is available in two variants: Alpine and Ubuntu. See below. -This page also contains important information about [migrating from earlier Docker image versions](#migrate-from-previous-docker-containers-versions). +This topic also contains important information about [migrating from earlier Docker image versions](#migrate-from-previous-docker-containers-versions). -## Hosted Grafana - -You can run Grafana on your own hardware or use [Grafana Cloud](https://grafana.com/products/cloud/features/#cloud-dashboards-grafana) and get Grafana without the overhead of installing, maintaining, and scaling your observability stack. The free forever plan includes Grafana, 10K Prometheus series, 50 GB logs and more. [Create a free account to get started](https://grafana.com/auth/sign-up/create-user?pg=docs-grafana-docker&plcmt=in-text). +> **Note:** You can use [Grafana Cloud](https://grafana.com/products/cloud/features/#cloud-logs) to avoid the overhead of installing, maintaining, and scaling your observability stack. The free forever plan includes Grafana, 10K Prometheus series, 50 GB logs, and more.[Create a free account to get started](https://grafana.com/auth/sign-up/create-user?pg=docs-grafana-install&plcmt=in-text). ## Alpine image (recommended) diff --git a/docs/sources/installation/mac.md b/docs/sources/installation/mac.md index 7a33572e301..722eb3d2fd4 100755 --- a/docs/sources/installation/mac.md +++ b/docs/sources/installation/mac.md @@ -25,7 +25,7 @@ Use [Homebrew](http://brew.sh/) to install the most recent released version of G The brew page downloads and untars the files into: - - `/usr/local/Cellar/grafana/[version]` (if using Homebrew v2) + - `/usr/local/Cellar/grafana/[version]` (Homebrew v2) - `/opt/homebrew/Cellar/grafana/[version]` (Homebrew v3) 1. Start Grafana using the command: diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md index e02a71e8375..870d7935d74 100755 --- a/docs/sources/installation/rpm.md +++ b/docs/sources/installation/rpm.md @@ -8,13 +8,13 @@ weight = 300 # Install on RPM-based Linux (CentOS, Fedora, OpenSuse, Red Hat) -This page explains how to install Grafana dependencies, download and install Grafana, get the service up and running on your RPM-based Linux system, and the installation package details. +This topic explains how to install Grafana dependencies, download and install Grafana, get the service up and running on your RPM-based Linux system, and the installation package details. -**Note on upgrading:** While the process for upgrading Grafana is very similar to installing Grafana, there are some key backup steps you should perform. Read [Upgrading Grafana]({{< relref "upgrading.md" >}}) for tips and guidance on updating an existing installation. +## Note on upgrading -## Hosted Grafana +While the process for upgrading Grafana is very similar to installing Grafana, there are some key backup steps you should perform. Read [Upgrading Grafana]({{< relref "upgrading.md" >}}) for tips and guidance on updating an existing installation. -You can run Grafana on your own hardware or use [Grafana Cloud](https://grafana.com/products/cloud/features/#cloud-dashboards-grafana) and get Grafana without the overhead of installing, maintaining, and scaling your observability stack. The free forever plan includes Grafana, 10K Prometheus series, 50 GB logs and more. [Create a free account to get started](https://grafana.com/auth/sign-up/create-user?pg=docs-grafana-install&plcmt=in-text). +> **Note:** You can use [Grafana Cloud](https://grafana.com/products/cloud/features/#cloud-logs) to avoid the overhead of installing, maintaining, and scaling your observability stack. The free forever plan includes Grafana, 10K Prometheus series, 50 GB logs, and more.[Create a free account to get started](https://grafana.com/auth/sign-up/create-user?pg=docs-grafana-install&plcmt=in-text). ## 1. Download and install diff --git a/docs/sources/whatsnew/whats-new-in-v7-5.md b/docs/sources/whatsnew/whats-new-in-v7-5.md index 77c18fc1507..f66b95827f0 100644 --- a/docs/sources/whatsnew/whats-new-in-v7-5.md +++ b/docs/sources/whatsnew/whats-new-in-v7-5.md @@ -64,7 +64,7 @@ Previously, when users wanted to configure the Postgres data source to connect w Instead of the file path, users can now paste the SSL certification content in the UI. This allows them to configure the certification even when they do not have access to the server. -> **Note:** It remains as limitation for the hosted Grafana, because the user doesn't have access to the server configuration. +> **Note:** It remains as limitation for the Grafana Cloud, as users may not have access to the server configuration. [Postgres data source]({{< relref "../datasources/postgres.md" >}}) and [Provisioning]({{< relref "../administration/provisioning.md" >}}) were updated as a result of this change.