Add match mode to config

matcher/config.go

@@ -44,6 +44,7 @@ type Configuration struct {
 	DefaultNamespace      string                       `yaml:"defaultNamespace" validate:"nonzero"`
 	NameTagKey            string                       `yaml:"nameTagKey" validate:"nonzero"`
 	SortedTagIteratorPool pool.ObjectPoolConfiguration `yaml:"sortedTagIteratorPool"`
+	MatchMode             string                       `yaml:"matchMode"`
 }
 
 // NewNamespaces creates a matcher.Namespaces.
@@ -82,6 +83,11 @@ func (cfg *Configuration) NewOptions(
 	clockOpts clock.Options,
 	instrumentOpts instrument.Options,
 ) (Options, error) {
+	mode, err := parseMatchMode(cfg.MatchMode)
+	if err != nil {
+		return nil, err
+	}
+
 	// Configure rules kv store.
 	rulesStore, err := kvCluster.Store(cfg.RulesKVNamespace)
 	if err != nil {
@@ -128,11 +134,22 @@ func (cfg *Configuration) NewOptions(
 		SetNamespacesKey(cfg.NamespacesKey).
 		SetRuleSetKeyFn(ruleSetKeyFn).
 		SetNamespaceTag([]byte(cfg.NamespaceTag)).
-		SetDefaultNamespace([]byte(cfg.DefaultNamespace))
+		SetDefaultNamespace([]byte(cfg.DefaultNamespace)).
+		SetMatchMode(mode)
 
 	if cfg.InitWatchTimeout != 0 {
 		opts = opts.SetInitWatchTimeout(cfg.InitWatchTimeout)
 	}
 
 	return opts, nil
 }
+
+func parseMatchMode(value string) (rules.MatchMode, error) {
+	mode := rules.MatchMode(value)
+	switch mode {
+	case rules.ForwardMatch, rules.ReverseMatch:
+		return mode, nil
+	default:
+		return mode, fmt.Errorf("unknown match mode: %s", value)
+	}
+}

matcher/config_test.go

@@ -27,6 +27,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/m3db/m3cluster/client"
 	"github.com/m3db/m3cluster/kv/mem"
+	"github.com/m3db/m3metrics/rules"
 	"github.com/m3db/m3x/clock"
 	"github.com/m3db/m3x/instrument"
 
@@ -41,6 +42,7 @@ func TestConfigurationNewNamespaces(t *testing.T) {
 		NamespaceTag:     "NamespaceTag",
 		DefaultNamespace: "DefaultNamespace",
 		NameTagKey:       "NameTagKey",
+		MatchMode:        "forward",
 	}
 
 	ctrl := gomock.NewController(t)
@@ -57,4 +59,5 @@ func TestConfigurationNewNamespaces(t *testing.T) {
 	require.Equal(t, cfg.NamespacesKey, opts.NamespacesKey())
 	require.Equal(t, []byte(cfg.NamespaceTag), opts.NamespaceTag())
 	require.Equal(t, []byte(cfg.DefaultNamespace), opts.DefaultNamespace())
+	require.Equal(t, rules.ForwardMatch, opts.MatchMode())
 }

rules/ruleset.go

@@ -42,18 +42,18 @@ var (
 )
 
 // MatchMode determines how match is performed.
-type MatchMode int
+type MatchMode string
 
 // List of supported match modes.
 const (
 	// When performing matches in ForwardMatch mode, the matcher matches the given id against
 	// both the mapping rules and rollup rules to find out the applicable mapping policies
 	// and rollup policies.
-	ForwardMatch MatchMode = iota
+	ForwardMatch MatchMode = "forward"
 
 	// When performing matches in ReverseMatch mode, the matcher find the applicable mapping
 	// policies for the given id.
-	ReverseMatch
+	ReverseMatch MatchMode = "reverse"
 )
 
 // Matcher matches metrics against rules to determine applicable policies.