VERSION 4.1.3

1. 允许去除 index tag，以在 n9e 上获得更好的体验

README.md

@@ -100,6 +100,7 @@ swcollector需要部署到有交换机SNMP访问权限的服务器上。
             "172.16.114.233" 
  		],
 		"gosnmp":true,         #是否使用 gosnmp 采集, false 则使用 snmpwalk
+		"index_tag":false,     #去掉 index tag 以在 n9e 上获得更好体验
  		"pingTimeout":300,     #Ping超时时间，单位毫秒
 		"pingRetry":4,         #Ping探测重试次数
 		"community":"public",  #SNMP认证字符串

cfg.example.json

@@ -11,6 +11,7 @@
             "10.10.88.168"      
  		],
 		"gosnmp":true,
+		"index_tag":false,
  		"pingTimeout":300,
 		"pingRetry":4,
 		"community":"123456",

funcs/common.go

@@ -1,9 +1,10 @@
 package funcs
 
 import (
+	"strings"
+
 	"github.com/gaochao1/swcollector/g"
 	"github.com/open-falcon/common/model"
-	"strings"
 )
 
 func NewMetricValue(metric string, val interface{}, dataType string, tags ...string) *model.MetricValue {
@@ -14,9 +15,14 @@ func NewMetricValue(metric string, val interface{}, dataType string, tags ...str
 	}
 
 	size := len(tags)
-
+	validTags := []string{}
+	for _, t := range tags {
+		if t != "" {
+			validTags = append(validTags, t)
+		}
+	}
 	if size > 0 {
-		mv.Tags = strings.Join(tags, ",")
+		mv.Tags = strings.Join(validTags, ",")
 	}
 
 	return &mv
@@ -43,9 +49,14 @@ func NewMetricValueIp(TS int64, ip, metric string, val interface{}, dataType str
 	}
 
 	size := len(tags)
-
+	validTags := []string{}
+	for _, t := range tags {
+		if t != "" {
+			validTags = append(validTags, t)
+		}
+	}
 	if size > 0 {
-		mv.Tags = strings.Join(tags, ",")
+		mv.Tags = strings.Join(validTags, ",")
 	}
 
 	return &mv

funcs/swifstat.go

@@ -175,7 +175,10 @@ func swIfMetrics() (L []*model.MetricValue) {
 
 				for _, ifStat := range *chIfStat.IfStatsList {
 					ifNameTag := "ifName=" + ifStat.IfName
-					ifIndexTag := "ifIndex=" + strconv.Itoa(ifStat.IfIndex)
+					ifIndexTag := ""
+					if g.Config().Switch.IndexTag {
+						ifIndexTag = "ifIndex=" + strconv.Itoa(ifStat.IfIndex)
+					}
 					ip := chIfStat.Ip
 					if ignoreOperStatus == false {
 						L = append(L, GaugeValueIp(ifStat.TS, ip, "switch.if.OperStatus", ifStat.IfOperStatus, ifNameTag, ifIndexTag))

g/cfg.go

@@ -15,9 +15,10 @@ type DebugmetricConfig struct {
 }
 
 type SwitchConfig struct {
-	Enabled bool     `json:"enabled"`
-	IpRange []string `json:"ipRange"`
-	Gosnmp  bool     `json:"gosnmp"`
+	Enabled  bool     `json:"enabled"`
+	IpRange  []string `json:"ipRange"`
+	IndexTag bool     `json:"index_tag"`
+	Gosnmp   bool     `json:"gosnmp"`
 
 	PingTimeout int `json:"pingTimeout"`
 	PingRetry   int `json:"pingRetry"`

g/const.go

@@ -24,6 +24,6 @@ import (
 // 4.1.0 support n9e transfer mode
 // 4.1.1 n9e mode support debug
 const (
-	VERSION          = "4.1.2"
+	VERSION          = "4.1.3"
 	COLLECT_INTERVAL = time.Second
 )