Merge branch 'main' into trace-labels-in-distributor

.github/jsonnetfile.json

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

.github/jsonnetfile.lock.json

@@ -8,8 +8,8 @@
           "subdir": "workflows"
         }
       },
-      "version": "21f1189544e3976070cbdb6463f64c7a32dcc176",
-      "sum": "IPS1oGR8k7jk6J2snciTycWFgtISCwXSPhJ3A+nEGvY="
+      "version": "cfa24256090828f566f1ba59292ce65d8db4a4ae",
+      "sum": "tml1dcFlo15kEE6JvN/nPY2xkhfeF3ERZjAyFbnguHA="
     }
   ],
   "legacyImports": false

.github/release-workflows.jsonnet

@@ -1,9 +1,14 @@
 local lokiRelease = import 'workflows/main.jsonnet';
-local build = lokiRelease.build;
 
+local build = lokiRelease.build;
 local releaseLibRef = 'main';
-
 local checkTemplate = 'grafana/loki-release/.github/workflows/check.yml@%s' % releaseLibRef;
+local buildImageVersion = std.extVar('BUILD_IMAGE_VERSION');
+local buildImage = 'grafana/loki-build-image:%s' % buildImageVersion;
+local golangCiLintVersion = 'v1.60.3';
+local imageBuildTimeoutMin = 60;
+local imagePrefix = 'grafana';
+local dockerPluginDir = 'clients/cmd/docker-driver';
 
 local imageJobs = {
   loki: build.image('loki', 'cmd/loki'),
@@ -15,29 +20,16 @@ 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']),
+  'loki-docker-driver': build.dockerPlugin('loki-docker-driver', dockerPluginDir, buildImage=buildImage, platform=['linux/amd64', 'linux/arm64']),
 };
 
 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');
-local buildImage = 'grafana/loki-build-image:%s' % buildImageVersion;
-local golangCiLintVersion = 'v1.60.3';
-
-local imageBuildTimeoutMin = 60;
-local imagePrefix = 'grafana';
-
 {
   'patch-release-pr.yml': std.manifestYamlDoc(
     lokiRelease.releasePRWorkflow(
@@ -83,6 +75,7 @@ local imagePrefix = 'grafana';
       getDockerCredsFromVault=true,
       imagePrefix='grafana',
       releaseLibRef=releaseLibRef,
+      pluginBuildDir=dockerPluginDir,
       releaseRepo='grafana/loki',
       useGitHubAppToken=true,
     ), false, false

.github/renovate.json5

@@ -24,7 +24,7 @@
     {
       // Disable Go version updates
       "matchManagers": ["gomod"],
-      "matchPackageNames": ["go"],
+      "matchPackageNames": ["go", "toolchain"],
       "enabled": false
     },
     {
@@ -48,17 +48,7 @@
       "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"],
+      "matchPackageNames": ["!grafana/loki"], // This is updated via a different job
       "autoApprove": false,
       "automerge": false
     },
@@ -71,7 +61,7 @@
     },
     {
       // Enable all other updates
-      "matchFileNames": ["!tools/lambda-promtail/go.mod", "!operator/go.mod", "!operator/api/loki/go.mod"],
+      "matchFileNames": ["!operator/go.mod", "!operator/api/loki/go.mod"],
       "groupName": "{{packageName}}",
       "enabled": true,
       "matchUpdateTypes": ["major", "minor", "patch"],