added metric for filtered routes

main.go

@@ -11,7 +11,7 @@ import (
 	"os"
 )
 
-const version string = "0.5.3"
+const version string = "0.6.0"
 
 var (
 	showVersion   = flag.Bool("version", false, "Print version information.")
@@ -109,6 +109,7 @@ func writeForProtocol(p *protocol, prefix string, w io.Writer) {
 	fmt.Fprintf(w, "%s_up{name=\"%s\"} %d\n", prefix, p.name, p.up)
 	fmt.Fprintf(w, "%s_prefix_count_import{name=\"%s\"} %d\n", prefix, p.name, p.imported)
 	fmt.Fprintf(w, "%s_prefix_count_export{name=\"%s\"} %d\n", prefix, p.name, p.exported)
+	fmt.Fprintf(w, "%s_prefix_count_filter{name=\"%s\"} %d\n", prefix, p.name, p.filtered)
 	fmt.Fprintf(w, "%s_uptime{name=\"%s\"} %d\n", prefix, p.name, p.uptime)
 
 	for k, v := range p.attributes {

parser.go

@@ -18,7 +18,7 @@ var (
 
 func init() {
 	protocolRegex, _ = regexp.Compile("^([^\\s]+)\\s+(BGP|OSPF)\\s+([^\\s]+)\\s+([^\\s]+)\\s+([^\\s]+)\\s+(.*?)\\s*$")
-	routeRegex, _ = regexp.Compile("^\\s+Routes:\\s+(\\d+) imported, (?:\\d+ filtered, )?(\\d+) exported")
+	routeRegex, _ = regexp.Compile("^\\s+Routes:\\s+(\\d+) imported, (?:(\\d+) filtered, )?(\\d+) exported")
 	uptimeRegex, _ = regexp.Compile("^(?:((\\d+):(\\d{2}):(\\d{2}))|\\d+)$")
 }
 
@@ -79,7 +79,11 @@ func parseLineForRoutes(line string, p *protocol) {
 
 	if match != nil {
 		p.imported, _ = strconv.ParseInt(match[1], 10, 64)
-		p.exported, _ = strconv.ParseInt(match[2], 10, 64)
+		p.exported, _ = strconv.ParseInt(match[3], 10, 64)
+
+		if len(match[2]) > 0 {
+			p.filtered, _ = strconv.ParseInt(match[2], 10, 64)
+		}
 	}
 }
 

parser_test.go

@@ -17,6 +17,7 @@ func TestEstablishedBgpOldTimeFormat(t *testing.T) {
 	assert.IntEqual("established", 1, x.up, t)
 	assert.Int64Equal("imported", 12, x.imported, t)
 	assert.Int64Equal("exported", 34, x.exported, t)
+	assert.Int64Equal("filtered", 1, x.filtered, t)
 	assert.IntEqual("ipVersion", 4, x.ipVersion, t)
 }
 
@@ -31,6 +32,7 @@ func TestEstablishedBgpCurrentTimeFormat(t *testing.T) {
 	assert.IntEqual("established", 1, x.up, t)
 	assert.Int64Equal("imported", 12, x.imported, t)
 	assert.Int64Equal("exported", 34, x.exported, t)
+	assert.Int64Equal("filtered", 1, x.filtered, t)
 	assert.IntEqual("ipVersion", 4, x.ipVersion, t)
 	assert.IntEqual("uptime", 60, x.uptime, t)
 }
@@ -73,7 +75,7 @@ func TestOspfOldTimeFormat(t *testing.T) {
 	x := p[0]
 	assert.StringEqual("name", "ospf1", x.name, t)
 	assert.IntEqual("proto", OSPF, x.proto, t)
-	assert.IntEqual("established", 1, x.up, t)
+	assert.IntEqual("up", 1, x.up, t)
 	assert.Int64Equal("imported", 12, x.imported, t)
 	assert.Int64Equal("exported", 34, x.exported, t)
 	assert.IntEqual("ipVersion", 4, x.ipVersion, t)
@@ -87,7 +89,7 @@ func TestOspfCurrentTimeFormat(t *testing.T) {
 	x := p[0]
 	assert.StringEqual("name", "ospf1", x.name, t)
 	assert.IntEqual("proto", OSPF, x.proto, t)
-	assert.IntEqual("established", 1, x.up, t)
+	assert.IntEqual("up", 1, x.up, t)
 	assert.Int64Equal("imported", 12, x.imported, t)
 	assert.Int64Equal("exported", 34, x.exported, t)
 	assert.IntEqual("ipVersion", 4, x.ipVersion, t)
@@ -102,8 +104,26 @@ func TestOspfProtocolDown(t *testing.T) {
 	x := p[0]
 	assert.StringEqual("name", "o_hrz", x.name, t)
 	assert.IntEqual("proto", OSPF, x.proto, t)
-	assert.IntEqual("established", 0, x.up, t)
+	assert.IntEqual("up", 0, x.up, t)
 	assert.Int64Equal("imported", 0, x.imported, t)
 	assert.Int64Equal("exported", 0, x.exported, t)
 	assert.IntEqual("ipVersion", 6, x.ipVersion, t)
 }
+
+func TestOspfRunning(t *testing.T) {
+	data := "ospf1    OSPF      master   up     00:01:00  Running\ntest\nbar\n  Routes:         12 imported, 34 exported, 100 preferred\nxxx"
+	p := parseOutput([]byte(data), 4)
+	assert.IntEqual("protocols", 1, len(p), t)
+
+	x := p[0]
+	assert.IntEqual("runing", 1, p.attributes["running"], t)
+}
+
+func TestOspfAlone(t *testing.T) {
+	data := "ospf1    OSPF      master   up     00:01:00  Alone\ntest\nbar\n  Routes:         12 imported, 34 exported, 100 preferred\nxxx"
+	p := parseOutput([]byte(data), 4)
+	assert.IntEqual("protocols", 1, len(p), t)
+
+	x := p[0]
+	assert.IntEqual("runing", 0, p.attributes["running"], t)
+}

protocol.go

@@ -13,6 +13,7 @@ type protocol struct {
 	up         int
 	imported   int64
 	exported   int64
+	filtered   int64
 	uptime     int
 	attributes map[string]interface{}
 }