fix(deps): update module gopkg.in/yaml.v2 to v3

clients/cmd/docker-driver/config.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"io"
 	"net/url"
 	"os"
 	"strconv"
@@ -17,7 +18,7 @@ import (
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/relabel"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/loki/v3/clients/pkg/logentry/stages"
 	"github.com/grafana/loki/v3/clients/pkg/promtail/client"
@@ -319,7 +320,11 @@ func parsePipeline(logCtx logger.Info) (PipelineConfig, error) {
 		}
 	}
 	if okString {
-		if err := yaml.UnmarshalStrict([]byte(pipelineString), &pipeline.PipelineStages); err != nil {
+		decoder := yaml.NewDecoder(bytes.NewReader([]byte(pipelineString)))
+		decoder.KnownFields(true)
+
+		err := decoder.Decode(&pipeline)
+		if err != nil && !errors.Is(err, io.EOF) {
 			return pipeline, err
 		}
 	}
@@ -363,7 +368,11 @@ func parseInt(key string, logCtx logger.Info, set func(i int)) error {
 
 func relabelConfig(config string, lbs model.LabelSet) (model.LabelSet, error) {
 	relabelConfig := make([]*relabel.Config, 0)
-	if err := yaml.UnmarshalStrict([]byte(config), &relabelConfig); err != nil {
+	decoder := yaml.NewDecoder(bytes.NewReader([]byte(config)))
+	decoder.KnownFields(true)
+
+	err := decoder.Decode(&relabelConfig)
+	if err != nil && !errors.Is(err, io.EOF) {
 		return nil, err
 	}
 	relabed, _ := relabel.Process(labels.FromMap(util.ModelLabelSetToMap(lbs)), relabelConfig...)
@@ -389,5 +398,12 @@ func loadConfig(filename string, cfg interface{}) error {
 		return errors.Wrap(err, "Error reading config file")
 	}
 
-	return yaml.UnmarshalStrict(buf, cfg)
+	decoder := yaml.NewDecoder(bytes.NewReader(buf))
+	decoder.KnownFields(true)
+
+	err = decoder.Decode(cfg)
+	if err != nil && !errors.Is(err, io.EOF) {
+		return err
+	}
+	return nil
 }

clients/pkg/logentry/stages/json_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	util_log "github.com/grafana/loki/v3/pkg/util/log"
 )

clients/pkg/logentry/stages/logfmt_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	util_log "github.com/grafana/loki/v3/pkg/util/log"
 )

clients/pkg/logentry/stages/regex_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	util_log "github.com/grafana/loki/v3/pkg/util/log"
 )

clients/pkg/logentry/stages/replace_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	util_log "github.com/grafana/loki/v3/pkg/util/log"
 )

clients/pkg/logentry/stages/stage.go

@@ -10,7 +10,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/loki/v3/clients/pkg/promtail/api"
 )

clients/pkg/promtail/client/config_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/prometheus/common/config"
 	"github.com/stretchr/testify/require"
 
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 var clientConfig = Config{}

clients/pkg/promtail/client/logger.go

@@ -10,7 +10,7 @@ import (
 	"github.com/fatih/color"
 	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/loki/v3/clients/pkg/promtail/api"
 	"github.com/grafana/loki/v3/clients/pkg/promtail/limit"

clients/pkg/promtail/config/config.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/loki/v3/clients/pkg/promtail/client"
 	"github.com/grafana/loki/v3/clients/pkg/promtail/limit"

clients/pkg/promtail/config/config_test.go

@@ -9,7 +9,7 @@ import (
 	dskitflagext "github.com/grafana/dskit/flagext"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/loki/v3/clients/pkg/promtail/client"
 

clients/pkg/promtail/positions/positions.go

@@ -1,8 +1,11 @@
 package positions
 
 import (
+	"bytes"
+	"errors"
 	"flag"
 	"fmt"
+	"io"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -12,7 +15,7 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 const (
@@ -224,8 +227,11 @@ func readPositionsFile(cfg Config, logger log.Logger) (map[string]string, error)
 	}
 
 	var p File
-	err = yaml.UnmarshalStrict(buf, &p)
-	if err != nil {
+	decoder := yaml.NewDecoder(bytes.NewReader(buf))
+	decoder.KnownFields(true)
+
+	err = decoder.Decode(p)
+	if err != nil && !errors.Is(err, io.EOF) {
 		// return empty if cfg option enabled
 		if cfg.IgnoreInvalidYaml {
 			level.Debug(logger).Log("msg", "ignoring invalid positions file", "file", cleanfn, "error", err)

clients/pkg/promtail/positions/write_positions_unix.go

@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 
 	renameio "github.com/google/renameio/v2"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 func writePositionFile(filename string, positions map[string]string) error {

clients/pkg/promtail/positions/write_positions_windows.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"path/filepath"
 
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 // writePositionFile is a fall back for Windows because renameio does not support Windows.

clients/pkg/promtail/scrapeconfig/scrapeconfig_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/prometheus/prometheus/discovery/kubernetes"
 	"github.com/prometheus/prometheus/discovery/targetgroup"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 // todo add full example.

clients/pkg/promtail/targets/journal/journaltarget_test.go

@@ -18,7 +18,7 @@ import (
 	"github.com/prometheus/prometheus/model/relabel"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/loki/v3/clients/pkg/promtail/client/fake"
 	"github.com/grafana/loki/v3/clients/pkg/promtail/positions"

clients/pkg/promtail/targets/stdin/stdin_target_manager_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/loki/v3/clients/pkg/logentry/stages"
 	"github.com/grafana/loki/v3/clients/pkg/promtail/api"

clients/pkg/promtail/targets/syslog/syslogtarget_test.go

@@ -17,7 +17,7 @@ import (
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/relabel"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/loki/v3/clients/pkg/promtail/client/fake"
 	"github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig"

go.mod

@@ -105,7 +105,6 @@ require (
 	golang.org/x/time v0.8.0
 	google.golang.org/api v0.209.0
 	google.golang.org/grpc v1.68.0
-	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/klog/v2 v2.130.1
 )
@@ -147,6 +146,7 @@ require (
 	golang.org/x/oauth2 v0.24.0
 	golang.org/x/text v0.20.0
 	google.golang.org/protobuf v1.35.2
+	gopkg.in/yaml.v2 v2.4.0
 	gotest.tools v2.2.0+incompatible
 	k8s.io/apimachinery v0.31.3
 	k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078

integration/cluster/cluster.go

@@ -21,13 +21,12 @@ import (
 	"github.com/grafana/dskit/multierror"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/loki/v3/integration/util"
 
 	"github.com/grafana/loki/v3/pkg/loki"
 	"github.com/grafana/loki/v3/pkg/storage"
-	"github.com/grafana/loki/v3/pkg/storage/config"
 	"github.com/grafana/loki/v3/pkg/util/cfg"
 	util_log "github.com/grafana/loki/v3/pkg/util/log"
 	"github.com/grafana/loki/v3/pkg/validation"
@@ -363,8 +362,9 @@ func (c *Component) writeConfig() error {
 func (c *Component) MergedConfig() ([]byte, error) {
 	var sb bytes.Buffer
 
-	periodStart := config.DayTime{Time: c.cluster.initedAt.Add(-24 * time.Hour)}
-	additionalPeriodStart := config.DayTime{Time: c.cluster.initedAt.Add(-7 * 24 * time.Hour)}
+	// Quote the time strings to ensure they're treated as strings in YAML 1.2
+	periodStart := fmt.Sprintf("%q", time.Unix(int64(c.cluster.initedAt)/1000, 0).Format("2006-01-02"))
+	additionalPeriodStart := fmt.Sprintf("%q", time.Unix(int64(c.cluster.initedAt)/1000, 0).Add(-6*24*time.Hour).Format("2006-01-02"))
 
 	if err := configTemplate.Execute(&sb, map[string]interface{}{
 		"dataPath":       c.dataPath,
@@ -385,8 +385,8 @@ func (c *Component) MergedConfig() ([]byte, error) {
 		var buf bytes.Buffer
 		if err := template.Must(template.New("schema").Parse(periodCfg)).
 			Execute(&buf, map[string]interface{}{
-				"curPeriodStart":        periodStart.String(),
-				"additionalPeriodStart": additionalPeriodStart.String(),
+				"curPeriodStart":        periodStart,
+				"additionalPeriodStart": additionalPeriodStart,
 				"schemaVer":             c.cluster.schemaVer,
 			}); err != nil {
 			return nil, errors.New("error building schema_config")

integration/util/merger.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"dario.cat/mergo"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 // YAMLMerger takes a set of given YAML fragments and merges them into a single YAML document.

pkg/logcli/query/query.go

@@ -14,7 +14,7 @@ import (
 	"github.com/grafana/dskit/user"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/loki/v3/pkg/logcli/client"
 	"github.com/grafana/loki/v3/pkg/logcli/output"
@@ -567,7 +567,7 @@ func LoadSchemaUsingObjectClient(oc chunk.ObjectClient, name string) (*config.Sc
 	defer rdr.Close()
 
 	decoder := yaml.NewDecoder(rdr)
-	decoder.SetStrict(true)
+	decoder.KnownFields(true)
 	section := schemaConfigSection{}
 	err = decoder.Decode(&section)
 	if err != nil {

pkg/loghttp/push/otlp_config_test.go

@@ -1,12 +1,13 @@
 package push
 
 import (
+	"bytes"
 	"testing"
 
 	"github.com/grafana/dskit/flagext"
 	"github.com/prometheus/prometheus/model/relabel"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 var defaultGlobalOTLPConfig = GlobalOTLPConfig{}
@@ -153,7 +154,10 @@ log_attributes:
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			cfg := OTLPConfig{}
-			err := yaml.UnmarshalStrict(tc.yamlConfig, &cfg)
+			decoder := yaml.NewDecoder(bytes.NewReader(tc.yamlConfig))
+			decoder.KnownFields(true)
+
+			err := decoder.Decode(&cfg)
 			if tc.expectedErr != nil {
 				require.ErrorIs(t, err, tc.expectedErr)
 				return

pkg/loki/config_handler.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"reflect"
 
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 func yamlMarshalUnmarshal(in interface{}) (map[interface{}]interface{}, error) {

pkg/loki/runtime_config.go

@@ -7,7 +7,7 @@ import (
 	"github.com/go-kit/log/level"
 	"github.com/grafana/dskit/kv"
 	"github.com/grafana/dskit/runtimeconfig"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/loki/v3/pkg/runtime"
 	util_log "github.com/grafana/loki/v3/pkg/util/log"
@@ -42,7 +42,7 @@ func loadRuntimeConfig(r io.Reader) (interface{}, error) {
 	overrides := &runtimeConfigValues{}
 
 	decoder := yaml.NewDecoder(r)
-	decoder.SetStrict(true)
+	decoder.KnownFields(true)
 	if err := decoder.Decode(&overrides); err != nil {
 		return nil, err
 	}

pkg/querier/queryrange/limits_test.go

@@ -15,7 +15,7 @@ import (
 	"github.com/prometheus/prometheus/promql"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/atomic"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/loki/v3/pkg/logproto"
 	"github.com/grafana/loki/v3/pkg/logql/syntax"

pkg/querier/queryrange/split_by_interval_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/loki/v3/pkg/loghttp"
 	"github.com/grafana/loki/v3/pkg/logproto"

pkg/ruler/base/ruler_test.go

@@ -41,7 +41,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/atomic"
 	"google.golang.org/grpc"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/dskit/tenant"
 

pkg/ruler/config.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/prometheus/prometheus/config"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	ruler "github.com/grafana/loki/v3/pkg/ruler/base"
 	"github.com/grafana/loki/v3/pkg/ruler/storage/cleaner"