Merge branch 'main' into basic-auth-for-elasticsearch-exporter

CHANGELOG.md

@@ -10,10 +10,16 @@ internal API changes are not present.
 Main (unreleased)
 -----------------
 
+
 ### Features
 
 - Add support for Basic Auth-secured connection with Elasticsearch cluster using `prometheus.exporter.elasticsearch`. (@hainenber)
 
+### Bugfixes
+
+- Fix default configuration file `grafana-agent-flow.river` used in downstream packages. (@bricewge)
+
+
 v0.38.0-rc.0 (2023-11-16)
 -------------------------
 
@@ -112,8 +118,6 @@ v0.38.0-rc.0 (2023-11-16)
 
 ### Bugfixes
 
-- Fix default configuration file `grafana-agent-flow.river` used in downstream packages. (@bricewge)
-
 - Set exit code 1 on grafana-agentctl non-runnable command. (@fgouteroux)
 
 - Fixed an issue where `loki.process` validation for stage `metric.counter` was