Merge pull request #467 from v3io/development

Development

Author: dinal

Diff for: pkg/tsdb/schema/schema.go

@@ -190,7 +190,7 @@ func validateAggregatesGranularity(aggregationGranularity string, partitionInter
 	if hasAggregates {
 		partitionIntervalDuration, _ := utils.Str2duration(partitionInterval) // safe to ignore error since we create 'partitionInterval'
 		if partitionIntervalDuration/duration > MaxV3ioArraySize {
-			return errors.New("the aggregation granularity is too close to the ingestion rate provided. Try increasing the granularity to get an aggregation performance impact")
+			return errors.New("the size of the aggregation-granularity interval isn't sufficiently larger than the specified ingestion rate. Try increasing the granularity to get the expected pre-aggregation performance impact")
 		}
 	}
 	return nil

Diff for: pkg/tsdbctl/create.go

@@ -64,7 +64,7 @@ func newCreateCommandeer(rootCommandeer *RootCommandeer) *createCommandeer {
 	cmd.Flags().StringVarP(&commandeer.defaultRollups, "aggregates", "a", "",
 		"Default aggregates to calculate in real time during\nthe samples ingestion, as a comma-separated list of\nsupported aggregation functions - count | avg | sum |\nmin | max | stddev | stdvar | last | rate.\nExample: \"sum,avg,max\".")
 	cmd.Flags().StringVarP(&commandeer.crossLabelSets, "cross-label", "l", "",
-		"Label sets for which cross-label pre-aggregations should be created. Must be used in conjunction with -a.\nExample: \"label1,label2;label3\".")
+		"NOT SUPPORTED - Label sets for which cross-label pre-aggregations should be created. Must be used in conjunction with -a.\nExample: \"label1,label2;label3\".")
 	cmd.Flags().StringVarP(&commandeer.aggregationGranularity, "aggregation-granularity", "i", config.DefaultAggregationGranularity,
 		"Aggregation granularity - a time interval for applying\nthe aggregation functions (if  configured - see the\n-a|--aggregates flag), of the format \"[0-9]+[mhd]\"\n(where 'm' = minutes, 'h' = hours, and 'd' = days).\nExamples: \"2h\"; \"90m\".")
 	cmd.Flags().IntVarP(&commandeer.shardingBucketsCount, "sharding-buckets", "b", config.DefaultShardingBucketsCount,