public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(deps): Switch to maintained gopkg.in/yaml fork (#114131)

Browse Source 
Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
This commit is contained in:
Dave Henderson
2025-11-19 15:20:32 -05:00
committed by GitHub
parent 84d6f54daa
commit 7264803016
41 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/ngalert/api/api_convert_prometheus.go
+1 -1
View File
@@ -15,7 +15,7 @@ import (
amconfig "github.com/prometheus/alertmanager/config"
"github.com/prometheus/alertmanager/pkg/labels"
prommodel "github.com/prometheus/common/model"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/apimachinery/errutil"
pkg/services/ngalert/api/api_convert_prometheus_test.go
+1 -1
View File
@@ -15,7 +15,7 @@ import (
prommodel "github.com/prometheus/common/model"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/apimachinery/identity"
"github.com/grafana/grafana/pkg/infra/log"
pkg/services/ngalert/api/lotex_am.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"io"
"net/http"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/infra/log"
pkg/services/ngalert/api/lotex_ruler.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"net/http"
"net/url"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/infra/log"
pkg/services/ngalert/api/prometheus_conversion.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"io"
"mime"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/apimachinery/errutil"
pkg/services/ngalert/api/tooling/definitions/alertmanager.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"github.com/prometheus/alertmanager/config"
"github.com/prometheus/alertmanager/pkg/labels"
"github.com/prometheus/common/model"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/alerting/definition"
alertingmodels "github.com/grafana/alerting/models"
pkg/services/ngalert/api/tooling/definitions/alertmanager_test.go
+1 -1
View File
@@ -14,7 +14,7 @@ import (
"github.com/prometheus/common/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
//go:embed test-data/*.*
pkg/services/ngalert/api/tooling/definitions/alertmanager_validation.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"strings"
"github.com/grafana/alerting/templates"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
func (t *NotificationTemplate) Validate() error {
pkg/services/ngalert/api/tooling/definitions/cortex-ruler_test.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/prometheus/common/model"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
func Test_Rule_Marshaling(t *testing.T) {
pkg/services/ngalert/api/tooling/definitions/provisioning_policies_test.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"testing"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
func TestNotificationPolicyExportMarshal(t *testing.T) {
pkg/services/ngalert/api/util.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"strconv"
"strings"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/services/accesscontrol"
pkg/services/ngalert/models/alert_rule_test.go
+1 -1
View File
@@ -15,8 +15,8 @@ import (
"github.com/prometheus/common/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.yaml.in/yaml/v3"
"golang.org/x/exp/maps"
"gopkg.in/yaml.v3"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
pkg/services/ngalert/prom/convert.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"time"
"github.com/google/uuid"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/apimachinery/errutil"
"github.com/grafana/grafana/pkg/services/datasources"
pkg/services/ngalert/prom/convert_test.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/google/uuid"
prommodel "github.com/prometheus/common/model"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/expr"
"github.com/grafana/grafana/pkg/expr/mathexp"
pkg/services/ngalert/prom/models_test.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
prommodel "github.com/prometheus/common/model"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/util"
)
pkg/services/ngalert/remote/alertmanager.go
+1 -1
View File
@@ -30,7 +30,7 @@ import (
"github.com/prometheus/alertmanager/pkg/labels"
"github.com/prometheus/client_golang/prometheus"
common_config "github.com/prometheus/common/config"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/tracing"
pkg/services/ngalert/remote/alertmanager_test.go
+1 -1
View File
@@ -27,12 +27,12 @@ import (
"github.com/prometheus/client_golang/prometheus"
common_config "github.com/prometheus/common/config"
"github.com/stretchr/testify/require"
"go.yaml.in/yaml/v3"
alertingClusterPB "github.com/grafana/alerting/cluster/clusterpb"
"github.com/grafana/alerting/definition"
alertingModels "github.com/grafana/alerting/models"
"github.com/grafana/alerting/notify"
"gopkg.in/yaml.v3"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/infra/log"
pkg/services/ngalert/sender/notifier.go
+1 -1
View File
@@ -38,7 +38,7 @@ import (
"github.com/prometheus/common/promslog"
"github.com/prometheus/common/version"
"github.com/prometheus/sigv4"
"gopkg.in/yaml.v2"
"go.yaml.in/yaml/v3"
"github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/discovery/targetgroup"
pkg/services/ngalert/sender/notifier_test.go
+1 -1
View File
@@ -38,7 +38,7 @@ import (
"github.com/prometheus/common/promslog"
"github.com/stretchr/testify/require"
"go.uber.org/atomic"
"gopkg.in/yaml.v2"
"go.yaml.in/yaml/v2"
"github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/discovery"
pkg/services/provisioning/alerting/config_reader.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"path/filepath"
"strings"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/infra/log"
)
pkg/services/provisioning/alerting/contact_point_types_test.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/services/provisioning/values"
)
pkg/services/provisioning/alerting/notification_policy_types_test.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
func TestNotificationPolicy(t *testing.T) {
pkg/services/provisioning/alerting/rules_types_test.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/prometheus/common/model"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/services/ngalert/models"
"github.com/grafana/grafana/pkg/services/provisioning/values"
pkg/services/provisioning/dashboards/config_reader.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"path/filepath"
"strings"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/provisioning/utils"
pkg/services/provisioning/datasources/config_reader.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"path/filepath"
"strings"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/datasources"
pkg/services/provisioning/plugins/config_reader.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"path/filepath"
"strings"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
pkg/services/provisioning/values/values_test.go
+1 -1
View File
@@ -8,8 +8,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.yaml.in/yaml/v3"
"gopkg.in/ini.v1"
"gopkg.in/yaml.v3"
"github.com/grafana/grafana/pkg/setting"
)