Merge pull request #54 from Thorsieger/master

caches metric can be missalloccated too

cmd/bucky/inconsistent.go

@@ -13,6 +13,9 @@ import (
 
 // import "github.com/go-graphite/buckytools/hashing"
 
+var inconsistentFilterCacheMetrics bool
+var inconsistentGoCarbonMetricsPrefix string
+
 func init() {
 	usage := "[options]"
 	short := "Find metrics not in correct locations."
@@ -36,6 +39,8 @@ Use bucky rebalance to correct.`
 		"Force the remote daemons to rebuild their cache.")
 	c.Flag.BoolVar(&listRegexMode, "r", false,
 		"Filter by a regular expression.")
+	c.Flag.BoolVar(&inconsistentFilterCacheMetrics, "filter-cache-metrics", true, "Filter go-carbon inconsistent metrics.")
+	c.Flag.StringVar(&inconsistentGoCarbonMetricsPrefix, "go-carbon-prefix", "carbon.agents.", "go-carbon metric prefix")
 }
 
 func InconsistentMetrics(hostports []string, regex string) (map[string][]string, error) {
@@ -63,9 +68,9 @@ func InconsistentMetrics(hostports []string, regex string) (map[string][]string,
 		}
 
 		for _, m := range metrics {
-			if strings.HasPrefix(m, "carbon.agents.") {
-				// These metrics are inserted into the stream after hashing
-				// is done.  They will never be consistent and shouldn't be.
+			if inconsistentFilterCacheMetrics && strings.HasPrefix(m, inconsistentGoCarbonMetricsPrefix) {
+				// Graphite cache metrics (usually "carbon.agents.*" metrics) can be inserted into the stream
+				// after hashing has been completed (if written locally). In this case, they will never be consistent and shouldn't be.
 				continue
 			}
 			if Cluster.Hash.GetNode(m).Server != host {

cmd/bucky/rebalance.go

@@ -56,6 +56,8 @@ Set -offload=true to speed up rebalance.`
 	c.Flag.BoolVar(&listForce, "f", false, "Force the remote daemons to rebuild their cache.")
 	c.Flag.StringVar(&rebalanceConfig.allowedDsts, "allowed-dsts", "", "Only copy/rebalance metrics to the allowed destinations (ip1:port,ip2:port). By default (i.e. empty), all dsts are allowed.")
 	c.Flag.StringVar(&rebalanceConfig.allowedMetricRegex, "r", "", "Only copy/rebalance metrics matching regex. By default (i.e. empty), all metrics are allowed.")
+	c.Flag.BoolVar(&inconsistentFilterCacheMetrics, "filter-cache-metrics", true, "Filter go-carbon inconsistent metrics.")
+	c.Flag.StringVar(&inconsistentGoCarbonMetricsPrefix, "go-carbon-prefix", "carbon.agents.", "go-carbon metric prefix")
 }
 
 // countMap returns the number of metrics in a server -> metrics mapping