mirrors/bird_exporter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new encapsulation with label strategies

Browse Source
This commit is contained in:
Daniel Czerwonk 2017-11-30 23:35:31 +01:00
parent baeb9c804e
commit c8354f281e
10 changed files with 136 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bird_client.go
View File

@ -3,6 +3,7 @@ package main
import (
"github.com/czerwonk/bird_exporter/protocol"
"github.com/czerwonk/bird_socket"
"github.com/czerwonk/bird_exporter/parser"
)
func getProtocols() ([]*protocol.Protocol, error) {
@ -33,5 +34,5 @@ func getProtocolsFromBird(socketPath string, ipVersion int) ([]*protocol.Protoco
return nil, err
}
return parseOutput(b, ipVersion), nil
return parser.Parse(b, ipVersion), nil
}

14
metric_collector.go
View File

@ -1,6 +1,7 @@
package main
import (
"github.com/czerwonk/bird_exporter/metrics"
"github.com/czerwonk/bird_exporter/ospf"
"github.com/czerwonk/bird_exporter/protocol"
"github.com/prometheus/client_golang/prometheus"
@ -17,13 +18,14 @@ type MetricCollector struct {
}
func NewMetricCollectorForProtocols(protocols []*protocol.Protocol) *MetricCollector {
l := &metrics.LegacyLabelStrategy{}
e := map[int]MetricExporter{
protocol.BGP: protocol.NewMetricExporter("bgp4_session", "bgp6_session"),
protocol.Device: protocol.NewMetricExporter("device4", "device6"),
protocol.Direct: protocol.NewMetricExporter("direct4", "direct6"),
protocol.Kernel: protocol.NewMetricExporter("kernel4", "kernel6"),
protocol.OSPF: &ospf.OspfMetricExporter{},
protocol.Static: protocol.NewMetricExporter("static4", "static6"),
protocol.BGP: metrics.NewMetricExporter("bgp4_session", "bgp6_session", l),
protocol.Device: metrics.NewMetricExporter("device4", "device6", l),
protocol.Direct: metrics.NewMetricExporter("direct4", "direct6", l),
protocol.Kernel: metrics.NewMetricExporter("kernel4", "kernel6", l),
protocol.OSPF: ospf.NewExporter(l),
protocol.Static: metrics.NewMetricExporter("static4", "static6", l),
}
return &MetricCollector{protocols: protocols, exporters: e}

36
metrics/default_label_strategy.go Normal file
View File

@ -0,0 +1,36 @@
package metrics
import "github.com/czerwonk/bird_exporter/protocol"
type DefaultLabelStrategy struct {
}
func (*DefaultLabelStrategy) labelNames() []string {
return []string{"name", "proto", "ip_version"}
}
func (*DefaultLabelStrategy) labelValues(p *protocol.Protocol) []string {
return []string{p.Name, protoString(p), string(p.IpVersion)}
}
func protoString(p *protocol.Protocol) string {
switch p.Proto {
case protocol.BGP:
return "BGP"
case protocol.OSPF:
if p.IpVersion == 4 {
return "OSPF"
} else {
return "OSPFv3"
}
case protocol.Static:
return "Static"
case protocol.Kernel:
return "Kernel"
case protocol.Device:
return "Device"
case protocol.Direct:
return "Direct"
}
return ""
}

11
protocol/exporter.go → metrics/exporter.go
View File

@ -1,7 +1,8 @@
package protocol
package metrics
import (
"github.com/prometheus/client_golang/prometheus"
"github.com/czerwonk/bird_exporter/protocol"
)
type ProtocolMetricExporter struct {
@ -9,10 +10,10 @@ type ProtocolMetricExporter struct {
ipv6Exporter *GenericProtocolMetricExporter
}
func NewMetricExporter(prefixIpv4, prefixIpv6 string) *ProtocolMetricExporter {
func NewMetricExporter(prefixIpv4, prefixIpv6 string, labelStrategy LabelStrategy) *ProtocolMetricExporter {
return &ProtocolMetricExporter{
ipv4Exporter: NewGenericProtocolMetricExporter(prefixIpv4),
ipv6Exporter: NewGenericProtocolMetricExporter(prefixIpv6),
ipv4Exporter: NewGenericProtocolMetricExporter(prefixIpv4, labelStrategy),
ipv6Exporter: NewGenericProtocolMetricExporter(prefixIpv6, labelStrategy),
}
}
@ -21,7 +22,7 @@ func (e *ProtocolMetricExporter) Describe(ch chan<- *prometheus.Desc) {
e.ipv6Exporter.Describe(ch)
}
func (e *ProtocolMetricExporter) Export(p *Protocol, ch chan<- prometheus.Metric) {
func (e *ProtocolMetricExporter) Export(p *protocol.Protocol, ch chan<- prometheus.Metric) {
if p.IpVersion == 4 {
e.ipv4Exporter.Export(p, ch)
} else {

69
protocol/generic_exporter.go → metrics/generic_exporter.go
View File

@ -1,8 +1,12 @@
package protocol
package metrics
import "github.com/prometheus/client_golang/prometheus"
import (
"github.com/czerwonk/bird_exporter/protocol"
"github.com/prometheus/client_golang/prometheus"
)
type GenericProtocolMetricExporter struct {
labelStrategy LabelStrategy
upDesc *prometheus.Desc
importCountDesc *prometheus.Desc
exportCountDesc *prometheus.Desc
@ -31,15 +35,15 @@ type GenericProtocolMetricExporter struct {
withdrawsExportAcceptCountDesc *prometheus.Desc
}
func NewGenericProtocolMetricExporter(prefix string) *GenericProtocolMetricExporter {
m := &GenericProtocolMetricExporter{}
func NewGenericProtocolMetricExporter(prefix string, labelStrategy LabelStrategy) *GenericProtocolMetricExporter {
m := &GenericProtocolMetricExporter{labelStrategy: labelStrategy}
m.initDesc(prefix)
return m
}
func (m *GenericProtocolMetricExporter) initDesc(prefix string) {
labels := []string{"name"}
labels := m.labelStrategy.labelNames()
m.upDesc = prometheus.NewDesc(prefix+"_up", "Protocol is up", labels, nil)
m.importCountDesc = prometheus.NewDesc(prefix+"_prefix_count_import", "Number of imported routes", labels, nil)
m.exportCountDesc = prometheus.NewDesc(prefix+"_prefix_count_export", "Number of exported routes", labels, nil)
@ -97,31 +101,32 @@ func (m *GenericProtocolMetricExporter) Describe(ch chan<- *prometheus.Desc) {
ch <- m.withdrawsExportReceiveCountDesc
}
func (m *GenericProtocolMetricExporter) Export(protocol *Protocol, ch chan<- prometheus.Metric) {
ch <- prometheus.MustNewConstMetric(m.upDesc, prometheus.GaugeValue, float64(protocol.Up), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.importCountDesc, prometheus.GaugeValue, float64(protocol.Imported), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.exportCountDesc, prometheus.GaugeValue, float64(protocol.Exported), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.filterCountDesc, prometheus.GaugeValue, float64(protocol.Filtered), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.preferredCountDesc, prometheus.GaugeValue, float64(protocol.Preferred), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.uptimeDesc, prometheus.GaugeValue, float64(protocol.Uptime), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.updatesImportReceiveCountDesc, prometheus.GaugeValue, float64(protocol.ImportUpdates.Received), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.updatesImportRejectCountDesc, prometheus.GaugeValue, float64(protocol.ImportUpdates.Rejected), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.updatesImportFilterCountDesc, prometheus.GaugeValue, float64(protocol.ImportUpdates.Filtered), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.updatesImportAcceptCountDesc, prometheus.GaugeValue, float64(protocol.ImportUpdates.Accepted), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.updatesImportIgnoreCountDesc, prometheus.GaugeValue, float64(protocol.ImportUpdates.Ignored), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.updatesExportReceiveCountDesc, prometheus.GaugeValue, float64(protocol.ExportUpdates.Received), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.updatesExportRejectCountDesc, prometheus.GaugeValue, float64(protocol.ExportUpdates.Rejected), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.updatesExportFilterCountDesc, prometheus.GaugeValue, float64(protocol.ExportUpdates.Filtered), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.updatesExportAcceptCountDesc, prometheus.GaugeValue, float64(protocol.ExportUpdates.Accepted), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.updatesExportIgnoreCountDesc, prometheus.GaugeValue, float64(protocol.ExportUpdates.Ignored), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.withdrawsImportReceiveCountDesc, prometheus.GaugeValue, float64(protocol.ImportWithdraws.Received), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.withdrawsImportRejectCountDesc, prometheus.GaugeValue, float64(protocol.ImportWithdraws.Rejected), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.withdrawsImportFilterCountDesc, prometheus.GaugeValue, float64(protocol.ImportWithdraws.Filtered), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.withdrawsImportAcceptCountDesc, prometheus.GaugeValue, float64(protocol.ImportWithdraws.Accepted), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.withdrawsImportIgnoreCountDesc, prometheus.GaugeValue, float64(protocol.ImportWithdraws.Ignored), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.withdrawsExportReceiveCountDesc, prometheus.GaugeValue, float64(protocol.ExportWithdraws.Received), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.withdrawsExportRejectCountDesc, prometheus.GaugeValue, float64(protocol.ExportWithdraws.Rejected), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.withdrawsExportFilterCountDesc, prometheus.GaugeValue, float64(protocol.ExportWithdraws.Filtered), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.withdrawsExportAcceptCountDesc, prometheus.GaugeValue, float64(protocol.ExportWithdraws.Accepted), protocol.Name)
ch <- prometheus.MustNewConstMetric(m.withdrawsExportIgnoreCountDesc, prometheus.GaugeValue, float64(protocol.ExportWithdraws.Ignored), protocol.Name)
func (m *GenericProtocolMetricExporter) Export(p *protocol.Protocol, ch chan<- prometheus.Metric) {
l := m.labelStrategy.labelValues(p)
ch <- prometheus.MustNewConstMetric(m.upDesc, prometheus.GaugeValue, float64(p.Up), l...)
ch <- prometheus.MustNewConstMetric(m.importCountDesc, prometheus.GaugeValue, float64(p.Imported), l...)
ch <- prometheus.MustNewConstMetric(m.exportCountDesc, prometheus.GaugeValue, float64(p.Exported), l...)
ch <- prometheus.MustNewConstMetric(m.filterCountDesc, prometheus.GaugeValue, float64(p.Filtered), l...)
ch <- prometheus.MustNewConstMetric(m.preferredCountDesc, prometheus.GaugeValue, float64(p.Preferred), l...)
ch <- prometheus.MustNewConstMetric(m.uptimeDesc, prometheus.GaugeValue, float64(p.Uptime), l...)
ch <- prometheus.MustNewConstMetric(m.updatesImportReceiveCountDesc, prometheus.GaugeValue, float64(p.ImportUpdates.Received), l...)
ch <- prometheus.MustNewConstMetric(m.updatesImportRejectCountDesc, prometheus.GaugeValue, float64(p.ImportUpdates.Rejected), l...)
ch <- prometheus.MustNewConstMetric(m.updatesImportFilterCountDesc, prometheus.GaugeValue, float64(p.ImportUpdates.Filtered), l...)
ch <- prometheus.MustNewConstMetric(m.updatesImportAcceptCountDesc, prometheus.GaugeValue, float64(p.ImportUpdates.Accepted), l...)
ch <- prometheus.MustNewConstMetric(m.updatesImportIgnoreCountDesc, prometheus.GaugeValue, float64(p.ImportUpdates.Ignored), l...)
ch <- prometheus.MustNewConstMetric(m.updatesExportReceiveCountDesc, prometheus.GaugeValue, float64(p.ExportUpdates.Received), l...)
ch <- prometheus.MustNewConstMetric(m.updatesExportRejectCountDesc, prometheus.GaugeValue, float64(p.ExportUpdates.Rejected), l...)
ch <- prometheus.MustNewConstMetric(m.updatesExportFilterCountDesc, prometheus.GaugeValue, float64(p.ExportUpdates.Filtered), l...)
ch <- prometheus.MustNewConstMetric(m.updatesExportAcceptCountDesc, prometheus.GaugeValue, float64(p.ExportUpdates.Accepted), l...)
ch <- prometheus.MustNewConstMetric(m.updatesExportIgnoreCountDesc, prometheus.GaugeValue, float64(p.ExportUpdates.Ignored), l...)
ch <- prometheus.MustNewConstMetric(m.withdrawsImportReceiveCountDesc, prometheus.GaugeValue, float64(p.ImportWithdraws.Received), l...)
ch <- prometheus.MustNewConstMetric(m.withdrawsImportRejectCountDesc, prometheus.GaugeValue, float64(p.ImportWithdraws.Rejected), l...)
ch <- prometheus.MustNewConstMetric(m.withdrawsImportFilterCountDesc, prometheus.GaugeValue, float64(p.ImportWithdraws.Filtered), l...)
ch <- prometheus.MustNewConstMetric(m.withdrawsImportAcceptCountDesc, prometheus.GaugeValue, float64(p.ImportWithdraws.Accepted), l...)
ch <- prometheus.MustNewConstMetric(m.withdrawsImportIgnoreCountDesc, prometheus.GaugeValue, float64(p.ImportWithdraws.Ignored), l...)
ch <- prometheus.MustNewConstMetric(m.withdrawsExportReceiveCountDesc, prometheus.GaugeValue, float64(p.ExportWithdraws.Received), l...)
ch <- prometheus.MustNewConstMetric(m.withdrawsExportRejectCountDesc, prometheus.GaugeValue, float64(p.ExportWithdraws.Rejected), l...)
ch <- prometheus.MustNewConstMetric(m.withdrawsExportFilterCountDesc, prometheus.GaugeValue, float64(p.ExportWithdraws.Filtered), l...)
ch <- prometheus.MustNewConstMetric(m.withdrawsExportAcceptCountDesc, prometheus.GaugeValue, float64(p.ExportWithdraws.Accepted), l...)
ch <- prometheus.MustNewConstMetric(m.withdrawsExportIgnoreCountDesc, prometheus.GaugeValue, float64(p.ExportWithdraws.Ignored), l...)
}

8
metrics/label_strategy.go Normal file
View File

@ -0,0 +1,8 @@
package metrics
import "github.com/czerwonk/bird_exporter/protocol"
type LabelStrategy interface {
labelNames() []string
labelValues(p *protocol.Protocol) []string
}

14
metrics/legacy_label_strategy.go Normal file
View File

@ -0,0 +1,14 @@
package metrics
import "github.com/czerwonk/bird_exporter/protocol"
type LegacyLabelStrategy struct {
}
func (*LegacyLabelStrategy) labelNames() []string {
return []string{"name"}
}
func (*LegacyLabelStrategy) labelValues(p *protocol.Protocol) []string {
return []string{p.Name}
}

20
ospf/exporter.go
View File

@ -1,30 +1,31 @@
package ospf
import (
"github.com/czerwonk/bird_exporter/metrics"
"github.com/czerwonk/bird_exporter/protocol"
"github.com/prometheus/client_golang/prometheus"
)
var descriptions map[int]*desc
var exporter map[int]*protocol.GenericProtocolMetricExporter
type desc struct {
runningDesc *prometheus.Desc
}
type OspfMetricExporter struct {
genericExporter *metrics.ProtocolMetricExporter
}
func init() {
exporter = make(map[int]*protocol.GenericProtocolMetricExporter)
exporter[4] = protocol.NewGenericProtocolMetricExporter("ospf")
exporter[6] = protocol.NewGenericProtocolMetricExporter("ospfv3")
descriptions = make(map[int]*desc)
descriptions[4] = getDesc("ospf")
descriptions[6] = getDesc("ospfv3")
}
func NewExporter(labelStrategy metrics.LabelStrategy) *OspfMetricExporter {
return &OspfMetricExporter{genericExporter: metrics.NewMetricExporter("ospf", "ospfv3", labelStrategy)}
}
func getDesc(prefix string) *desc {
labels := []string{"name"}
@ -34,14 +35,13 @@ func getDesc(prefix string) *desc {
return d
}
func (*OspfMetricExporter) Describe(ch chan<- *prometheus.Desc) {
exporter[4].Describe(ch)
exporter[6].Describe(ch)
func (m *OspfMetricExporter) Describe(ch chan<- *prometheus.Desc) {
m.genericExporter.Describe(ch)
ch <- descriptions[4].runningDesc
ch <- descriptions[6].runningDesc
}
func (*OspfMetricExporter) Export(p *protocol.Protocol, ch chan<- prometheus.Metric) {
exporter[p.IpVersion].Export(p, ch)
func (m *OspfMetricExporter) Export(p *protocol.Protocol, ch chan<- prometheus.Metric) {
m.genericExporter.Export(p, ch)
ch <- prometheus.MustNewConstMetric(descriptions[p.IpVersion].runningDesc, prometheus.GaugeValue, p.Attributes["running"], p.Name)
}

5
parser.go → parser/parser.go
View File

@ -1,4 +1,4 @@
package main
package parser
import (
"bufio"
@ -27,7 +27,8 @@ func init() {
routeChangeRegex = regexp.MustCompile("(Import|Export) (updates|withdraws):\\s+(\\d+|---)\\s+(\\d+|---)\\s+(\\d+|---)\\s+(\\d+|---)\\s+(\\d+|---)\\s*")
}
func parseOutput(data []byte, ipVersion int) []*protocol.Protocol {
// Parser parses bird output and returns protocol.Protocol structs
func Parse(data []byte, ipVersion int) []*protocol.Protocol {
protocols := make([]*protocol.Protocol, 0)
reader := bytes.NewReader(data)

23
parser_test.go
View File

@ -5,11 +5,12 @@ import (
"github.com/czerwonk/bird_exporter/protocol"
"github.com/czerwonk/testutils/assert"
"github.com/czerwonk/bird_exporter/parser"
)
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)
p := parser.Parse([]byte(data), 4)
assert.IntEqual("protocols", 1, len(p), t)
x := p[0]
@ -25,7 +26,7 @@ func TestEstablishedBgpOldTimeFormat(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)
p := parser.Parse([]byte(data), 4)
assert.IntEqual("protocols", 1, len(p), t)
x := p[0]
@ -42,7 +43,7 @@ func TestEstablishedBgpCurrentTimeFormat(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)
p := parser.Parse([]byte(data), 6)
assert.IntEqual("protocols", 1, len(p), t)
x := p[0]
@ -51,7 +52,7 @@ func TestIpv6Bgp(t *testing.T) {
func TestActiveBgp(t *testing.T) {
data := "bar BGP master start 2016-01-01 Active\ntest\nbar"
p := parseOutput([]byte(data), 4)
p := parser.Parse([]byte(data), 4)
assert.IntEqual("protocols", 1, len(p), t)
x := p[0]
@ -66,7 +67,7 @@ func TestActiveBgp(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)
p := parser.Parse([]byte(data), 4)
assert.IntEqual("protocols", 2, len(p), t)
}
@ -78,7 +79,7 @@ func TestUpdateAndWithdrawCounts(t *testing.T) {
" Import withdraws: 6 7 8 9 10\n" +
" Export updates: 11 12 13 14 15\n" +
" Export withdraws: 16 17 18 19 ---"
p := parseOutput([]byte(data), 4)
p := parser.Parse([]byte(data), 4)
x := p[0]
assert.Int64Equal("import updates received", 1, x.ImportUpdates.Received, t)
@ -105,7 +106,7 @@ func TestUpdateAndWithdrawCounts(t *testing.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)
p := parser.Parse([]byte(data), 4)
assert.IntEqual("protocols", 1, len(p), t)
x := p[0]
@ -120,7 +121,7 @@ func TestOspfOldTimeFormat(t *testing.T) {
func TestOspfCurrentTimeFormat(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)
p := parser.Parse([]byte(data), 4)
assert.IntEqual("protocols", 1, len(p), t)
x := p[0]
@ -136,7 +137,7 @@ func TestOspfCurrentTimeFormat(t *testing.T) {
func TestOspfProtocolDown(t *testing.T) {
data := "o_hrz OSPF t_hrz down 1494926415 \n Preference: 150\n Input filter: ACCEPT\n Output filter: REJECT\nxxx"
p := parseOutput([]byte(data), 6)
p := parser.Parse([]byte(data), 6)
assert.IntEqual("protocols", 1, len(p), t)
x := p[0]
@ -150,7 +151,7 @@ func TestOspfProtocolDown(t *testing.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)
p := parser.Parse([]byte(data), 4)
assert.IntEqual("protocols", 1, len(p), t)
x := p[0]
@ -159,7 +160,7 @@ func TestOspfRunning(t *testing.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)
p := parser.Parse([]byte(data), 4)
assert.IntEqual("protocols", 1, len(p), t)
x := p[0]