diff --git a/docs/sources/datasources/tempo.md b/docs/sources/datasources/tempo.md index 339919e8efb..29d6f6a0fce 100644 --- a/docs/sources/datasources/tempo.md +++ b/docs/sources/datasources/tempo.md @@ -18,7 +18,7 @@ To access Tempo settings, click the **Configuration** (gear) icon, then click ** | ------------ | --------------------------------------------------------------------------------------- | | `Name` | The name using which you will refer to the data source in panels, queries, and Explore. | | `Default` | The default data source will be pre-selected for new panels. | -| `URL` | The URL of the Tempo instance, e.g., `http://localhost:16686` | +| `URL` | The URL of the Tempo instance, e.g., `http://tempo` | | `Basic Auth` | Enable basic authentication to the Tempo data source. | | `User` | User name for basic authentication. | | `Password` | Password for basic authentication. | @@ -32,7 +32,7 @@ This is a configuration for the [trace to logs feature]({{< relref "../explore/t - **Data source -** Target data source. - **Tags -** The tags that will be used in the Loki query. Default is `'cluster', 'hostname', 'namespace', 'pod'`. -![Trace to logs settings](/img/docs/explore/trace-to-logs-settings-7-4.png "Screenshot of the trace to logs settings") +![Trace to logs settings](/img/docs/explore/trace-to-logs-settings-7-4.png 'Screenshot of the trace to logs settings') ## Query traces diff --git a/docs/sources/whatsnew/whats-new-in-v7-5.md b/docs/sources/whatsnew/whats-new-in-v7-5.md index 1462ec3a0d0..f559eb35454 100644 --- a/docs/sources/whatsnew/whats-new-in-v7-5.md +++ b/docs/sources/whatsnew/whats-new-in-v7-5.md @@ -60,9 +60,9 @@ Instead of the file path, users can now paste the SSL certification content in t > **Note:** It remains as limitation for the hosted Grafana, because the user doesn't have access to the server configuration. -### Deprecation notice for some Azure Monitor queries +### Deprecation notice for some Azure Monitor queries -In the upcoming Grafana 8.0 release, Application Insights and Insights Analytics query types within the Azure Monitor data source will be deprecated and be made read-only in favor of querying Application Insights from Metrics and Logs. +In the upcoming Grafana 8.0 release, Application Insights and Insights Analytics query types within the Azure Monitor data source will be deprecated and be made read-only in favor of querying Application Insights from Metrics and Logs. Grafana 7.5 includes a deprecation notice for these queries, and some documentation to help users prepare for the upcoming changes. @@ -102,6 +102,15 @@ If you enable this feature, then Grafana hashes and caches data source queries a If you enable the feature, then you can use template variables in reports. +### Tempo as a backend data source + +We have converted Tempo to a backend data source and dropped support for tempo-query's (Jaeger) response. To configure, you can now point to the port that is set in Tempo's configuration file. + +```yaml +server: + http_listen_port: 3101 +``` + ## Breaking changes There are no known breaking changes in this release.