\ No newline at end of file
diff --git a/docs/sources/best-practices/best-practices-for-creating-dashboards.md b/docs/sources/best-practices/best-practices-for-creating-dashboards.md
index c9034348c28..f6153585276 100644
--- a/docs/sources/best-practices/best-practices-for-creating-dashboards.md
+++ b/docs/sources/best-practices/best-practices-for-creating-dashboards.md
@@ -1,10 +1,6 @@
+++
title = "Best practices for creating dashboards"
description = "Best practices for creating dashboards in Grafana"
-type = "docs"
-[menu.docs]
-identifier = "best-practices-for-creating-dashboards"
-parent = "best-practices"
weight = 100
+++
@@ -49,7 +45,7 @@ Once you have a strategy or design guidelines, write them down to help maintain
- If you create many related dashboards, think about how to cross-reference them for easy navigation. Refer to [Best practices for managing dashboards]({{< relref "best-practices-for-managing-dashboards.md" >}}) for more information.
- Grafana retrieves data from a data source. A basic understanding of [data sources]({{< relref "../datasources/_index.md" >}}) in general and your specific is important.
- Avoid unnecessary dashboard refreshing to reduce the load on the network or backend. For example, if your data changes every hour, then you don't need to set the dashboard refresh rate to 30 seconds.
-- Use the left and right Y-axes when displaying time series with different units or ranges.
+- Use the left and right Y-axes when displaying time series with different units or ranges.
- Add documentation to dashboards and panels.
- To add documentation to a dashboard, add a [Text panel visualization]({{< relref "../panels/visualizations/text-panel.md" >}}) to the dashboard. Record things like the purpose of the dashboard, useful resource links, and any instructions users might need to interact with the dashboard. Check out this [Wikimedia example](https://grafana.wikimedia.org/d/000000066/resourceloader?orgId=1).
- To add documentation to a panel, [edit the panel settings]({{< relref "../panels/add-a-panel.md#edit-panel-settings" >}}) and add a description. Any text you add will appear if you hover your cursor over the small `i` in the top left corner of the panel.
diff --git a/docs/sources/best-practices/best-practices-for-managing-dashboards.md b/docs/sources/best-practices/best-practices-for-managing-dashboards.md
index 448eaf7513c..d3208b1f9ad 100644
--- a/docs/sources/best-practices/best-practices-for-managing-dashboards.md
+++ b/docs/sources/best-practices/best-practices-for-managing-dashboards.md
@@ -1,10 +1,6 @@
+++
title = "Best practices for managing dashboards"
description = "Best practices for managing dashboards in Grafana"
-type = "docs"
-[menu.docs]
-identifier = "best-practices-for-managing-dashboards"
-parent = "best-practices"
weight = 200
+++
@@ -18,7 +14,7 @@ Here are some principles to consider before you start managing dashboards.
### Strategic observability
-There are several [common observability strategies]({{< relref "common-observability-strategies.md" >}}). You should research them and decide whether one of them works for you or if you want to come up with your own. Either way, have a plan, write it down, and stick to it.
+There are several [common observability strategies]({{< relref "common-observability-strategies.md" >}}). You should research them and decide whether one of them works for you or if you want to come up with your own. Either way, have a plan, write it down, and stick to it.
Adapt your strategy to changing needs as necessary.
diff --git a/docs/sources/best-practices/common-observability-strategies.md b/docs/sources/best-practices/common-observability-strategies.md
index f5ffd641e86..c5d97796375 100644
--- a/docs/sources/best-practices/common-observability-strategies.md
+++ b/docs/sources/best-practices/common-observability-strategies.md
@@ -3,10 +3,6 @@ title = "Common observability strategies"
description = "Common observability strategies"
keywords = ["grafana", "intro", "guide", "concepts", "methods"]
aliases = ["/docs/grafana/latest/getting-started/strategies/"]
-type = "docs"
-[menu.docs]
-identifier = "common-observability-strategies"
-parent = "best-practices"
weight = 300
+++
@@ -19,7 +15,7 @@ A logical strategy allows you to make uniform dashboards and scale your observab
## Guidelines for usage
- The USE method tells you how happy your machines are, the RED method tells you how happy your users are.
-- USE reports on causes of issues.
+- USE reports on causes of issues.
- RED reports on user experience and is more likely to report symptoms of problems.
- The best practice of alerting is to alert on symptoms rather than causes, so alerting should be done on RED dashboards.
diff --git a/docs/sources/best-practices/dashboard-management-maturity-levels.md b/docs/sources/best-practices/dashboard-management-maturity-levels.md
index 51c56cb0fd0..46f8a653011 100644
--- a/docs/sources/best-practices/dashboard-management-maturity-levels.md
+++ b/docs/sources/best-practices/dashboard-management-maturity-levels.md
@@ -1,10 +1,6 @@
+++
title = "Dashboard management maturity model"
description = "Explanation of dashboard management maturity model"
-type = "docs"
-[menu.docs]
-identifier = "best-management-for-maturity-model"
-parent = "best-practices"
weight = 400
+++
@@ -35,8 +31,8 @@ At this stage, you are starting to manage your dashboard use with methodical das
How can you tell you are here?
-- Prevent sprawl by using template variables. For example, you don't need a separate dashboard for each node, you can use query variables. Even better, you can make the data source a template variable too, so you can reuse the same dashboard across different clusters and monitoring backends.
-
+- Prevent sprawl by using template variables. For example, you don't need a separate dashboard for each node, you can use query variables. Even better, you can make the data source a template variable too, so you can reuse the same dashboard across different clusters and monitoring backends.
+
Refer to the list of [Variable examples]({{< relref "../variables/variable-examples.md" >}}) if you want some ideas.
- Methodical dashboards according to an [observability strategy]({{< relref "common-observability-strategies.md" >}}).
@@ -49,7 +45,7 @@ How can you tell you are here?
{{< imgbox max-width="100%" img="/img/docs/best-practices/service-hierarchy-example.png" caption="Example of a service hierarchy" >}}
- Compare like to like: split service dashboards when the magnitude differs. Make sure aggregated metrics don't drown out important information.
-- Expressive charts with meaningful use of color and normalizing axes where you can.
+- Expressive charts with meaningful use of color and normalizing axes where you can.
- Example of meaningful color: Blue means it's good, red means it's bad. [Thresholds]({{< relref "../panels/thresholds.md" >}}) can help with that.
- Example of normalizing axes: When comparing CPU usage, measure by percentage rather than raw number, because machines can have a different number of cores. Normalizing CPU usage by the number of cores reduces cognitive load because the viewer can trust that at 100% all cores are being used, without having to know the number of CPUs.
- Directed browsing cuts down on "guessing."
diff --git a/docs/sources/dashboards/_index.md b/docs/sources/dashboards/_index.md
index 05502ce5b22..282e1dc7c1b 100644
--- a/docs/sources/dashboards/_index.md
+++ b/docs/sources/dashboards/_index.md
@@ -1,10 +1,7 @@
+++
-title = "Dashboard overview"
-type = "docs"
+title = "Dashboards"
aliases = ["/docs/grafana/latest/features/dashboard/dashboards/"]
-[menu.docs]
-identifier = "dashboards"
-weight = 100
+weight = 80
+++
# Dashboard overview
diff --git a/docs/sources/dashboards/annotations.md b/docs/sources/dashboards/annotations.md
index 32c4c3fd94d..8b57719ca47 100644
--- a/docs/sources/dashboards/annotations.md
+++ b/docs/sources/dashboards/annotations.md
@@ -1,11 +1,7 @@
+++
title = "Annotations"
keywords = ["grafana", "annotations", "documentation", "guide"]
-type = "docs"
aliases = ["/docs/grafana/latest/reference/annotations/"]
-[menu.docs]
-name = "Annotations"
-parent = "dashboard_features"
weight = 2
+++
diff --git a/docs/sources/dashboards/dashboard_folders.md b/docs/sources/dashboards/dashboard_folders.md
index a88a01cdff6..e910ff75cae 100644
--- a/docs/sources/dashboards/dashboard_folders.md
+++ b/docs/sources/dashboards/dashboard_folders.md
@@ -1,11 +1,7 @@
+++
title = "Dashboard Folders"
keywords = ["grafana", "dashboard", "dashboard folders", "folder", "folders", "documentation", "guide"]
-type = "docs"
aliases = ["/docs/grafana/latest/reference/dashboard_folders/"]
-[menu.docs]
-name = "Folders"
-parent = "dashboard_features"
weight = 3
+++
diff --git a/docs/sources/dashboards/dashboard_history.md b/docs/sources/dashboards/dashboard_history.md
index 741986f0da4..45abe97107a 100644
--- a/docs/sources/dashboards/dashboard_history.md
+++ b/docs/sources/dashboards/dashboard_history.md
@@ -1,11 +1,7 @@
+++
title = "Dashboard Version History"
keywords = ["grafana", "dashboard", "documentation", "version", "history"]
-type = "docs"
aliases = ["/docs/grafana/latest/reference/dashboard_history/"]
-[menu.docs]
-name = "Dashboard Version History"
-parent = "dashboard_features"
weight = 100
+++
diff --git a/docs/sources/dashboards/export-import.md b/docs/sources/dashboards/export-import.md
index b37a5077840..5fe0f3ea01a 100644
--- a/docs/sources/dashboards/export-import.md
+++ b/docs/sources/dashboards/export-import.md
@@ -1,10 +1,7 @@
+++
title = "Export and import"
keywords = ["grafana", "dashboard", "documentation", "export", "import"]
-type = "docs"
aliases = ["/docs/grafana/latest/reference/export_import/"]
-[menu.docs]
-parent = "dashboard_features"
weight = 800
+++
@@ -30,7 +27,7 @@ the dashboard, and will also be added as a required input when the dashboard is
## Importing a dashboard
-To import a dashboard click the + icon in the side menu, and then click **Import**.
+To import a dashboard click the + icon in the side menu, and then click **Import**.
{{< docs-imagebox img="/img/docs/v70/import_step1.png" max-width="700px" >}}
diff --git a/docs/sources/dashboards/json-model.md b/docs/sources/dashboards/json-model.md
index f7807b2dce9..884818b39ca 100644
--- a/docs/sources/dashboards/json-model.md
+++ b/docs/sources/dashboards/json-model.md
@@ -1,11 +1,7 @@
+++
title = "JSON model"
keywords = ["grafana", "dashboard", "documentation", "json", "model"]
-type = "docs"
aliases = ["/docs/grafana/latest/reference/dashboard/"]
-[menu.docs]
-name = "JSON Model"
-parent = "dashboard_features"
weight = 1200
+++
diff --git a/docs/sources/dashboards/playlist.md b/docs/sources/dashboards/playlist.md
index 21ff4a32252..582486590a8 100644
--- a/docs/sources/dashboards/playlist.md
+++ b/docs/sources/dashboards/playlist.md
@@ -1,11 +1,7 @@
+++
title = "Playlist"
keywords = ["grafana", "dashboard", "documentation", "playlist"]
-type = "docs"
aliases = ["/docs/grafana/latest/reference/playlist/"]
-[menu.docs]
-parent = "dashboard_features"
-identifier = "feature_playlist"
weight = 4
+++
@@ -22,7 +18,7 @@ You can access the Playlist feature from Grafana's side menu, in the Dashboards
## Create a playlist
-You create a playlist to present dashboards in a sequence, with a set order and time interval between dashboards.
+You create a playlist to present dashboards in a sequence, with a set order and time interval between dashboards.
1. To access the Playlist feature, hover your cursor over Grafana's side menu.
1. Click **Playlists**.
@@ -32,7 +28,7 @@ You create a playlist to present dashboards in a sequence, with a set order and
The time interval is the amount of time for Grafana to stay on a particular dashboard before advancing to the next one on the playlist.
-1. Next to the dashboard(s) you want to add to your playlist, click **Add to playlist**.
+1. Next to the dashboard(s) you want to add to your playlist, click **Add to playlist**.
1. Click **Create**.
## Edit a playlist
@@ -46,7 +42,7 @@ You can edit playlists while creating them or after saving them.
### Edit the Name of a playlist
1. Double-click within the **Name** text box.
-1. Enter a name.
+1. Enter a name.
1. Click **Save** to save your changes.
### Edit the Interval of a playlist
@@ -62,9 +58,9 @@ You can edit playlists while creating them or after saving them.
### Search for a dashboard to add
-1. Click the **Search dashboards by name** text box.
-1. Search for the playlist by name or regular expression.
-1. If needed, filter your results by starred status or tags.
+1. Click the **Search dashboards by name** text box.
+1. Search for the playlist by name or regular expression.
+1. If needed, filter your results by starred status or tags.
By default, your starred dashboards will appear as options to add to the Playlist.
1. Click **Save** to save your changes.
@@ -85,18 +81,18 @@ You can edit playlists while creating them or after saving them.
## Save a playlist
-You can save a playlist to add it to your **Playlists** page, where you can start it. Be sure that all the dashboards you want to appear in your playlist are added when creating or editing the playlist before saving it.
+You can save a playlist to add it to your **Playlists** page, where you can start it. Be sure that all the dashboards you want to appear in your playlist are added when creating or editing the playlist before saving it.
1. To access the Playlist feature, hover your cursor over Grafana's side menu.
1. Click **Playlists**.
1. Click on the playlist.
1. Edit the playlist.
* Ensure that your playlist has a **Name**, **Interval**, and at least one **Dashboard** added to it.
-1. Click **Save**.
+1. Click **Save**.
## Start a playlist
-You can start a playlist in five different view modes, which determine how the menus and navigation bar are displayed on the dashboards.
+You can start a playlist in five different view modes, which determine how the menus and navigation bar are displayed on the dashboards.
By default, each dashboard is displayed for the amount of time entered in the Interval field, which can be set while creating or editing a playlist. Once a playlist is started, it can be controlled using the navbar at the top of your screen.
@@ -104,24 +100,24 @@ By default, each dashboard is displayed for the amount of time entered in the In
1. Next to the playlist you want to start, click **Start playlist**.
1. In the dropdown, select the mode you want the playlist to display in.
- **Normal mode:**
- - The side menu remains visible.
+ - The side menu remains visible.
- The navbar, row and panel controls appear at the top of the screen.
- **TV mode:**
- - The side menu is hidden/removed.
+ - The side menu is hidden/removed.
- The navbar, row and panel controls appear at the top of the screen.
- Enabled automatically after one minute of user inactivity.
- - You can enable it manually using the `d v` sequence shortcut, or by appending the parameter `?inactive` to the dashboard URL.
- - You can disable it with any mouse movement or keyboard action.
- - **TV mode (with auto fit panels):**
- - The side menu is hidden/removed.
+ - You can enable it manually using the `d v` sequence shortcut, or by appending the parameter `?inactive` to the dashboard URL.
+ - You can disable it with any mouse movement or keyboard action.
+ - **TV mode (with auto fit panels):**
+ - The side menu is hidden/removed.
- The navbar, row and panel controls appear at the top of the screen.
- Dashboard panels automatically adjust to optimize space on screen.
- - **Kiosk mode:**
- - The side menu, navbar, row and panel controls are completely hidden/removed from view.
+ - **Kiosk mode:**
+ - The side menu, navbar, row and panel controls are completely hidden/removed from view.
- You can enable it manually using the `d v` sequence shortcut after the playlist has started.
- You can disable it manually with the same shortcut.
- - **Kiosk mode (with auto fit panels):**
- - The side menu, navbar, row and panel controls are completely hidden/removed from view.
+ - **Kiosk mode (with auto fit panels):**
+ - The side menu, navbar, row and panel controls are completely hidden/removed from view.
- Dashboard panels automatically adjust to optimize space on screen.
## Control a playlist
@@ -141,12 +137,12 @@ You can control a playlist in **Normal** or **TV** mode after it's started, usin
## Share a playlist in a view mode
-You can share a playlist by copying the link address on the view mode you prefer, and pasting the URL to your destination.
+You can share a playlist by copying the link address on the view mode you prefer, and pasting the URL to your destination.
1. From the Dashboards submenu, click **Playlists**.
1. Next to the playlist you want to share, click **Start playlist**.
1. In the dropdown, right click the view mode you prefer.
-1. Click **Copy Link Address** to copy the URL to your clipboard.
+1. Click **Copy Link Address** to copy the URL to your clipboard.
Example: The URL for the first playlist on the Grafana Play site in Kiosk mode will look like this:
[https://play.grafana.org/playlists/play/1?kiosk](https://play.grafana.org/playlists/play/1?kiosk).
diff --git a/docs/sources/dashboards/reporting.md b/docs/sources/dashboards/reporting.md
index 7209eac7adc..6f70d585fa4 100644
--- a/docs/sources/dashboards/reporting.md
+++ b/docs/sources/dashboards/reporting.md
@@ -2,10 +2,7 @@
title = "Reporting"
description = ""
keywords = ["grafana", "reporting"]
-type = "docs"
aliases = ["/docs/grafana/latest/administration/reports"]
-[menu.docs]
-parent = "features"
weight = 8
+++
diff --git a/docs/sources/dashboards/scripted-dashboards.md b/docs/sources/dashboards/scripted-dashboards.md
index 445e86c6ffa..9877a78591d 100644
--- a/docs/sources/dashboards/scripted-dashboards.md
+++ b/docs/sources/dashboards/scripted-dashboards.md
@@ -1,10 +1,7 @@
+++
title = "Scripted dashboards"
keywords = ["grafana", "dashboard", "documentation", "scripted"]
-type = "docs"
aliases = ["/docs/grafana/latest/reference/scripting/"]
-[menu.docs]
-parent = "dashboard_features"
weight = 1500
+++
diff --git a/docs/sources/dashboards/search.md b/docs/sources/dashboards/search.md
index 4556b32243a..20b00402434 100644
--- a/docs/sources/dashboards/search.md
+++ b/docs/sources/dashboards/search.md
@@ -1,10 +1,7 @@
+++
title = "Search"
keywords = ["grafana", "dashboard", "documentation", "search"]
-type = "docs"
aliases =["/docs/grafana/latest/reference/search/"]
-[menu.docs]
-parent = "dashboard_features"
weight = 5
+++
diff --git a/docs/sources/dashboards/share-dashboard.md b/docs/sources/dashboards/share-dashboard.md
index d606353da6c..475c3391c02 100644
--- a/docs/sources/dashboards/share-dashboard.md
+++ b/docs/sources/dashboards/share-dashboard.md
@@ -1,10 +1,7 @@
+++
title = "Share dashboard"
keywords = ["grafana", "dashboard", "documentation", "sharing"]
-type = "docs"
aliases = ["/docs/grafana/latest/reference/share_dashboard/"]
-[menu.docs]
-parent = "dashboard_features"
weight = 500
+++
diff --git a/docs/sources/dashboards/share-panel.md b/docs/sources/dashboards/share-panel.md
index bb571303bf5..fab3949417c 100644
--- a/docs/sources/dashboards/share-panel.md
+++ b/docs/sources/dashboards/share-panel.md
@@ -1,10 +1,7 @@
+++
title = "Share panel"
keywords = ["grafana", "dashboard", "documentation", "sharing"]
-type = "docs"
aliases = ["/docs/grafana/latest/reference/share_panel/"]
-[menu.docs]
-parent = "dashboard_features"
weight = 600
+++
diff --git a/docs/sources/dashboards/shortcuts.md b/docs/sources/dashboards/shortcuts.md
index e2e8e5e5ef6..cd63e625df6 100644
--- a/docs/sources/dashboards/shortcuts.md
+++ b/docs/sources/dashboards/shortcuts.md
@@ -1,8 +1,5 @@
+++
title = "Keyboard shortcuts"
-type = "docs"
-[menu.docs]
-parent = "features"
weight = 7
+++
diff --git a/docs/sources/dashboards/time-range-controls.md b/docs/sources/dashboards/time-range-controls.md
index 5236560b5ab..1ee581bd160 100644
--- a/docs/sources/dashboards/time-range-controls.md
+++ b/docs/sources/dashboards/time-range-controls.md
@@ -2,10 +2,6 @@
title = "Time range controls"
keywords = ["grafana", "dashboard", "documentation", "time range"]
aliases = ["/docs/grafana/latest/reference/timerange/"]
-type = "docs"
-[menu.docs]
-name = "Time range controls"
-parent = "dashboards"
weight = 7
+++
diff --git a/docs/sources/datasources/_index.md b/docs/sources/datasources/_index.md
index ef005b16f35..598af8b5cab 100644
--- a/docs/sources/datasources/_index.md
+++ b/docs/sources/datasources/_index.md
@@ -1,12 +1,7 @@
+++
title = "Data sources"
-type = "docs"
aliases = ["/docs/grafana/latest/datasources/overview/"]
-[menu.docs]
-name = "Data sources"
-identifier = "datasources"
-parent = "features"
-weight = 50
+weight = 60
+++
# Data sources
diff --git a/docs/sources/datasources/add-a-data-source.md b/docs/sources/datasources/add-a-data-source.md
index e000b320702..3c3372ca791 100644
--- a/docs/sources/datasources/add-a-data-source.md
+++ b/docs/sources/datasources/add-a-data-source.md
@@ -1,11 +1,6 @@
+++
title = "Add data source"
-type = "docs"
aliases = ["/docs/grafana/latest/features/datasources/add-a-data-source/"]
-[menu.docs]
-name = "Add a data source"
-identifier = "add_data_source"
-parent = "features"
weight = 100
+++
@@ -23,7 +18,7 @@ Before you create your first dashboard, you need to add your data source. Follow
{{< 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.
+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">}}
diff --git a/docs/sources/datasources/azuremonitor.md b/docs/sources/datasources/azuremonitor.md
index 0348b420547..4340de1cece 100644
--- a/docs/sources/datasources/azuremonitor.md
+++ b/docs/sources/datasources/azuremonitor.md
@@ -2,11 +2,7 @@
title = "Azure Monitor"
description = "Guide for using Azure Monitor in Grafana"
keywords = ["grafana", "microsoft", "azure", "monitor", "application", "insights", "log", "analytics", "guide"]
-type = "docs"
aliases = ["/docs/grafana/latest/features/datasources/azuremonitor"]
-[menu.docs]
-name = "Azure Monitor"
-parent = "datasources"
weight = 300
+++
diff --git a/docs/sources/datasources/cloudmonitoring.md b/docs/sources/datasources/cloudmonitoring.md
index 496d3f9a093..2d80e29b553 100644
--- a/docs/sources/datasources/cloudmonitoring.md
+++ b/docs/sources/datasources/cloudmonitoring.md
@@ -2,11 +2,7 @@
title = "Cloud Monitoring"
description = "Guide for using Google Cloud Monitoring in Grafana"
keywords = ["grafana", "stackdriver", "google", "guide", "cloud", "monitoring"]
-type = "docs"
aliases = ["/docs/grafana/latest/features/datasources/stackdriver", "/docs/grafana/latest/features/datasources/cloudmonitoring/"]
-[menu.docs]
-name = "Google Cloud Monitoring"
-parent = "datasources"
weight = 200
+++
diff --git a/docs/sources/datasources/cloudwatch.md b/docs/sources/datasources/cloudwatch.md
index 1aa011a44f7..01ab6433d65 100644
--- a/docs/sources/datasources/cloudwatch.md
+++ b/docs/sources/datasources/cloudwatch.md
@@ -2,12 +2,7 @@
title = "AWS CloudWatch"
description = "Guide for using CloudWatch in Grafana"
keywords = ["grafana", "cloudwatch", "guide"]
-type = "docs"
aliases = ["/docs/grafana/latest/datasources/cloudwatch"]
-[menu.docs]
-name = "AWS Cloudwatch"
-identifier = "cloudwatch"
-parent = "datasources"
weight = 200
+++
diff --git a/docs/sources/datasources/elasticsearch.md b/docs/sources/datasources/elasticsearch.md
index 4a96529175f..e4e2629c896 100644
--- a/docs/sources/datasources/elasticsearch.md
+++ b/docs/sources/datasources/elasticsearch.md
@@ -2,11 +2,7 @@
title = "Elasticsearch"
description = "Guide for using Elasticsearch in Grafana"
keywords = ["grafana", "elasticsearch", "guide"]
-type = "docs"
aliases = ["/docs/grafana/latest/features/datasources/elasticsearch"]
-[menu.docs]
-name = "Elasticsearch"
-parent = "datasources"
weight = 400
+++
@@ -95,7 +91,7 @@ For example, if you're using a default setup of Filebeat for shipping logs to El
Data links create a link from a specified field that can be accessed in logs view in Explore.
-Each data link configuration consists of:
+Each data link configuration consists of:
- **Field -** Name of the field used by the data link.
- **URL/query -** If the link is external, then enter the full link URL. If the link is internal link, then this input serves as query for the target data source. In both cases, you can interpolate the value from the field with `${__value.raw }` macro.
- **Internal link -** Select if the link is internal or external. In case of internal link, a data source selector allows you to select the target data source. Only tracing data sources are supported.
diff --git a/docs/sources/datasources/graphite.md b/docs/sources/datasources/graphite.md
index 9a74c278c27..59f6b4d6e64 100644
--- a/docs/sources/datasources/graphite.md
+++ b/docs/sources/datasources/graphite.md
@@ -2,12 +2,7 @@
title = "Graphite"
description = "Guide for using graphite in Grafana"
keywords = ["grafana", "graphite", "guide"]
-type = "docs"
aliases = ["/docs/grafana/latest/features/datasources/graphite"]
-[menu.docs]
-name = "Graphite"
-identifier = "graphite"
-parent = "datasources"
weight = 600
+++
diff --git a/docs/sources/datasources/influxdb.md b/docs/sources/datasources/influxdb.md
index 4e53a76155f..314ef69639f 100644
--- a/docs/sources/datasources/influxdb.md
+++ b/docs/sources/datasources/influxdb.md
@@ -2,11 +2,7 @@
title = "InfluxDB"
description = "Guide for using InfluxDB in Grafana"
keywords = ["grafana", "influxdb", "guide", "flux"]
-type = "docs"
aliases = ["/docs/grafana/latest/features/datasources/influxdb"]
-[menu.docs]
-name = "InfluxDB"
-parent = "datasources"
weight = 700
+++
@@ -68,7 +64,7 @@ Identifier | Description
{{< docs-imagebox img="/img/docs/v45/influxdb_query_still.png" class="docs-image--no-shadow" animated-gif="/img/docs/v45/influxdb_query.gif" >}}
-You can access the InfluxDB editor under the metrics tab when you are in the edit mode of the Graph or Singlestat panels.
+You can access the InfluxDB editor under the metrics tab when you are in the edit mode of the Graph or Singlestat panels.
Enter edit mode by clicking the panel title and clicking **Edit**. The editor allows you to select metrics and tags.
### Filter data (WHERE)
@@ -180,7 +176,7 @@ You can view the interpolated version of a query with the Query Inspector.
> Only available in Grafana v6.3+.
-Querying and displaying log data from InfluxDB is available in [Explore]({{< relref "../explore" >}}), and in the [logs panel]({{< relref "../panels/visualizations/logs-panel.md" >}}) in dashboards.
+Querying and displaying log data from InfluxDB is available in [Explore]({{< relref "../explore" >}}), and in the [logs panel]({{< relref "../panels/visualizations/logs-panel.md" >}}) in dashboards.
Select the InfluxDB data source, and then enter a query to display your logs.
### Log Queries
diff --git a/docs/sources/datasources/jaeger.md b/docs/sources/datasources/jaeger.md
index 7fb158924c0..a3ebe839e9e 100644
--- a/docs/sources/datasources/jaeger.md
+++ b/docs/sources/datasources/jaeger.md
@@ -2,11 +2,7 @@
title = "Jaeger"
description = "Guide for using Jaeger in Grafana"
keywords = ["grafana", "jaeger", "guide", "tracing"]
-type = "docs"
aliases = ["/docs/grafana/latest/features/datasources/jaeger"]
-[menu.docs]
-name = "Jaeger"
-parent = "datasources"
weight = 800
+++
diff --git a/docs/sources/datasources/loki.md b/docs/sources/datasources/loki.md
index d29189fd7fe..9809b7c94e1 100644
--- a/docs/sources/datasources/loki.md
+++ b/docs/sources/datasources/loki.md
@@ -2,11 +2,7 @@
title = "Loki"
description = "Guide for using Loki in Grafana"
keywords = ["grafana", "loki", "logging", "guide"]
-type = "docs"
aliases = ["/docs/grafana/latest/features/datasources/loki"]
-[menu.docs]
-name = "Loki"
-parent = "datasources"
weight = 800
+++
diff --git a/docs/sources/datasources/mssql.md b/docs/sources/datasources/mssql.md
index e81773ad736..410779fecb2 100644
--- a/docs/sources/datasources/mssql.md
+++ b/docs/sources/datasources/mssql.md
@@ -2,11 +2,7 @@
title = "Microsoft SQL Server"
description = "Guide for using Microsoft SQL Server in Grafana"
keywords = ["grafana", "MSSQL", "Microsoft", "SQL", "guide", "Azure SQL Database"]
-type = "docs"
aliases = ["/docs/grafana/latest/features/datasources/mssql/"]
-[menu.docs]
-name = "Microsoft SQL Server"
-parent = "datasources"
weight = 900
+++
diff --git a/docs/sources/datasources/mysql.md b/docs/sources/datasources/mysql.md
index 81327210ddb..f6769a6d4b3 100644
--- a/docs/sources/datasources/mysql.md
+++ b/docs/sources/datasources/mysql.md
@@ -2,11 +2,7 @@
title = "MySQL"
description = "Guide for using MySQL in Grafana"
keywords = ["grafana", "mysql", "guide"]
-type = "docs"
aliases = ["/docs/grafana/latest/features/datasources/mysql/"]
-[menu.docs]
-name = "MySQL"
-parent = "datasources"
weight = 1000
+++
diff --git a/docs/sources/datasources/opentsdb.md b/docs/sources/datasources/opentsdb.md
index e9994f312fe..75d884b53e3 100644
--- a/docs/sources/datasources/opentsdb.md
+++ b/docs/sources/datasources/opentsdb.md
@@ -2,11 +2,7 @@
title = "OpenTSDB"
description = "Guide for using OpenTSDB in Grafana"
keywords = ["grafana", "opentsdb", "guide"]
-type = "docs"
aliases = ["/docs/grafana/latest/features/opentsdb", "/docs/grafana/latest/features/datasources/opentsdb/"]
-[menu.docs]
-name = "OpenTSDB"
-parent = "datasources"
weight = 1100
+++
diff --git a/docs/sources/datasources/postgres.md b/docs/sources/datasources/postgres.md
index b7d9af94fa1..4904f8b8444 100644
--- a/docs/sources/datasources/postgres.md
+++ b/docs/sources/datasources/postgres.md
@@ -2,11 +2,7 @@
title = "PostgreSQL"
description = "Guide for using PostgreSQL in Grafana"
keywords = ["grafana", "postgresql", "guide"]
-type = "docs"
aliases = ["/docs/grafana/latest/features/datasources/postgres/"]
-[menu.docs]
-name = "PostgreSQL"
-parent = "datasources"
weight = 1200
+++
diff --git a/docs/sources/datasources/prometheus.md b/docs/sources/datasources/prometheus.md
index ce11f9eb027..6302b2ecd84 100644
--- a/docs/sources/datasources/prometheus.md
+++ b/docs/sources/datasources/prometheus.md
@@ -2,11 +2,7 @@
title = "Prometheus"
description = "Guide for using Prometheus in Grafana"
keywords = ["grafana", "prometheus", "guide"]
-type = "docs"
aliases = ["/docs/grafana/latest/features/datasources/prometheus"]
-[menu.docs]
-name = "Prometheus"
-parent = "datasources"
weight = 1300
+++
diff --git a/docs/sources/datasources/tempo.md b/docs/sources/datasources/tempo.md
index 06e949df772..49ba9bfea5a 100644
--- a/docs/sources/datasources/tempo.md
+++ b/docs/sources/datasources/tempo.md
@@ -2,11 +2,7 @@
title = "Tempo"
description = "High volume, minimal dependency trace storage. OSS tracing solution from Grafana Labs."
keywords = ["grafana", "tempo", "guide", "tracing"]
-type = "docs"
aliases = ["/docs/grafana/latest/features/datasources/tempo"]
-[menu.docs]
-name = "Tempo"
-parent = "datasources"
weight = 800
+++
diff --git a/docs/sources/datasources/testdata.md b/docs/sources/datasources/testdata.md
index 0d7e4310eda..fed671a3a2d 100644
--- a/docs/sources/datasources/testdata.md
+++ b/docs/sources/datasources/testdata.md
@@ -1,11 +1,7 @@
+++
title = "TestData"
keywords = ["grafana", "dashboard", "documentation", "panels", "testdata"]
-type = "docs"
aliases = ["/docs/grafana/latest/features/datasources/testdata"]
-[menu.docs]
-name = "TestData"
-parent = "datasources"
weight = 1400
+++
@@ -17,9 +13,9 @@ This makes it much easier to verify functionality since the data can be shared v
## Enable
-The `TestData DB` data source is not enabled by default. To enable it:
+The `TestData DB` data source is not enabled by default. To enable it:
-1. In the **Configuration** menu (small gear on the left side of the screen), click **Data Sources**.
+1. In the **Configuration** menu (small gear on the left side of the screen), click **Data Sources**.
1. Click **Add Data Source**.
1. Search and click `TestData DB`.
1. Click **Save & Test** to enable it.
@@ -39,7 +35,7 @@ Once you provided the numbers, `TestData DB` distributes them evenly based on th
## Dashboards
-`TestData DB` also contains some dashboards with examples.
+`TestData DB` also contains some dashboards with examples.
1. Click **Configuration** > **Data Sources** > **TestData DB** > **Dashboards**.
1. **Import** the **Simple Streaming Example** dashboard.
diff --git a/docs/sources/datasources/zipkin.md b/docs/sources/datasources/zipkin.md
index 1a02e9d25fb..f6daa62a98c 100644
--- a/docs/sources/datasources/zipkin.md
+++ b/docs/sources/datasources/zipkin.md
@@ -2,11 +2,7 @@
title = "Zipkin"
description = "Guide for using Zipkin in Grafana"
keywords = ["grafana", "zipkin", "guide", "tracing"]
-type = "docs"
aliases = ["/docs/grafana/latest/datasources/zipkin"]
-[menu.docs]
-name = "Zipkin"
-parent = "datasources"
weight = 1500
+++
@@ -36,7 +32,7 @@ Querying and displaying traces from Zipkin is available via [Explore]({{< relref
The Zipkin query editor allows you to query by trace ID directly or selecting a trace from trace selector. To query by trace ID, insert the ID into the text input.
-{{< docs-imagebox img="/img/docs/v70/zipkin-query-editor-open.png" class="docs-image--no-shadow" caption="Screenshot of the Zipkin query editor with trace selector expanded" >}}
+{{< docs-imagebox img="/img/docs/v70/zipkin-query-editor-open.png" class="docs-image--no-shadow" caption="Screenshot of the Zipkin query editor with trace selector expanded" >}}
Use the trace selector to pick particular trace from all traces logged in the time range you have selected in Explore. The trace selector has three levels of nesting:
1. The service you are interested in.
diff --git a/docs/sources/developers/_index.md b/docs/sources/developers/_index.md
index 20dec5156ae..6b523397bf2 100644
--- a/docs/sources/developers/_index.md
+++ b/docs/sources/developers/_index.md
@@ -1,7 +1,7 @@
+++
title = "Developers"
-type = "docs"
aliases = ["/docs/plugins/developing/"]
+weight = 190
+++
# Developers
diff --git a/docs/sources/developers/cla.md b/docs/sources/developers/cla.md
index 6f4678d71a8..8fd11240586 100644
--- a/docs/sources/developers/cla.md
+++ b/docs/sources/developers/cla.md
@@ -1,7 +1,6 @@
+++
title = "Contributor License Agreement (CLA)"
description = "Contributor License Agreement (CLA)"
-type = "docs"
aliases = ["/docs/grafana/latest/project/cla", "docs/contributing/cla.html"]
+++
diff --git a/docs/sources/developers/contribute.md b/docs/sources/developers/contribute.md
index c3a125b2da2..fcffb054d45 100644
--- a/docs/sources/developers/contribute.md
+++ b/docs/sources/developers/contribute.md
@@ -1,7 +1,6 @@
+++
title = "Contribute to Grafana"
keywords = ["grafana", "documentation", "developers", "resources"]
-type = "docs"
+++
# Contribute to Grafana
diff --git a/docs/sources/developers/plugins/_index.md b/docs/sources/developers/plugins/_index.md
index c8207ba2b12..0ebcfd4285d 100644
--- a/docs/sources/developers/plugins/_index.md
+++ b/docs/sources/developers/plugins/_index.md
@@ -1,6 +1,5 @@
+++
title = "Build a plugin."
-type = "docs"
+++
# Build a plugin
diff --git a/docs/sources/developers/plugins/add-authentication-for-data-source-plugins.md b/docs/sources/developers/plugins/add-authentication-for-data-source-plugins.md
index fce221e72b8..36bcccef666 100644
--- a/docs/sources/developers/plugins/add-authentication-for-data-source-plugins.md
+++ b/docs/sources/developers/plugins/add-authentication-for-data-source-plugins.md
@@ -1,6 +1,5 @@
+++
title = "Add authentication for data source plugins"
-type = "docs"
aliases = ["/docs/grafana/latest/plugins/developing/auth-for-datasources/", "/docs/grafana/latest/developers/plugins/authentication/"]
+++
diff --git a/docs/sources/developers/plugins/add-support-for-annotations.md b/docs/sources/developers/plugins/add-support-for-annotations.md
index 208e944d5f0..8fdb2cdb167 100644
--- a/docs/sources/developers/plugins/add-support-for-annotations.md
+++ b/docs/sources/developers/plugins/add-support-for-annotations.md
@@ -1,6 +1,5 @@
+++
title = "Add support for annotations"
-type = "docs"
+++
# Add support for annotations
diff --git a/docs/sources/developers/plugins/add-support-for-explore-queries.md b/docs/sources/developers/plugins/add-support-for-explore-queries.md
index d59a2177f94..1dc35b48945 100644
--- a/docs/sources/developers/plugins/add-support-for-explore-queries.md
+++ b/docs/sources/developers/plugins/add-support-for-explore-queries.md
@@ -1,6 +1,5 @@
+++
title = "Add support for Explore queries"
-type = "docs"
+++
# Add support for Explore queries
diff --git a/docs/sources/developers/plugins/add-support-for-variables.md b/docs/sources/developers/plugins/add-support-for-variables.md
index 086eca4b0d9..f1a55abc518 100644
--- a/docs/sources/developers/plugins/add-support-for-variables.md
+++ b/docs/sources/developers/plugins/add-support-for-variables.md
@@ -1,6 +1,5 @@
+++
title = "Add support for variables in plugins"
-type = "docs"
+++
# Add support for variables in plugins
diff --git a/docs/sources/developers/plugins/backend/_index.md b/docs/sources/developers/plugins/backend/_index.md
index 600e88ef269..2c4e18d02f6 100644
--- a/docs/sources/developers/plugins/backend/_index.md
+++ b/docs/sources/developers/plugins/backend/_index.md
@@ -1,7 +1,6 @@
+++
title = "Backend plugins"
keywords = ["grafana", "plugins", "backend", "plugin", "backend-plugins", "documentation"]
-type = "docs"
aliases = ["/docs/grafana/latest/plugins/developing/backend-plugins-guide/"]
+++
diff --git a/docs/sources/developers/plugins/backend/grafana-plugin-sdk-for-go.md b/docs/sources/developers/plugins/backend/grafana-plugin-sdk-for-go.md
index 8dde98e85e0..72d52085dac 100644
--- a/docs/sources/developers/plugins/backend/grafana-plugin-sdk-for-go.md
+++ b/docs/sources/developers/plugins/backend/grafana-plugin-sdk-for-go.md
@@ -1,7 +1,6 @@
+++
title = "Grafana Plugin SDK for Go"
keywords = ["grafana", "plugins", "backend", "plugin", "backend-plugins", "sdk", "documentation"]
-type = "docs"
+++
# Grafana plugin SDK for Go
diff --git a/docs/sources/developers/plugins/backend/plugin-protocol.md b/docs/sources/developers/plugins/backend/plugin-protocol.md
index 63ddc77544c..6abd367d6a1 100644
--- a/docs/sources/developers/plugins/backend/plugin-protocol.md
+++ b/docs/sources/developers/plugins/backend/plugin-protocol.md
@@ -1,7 +1,6 @@
+++
title = "Plugin protocol"
keywords = ["grafana", "plugins", "backend", "plugin", "backend-plugins", "documentation"]
-type = "docs"
+++
# Plugin protocol
diff --git a/docs/sources/developers/plugins/build-a-logs-data-source-plugin.md b/docs/sources/developers/plugins/build-a-logs-data-source-plugin.md
index 029d35dae09..7a46142f6ea 100644
--- a/docs/sources/developers/plugins/build-a-logs-data-source-plugin.md
+++ b/docs/sources/developers/plugins/build-a-logs-data-source-plugin.md
@@ -1,6 +1,5 @@
+++
title = "Build a logs data source plugin"
-type = "docs"
+++
# Build a logs data source plugin
diff --git a/docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md b/docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md
index d68d7e050c4..b9985c2a9a2 100644
--- a/docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md
+++ b/docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md
@@ -1,6 +1,5 @@
+++
title = "Build a streaming data source plugin"
-type = "docs"
+++
# Build a streaming data source plugin
diff --git a/docs/sources/developers/plugins/data-frames.md b/docs/sources/developers/plugins/data-frames.md
index e7d0f722569..faa23b0dcda 100644
--- a/docs/sources/developers/plugins/data-frames.md
+++ b/docs/sources/developers/plugins/data-frames.md
@@ -1,6 +1,5 @@
+++
title = "Data frames"
-type = "docs"
+++
# Data frames
diff --git a/docs/sources/developers/plugins/error-handling.md b/docs/sources/developers/plugins/error-handling.md
index c381077b2d7..c36ba32319c 100644
--- a/docs/sources/developers/plugins/error-handling.md
+++ b/docs/sources/developers/plugins/error-handling.md
@@ -1,6 +1,5 @@
+++
title = "Error handling"
-type = "docs"
+++
# Error handling
diff --git a/docs/sources/developers/plugins/legacy/_index.md b/docs/sources/developers/plugins/legacy/_index.md
index fdbc18cc04e..971ad735e27 100644
--- a/docs/sources/developers/plugins/legacy/_index.md
+++ b/docs/sources/developers/plugins/legacy/_index.md
@@ -1,6 +1,5 @@
+++
title = "Legacy plugins"
-type = "docs"
aliases = ["/docs/grafana/latest/plugins/development/", "/docs/grafana/latest/plugins/datasources/", "/docs/grafana/latest/plugins/apps/", "/docs/grafana/latest/plugins/panels/", "/docs/grafana/latest/plugins/developing/development/"]
+++
diff --git a/docs/sources/developers/plugins/legacy/apps.md b/docs/sources/developers/plugins/legacy/apps.md
index ad9728dfeed..d4da640a775 100644
--- a/docs/sources/developers/plugins/legacy/apps.md
+++ b/docs/sources/developers/plugins/legacy/apps.md
@@ -1,7 +1,6 @@
+++
title = "Legacy app plugins"
keywords = ["grafana", "plugins", "documentation"]
-type = "docs"
aliases = ["/docs/grafana/latest/plugins/developing/apps/"]
+++
diff --git a/docs/sources/developers/plugins/legacy/data-sources.md b/docs/sources/developers/plugins/legacy/data-sources.md
index f6fcce44061..77ec4f13273 100644
--- a/docs/sources/developers/plugins/legacy/data-sources.md
+++ b/docs/sources/developers/plugins/legacy/data-sources.md
@@ -1,7 +1,6 @@
+++
title = "Legacy data source plugins"
keywords = ["grafana", "plugins", "documentation"]
-type = "docs"
aliases = ["/docs/grafana/latest/plugins/developing/datasources/"]
+++
diff --git a/docs/sources/developers/plugins/legacy/defaults-and-editor-mode.md b/docs/sources/developers/plugins/legacy/defaults-and-editor-mode.md
index 5a8e907404b..a8ec4bf4b6d 100644
--- a/docs/sources/developers/plugins/legacy/defaults-and-editor-mode.md
+++ b/docs/sources/developers/plugins/legacy/defaults-and-editor-mode.md
@@ -1,6 +1,5 @@
+++
title = "Legacy defaults and editor mode"
-type = "docs"
aliases = ["/docs/grafana/latest/plugins/developing/defaults-and-editor-mode/"]
+++
diff --git a/docs/sources/developers/plugins/legacy/panels.md b/docs/sources/developers/plugins/legacy/panels.md
index a2af7700ce4..0b6ecac406b 100644
--- a/docs/sources/developers/plugins/legacy/panels.md
+++ b/docs/sources/developers/plugins/legacy/panels.md
@@ -1,7 +1,6 @@
+++
title = "Legacy panel plugins"
keywords = ["grafana", "plugins", "panel", "documentation"]
-type = "docs"
aliases = ["/docs/grafana/latest/plugins/developing/panels/"]
+++
diff --git a/docs/sources/developers/plugins/legacy/review-guidelines.md b/docs/sources/developers/plugins/legacy/review-guidelines.md
index b0d93a3d2b4..7449b5f6318 100644
--- a/docs/sources/developers/plugins/legacy/review-guidelines.md
+++ b/docs/sources/developers/plugins/legacy/review-guidelines.md
@@ -1,6 +1,5 @@
+++
title = "Legacy review guidelines"
-type = "docs"
aliases = ["/docs/grafana/latest/plugins/developing/plugin-review-guidelines/"]
+++
diff --git a/docs/sources/developers/plugins/legacy/snapshot-mode.md b/docs/sources/developers/plugins/legacy/snapshot-mode.md
index 5e41963de65..65061bbcaf1 100644
--- a/docs/sources/developers/plugins/legacy/snapshot-mode.md
+++ b/docs/sources/developers/plugins/legacy/snapshot-mode.md
@@ -1,6 +1,5 @@
+++
title = "Legacy snapshot mode"
-type = "docs"
aliases = ["/docs/grafana/latest/plugins/developing/snapshot-mode/"]
+++
diff --git a/docs/sources/developers/plugins/legacy/style-guide.md b/docs/sources/developers/plugins/legacy/style-guide.md
index c77152764f0..73a6e8d0bfd 100644
--- a/docs/sources/developers/plugins/legacy/style-guide.md
+++ b/docs/sources/developers/plugins/legacy/style-guide.md
@@ -1,6 +1,5 @@
+++
title = "Legacy code style guide"
-type = "docs"
aliases = ["/docs/grafana/latest/plugins/developing/code-styleguide/"]
+++
diff --git a/docs/sources/developers/plugins/metadata.md b/docs/sources/developers/plugins/metadata.md
index bf6be4baf88..9a40f8c732a 100644
--- a/docs/sources/developers/plugins/metadata.md
+++ b/docs/sources/developers/plugins/metadata.md
@@ -4,7 +4,6 @@
# -------------------------------------------------------------------------
title = "plugin.json"
keywords = ["grafana", "plugins", "documentation"]
-type = "docs"
aliases = ["/docs/grafana/latest/plugins/developing/plugin.json/"]
+++
diff --git a/docs/sources/developers/plugins/metadata.md.tpl b/docs/sources/developers/plugins/metadata.md.tpl
index 3fc7c59e07b..d120da9fb8f 100644
--- a/docs/sources/developers/plugins/metadata.md.tpl
+++ b/docs/sources/developers/plugins/metadata.md.tpl
@@ -4,7 +4,6 @@
# -------------------------------------------------------------------------
title = "plugin.json"
keywords = ["grafana", "plugins", "documentation"]
-type = "docs"
aliases = ["/docs/grafana/latest/plugins/developing/plugin.json/"]
+++
diff --git a/docs/sources/developers/plugins/migration-guide.md b/docs/sources/developers/plugins/migration-guide.md
index 4354db6b4e4..51808e435d6 100644
--- a/docs/sources/developers/plugins/migration-guide.md
+++ b/docs/sources/developers/plugins/migration-guide.md
@@ -1,6 +1,5 @@
+++
title = "Plugin migration guide"
-type = "docs"
+++
# Plugin migration guide
diff --git a/docs/sources/developers/plugins/sign-a-plugin.md b/docs/sources/developers/plugins/sign-a-plugin.md
index b1e387b187c..0d1d72c4209 100644
--- a/docs/sources/developers/plugins/sign-a-plugin.md
+++ b/docs/sources/developers/plugins/sign-a-plugin.md
@@ -1,6 +1,5 @@
+++
title = "Sign a plugin"
-type = "docs"
+++
# Sign a plugin
diff --git a/docs/sources/developers/plugins/working-with-data-frames.md b/docs/sources/developers/plugins/working-with-data-frames.md
index 4a14243e55a..567a001bcbb 100644
--- a/docs/sources/developers/plugins/working-with-data-frames.md
+++ b/docs/sources/developers/plugins/working-with-data-frames.md
@@ -1,6 +1,5 @@
+++
title = "Working with data frames"
-type = "docs"
+++
# Working with data frames
diff --git a/docs/sources/enterprise/_index.md b/docs/sources/enterprise/_index.md
index d56032de7c3..24cf52c620e 100644
--- a/docs/sources/enterprise/_index.md
+++ b/docs/sources/enterprise/_index.md
@@ -2,11 +2,7 @@
title = "Grafana Enterprise"
description = "Grafana Enterprise overview"
keywords = ["grafana", "documentation", "datasource", "permissions", "ldap", "licensing", "enterprise", "insights", "reporting"]
-type = "docs"
-[menu.docs]
-name = "Grafana Enterprise"
-identifier = "enterprise"
-weight = 100
+weight = 150
+++
# Grafana Enterprise
diff --git a/docs/sources/enterprise/auditing.md b/docs/sources/enterprise/auditing.md
index 477bf3f6593..bb53594ca55 100644
--- a/docs/sources/enterprise/auditing.md
+++ b/docs/sources/enterprise/auditing.md
@@ -2,9 +2,6 @@
title = "Auditing"
description = "Auditing"
keywords = ["grafana", "auditing", "audit", "logs"]
-type = "docs"
-[menu.docs]
-parent = "enterprise"
weight = 700
+++
diff --git a/docs/sources/enterprise/datasource_permissions.md b/docs/sources/enterprise/datasource_permissions.md
index 15552585855..af4b80d5237 100644
--- a/docs/sources/enterprise/datasource_permissions.md
+++ b/docs/sources/enterprise/datasource_permissions.md
@@ -2,11 +2,6 @@
title = "Data source permissions"
description = "Grafana Datasource Permissions Guide "
keywords = ["grafana", "configuration", "documentation", "datasource", "permissions", "users", "teams", "enterprise"]
-type = "docs"
-[menu.docs]
-name = "Datasource"
-identifier = "datasource-permissions"
-parent = "enterprise"
weight = 200
+++
diff --git a/docs/sources/enterprise/enhanced_ldap.md b/docs/sources/enterprise/enhanced_ldap.md
index 3c673a9d309..b1966d4d497 100644
--- a/docs/sources/enterprise/enhanced_ldap.md
+++ b/docs/sources/enterprise/enhanced_ldap.md
@@ -2,11 +2,6 @@
title = "Enhanced LDAP Integration"
description = "Grafana Enhanced LDAP Integration Guide "
keywords = ["grafana", "configuration", "documentation", "ldap", "active directory", "enterprise"]
-type = "docs"
-[menu.docs]
-name = "Enhanced LDAP"
-identifier = "enhanced-ldap"
-parent = "enterprise"
weight = 300
+++
diff --git a/docs/sources/enterprise/enterprise-configuration.md b/docs/sources/enterprise/enterprise-configuration.md
index cd8be1a84ab..7ddc3bd0049 100644
--- a/docs/sources/enterprise/enterprise-configuration.md
+++ b/docs/sources/enterprise/enterprise-configuration.md
@@ -2,11 +2,6 @@
title = "Enterprise configuration"
description = "Enterprise configuration documentation"
keywords = ["grafana", "configuration", "documentation", "enterprise"]
-type = "docs"
-[menu.docs]
-name = "Enterprise configuration"
-identifier = "enterprise-config"
-parent = "enterprise"
weight = 300
+++
diff --git a/docs/sources/enterprise/export-pdf.md b/docs/sources/enterprise/export-pdf.md
index 6883c412539..4d626b3fa83 100644
--- a/docs/sources/enterprise/export-pdf.md
+++ b/docs/sources/enterprise/export-pdf.md
@@ -2,9 +2,6 @@
title = "Export dashboard as PDF"
description = ""
keywords = ["grafana", "export", "pdf", "share"]
-type = "docs"
-[menu.docs]
-parent = "enterprise"
weight = 900
+++
diff --git a/docs/sources/enterprise/license-expiration.md b/docs/sources/enterprise/license-expiration.md
index f4d3ba78700..72d5c6444e8 100644
--- a/docs/sources/enterprise/license-expiration.md
+++ b/docs/sources/enterprise/license-expiration.md
@@ -2,9 +2,6 @@
title = "License Expiration"
description = ""
keywords = ["grafana", "licensing"]
-type = "docs"
-[menu.docs]
-parent = "enterprise"
weight = 8
+++
diff --git a/docs/sources/enterprise/reporting.md b/docs/sources/enterprise/reporting.md
index 5c2af1655c4..79068572d64 100644
--- a/docs/sources/enterprise/reporting.md
+++ b/docs/sources/enterprise/reporting.md
@@ -2,10 +2,7 @@
title = "Reporting"
description = ""
keywords = ["grafana", "reporting"]
-type = "docs"
aliases = ["/docs/grafana/latest/administration/reports"]
-[menu.docs]
-parent = "enterprise"
weight = 400
+++
@@ -38,8 +35,8 @@ Currently only Organization Admins can create reports.
- **Time range -** (optional) Use custom time range for the report. For more information check [Report time range]({{< relref "#report-time-range" >}}).
1. **Preview PDF** to make sure the report appears as you expect. Update if necessary.
1. Enter scheduling information. Options vary depending on the frequency you select.
-1. Select the orientation option for generated report: **Portrait** or **Landscape**.
-1. Select the layout option for generated report: **Simple** or **Grid**.
+1. Select the orientation option for generated report: **Portrait** or **Landscape**.
+1. Select the layout option for generated report: **Simple** or **Grid**.
1. **Save** the report.
1. **Send test email** to verify that the whole configuration is working as expected.
@@ -67,7 +64,7 @@ All scheduling indicates when the reporting service will start rendering the das
Hourly reports are generated once per hour. All fields are required.
- **At minute -** The number of minutes after full hour when the report should be generated.
-- **Time zone -** Time zone to determine the offset of the full hour. Does not currently change the time in the rendered report.
+- **Time zone -** Time zone to determine the offset of the full hour. Does not currently change the time in the rendered report.
#### Daily
@@ -141,12 +138,12 @@ image_scale_factor = 2
> Setting custom report time range is available in Grafana Enterprise v7.2+.
By default, reports use the saved time range of the dashboard. Changing the time range of the report can be done by:
-- Saving a modified time range to the dashboard.
+- Saving a modified time range to the dashboard.
- Setting a time range via **Time range** field in the report form. If specified, then this custom time range overrides the one from the report's dashboard.
The page header of the report displays the time range for the dashboard's data queries. Dashboards set to use the browser's time zone will use the time zone on the Grafana server.
-If the time zone is set differently between your Grafana server and its remote image renderer, then the time ranges in the report might be different between the page header and the time axes in the panels. We advise always setting the time zone to UTC for dashboards when using a remote renderer to avoid this.
+If the time zone is set differently between your Grafana server and its remote image renderer, then the time ranges in the report might be different between the page header and the time axes in the panels. We advise always setting the time zone to UTC for dashboards when using a remote renderer to avoid this.
## Reports settings
@@ -154,7 +151,7 @@ If the time zone is set differently between your Grafana server and its remote i
You can configure organization-wide report settings in the **Settings** tab on the **Reporting** page. Settings are applied to all the reports for current organization.
-You can customize the branding options.
+You can customize the branding options.
Report branding:
**Company logo URL** - Company logo displayed in the report PDF. Defaults to the Grafana logo.
@@ -163,8 +160,8 @@ Email branding:
- **Company logo URL** - Company logo displayed in the report PDF. Defaults to the Grafana logo.
- **Email footer** - Toggle to enable report email footer. Select **Sent by** or **None**.
- **Footer link text** - Text for the link in the report email footer. Defaults to "Grafana".
-- **Footer link URL** - Link for the report email footer.
-
+- **Footer link URL** - Link for the report email footer.
+
{{< docs-imagebox img="/img/docs/enterprise/reports_settings.png" max-width="500px" class="docs-image--no-shadow" >}}
## Troubleshoot reporting
diff --git a/docs/sources/enterprise/saml.md b/docs/sources/enterprise/saml.md
index bc5c0a78e0b..b157a4a0d2d 100644
--- a/docs/sources/enterprise/saml.md
+++ b/docs/sources/enterprise/saml.md
@@ -3,10 +3,6 @@ title = "SAML Authentication"
description = "Grafana SAML Authentication"
keywords = ["grafana", "saml", "documentation", "saml-auth"]
aliases = ["/docs/grafana/latest/auth/saml/"]
-type = "docs"
-[menu.docs]
-name = "SAML"
-parent = "authentication"
weight = 500
+++
@@ -30,10 +26,10 @@ Grafana supports the following SAML 2.0 bindings:
- `HTTP-POST` binding
In terms of security:
-- Grafana supports signed and encrypted assertions.
+- Grafana supports signed and encrypted assertions.
- Grafana does not support signed or encrypted requests.
-In terms of initiation:
+In terms of initiation:
- Grafana supports SP-initiated requests.
- Grafana does not support IdP-initiated request.
@@ -67,7 +63,7 @@ The table below describes all SAML configuration options. Continue reading below
### Enable SAML authentication
-To use the SAML integration, in the `auth.saml` section of in the Grafana custom configuration file, set `enabled` to `true`.
+To use the SAML integration, in the `auth.saml` section of in the Grafana custom configuration file, set `enabled` to `true`.
Refer to [Configuration]({{< relref "../administration/configuration.md" >}}) for more information about configuring Grafana.
@@ -75,8 +71,8 @@ Refer to [Configuration]({{< relref "../administration/configuration.md" >}}) fo
The SAML SSO standard uses asymmetric encryption to exchange information between the SP (Grafana) and the IdP. To perform such encryption, you need a public part and a private part. In this case, the X.509 certificate provides the public part, while the private key provides the private part.
-Grafana supports two ways of specifying both the `certificate` and `private_key`.
-- Without a suffix (`certificate` or `private_key`), the configuration assumes you've supplied the base64-encoded file contents.
+Grafana supports two ways of specifying both the `certificate` and `private_key`.
+- Without a suffix (`certificate` or `private_key`), the configuration assumes you've supplied the base64-encoded file contents.
- With the `_path` suffix (`certificate_path` or `private_key_path`), then Grafana treats the value entered as a file path and attempts to read the file from the file system.
You can only use one form of each configuration option. Using multiple forms, such as both `certificate` and `certificate_path`, results in an error.
@@ -91,7 +87,7 @@ The SAML standard recommends using a digital signature for some types of message
You also need to define the public part of the IdP for message verification. The SAML IdP metadata XML defines where and how Grafana exchanges user information.
-Grafana supports three ways of specifying the IdP metadata.
+Grafana supports three ways of specifying the IdP metadata.
- Without a suffix `idp_metadata`, Grafana assumes base64-encoded XML file contents.
- With the `_path` suffix, Grafana assumes a file path and attempts to read the file from the file system.
- With the `_url` suffix, Grafana assumes a URL and attempts to load the metadata from the given location.
@@ -139,7 +135,6 @@ For Grafana to map the user information, it looks at the individual attributes w
Grafana provides configuration options that let you modify which keys to look at for these values. The data we need to create the user in Grafana is Name, Login handle, and email.
-An example is `assertion_attribute_name = "givenName"` where Grafana looks within the assertion for an attribute with a friendly name or name of `givenName`. Both, the friendly name (e.g. `givenName`) or the name (e.g. `urn:oid:2.5.4.42`) can be used interchangeably as the value for the configuration option.
### Configure team sync
@@ -180,7 +175,7 @@ role_values_grafana_admin = superadmin
> Only available in Grafana v7.0+
-Organization mapping allows you to assign users to particular organization in Grafana depending on attribute value obtained from identity provider.
+Organization mapping allows you to assign users to particular organization in Grafana depending on attribute value obtained from identity provider.
1. In configuration file, set [`assertion_attribute_org`]({{< relref "./enterprise-configuration.md#assertion-attribute-org" >}}) to the attribute name you store organization info in.
1. Set [`org_mapping`]({{< relref "./enterprise-configuration.md#org-mapping" >}}) option to the comma-separated list of `Organization:OrgId` pairs to map organization from IdP to Grafana organization specified by id.
@@ -250,13 +245,13 @@ To configure SAML integration with Okta, create integration inside the Okta orga
- In the **Audience URI (SP Entity ID)** field, use the `/saml/metadata` endpoint URL, for example, `https://grafana.example.com/saml/metadata`.
- Leave the default values for **Name ID format** and **Application username**.
- In the **ATTRIBUTE STATEMENTS (OPTIONAL)** section, enter the SAML attributes to be shared with Grafana, for example:
-
+
| Attribute name (in Grafana) | Value (in Okta profile) |
| --------------------------- | -------------------------------------- |
| Login | `user.login` |
| Email | `user.email` |
| DisplayName | `user.firstName + " " + user.lastName` |
-
+
- In the **GROUP ATTRIBUTE STATEMENTS (OPTIONAL)** section, enter a group attribute name (for example, `Group`) and set filter to `Matches regex .*` to return all user groups.
1. Click **Next**.
1. On the final Feedback tab, fill out the form and then click **Finish**.
@@ -269,7 +264,7 @@ Once the application is created, configure Grafana to use it for SAML authentica
1. Configure the [certificate and private key]({{< relref "#certificate-and-private-key" >}}).
1. On the Okta application page where you have been redirected after application created, navigate to the **Sign On** tab and find **Identity Provider metadata** link in the **Settings** section.
1. Set the [`idp_metadata_url`]({{< relref "./enterprise-configuration.md#idp-metadata-url" >}}) to the URL obtained from the previous step. The URL should look like `https://