Merge pull request #35 from v3io/development

Development --> Master (v2.8.0-v0.9.0)

README.md

@@ -91,6 +91,10 @@ The Makefile provides several targets:
   * You will find a Travis CI configuration in `.travis.yml`.
   * See the [Community page](https://prometheus.io/community) for how to reach the Prometheus developers and users on various communication channels.
 
+## V3IO integration
+### Configuration Options
+  * `disableV3ioAggregations` - Prometheus uses v3io-tsdb builtin aggregations by default when possible. To disable this optimization set `disableV3ioAggregations: true` config in your `prometheus.yaml` file. 
+
 ## Contributing
 
 Refer to [CONTRIBUTING.md](https://github.com/prometheus/prometheus/blob/master/CONTRIBUTING.md)

cmd/prometheus/main.go

@@ -447,8 +447,8 @@ func main() {
 		},
 		// V3io related updates
 		func(cfg *config.Config) error {
-			localStorage.SetUseV3ioAggregations(cfg.UseV3ioAggregations)
-			queryEngine.UseV3ioAggregations = cfg.UseV3ioAggregations
+			localStorage.SetUseV3ioAggregations(!cfg.DisableV3ioAggregations)
+			queryEngine.UseV3ioAggregations = !cfg.DisableV3ioAggregations
 
 			return nil
 		},

config/config.go

@@ -135,7 +135,7 @@ type Config struct {
 	RemoteWriteConfigs []*RemoteWriteConfig `yaml:"remote_write,omitempty"`
 	RemoteReadConfigs  []*RemoteReadConfig  `yaml:"remote_read,omitempty"`
 
-	UseV3ioAggregations bool `yaml:"useV3ioAggregations,omitempty"`
+	DisableV3ioAggregations bool `yaml:"disableV3ioAggregations,omitempty"`
 
 	// original is the input from which the config was parsed.
 	original string