add options to rebalance

go-graphite · Jul 20, 2023 · 5fc4c79 · 5fc4c79
1 parent 82a5d19
commit 5fc4c79
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/cmd/bucky/inconsistent.go b/cmd/bucky/inconsistent.go
@@ -13,8 +13,8 @@ import (
 
 // import "github.com/go-graphite/buckytools/hashing"
 
-var inconsistentCacheMetrics bool
-var inconsistentCacheMetricsPrefix string
+var inconsistentInconsistentCacheMetrics bool
+var inconsistentGoCarbonMetricsPrefix string
 
 func init() {
  usage := "[options]"
@@ -39,10 +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(&inconsistentCacheMetrics, "list-cache-metrics", true,
- "Filter carbon cache metrics.")
- c.Flag.StringVar(&inconsistentCacheMetricsPrefix, "cache-metric-prefix", "carbon.agents.",
- "cache metric prefix")
+ c.Flag.BoolVar(&inconsistentInconsistentCacheMetrics, "inconsistent-cache-metrics", false, "Search for 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) {
@@ -70,7 +68,7 @@ func InconsistentMetrics(hostports []string, regex string) (map[string][]string,
  }
 
  for _, m := range metrics {
- if !inconsistentCacheMetrics && strings.HasPrefix(m, inconsistentCacheMetricsPrefix) {
+ if !inconsistentInconsistentCacheMetrics && strings.HasPrefix(m, inconsistentGoCarbonMetricsPrefix) {
  continue
  }
  if Cluster.Hash.GetNode(m).Server != host {

diff --git a/cmd/bucky/rebalance.go b/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(&inconsistentInconsistentCacheMetrics, "inconsistent-cache-metrics", false, "Search for 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