diff --git a/integration/influx_ingestion_test.go b/integration/influx_ingestion_test.go index bb9d929d63..8ac9269e0b 100644 --- a/integration/influx_ingestion_test.go +++ b/integration/influx_ingestion_test.go @@ -57,7 +57,7 @@ func TestInfluxIngestion(t *testing.T) { series, expectedVector, expectedMatrix := generateFloatSeries("series_f1", now, prompb.Label{Name: "foo", Value: "bar"}) // Fix up the expectation as Influx values seem to be rounded to millionths for _, s := range expectedVector { - s.Metric[model.LabelName("__mimir_source__")] = model.LabelValue("influx") + s.Metric[model.LabelName("__proxy_source__")] = model.LabelValue("influx") s.Value = model.SampleValue(math.Round(float64(s.Value)*1000000) / 1000000.0) } // Fix up the expectation as Influx values seem to be rounded to millionths @@ -87,7 +87,7 @@ func TestInfluxIngestion(t *testing.T) { labelNames, err := c.LabelNames(v1.MinTime, v1.MaxTime, nil) require.NoError(t, err) - require.Equal(t, []string{"__mimir_source__", "__name__", "foo"}, labelNames) + require.Equal(t, []string{"__name", "__proxy_source__", "foo"}, labelNames) rangeResult, err := c.QueryRange("series_f1", now.Add(-15*time.Minute), now, 15*time.Second) require.NoError(t, err) diff --git a/pkg/distributor/influx.go b/pkg/distributor/influx.go index 67cf217083..440dd8594b 100644 --- a/pkg/distributor/influx.go +++ b/pkg/distributor/influx.go @@ -163,7 +163,7 @@ func TimeseriesToInfluxRequest(timeseries []prompb.TimeSeries) string { name = l.Value continue } - if l.Name != "__mimir_source__" { + if l.Name != "__proxy_source__" { others = append(others, l.Name+"="+l.Value) } } diff --git a/pkg/distributor/influx_test.go b/pkg/distributor/influx_test.go index cbe18530d3..a3999b4bb8 100644 --- a/pkg/distributor/influx_test.go +++ b/pkg/distributor/influx_test.go @@ -23,8 +23,8 @@ func TestInfluxHandleSeriesPush(t *testing.T) { { TimeSeries: &mimirpb.TimeSeries{ Labels: []mimirpb.LabelAdapter{ - {Name: "__mimir_source__", Value: "influx"}, {Name: "__name__", Value: "measurement_f1"}, + {Name: "__proxy_source__", Value: "influx"}, {Name: "t1", Value: "v1"}, }, Samples: []mimirpb.Sample{ diff --git a/pkg/distributor/influxpush/parser.go b/pkg/distributor/influxpush/parser.go index a567ec8110..1512080fce 100644 --- a/pkg/distributor/influxpush/parser.go +++ b/pkg/distributor/influxpush/parser.go @@ -20,7 +20,9 @@ import ( "github.com/grafana/mimir/pkg/util" ) -const internalLabel = "__mimir_source__" +// This has to match existing code in influx2cortex otherwise all customer series would +// change when they move to the influx in Mimir endpoint. +const internalLabel = "__proxy_source__" // ParseInfluxLineReader parses a Influx Line Protocol request from an io.Reader. func ParseInfluxLineReader(_ context.Context, r *http.Request, maxSize int) ([]mimirpb.PreallocTimeseries, int, error) { diff --git a/pkg/distributor/influxpush/parser_test.go b/pkg/distributor/influxpush/parser_test.go index 729819d0f5..14d74c2329 100644 --- a/pkg/distributor/influxpush/parser_test.go +++ b/pkg/distributor/influxpush/parser_test.go @@ -31,8 +31,8 @@ func TestParseInfluxLineReader(t *testing.T) { expectedResult: []mimirpb.TimeSeries{ { Labels: []mimirpb.LabelAdapter{ - {Name: "__mimir_source__", Value: "influx"}, {Name: "__name__", Value: "measurement"}, + {Name: "__proxy_source__", Value: "influx"}, {Name: "t1", Value: "v1"}, }, Samples: []mimirpb.Sample{{Value: 1.5, TimestampMs: 1465839830100}}, @@ -46,8 +46,8 @@ func TestParseInfluxLineReader(t *testing.T) { expectedResult: []mimirpb.TimeSeries{ { Labels: []mimirpb.LabelAdapter{ - {Name: "__mimir_source__", Value: "influx"}, {Name: "__name__", Value: "measurement_f1"}, + {Name: "__proxy_source__", Value: "influx"}, {Name: "t1", Value: "v1"}, }, Samples: []mimirpb.Sample{{Value: 2, TimestampMs: 1465839830100}}, @@ -61,8 +61,8 @@ func TestParseInfluxLineReader(t *testing.T) { expectedResult: []mimirpb.TimeSeries{ { Labels: []mimirpb.LabelAdapter{ - {Name: "__mimir_source__", Value: "influx"}, {Name: "__name__", Value: "measurement_f1"}, + {Name: "__proxy_source__", Value: "influx"}, {Name: "t1", Value: "v1"}, }, Samples: []mimirpb.Sample{{Value: 3.14159, TimestampMs: 1465839830100}}, @@ -76,24 +76,24 @@ func TestParseInfluxLineReader(t *testing.T) { expectedResult: []mimirpb.TimeSeries{ { Labels: []mimirpb.LabelAdapter{ - {Name: "__mimir_source__", Value: "influx"}, {Name: "__name__", Value: "measurement_f1"}, + {Name: "__proxy_source__", Value: "influx"}, {Name: "t1", Value: "v1"}, }, Samples: []mimirpb.Sample{{Value: 2, TimestampMs: 1465839830100}}, }, { Labels: []mimirpb.LabelAdapter{ - {Name: "__mimir_source__", Value: "influx"}, {Name: "__name__", Value: "measurement_f2"}, + {Name: "__proxy_source__", Value: "influx"}, {Name: "t1", Value: "v1"}, }, Samples: []mimirpb.Sample{{Value: 3, TimestampMs: 1465839830100}}, }, { Labels: []mimirpb.LabelAdapter{ - {Name: "__mimir_source__", Value: "influx"}, {Name: "__name__", Value: "measurement_f3"}, + {Name: "__proxy_source__", Value: "influx"}, {Name: "t1", Value: "v1"}, }, Samples: []mimirpb.Sample{{Value: 3.14159, TimestampMs: 1465839830100}}, @@ -107,8 +107,8 @@ func TestParseInfluxLineReader(t *testing.T) { expectedResult: []mimirpb.TimeSeries{ { Labels: []mimirpb.LabelAdapter{ - {Name: "__mimir_source__", Value: "influx"}, {Name: "__name__", Value: "measurement_f1"}, + {Name: "__proxy_source__", Value: "influx"}, {Name: "t1", Value: "v1"}, }, Samples: []mimirpb.Sample{{Value: 2, TimestampMs: 1465839830100}}, @@ -123,8 +123,8 @@ func TestParseInfluxLineReader(t *testing.T) { expectedResult: []mimirpb.TimeSeries{ { Labels: []mimirpb.LabelAdapter{ - {Name: "__mimir_source__", Value: "influx"}, {Name: "__name__", Value: "measurement_f1"}, + {Name: "__proxy_source__", Value: "influx"}, {Name: "t1", Value: "v1"}, {Name: "t2", Value: "v2"}, {Name: "t3", Value: "v3"}, @@ -140,24 +140,24 @@ func TestParseInfluxLineReader(t *testing.T) { expectedResult: []mimirpb.TimeSeries{ { Labels: []mimirpb.LabelAdapter{ - {Name: "__mimir_source__", Value: "influx"}, {Name: "__name__", Value: "measurement_f1"}, + {Name: "__proxy_source__", Value: "influx"}, {Name: "t1", Value: "v1"}, }, Samples: []mimirpb.Sample{{Value: 3, TimestampMs: 1465839830100}}, }, { Labels: []mimirpb.LabelAdapter{ - {Name: "__mimir_source__", Value: "influx"}, {Name: "__name__", Value: "measurement_f2"}, + {Name: "__proxy_source__", Value: "influx"}, {Name: "t1", Value: "v1"}, }, Samples: []mimirpb.Sample{{Value: 365, TimestampMs: 1465839830100}}, }, { Labels: []mimirpb.LabelAdapter{ - {Name: "__mimir_source__", Value: "influx"}, {Name: "__name__", Value: "measurement_f3"}, + {Name: "__proxy_source__", Value: "influx"}, {Name: "t1", Value: "v1"}, }, Samples: []mimirpb.Sample{{Value: 0, TimestampMs: 1465839830100}}, @@ -171,8 +171,8 @@ func TestParseInfluxLineReader(t *testing.T) { expectedResult: []mimirpb.TimeSeries{ { Labels: []mimirpb.LabelAdapter{ - {Name: "__mimir_source__", Value: "influx"}, {Name: "__name__", Value: "_measurement_f_1"}, + {Name: "__proxy_source__", Value: "influx"}, {Name: "_t1_", Value: "v1"}, }, Samples: []mimirpb.Sample{{Value: 0, TimestampMs: 1465839830100}}, @@ -187,8 +187,8 @@ func TestParseInfluxLineReader(t *testing.T) { { Labels: []mimirpb.LabelAdapter{ {Name: "_1t1", Value: "v1"}, - {Name: "__mimir_source__", Value: "influx"}, {Name: "__name__", Value: "_0measurement_f1"}, + {Name: "__proxy_source__", Value: "influx"}, }, Samples: []mimirpb.Sample{{Value: 0, TimestampMs: 1465839830100}}, },