Merge branch 'main' into bump-go-1.21.6

hainenber · web-flow · commit 06f615d1817e · 2024-01-17T19:36:42.000+07:00
diff --git a/docs/sources/flow/reference/components/otelcol.exporter.otlp.md b/docs/sources/flow/reference/components/otelcol.exporter.otlp.md
@@ -205,7 +205,7 @@ You can create an `otlp` exporter that sends your data to a managed service, for
 ```river
 otelcol.exporter.otlp "grafana_cloud_tempo" {
     client {
-        endpoint = "https://tempo-xxx.grafana.net/tempo"
+        endpoint = "tempo-xxx.grafana.net/tempo:443"
         auth     = otelcol.auth.basic.grafana_cloud_tempo.handler
     }
 }
@@ -229,4 +229,4 @@ connection work correctly. Refer to the linked documentation for more details.
 
 {{% /admonition %}}
 
-<!-- END GENERATED COMPATIBLE COMPONENTS -->
+<!-- END GENERATED COMPATIBLE COMPONENTS -->

Original file line number	Diff line number	Diff line change
@@ -205,7 +205,7 @@ You can create an `otlp` exporter that sends your data to a managed service, for
`205`	`205`	```river
`206`	`206`	`otelcol.exporter.otlp "grafana_cloud_tempo" {`
`207`	`207`	`client {`
`208`		`- endpoint = "https://tempo-xxx.grafana.net/tempo"`
	`208`	`+ endpoint = "tempo-xxx.grafana.net/tempo:443"`
`209`	`209`	`auth = otelcol.auth.basic.grafana_cloud_tempo.handler`
`210`	`210`	`}`
`211`	`211`	`}`
`@@ -229,4 +229,4 @@ connection work correctly. Refer to the linked documentation for more details.`
`229`	`229`
`230`	`230`	`{{% /admonition %}}`
`231`	`231`
`232`		`-<!-- END GENERATED COMPATIBLE COMPONENTS -->`
	`232`	`+<!-- END GENERATED COMPATIBLE COMPONENTS -->`