added ospf*_running metric

main.go

@@ -113,6 +113,6 @@ func writeForProtocol(p *protocol, prefix string, w io.Writer) {
 	fmt.Fprintf(w, "%s_uptime{name=\"%s\"} %d\n", prefix, p.name, p.uptime)
 
 	for k, v := range p.attributes {
-		fmt.Fprintf(w, "%s_%s{name=\"%s\"} %v\n", prefix, k, v)
+		fmt.Fprintf(w, "%s_%s{name=\"%s\"} %v\n", prefix, k, p.name, v)
 	}
 }

parser.go

@@ -59,6 +59,7 @@ func parseLineForProtocol(line string, ipVersion int) (*protocol, bool) {
 	up := parseState(match[4], proto)
 	ut := parseUptime(match[5])
 	p := &protocol{proto: proto, name: match[1], ipVersion: ipVersion, up: up, uptime: ut, attributes: make(map[string]interface{})}
+	fillAttributes(p, match)
 
 	return p, true
 }
@@ -90,9 +91,9 @@ func parseLineForRoutes(line string, p *protocol) {
 func parseState(state string, proto int) int {
 	if state == "up" {
 		return 1
-	} else {
-		return 0
 	}
+
+	return 0
 }
 
 func parseUptime(value string) int {
@@ -143,3 +144,17 @@ func parseInt(value string) int64 {
 
 	return i
 }
+
+func fillAttributes(p *protocol, m []string) {
+	if p.proto == OSPF {
+		p.attributes["running"] = parseOspfRunning(m[6])
+	}
+}
+
+func parseOspfRunning(state string) int {
+	if state == "Running" {
+		return 1
+	}
+
+	return 0
+}

parser_test.go

@@ -116,7 +116,7 @@ func TestOspfRunning(t *testing.T) {
 	assert.IntEqual("protocols", 1, len(p), t)
 
 	x := p[0]
-	assert.IntEqual("runing", 1, p.attributes["running"], t)
+	assert.IntEqual("runing", 1, x.attributes["running"].(int), t)
 }
 
 func TestOspfAlone(t *testing.T) {
@@ -125,5 +125,5 @@ func TestOspfAlone(t *testing.T) {
 	assert.IntEqual("protocols", 1, len(p), t)
 
 	x := p[0]
-	assert.IntEqual("runing", 0, p.attributes["running"], t)
+	assert.IntEqual("runing", 0, x.attributes["running"].(int), t)
 }