Merge branch 'grafana:main' into fix/add-namespace-to-various-loki-te…

…mplates

.github/jsonnetfile.json

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

.github/jsonnetfile.lock.json

@@ -8,8 +8,8 @@
           "subdir": "workflows"
         }
       },
-      "version": "20aac53fcb06d378b1c1101c7e4dc989466eb4ff",
-      "sum": "bo355Fm9Gm1TU13MjlXGXgrCXo4CPr7aEeTvgNFYAl8="
+      "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/helm-ci.yml

@@ -11,34 +11,9 @@ env:
 
 jobs:
   call-lint:
-    name: Lint Helm Chart
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Check Docs
-        run: |
-          docker run --rm --volume "$(pwd):/helm-docs" -u "$(id -u)" jnorwood/helm-docs:v1.11.0
-          if ! git diff --exit-code; then
-              echo "Documentation not up to date. Please run helm-docs and commit changes!" >&2
-              exit 1
-          fi
-
-      - name: Lint Yaml
-        run: make helm-lint
-
-      - name: Lint Code Base
-        uses: docker://github/super-linter:v3.17.2
-        env:
-          FILTER_REGEX_EXCLUDE: .*(CHANGELOG\.md|README\.md|Chart\.yaml|NOTES.txt).*
-          FILTER_REGEX_INCLUDE: .*production/helm/.*
-          VALIDATE_ALL_CODEBASE: false
-          VALIDATE_KUBERNETES_KUBEVAL: false
-          VALIDATE_YAML: false
-          VALIDATE_GO: false
-          DEFAULT_BRANCH: main
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+    uses: grafana/helm-charts/.github/workflows/linter.yml@main
+    with:
+      filter_regex_include: .*production/helm/loki/.*
   call-test:
     name: Test Helm Chart
     runs-on: ubuntu-latest