Update from upstream repository

.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "grafana/loki-build-image:0.35.0",
+  "image": "grafana/loki-build-image:0.35.1",
   "containerEnv": {
     "BUILD_IN_CONTAINER": "false"
   },

.github/pull_request_template.md

@@ -10,6 +10,5 @@ Fixes #<issue number>
 - [ ] Documentation added
 - [ ] Tests updated
 - [ ] Title matches the required conventional commits format, see [here](https://www.conventionalcommits.org/en/v1.0.0/)
-  - **Note** that Promtail is considered to be feature complete, and future development for logs collection will be in [Grafana Alloy](https://github.com/grafana/alloy). As such, `feat` PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
 - [ ] Changes that require user attention or interaction to upgrade are documented in `docs/sources/setup/upgrade/_index.md`
 - [ ] If the change is deprecating or removing a configuration option, update the `deprecated-config.yaml` and `deleted-config.yaml` files respectively in the `tools/deprecated-config-checker` directory. [Example PR](https://github.com/grafana/loki/pull/10840/commits/0d4416a4b03739583349934b96f272fb4f685d15)

.github/release-workflows.jsonnet

@@ -28,7 +28,6 @@ local imageJobs = {
   logcli: build.image('logcli', 'cmd/logcli', platform=platforms.all),
   'loki-canary': build.image('loki-canary', 'cmd/loki-canary', platform=platforms.all),
   'loki-canary-boringcrypto': build.image('loki-canary-boringcrypto', 'cmd/loki-canary-boringcrypto', platform=platforms.all),
-  promtail: build.image('promtail', 'clients/cmd/promtail', platform=platforms.all),
   querytee: build.image('loki-query-tee', 'cmd/querytee', platform=[r.forPlatform('linux/amd64'), r.forPlatform('linux/arm64')]),
   'loki-docker-driver': build.dockerPlugin('loki-docker-driver', dockerPluginDir, buildImage=buildImage, platform=[r.forPlatform('linux/amd64'), r.forPlatform('linux/arm64')]),
   'loki-helm-test': build.image('loki-helm-test', 'production/helm/loki/src/helm-test', platform=platforms.all),
@@ -38,7 +37,6 @@ local weeklyImageJobs = {
   loki: build.weeklyImage('loki', 'cmd/loki', platform=platforms.all),
   'loki-canary': build.weeklyImage('loki-canary', 'cmd/loki-canary', platform=platforms.all),
   'loki-canary-boringcrypto': build.weeklyImage('loki-canary-boringcrypto', 'cmd/loki-canary-boringcrypto', platform=platforms.all),
-  promtail: build.weeklyImage('promtail', 'clients/cmd/promtail', platform=platforms.all),
   querytee: build.weeklyImage('loki-query-tee', 'cmd/querytee'),
 };
 

.github/renovate.json5

@@ -16,16 +16,16 @@
   prHourlyLimit: 4,
   baseBranchPatterns: [
     'main',
-    'release-3.6.x', // Update when a new release is out, 2 minors, 1 major.
-    'release-3.5.x', // Also ensure to update the 'packageRules' section to match
+    'release-3.7.x', // Update when a new release is out, 2 minors, 1 major.
+    'release-3.6.x', // Also ensure to update the 'packageRules' section to match
     //'release-2.9.x',
   ],
   packageRules: [
     {
       // Disable updates for all branches - we only want security updates
       matchBaseBranches: [
+        'release-3.7.x',
         'release-3.6.x',
-        'release-3.5.x',
         'release-2.9.x',
       ],
       enabled: false,
@@ -37,8 +37,8 @@
     // global 'vulnerabilityAlerts' for this scope.
     matchBaseBranches: [
       'release-2.9.x', 
-      //'release-3.4.x', 
-      'release-3.5.x'
+      'release-3.6.x', 
+      'release-3.7.x'
     ],
     matchFileNames: ['operator/**'],
     enabled: false

.github/workflows/build-loki-binary.yml

@@ -27,8 +27,6 @@ jobs:
             path: ./cmd/logcli
           - name: querytee
             path: ./cmd/querytee
-          - name: promtail
-            path: ./clients/cmd/promtail
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/check.yml

@@ -2,7 +2,7 @@
   "check":
     "uses": "grafana/loki-release/.github/workflows/check.yml@fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
     "with":
-      "build_image": "grafana/loki-build-image:0.35.0"
+      "build_image": "grafana/loki-build-image:0.35.1"
       "golang_ci_lint_version": "v2.10.1"
       "release_lib_ref": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
       "skip_validation": false

.github/workflows/images.yml

@@ -2,15 +2,15 @@
   "check":
     "uses": "grafana/loki-release/.github/workflows/check.yml@fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
     "with":
-      "build_image": "grafana/loki-build-image:0.35.0"
+      "build_image": "grafana/loki-build-image:0.35.1"
       "golang_ci_lint_version": "v2.10.1"
       "release_lib_ref": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
       "skip_validation": false
       "use_github_app_token": true
   "loki-canary-boringcrypto-image":
     "env":
       "BUILD_TIMEOUT": 60
-      "GO_VERSION": "1.26.0"
+      "GO_VERSION": "1.26.2"
       "IMAGE_PREFIX": "grafana"
       "RELEASE_LIB_REF": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
       "RELEASE_REPO": "grafana/loki"
@@ -134,7 +134,7 @@
   "loki-canary-image":
     "env":
       "BUILD_TIMEOUT": 60
-      "GO_VERSION": "1.26.0"
+      "GO_VERSION": "1.26.2"
       "IMAGE_PREFIX": "grafana"
       "RELEASE_LIB_REF": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
       "RELEASE_REPO": "grafana/loki"
@@ -258,7 +258,7 @@
   "loki-image":
     "env":
       "BUILD_TIMEOUT": 60
-      "GO_VERSION": "1.26.0"
+      "GO_VERSION": "1.26.2"
       "IMAGE_PREFIX": "grafana"
       "RELEASE_LIB_REF": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
       "RELEASE_REPO": "grafana/loki"
@@ -379,134 +379,10 @@
           ${OUTPUTS_IMAGE_NAME}@${IMAGE_DIGEST_AMD64} \
           ${OUTPUTS_IMAGE_NAME}@${IMAGE_DIGEST_ARM}
         docker buildx imagetools inspect $IMAGE
-  "promtail-image":
-    "env":
-      "BUILD_TIMEOUT": 60
-      "GO_VERSION": "1.26.0"
-      "IMAGE_PREFIX": "grafana"
-      "RELEASE_LIB_REF": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
-      "RELEASE_REPO": "grafana/loki"
-    "needs":
-    - "check"
-    "outputs":
-      "image_digest_linux_amd64": "${{ steps.digest.outputs.digest_linux_amd64 }}"
-      "image_digest_linux_arm": "${{ steps.digest.outputs.digest_linux_arm }}"
-      "image_digest_linux_arm64": "${{ steps.digest.outputs.digest_linux_arm64 }}"
-      "image_name": "${{ steps.weekly-version.outputs.image_name }}"
-      "image_tag": "${{ steps.weekly-version.outputs.image_version }}"
-    "permissions":
-      "contents": "read"
-      "id-token": "write"
-    "runs-on": "${{ matrix.runs_on }}"
-    "steps":
-    - "name": "pull release library code"
-      "uses": "actions/checkout@v4"
-      "with":
-        "path": "lib"
-        "persist-credentials": false
-        "ref": "${{ env.RELEASE_LIB_REF }}"
-        "repository": "grafana/loki-release"
-    - "name": "pull code to release"
-      "uses": "actions/checkout@v4"
-      "with":
-        "path": "release"
-        "persist-credentials": false
-        "repository": "${{ env.RELEASE_REPO }}"
-    - "name": "setup node"
-      "uses": "actions/setup-node@v4"
-      "with":
-        "node-version": 20
-        "package-manager-cache": false
-    - "name": "Set up Docker buildx"
-      "uses": "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2"
-    - "name": "Login to DockerHub (from Vault)"
-      "uses": "grafana/shared-workflows/actions/dockerhub-login@fa48192dac470ae356b3f7007229f3ac28c48a25"
-    - "id": "weekly-version"
-      "name": "Get weekly version"
-      "run": |
-        version=$(./tools/image-tag)
-        echo "image_version=$version" >> $GITHUB_OUTPUT
-        echo "image_name=${{ env.IMAGE_PREFIX }}/promtail" >> $GITHUB_OUTPUT
-        echo "image_full_name=${{ env.IMAGE_PREFIX }}/promtail:$version" >> $GITHUB_OUTPUT
-      "working-directory": "release"
-    - "id": "platform"
-      "name": "Parse image platform"
-      "run": |
-        platform="$(echo "${{ matrix.arch }}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
-        echo "platform=${platform}" >> $GITHUB_OUTPUT
-        echo "platform_short=$(echo ${{ matrix.arch }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
-      "working-directory": "release"
-    - "id": "build-push"
-      "name": "Build and push"
-      "timeout-minutes": "${{ fromJSON(env.BUILD_TIMEOUT) }}"
-      "uses": "docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1"
-      "with":
-        "build-args": |
-          IMAGE_TAG=${{ steps.weekly-version.outputs.image_version }}
-          GO_VERSION=${{ env.GO_VERSION }}
-        "context": "release"
-        "file": "release/clients/cmd/promtail/Dockerfile"
-        "outputs": "push-by-digest=true,type=image,name=${{ steps.weekly-version.outputs.image_name }},push=true"
-        "platforms": "${{ matrix.arch }}"
-        "provenance": true
-        "tags": "${{ steps.weekly-version.outputs.image_name }}"
-    - "env":
-        "OUTPUTS_DIGEST": "${{ steps.build-push.outputs.digest }}"
-      "id": "digest"
-      "name": "Process image digest"
-      "run": |
-        arch=$(echo ${{ matrix.arch }} | tr "/" "_")
-        echo "digest_$arch=$OUTPUTS_DIGEST" >> $GITHUB_OUTPUT
-      "working-directory": "release"
-    "strategy":
-      "fail-fast": true
-      "matrix":
-        "include":
-        - "arch": "linux/amd64"
-          "runs_on":
-          - "github-hosted-ubuntu-x64-small"
-        - "arch": "linux/arm64"
-          "runs_on":
-          - "github-hosted-ubuntu-arm64-small"
-        - "arch": "linux/arm"
-          "runs_on":
-          - "github-hosted-ubuntu-arm64-small"
-  "promtail-manifest":
-    "env":
-      "BUILD_TIMEOUT": 60
-      "IMAGE_DIGEST_AMD64": "${{ needs.promtail-image.outputs.image_digest_linux_amd64 }}"
-      "IMAGE_DIGEST_ARM": "${{ needs.promtail-image.outputs.image_digest_linux_arm }}"
-      "IMAGE_DIGEST_ARM64": "${{ needs.promtail-image.outputs.image_digest_linux_arm64 }}"
-      "OUTPUTS_IMAGE_NAME": "${{ needs.promtail-image.outputs.image_name }}"
-      "OUTPUTS_IMAGE_TAG": "${{ needs.promtail-image.outputs.image_tag }}"
-    "needs":
-    - "promtail-image"
-    "permissions":
-      "contents": "read"
-      "id-token": "write"
-    "runs-on": "ubuntu-latest"
-    "steps":
-    - "name": "Set up Docker buildx"
-      "uses": "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2"
-    - "name": "Login to DockerHub (from Vault)"
-      "uses": "grafana/shared-workflows/actions/dockerhub-login@75804962c1ba608148988c1e2dc35fbb0ee21746"
-    - "name": "Publish multi-arch manifest"
-      "run": |
-        # Unfortunately there is no better way atm than having a separate named output for each digest
-        echo "linux/arm64 $IMAGE_DIGEST_ARM64"
-        echo "linux/amd64 $IMAGE_DIGEST_AMD64"
-        echo "linux/arm   $IMAGE_DIGEST_ARM"
-        IMAGE="${OUTPUTS_IMAGE_NAME}:${OUTPUTS_IMAGE_TAG}"
-        echo "Create multi-arch manifest for $IMAGE"
-        docker buildx imagetools create -t $IMAGE \
-          ${OUTPUTS_IMAGE_NAME}@${IMAGE_DIGEST_ARM64} \
-          ${OUTPUTS_IMAGE_NAME}@${IMAGE_DIGEST_AMD64} \
-          ${OUTPUTS_IMAGE_NAME}@${IMAGE_DIGEST_ARM}
-        docker buildx imagetools inspect $IMAGE
   "querytee-image":
     "env":
       "BUILD_TIMEOUT": 60
-      "GO_VERSION": "1.26.0"
+      "GO_VERSION": "1.26.2"
       "IMAGE_PREFIX": "grafana"
       "RELEASE_LIB_REF": "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
       "RELEASE_REPO": "grafana/loki"

.github/workflows/minor-release-pr.yml

@@ -21,7 +21,7 @@ jobs:
       pull-requests: "write"
     uses: "grafana/loki-release/.github/workflows/check.yml@fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
     with:
-      build_image: "grafana/loki-build-image:0.35.0"
+      build_image: "grafana/loki-build-image:0.35.1"
       golang_ci_lint_version: "v2.10.1"
       release_lib_ref: "fb3b12ec3e6411bcb951a5ea08cc983c2f2735fc"
       skip_validation: false
@@ -38,7 +38,6 @@ jobs:
     - "loki-canary-boringcrypto"
     - "loki-docker-driver"
     - "loki-helm-test"
-    - "promtail"
     - "querytee"
     permissions:
       contents: "write"
@@ -180,10 +179,10 @@ jobs:
           --env SKIP_ARM \
           --volume .:/src/loki \
           --workdir /src/loki \
-          --entrypoint /bin/sh "grafana/loki-build-image:0.35.0"
+          --entrypoint /bin/sh "grafana/loki-build-image:0.35.1"
           git config --global --add safe.directory /src/loki
           echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
-          if echo "grafana/loki-build-image:0.35.0" | grep -q "golang"; then
+          if echo "grafana/loki-build-image:0.35.1" | grep -q "golang"; then
             /src/loki/.github/vendor/github.com/grafana/loki-release/workflows/install_workflow_dependencies.sh dist
           fi
           make dist packages
@@ -799,7 +798,7 @@ jobs:
         build-args: |
           IMAGE_TAG=${{ needs.version.outputs.version }}
           GOARCH=${{ steps.platform.outputs.platform_short }}
-          BUILD_IMAGE=grafana/loki-build-image:0.35.0
+          BUILD_IMAGE=grafana/loki-build-image:0.35.1
         context: "release"
         file: "release/clients/cmd/docker-driver/Dockerfile"
         outputs: "type=local,dest=release/plugins/loki-docker-driver-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}"
@@ -912,86 +911,6 @@ jobs:
         - arch: "linux/arm"
           runs_on:
           - "github-hosted-ubuntu-arm64-small"
-  promtail:
-    needs:
-    - "version"
-    permissions:
-      contents: "write"
-      id-token: "write"
-      pull-requests: "write"
-    runs-on: "${{ matrix.runs_on }}"
-    steps:
-    - name: "pull release library code"
-      uses: "actions/checkout@v4"
-      with:
-        path: "lib"
-        persist-credentials: false
-        ref: "${{ env.RELEASE_LIB_REF }}"
-        repository: "grafana/loki-release"
-    - name: "pull code to release"
-      uses: "actions/checkout@v4"
-      with:
-        path: "release"
-        persist-credentials: false
-        repository: "${{ env.RELEASE_REPO }}"
-    - name: "setup node"
-      uses: "actions/setup-node@v4"
-      with:
-        node-version: 20
-        package-manager-cache: false
-    - id: "fetch_gcs_credentials"
-      name: "fetch gcs credentials from vault"
-      uses: "grafana/shared-workflows/actions/get-vault-secrets@28361cdb22223e5f1e34358c86c20908e7248760"
-      with:
-        repo_secrets: "GCS_SERVICE_ACCOUNT_KEY=gcs:service-account-key"
-    - name: "auth gcs"
-      uses: "google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f"
-      with:
-        credentials_json: "${{ env.GCS_SERVICE_ACCOUNT_KEY }}"
-    - name: "Set up Docker buildx"
-      uses: "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2"
-    - id: "platform"
-      name: "Parse image platform"
-      run: |
-        mkdir -p images
-
-        platform="$(echo "${{ matrix.arch }}" | sed "s/\(.*\)\/\(.*\)/\1-\2/")"
-        echo "platform=${platform}" >> $GITHUB_OUTPUT
-        echo "platform_short=$(echo ${{ matrix.arch }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
-      working-directory: "release"
-    - env:
-        IMAGE_TAG: "${{ needs.version.outputs.version }}"
-      if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
-      name: "Build and export"
-      timeout-minutes: "${{ fromJSON(env.BUILD_TIMEOUT) }}"
-      uses: "docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1"
-      with:
-        build-args: "IMAGE_TAG=${{ needs.version.outputs.version }}"
-        context: "release"
-        file: "release/clients/cmd/promtail/Dockerfile"
-        outputs: "type=docker,dest=release/images/promtail-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}.tar"
-        platforms: "${{ matrix.arch }}"
-        tags: "${{ env.IMAGE_PREFIX }}/promtail:${{ needs.version.outputs.version }}-${{ steps.platform.outputs.platform_short }}"
-    - if: "${{ fromJSON(needs.version.outputs.pr_created) }}"
-      name: "Upload artifacts"
-      uses: "google-github-actions/upload-cloud-storage@386ab77f37fdf51c0e38b3d229fad286861cc0d0"
-      with:
-        destination: "${{ env.BUILD_ARTIFACTS_BUCKET }}/${{ github.sha }}/images"
-        path: "release/images/promtail-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}.tar"
-        process_gcloudignore: false
-    strategy:
-      fail-fast: true
-      matrix:
-        include:
-        - arch: "linux/amd64"
-          runs_on:
-          - "github-hosted-ubuntu-x64-small"
-        - arch: "linux/arm64"
-          runs_on:
-          - "github-hosted-ubuntu-arm64-small"
-        - arch: "linux/arm"
-          runs_on:
-          - "github-hosted-ubuntu-arm64-small"
   querytee:
     needs:
     - "version"

.github/workflows/nix-ci.yaml

@@ -39,7 +39,6 @@ jobs:
       - uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31.8.2
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - run: nix build --print-build-logs .#promtail
       - run: nix build --print-build-logs .#logcli
       - run: nix build --print-build-logs .#loki
       - run: nix build --print-build-logs .#loki-canary

.github/workflows/operator-reusable-hub-release.yml

@@ -9,11 +9,6 @@ on:
       repo:
         type: string
         required: true
-    secrets:
-      APP_ID:
-        required: true
-      APP_PRIVATE_KEY:
-        required: true
 
 jobs:
   create-operator-pull-request: