Merge branch 'main' into helm-ruler-querier

.devcontainer/devcontainer.json

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

.github/jsonnetfile.json

@@ -8,7 +8,7 @@
           "subdir": "workflows"
         }
       },
-      "version": "d900569c04b53e02de6ef208fa77cba41ec5f709"
+      "version": "21f1189544e3976070cbdb6463f64c7a32dcc176"
     }
   ],
   "legacyImports": true

.github/jsonnetfile.lock.json

@@ -8,8 +8,8 @@
           "subdir": "workflows"
         }
       },
-      "version": "d900569c04b53e02de6ef208fa77cba41ec5f709",
-      "sum": "+uAzU+b+aJtp3k+JX5mDxuh8LNY23+cHvUOwzCQ8CS8="
+      "version": "21f1189544e3976070cbdb6463f64c7a32dcc176",
+      "sum": "IPS1oGR8k7jk6J2snciTycWFgtISCwXSPhJ3A+nEGvY="
     }
   ],
   "legacyImports": false

.github/release-workflows.jsonnet

@@ -15,6 +15,7 @@ local imageJobs = {
   'loki-canary-boringcrypto': build.image('loki-canary-boringcrypto', 'cmd/loki-canary-boringcrypto'),
   promtail: build.image('promtail', 'clients/cmd/promtail'),
   querytee: build.image('loki-query-tee', 'cmd/querytee', platform=['linux/amd64']),
+  'loki-docker-driver': build.dockerPlugin('grafana/loki-docker-driver', 'clients/cmd/docker-driver', platform=['linux/amd64', 'linux/arm64']),
 };
 
 local weeklyImageJobs = {
@@ -27,6 +28,7 @@ local weeklyImageJobs = {
   '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');

.github/renovate.json5

@@ -0,0 +1,101 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ],
+  "labels": [
+    "dependencies"
+  ],
+  "prHourlyLimit": 4,
+  "baseBranches": [
+    "main"
+  ],
+  "packageRules": [
+    {
+      "matchBaseBranches": [
+        "release-2.9.x",
+        "release-2.8.x"
+      ],
+      "enabled": false,
+      "matchPackageNames": [
+        "*"
+      ]
+    },
+    {
+      // Disable Go version updates
+      "matchManagers": ["gomod"],
+      "matchPackageNames": ["go"],
+      "enabled": false
+    },
+    {
+      // Disable Go and loki-build-image updates for Dockerfiles
+      "matchManagers": ["dockerfile"],
+      "matchPackageNames": ["golang", "grafana/loki-build-image"],
+      "enabled": false
+    },
+    {
+      // Don't automatically merge GitHub Actions updates
+      "matchManagers": ["github-actions"],
+      "enabled": true,
+      "matchUpdateTypes": ["major", "minor", "patch"],
+      "autoApprove": false,
+      "automerge": false
+    },
+    {
+      // Separate out Helm updates from other dependencies
+      // Don't automatically merge Helm updates
+      // Updates to this require the docs to be updated
+      "matchManagers": ["helm-requirements", "helm-values", "helmv3"],
+      "groupName": "helm-{{packageName}}",
+      "matchUpdateTypes": ["major", "minor", "patch"],
+      "autoApprove": false,
+      "automerge": false
+    },
+    {
+      // Separate out lambda-promtail updates from other dependencies
+      // Don't automatically merge lambda-promtail updates
+      // Updates to this require the nix SHA to be updated
+      "matchFileNames": ["tools/lambda-promtail/go.mod"],
+      "groupName": "lambdapromtail-{{packageName}}",
+      "enabled": true,
+      "matchUpdateTypes": ["major", "minor", "patch"],
+      "autoApprove": false,
+      "automerge": false
+    },
+    {
+      // Disable operator updates
+      "matchFileNames": ["operator/go.mod", "operator/api/loki/go.mod"],
+      "enabled": false,
+      "autoApprove": false,
+      "automerge": false
+    },
+    {
+      // Enable all other updates
+      "matchFileNames": ["!tools/lambda-promtail/go.mod", "!operator/go.mod", "!operator/api/loki/go.mod"],
+      "groupName": "{{packageName}}",
+      "enabled": true,
+      "matchUpdateTypes": ["major", "minor", "patch"],
+      // After we have tested the above configuration, we can enable the following
+      "automerge": false,
+      "autoApprove": false
+    }
+  ],
+  "digest": {
+    "enabled": false
+  },
+  "vulnerabilityAlerts": {
+    "enabled": true,
+    "addLabels": [
+      "area/security"
+    ]
+  },
+  "osvVulnerabilityAlerts": true,
+  "prConcurrentLimit": 10,
+  "rebaseWhen": "conflicted",
+  "branchPrefix": "deps-update/",
+  "postUpdateOptions": [
+    "gomodTidy"
+  ],
+  "semanticCommitType": "fix",
+  "semanticCommitScope": "deps"
+}

.github/workflows/check.yml

@@ -2,7 +2,7 @@
   "check":
     "uses": "grafana/loki-release/.github/workflows/check.yml@main"
     "with":
-      "build_image": "grafana/loki-build-image:0.34.0"
+      "build_image": "grafana/loki-build-image:0.34.1"
       "golang_ci_lint_version": "v1.60.3"
       "release_lib_ref": "main"
       "skip_validation": false
@@ -12,4 +12,4 @@
   "pull_request": {}
   "push":
     "branches":
-    - "main"
+    - "main"

.github/workflows/doc-validator.yml

@@ -7,7 +7,7 @@ jobs:
   doc-validator:
     runs-on: "ubuntu-latest"
     container:
-      image: "grafana/doc-validator:v5.1.0"
+      image: "grafana/doc-validator:v5.2.0"
     steps:
       - name: "Checkout code"
         uses: "actions/checkout@v4"