[agent] append default tags to metrics sending via agent

open-falcon-archive/agent#58
smartech7 · Apr 26, 2017 · b20061f · b20061f
1 parent 8912c85
commit b20061f
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 9 deletions.
diff --git a/config/agent.json b/config/agent.json
@@ -30,6 +30,8 @@
     "collector": {
         "ifacePrefix": ["eth", "em"]
     },
+    "default_tags": {
+    },
     "ignore": {
         "cpu.busy": true,
         "df.bytes.free": true,

diff --git a/modules/agent/cfg.example.json b/modules/agent/cfg.example.json
@@ -31,6 +31,8 @@
     "collector": {
         "ifacePrefix": ["eth", "em"]
     },
+    "default_tags": {
+    },
     "ignore": {
         "cpu.busy": true,
         "df.bytes.free": true,

diff --git a/modules/agent/g/cfg.go b/modules/agent/g/cfg.go
@@ -41,15 +41,16 @@ type CollectorConfig struct {
 }
 
 type GlobalConfig struct {
-	Debug         bool             `json:"debug"`
-	Hostname      string           `json:"hostname"`
-	IP            string           `json:"ip"`
-	Plugin        *PluginConfig    `json:"plugin"`
-	Heartbeat     *HeartbeatConfig `json:"heartbeat"`
-	Transfer      *TransferConfig  `json:"transfer"`
-	Http          *HttpConfig      `json:"http"`
-	Collector     *CollectorConfig `json:"collector"`
-	IgnoreMetrics map[string]bool  `json:"ignore"`
+	Debug         bool              `json:"debug"`
+	Hostname      string            `json:"hostname"`
+	IP            string            `json:"ip"`
+	Plugin        *PluginConfig     `json:"plugin"`
+	Heartbeat     *HeartbeatConfig  `json:"heartbeat"`
+	Transfer      *TransferConfig   `json:"transfer"`
+	Http          *HttpConfig       `json:"http"`
+	Collector     *CollectorConfig  `json:"collector"`
+	DefaultTags   map[string]string `json:"default_tags"`
+	IgnoreMetrics map[string]bool   `json:"ignore"`
 }
 
 var (

diff --git a/modules/agent/g/var.go b/modules/agent/g/var.go
@@ -1,6 +1,7 @@
 package g
 
 import (
+	"bytes"
 	"github.com/open-falcon/falcon-plus/common/model"
 	"github.com/toolkits/slice"
 	"log"
@@ -55,6 +56,32 @@ func SendToTransfer(metrics []*model.MetricValue) {
 		return
 	}
 
+	dt := Config().DefaultTags
+	if len(dt) > 0 {
+		var buf bytes.Buffer
+		default_tags_list := []string{}
+		for k, v := range dt {
+			buf.Reset()
+			buf.WriteString(k)
+			buf.WriteString("=")
+			buf.WriteString(v)
+			default_tags_list = append(default_tags_list, buf.String())
+		}
+		default_tags := strings.Join(default_tags_list, ",")
+
+		for i, x := range metrics {
+			buf.Reset()
+			if x.Tags == "" {
+				metrics[i].Tags = default_tags
+			} else {
+				buf.WriteString(metrics[i].Tags)
+				buf.WriteString(",")
+				buf.WriteString(default_tags)
+				metrics[i].Tags = buf.String()
+			}
+		}
+	}
+
 	debug := Config().Debug
 
 	if debug {