Add-changelog-for-utf8-support

CHANGELOG.md

@@ -24,6 +24,7 @@
 * [FEATURE] Querier: Support for configuring query optimizers and enabling XFunctions in the Thanos engine. #6873
 * [FEATURE] Query Frontend: Add support /api/v1/format_query API for formatting queries. #6893
 * [FEATURE] Query Frontend: Add support for /api/v1/parse_query API (experimental) to parse a PromQL expression and return it as a JSON-formatted AST (abstract syntax tree). #6978
+* [ENHANCEMENT] Upgrade the Prometheus version to 3.6.0 and add a `-validation.name-validation-scheme` flag to support UTF-8. #7040
 * [ENHANCEMENT] Distributor: Emit an error with a 400 status code when empty labels are found before the relabelling or label dropping process. #7052
 * [ENHANCEMENT] Parquet Storage: Add support for additional sort columns during Parquet file generation #7003
 * [ENHANCEMENT] Modernizes the entire codebase by using go modernize tool. #7005

integration/alertmanager_test.go

@@ -32,6 +32,64 @@ const simpleAlertmanagerConfig = `route:
 receivers:
   - name: dummy`
 
+const utf8AlertmanagerConfig = `route:
+  receiver: dummy
+  group_by: [group.test.🙂]
+receivers:
+  - name: dummy`
+
+func TestAlertmanager_UTF8(t *testing.T) {
+	s, err := e2e.NewScenario(networkName)
+	require.NoError(t, err)
+	defer s.Close()
+
+	flags := mergeFlags(AlertmanagerFlags(), AlertmanagerS3Flags())
+
+	minio := e2edb.NewMinio(9000, alertsBucketName)
+	require.NoError(t, s.StartAndWaitReady(minio))
+
+	alertmanager := e2ecortex.NewAlertmanager(
+		"alertmanager",
+		flags,
+		"",
+	)
+
+	require.NoError(t, s.StartAndWaitReady(alertmanager))
+
+	c, err := e2ecortex.NewClient("", "", alertmanager.HTTPEndpoint(), "", "user-1")
+	require.NoError(t, err)
+
+	ctx := context.Background()
+
+	err = c.SetAlertmanagerConfig(ctx, utf8AlertmanagerConfig, map[string]string{})
+	require.NoError(t, err)
+
+	require.NoError(t, alertmanager.WaitSumMetricsWithOptions(e2e.Equals(1), []string{"cortex_alertmanager_config_last_reload_successful"}, e2e.WaitMissingMetrics))
+	require.NoError(t, alertmanager.WaitSumMetricsWithOptions(e2e.Greater(0), []string{"cortex_alertmanager_config_hash"}, e2e.WaitMissingMetrics))
+
+	silenceId, err := c.CreateSilence(ctx, types.Silence{
+		Matchers: amlabels.Matchers{
+			{Name: "silences.name.🙂", Value: "silences.value.🙂"},
+		},
+		Comment:  "test silences",
+		StartsAt: time.Now(),
+		EndsAt:   time.Now().Add(time.Minute),
+	})
+	require.NoError(t, err)
+	require.NotEmpty(t, silenceId)
+	require.NoError(t, alertmanager.WaitSumMetrics(e2e.Equals(1), "cortex_alertmanager_silences"))
+
+	err = c.SendAlertToAlermanager(ctx, &model.Alert{
+		Labels: model.LabelSet{
+			"alert.name.🙂": "alert.value.🙂",
+		},
+		StartsAt: time.Now(),
+		EndsAt:   time.Now().Add(time.Minute),
+	})
+	require.NoError(t, err)
+	require.NoError(t, alertmanager.WaitSumMetrics(e2e.Equals(1), "cortex_alertmanager_alerts_received_total"))
+}
+
 func TestAlertmanager(t *testing.T) {
 	s, err := e2e.NewScenario(networkName)
 	require.NoError(t, err)

integration/ruler_test.go

@@ -284,6 +284,60 @@ func TestRulerSharding(t *testing.T) {
 	assert.ElementsMatch(t, expectedNames, actualNames)
 }
 
+func TestRulerAPIUTF8(t *testing.T) {
+	s, err := e2e.NewScenario(networkName)
+	require.NoError(t, err)
+	defer s.Close()
+
+	// Start dependencies.
+	consul := e2edb.NewConsul()
+	minio := e2edb.NewMinio(9000, bucketName, rulestoreBucketName)
+	require.NoError(t, s.StartAndWaitReady(consul, minio))
+
+	rulerFlags := mergeFlags(
+		BlocksStorageFlags(),
+		RulerFlags(),
+	)
+
+	// Start ruler.
+	ruler := e2ecortex.NewRuler("ruler", consul.NetworkHTTPEndpoint(), rulerFlags, "")
+	require.NoError(t, s.StartAndWaitReady(ruler))
+
+	c, err := e2ecortex.NewClient("", "", "", ruler.HTTPEndpoint(), "user-1")
+	require.NoError(t, err)
+
+	groupLabels := map[string]string{
+		"group.label.🙂": "val.🙂",
+	}
+	ruleLabels := map[string]string{
+		"rule.label.🙂": "val.🙂",
+	}
+
+	interval, _ := model.ParseDuration("1s")
+
+	ruleGroup := rulefmt.RuleGroup{
+		Name:     "utf8Rule",
+		Interval: interval,
+		Rules: []rulefmt.Rule{{
+			Alert:  "alert.rule",
+			Expr:   "up",
+			Labels: ruleLabels,
+		}, {
+			Record: "record.rule",
+			Expr:   "up",
+			Labels: ruleLabels,
+		}},
+		Labels: groupLabels,
+	}
+
+	// Set rule group
+	err = c.SetRuleGroup(ruleGroup, "namespace")
+	require.NoError(t, err)
+
+	require.NoError(t, ruler.WaitSumMetrics(e2e.Equals(1), "cortex_ruler_managers_total"))
+	require.NoError(t, ruler.WaitSumMetrics(e2e.Equals(1), "cortex_ruler_rule_groups_in_store"))
+}
+
 func TestRulerAPISharding(t *testing.T) {
 	testRulerAPIWithSharding(t, false)
 }

integration/utf8_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/prompb"
 	"github.com/stretchr/testify/require"
 
@@ -105,16 +106,16 @@ overrides:
 	require.NoError(t, s.StartAndWaitReady(cortex))
 
 	// user-1 uses legacy validation
-	user1Client, err := e2ecortex.NewClient(cortex.HTTPEndpoint(), "", "", "", "user-1")
+	user1Client, err := e2ecortex.NewClient(cortex.HTTPEndpoint(), cortex.HTTPEndpoint(), "", "", "user-1")
 	require.NoError(t, err)
 
 	// user-2 uses utf8 validation
-	user2Client, err := e2ecortex.NewClient(cortex.HTTPEndpoint(), "", "", "", "user-2")
+	user2Client, err := e2ecortex.NewClient(cortex.HTTPEndpoint(), cortex.HTTPEndpoint(), "", "", "user-2")
 	require.NoError(t, err)
 
 	now := time.Now()
 
-	utf8Series, _ := generateSeries("series_1", now, prompb.Label{Name: "test.utf8.metric", Value: "😄"})
+	utf8Series, _ := generateSeries("series.1", now, prompb.Label{Name: "test.utf8.metric", Value: "😄"})
 	legacySeries, _ := generateSeries("series_2", now, prompb.Label{Name: "job", Value: "test"})
 
 	res, err := user1Client.Push(legacySeries)
@@ -134,4 +135,33 @@ overrides:
 	res, err = user2Client.Push(utf8Series)
 	require.NoError(t, err)
 	require.Equal(t, 200, res.StatusCode)
+
+	// utf8 querying
+	// c.f. https://prometheus.io/docs/guides/utf8/#querying
+	query := `{"series.1", "test.utf8.metric"="😄"}`
+	queryResult, err := user2Client.Query(query, now)
+	require.NoError(t, err)
+	require.Equal(t, 200, res.StatusCode)
+	require.Equal(t, model.ValVector, queryResult.Type())
+	vec := queryResult.(model.Vector)
+	require.Equal(t, 1, len(vec))
+
+	// label names
+	start := now
+	end := now.Add(time.Minute * 5)
+	labelNames, err := user2Client.LabelNames(start, end)
+	require.NoError(t, err)
+	require.Equal(t, []string{"__name__", "job", "test.utf8.metric"}, labelNames)
+
+	// series
+	series, err := user2Client.Series([]string{`{"test.utf8.metric"="😄"}`}, start, end)
+	require.NoError(t, err)
+	require.Equal(t, 1, len(series))
+	require.Equal(t, `{__name__="series.1", test.utf8.metric="😄"}`, series[0].String())
+
+	// label values
+	labelValues, err := user2Client.LabelValues("test.utf8.metric", start, end, nil)
+	require.NoError(t, err)
+	require.Equal(t, 1, len(labelValues))
+	require.Equal(t, model.LabelValue("😄"), labelValues[0])
 }

pkg/cortex/cortex.go

@@ -31,7 +31,6 @@ import (
 	"github.com/cortexproject/cortex/pkg/configs"
 	configAPI "github.com/cortexproject/cortex/pkg/configs/api"
 	"github.com/cortexproject/cortex/pkg/configs/db"
-	_ "github.com/cortexproject/cortex/pkg/cortex/configinit"
 	"github.com/cortexproject/cortex/pkg/cortex/storage"
 	"github.com/cortexproject/cortex/pkg/cortexpb"
 	"github.com/cortexproject/cortex/pkg/distributor"

pkg/distributor/distributor_test.go

@@ -36,7 +36,6 @@ import (
 	"google.golang.org/grpc/status"
 
 	promchunk "github.com/cortexproject/cortex/pkg/chunk/encoding"
-	_ "github.com/cortexproject/cortex/pkg/cortex/configinit"
 	"github.com/cortexproject/cortex/pkg/cortexpb"
 	"github.com/cortexproject/cortex/pkg/ha"
 	"github.com/cortexproject/cortex/pkg/ingester"

pkg/util/validation/validate_test.go

@@ -16,7 +16,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/weaveworks/common/httpgrpc"
 
-	_ "github.com/cortexproject/cortex/pkg/cortex/configinit"
 	"github.com/cortexproject/cortex/pkg/cortexpb"
 	util_log "github.com/cortexproject/cortex/pkg/util/log"
 )