Skip to content
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/check-linux-build-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: Check Linux build image
on:
pull_request:
paths:
- 'tools/build-image/*'
- '.github/workflows/check-linux-build-image.yml'
- "tools/build-image/*"
- ".github/workflows/check-linux-build-image.yml"

permissions:
contents: read
Expand All @@ -25,11 +25,11 @@ jobs:

- name: Remove unnecessary files
run: |
rm -rf /usr/share/dotnet
rm -rf "$AGENT_TOOLSDIRECTORY"
rm -rf /opt/ghc
rm -rf "/usr/local/share/boost"
rm -rf /opt/hostedtoolcache
rm -rf /usr/share/dotnet
rm -rf "$AGENT_TOOLSDIRECTORY"
rm -rf /opt/ghc
rm -rf "/usr/local/share/boost"
rm -rf /opt/hostedtoolcache

- name: Setup QEMU
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
Expand Down
60 changes: 30 additions & 30 deletions .github/workflows/create_build_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,40 +19,40 @@ jobs:
suffix: "-boringcrypto"
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
with:
persist-credentials: false
- name: Checkout code
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
with:
persist-credentials: false

- name: Remove unnecessary files
run: |
- name: Remove unnecessary files
run: |
rm -rf /usr/share/dotnet
rm -rf "$AGENT_TOOLSDIRECTORY"
rm -rf /opt/ghc
rm -rf "/usr/local/share/boost"
rm -rf /opt/hostedtoolcache

- name: Get version from Git tag
env:
FULL_TAG: ${{ github.ref_name }}
id: get_image_version
run: echo "image_tag=${FULL_TAG##*/}${{ matrix.build.suffix }}" >> $GITHUB_OUTPUT

- name: Login to DockerHub (from vault)
uses: grafana/shared-workflows/actions/dockerhub-login@13fb504e3bfe323c1188bf244970d94b2d336e86 # dockerhub-login-v1.0.1

- name: Setup QEMU
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1

- name: Create Linux build image
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
with:
platforms: linux/amd64,linux/arm64
context: ./tools/build-image
push: true
tags: grafana/alloy-build-image:${{ steps.get_image_version.outputs.image_tag }}
build-args: |
GO_RUNTIME=${{ matrix.build.runtime }}
- name: Get version from Git tag
env:
FULL_TAG: ${{ github.ref_name }}
id: get_image_version
run: echo "image_tag=${FULL_TAG##*/}${{ matrix.build.suffix }}" >> $GITHUB_OUTPUT

- name: Login to DockerHub (from vault)
uses: grafana/shared-workflows/actions/dockerhub-login@13fb504e3bfe323c1188bf244970d94b2d336e86 # dockerhub-login-v1.0.1

- name: Setup QEMU
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1

- name: Create Linux build image
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
with:
platforms: linux/amd64,linux/arm64
context: ./tools/build-image
push: true
tags: grafana/alloy-build-image:${{ steps.get_image_version.outputs.image_tag }}
build-args: |
GO_RUNTIME=${{ matrix.build.runtime }}
39 changes: 39 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ Main (unreleased)

### Breaking changes

- `prometheus.exporter.blackbox`, `prometheus.exporter.snmp` and `prometheus.exporter.statsd` now use the component ID instead of the hostname as
their `instance` label in their exported metrics. This is a consequence of a bug fix that could lead to a missing data when using the exporter
with clustering. If you would like to retain the previous behaviour, you can use `discovery.relabel` with `action = "replace"` rule to
set the `instance` label to `sys.env("HOSTNAME")`. (@thampiotr)

### Breaking changes

- `prometheus.exporter.blackbox`, `prometheus.exporter.snmp` and `prometheus.exporter.statsd` now use the component ID instead of the hostname as
their `instance` label in their exported metrics. This is a consequence of a bug fix that could lead to a missing data when using the exporter
with clustering. If you would like to retain the previous behaviour, you can use `discovery.relabel` with `action = "replace"` rule to
Expand Down Expand Up @@ -47,14 +54,46 @@ Main (unreleased)

- `prometheus.exporter.postgres` dependency has been updated to v0.18.1. This includes new `stat_progress_vacuum` and `buffercache_summary` collectors, as well as other bugfixes and enhancements. (@cristiangreco)

<<<<<<< HEAD
- Update Beyla component to 2.7.2. (@grcevski)
=======
- Schedule new path targets faster in `loki.source.file`. (@kalleep)
>>>>>>> main

### Bugfixes

- Stop `loki.source.kubernetes` discarding log lines with duplicate timestamps. (@ciaranj)

- Fix direction of arrows for pyroscope components in UI graph. (@dehaansa)

- Only log EOF errors for syslog port investigations in `loki.source.syslog` as Debug, not Warn. (@dehaansa)

- Fix panic in `otelcol.receiver.syslog` when no tcp block was configured. (@kalleep)

v1.11.2
-----------------

### Bugfixes

- Fix potential deadlock in `loki.source.journal` when stopping or reloading the component. (@thampiotr)

- Honor sync timeout when waiting for network availability for prometheus.operator.* components. (@dehaansa)

- Fix `prometheus.exporter.cloudwatch` to not always emit debug logs but respect debug property. (@kalleep)

- Fix an issue where component shutdown could block indefinitely by adding a warning log message and a deadline of 10 minutes. The deadline can be configured with the `--feature.component-shutdown-deadline` flag if the default is not suitable. (@thampiotr)

- Fix potential deadlocks in `loki.source.file` and `loki.source.journal` when component is shutting down. (@kalleep, @thampiotr)
- rework the query samples collector to buffer per-query execution state across scrapes and emit finalized entries (@gaantunes)
- Add a `stat_statements` configuration block to the `prometheus.exporter.postgres` component to enable selecting both the query ID and the full SQL statement. The new block includes one option to enable statement selection, and another to configure the maximum length of the statement text. (@SimonSerrano)

- Schedule new path targets faster in `loki.source.file`. (@kalleep)

- Update Beyla component to 2.7.4. (@grcevski)

- Stop `loki.source.kubernetes` discarding log lines with duplicate timestamps. (@ciaranj)


- Only log EOF errors for syslog port investigations in `loki.source.syslog` as Debug, not Warn. (@dehaansa)

- Fix panic in `otelcol.receiver.syslog` when no tcp block was configured. (@kalleep)
Expand Down
4 changes: 2 additions & 2 deletions docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ docs: check-cloudwatch-integration
endif

check-cloudwatch-integration:
$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.24.6-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md
$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.25.1-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/reference/components/prometheus/prometheus.exporter.cloudwatch.md

generate-cloudwatch-integration:
$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.24.6-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate
$(PODMAN) run -v "$(shell git rev-parse --show-toplevel):/repo:z" -v "$(shell pwd):/docs:z" -w /repo golang:1.25.1-bullseye go run internal/static/integrations/cloudwatch_exporter/docs/doc.go generate
Loading
Loading