Merge branch 'main' into cristian/dbo11y-pg-remove-comments

Author: srsholmes

.gitattributes

@@ -4,4 +4,4 @@ pkg/operator/crds/*.yaml linguist-generated=true
 Makefile text eol=lf
 tools/make/*.mk text eol=lf
 tools/image-tag text eol=lf
-tools/release text eol=lf
+tools/publish-release-assets.sh text eol=lf

.github/ISSUE_TEMPLATE/blank.yaml

@@ -85,6 +85,7 @@ body:
       - otelcol.auth.headers
       - otelcol.auth.oauth2
       - otelcol.auth.sigv4
+      - otelcol.connector.count
       - otelcol.connector.host_info
       - otelcol.connector.servicegraph
       - otelcol.connector.spanlogs
@@ -93,6 +94,7 @@ body:
       - otelcol.exporter.datadog
       - otelcol.exporter.debug
       - otelcol.exporter.faro
+      - otelcol.exporter.file
       - otelcol.exporter.googlecloud
       - otelcol.exporter.googlecloudpubsub
       - otelcol.exporter.kafka
@@ -143,6 +145,7 @@ body:
       - otelcol.receiver.vcenter
       - otelcol.receiver.zipkin
       - otelcol.storage.file
+      - prometheus.echo
       - prometheus.enrich
       - prometheus.exporter.apache
       - prometheus.exporter.azure

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -85,6 +85,7 @@ body:
       - otelcol.auth.headers
       - otelcol.auth.oauth2
       - otelcol.auth.sigv4
+      - otelcol.connector.count
       - otelcol.connector.host_info
       - otelcol.connector.servicegraph
       - otelcol.connector.spanlogs
@@ -93,6 +94,7 @@ body:
       - otelcol.exporter.datadog
       - otelcol.exporter.debug
       - otelcol.exporter.faro
+      - otelcol.exporter.file
       - otelcol.exporter.googlecloud
       - otelcol.exporter.googlecloudpubsub
       - otelcol.exporter.kafka
@@ -143,6 +145,7 @@ body:
       - otelcol.receiver.vcenter
       - otelcol.receiver.zipkin
       - otelcol.storage.file
+      - prometheus.echo
       - prometheus.enrich
       - prometheus.exporter.apache
       - prometheus.exporter.azure

.github/ISSUE_TEMPLATE/docs.yaml

@@ -88,6 +88,7 @@ body:
       - otelcol.auth.headers
       - otelcol.auth.oauth2
       - otelcol.auth.sigv4
+      - otelcol.connector.count
       - otelcol.connector.host_info
       - otelcol.connector.servicegraph
       - otelcol.connector.spanlogs
@@ -96,6 +97,7 @@ body:
       - otelcol.exporter.datadog
       - otelcol.exporter.debug
       - otelcol.exporter.faro
+      - otelcol.exporter.file
       - otelcol.exporter.googlecloud
       - otelcol.exporter.googlecloudpubsub
       - otelcol.exporter.kafka
@@ -146,6 +148,7 @@ body:
       - otelcol.receiver.vcenter
       - otelcol.receiver.zipkin
       - otelcol.storage.file
+      - prometheus.echo
       - prometheus.enrich
       - prometheus.exporter.apache
       - prometheus.exporter.azure

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -85,6 +85,7 @@ body:
       - otelcol.auth.headers
       - otelcol.auth.oauth2
       - otelcol.auth.sigv4
+      - otelcol.connector.count
       - otelcol.connector.host_info
       - otelcol.connector.servicegraph
       - otelcol.connector.spanlogs
@@ -93,6 +94,7 @@ body:
       - otelcol.exporter.datadog
       - otelcol.exporter.debug
       - otelcol.exporter.faro
+      - otelcol.exporter.file
       - otelcol.exporter.googlecloud
       - otelcol.exporter.googlecloudpubsub
       - otelcol.exporter.kafka
@@ -143,6 +145,7 @@ body:
       - otelcol.receiver.vcenter
       - otelcol.receiver.zipkin
       - otelcol.storage.file
+      - prometheus.echo
       - prometheus.enrich
       - prometheus.exporter.apache
       - prometheus.exporter.azure

.github/ISSUE_TEMPLATE/proposal.yaml

@@ -85,6 +85,7 @@ body:
       - otelcol.auth.headers
       - otelcol.auth.oauth2
       - otelcol.auth.sigv4
+      - otelcol.connector.count
       - otelcol.connector.host_info
       - otelcol.connector.servicegraph
       - otelcol.connector.spanlogs
@@ -93,6 +94,7 @@ body:
       - otelcol.exporter.datadog
       - otelcol.exporter.debug
       - otelcol.exporter.faro
+      - otelcol.exporter.file
       - otelcol.exporter.googlecloud
       - otelcol.exporter.googlecloudpubsub
       - otelcol.exporter.kafka
@@ -143,6 +145,7 @@ body:
       - otelcol.receiver.vcenter
       - otelcol.receiver.zipkin
       - otelcol.storage.file
+      - prometheus.echo
       - prometheus.enrich
       - prometheus.exporter.apache
       - prometheus.exporter.azure

.github/pull_request_template.md

@@ -1,10 +1,9 @@
 <!--
 
-CONTRIBUTORS GUIDE: https://github.com/grafana/alloy/blob/main/docs/developer/contributing.md#updating-the-changelog
+CONTRIBUTORS GUIDE: https://github.com/grafana/alloy/blob/main/docs/developer/contributing.md
 
 If this is your first PR or you have not contributed in a while, we recommend
-taking the time to review the guide. It gives helpful instructions for
-contributors around things like how to update the changelog.
+taking the time to review the guide.
 
 -->
 
@@ -21,7 +20,6 @@ contributors around things like how to update the changelog.
 
 <!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->
 
-- [ ] CHANGELOG.md updated
 - [ ] Documentation added
 - [ ] Tests updated
 - [ ] Config converters updated

.github/workflows/autolock.yml

@@ -18,8 +18,8 @@ jobs:
     steps:
       - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5.0.1
         with:
-          pr-inactive-days: 30
-          issue-inactive-days: 30
+          pr-inactive-days: 14
+          issue-inactive-days: 14
           add-issue-labels: 'frozen-due-to-age'
           add-pr-labels: 'frozen-due-to-age'
           process-only: 'issues, prs'

.github/workflows/backport.yml

@@ -15,7 +15,7 @@ jobs:
   build_linux:
     name: Build on Linux
     runs-on: github-hosted-ubuntu-x64-large
-    container: grafana/alloy-build-image:v0.1.22@sha256:a797a8e2efdf6e2c8280e91a50dc79418f8efb56d4a591f04c8f2435b78154ab
+    container: grafana/alloy-build-image:v0.1.25@sha256:306ef67a1593ebdcdc3de9e7360001183830f45b05f213cd2c6f47114196c9a6
     strategy:
       matrix:
         os: [linux]
@@ -42,7 +42,7 @@ jobs:
   build_linux_boringcrypto:
     name: Build on Linux (boringcrypto)
     runs-on: github-hosted-ubuntu-x64-large
-    container: grafana/alloy-build-image:v0.1.22-boringcrypto@sha256:b609db5a06d6cd768514d1daac6bb81bed9f7fed4336f48cfb5410b8a3d8d65d
+    container: grafana/alloy-build-image:v0.1.25-boringcrypto@sha256:31052c9ec5b8bfeec927984955541629882eb8c6518ff9106fb484e9b711875c
     strategy:
       matrix:
         os: [linux]
@@ -123,7 +123,7 @@ jobs:
   build_freebsd:
     name: Build on FreeBSD (AMD64)
     runs-on: github-hosted-ubuntu-x64-large
-    container: grafana/alloy-build-image:v0.1.22@sha256:a797a8e2efdf6e2c8280e91a50dc79418f8efb56d4a591f04c8f2435b78154ab
+    container: grafana/alloy-build-image:v0.1.25@sha256:306ef67a1593ebdcdc3de9e7360001183830f45b05f213cd2c6f47114196c9a6
     steps:
     - name: Checkout code
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1