Merge branch 'main' into patch-2

grafana · Nov 11, 2024 · bdc1867 · bdc1867
2 parents 458b589 + f2da621
commit bdc1867
Show file tree

Hide file tree

Showing 265 changed files with 1,759 additions and 87,173 deletions.
diff --git a/.github/workflows/helm-ci.yml b/.github/workflows/helm-ci.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Lint Code Base
         uses: docker://github/super-linter:v3.17.2
         env:
-          FILTER_REGEX_EXCLUDE: .*(README\.md|Chart\.yaml|NOTES.txt).*
+          FILTER_REGEX_EXCLUDE: .*(CHANGELOG\.md|README\.md|Chart\.yaml|NOTES.txt).*
           FILTER_REGEX_INCLUDE: .*production/helm/.*
           VALIDATE_ALL_CODEBASE: false
           VALIDATE_KUBERNETES_KUBEVAL: false
@@ -85,10 +85,12 @@ jobs:
         run: |
           kubectl create namespace prometheus
 
-          helm install prometheus prometheus-community/kube-prometheus-stack \
+          helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+          helm install --debug prometheus prometheus-community/kube-prometheus-stack \
             --namespace prometheus \
             --set grafana.enabled=false \
-            --set prometheus.prometheusSpec.serviceMonitorSelector.matchLabels.release=prometheus
+            --set prometheus.prometheusSpec.serviceMonitorSelector.matchLabels.release=prometheus \
+            --set prometheus.prometheusSpec.scrapeConfigNamespaceSelector.matchLabels.release=prometheus
 
           kubectl --namespace prometheus get pods -l "release=prometheus"
           kubectl --namespace prometheus get services -l "release=prometheus"

diff --git a/.github/workflows/operator-release-please.yml b/.github/workflows/operator-release-please.yml
@@ -17,6 +17,9 @@ jobs:
     outputs:
       release_created: ${{ steps.release.outputs.operator--release_created }}
       release_name: ${{ steps.release.outputs.operator--tag_name }}
+      release_major: ${{ steps.release.outputs.operator--major }}
+      release_minor: ${{ steps.release.outputs.operator--minor }}
+      release_patch: ${{ steps.release.outputs.operator--patch }}
     steps:
       - id: "get_github_app_token"
         name: Get GitHub App Token
@@ -53,4 +56,27 @@ jobs:
           GH_TOKEN: ${{ steps.get_github_app_token.outputs.token }}
         working-directory: "release"
         run: |
-          gh release edit "${{ needs.releasePlease.outputs.release_name }}" --draft=false --latest=false
+          gh release edit "${{ needs.releasePlease.outputs.release_name }}" --draft=false --latest=false
+  publishImages:
+    env:
+      BUILD_TIMEOUT: 60
+      IMAGE_PREFIX: "grafana"
+    needs:
+      - "publishRelease"
+    runs-on: ubuntu-latest
+    steps:
+      - 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"
+      - name: "Build and push"
+        timeout-minutes: "${{ env.BUILD_TIMEOUT }}"
+        uses: "docker/build-push-action@v6"
+        with:
+          context: "operator"
+          file: "Dockerfile"
+          platforms: "linux/amd64,linux/arm64,linux/arm"
+          push: true
+          tags: "${{ env.IMAGE_PREFIX }}/loki-operator:${{ steps.releasePlease.outputs.release_major }}.${{ steps.releasePlease.outputs.release_minor }}.${{ steps.releasePlease.outputs.release_patch }}"
diff --git a/.github/workflows/syft-sbom-ci.yml b/.github/workflows/syft-sbom-ci.yml
@@ -14,7 +14,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Anchore SBOM Action
-      uses: anchore/[email protected].6
+      uses: anchore/[email protected].7
       with:
          artifact-name: ${{ github.event.repository.name }}-spdx.json
 
diff --git a/_shared-workflows-dockerhub-login b/_shared-workflows-dockerhub-login
diff --git a/clients/cmd/fluentd/Dockerfile b/clients/cmd/fluentd/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.3.5 AS build
+FROM ruby:3.3.6 AS build
 
 ENV DEBIAN_FRONTEND=noninteractive
 

diff --git a/clients/pkg/logentry/stages/extensions_test.go b/clients/pkg/logentry/stages/extensions_test.go
@@ -122,7 +122,7 @@ func TestCRI_tags(t *testing.T) {
 			},
 			expected: []string{
 				"partial line 1 log finished",     // belongs to stream `{foo="bar"}`
-				"partial line 2 another full log", // belongs to stream `{foo="bar2"}
+				"partial line 2 another full log", // belongs to stream `{foo="bar2"}`
 			},
 		},
 		{

diff --git a/docs/sources/setup/install/helm/deployment-guides/aws.md b/docs/sources/setup/install/helm/deployment-guides/aws.md
@@ -15,6 +15,8 @@ This guide shows how to deploy a minimally viable Loki in **microservice** mode
 
 There are two methods for authenticating and connecting Loki to AWS S3. We will guide you through the recommended method of granting access via an IAM role.
 
+{{< youtube id="5lXmWmofqwM" >}}
+
 ## Considerations
 
 {{< admonition type="caution" >}}
@@ -313,7 +315,7 @@ deploymentMode: Distributed
 ingester:
  replicas: 3
  persistence:
-   storageClass: gp2
+   storageClass: gp3
    accessModes:
      - ReadWriteOnce
    size: 10Gi
@@ -322,7 +324,7 @@ querier:
  replicas: 3
  maxUnavailable: 2
  persistence:
-   storageClass: gp2
+   storageClass: gp3
    accessModes:
      - ReadWriteOnce
    size: 10Gi
@@ -337,23 +339,23 @@ distributor:
 compactor:
  replicas: 1
  persistence:
-   storageClass: gp2
+   storageClass: gp3
    accessModes:
      - ReadWriteOnce
    size: 10Gi
 indexGateway:
  replicas: 2
  maxUnavailable: 1
  persistence:
-   storageClass: gp2
+   storageClass: gp3
    accessModes:
      - ReadWriteOnce
    size: 10Gi
 ruler:
  replicas: 1
  maxUnavailable: 1
  persistence:
-   storageClass: gp2
+   storageClass: gp3
    accessModes:
      - ReadWriteOnce
    size: 10Gi