From eeba36e435cb3a75356194098fd49fe6c35fd436 Mon Sep 17 00:00:00 2001 From: Joseph Perez <45749060+josmperez@users.noreply.github.com> Date: Mon, 10 Jul 2023 14:25:09 -0700 Subject: [PATCH] [v10.0.x] Fix merge error in index.md (#71312) * Fix merge error in index.md Fixes glitch reported here: https://raintank-corp.slack.com/archives/C5PG2JK8W/p1689019056173919 * Prettier fix --- docs/sources/administration/data-source-management/index.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/sources/administration/data-source-management/index.md b/docs/sources/administration/data-source-management/index.md index 8a15b01309e..e8413736a25 100644 --- a/docs/sources/administration/data-source-management/index.md +++ b/docs/sources/administration/data-source-management/index.md @@ -85,15 +85,12 @@ You can assign data source permissions to users, teams, and roles which will all When query caching is enabled, Grafana temporarily stores the results of data source queries. When you or another user submit the exact same query again, the results will come back from the cache instead of from the data source (like Splunk or ServiceNow) itself. -<<<<<<< HEAD Query caching works for all backend data sources. You can enable the cache globally and configure the cache duration (also called Time to Live, or TTL). -======= + When using Grafana, a query pertains to a request for data frames to be modified or displayed. A resource relates to any HTTP requests made by a plugin, such as the Amazon Timestream plugin requesting a list of available databases from AWS. For more information on data source queries and resources, please see the developers page on [backend plugins]({{< relref "../../developers/plugins/introduction-to-plugin-development/backend/" >}}). The caching feature works for **all** backend data sources. You can enable the cache globally in Grafana's [configuration]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}), and configure a cache duration (also called Time to Live, or TTL) for each data source individually. -> > > > > > > f9df1f3051 (Docs: Plugins doc reorganization, part 1 (#69864)) - {{% admonition type="note" %}} Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/). {{% /admonition %}}