From 5803d0ae0efce105fbfbb46747b77d8114b0d7f9 Mon Sep 17 00:00:00 2001 From: Tal Neiman <33829179+talIguaz@users.noreply.github.com> Date: Thu, 2 May 2019 13:19:38 +0300 Subject: [PATCH] disable v3io aggregations by default + changea query log to info (#42) --- cmd/prometheus/main.go | 4 ++-- config/config.go | 2 +- promql/engine.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go index 68f02dff3f0..5d4101334bf 100644 --- a/cmd/prometheus/main.go +++ b/cmd/prometheus/main.go @@ -447,8 +447,8 @@ func main() { }, // V3io related updates func(cfg *config.Config) error { - localStorage.SetUseV3ioAggregations(!cfg.DisableV3ioAggregations) - queryEngine.UseV3ioAggregations = !cfg.DisableV3ioAggregations + localStorage.SetUseV3ioAggregations(cfg.UseV3ioAggregations) + queryEngine.UseV3ioAggregations = cfg.UseV3ioAggregations return nil }, diff --git a/config/config.go b/config/config.go index af94efcfcef..a937f60764e 100644 --- a/config/config.go +++ b/config/config.go @@ -135,7 +135,7 @@ type Config struct { RemoteWriteConfigs []*RemoteWriteConfig `yaml:"remote_write,omitempty"` RemoteReadConfigs []*RemoteReadConfig `yaml:"remote_read,omitempty"` - DisableV3ioAggregations bool `yaml:"disableV3ioAggregations,omitempty"` + UseV3ioAggregations bool `yaml:"useV3ioAggregations,omitempty"` // original is the input from which the config was parsed. original string diff --git a/promql/engine.go b/promql/engine.go index f711002444b..5bc11ab22d1 100644 --- a/promql/engine.go +++ b/promql/engine.go @@ -587,7 +587,7 @@ func (ng *Engine) populateSeries(ctx context.Context, q storage.Queryable, s *Ev params.End = params.End - offsetMilliseconds } - level.Debug(ng.logger).Log("msg", "Querying v3io vector selector", + level.Info(ng.logger).Log("msg", "Querying v3io vector selector", "useV3ioAggregations", querier.(*tsdb.V3ioPromQuerier).UseAggregates, "use3ioAggregationConfig", querier.(*tsdb.V3ioPromQuerier).UseAggregatesConfig) set, wrn, err = querier.Select(params, n.LabelMatchers...) @@ -610,7 +610,7 @@ func (ng *Engine) populateSeries(ctx context.Context, q storage.Queryable, s *Ev params.End = params.End - offsetMilliseconds } - level.Debug(ng.logger).Log("msg", "Querying v3io matrix selector", + level.Info(ng.logger).Log("msg", "Querying v3io matrix selector", "useV3ioAggregations", querier.(*tsdb.V3ioPromQuerier).UseAggregates, "use3ioAggregationConfig", querier.(*tsdb.V3ioPromQuerier).UseAggregatesConfig) set, wrn, err = querier.Select(params, n.LabelMatchers...)