Merge pull request #43 from v3io/development

disable v3io aggregations by default + changea query log to info (#42)

Author: gtopper

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
 		},

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

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...)