Merge branch 'main' into log-4550-gcp

grafana · Oct 15, 2024 · 3da88e5 · 3da88e5
2 parents f473928 + 3e451c7
commit 3da88e5
Show file tree

Hide file tree

Showing 350 changed files with 4,034 additions and 14,008 deletions.
diff --git a/.github/jsonnetfile.json b/.github/jsonnetfile.json
@@ -8,7 +8,7 @@
           "subdir": "workflows"
         }
       },
-      "version": "d900569c04b53e02de6ef208fa77cba41ec5f709"
+      "version": "20aac53fcb06d378b1c1101c7e4dc989466eb4ff"
     }
   ],
   "legacyImports": true

diff --git a/.github/jsonnetfile.lock.json b/.github/jsonnetfile.lock.json
@@ -8,8 +8,8 @@
           "subdir": "workflows"
         }
       },
-      "version": "d900569c04b53e02de6ef208fa77cba41ec5f709",
-      "sum": "+uAzU+b+aJtp3k+JX5mDxuh8LNY23+cHvUOwzCQ8CS8="
+      "version": "20aac53fcb06d378b1c1101c7e4dc989466eb4ff",
+      "sum": "bo355Fm9Gm1TU13MjlXGXgrCXo4CPr7aEeTvgNFYAl8="
     }
   ],
   "legacyImports": false

diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -12,4 +12,4 @@
   "pull_request": {}
   "push":
     "branches":
-    - "main"
+    - "main"
diff --git a/.github/workflows/helm-loki-ci.yml b/.github/workflows/helm-loki-ci.yml
@@ -53,7 +53,7 @@ jobs:
           fi
           helm dependency build
           for file in scenarios/*.yaml; do
-            cat "$file"
+            echo "rendering scenario $(file)"
             schenario_folder=${{ github.workspace }}/output/base/$(basename $file .yaml)
             mkdir $schenario_folder
             helm template loki-test-chart-name . -f $file --output-dir $schenario_folder
@@ -62,9 +62,15 @@ jobs:
       - name: Render Helm chart for each scenario in the PR branch
         run: |
           cd ${{ github.workspace }}/pr/production/helm/loki
+          # Check if the scenarios folder exists
+          if [ ! -d "scenarios" ]; then
+            echo "PR looks outdated because PRs branch does not have the scenarios, copying them from the base branch."
+            cp -r ${{ github.workspace }}/base/production/helm/loki/scenarios ./scenarios
+          fi
+          
           helm dependency build
           for file in scenarios/*.yaml; do
-            cat "$file"
+            echo "rendering scenario $(file)"
             schenario_folder=${{ github.workspace }}/output/pr/$(basename $file .yaml)
             mkdir $schenario_folder
             helm template loki-test-chart-name . -f $file --output-dir $schenario_folder

diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
@@ -430,4 +430,4 @@
 "permissions":
   "contents": "write"
   "id-token": "write"
-  "pull-requests": "write"
+  "pull-requests": "write"
diff --git a/.github/workflows/minor-release-pr.yml b/.github/workflows/minor-release-pr.yml
@@ -828,4 +828,4 @@ name: "Prepare Minor Release PR from Weekly"
 permissions:
   contents: "write"
   id-token: "write"
-  pull-requests: "write"
+  pull-requests: "write"
diff --git a/.github/workflows/nix-ci.yaml b/.github/workflows/nix-ci.yaml
@@ -4,29 +4,30 @@ on:
   pull_request:
     paths:
       - "flake.nix"
+      - "go.mod"
       - "nix/**"
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v22
+      - uses: cachix/install-nix-action@v30
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - run: nix run --print-build-logs .#lint
   test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v22
+      - uses: cachix/install-nix-action@v30
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - run: nix run --print-build-logs .#test
   packages:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v22
+      - uses: cachix/install-nix-action@v30
         with:
           nix_path: nixpkgs=channel:nixos-unstable
       - run: nix build --print-build-logs .#promtail

diff --git a/.github/workflows/operator-bundle.yaml b/.github/workflows/operator-bundle.yaml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ['1.21']
+        go: ['1.22']
     steps:
     - name: Set up Go 1.x
       uses: actions/setup-go@v4

diff --git a/.github/workflows/operator-scorecard.yaml b/.github/workflows/operator-scorecard.yaml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ['1.21']
+        go: ['1.22']
     steps:
     - name: Set up Go 1.x
       uses: actions/setup-go@v4

diff --git a/.github/workflows/operator.yaml b/.github/workflows/operator.yaml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ['1.21']
+        go: ['1.22']
     steps:
     - name: Install make
       run: sudo apt-get install make
@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ['1.21']
+        go: ['1.22']
     steps:
     - name: Install make
       run: sudo apt-get install make
@@ -51,8 +51,8 @@ jobs:
     - name: Lint
       uses: golangci/golangci-lint-action@v3
       with:
-        version: v1.54.2
-        args: --timeout=4m
+        version: v1.61.0
+        args: --timeout=5m
         working-directory: ./operator
     - name: Check prometheus rules
       working-directory: ./operator
@@ -64,7 +64,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ['1.21']
+        go: ['1.22']
     steps:
     - name: Install make
       run: sudo apt-get install make
@@ -85,7 +85,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ['1.21']
+        go: ['1.22']
     steps:
     - name: Install make
       run: sudo apt-get install make
@@ -106,7 +106,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ['1.21']
+        go: ['1.22']
     steps:
     - name: Install make
       run: sudo apt-get install make

diff --git a/.github/workflows/patch-release-pr.yml b/.github/workflows/patch-release-pr.yml
@@ -828,4 +828,4 @@ name: "Prepare Patch Release PR"
 permissions:
   contents: "write"
   id-token: "write"
-  pull-requests: "write"
+  pull-requests: "write"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -219,4 +219,4 @@ name: "create release"
 permissions:
   contents: "write"
   id-token: "write"
-  pull-requests: "write"
+  pull-requests: "write"
diff --git a/.golangci.yml b/.golangci.yml
@@ -20,11 +20,9 @@ run:
 
   # list of build tags, all linters use it. Default is empty list.
   build-tags:
-    - linux
     - cgo
-    - promtail_journal_enabled
     - integration
-    
+
 # output configuration options
 output:
   formats:
@@ -63,7 +61,7 @@ linters:
     - govet
     - typecheck
     - depguard
-    - exportloopref
+    - copyloopvar
     - gofmt
     - goimports
     - gosimple

diff --git a/Makefile b/Makefile
@@ -339,7 +339,7 @@ ifeq ($(BUILD_IN_CONTAINER),true)
 else
 	go version
 	golangci-lint version
-	GO111MODULE=on golangci-lint run -v --timeout 15m
+	GO111MODULE=on golangci-lint run -v --timeout 15m --build-tags linux,promtail_journal_enabled
 	faillint -paths "sync/atomic=go.uber.org/atomic" ./...
 endif
 

diff --git a/clients/cmd/fluentd/docker/Gemfile b/clients/cmd/fluentd/docker/Gemfile
@@ -3,4 +3,4 @@
 source 'https://rubygems.org'
 
 gem 'fluentd', '1.15.3'
-gem 'fluent-plugin-multi-format-parser', '~>1.0.0'
+gem 'fluent-plugin-multi-format-parser', '~>1.1.0'
diff --git a/clients/pkg/logentry/metric/counters_test.go b/clients/pkg/logentry/metric/counters_test.go
@@ -78,7 +78,6 @@ func Test_validateCounterConfig(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			err := validateCounterConfig(&tt.config)

diff --git a/clients/pkg/logentry/stages/decolorize_test.go b/clients/pkg/logentry/stages/decolorize_test.go
@@ -36,8 +36,6 @@ func TestPipeline_Decolorize(t *testing.T) {
 	}
 
 	for testName, testData := range tests {
-		testData := testData
-
 		t.Run(testName, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/clients/pkg/logentry/stages/eventlogmessage_test.go b/clients/pkg/logentry/stages/eventlogmessage_test.go
@@ -106,7 +106,6 @@ func TestEventLogMessage_simple(t *testing.T) {
 	}
 
 	for testName, testData := range tests {
-		testData := testData
 		testData.extractedValues[testData.sourcekey] = testData.msgdata
 
 		t.Run(testName, func(t *testing.T) {
@@ -151,7 +150,6 @@ func TestEventLogMessageConfig_validate(t *testing.T) {
 		},
 	}
 	for tName, tt := range tests {
-		tt := tt
 		t.Run(tName, func(t *testing.T) {
 			_, err := newEventLogMessageStage(util_log.Logger, tt.config)
 			if tt.err != nil {
@@ -262,7 +260,6 @@ func TestEventLogMessage_Real(t *testing.T) {
 	}
 
 	for testName, testData := range tests {
-		testData := testData
 		testData.extractedValues[testData.sourcekey] = testData.msgdata
 
 		t.Run(testName, func(t *testing.T) {
@@ -318,7 +315,6 @@ func TestEventLogMessage_invalid(t *testing.T) {
 	}
 
 	for testName, testData := range tests {
-		testData := testData
 		testData.extractedValues[testData.sourcekey] = testData.msgdata
 
 		t.Run(testName, func(t *testing.T) {

diff --git a/clients/pkg/logentry/stages/extensions_test.go b/clients/pkg/logentry/stages/extensions_test.go
@@ -65,7 +65,6 @@ func TestNewDocker(t *testing.T) {
 	}
 
 	for tName, tt := range tests {
-		tt := tt
 		t.Run(tName, func(t *testing.T) {
 			t.Parallel()
 			p, err := NewDocker(util_log.Logger, prometheus.DefaultRegisterer)
@@ -268,7 +267,6 @@ func TestNewCri(t *testing.T) {
 	}
 
 	for tName, tt := range tests {
-		tt := tt
 		t.Run(tName, func(t *testing.T) {
 			t.Parallel()
 			cfg := map[string]interface{}{}

diff --git a/clients/pkg/logentry/stages/json_test.go b/clients/pkg/logentry/stages/json_test.go
@@ -78,8 +78,6 @@ func TestPipeline_JSON(t *testing.T) {
 	}
 
 	for testName, testData := range tests {
-		testData := testData
-
 		t.Run(testName, func(t *testing.T) {
 			t.Parallel()
 
@@ -179,7 +177,6 @@ func TestJSONConfig_validate(t *testing.T) {
 		},
 	}
 	for tName, tt := range tests {
-		tt := tt
 		t.Run(tName, func(t *testing.T) {
 			c, err := parseJSONConfig(tt.config)
 			assert.NoError(t, err, "failed to create config: %s", err)
@@ -339,7 +336,6 @@ func TestJSONParser_Parse(t *testing.T) {
 		},
 	}
 	for tName, tt := range tests {
-		tt := tt
 		t.Run(tName, func(t *testing.T) {
 			t.Parallel()
 			p, err := New(util_log.Logger, nil, StageTypeJSON, tt.config, nil)

diff --git a/clients/pkg/logentry/stages/labels_test.go b/clients/pkg/logentry/stages/labels_test.go
@@ -115,7 +115,6 @@ func TestLabels(t *testing.T) {
 		},
 	}
 	for name, test := range tests {
-		test := test
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			err := validateLabelsConfig(test.config)
@@ -176,7 +175,6 @@ func TestLabelStage_Process(t *testing.T) {
 		},
 	}
 	for name, test := range tests {
-		test := test
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			st, err := newLabelStage(util_log.Logger, test.config)

diff --git a/clients/pkg/logentry/stages/logfmt_test.go b/clients/pkg/logentry/stages/logfmt_test.go
@@ -64,8 +64,6 @@ func TestPipeline_Logfmt(t *testing.T) {
 	}
 
 	for testName, testData := range tests {
-		testData := testData
-
 		t.Run(testName, func(t *testing.T) {
 			t.Parallel()
 
@@ -153,7 +151,6 @@ func TestLogfmtConfig_validate(t *testing.T) {
 		},
 	}
 	for tName, tt := range tests {
-		tt := tt
 		t.Run(tName, func(t *testing.T) {
 			c, err := parseLogfmtConfig(tt.config)
 			assert.NoError(t, err)
@@ -281,7 +278,6 @@ func TestLogfmtParser_Parse(t *testing.T) {
 		},
 	}
 	for tName, tt := range tests {
-		tt := tt
 		t.Run(tName, func(t *testing.T) {
 			t.Parallel()
 			p, err := New(util_log.Logger, nil, StageTypeLogfmt, tt.config, nil)

diff --git a/clients/pkg/logentry/stages/metrics_test.go b/clients/pkg/logentry/stages/metrics_test.go
@@ -415,7 +415,6 @@ func TestValidateMetricsConfig(t *testing.T) {
 	}
 
 	for name, test := range tests {
-		test := test
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			err := validateMetricsConfig(test.config)

diff --git a/clients/pkg/logentry/stages/output_test.go b/clients/pkg/logentry/stages/output_test.go
@@ -86,7 +86,6 @@ func TestOutputValidation(t *testing.T) {
 		},
 	}
 	for name, test := range tests {
-		test := test
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			err := validateOutputConfig(test.config)
@@ -120,7 +119,6 @@ func TestOutputStage_Process(t *testing.T) {
 		},
 	}
 	for name, test := range tests {
-		test := test
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			st, err := newOutputStage(util_log.Logger, test.config)