add filter names as label
This commit is contained in:
Daniel Czerwonk
parent
d6a31b7948
commit
25ef739b20
@ -2,15 +2,18 @@ package client
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/czerwonk/bird_exporter/parser"
|
||||
"github.com/czerwonk/bird_exporter/protocol"
|
||||
"github.com/czerwonk/bird_socket"
|
||||
birdsocket "github.com/czerwonk/bird_socket"
|
||||
)
|
||||
|
||||
// BirdClient communicates with the bird socket to retrieve information
|
||||
type BirdClient struct {
|
||||
Options *BirdClientOptions
|
||||
}
|
||||
|
||||
// BirdClientOptions defines options to connect to bird
|
||||
type BirdClientOptions struct {
|
||||
BirdV2 bool
|
||||
BirdEnabled bool
|
||||
@ -19,6 +22,7 @@ type BirdClientOptions struct {
|
||||
Bird6Socket string
|
||||
}
|
||||
|
||||
// GetProtocols retrieves protocol information and statistics from bird
|
||||
func (c *BirdClient) GetProtocols() ([]*protocol.Protocol, error) {
|
||||
ipVersions := make([]string, 0)
|
||||
if c.Options.BirdV2 {
|
||||
@ -36,8 +40,9 @@ func (c *BirdClient) GetProtocols() ([]*protocol.Protocol, error) {
|
||||
return c.protocolsFromBird(ipVersions)
|
||||
}
|
||||
|
||||
func (c *BirdClient) GetOspfAreas(protocol *protocol.Protocol) ([]*protocol.OspfArea, error) {
|
||||
sock := c.socketFor(protocol.IpVersion)
|
||||
// GetOSPFAreas retrieves OSPF specific information from bird
|
||||
func (c *BirdClient) GetOSPFAreas(protocol *protocol.Protocol) ([]*protocol.OspfArea, error) {
|
||||
sock := c.socketFor(protocol.IPVersion)
|
||||
b, err := birdsocket.Query(sock, fmt.Sprintf("show ospf %s", protocol.Name))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
@ -2,11 +2,12 @@ package client
|
||||
|
||||
import "github.com/czerwonk/bird_exporter/protocol"
|
||||
|
||||
// Client retrieves information from Bird routing daemon
|
||||
type Client interface {
|
||||
|
||||
// GetProtocols retrieves protocol information and statistics from bird
|
||||
GetProtocols() ([]*protocol.Protocol, error)
|
||||
|
||||
// GetOspfArea retrieves OSPF specific information from bird
|
||||
GetOspfAreas(protocol *protocol.Protocol) ([]*protocol.OspfArea, error)
|
||||
// GetOSPFAreas retrieves OSPF specific information from bird
|
||||
GetOSPFAreas(protocol *protocol.Protocol) ([]*protocol.OspfArea, error)
|
||||
}
|
||||
|
||||
17
go.mod
17
go.mod
@ -1,19 +1,10 @@
|
||||
module github.com/czerwonk/bird_exporter
|
||||
|
||||
require (
|
||||
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc
|
||||
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf
|
||||
github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a
|
||||
github.com/czerwonk/bird_socket v0.0.0-20170701072538-fe8194eb5598
|
||||
github.com/czerwonk/testutils v0.0.0-20170526233935-dd9dabe360d4
|
||||
github.com/golang/protobuf v0.0.0-20170920220647-130e6b02ab05
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.0
|
||||
github.com/prometheus/client_golang v0.8.0
|
||||
github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612
|
||||
github.com/prometheus/common v0.0.0-20170908161822-2f17f4a9d485
|
||||
github.com/prometheus/procfs v0.0.0-20170703101242-e645f4e5aaa8
|
||||
github.com/sirupsen/logrus v1.0.3
|
||||
golang.org/x/crypto v0.0.0-20170928142450-76eec36fa142
|
||||
golang.org/x/sys v0.0.0-20170927054621-314a259e304f
|
||||
gopkg.in/alecthomas/kingpin.v2 v2.2.5
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
||||
github.com/modern-go/reflect2 v1.0.1 // indirect
|
||||
github.com/prometheus/client_golang v1.2.1
|
||||
github.com/prometheus/common v0.7.0
|
||||
)
|
||||
|
||||
106
go.sum
106
go.sum
@ -1,30 +1,92 @@
|
||||
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
|
||||
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
||||
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
|
||||
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
||||
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY=
|
||||
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
||||
github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a h1:BtpsbiV638WQZwhA98cEZw2BsbnQJrbd0BI7tsy0W1c=
|
||||
github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
|
||||
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 h1:Hs82Z41s6SdL1CELW+XaDYmOH4hkBN4/N9og/AsOv7E=
|
||||
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
||||
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
|
||||
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
|
||||
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
|
||||
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
|
||||
github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA=
|
||||
github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
|
||||
github.com/czerwonk/bird_socket v0.0.0-20170701072538-fe8194eb5598 h1:PoKf7YEmuDOGzXD52jaJhZeOuwRrgv9FbZF8yfyoF7A=
|
||||
github.com/czerwonk/bird_socket v0.0.0-20170701072538-fe8194eb5598/go.mod h1:SQ2xpIC3W7ygMomUYEsxXBeun7RML/HCNXj24fbz+XI=
|
||||
github.com/czerwonk/testutils v0.0.0-20170526233935-dd9dabe360d4 h1:1QQjuJMb2LVM/sk4HS7svnGjM8um7EWk8lD5BwZ2X28=
|
||||
github.com/czerwonk/testutils v0.0.0-20170526233935-dd9dabe360d4/go.mod h1:Xibh2UDW2TbNjbi8QON4p0QxiYK/RM5USagAW7J3jUM=
|
||||
github.com/golang/protobuf v0.0.0-20170920220647-130e6b02ab05 h1:Kesru7U6Mhpf/x7rthxAKnr586VFmoE2NdEvkOKvfjg=
|
||||
github.com/golang/protobuf v0.0.0-20170920220647-130e6b02ab05/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.0 h1:YNOwxxSJzSUARoD9KRZLzM9Y858MNGCOACTvCW9TSAc=
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.0/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
|
||||
github.com/prometheus/client_golang v0.8.0 h1:1921Yw9Gc3iSc4VQh3PIoOqgPCZS7G/4xQNVUp8Mda8=
|
||||
github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
|
||||
github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612 h1:13pIdM2tpaDi4OVe24fgoIS7ZTqMt0QI+bwQsX5hq+g=
|
||||
github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
|
||||
github.com/prometheus/common v0.0.0-20170908161822-2f17f4a9d485 h1:ELypU1kBAPEzqcj8hphDyZWTJw5TIFgepXU983BEkD0=
|
||||
github.com/prometheus/common v0.0.0-20170908161822-2f17f4a9d485/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
|
||||
github.com/prometheus/procfs v0.0.0-20170703101242-e645f4e5aaa8 h1:uZfczEBIA1FZfOQo4/JWgGnMNd/4HVsM9A+B30wtlkA=
|
||||
github.com/prometheus/procfs v0.0.0-20170703101242-e645f4e5aaa8/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
|
||||
github.com/sirupsen/logrus v1.0.3 h1:B5C/igNWoiULof20pKfY4VntcIPqKuwEmoLZrabbUrc=
|
||||
github.com/sirupsen/logrus v1.0.3/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
|
||||
golang.org/x/crypto v0.0.0-20170928142450-76eec36fa142 h1:5T6aMun9V7kQkjsSk9ZbDDnTnZNNwh4HDNahEeONaD8=
|
||||
golang.org/x/crypto v0.0.0-20170928142450-76eec36fa142/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||
golang.org/x/sys v0.0.0-20170927054621-314a259e304f h1:iUy6hSM2lPBGm2d9HgXq1GqYPwcJvA8ihnWauXggYMs=
|
||||
golang.org/x/sys v0.0.0-20170927054621-314a259e304f/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
gopkg.in/alecthomas/kingpin.v2 v2.2.5 h1:qskSCq465uEvC3oGocwvZNsO3RF3SpLVLumOAhL0bXo=
|
||||
gopkg.in/alecthomas/kingpin.v2 v2.2.5/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
||||
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
||||
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
|
||||
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
|
||||
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
||||
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
|
||||
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
|
||||
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
|
||||
github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
||||
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
||||
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
|
||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
||||
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
||||
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
|
||||
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
|
||||
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
|
||||
github.com/prometheus/client_golang v1.2.1 h1:JnMpQc6ppsNgw9QPAGF6Dod479itz7lvlsMzzNayLOI=
|
||||
github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U=
|
||||
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
|
||||
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
|
||||
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
|
||||
github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLyCY=
|
||||
github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
|
||||
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
|
||||
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
|
||||
github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
|
||||
github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
|
||||
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
|
||||
github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
|
||||
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
|
||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY=
|
||||
golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
|
||||
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
|
||||
2
main.go
2
main.go
@ -12,7 +12,7 @@ import (
|
||||
"github.com/prometheus/common/log"
|
||||
)
|
||||
|
||||
const version string = "1.2.3"
|
||||
const version string = "1.2.4"
|
||||
|
||||
var (
|
||||
showVersion = flag.Bool("version", false, "Print version information.")
|
||||
|
||||
@ -46,7 +46,7 @@ func exportersForLegacy(c *client.BirdClient) map[int][]metrics.MetricExporter {
|
||||
protocol.BGP: {metrics.NewLegacyMetricExporter("bgp4_session", "bgp6_session", l)},
|
||||
protocol.Direct: {metrics.NewLegacyMetricExporter("direct4", "direct6", l)},
|
||||
protocol.Kernel: {metrics.NewLegacyMetricExporter("kernel4", "kernel6", l)},
|
||||
protocol.OSPF: {metrics.NewLegacyMetricExporter("ospf", "ospfv3", l), metrics.NewOspfExporter("", c)},
|
||||
protocol.OSPF: {metrics.NewLegacyMetricExporter("ospf", "ospfv3", l), metrics.NewOSPFExporter("", c)},
|
||||
protocol.Static: {metrics.NewLegacyMetricExporter("static4", "static6", l)},
|
||||
}
|
||||
}
|
||||
@ -59,7 +59,7 @@ func exportersForDefault(c *client.BirdClient) map[int][]metrics.MetricExporter
|
||||
protocol.BGP: {e},
|
||||
protocol.Direct: {e},
|
||||
protocol.Kernel: {e},
|
||||
protocol.OSPF: {e, metrics.NewOspfExporter("bird_", c)},
|
||||
protocol.OSPF: {e, metrics.NewOSPFExporter("bird_", c)},
|
||||
protocol.Static: {e},
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,15 +4,18 @@ import (
|
||||
"github.com/czerwonk/bird_exporter/protocol"
|
||||
)
|
||||
|
||||
// DefaultLabelStrategy defines the labels to add to an metric and its data retrieval method
|
||||
type DefaultLabelStrategy struct {
|
||||
}
|
||||
|
||||
// LabelNames returns the list of label names
|
||||
func (*DefaultLabelStrategy) LabelNames() []string {
|
||||
return []string{"name", "proto", "ip_version"}
|
||||
return []string{"name", "proto", "ip_version", "import_filter", "export_filter"}
|
||||
}
|
||||
|
||||
// LabelValues returns the values for a protocol
|
||||
func (*DefaultLabelStrategy) LabelValues(p *protocol.Protocol) []string {
|
||||
return []string{p.Name, protoString(p), p.IpVersion}
|
||||
return []string{p.Name, protoString(p), p.IPVersion, p.ImportFilter, p.ExportFilter}
|
||||
}
|
||||
|
||||
func protoString(p *protocol.Protocol) string {
|
||||
@ -20,7 +23,7 @@ func protoString(p *protocol.Protocol) string {
|
||||
case protocol.BGP:
|
||||
return "BGP"
|
||||
case protocol.OSPF:
|
||||
if p.IpVersion == "4" {
|
||||
if p.IPVersion == "4" {
|
||||
return "OSPF"
|
||||
}
|
||||
return "OSPFv3"
|
||||
|
||||
@ -5,6 +5,7 @@ import (
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
)
|
||||
|
||||
// GenericProtocolMetricExporter exports metrics retrieved from Bird routing daemon
|
||||
type GenericProtocolMetricExporter struct {
|
||||
labelStrategy LabelStrategy
|
||||
upDesc *prometheus.Desc
|
||||
@ -35,6 +36,7 @@ type GenericProtocolMetricExporter struct {
|
||||
withdrawsExportAcceptCountDesc *prometheus.Desc
|
||||
}
|
||||
|
||||
// NewGenericProtocolMetricExporter creates a new instance of GenericProtocolMetricExporter
|
||||
func NewGenericProtocolMetricExporter(prefix string, newNaming bool, labelStrategy LabelStrategy) *GenericProtocolMetricExporter {
|
||||
m := &GenericProtocolMetricExporter{labelStrategy: labelStrategy}
|
||||
m.initDesc(prefix, newNaming)
|
||||
|
||||
@ -23,7 +23,7 @@ func (e *LegacyMetricExporter) Describe(ch chan<- *prometheus.Desc) {
|
||||
}
|
||||
|
||||
func (e *LegacyMetricExporter) Export(p *protocol.Protocol, ch chan<- prometheus.Metric) {
|
||||
if p.IpVersion == "4" {
|
||||
if p.IPVersion == "4" {
|
||||
e.ipv4Exporter.Export(p, ch)
|
||||
} else {
|
||||
e.ipv6Exporter.Export(p, ch)
|
||||
|
||||
@ -19,7 +19,8 @@ type ospfMetricExporter struct {
|
||||
client client.Client
|
||||
}
|
||||
|
||||
func NewOspfExporter(prefix string, client client.Client) MetricExporter {
|
||||
// NewOSPFExporter creates a new MetricExporter for OSPF metrics
|
||||
func NewOSPFExporter(prefix string, client client.Client) MetricExporter {
|
||||
d := make(map[string]*ospfDesc)
|
||||
d["4"] = getDesc(prefix + "ospf")
|
||||
d["6"] = getDesc(prefix + "ospfv3")
|
||||
@ -55,10 +56,10 @@ func (m *ospfMetricExporter) describe(ipVersion string, ch chan<- *prometheus.De
|
||||
}
|
||||
|
||||
func (m *ospfMetricExporter) Export(p *protocol.Protocol, ch chan<- prometheus.Metric) {
|
||||
d := m.descriptions[p.IpVersion]
|
||||
d := m.descriptions[p.IPVersion]
|
||||
ch <- prometheus.MustNewConstMetric(d.runningDesc, prometheus.GaugeValue, p.Attributes["running"], p.Name)
|
||||
|
||||
areas, err := m.client.GetOspfAreas(p)
|
||||
areas, err := m.client.GetOSPFAreas(p)
|
||||
if err != nil {
|
||||
log.Errorln(err)
|
||||
return
|
||||
|
||||
@ -18,6 +18,7 @@ var (
|
||||
routeRegex *regexp.Regexp
|
||||
uptimeRegex *regexp.Regexp
|
||||
routeChangeRegex *regexp.Regexp
|
||||
filterRegex *regexp.Regexp
|
||||
channelRegex *regexp.Regexp
|
||||
)
|
||||
|
||||
@ -34,6 +35,7 @@ func init() {
|
||||
routeRegex = regexp.MustCompile(`^\s+Routes:\s+(\d+) imported, (?:(\d+) filtered, )?(\d+) exported(?:, (\d+) preferred)?`)
|
||||
uptimeRegex = regexp.MustCompile(`^(?:((\d+):(\d{2}):(\d{2}))|(\d+)|(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}))$`)
|
||||
routeChangeRegex = regexp.MustCompile(`(Import|Export) (updates|withdraws):\s+(\d+|---)\s+(\d+|---)\s+(\d+|---)\s+(\d+|---)\s+(\d+|---)\s*`)
|
||||
filterRegex = regexp.MustCompile(`(Input|Output) filter:\s+(.*)`)
|
||||
channelRegex = regexp.MustCompile(`Channel ipv(4|6)`)
|
||||
}
|
||||
|
||||
@ -50,6 +52,7 @@ func ParseProtocols(data []byte, ipVersion string) []*protocol.Protocol {
|
||||
parseLineForChannel,
|
||||
parseLineForRoutes,
|
||||
parseLineForRouteChanges,
|
||||
parseLineForFilterName,
|
||||
}
|
||||
|
||||
for scanner.Scan() {
|
||||
@ -180,15 +183,15 @@ func parseLineForChannel(c *context) {
|
||||
return
|
||||
}
|
||||
|
||||
if len(c.current.IpVersion) == 0 {
|
||||
c.current.IpVersion = channel[1]
|
||||
if len(c.current.IPVersion) == 0 {
|
||||
c.current.IPVersion = channel[1]
|
||||
} else {
|
||||
c.current = &protocol.Protocol{
|
||||
Name: c.current.Name,
|
||||
Proto: c.current.Proto,
|
||||
Up: c.current.Up,
|
||||
Uptime: c.current.Uptime,
|
||||
IpVersion: channel[1],
|
||||
IPVersion: channel[1],
|
||||
}
|
||||
c.protocols = append(c.protocols, c.current)
|
||||
}
|
||||
@ -264,6 +267,25 @@ func parseRouteChangeValue(value string) int64 {
|
||||
return parseInt(value)
|
||||
}
|
||||
|
||||
func parseLineForFilterName(c *context) {
|
||||
if c.current == nil {
|
||||
return
|
||||
}
|
||||
|
||||
match := filterRegex.FindStringSubmatch(c.line)
|
||||
if match == nil {
|
||||
return
|
||||
}
|
||||
|
||||
if match[1] == "Input" {
|
||||
c.current.ImportFilter = match[2]
|
||||
} else {
|
||||
c.current.ExportFilter = match[2]
|
||||
}
|
||||
|
||||
c.handled = true
|
||||
}
|
||||
|
||||
func parseInt(value string) int64 {
|
||||
i, err := strconv.ParseInt(value, 10, 64)
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ func TestEstablishedBgpOldTimeFormat(t *testing.T) {
|
||||
assert.Int64Equal("exported", 34, x.Exported, t)
|
||||
assert.Int64Equal("filtered", 1, x.Filtered, t)
|
||||
assert.Int64Equal("preferred", 100, x.Preferred, t)
|
||||
assert.StringEqual("ipVersion", "4", x.IpVersion, t)
|
||||
assert.StringEqual("ipVersion", "4", x.IPVersion, t)
|
||||
assert.That("uptime", "uptime is feasable", func() bool { return x.Uptime >= min && max <= x.Uptime }, t)
|
||||
}
|
||||
|
||||
@ -40,7 +40,7 @@ func TestEstablishedBgpCurrentTimeFormat(t *testing.T) {
|
||||
assert.Int64Equal("exported", 34, x.Exported, t)
|
||||
assert.Int64Equal("filtered", 1, x.Filtered, t)
|
||||
assert.Int64Equal("preferred", 100, x.Preferred, t)
|
||||
assert.StringEqual("ipVersion", "4", x.IpVersion, t)
|
||||
assert.StringEqual("ipVersion", "4", x.IPVersion, t)
|
||||
assert.IntEqual("uptime", 60, x.Uptime, t)
|
||||
}
|
||||
|
||||
@ -61,7 +61,7 @@ func TestEstablishedBgpIsoLongTimeFormat(t *testing.T) {
|
||||
assert.Int64Equal("exported", 34, x.Exported, t)
|
||||
assert.Int64Equal("filtered", 1, x.Filtered, t)
|
||||
assert.Int64Equal("preferred", 100, x.Preferred, t)
|
||||
assert.StringEqual("ipVersion", "4", x.IpVersion, t)
|
||||
assert.StringEqual("ipVersion", "4", x.IPVersion, t)
|
||||
assert.That("uptime", "uptime is feasable", func() bool { return x.Uptime >= min && max <= x.Uptime }, t)
|
||||
}
|
||||
|
||||
@ -71,7 +71,7 @@ func TestIpv6Bgp(t *testing.T) {
|
||||
assert.IntEqual("protocols", 1, len(p), t)
|
||||
|
||||
x := p[0]
|
||||
assert.StringEqual("ipVersion", "6", x.IpVersion, t)
|
||||
assert.StringEqual("ipVersion", "6", x.IPVersion, t)
|
||||
}
|
||||
|
||||
func TestActiveBgp(t *testing.T) {
|
||||
@ -85,7 +85,7 @@ func TestActiveBgp(t *testing.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.StringEqual("ipVersion", "4", x.IpVersion, t)
|
||||
assert.StringEqual("ipVersion", "4", x.IPVersion, t)
|
||||
assert.IntEqual("uptime", 0, int(x.Uptime), t)
|
||||
}
|
||||
|
||||
@ -133,6 +133,8 @@ func TestWithBird2(t *testing.T) {
|
||||
"bgp1 BGP master up 1494926415\n" +
|
||||
" Channel ipv6\n" +
|
||||
" Routes: 1 imported, 2 filtered, 3 exported, 4 preferred\n" +
|
||||
" Input filter: none\n" +
|
||||
" Output filter: all\n" +
|
||||
"\n" +
|
||||
"direct1 Direct --- up 1513027903\n" +
|
||||
" Channel ipv4\n" +
|
||||
@ -171,16 +173,18 @@ func TestWithBird2(t *testing.T) {
|
||||
x := p[0]
|
||||
assert.StringEqual("BGP ipv6 name", "bgp1", x.Name, t)
|
||||
assert.IntEqual("BGP ipv6 proto", protocol.BGP, x.Proto, t)
|
||||
assert.StringEqual("BGP ipv6 ip version", "6", x.IpVersion, t)
|
||||
assert.StringEqual("BGP ipv6 ip version", "6", x.IPVersion, t)
|
||||
assert.Int64Equal("BGP ipv6 imported", 1, x.Imported, t)
|
||||
assert.Int64Equal("BGP ipv6 exported", 3, x.Exported, t)
|
||||
assert.Int64Equal("BGP ipv6 filtered", 2, x.Filtered, t)
|
||||
assert.Int64Equal("BGP ipv6 preferred", 4, x.Preferred, t)
|
||||
assert.StringEqual("BGP import filter", "none", x.ImportFilter, t)
|
||||
assert.StringEqual("BGP export filter", "all", x.ExportFilter, t)
|
||||
|
||||
x = p[1]
|
||||
assert.StringEqual("BGP ipv4 name", "direct1", x.Name, t)
|
||||
assert.StringEqual("Direct ipv4 name", "direct1", x.Name, t)
|
||||
assert.IntEqual("Direct ipv4 proto", protocol.Direct, x.Proto, t)
|
||||
assert.StringEqual("Direct ipv4 ip version", "4", x.IpVersion, t)
|
||||
assert.StringEqual("Direct ipv4 ip version", "4", x.IPVersion, t)
|
||||
assert.Int64Equal("Direct ipv4 imported", 12, x.Imported, t)
|
||||
assert.Int64Equal("Direct ipv4 exported", 34, x.Exported, t)
|
||||
assert.Int64Equal("Direct ipv4 filtered", 1, x.Filtered, t)
|
||||
@ -207,9 +211,9 @@ func TestWithBird2(t *testing.T) {
|
||||
assert.Int64Equal("Direct ipv4 export withdraws accepted", 0, x.ExportWithdraws.Accepted, t)
|
||||
|
||||
x = p[2]
|
||||
assert.StringEqual("BGP ipv4 name", "direct1", x.Name, t)
|
||||
assert.StringEqual("Direct ipv6 name", "direct1", x.Name, t)
|
||||
assert.IntEqual("Direct ipv6 proto", protocol.Direct, x.Proto, t)
|
||||
assert.StringEqual("Direct ipv6 ip version", "6", x.IpVersion, t)
|
||||
assert.StringEqual("Direct ipv6 ip version", "6", x.IPVersion, t)
|
||||
assert.Int64Equal("Direct ipv6 imported", 3, x.Imported, t)
|
||||
assert.Int64Equal("Direct ipv6 exported", 5, x.Exported, t)
|
||||
assert.Int64Equal("Direct ipv6 filtered", 7, x.Filtered, t)
|
||||
@ -238,7 +242,7 @@ func TestWithBird2(t *testing.T) {
|
||||
x = p[3]
|
||||
assert.StringEqual("OSPF ipv4 name", "ospf1", x.Name, t)
|
||||
assert.IntEqual("OSPF ipv4 proto", protocol.OSPF, x.Proto, t)
|
||||
assert.StringEqual("OSPF ipv4 ip version", "4", x.IpVersion, t)
|
||||
assert.StringEqual("OSPF ipv4 ip version", "4", x.IPVersion, t)
|
||||
assert.Int64Equal("OSPF ipv4 imported", 4, x.Imported, t)
|
||||
assert.Int64Equal("OSPF ipv4 exported", 2, x.Exported, t)
|
||||
assert.Int64Equal("OSPF ipv4 filtered", 3, x.Filtered, t)
|
||||
@ -257,7 +261,7 @@ func TestOspfOldTimeFormat(t *testing.T) {
|
||||
assert.Int64Equal("imported", 12, x.Imported, t)
|
||||
assert.Int64Equal("exported", 34, x.Exported, t)
|
||||
assert.Int64Equal("preferred", 100, x.Preferred, t)
|
||||
assert.StringEqual("ipVersion", "4", x.IpVersion, t)
|
||||
assert.StringEqual("ipVersion", "4", x.IPVersion, t)
|
||||
}
|
||||
|
||||
func TestOspfCurrentTimeFormat(t *testing.T) {
|
||||
@ -272,7 +276,7 @@ func TestOspfCurrentTimeFormat(t *testing.T) {
|
||||
assert.Int64Equal("imported", 12, x.Imported, t)
|
||||
assert.Int64Equal("exported", 34, x.Exported, t)
|
||||
assert.Int64Equal("preferred", 100, x.Preferred, t)
|
||||
assert.StringEqual("ipVersion", "4", x.IpVersion, t)
|
||||
assert.StringEqual("ipVersion", "4", x.IPVersion, t)
|
||||
assert.IntEqual("uptime", 60, x.Uptime, t)
|
||||
}
|
||||
|
||||
@ -287,7 +291,7 @@ func TestOspfProtocolDown(t *testing.T) {
|
||||
assert.IntEqual("up", 0, x.Up, t)
|
||||
assert.Int64Equal("imported", 0, x.Imported, t)
|
||||
assert.Int64Equal("exported", 0, x.Exported, t)
|
||||
assert.StringEqual("ipVersion", "6", x.IpVersion, t)
|
||||
assert.StringEqual("ipVersion", "6", x.IPVersion, t)
|
||||
}
|
||||
|
||||
func TestOspfRunning(t *testing.T) {
|
||||
|
||||
@ -11,7 +11,9 @@ const (
|
||||
|
||||
type Protocol struct {
|
||||
Name string
|
||||
IpVersion string
|
||||
IPVersion string
|
||||
ImportFilter string
|
||||
ExportFilter string
|
||||
Proto int
|
||||
Up int
|
||||
Imported int64
|
||||
@ -35,5 +37,5 @@ type RouteChangeCount struct {
|
||||
}
|
||||
|
||||
func NewProtocol(name string, proto int, ipVersion string, uptime int) *Protocol {
|
||||
return &Protocol{Name: name, Proto: proto, IpVersion: ipVersion, Uptime: uptime, Attributes: make(map[string]float64)}
|
||||
return &Protocol{Name: name, Proto: proto, IPVersion: ipVersion, Uptime: uptime, Attributes: make(map[string]float64)}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user