public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v10.0.x] Fix merge error in index.md (#71312)

Browse Source 
* Fix merge error in index.md

Fixes glitch reported here: https://raintank-corp.slack.com/archives/C5PG2JK8W/p1689019056173919

* Prettier fix
This commit is contained in:
Joseph Perez
2023-07-10 16:25:09 -05:00
committed by GitHub
parent 25f498c76f
commit eeba36e435
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/sources/administration/data-source-management/index.md
+1 -4
View File
@@ -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 %}}