Merge branch 'main' into deps-update/rollout-operator

grafana · Dec 9, 2024 · 3b0a740 · 3b0a740
2 parents af0be5d + 03a0587
commit 3b0a740
Show file tree

Hide file tree

Showing 41 changed files with 675 additions and 705 deletions.
diff --git a/.github/release-workflows.jsonnet b/.github/release-workflows.jsonnet
@@ -20,15 +20,9 @@ local imageJobs = {
 
 local weeklyImageJobs = {
   loki: build.weeklyImage('loki', 'cmd/loki'),
-  fluentd: build.weeklyImage('fluent-plugin-loki', 'clients/cmd/fluentd', platform=['linux/amd64']),
-  'fluent-bit': build.weeklyImage('fluent-bit-plugin-loki', 'clients/cmd/fluent-bit', platform=['linux/amd64']),
-  logstash: build.weeklyImage('logstash-output-loki', 'clients/cmd/logstash', platform=['linux/amd64']),
-  logcli: build.weeklyImage('logcli', 'cmd/logcli'),
   'loki-canary': build.weeklyImage('loki-canary', 'cmd/loki-canary'),
   'loki-canary-boringcrypto': build.weeklyImage('loki-canary-boringcrypto', 'cmd/loki-canary-boringcrypto'),
   promtail: build.weeklyImage('promtail', 'clients/cmd/promtail'),
-  querytee: build.weeklyImage('loki-query-tee', 'cmd/querytee', platform=['linux/amd64']),
-  'loki-docker-driver': build.weeklyDockerPlugin('grafana/loki-docker-driver', 'clients/cmd/docker-driver', platform=['linux/amd64', 'linux/arm64']),
 };
 
 local buildImageVersion = std.extVar('BUILD_IMAGE_VERSION');

diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
@@ -7,190 +7,6 @@
       "release_lib_ref": "main"
       "skip_validation": false
       "use_github_app_token": true
-  "fluent-bit":
-    "env":
-      "BUILD_TIMEOUT": 60
-      "IMAGE_PREFIX": "grafana"
-      "RELEASE_LIB_REF": "main"
-      "RELEASE_REPO": "grafana/loki"
-    "needs":
-    - "check"
-    "runs-on": "ubuntu-latest"
-    "steps":
-    - "name": "pull release library code"
-      "uses": "actions/checkout@v4"
-      "with":
-        "path": "lib"
-        "ref": "${{ env.RELEASE_LIB_REF }}"
-        "repository": "grafana/loki-release"
-    - "name": "pull code to release"
-      "uses": "actions/checkout@v4"
-      "with":
-        "path": "release"
-        "repository": "${{ env.RELEASE_REPO }}"
-    - "name": "setup node"
-      "uses": "actions/setup-node@v4"
-      "with":
-        "node-version": 20
-    - "name": "Set up QEMU"
-      "uses": "docker/setup-qemu-action@v3"
-    - "name": "set up docker buildx"
-      "uses": "docker/setup-buildx-action@v3"
-    - "name": "Login to DockerHub (from vault)"
-      "uses": "grafana/shared-workflows/actions/dockerhub-login@main"
-    - "id": "weekly-version"
-      "name": "Get weekly version"
-      "run": |
-        echo "version=$(./tools/image-tag)" >> $GITHUB_OUTPUT
-      "working-directory": "release"
-    - "name": "Build and push"
-      "timeout-minutes": "${{ fromJSON(env.BUILD_TIMEOUT) }}"
-      "uses": "docker/build-push-action@v6"
-      "with":
-        "build-args": "IMAGE_TAG=${{ steps.weekly-version.outputs.version }}"
-        "context": "release"
-        "file": "release/clients/cmd/fluent-bit/Dockerfile"
-        "platforms": "linux/amd64"
-        "push": true
-        "tags": "${{ env.IMAGE_PREFIX }}/fluent-bit-plugin-loki:${{ steps.weekly-version.outputs.version }}"
-  "fluentd":
-    "env":
-      "BUILD_TIMEOUT": 60
-      "IMAGE_PREFIX": "grafana"
-      "RELEASE_LIB_REF": "main"
-      "RELEASE_REPO": "grafana/loki"
-    "needs":
-    - "check"
-    "runs-on": "ubuntu-latest"
-    "steps":
-    - "name": "pull release library code"
-      "uses": "actions/checkout@v4"
-      "with":
-        "path": "lib"
-        "ref": "${{ env.RELEASE_LIB_REF }}"
-        "repository": "grafana/loki-release"
-    - "name": "pull code to release"
-      "uses": "actions/checkout@v4"
-      "with":
-        "path": "release"
-        "repository": "${{ env.RELEASE_REPO }}"
-    - "name": "setup node"
-      "uses": "actions/setup-node@v4"
-      "with":
-        "node-version": 20
-    - "name": "Set up QEMU"
-      "uses": "docker/setup-qemu-action@v3"
-    - "name": "set up docker buildx"
-      "uses": "docker/setup-buildx-action@v3"
-    - "name": "Login to DockerHub (from vault)"
-      "uses": "grafana/shared-workflows/actions/dockerhub-login@main"
-    - "id": "weekly-version"
-      "name": "Get weekly version"
-      "run": |
-        echo "version=$(./tools/image-tag)" >> $GITHUB_OUTPUT
-      "working-directory": "release"
-    - "name": "Build and push"
-      "timeout-minutes": "${{ fromJSON(env.BUILD_TIMEOUT) }}"
-      "uses": "docker/build-push-action@v6"
-      "with":
-        "build-args": "IMAGE_TAG=${{ steps.weekly-version.outputs.version }}"
-        "context": "release"
-        "file": "release/clients/cmd/fluentd/Dockerfile"
-        "platforms": "linux/amd64"
-        "push": true
-        "tags": "${{ env.IMAGE_PREFIX }}/fluent-plugin-loki:${{ steps.weekly-version.outputs.version }}"
-  "logcli":
-    "env":
-      "BUILD_TIMEOUT": 60
-      "IMAGE_PREFIX": "grafana"
-      "RELEASE_LIB_REF": "main"
-      "RELEASE_REPO": "grafana/loki"
-    "needs":
-    - "check"
-    "runs-on": "ubuntu-latest"
-    "steps":
-    - "name": "pull release library code"
-      "uses": "actions/checkout@v4"
-      "with":
-        "path": "lib"
-        "ref": "${{ env.RELEASE_LIB_REF }}"
-        "repository": "grafana/loki-release"
-    - "name": "pull code to release"
-      "uses": "actions/checkout@v4"
-      "with":
-        "path": "release"
-        "repository": "${{ env.RELEASE_REPO }}"
-    - "name": "setup node"
-      "uses": "actions/setup-node@v4"
-      "with":
-        "node-version": 20
-    - "name": "Set up QEMU"
-      "uses": "docker/setup-qemu-action@v3"
-    - "name": "set up docker buildx"
-      "uses": "docker/setup-buildx-action@v3"
-    - "name": "Login to DockerHub (from vault)"
-      "uses": "grafana/shared-workflows/actions/dockerhub-login@main"
-    - "id": "weekly-version"
-      "name": "Get weekly version"
-      "run": |
-        echo "version=$(./tools/image-tag)" >> $GITHUB_OUTPUT
-      "working-directory": "release"
-    - "name": "Build and push"
-      "timeout-minutes": "${{ fromJSON(env.BUILD_TIMEOUT) }}"
-      "uses": "docker/build-push-action@v6"
-      "with":
-        "build-args": "IMAGE_TAG=${{ steps.weekly-version.outputs.version }}"
-        "context": "release"
-        "file": "release/cmd/logcli/Dockerfile"
-        "platforms": "linux/amd64,linux/arm64,linux/arm"
-        "push": true
-        "tags": "${{ env.IMAGE_PREFIX }}/logcli:${{ steps.weekly-version.outputs.version }}"
-  "logstash":
-    "env":
-      "BUILD_TIMEOUT": 60
-      "IMAGE_PREFIX": "grafana"
-      "RELEASE_LIB_REF": "main"
-      "RELEASE_REPO": "grafana/loki"
-    "needs":
-    - "check"
-    "runs-on": "ubuntu-latest"
-    "steps":
-    - "name": "pull release library code"
-      "uses": "actions/checkout@v4"
-      "with":
-        "path": "lib"
-        "ref": "${{ env.RELEASE_LIB_REF }}"
-        "repository": "grafana/loki-release"
-    - "name": "pull code to release"
-      "uses": "actions/checkout@v4"
-      "with":
-        "path": "release"
-        "repository": "${{ env.RELEASE_REPO }}"
-    - "name": "setup node"
-      "uses": "actions/setup-node@v4"
-      "with":
-        "node-version": 20
-    - "name": "Set up QEMU"
-      "uses": "docker/setup-qemu-action@v3"
-    - "name": "set up docker buildx"
-      "uses": "docker/setup-buildx-action@v3"
-    - "name": "Login to DockerHub (from vault)"
-      "uses": "grafana/shared-workflows/actions/dockerhub-login@main"
-    - "id": "weekly-version"
-      "name": "Get weekly version"
-      "run": |
-        echo "version=$(./tools/image-tag)" >> $GITHUB_OUTPUT
-      "working-directory": "release"
-    - "name": "Build and push"
-      "timeout-minutes": "${{ fromJSON(env.BUILD_TIMEOUT) }}"
-      "uses": "docker/build-push-action@v6"
-      "with":
-        "build-args": "IMAGE_TAG=${{ steps.weekly-version.outputs.version }}"
-        "context": "release"
-        "file": "release/clients/cmd/logstash/Dockerfile"
-        "platforms": "linux/amd64"
-        "push": true
-        "tags": "${{ env.IMAGE_PREFIX }}/logstash-output-loki:${{ steps.weekly-version.outputs.version }}"
   "loki":
     "env":
       "BUILD_TIMEOUT": 60
@@ -329,78 +145,6 @@
         "platforms": "linux/amd64,linux/arm64,linux/arm"
         "push": true
         "tags": "${{ env.IMAGE_PREFIX }}/loki-canary-boringcrypto:${{ steps.weekly-version.outputs.version }}"
-  "loki-docker-driver":
-    "env":
-      "BUILD_TIMEOUT": 60
-      "IMAGE_PREFIX": "grafana"
-      "RELEASE_LIB_REF": "main"
-      "RELEASE_REPO": "grafana/loki"
-    "needs":
-    - "check"
-    "runs-on": "ubuntu-latest"
-    "steps":
-    - "name": "pull release library code"
-      "uses": "actions/checkout@v4"
-      "with":
-        "path": "lib"
-        "ref": "${{ env.RELEASE_LIB_REF }}"
-        "repository": "grafana/loki-release"
-    - "name": "pull code to release"
-      "uses": "actions/checkout@v4"
-      "with":
-        "path": "release"
-        "repository": "${{ env.RELEASE_REPO }}"
-    - "name": "setup node"
-      "uses": "actions/setup-node@v4"
-      "with":
-        "node-version": 20
-    - "name": "Set up QEMU"
-      "uses": "docker/setup-qemu-action@v3"
-    - "name": "set up docker buildx"
-      "uses": "docker/setup-buildx-action@v3"
-    - "name": "Login to DockerHub (from vault)"
-      "uses": "grafana/shared-workflows/actions/dockerhub-login@main"
-    - "id": "weekly-version"
-      "name": "Get weekly version"
-      "run": |
-        echo "version=$(./tools/image-tag)" >> $GITHUB_OUTPUT
-        
-        platform="$(echo "${{ matrix.platform}}" |  sed  "s/\(.*\)\/\(.*\)/\1-\2/")"
-        echo "platform=${platform}" >> $GITHUB_OUTPUT
-        echo "platform_short=$(echo ${{ matrix.platform }} | cut -d / -f 2)" >> $GITHUB_OUTPUT
-        if [[ "${platform}" == "linux/arm64" ]]; then
-          echo "plugin_arch=-arm64" >> $GITHUB_OUTPUT
-        else
-          echo "plugin_arch=" >> $GITHUB_OUTPUT
-        fi
-      "working-directory": "release"
-    - "name": "Build and export"
-      "timeout-minutes": "${{ fromJSON(env.BUILD_TIMEOUT) }}"
-      "uses": "docker/build-push-action@v6"
-      "with":
-        "build-args": "IMAGE_TAG=${{ steps.weekly-version.outputs.version }},GOARCH=${{ steps.weekly-version.outputs.platform_short }}"
-        "context": "release"
-        "file": "release/clients/cmd/docker-driver/Dockerfile"
-        "outputs": "type=docker,dest=release/images/grafana/loki-docker-driver-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}.tar"
-        "platforms": "${{ matrix.platform }}"
-        "push": false
-        "tags": "${{ env.IMAGE_PREFIX }}/grafana/loki-docker-driver:${{ steps.weekly-version.outputs.version }}"
-    - "env":
-        "BUILD_DIR": "release/clients/cmd/docker-driver"
-        "IMAGE_TAG": "${{ steps.weekly-version.outputs.version }}"
-      "name": "Package and push as Docker plugin"
-      "run": |
-        rm -rf "${{ env.BUILD_DIR }}/rootfs" || true
-        mkdir "${{ env.BUILD_DIR }}/rootfs"
-        tar -x -C "${{ env.BUILD_DIR }}/rootfs" -f "release/images/%s-${{ needs.version.outputs.version}}-${{ steps.platform.outputs.platform }}.tar"
-        docker plugin create "${{ env.IMAGE_TAG }}${{ steps.platform.outputs.plugin_arch }}" "${{ env.BUILD_DIR }}"
-        docker plugin push "${{ env.IMAGE_TAG }}${{ steps.platform.outputs.plugin_arch }}"
-      "working-directory": "release"
-    "strategy":
-      "matrix":
-        "platform":
-        - "linux/amd64"
-        - "linux/arm64"
   "promtail":
     "env":
       "BUILD_TIMEOUT": 60
@@ -447,52 +191,6 @@
         "platforms": "linux/amd64,linux/arm64,linux/arm"
         "push": true
         "tags": "${{ env.IMAGE_PREFIX }}/promtail:${{ steps.weekly-version.outputs.version }}"
-  "querytee":
-    "env":
-      "BUILD_TIMEOUT": 60
-      "IMAGE_PREFIX": "grafana"
-      "RELEASE_LIB_REF": "main"
-      "RELEASE_REPO": "grafana/loki"
-    "needs":
-    - "check"
-    "runs-on": "ubuntu-latest"
-    "steps":
-    - "name": "pull release library code"
-      "uses": "actions/checkout@v4"
-      "with":
-        "path": "lib"
-        "ref": "${{ env.RELEASE_LIB_REF }}"
-        "repository": "grafana/loki-release"
-    - "name": "pull code to release"
-      "uses": "actions/checkout@v4"
-      "with":
-        "path": "release"
-        "repository": "${{ env.RELEASE_REPO }}"
-    - "name": "setup node"
-      "uses": "actions/setup-node@v4"
-      "with":
-        "node-version": 20
-    - "name": "Set up QEMU"
-      "uses": "docker/setup-qemu-action@v3"
-    - "name": "set up docker buildx"
-      "uses": "docker/setup-buildx-action@v3"
-    - "name": "Login to DockerHub (from vault)"
-      "uses": "grafana/shared-workflows/actions/dockerhub-login@main"
-    - "id": "weekly-version"
-      "name": "Get weekly version"
-      "run": |
-        echo "version=$(./tools/image-tag)" >> $GITHUB_OUTPUT
-      "working-directory": "release"
-    - "name": "Build and push"
-      "timeout-minutes": "${{ fromJSON(env.BUILD_TIMEOUT) }}"
-      "uses": "docker/build-push-action@v6"
-      "with":
-        "build-args": "IMAGE_TAG=${{ steps.weekly-version.outputs.version }}"
-        "context": "release"
-        "file": "release/cmd/querytee/Dockerfile"
-        "platforms": "linux/amd64"
-        "push": true
-        "tags": "${{ env.IMAGE_PREFIX }}/loki-query-tee:${{ steps.weekly-version.outputs.version }}"
 "name": "publish images"
 "on":
   "push":

diff --git a/.github/workflows/nix-ci.yaml b/.github/workflows/nix-ci.yaml
@@ -1,6 +1,9 @@
 ---
 name: "Lint And Build Nix Flake"
 on:
+  push:
+    branches:
+      - main
   pull_request:
     paths:
       - "flake.nix"

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -12,5 +12,9 @@
 # The observability logs team is listed as co-codeowner for grammar file. This is to receive notifications about updates, so these can be implemented in https://github.com/grafana/lezer-logql
 /pkg/logql/syntax/expr.y @grafana/observability-logs @grafana/loki-team
 
+# Nix
+/nix/ @trevorwhitney
+flake.nix @trevorwhitney
+
 # No owners - allows sub-maintainers to merge changes.
 CHANGELOG.md
diff --git a/cmd/loki/loki-local-config.yaml b/cmd/loki/loki-local-config.yaml
@@ -25,6 +25,9 @@ query_range:
         enabled: true
         max_size_mb: 100
 
+limits_config:
+  metric_aggregation_enabled: true
+
 schema_config:
   configs:
     - from: 2020-10-24

diff --git a/docs/sources/release-notes/v2-9.md b/docs/sources/release-notes/v2-9.md
@@ -36,7 +36,14 @@ For a full list of all changes and fixes, refer to the [CHANGELOG](https://githu
 
 ## Bug fixes
 
-### 2.9.10 (2026-08-09)
+### 2.9.11 (2024-12-04)
+
+- **docker:** Update Docker to 23.0.15 ([#](https://github.com/grafana/loki/issues/)).
+- **lamba-promtail:** Lamba-promtail updates, some of which address CVEs([#14105](https://github.com/grafana/loki/issues/14105)).
+- **promtail:** Switch Promtail base image from Debian to Ubuntu to fix critical security issues ([#15195](https://github.com/grafana/loki/issues/15195)).
+- **storage:** Fix bug in cache of the index object client([#10585](https://github.com/grafana/loki/issues/10585)).
+
+### 2.9.10 (2024-08-09)
 
 - Update dependencies versions to remove CVE ([#13835](https://github.com/grafana/loki/pull/13835)) ([567bef2](https://github.com/grafana/loki/commit/567bef286376663407c54f5da07fa00963ba5485)).
 
@@ -97,4 +104,4 @@ For a full list of all changes and fixes, refer to the [CHANGELOG](https://githu
 - Updated Docker base images to mitigate security vulnerability CVE-2022-48174
 - Fixed bugs in indexshipper (`tsdb`, `boltdb-shipper`) that could result in not showing all ingested logs in query results.
 
-For a full list of all changes and fixes, refer to the [CHANGELOG](https://github.com/grafana/loki/blob/release-2.9.x/CHANGELOG.md).
+For a full list of all changes and fixes, refer to the [CHANGELOG](https://github.com/grafana/loki/blob/release-2.9.x/CHANGELOG.md).