Merge branch 'main' into add-containerSecurityContext-to-statefulset-…

…backend-sidecar

docs/sources/operations/query-acceleration-blooms.md

@@ -152,7 +152,7 @@ Example calculation for storage requirements of blooms for a single tenant.
 
 Since reading blooms depends heavily on disk IOPS, Bloom Gateways should make use of multiple, 
 locally attached SSD disks (NVMe) to increase i/o throughput. 
-Multiple directories on different disk mounts can be specified using the `-bloom.shipper.working-directory` [setting]storage-config-cfg] 
+Multiple directories on different disk mounts can be specified using the `-bloom.shipper.working-directory` [setting][storage-config-cfg] 
 when using a comma separated list of mount points, for example:
 ```
 -bloom.shipper.working-directory="/mnt/data0,/mnt/data1,/mnt/data2,/mnt/data3"

go.mod

@@ -124,7 +124,7 @@ require (
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/gogo/googleapis v1.4.1
 	github.com/grafana/jsonparser v0.0.0-20240425183733-ea80629e1a32
-	github.com/grafana/loki/pkg/push v0.0.0-20240923094301-8ebb2b5300f0
+	github.com/grafana/loki/pkg/push v0.0.0-20240924133635-758364c7775f
 	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/hashicorp/raft v1.7.1
 	github.com/hashicorp/raft-wal v0.4.1

pkg/pattern/instance.go

@@ -9,7 +9,6 @@ import (
 	"sync"
 
 	"github.com/go-kit/log"
-	"github.com/go-kit/log/level"
 	"github.com/grafana/dskit/httpgrpc"
 	"github.com/grafana/dskit/multierror"
 	"github.com/grafana/dskit/ring"
@@ -264,20 +263,11 @@ func (i *instance) Observe(stream string, entries []logproto.Entry) {
 		streamMetrics, ok := i.aggMetricsByStreamAndLevel[stream]
 
 		if !ok {
-			streamMetrics = make(map[string]*aggregatedMetrics, len(constants.LogLevels))
-			for _, l := range constants.LogLevels {
-				streamMetrics[l] = &aggregatedMetrics{}
-			}
+			streamMetrics = map[string]*aggregatedMetrics{}
 		}
 
 		if _, ok := streamMetrics[lvl]; !ok {
-			level.Warn(i.logger).Log(
-				"msg", "unknown log level while observing stream",
-				"level", lvl,
-				"stream", stream,
-			)
-
-			lvl = constants.LogLevelUnknown
+			streamMetrics[lvl] = &aggregatedMetrics{}
 		}
 
 		streamMetrics[lvl].bytes += uint64(len(entry.Line))

vendor/modules.txt

@@ -1034,7 +1034,7 @@ github.com/grafana/gomemcache/memcache
 # github.com/grafana/jsonparser v0.0.0-20240425183733-ea80629e1a32
 ## explicit; go 1.13
 github.com/grafana/jsonparser
-# github.com/grafana/loki/pkg/push v0.0.0-20240923094301-8ebb2b5300f0 => ./pkg/push
+# github.com/grafana/loki/pkg/push v0.0.0-20240924133635-758364c7775f => ./pkg/push
 ## explicit; go 1.19
 github.com/grafana/loki/pkg/push
 # github.com/grafana/pyroscope-go/godeltaprof v0.1.8