From bbaf6a23bbb0d2c423eb3304781c57029e2df9be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 27 Aug 2021 10:46:45 +0200 Subject: [PATCH] Docs: Add info and links about our hosted services to our grafana install docs (#38544) * Add info and links about our hosted services to our grafana install docs * review updates * Update docs/sources/installation/debian.md Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com> Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com> --- docs/sources/datasources/loki.md | 6 +++++- docs/sources/datasources/prometheus.md | 4 ++++ docs/sources/installation/debian.md | 10 +++++++--- docs/sources/installation/docker.md | 4 ++++ docs/sources/installation/rpm.md | 10 ++++++++-- 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/docs/sources/datasources/loki.md b/docs/sources/datasources/loki.md index 85c98fdf3fa..b2863011828 100644 --- a/docs/sources/datasources/loki.md +++ b/docs/sources/datasources/loki.md @@ -12,7 +12,9 @@ Grafana ships with built-in support for Loki, an open source log aggregation sys Add it as a data source and you are ready to build dashboards or query your log data in [Explore]({{< relref "../explore" >}}). Refer to [Add a data source]({{< relref "add-a-data-source.md" >}}) for instructions on how to add a data source to Grafana. Only users with the organization admin role can add data sources. -> **Note:** To troubleshoot configuration and other issues, check the log file located at /var/log/grafana/grafana.log on Unix systems or in /data/log on other platforms and manual installations. +## Hosted Loki + +You can run Loki on your own hardware or use [Grafana Cloud](https://grafana.com/products/cloud/features/#cloud-logs). The free forever plan includes Grafana, 50 GB of Loki logs, 10K Prometheus series, and more. [Create a free account to get started](https://grafana.com/auth/sign-up/create-user?pg=docs-grafana-loki&plcmt=in-text). ## Loki settings @@ -26,6 +28,8 @@ To access Loki settings, click the **Configuration** (gear) icon, then click **D | `Whitelisted Cookies` | Grafana Proxy deletes forwarded cookies by default. Specify cookies by name that should be forwarded to the data source. | | `Maximum lines` | Upper limit for the number of log lines returned by Loki (default is 1000). Lower this limit if your browser is sluggish when displaying logs in Explore. | +> **Note:** To troubleshoot configuration and other issues, check the log file located at /var/log/grafana/grafana.log on Unix systems or in /data/log on other platforms and manual installations. + ### Derived fields The Derived Fields configuration allows you to: diff --git a/docs/sources/datasources/prometheus.md b/docs/sources/datasources/prometheus.md index 18d6e8ed579..6691a0fdd40 100644 --- a/docs/sources/datasources/prometheus.md +++ b/docs/sources/datasources/prometheus.md @@ -10,6 +10,10 @@ weight = 1300 Grafana includes built-in support for Prometheus. This topic explains options, variables, querying, and other options specific to the Prometheus data source. Refer to [Add a data source]({{< relref "add-a-data-source.md" >}}) for instructions on how to add a data source to Grafana. Only users with the organization admin role can add data sources. +## Hosted Prometheus + +Run Prometheus on your own hardware or use [Grafana Cloud](https://grafana.com/products/cloud/features/#cloud-dashboards-grafana). 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=doc-grafana-&plcmt=in-text). + ## Prometheus settings To access Prometheus settings, hover your mouse over the **Configuration** (gear) icon, then click **Data Sources**, and then click the Prometheus data source. diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index 013293455f8..2afebef3dfa 100644 --- a/docs/sources/installation/debian.md +++ b/docs/sources/installation/debian.md @@ -12,6 +12,10 @@ This page explains how to install Grafana dependencies, download and install Gra **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. +## 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-install&plcmt=in-text). + ## 1. Download and install You can install Grafana using our official APT repository, by downloading a `.deb` package, or by downloading a binary `.tar.gz` file. @@ -22,12 +26,12 @@ If you install from the APT repository, then Grafana is automatically updated ev | Grafana Version | Package | Repository | | ------------------------- | ------------------ | --------------------------------------------------------- | -| Grafana OSS | grafana | `https://packages.grafana.com/oss/deb stable main` | -| Grafana OSS (Beta) | grafana | `https://packages.grafana.com/oss/deb beta main` | | Grafana Enterprise | grafana-enterprise | `https://packages.grafana.com/enterprise/deb stable main` | | Grafana Enterprise (Beta) | grafana-enterprise | `https://packages.grafana.com/enterprise/deb beta main` | +| Grafana OSS | grafana | `https://packages.grafana.com/oss/deb stable main` | +| Grafana OSS (Beta) | grafana | `https://packages.grafana.com/oss/deb beta main` | -> We recommend all users install the Enterprise Edition of Grafana, which can be seamlessly upgraded with a Grafana Enterprise [subscription](https://grafana.com/products/enterprise/?utm_source=grafana-install-page). +> **Note:** 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](https://grafana.com/products/enterprise/?utm_source=grafana-install-page), which has support for [Enterprise plugins](https://grafana.com/grafana/plugins/?enterprise=1&utcm_source=grafana-install-page). #### To install the latest Enterprise edition: diff --git a/docs/sources/installation/docker.md b/docs/sources/installation/docker.md index ffda52df0c3..89193f8986b 100755 --- a/docs/sources/installation/docker.md +++ b/docs/sources/installation/docker.md @@ -11,6 +11,10 @@ You can install and run Grafana using the official Docker image. It comes in two This page 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). + ## Alpine image (recommended) `grafana/grafana:` diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md index 4ea4eb2ad33..b2ec4936381 100755 --- a/docs/sources/installation/rpm.md +++ b/docs/sources/installation/rpm.md @@ -12,6 +12,10 @@ This page explains how to install Grafana dependencies, download and install Gra **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. +## 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-install&plcmt=in-text). + ## 1. Download and install You can install Grafana from a YUM repository, manually using YUM, manually using RPM, or by downloading a binary `.tar.gz` file. @@ -22,10 +26,12 @@ If you install from the YUM repository, then Grafana is automatically updated ev | Grafana Version | Package | Repository | | ------------------------- | ------------------ | -------------------------------------------------- | -| Grafana OSS | grafana | `https://packages.grafana.com/oss/rpm` | -| Grafana OSS (Beta) | grafana | `https://packages.grafana.com/oss/rpm-beta` | | Grafana Enterprise | grafana-enterprise | `https://packages.grafana.com/enterprise/rpm` | | Grafana Enterprise (Beta) | grafana-enterprise | `https://packages.grafana.com/enterprise/rpm-beta` | +| Grafana OSS | grafana | `https://packages.grafana.com/oss/rpm` | +| Grafana OSS (Beta) | grafana | `https://packages.grafana.com/oss/rpm-beta` | + +> **Note:** 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](https://grafana.com/products/enterprise/?utm_source=grafana-install-page) and has support for [Enterprise plugins](https://grafana.com/grafana/plugins/?enterprise=1&utcm_source=grafana-install-page). Add a new file to your YUM repo using the method of your choice. The command below uses `nano`.