Installing on Linux
+Install on Linux
}}" class="nav-cards__item nav-cards__item--install"> -Installing on macOS
+Install on macOS
- }}" class="nav-cards__item nav-cards__item--install"> + }}" class="nav-cards__item nav-cards__item--install"> -Installing on Windows
+Install on Windows
+ + }}" class="nav-cards__item nav-cards__item--install"> +Run Docker image
+Run Grafana on a Docker image.
diff --git a/docs/sources/administration/image_rendering.md b/docs/sources/administration/image_rendering.md
index 02bd81ee095..0f9781f393b 100755
--- a/docs/sources/administration/image_rendering.md
+++ b/docs/sources/administration/image_rendering.md
@@ -10,11 +10,11 @@ weight = 8
# Image rendering
-Grafana supports automatic rendering of panels and dashboards as PNG images. This allows Grafana to automatically generate images of your panels to include in alert [Notifications]({{ < relref "../alerting/notifications.md" >}}).
+Grafana supports automatic rendering of panels and dashboards as PNG images. This allows Grafana to automatically generate images of your panels to include in [alert notifications]({{< relref "../alerting/notifications.md" >}}).
When an image is being rendered the PNG-image is temporarily written to the file system. When an image is rendered, the PNG image is temporary written to the `png` folder in the Grafana `data` folder.
-A background job runs every 10 minutes and removes temporary images. You can configure how long an image should be stored before being removed by configuring the [temp-data-lifetime]({{ < relref "/installation/configuration/#temp-data-lifetime" > }}) setting.
+A background job runs every 10 minutes and removes temporary images. You can configure how long an image should be stored before being removed by configuring the [temp-data-lifetime]({{< relref "../installation/configuration/#temp-data-lifetime" >}}) setting.
You can also render a PNG by clicking the dropdown arrow next to a panel title, then clicking **Share > Direct link rendered image**.
@@ -22,7 +22,7 @@ You can also render a PNG by clicking the dropdown arrow next to a panel title,
Minimum free memory recommendation is 16GB on the system doing the rendering.
-Rendering images can require a lot of memory, mainly because Grafama creates browser instances in the background for the actual rendering. If multiple images are rendered in parallel, then the rendering has a bigger memory footprint. One advantage of using the remote rendering service is that the rendering will be done on the remote system, so your local system resources will not be affected by rendering.
+Rendering images can require a lot of memory, mainly because Grafana creates browser instances in the background for the actual rendering. If multiple images are rendered in parallel, then the rendering has a bigger memory footprint. One advantage of using the remote rendering service is that the rendering will be done on the remote system, so your local system resources will not be affected by rendering.
## Alerting and render limits
@@ -36,9 +36,9 @@ To install the plugin, refer to the [Grafana Image Renderer Installation instruc
## Run in custom Grafana Docker image
- We recommend setting up another Docker container for rendering and using remote rendering. Refer to [Remote rendering service](#remote-rendering-service) for instructions.
+ We recommend setting up another Docker container for rendering and using remote rendering. Refer to [Remote rendering service]({{< relref "#remote-rendering-service" >}}) for instructions.
-If you still want to install the plugin in the Grafana Docker image, refer to [Build with Grafana Image Renderer plugin pre-installed]({{ < relref "/installation/docker/#build-with-grafana-image-renderer-plugin-pre-installed" > }}).
+If you still want to install the plugin in the Grafana Docker image, refer to [Build with Grafana Image Renderer plugin pre-installed]({{< relref "../installation/docker/#build-with-grafana-image-renderer-plugin-pre-installed" >}}).
## Remote rendering service
diff --git a/docs/sources/alerting/metrics.md b/docs/sources/alerting/metrics.md
index b3f348c8891..4bb40185b5a 100644
--- a/docs/sources/alerting/metrics.md
+++ b/docs/sources/alerting/metrics.md
@@ -11,7 +11,7 @@ weight = 2
# Metrics from the alert engine
-The alert engine publishes some internal metrics about itself. You can read more about how Grafana publishes [internal metrics]({{ < "../administration/metrics/" > }}).
+The alert engine publishes some internal metrics about itself. You can read more about how Grafana publishes [internal metrics]({{< relref "../administration/metrics/" >}}).
Description | Type | Metric name
---------- | ----------- | ----------
diff --git a/docs/sources/enterprise/_index.md b/docs/sources/enterprise/_index.md
index 1bf53a83329..e17b2825ef8 100755
--- a/docs/sources/enterprise/_index.md
+++ b/docs/sources/enterprise/_index.md
@@ -11,49 +11,44 @@ weight = 30
# Grafana Enterprise
-Grafana Enterprise is a commercial edition of Grafana that includes additional features not found in the open source
-version.
+Grafana Enterprise is a commercial edition of Grafana that includes additional features not found in the open source version.
-Building on everything you already know and love about Grafana, Grafana Enterprise adds enterprise data sources,
-advanced authentication options, more permission controls, 24x7x365 support, and training from the core Grafana team.
+Building on everything you already know and love about Grafana, Grafana Enterprise adds enterprise data sources, advanced authentication options, more permission controls, 24x7x365 support, and training from the core Grafana team.
Grafana Enterprise includes all of the features found in the open source edition and more.
-___
-
-### Enhanced LDAP Integration
+## Enhanced LDAP Integration
With Grafana Enterprise you can set up synchronization between LDAP Groups and Teams. [Learn More]({{< relref "../auth/enhanced_ldap.md" >}}).
-### SAML Authentication
+## SAML Authentication
-Enables your Grafana Enterprise users to authenticate with SAML. [Learn More]({{< relref "../auth/saml.md" >}}).
+Enables your Grafana Enterprise users to authenticate with SAML. [Learn More]({{< relref "saml.md" >}}).
-### Team Sync
+## Team Sync
-Team Sync allows you to setup synchronization between teams in Grafana and teams in your auth provider so that your users automatically end up in the right team. [Learn More]({{< relref "../auth/team-sync.md" >}}).
+Team Sync allows you to setup synchronization between teams in Grafana and teams in your auth provider so that your users automatically end up in the right team. [Learn More]({{< relref "team-sync.md" >}}).
Supported auth providers:
-* [LDAP]({{< relref "../auth/enhanced_ldap.md#ldap-group-synchronization-for-teams" >}})
+* [LDAP]({{< relref "enhanced_ldap.md#ldap-group-synchronization-for-teams" >}})
* [GitHub OAuth]({{< relref "../auth/github.md#team-sync-enterprise-only" >}})
* [GitLab OAuth]({{< relref "../auth/gitlab.md#team-sync-enterprise-only" >}})
* [Auth Proxy]({{< relref "../auth/auth-proxy.md#team-sync-enterprise-only">}})
-### White labeling
+## White labeling
White labeling makes it possible to customize the logos and footer links of Grafana. [Learn More]({{< relref "white-labeling.md" >}}).
+## Data source permissions
-### Data source permissions
+Data source permissions allow you to restrict query access to only specific Teams and Users. [Learn More]({{< relref "datasource_permissions.md" >}}).
-Data source permissions allow you to restrict query access to only specific Teams and Users. [Learn More]({{< relref "../permissions/datasource_permissions.md" >}}).
+## Reporting
-### Reporting
+Reporting makes it possible to take any dashboard, generate a PDF report, and set up a schedule to have it delivered. [Learn More]({{< relref "reporting.md" >}}).
-Reporting makes it possible to take any dashboard, generate a PDF report, and set up a schedule to have it delivered. [Learn More]({{< relref "../features/reporting.md" >}}).
-
-### Enterprise Plugins
+## Enterprise Plugins
With a Grafana Enterprise license you will get access to enterprise plugins, including:
@@ -67,8 +62,7 @@ With a Grafana Enterprise license you will get access to enterprise plugins, inc
## Try Grafana Enterprise
-You can learn more about Grafana Enterprise [here](https://grafana.com/enterprise). To purchase or obtain a trial license contact
-the Grafana Labs [Sales Team](https://grafana.com/contact?about=support&topic=Grafana%20Enterprise).
+You can learn more about Grafana Enterprise [here](https://grafana.com/enterprise). To purchase or obtain a trial license contact the Grafana Labs [Sales Team](https://grafana.com/contact?about=support&topic=Grafana%20Enterprise).
## License file management
@@ -88,4 +82,3 @@ license_path = /company/secrets/license.jwt
This setting can also be set via ENV variable which is useful if you're running Grafana via docker and have a custom
volume where you have placed the license file. In this case set the ENV variable `GF_ENTERPRISE_LICENSE_PATH` to point
to the location of your license file.
-
diff --git a/docs/sources/features/datasources/add-a-data-source.md b/docs/sources/features/datasources/add-a-data-source.md
new file mode 100644
index 00000000000..7902cd665e5
--- /dev/null
+++ b/docs/sources/features/datasources/add-a-data-source.md
@@ -0,0 +1,29 @@
++++
+title = "Add a data source"
+type = "docs"
+[menu.docs]
+name = "Add a data source"
+identifier = "add_data_source"
+parent = "features"
+weight = 2
++++
+
+# Add a data source
+
+Before you create your first dashboard, you need to add your data source. Following are the list of instructions to create one.
+
+1. Move your cursor to the cog on the side menu which will show you the configuration menu. If the side menu is not visible click the Grafana icon in the upper left corner. Click on **Configuration** > **Data Sources** in the side menu and you'll be taken to the data sources page
+ where you can add add and edit data sources. You can also click the cog.
+{{< docs-imagebox img="/img/docs/v52/sidemenu-datasource.png" max-width="250px" class="docs-image--no-shadow">}}
+
+1. Click **Add data source** and you will come to the settings page of your new data source.
+
+ {{< docs-imagebox img="/img/docs/v52/add-datasource.png" max-width="700px" class="docs-image--no-shadow">}}
+
+1. In the **Name** box, enter a name for this data source.
+
+ {{< docs-imagebox img="/img/docs/v52/datasource-settings.png" max-width="700px" class="docs-image--no-shadow">}}
+
+1. In the **Type**, select the type of data source. See [Supported data sources]({{< relref "../../features/datasources/#supported-data-sources/" >}}) for more information and how to configure your data source.
+
+1. Click **Save & Test**.
\ No newline at end of file
diff --git a/docs/sources/features/datasources/data-sources.md b/docs/sources/features/datasources/data-sources.md
index d09ac9083e2..1a728f61dd9 100644
--- a/docs/sources/features/datasources/data-sources.md
+++ b/docs/sources/features/datasources/data-sources.md
@@ -11,7 +11,7 @@ weight = 1
# Data sources
-Grafana can visualize, explore, and alert on data from many different databases and cloud services. Each database or service type is accessed from a *data source*.
+Grafana can visualize, explore, and alert on data from many different databases and cloud services. Each database or service type is accessed from a *data source*. Before you can create visualizations in Grafana, you must [add a data source]({{< relref "add-a-data-source.md" >}}).
Each data source has a specific query editor that is customized for the features and capabilities that the particular data source exposes. The query language and capabilities of each data source are obviously very different. You can combine data from multiple data sources into a single dashboard, but each panel is connected to a specific data source that belongs to a particular organization.
diff --git a/docs/sources/guides/getting_started.md b/docs/sources/guides/getting_started.md
index 94a048e1cd4..97c3755281c 100755
--- a/docs/sources/guides/getting_started.md
+++ b/docs/sources/guides/getting_started.md
@@ -13,7 +13,7 @@ weight = 100
# Getting started
-This guide will help you get started and acquainted with Grafana.
+This guide will help you get started and acquainted with Grafana. To learn more about Grafana in general, refer to [What is Grafana?]({{< relref "what-is-grafana.md" >}}).
## Install Grafana
@@ -35,29 +35,9 @@ This step varies according to your computer operating system. Refer to the instr
Congratulations, you have gotten started with Grafana! You have a dashboard and are displaying results. Feel free to experiment with what you have built, continue on to add another data source, or explore [Next steps](#next-steps).
-## Add a data source
-
-{{< docs-imagebox img="/img/docs/v52/sidemenu-datasource.png" max-width="250px" class="docs-image--right docs-image--no-shadow">}}
-
-Before you create your first real dashboard, you need to add your data source.
-
-First move your cursor to the cog on the side menu which will show you the configuration menu. If the side menu is not visible click the Grafana icon in the upper left corner. The first item on the configuration menu is data sources, click on that and you'll be taken to the data sources page where you can add and edit data sources. You can also simply click the cog.
-
-
-Click Add data source and you will come to the settings page of your new data source.
-
-{{< docs-imagebox img="/img/docs/v52/add-datasource.png" max-width="700px" class="docs-image--no-shadow">}}
-
-First, give the data source a Name and then select which Type of data source you'll want to create, see [Supported data sources]({{< relref "../features/datasources/#supported-data-sources/" >}}) for more information and how to configure your data source.
-
-
-{{< docs-imagebox img="/img/docs/v52/datasource-settings.png" max-width="700px" class="docs-image--no-shadow">}}
-
-After you have configured your data source you are ready to save and test.
-
## Next steps
-There is so much you can do in Grafana, it can be hard to know where to begin. Your next steps will be different depending on whether you are using Grafana just for yourself or if you are an administrating Grafana for an organization.
+Different user types will have different interests. Some suggestions are listed below, or refer to [What is Grafana?]({{< relref "what-is-grafana.md" >}}) for a general overview of Grafana features.
### All users
@@ -65,6 +45,7 @@ All users might want to learn about:
* [Panels]({{< relref "../features/panels/panels.md" >}})
* [Dashboards]({{< relref "../features/dashboard/dashboards.md" >}})
+* [Data sources]({{< relref "../features/datasources/data-sources.md" >}}) and [Add a data source]({{< relref "../features/datasources/add-a-data-source.md" >}})
* [Keyboard shortcuts]({{< relref "../features/shortcuts.md" >}})
* [Explore workflow]({{< relref "../features/explore/index.md" >}})
* [Plugins](https://grafana.com/grafana/plugins?orderBy=weight&direction=asc)
diff --git a/docs/sources/guides/what-is-grafana.md b/docs/sources/guides/what-is-grafana.md
new file mode 100644
index 00000000000..d66dd1f4d63
--- /dev/null
+++ b/docs/sources/guides/what-is-grafana.md
@@ -0,0 +1,93 @@
++++
+title = "What is Grafana?"
+description = "Overview of Grafana and features"
+keywords = ["grafana", "intro", "guide", "started"]
+type = "docs"
+[menu.docs]
+name = "What is Grafana?"
+identifier = "what_is_grafana"
+parent = "guides"
+weight = 200
++++
+
+# What is Grafana?
+
+This topic provides a high-level look at Grafana, the Grafana process, and Grafana features. It's a good place to start if you want to learn more about Grafana software. To jump right in, refer to [Getting started]({{< relref "getting_started.md" >}}).
+
+Grafana is open source visualization and analytics software. It allows you to query, visualize, alert on, and explore your metrics no matter where they are stored. In plain English, it provides you with tools to turn your time-series database (TSDB) data into beautiful graphs and visualizations.
+
+After creating a dashboard like you do in [Getting started]({{< relref "getting_started.md" >}}), there are many possible things you might do next. It all depends on your needs and your use case.
+
+For example, if you want to view weather data and statistics about your smart home, then you might create a playlist. If you are the administrator for a corporation and are managing Grafana for multiple teams, then you might need to set up provisioning and authentication.
+
+The following sections provide an overview of things you might want to do with your Grafana database and links so you can learn more. For more guidance and ideas, check out the [Grafana Community forums](https://community.grafana.com/).
+
+## Explore metrics and logs
+
+Explore your data through ad-hoc queries and dynamic drilldown. Split view and compare different time ranges, queries and data sources side by side.
+
+Refer to [Explore]({{< relref "../features/explore/index.md" >}}) for more information.
+
+## Alerts
+
+If you're using Grafana alerting, then you can have alerts sent through a number of different [alert notifiers]({{< relref "../alerting/notifications.md" >}}), including PagerDuty, SMS, email, VictorOps, OpsGenie, or Slack.
+
+Alert hooks allow you to create different notifiers with a bit of code if you prefer some other channels of communication. Visually define [alert rules]({{< relref "../alerting/rules.md" >}}) for your most important metrics.
+
+## Annotations
+
+Annotate graphs with rich events from different data sources. Hover over events to see the full event metadata and tags.
+
+This feature, which shows up as a graph marker in Grafana, is useful for correlating data in case something goes wrong. You can create the annotations manually—just control-click on a graph and input some text—or you can fetch data from any data source.
+
+Refer to [Annotations]({{< relref "../reference/annotations.md" >}}) for more information.
+
+## Dashboard variables
+
+[Template variables]({{< relref "../reference/templating.md" >}}) allow you to create dashboards that can be reused for lots of different use cases. Values aren't hard-coded with these templates, so for instance, if you have a production server and a test server, you can use the same dashboard for both.
+
+Templating allows you to drill down into your data, say, from all data to North America data, down to Texas data, and beyond. You can also share these dashboards across teams within your organization—or if you create a great dashboard template for a popular data source, you can contribute it to the whole community to customize and use.
+
+## Configure Grafana
+
+If you're a Grafana administrator, then you'll want to thoroughly familiarize yourself with [Grafana configuration options]({{< relref "../installation/configuration.md" >}}) and the [Grafana CLI]({{< relref "../administration/cli.md" >}}).
+
+Configuration covers both config files and environment variables. You can set up default ports, logging levels, email IP addresses, security, and more.
+
+## Import dashboards and plugins
+
+Discover hundreds of [dashboards](https://grafana.com/grafana/dashboards) and [plugins](https://grafana.com/grafana/plugins) in the official library. Thanks to the passion and momentum of community members, new ones are added every week.
+
+## Authentication
+
+Grafana supports different authentication methods, such as LDAP and OAuth, and allows you to map users to organizations. Refer to the [User authentication overview]({{< relref "../auth/overview.md" >}}) for more information.
+
+In Grafana Enterprise, you can also map users to teams: If your company has its own authentication system, Grafana allows you to map the teams in your internal systems to teams in Grafana. That way, you can automatically give people access to the dashboards designated for their teams.
+
+Refer to [Grafana Enterprise]({{< relref "../enterprise/_index.md" >}}) for more information.
+
+## Provisioning
+
+While it's easy to click, drag, and drop to create a single dashboard, power users in need of many dashboards will want to automate the setup with a script. You can script anything in Grafana.
+
+For example, if you're spinning up a new Kubernetes cluster, you can also spin up a Grafana automatically with a script that would have the right server, IP address, and data sources preset and locked in so users cannot change them. It's also a way of getting control over a lot of dashboards.
+
+Refer to [Provisioning]({{< relref "../administration/provisioning.md" >}}) for more information.
+
+## Permissions
+
+When organizations have one Grafana and multiple teams, they often want the ability to both keep things separate and share dashboards. You can create a team of users and then set [permissions]({{< relref "../permissions/overview.md" >}}) on folders, dashboards, and down to the [data source level]({{< relref "../enterprise/datasource_permissions.md" >}}) if you're using [Grafana Enterprise]({{< relref "../enterprise/_index.md" >}}).
+
+## Grafana Cloud
+
+Grafana Cloud is a highly available, fast, fully managed OpenSaaS logging and metrics platform. Everything you love about Grafana, but Grafana Labs hosts it for you and handles all the headaches.
+
+[Learn more about Grafana Cloud.](https://grafana.com/cloud/)
+
+## Grafana Enterprise
+
+[Grafana Enterprise]({{< relref "../enterprise/_index.md" >}}) is a commercial edition of Grafana that includes additional features not found in the open source version.
+
+Building on everything you already know and love about Grafana, Grafana Enterprise adds enterprise data sources, advanced authentication options, more permission controls, 24x7x365 support, and training from the core Grafana team.
+
+[Learn more about Grafana Enterprise](https://grafana.com/enterprise). To purchase Enterprise or obtain a trial license, contact the Grafana Labs [Sales Team](https://grafana.com/contact?about=support&topic=Grafana%20Enterprise).
diff --git a/docs/sources/menu.yaml b/docs/sources/menu.yaml
index 6e846766110..fd0c41bce0a 100644
--- a/docs/sources/menu.yaml
+++ b/docs/sources/menu.yaml
@@ -1,6 +1,8 @@
- name: Getting started
link: /guides/
children:
+ - name: What is Grafana?
+ link: /guides/what-is-grafana/
- name: Getting started
link: /guides/getting_started/
- name: Intro to time series
@@ -68,7 +70,7 @@
- link: /permissions/dashboard_folder_permissions/
name: Dashboard and Folder
- link: /permissions/datasource_permissions/
- name: Datasource
+ name: Data source
- name: Grafana CLI
link: /administration/cli/
- name: Internal metrics
@@ -141,6 +143,8 @@
- name: Data Sources
link: /features/datasources/
children:
+ - link: /features/datasources/add-data-source/
+ name: Add data source
- link: /features/datasources/cloudwatch/
name: AWS Cloudwatch
- link: /features/datasources/azuremonitor/
@@ -168,7 +172,7 @@
- link: /features/datasources/prometheus/
name: Prometheus
- link: /features/datasources/testdata/
- name: Testdata
+ name: TestData DB
- name: Explore
link: /features/explore/
- name: Alerting