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

resolves #8

Browse Source
This commit is contained in:
Daniel Czerwonk 2017-09-22 08:02:12 +02:00
parent 7a7feb90b8
commit a9d6003ed4
7 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bgp/bgp_metric.go
View File

@ -8,11 +8,12 @@ import (
var descriptions map[int]*desc
type desc struct {
upDesc *prometheus.Desc
importCountDesc *prometheus.Desc
exportCountDesc *prometheus.Desc
filterCountDesc *prometheus.Desc
uptimeDesc *prometheus.Desc
upDesc *prometheus.Desc
importCountDesc *prometheus.Desc
exportCountDesc *prometheus.Desc
filterCountDesc *prometheus.Desc
preferredCountDesc *prometheus.Desc
uptimeDesc *prometheus.Desc
}
type BgpMetric struct {
@ -33,6 +34,7 @@ func getDesc(prefix string) *desc {
d.importCountDesc = prometheus.NewDesc(prefix+"_session_prefix_count_import", "Number of imported routes", labels, nil)
d.exportCountDesc = prometheus.NewDesc(prefix+"_session_prefix_count_export", "Number of exported routes", labels, nil)
d.filterCountDesc = prometheus.NewDesc(prefix+"_session_prefix_count_filter", "Number of filtered routes", labels, nil)
d.preferredCountDesc = prometheus.NewDesc(prefix+"_session_prefix_count_preferred", "Number of preferred routes", labels, nil)
d.uptimeDesc = prometheus.NewDesc(prefix+"_session_uptime", "Uptime of the protocol in seconds", labels, nil)
return d
@ -43,6 +45,7 @@ func (m *BgpMetric) Describe(ch chan<- *prometheus.Desc) {
ch <- descriptions[m.Protocol.IpVersion].importCountDesc
ch <- descriptions[m.Protocol.IpVersion].exportCountDesc
ch <- descriptions[m.Protocol.IpVersion].filterCountDesc
ch <- descriptions[m.Protocol.IpVersion].preferredCountDesc
ch <- descriptions[m.Protocol.IpVersion].uptimeDesc
}
@ -51,5 +54,6 @@ func (m *BgpMetric) GetMetrics(ch chan<- prometheus.Metric) {
ch <- prometheus.MustNewConstMetric(descriptions[m.Protocol.IpVersion].importCountDesc, prometheus.GaugeValue, float64(m.Protocol.Imported), m.Protocol.Name)
ch <- prometheus.MustNewConstMetric(descriptions[m.Protocol.IpVersion].exportCountDesc, prometheus.GaugeValue, float64(m.Protocol.Exported), m.Protocol.Name)
ch <- prometheus.MustNewConstMetric(descriptions[m.Protocol.IpVersion].filterCountDesc, prometheus.GaugeValue, float64(m.Protocol.Filtered), m.Protocol.Name)
ch <- prometheus.MustNewConstMetric(descriptions[m.Protocol.IpVersion].preferredCountDesc, prometheus.GaugeValue, float64(m.Protocol.Preferred), m.Protocol.Name)
ch <- prometheus.MustNewConstMetric(descriptions[m.Protocol.IpVersion].uptimeDesc, prometheus.GaugeValue, float64(m.Protocol.Uptime), m.Protocol.Name)
}

2
main.go
View File

@ -11,7 +11,7 @@ import (
"github.com/prometheus/common/log"
)
const version string = "0.8.2"
const version string = "0.8.3"
var (
showVersion = flag.Bool("version", false, "Print version information.")

16
ospf/ospf_metric.go
View File

@ -8,12 +8,13 @@ import (
var descriptions map[int]*desc
type desc struct {
upDesc *prometheus.Desc
importCountDesc *prometheus.Desc
exportCountDesc *prometheus.Desc
filterCountDesc *prometheus.Desc
uptimeDesc *prometheus.Desc
runningDesc *prometheus.Desc
upDesc *prometheus.Desc
importCountDesc *prometheus.Desc
exportCountDesc *prometheus.Desc
filterCountDesc *prometheus.Desc
preferredCountDesc *prometheus.Desc
uptimeDesc *prometheus.Desc
runningDesc *prometheus.Desc
}
type OspfMetric struct {
@ -34,6 +35,7 @@ func getDesc(prefix string) *desc {
d.importCountDesc = prometheus.NewDesc(prefix+"_prefix_count_import", "Number of imported routes", labels, nil)
d.exportCountDesc = prometheus.NewDesc(prefix+"_prefix_count_export", "Number of exported routes", labels, nil)
d.filterCountDesc = prometheus.NewDesc(prefix+"_prefix_count_filter", "Number of filtered routes", labels, nil)
d.preferredCountDesc = prometheus.NewDesc(prefix+"_prefix_count_preferred", "Number of preferred routes", labels, nil)
d.uptimeDesc = prometheus.NewDesc(prefix+"_uptime", "Uptime of the protocol in seconds", labels, nil)
d.runningDesc = prometheus.NewDesc(prefix+"_running", "State of OSPF: 0 = Alone, 1 = Running (Neighbor-Adjacencies established)", labels, nil)
@ -45,6 +47,7 @@ func (m *OspfMetric) Describe(ch chan<- *prometheus.Desc) {
ch <- descriptions[m.Protocol.IpVersion].importCountDesc
ch <- descriptions[m.Protocol.IpVersion].exportCountDesc
ch <- descriptions[m.Protocol.IpVersion].filterCountDesc
ch <- descriptions[m.Protocol.IpVersion].preferredCountDesc
ch <- descriptions[m.Protocol.IpVersion].uptimeDesc
ch <- descriptions[m.Protocol.IpVersion].runningDesc
}
@ -54,6 +57,7 @@ func (m *OspfMetric) GetMetrics(ch chan<- prometheus.Metric) {
ch <- prometheus.MustNewConstMetric(descriptions[m.Protocol.IpVersion].importCountDesc, prometheus.GaugeValue, float64(m.Protocol.Imported), m.Protocol.Name)
ch <- prometheus.MustNewConstMetric(descriptions[m.Protocol.IpVersion].exportCountDesc, prometheus.GaugeValue, float64(m.Protocol.Exported), m.Protocol.Name)
ch <- prometheus.MustNewConstMetric(descriptions[m.Protocol.IpVersion].filterCountDesc, prometheus.GaugeValue, float64(m.Protocol.Filtered), m.Protocol.Name)
ch <- prometheus.MustNewConstMetric(descriptions[m.Protocol.IpVersion].preferredCountDesc, prometheus.GaugeValue, float64(m.Protocol.Preferred), m.Protocol.Name)
ch <- prometheus.MustNewConstMetric(descriptions[m.Protocol.IpVersion].uptimeDesc, prometheus.GaugeValue, float64(m.Protocol.Uptime), m.Protocol.Name)
ch <- prometheus.MustNewConstMetric(descriptions[m.Protocol.IpVersion].runningDesc, prometheus.GaugeValue, m.Protocol.Attributes["running"], m.Protocol.Name)
}

6
parser.go
View File

@ -20,7 +20,7 @@ var (
func init() {
protocolRegex, _ = regexp.Compile("^(?:1002\\-)?([^\\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(?:, (\\d+) preferred)?")
uptimeRegex, _ = regexp.Compile("^(?:((\\d+):(\\d{2}):(\\d{2}))|\\d+)$")
}
@ -87,6 +87,10 @@ func parseLineForRoutes(line string, p *protocol.Protocol) {
if len(match[2]) > 0 {
p.Filtered, _ = strconv.ParseInt(match[2], 10, 64)
}
if len(match[4]) > 0 {
p.Preferred, _ = strconv.ParseInt(match[4], 10, 64)
}
}
}

4
parser_test.go
View File

@ -19,6 +19,7 @@ func TestEstablishedBgpOldTimeFormat(t *testing.T) {
assert.Int64Equal("imported", 12, x.Imported, t)
assert.Int64Equal("exported", 34, x.Exported, t)
assert.Int64Equal("filtered", 1, x.Filtered, t)
assert.Int64Equal("preferred", 100, x.Preferred, t)
assert.IntEqual("ipVersion", 4, x.IpVersion, t)
}
@ -34,6 +35,7 @@ func TestEstablishedBgpCurrentTimeFormat(t *testing.T) {
assert.Int64Equal("imported", 12, x.Imported, t)
assert.Int64Equal("exported", 34, x.Exported, t)
assert.Int64Equal("filtered", 1, x.Filtered, t)
assert.Int64Equal("preferred", 100, x.Preferred, t)
assert.IntEqual("ipVersion", 4, x.IpVersion, t)
assert.IntEqual("uptime", 60, x.Uptime, t)
}
@ -79,6 +81,7 @@ func TestOspfOldTimeFormat(t *testing.T) {
assert.IntEqual("up", 1, x.Up, t)
assert.Int64Equal("imported", 12, x.Imported, t)
assert.Int64Equal("exported", 34, x.Exported, t)
assert.Int64Equal("preferred", 100, x.Preferred, t)
assert.IntEqual("ipVersion", 4, x.IpVersion, t)
}
@ -93,6 +96,7 @@ func TestOspfCurrentTimeFormat(t *testing.T) {
assert.IntEqual("up", 1, x.Up, t)
assert.Int64Equal("imported", 12, x.Imported, t)
assert.Int64Equal("exported", 34, x.Exported, t)
assert.Int64Equal("preferred", 100, x.Preferred, t)
assert.IntEqual("ipVersion", 4, x.IpVersion, t)
assert.IntEqual("uptime", 60, x.Uptime, t)
}

1
protocol/protocol.go
View File

@ -14,6 +14,7 @@ type Protocol struct {
Imported int64
Exported int64
Filtered int64
Preferred int64
Uptime int
Attributes map[string]float64
}

2
vendor/vendor.json vendored
View File

@ -93,7 +93,7 @@
"revisionTime": "2017-05-19T19:08:37Z"
},
{
"checksumSHA1": "J+ZM49hifaNMFSbPAEibmNoCMh8=",
"checksumSHA1": "rPV8+049OOLKJLcGhi5dNQ1yvBA=",
"path": "golang.org/x/sys/unix",
"revision": "a55a76086885b80f79961eacb876ebd8caf3868d",
"revisionTime": "2017-05-24T02:50:34Z"