Merge pull request #25 from grafana/sync-grafana-agent-2024-03-11-1

Merge grafana/agent:main into grafana/alloy:main (2024-03-11)

.dockerignore

@@ -6,3 +6,4 @@ web/ui/node_modules/
 web/ui/build/
 packaging/windows/LICENSE
 packaging/windows/agent-windows-amd64.exe
+cmd/grafana-agent/Dockerfile

.drone/drone.yml

@@ -8,7 +8,7 @@ steps:
 - commands:
   - apt-get update -y && apt-get install -y libsystemd-dev
   - make lint
-  image: grafana/agent-build-image:0.32.0
+  image: grafana/agent-build-image:0.33.0
   name: Lint
 trigger:
   event:
@@ -23,7 +23,7 @@ platform:
 steps:
 - commands:
   - make GO_TAGS="nodocker" test
-  image: grafana/agent-build-image:0.32.0
+  image: grafana/agent-build-image:0.33.0
   name: Run Go tests
 trigger:
   event:
@@ -38,7 +38,7 @@ platform:
 steps:
 - commands:
   - K8S_USE_DOCKER_NETWORK=1 make test
-  image: grafana/agent-build-image:0.32.0
+  image: grafana/agent-build-image:0.33.0
   name: Run Go tests
   volumes:
   - name: docker
@@ -61,7 +61,7 @@ platform:
 steps:
 - commands:
   - go test -tags="nodocker,nonetwork" ./...
-  image: grafana/agent-build-image:0.32.0-windows
+  image: grafana/agent-build-image:0.33.0-windows
   name: Run Go tests
 trigger:
   ref:
@@ -76,7 +76,7 @@ platform:
 steps:
 - commands:
   - make agent-image
-  image: grafana/agent-build-image:0.32.0
+  image: grafana/agent-build-image:0.33.0
   name: Build container
   volumes:
   - name: docker
@@ -102,7 +102,7 @@ platform:
 steps:
 - commands:
   - '& "C:/Program Files/git/bin/bash.exe" ./tools/ci/docker-containers-windows agent'
-  image: grafana/agent-build-image:0.32.0-windows
+  image: grafana/agent-build-image:0.33.0-windows
   name: Build container
   volumes:
   - name: docker
@@ -129,7 +129,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM=
     make agent
-  image: grafana/agent-build-image:0.32.0
+  image: grafana/agent-build-image:0.33.0
   name: Build
 trigger:
   event:
@@ -146,7 +146,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM=
     make agent
-  image: grafana/agent-build-image:0.32.0
+  image: grafana/agent-build-image:0.33.0
   name: Build
 trigger:
   event:
@@ -163,7 +163,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=ppc64le GOARM=
     make agent
-  image: grafana/agent-build-image:0.32.0
+  image: grafana/agent-build-image:0.33.0
   name: Build
 trigger:
   event:
@@ -180,7 +180,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=s390x GOARM=
     make agent
-  image: grafana/agent-build-image:0.32.0
+  image: grafana/agent-build-image:0.33.0
   name: Build
 trigger:
   event:
@@ -196,7 +196,7 @@ steps:
 - commands:
   - make generate-ui
   - GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make agent
-  image: grafana/agent-build-image:0.32.0
+  image: grafana/agent-build-image:0.33.0
   name: Build
 trigger:
   event:
@@ -212,7 +212,7 @@ steps:
 - commands:
   - make generate-ui
   - GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make agent
-  image: grafana/agent-build-image:0.32.0
+  image: grafana/agent-build-image:0.33.0
   name: Build
 trigger:
   event:
@@ -228,7 +228,7 @@ steps:
 - commands:
   - make generate-ui
   - GO_TAGS="builtinassets" GOOS=windows GOARCH=amd64 GOARM= make agent
-  image: grafana/agent-build-image:0.32.0
+  image: grafana/agent-build-image:0.33.0
   name: Build
 trigger:
   event:
@@ -244,7 +244,7 @@ steps:
 - commands:
   - make generate-ui
   - GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make agent
-  image: grafana/agent-build-image:0.32.0
+  image: grafana/agent-build-image:0.33.0
   name: Build
 trigger:
   event:
@@ -261,7 +261,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM=
     GOEXPERIMENT=boringcrypto make agent-boringcrypto
-  image: grafana/agent-build-image:0.32.0
+  image: grafana/agent-build-image:0.33.0
   name: Build
 trigger:
   event:
@@ -278,7 +278,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM=
     GOEXPERIMENT=boringcrypto make agent-boringcrypto
-  image: grafana/agent-build-image:0.32.0
+  image: grafana/agent-build-image:0.33.0
   name: Build
 trigger:
   event:
@@ -295,7 +295,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets" GOOS=windows GOARCH=amd64 GOARM= GOEXPERIMENT=cngcrypto
     make agent-windows-boringcrypto
-  image: grafana/agent-build-image:0.32.0-boringcrypto
+  image: grafana/agent-build-image:0.33.0-boringcrypto
   name: Build
 trigger:
   event:
@@ -311,7 +311,7 @@ steps:
 - commands:
   - DOCKER_OPTS="" make dist/grafana-agent-linux-amd64
   - DOCKER_OPTS="" make test-packages
-  image: grafana/agent-build-image:0.32.0
+  image: grafana/agent-build-image:0.33.0
   name: Test Linux system packages
   volumes:
   - name: docker
@@ -407,6 +407,6 @@ kind: secret
 name: updater_private_key
 ---
 kind: signature
-hmac: 118cf0f805912a99d8c268f18a179dbe69fa701fbf11f9a9effac933b63091e0
+hmac: 509aa746729e5eaf86e4cbb02b07f125399aabefcc3bf5b1693ea2cca2eaa4e1
 
 ...

.drone/pipelines/build_images.jsonnet

@@ -36,7 +36,7 @@ local locals = {
         'docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD',
         'docker run --rm --privileged multiarch/qemu-user-static --reset -p yes',
         'docker buildx create --name multiarch --driver docker-container --use',
-        'docker buildx build --build-arg="GO_RUNTIME=golang:1.22.0-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/agent-build-image:$IMAGE_TAG ./build-image',
+        'docker buildx build --build-arg="GO_RUNTIME=golang:1.22.1-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/agent-build-image:$IMAGE_TAG ./build-image',
       ],
     }],
     volumes: [{
@@ -59,7 +59,7 @@ local locals = {
         'docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD',
         'docker run --rm --privileged multiarch/qemu-user-static --reset -p yes',
         'docker buildx create --name multiarch --driver docker-container --use',
-        'docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/agent-build-image:$IMAGE_TAG ./build-image',
+        'docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.1-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/agent-build-image:$IMAGE_TAG ./build-image',
       ],
     }],
     volumes: [{

.github/workflows/check-linux-build-image.yml.disabled

@@ -25,7 +25,7 @@ jobs:
           push: false
           tags: grafana/agent-build-image:latest
           build-args: |
-            GO_RUNTIME=golang:1.22.0-bullseye
+            GO_RUNTIME=golang:1.22.1-bullseye
 
       - name: Create test Linux build image for boring crypto
         uses: docker/build-push-action@v5
@@ -34,4 +34,4 @@ jobs:
           push: false
           tags: grafana/agent-build-image:latest
           build-args: |
-            GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22-bullseye
+            GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.1-bullseye

.github/workflows/helm-release.yml.disabled

@@ -89,7 +89,7 @@ jobs:
           git config user.email "[email protected]"
 
       - name: Set up Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@v4
         with:
           version: v3.10.3
 

.github/workflows/helm-test.yml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@v4
         with:
           version: v3.10.3
 
@@ -46,7 +46,7 @@ jobs:
           fetch-depth: 0
 
       - name: Install Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@v4
         with:
           version: v3.10.3
 
@@ -71,7 +71,7 @@ jobs:
         run: ct lint --config ./operations/helm/ct.yaml
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.8.0
+        uses: helm/kind-action@v1.9.0
         if: steps.list-changed.outputs.changed == 'true'
 
       - name: Add dependency chart repos

.github/workflows/trivy.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@84384bd6e777ef152729993b8145ea352e9dd3ef
+        uses: aquasecurity/trivy-action@062f2592684a31eb3aa050cc61e7ca1451cecd3d
         with:
           image-ref: 'grafana/agent:main'
           format: 'template'

.gitignore

@@ -17,11 +17,12 @@ data-agent
 /dist.temp/
 /packaging/windows/LICENSE
 /packaging/windows/agent-windows-amd64.exe
+web/ui/build
 
 .DS_Store
 buildx-v*
 cover*.out
 .uptodate
 node_modules
 
-/docs/variables.mk.local
+/docs/variables.mk.local

ADOPTERS.md

@@ -4,5 +4,6 @@ production environments. Please send PRs to add or remove organizations.
 * [AB Tasty](https://www.abtasty.com/)
 * [Canonical](https://www.ubuntu.com/)
 * Cerner Enterprise Hosting
+* [CLOUDETEER GmbH](https://www.cloudeteer.de/)
 * [Embark Studios](https://www.embark.dev/)
 * [Grafana Labs](https://grafana.com)

CHANGELOG.md

@@ -10,6 +10,12 @@ internal API changes are not present.
 Main (unreleased)
 -----------------
 
+### Enhancements
+
+- Add support for importing folders as single module to `import.file`. (@wildum)
+
+- Add support for importing directories as single module to `import.git`. (@wildum)
+
 ### Features
 
 - Added a new CLI flag `--stability.level` which defines the minimum stability
@@ -19,6 +25,43 @@ Main (unreleased)
 
 ### Bugfixes
 
+- Fix an issue where JSON string array elements were not parsed correctly in `loki.source.cloudflare`. (@thampiotr)
+
+- Fix a bug where structured metadata and parsed field are not passed further in `loki.source.api` (@marchellodev)
+
+### Other changes
+
+- Clustering for Grafana Agent in Flow mode has graduated from beta to stable.
+
+v0.40.2 (2024-03-05)
+--------------------
+
+### Bugfixes
+
+- Set permissions on the `Grafana Agent [Flow]` folder when installing via the
+  windows installer rather than relying on the parent folder permissions. (@erikbaranowski)
+
+- Set restricted viewing permissions on the `agent-config.yaml` (static mode) or
+  `config.river` (flow mode) when installing via the Windows installer if the
+  configuration file does not already exist. (@erikbaranowski)
+
+- Fix an issue where the import config node would not run after a config reload. (@wildum)
+
+- Fix an issue where Loki could reject a batch of logs when structured metadata feature is used. (@thampiotr)
+
+=======
+- Fix a duplicate metrics registration panic when recreating static
+  mode metric instance's write handler. (@rfratto, @hainenber)
+
+### Other changes
+
+- Change the Docker base image for Linux containers to `public.ecr.aws/ubuntu/ubuntu:mantic`. (@hainenber)
+
+v0.40.1 (2024-02-27)
+--------------------
+
+### Bugfixes
+
 - Fix an issues where the logging config block would trigger an error when trying to send logs to components that were not running. (@wildum)
 
 - Fix an issue where a custom component might be wired to a local declare instead of an import declare when they have the same label. (@wildum)
@@ -154,6 +197,8 @@ v0.40.0 (2024-02-27)
 - `grafana-agent` and `grafana-agent-flow` fallback to default X.509 trusted root certificates
   when the `GODEBUG=x509usefallbackroots=1` environment variable is set. (@hainenber)
 
+- Migrate away from EoL'ed `github.com/aws-sdk-go` v1. (@hainenber)
+
 v0.39.2 (2024-1-31)
 --------------------
 
@@ -164,7 +209,6 @@ v0.39.2 (2024-1-31)
 - An error will be returned in the converter from Static to Flow when `scrape_integration` is set
   to `true` but no `remote_write` is defined. (@erikbaranowski)
 
-
 v0.39.1 (2024-01-19)
 --------------------
 
@@ -179,7 +223,6 @@ v0.39.1 (2024-01-19)
 
 - Fix issue where installing the Windows Agent Flow installer would hang then crash. (@mattdurham)
 
-
 v0.39.0 (2024-01-09)
 --------------------
 

Makefile

@@ -207,8 +207,8 @@ ifneq ($(DOCKER_PLATFORM),)
 DOCKER_FLAGS += --platform=$(DOCKER_PLATFORM)
 endif
 
-.PHONY: images agent-image
-images: agent-image
+.PHONY: images agent-image agent-boringcrypto-image
+images: agent-image agent-boringcrypto-image
 
 agent-image:
 	DOCKER_BUILDKIT=1 docker build $(DOCKER_FLAGS) -t $(AGENT_IMAGE) -f cmd/grafana-agent/Dockerfile .

README.md

@@ -98,9 +98,14 @@ launch dependencies to play with Grafana Alloy locally.
 
 A new minor release is planned every six weeks.
 
-The release cadence is best-effort: releases may be moved forwards or backwards
-if needed. The planned release dates for future minor releases do not change if
-one minor release is moved.
+The release cadence is best-effort: if necessary, releases may be performed
+outside of this cadence, or a scheduled release date can be moved forwards or
+backwards.
+
+Minor releases published on cadence include updating dependencies for upstream
+OpenTelemetry Collector code if new versions are available. Minor releases
+published outside of the release cadence may not include these dependency
+updates.
 
 Patch and security releases may be created at any time.