added ospf support
This commit is contained in:
Daniel Czerwonk
parent
cf7d4bd13e
commit
37c832164d
36
main.go
36
main.go
@ -73,16 +73,38 @@ func handleMetricsRequest(w io.Writer, r *http.Request) error {
|
||||
return err
|
||||
}
|
||||
|
||||
for _, s := range protocols {
|
||||
writeForBgpSession(s, w)
|
||||
for _, p := range protocols {
|
||||
switch p.proto {
|
||||
case BGP:
|
||||
writeForBgpSession(p, w)
|
||||
case OSPF:
|
||||
writeForOspf(p, w)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func writeForBgpSession(s *protocol, w io.Writer) {
|
||||
fmt.Fprintf(w, "bgp%d_session_up{name=\"%s\"} %d\n", s.ipVersion, s.name, s.established)
|
||||
fmt.Fprintf(w, "bgp%d_session_prefix_count_import{name=\"%s\"} %d\n", s.ipVersion, s.name, s.imported)
|
||||
fmt.Fprintf(w, "bgp%d_session_prefix_count_export{name=\"%s\"} %d\n", s.ipVersion, s.name, s.exported)
|
||||
fmt.Fprintf(w, "bgp%d_session_uptime{name=\"%s\"} %d\n", s.ipVersion, s.name, s.uptime)
|
||||
func writeForBgpSession(p *protocol, w io.Writer) {
|
||||
prefix := fmt.Sprintf("bgp%d_session", p.ipVersion)
|
||||
writeForProtocol(p, prefix, w)
|
||||
}
|
||||
|
||||
func writeForOspf(p *protocol, w io.Writer) {
|
||||
if p.ipVersion == 4 {
|
||||
writeForProtocol(p, "ospf", w)
|
||||
} else {
|
||||
writeForProtocol(p, "ospfv3", w)
|
||||
}
|
||||
}
|
||||
|
||||
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_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_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)
|
||||
}
|
||||
}
|
||||
|
||||
35
parser.go
35
parser.go
@ -11,14 +11,14 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
protoRegex *regexp.Regexp
|
||||
routeRegex *regexp.Regexp
|
||||
uptimeRegex *regexp.Regexp
|
||||
protocolRegex *regexp.Regexp
|
||||
routeRegex *regexp.Regexp
|
||||
uptimeRegex *regexp.Regexp
|
||||
)
|
||||
|
||||
func init() {
|
||||
protoRegex, _ = regexp.Compile("^([^\\s]+)\\s+BGP\\s+([^\\s]+)\\s+([^\\s]+)\\s+([^\\s]+)\\s+(.*?)\\s*$")
|
||||
routeRegex, _ = regexp.Compile("^\\s+Routes:\\s+(\\d+) imported, \\d+ filtered, (\\d+) exported")
|
||||
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")
|
||||
uptimeRegex, _ = regexp.Compile("^(?:((\\d+):(\\d{2}):(\\d{2}))|\\d+)$")
|
||||
}
|
||||
|
||||
@ -49,14 +49,29 @@ func parseOutput(data []byte, ipVersion int) []*protocol {
|
||||
}
|
||||
|
||||
func parseLineForProtocol(line string, ipVersion int) (*protocol, bool) {
|
||||
match := protoRegex.FindStringSubmatch(line)
|
||||
match := protocolRegex.FindStringSubmatch(line)
|
||||
|
||||
if match == nil {
|
||||
return nil, false
|
||||
}
|
||||
|
||||
p := protocol{name: match[1], ipVersion: ipVersion, established: parseState(match[5]), uptime: parseUptime(match[4])}
|
||||
return &p, true
|
||||
proto := parseProto(match[2])
|
||||
up := parseState(match[6], proto)
|
||||
ut := parseUptime(match[5])
|
||||
p := &protocol{proto: proto, name: match[1], ipVersion: ipVersion, up: up, uptime: ut, attributes: make(map[string]interface{})}
|
||||
|
||||
return p, true
|
||||
}
|
||||
|
||||
func parseProto(val string) int {
|
||||
switch val {
|
||||
case "BGP":
|
||||
return BGP
|
||||
case "OSPF":
|
||||
return OSPF
|
||||
}
|
||||
|
||||
return PROTO_UNKNOWN
|
||||
}
|
||||
|
||||
func parseLineForRoutes(line string, p *protocol) {
|
||||
@ -68,8 +83,8 @@ func parseLineForRoutes(line string, p *protocol) {
|
||||
}
|
||||
}
|
||||
|
||||
func parseState(state string) int {
|
||||
if state == "Established" {
|
||||
func parseState(state string, proto int) int {
|
||||
if proto == OSPF || state == "Established" {
|
||||
return 1
|
||||
} else {
|
||||
return 0
|
||||
|
||||
@ -6,34 +6,36 @@ import (
|
||||
"github.com/czerwonk/testutils/assert"
|
||||
)
|
||||
|
||||
func TestEstablishedBirdOldFormat(t *testing.T) {
|
||||
func TestEstablishedBgpOldTimeFormat(t *testing.T) {
|
||||
data := "foo BGP master up 1481973060 Established\ntest\nbar\n Routes: 12 imported, 1 filtered, 34 exported, 100 preferred\nxxx"
|
||||
p := parseOutput([]byte(data), 4)
|
||||
assert.IntEqual("protocols", 1, len(p), t)
|
||||
|
||||
x := p[0]
|
||||
assert.StringEqual("name", "foo", x.name, t)
|
||||
assert.IntEqual("established", 1, x.established, t)
|
||||
assert.IntEqual("proto", BGP, x.proto, t)
|
||||
assert.IntEqual("established", 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)
|
||||
}
|
||||
|
||||
func TestEstablishedBirdCurrentFormat(t *testing.T) {
|
||||
func TestEstablishedBgpCurrentTimeFormat(t *testing.T) {
|
||||
data := "foo BGP master up 00:01:00 Established\ntest\nbar\n Routes: 12 imported, 1 filtered, 34 exported, 100 preferred\nxxx"
|
||||
p := parseOutput([]byte(data), 4)
|
||||
assert.IntEqual("protocols", 1, len(p), t)
|
||||
|
||||
x := p[0]
|
||||
assert.StringEqual("name", "foo", x.name, t)
|
||||
assert.IntEqual("established", 1, x.established, t)
|
||||
assert.IntEqual("proto", BGP, x.proto, t)
|
||||
assert.IntEqual("established", 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)
|
||||
assert.IntEqual("uptime", 60, x.uptime, t)
|
||||
}
|
||||
|
||||
func TestIpv6(t *testing.T) {
|
||||
func TestIpv6Bgp(t *testing.T) {
|
||||
data := "foo BGP master up 00:01:00 Established\ntest\nbar\n Routes: 12 imported, 1 filtered, 34 exported, 100 preferred\nxxx"
|
||||
p := parseOutput([]byte(data), 6)
|
||||
assert.IntEqual("protocols", 1, len(p), t)
|
||||
@ -42,22 +44,52 @@ func TestIpv6(t *testing.T) {
|
||||
assert.IntEqual("ipVersion", 6, x.ipVersion, t)
|
||||
}
|
||||
|
||||
func TestActive(t *testing.T) {
|
||||
func TestActiveBgp(t *testing.T) {
|
||||
data := "bar BGP master start 2016-01-01 Active\ntest\nbar"
|
||||
p := parseOutput([]byte(data), 4)
|
||||
assert.IntEqual("protocols", 1, len(p), t)
|
||||
|
||||
x := p[0]
|
||||
assert.StringEqual("name", "bar", x.name, t)
|
||||
assert.IntEqual("established", 0, x.established, t)
|
||||
assert.IntEqual("proto", BGP, x.proto, t)
|
||||
assert.IntEqual("established", 0, x.up, t)
|
||||
assert.IntEqual("imported", 0, int(x.imported), t)
|
||||
assert.IntEqual("exported", 0, int(x.exported), t)
|
||||
assert.IntEqual("ipVersion", 4, x.ipVersion, t)
|
||||
assert.IntEqual("uptime", 0, int(x.uptime), t)
|
||||
}
|
||||
|
||||
func Test2Sessions(t *testing.T) {
|
||||
func Test2BgpSessions(t *testing.T) {
|
||||
data := "foo BGP master up 00:01:00 Established\ntest\n Routes: 12 imported, 1 filtered, 34 exported, 100 preferred\nbar BGP master start 2016-01-01 Active\nxxx"
|
||||
p := parseOutput([]byte(data), 4)
|
||||
assert.IntEqual("protocols", 2, len(p), t)
|
||||
}
|
||||
|
||||
func TestOspfOldTimeFormat(t *testing.T) {
|
||||
data := "ospf1 OSPF master up 1481973060 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.StringEqual("name", "ospf1", x.name, t)
|
||||
assert.IntEqual("proto", OSPF, x.proto, t)
|
||||
assert.IntEqual("established", 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)
|
||||
}
|
||||
|
||||
func TestOspfCurrentTimeFormat(t *testing.T) {
|
||||
data := "ospf1 OSPF master up 00:01:00 Established\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.StringEqual("name", "ospf1", x.name, t)
|
||||
assert.IntEqual("proto", OSPF, x.proto, t)
|
||||
assert.IntEqual("established", 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)
|
||||
assert.IntEqual("uptime", 60, x.uptime, t)
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user