Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable ingestion of native histograms in integration tests #4442

Merged
merged 1 commit into from
Mar 9, 2023
Merged

Enable ingestion of native histograms in integration tests #4442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions integration/backward_compatibility.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,23 @@ import "github.com/grafana/mimir/integration/e2emimir"
// DefaultPreviousVersionImages is used by `tools/pre-pull-images` so it needs
// to be in a non `_test.go` file.
var DefaultPreviousVersionImages = map[string]e2emimir.FlagMapper{
"grafana/mimir:2.0.0": e2emimir.SetFlagMapper(map[string]string{"-ingester.ring.readiness-check-ring-health": "false"}),
"grafana/mimir:2.1.0": e2emimir.SetFlagMapper(map[string]string{"-ingester.ring.readiness-check-ring-health": "false"}),
"grafana/mimir:2.2.0": e2emimir.SetFlagMapper(map[string]string{"-ingester.ring.readiness-check-ring-health": "false"}),
"grafana/mimir:2.3.1": e2emimir.SetFlagMapper(map[string]string{"-ingester.ring.readiness-check-ring-health": "false"}),
"grafana/mimir:2.4.0": e2emimir.NoopFlagMapper,
"grafana/mimir:2.5.0": e2emimir.NoopFlagMapper,
"grafana/mimir:2.6.0": e2emimir.NoopFlagMapper,
"grafana/mimir:2.0.0": e2emimir.ChainFlagMappers(
e2emimir.SetFlagMapper(map[string]string{"-ingester.ring.readiness-check-ring-health": "false"}),
e2emimir.RemoveFlagMapper([]string{"-ingester.native-histograms-ingestion-enabled"}),
),
"grafana/mimir:2.1.0": e2emimir.ChainFlagMappers(
e2emimir.SetFlagMapper(map[string]string{"-ingester.ring.readiness-check-ring-health": "false"}),
e2emimir.RemoveFlagMapper([]string{"-ingester.native-histograms-ingestion-enabled"}),
),
"grafana/mimir:2.2.0": e2emimir.ChainFlagMappers(
e2emimir.SetFlagMapper(map[string]string{"-ingester.ring.readiness-check-ring-health": "false"}),
e2emimir.RemoveFlagMapper([]string{"-ingester.native-histograms-ingestion-enabled"}),
),
"grafana/mimir:2.3.1": e2emimir.ChainFlagMappers(
e2emimir.SetFlagMapper(map[string]string{"-ingester.ring.readiness-check-ring-health": "false"}),
e2emimir.RemoveFlagMapper([]string{"-ingester.native-histograms-ingestion-enabled"}),
),
"grafana/mimir:2.4.0": e2emimir.RemoveFlagMapper([]string{"-ingester.native-histograms-ingestion-enabled"}),
"grafana/mimir:2.5.0": e2emimir.RemoveFlagMapper([]string{"-ingester.native-histograms-ingestion-enabled"}),
"grafana/mimir:2.6.0": e2emimir.RemoveFlagMapper([]string{"-ingester.native-histograms-ingestion-enabled"}),
}
6 changes: 6 additions & 0 deletions integration/e2emimir/services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ func NewIngester(name string, consulAddress string, flags map[string]string, opt
"-ingester.ring.consul.hostname": consulAddress,
// Speed up the startup.
"-ingester.ring.min-ready-duration": "0s",
// Enable native histograms
"-ingester.native-histograms-ingestion-enabled": "true",
},
flags,
options...,
Expand Down Expand Up @@ -206,6 +208,8 @@ func NewSingleBinary(name string, flags map[string]string, options ...Option) *M
"-log.level": "warn",
// Speed up the startup.
"-ingester.ring.min-ready-duration": "0s",
// Enable native histograms
"-ingester.native-histograms-ingestion-enabled": "true",
},
flags,
options...,
Expand Down Expand Up @@ -234,6 +238,8 @@ func NewWriteInstance(name string, flags map[string]string, options ...Option) *
"-ingester.ring.replication-factor": "1",
// Speed up startup.
"-ingester.ring.min-ready-duration": "0s",
// Enable native histograms
"-ingester.native-histograms-ingestion-enabled": "true",
},
flags,
options...,
Expand Down