Merge branch 'main' into operator-structured-logs

.devcontainer/devcontainer.json

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

.drone/drone.yml

@@ -139,7 +139,7 @@ steps:
   depends_on:
   - clone
   environment: {}
-  image: grafana/loki-build-image:0.33.5
+  image: grafana/loki-build-image:0.33.6
   name: documentation-helm-reference-check
 trigger:
   ref:
@@ -1085,7 +1085,7 @@ steps:
       from_secret: docker_password
     DOCKER_USERNAME:
       from_secret: docker_username
-  image: grafana/loki-build-image:0.33.5
+  image: grafana/loki-build-image:0.33.6
   name: build and push
   privileged: true
   volumes:
@@ -1308,6 +1308,6 @@ kind: secret
 name: gpg_private_key
 ---
 kind: signature
-hmac: 8a2db8460244184bb92d99cfe9a366e0a1cce91034cfe3784436a2f178b976c7
+hmac: 3b3b039769ab8c44318749efec569ffe50c4cfb173f577422ec9d514054f0a9e
 
 ...

.github/jsonnetfile.json

@@ -8,7 +8,7 @@
           "subdir": "workflows"
         }
       },
-      "version": "adca1c07a2199374e1646e62331926509699368b"
+      "version": "87cb5090c36b5332e7f21b5c59e136962d5f4f56"
     }
   ],
   "legacyImports": true

.github/jsonnetfile.lock.json

@@ -8,8 +8,8 @@
           "subdir": "workflows"
         }
       },
-      "version": "adca1c07a2199374e1646e62331926509699368b",
-      "sum": "/6NMt3DFr1mpaBxncbwBJVV5vBpAMIyP3XNOoFArz5Q="
+      "version": "87cb5090c36b5332e7f21b5c59e136962d5f4f56",
+      "sum": "kVlVZPpPz8d/D6UGK9Hto+NeGy7z8NvGygcB1QboxWw="
     }
   ],
   "legacyImports": false

.github/labeler.yml

@@ -1,9 +1,13 @@
 type/docs:
-- 'docs/**/*'
-- 'operator/docs/*'
+- changed-files:
+  - any-glob-to-any-file: 'docs/**/*'
+  - any-glob-to-any-file: 'operator/docs/*'
 sig/operator:
-- 'operator/**/*'
+- changed-files:
+  - any-glob-to-any-file: 'operator/**/*'
 kind/feature:
-- 'operator/docs/enhancements/*'
+- changed-files:
+  - any-glob-to-any-file: 'operator/docs/enhancements/*'
 area/helm:
-- 'production/helm/**/*'
+- changed-files:
+  - any-glob-to-any-file: 'production/helm/**/*'

.github/renovate.json

@@ -5,7 +5,7 @@
     ],
     "labels": ["dependencies"],
     "prHourlyLimit": 4,
-    "baseBranches": ["main", "release-2.9.x", "release-2.8.x"],
+    "baseBranches": ["main"],
     "packageRules": [
       {
         "matchBaseBranches": ["release-2.9.x","release-2.8.x"],

.github/workflows/add-to-docs-project.yml

@@ -0,0 +1,15 @@
+name: Add to docs project
+on:
+  issues:
+    types: [labeled]
+  pull_request:
+    types: [labeled]
+jobs:
+  main:
+    if: ${{ github.event.label.name == 'type/docs' }}
+    permissions:
+      contents: read
+      id-token: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: grafana/writers-toolkit/add-to-docs-project@add-to-docs-project/v1

.github/workflows/backport.yml

@@ -7,20 +7,28 @@ on:
 
 jobs:
   main:
+    if: github.repository == 'grafana/loki'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: "grafana/grafana-github-actions"
           path: ./actions
           ref: main
       - name: Install Actions
         run: npm install --production --prefix ./actions
+      - id: "get_github_app_token"
+        name: "get github app token"
+        uses: "actions/create-github-app-token@v1"
+        with:
+          app-id: "${{ secrets.APP_ID }}"
+          owner: "${{ github.repository_owner }}"
+          private-key: "${{ secrets.APP_PRIVATE_KEY }}"
       - name: Run backport
         uses: ./actions/backport
         with:
           metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
-          token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
+          token: ${{ steps.get_github_app_token.outputs.token }}
           labelsToAdd: "backport"
           title: "chore: [{{base}}] {{originalTitle}}"

.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.33.5"
+      "build_image": "grafana/loki-build-image:0.33.6"
       "golang_ci_lint_version": "v1.55.1"
       "release_lib_ref": "main"
       "skip_validation": false

.github/workflows/dependabot_reviewer.yml

@@ -16,11 +16,11 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.6.0
+        uses: dependabot/fetch-metadata@v2.2.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

.github/workflows/helm-ci.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Check Docs
         run: |
@@ -43,24 +43,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@v4
         with:
           version: v3.8.2
 
       # Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and
       # yamllint (https://github.com/adrienverge/yamllint) which require Python
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.7
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.6.0
+        uses: helm/chart-testing-action@v2.6.1
 
       - name: Run chart-testing (list-changed)
         id: list-changed