Merge branch 'main' into fix-loki-source-file-windows

grafana · Dec 13, 2024 · b83dbf5 · b83dbf5
2 parents 6d8a5dd + 5d5c055
commit b83dbf5
Show file tree

Hide file tree

Showing 355 changed files with 8,845 additions and 9,580 deletions.
diff --git a/.drone/drone.yml b/.drone/drone.yml
@@ -10,7 +10,7 @@ steps:
   - 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.7-bullseye" --push --platform
+  - docker buildx build --build-arg="GO_RUNTIME=golang:1.23.3-bullseye" --push --platform
     linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image
   environment:
     DOCKER_LOGIN:
@@ -44,7 +44,7 @@ steps:
   - 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.7-bullseye"
+  - docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.23.3-bullseye"
     --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG
     ./tools/build-image
   environment:
@@ -110,7 +110,7 @@ steps:
 - commands:
   - apt-get update -y && apt-get install -y libsystemd-dev
   - make lint
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Lint
 trigger:
   event:
@@ -125,7 +125,7 @@ platform:
 steps:
 - commands:
   - make GO_TAGS="nodocker" test
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Run Go tests
 trigger:
   event:
@@ -140,7 +140,7 @@ platform:
 steps:
 - commands:
   - K8S_USE_DOCKER_NETWORK=1 make test
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Run Go tests
   volumes:
   - name: docker
@@ -164,7 +164,7 @@ steps:
 - commands:
   - '& "C:/Program Files/git/bin/bash.exe" -c ''go test -tags="nodocker,nonetwork"
     ./...'''
-  image: grafana/alloy-build-image:v0.1.6-windows
+  image: grafana/alloy-build-image:v0.1.7-windows
   name: Run Go tests
 trigger:
   ref:
@@ -179,7 +179,7 @@ platform:
 steps:
 - commands:
   - make alloy-image
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Build container
   volumes:
   - name: docker
@@ -205,7 +205,7 @@ platform:
 steps:
 - commands:
   - '& "C:/Program Files/git/bin/bash.exe" -c "make alloy-image-windows"'
-  image: grafana/alloy-build-image:v0.1.6-windows
+  image: grafana/alloy-build-image:v0.1.7-windows
   name: Build container
   volumes:
   - name: docker
@@ -232,7 +232,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM=
     make alloy
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Build
 trigger:
   event:
@@ -249,7 +249,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM=
     make alloy
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Build
 trigger:
   event:
@@ -266,7 +266,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=ppc64le GOARM=
     make alloy
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Build
 trigger:
   event:
@@ -283,7 +283,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=s390x GOARM=
     make alloy
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Build
 trigger:
   event:
@@ -299,7 +299,7 @@ steps:
 - commands:
   - make generate-ui
   - GO_TAGS="builtinassets" GOOS=darwin GOARCH=amd64 GOARM= make alloy
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Build
 trigger:
   event:
@@ -315,7 +315,7 @@ steps:
 - commands:
   - make generate-ui
   - GO_TAGS="builtinassets" GOOS=darwin GOARCH=arm64 GOARM= make alloy
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Build
 trigger:
   event:
@@ -331,7 +331,7 @@ steps:
 - commands:
   - make generate-ui
   - GO_TAGS="builtinassets" GOOS=windows GOARCH=amd64 GOARM= make alloy
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Build
 trigger:
   event:
@@ -347,7 +347,7 @@ steps:
 - commands:
   - make generate-ui
   - GO_TAGS="builtinassets" GOOS=freebsd GOARCH=amd64 GOARM= make alloy
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Build
 trigger:
   event:
@@ -364,7 +364,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=amd64 GOARM=
     GOEXPERIMENT=boringcrypto make alloy
-  image: grafana/alloy-build-image:v0.1.6-boringcrypto
+  image: grafana/alloy-build-image:v0.1.7-boringcrypto
   name: Build
 trigger:
   event:
@@ -381,7 +381,7 @@ steps:
   - make generate-ui
   - GO_TAGS="builtinassets promtail_journal_enabled" GOOS=linux GOARCH=arm64 GOARM=
     GOEXPERIMENT=boringcrypto make alloy
-  image: grafana/alloy-build-image:v0.1.6-boringcrypto
+  image: grafana/alloy-build-image:v0.1.7-boringcrypto
   name: Build
 trigger:
   event:
@@ -397,7 +397,7 @@ steps:
 - commands:
   - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
   failure: ignore
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Configure QEMU
   volumes:
   - name: docker
@@ -417,7 +417,7 @@ steps:
       from_secret: docker_password
     GCR_CREDS:
       from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Publish container
   volumes:
   - name: docker
@@ -440,7 +440,7 @@ steps:
 - commands:
   - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
   failure: ignore
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Configure QEMU
   volumes:
   - name: docker
@@ -460,7 +460,7 @@ steps:
       from_secret: docker_password
     GCR_CREDS:
       from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Publish container
   volumes:
   - name: docker
@@ -494,7 +494,7 @@ steps:
       from_secret: docker_password
     GCR_CREDS:
       from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.6-windows
+  image: grafana/alloy-build-image:v0.1.7-windows
   name: Build containers
   volumes:
   - name: docker
@@ -517,7 +517,7 @@ steps:
 - commands:
   - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
   failure: ignore
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Configure QEMU
   volumes:
   - name: docker
@@ -537,7 +537,7 @@ steps:
       from_secret: docker_password
     GCR_CREDS:
       from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Publish container
   volumes:
   - name: docker
@@ -560,7 +560,7 @@ steps:
 - commands:
   - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
   failure: ignore
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Configure QEMU
   volumes:
   - name: docker
@@ -580,7 +580,7 @@ steps:
       from_secret: docker_password
     GCR_CREDS:
       from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Publish container
   volumes:
   - name: docker
@@ -614,7 +614,7 @@ steps:
       from_secret: docker_password
     GCR_CREDS:
       from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.6-windows
+  image: grafana/alloy-build-image:v0.1.7-windows
   name: Build containers
   volumes:
   - name: docker
@@ -715,7 +715,7 @@ steps:
       from_secret: gpg_private_key
     GPG_PUBLIC_KEY:
       from_secret: gpg_public_key
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Publish release
   volumes:
   - name: docker
@@ -738,7 +738,7 @@ steps:
 - commands:
   - DOCKER_OPTS="" make dist/alloy-linux-amd64
   - DOCKER_OPTS="" make test-packages
-  image: grafana/alloy-build-image:v0.1.6
+  image: grafana/alloy-build-image:v0.1.7
   name: Test Linux system packages
   volumes:
   - name: docker
@@ -836,6 +836,6 @@ kind: secret
 name: updater_private_key
 ---
 kind: signature
-hmac: fd0699c2276e04bf3f9957b8eca427f3812c0aaf17bb969760f66574dcaf250c
+hmac: 10e6be95fbe639c7701a96c7b0523e849b28389d09eda8b122de3c981a93c4c0
 
 ...
diff --git a/.drone/pipelines/build_images.jsonnet b/.drone/pipelines/build_images.jsonnet
@@ -32,7 +32,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.7-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image',
+        'docker buildx build --build-arg="GO_RUNTIME=golang:1.23.3-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image',
       ],
     }],
     volumes: [{
@@ -55,7 +55,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.7-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image',
+        'docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.23.3-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/alloy-build-image:$IMAGE_TAG ./tools/build-image',
       ],
     }],
     volumes: [{

diff --git a/.github/workflows/check-linux-build-image.yml b/.github/workflows/check-linux-build-image.yml
@@ -7,11 +7,19 @@ on:
 
 jobs:
   check-linux-build-image:
-    runs-on: ubuntu-latest
+    runs-on: github-hosted-ubuntu-x64-large
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - 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: Setup QEMU
         uses: docker/setup-qemu-action@v3
 
@@ -25,7 +33,7 @@ jobs:
           push: false
           tags: grafana/alloy-build-image:latest
           build-args: |
-            GO_RUNTIME=golang:1.22.7-bullseye
+            GO_RUNTIME=golang:1.23.3-bullseye
 
       - name: Create test Linux build image for boring crypto
         uses: docker/build-push-action@v6
@@ -34,4 +42,4 @@ jobs:
           push: false
           tags: grafana/alloy-build-image:latest
           build-args: |
-            GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.7-bullseye
+            GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.23.3-bullseye
diff --git a/.github/workflows/deploy-pr-preview.yml b/.github/workflows/deploy-pr-preview.yml
@@ -0,0 +1,23 @@
+name: Deploy pr preview
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - closed
+    paths:
+      - "docs/sources/**"
+
+jobs:
+  deploy-pr-preview:
+    uses: grafana/writers-toolkit/.github/workflows/deploy-preview.yml@main
+    with:
+      sha: ${{ github.event.pull_request.head.sha }}
+      branch: ${{ github.head_ref }}
+      event_number: ${{ github.event.number }}
+      title: ${{ github.event.pull_request.title }}
+      repo: alloy
+      website_directory: content/docs/alloy/latest
+      relative_prefix: /docs/alloy/latest/
+      index_file: true
diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
@@ -13,7 +13,8 @@ jobs:
   # platform, but we're really only looking for issues that are
   # architecture-independent.
   linux:
-    runs-on: ubuntu-latest
+    # We use a large runner for the additional disk space.
+    runs-on: github-hosted-ubuntu-x64-large
     steps:
       - uses: actions/checkout@v4
       - name: Build image

diff --git a/.github/workflows/fuzz-go.yml b/.github/workflows/fuzz-go.yml
@@ -67,10 +67,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up Go 1.22
+      - name: Set up Go 1.23
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           cache: false
 
       - name: Find cache location

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v5
       with:
-        go-version: "1.22"
+        go-version: "1.23"
     - name: Set OTEL Exporter Endpoint
       run: echo "OTEL_EXPORTER_ENDPOINT=172.17.0.1:4318" >> $GITHUB_ENV
     - name: Run tests