From b03c1d9691ad5c7d26824187e7cb9c473e34bc9a Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 27 Sep 2016 16:17:58 +0100
Subject: [PATCH] Support ordering of processor plugins
---
internal/config/config.go | 22 ++++++++++++++++++++--
internal/models/running_processor.go | 7 +++++++
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/internal/config/config.go b/internal/config/config.go
index 64338cde..a38af792 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -53,8 +53,9 @@ type Config struct {
Agent *AgentConfig
Inputs []*models.RunningInput
Outputs []*models.RunningOutput
- Processors []*models.RunningProcessor
Aggregators []*models.RunningAggregator
+ // Processors have a slice wrapper type because they need to be sorted
+ Processors models.RunningProcessors
}
func NewConfig() *Config {
@@ -654,6 +655,10 @@ func (c *Config) LoadConfig(path string) error {
}
}
}
+
+ if len(c.Processors) > 1 {
+ sort.Sort(c.Processors)
+ }
return nil
}
@@ -911,13 +916,26 @@ func buildAggregator(name string, tbl *ast.Table) (*models.AggregatorConfig, err
// buildProcessor TODO doc
func buildProcessor(name string, tbl *ast.Table) (*models.ProcessorConfig, error) {
conf := &models.ProcessorConfig{Name: name}
- unsupportedFields := []string{"tagexclude", "taginclude"}
+ unsupportedFields := []string{"tagexclude", "taginclude", "fielddrop", "fieldpass"}
for _, field := range unsupportedFields {
if _, ok := tbl.Fields[field]; ok {
// TODO raise error because field is not supported
}
}
+ if node, ok := tbl.Fields["order"]; ok {
+ if kv, ok := node.(*ast.KeyValue); ok {
+ if b, ok := kv.Value.(*ast.Integer); ok {
+ var err error
+ conf.Order, err = strconv.ParseInt(b.Value, 10, 64)
+ if err != nil {
+ log.Printf("Error parsing int value for %s: %s\n", name, err)
+ }
+ }
+ }
+ }
+
+ delete(tbl.Fields, "order")
var err error
conf.Filter, err = buildFilter(tbl)
if err != nil {
diff --git a/internal/models/running_processor.go b/internal/models/running_processor.go
index f4f483f6..600b6192 100644
--- a/internal/models/running_processor.go
+++ b/internal/models/running_processor.go
@@ -10,9 +10,16 @@ type RunningProcessor struct {
Config *ProcessorConfig
}
+type RunningProcessors []*RunningProcessor
+
+func (rp RunningProcessors) Len() int { return len(rp) }
+func (rp RunningProcessors) Swap(i, j int) { rp[i], rp[j] = rp[j], rp[i] }
+func (rp RunningProcessors) Less(i, j int) bool { return rp[i].Config.Order < rp[j].Config.Order }
+
// FilterConfig containing a name and filter
type ProcessorConfig struct {
Name string
+ Order int64
Filter Filter
}
--
GitLab