From a9d6003ed4f639236f1a7364d1e5c22ae2212696 Mon Sep 17 00:00:00 2001 From: Daniel Czerwonk Date: Fri, 22 Sep 2017 08:02:12 +0200 Subject: [PATCH 1/2] resolves #8 --- bgp/bgp_metric.go | 14 +++++++++----- main.go | 2 +- ospf/ospf_metric.go | 16 ++++++++++------ parser.go | 6 +++++- parser_test.go | 4 ++++ protocol/protocol.go | 1 + vendor/vendor.json | 2 +- 7 files changed, 31 insertions(+), 14 deletions(-) diff --git a/bgp/bgp_metric.go b/bgp/bgp_metric.go index 9b9ba9e..21af2fa 100644 --- a/bgp/bgp_metric.go +++ b/bgp/bgp_metric.go @@ -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) } diff --git a/main.go b/main.go index 76f3723..d8739e4 100644 --- a/main.go +++ b/main.go @@ -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.") diff --git a/ospf/ospf_metric.go b/ospf/ospf_metric.go index 6fb0bf6..118e68d 100644 --- a/ospf/ospf_metric.go +++ b/ospf/ospf_metric.go @@ -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) } diff --git a/parser.go b/parser.go index da11538..b8f85bd 100644 --- a/parser.go +++ b/parser.go @@ -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) + } } } diff --git a/parser_test.go b/parser_test.go index 8041a7d..edc71bf 100644 --- a/parser_test.go +++ b/parser_test.go @@ -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) } diff --git a/protocol/protocol.go b/protocol/protocol.go index 8db502c..b950642 100644 --- a/protocol/protocol.go +++ b/protocol/protocol.go @@ -14,6 +14,7 @@ type Protocol struct { Imported int64 Exported int64 Filtered int64 + Preferred int64 Uptime int Attributes map[string]float64 } diff --git a/vendor/vendor.json b/vendor/vendor.json index f50dbca..695bcc0 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -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" From 3b3e9431a74fa96e4f1ce090b496ee387dcb415b Mon Sep 17 00:00:00 2001 From: Daniel Czerwonk Date: Fri, 22 Sep 2017 10:04:45 +0200 Subject: [PATCH 2/2] refactoring (resolves #9) --- bgp/bgp_collector.go | 33 +++++++++++++++++++ bgp/bgp_metric.go | 59 --------------------------------- metric_collector.go | 36 +++++++++++++++------ ospf/ospf_collector.go | 54 +++++++++++++++++++++++++++++++ ospf/ospf_metric.go | 63 ------------------------------------ protocol/generic_exporter.go | 47 +++++++++++++++++++++++++++ protocol_metric.go | 25 -------------- 7 files changed, 160 insertions(+), 157 deletions(-) create mode 100644 bgp/bgp_collector.go delete mode 100644 bgp/bgp_metric.go create mode 100644 ospf/ospf_collector.go delete mode 100644 ospf/ospf_metric.go create mode 100644 protocol/generic_exporter.go delete mode 100644 protocol_metric.go diff --git a/bgp/bgp_collector.go b/bgp/bgp_collector.go new file mode 100644 index 0000000..c23a666 --- /dev/null +++ b/bgp/bgp_collector.go @@ -0,0 +1,33 @@ +package bgp + +import ( + "github.com/czerwonk/bird_exporter/protocol" + "github.com/prometheus/client_golang/prometheus" +) + +var exporter map[int]*protocol.GenericProtocolMetricExporter + +type BgpCollector struct { + protocols []*protocol.Protocol +} + +func init() { + exporter = make(map[int]*protocol.GenericProtocolMetricExporter) + exporter[4] = protocol.NewGenericProtocolMetricExporter("bgp4_session") + exporter[6] = protocol.NewGenericProtocolMetricExporter("bgp6_session") +} + +func NewCollector(p []*protocol.Protocol) prometheus.Collector { + return &BgpCollector{protocols: p} +} + +func (m *BgpCollector) Describe(ch chan<- *prometheus.Desc) { + exporter[4].Describe(ch) + exporter[6].Describe(ch) +} + +func (m *BgpCollector) Collect(ch chan<- prometheus.Metric) { + for _, p := range m.protocols { + exporter[p.IpVersion].Export(p, ch) + } +} diff --git a/bgp/bgp_metric.go b/bgp/bgp_metric.go deleted file mode 100644 index 21af2fa..0000000 --- a/bgp/bgp_metric.go +++ /dev/null @@ -1,59 +0,0 @@ -package bgp - -import ( - "github.com/czerwonk/bird_exporter/protocol" - "github.com/prometheus/client_golang/prometheus" -) - -var descriptions map[int]*desc - -type desc struct { - upDesc *prometheus.Desc - importCountDesc *prometheus.Desc - exportCountDesc *prometheus.Desc - filterCountDesc *prometheus.Desc - preferredCountDesc *prometheus.Desc - uptimeDesc *prometheus.Desc -} - -type BgpMetric struct { - Protocol *protocol.Protocol -} - -func init() { - descriptions = make(map[int]*desc) - descriptions[4] = getDesc("bgp4") - descriptions[6] = getDesc("bgp6") -} - -func getDesc(prefix string) *desc { - labels := []string{"name"} - - d := &desc{} - d.upDesc = prometheus.NewDesc(prefix+"_session_up", "Protocol is up", labels, nil) - 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 -} - -func (m *BgpMetric) Describe(ch chan<- *prometheus.Desc) { - ch <- descriptions[m.Protocol.IpVersion].upDesc - 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 -} - -func (m *BgpMetric) GetMetrics(ch chan<- prometheus.Metric) { - ch <- prometheus.MustNewConstMetric(descriptions[m.Protocol.IpVersion].upDesc, prometheus.GaugeValue, float64(m.Protocol.Up), m.Protocol.Name) - 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) -} diff --git a/metric_collector.go b/metric_collector.go index c26227d..d781513 100644 --- a/metric_collector.go +++ b/metric_collector.go @@ -1,31 +1,47 @@ package main import ( + "github.com/czerwonk/bird_exporter/bgp" + "github.com/czerwonk/bird_exporter/ospf" "github.com/czerwonk/bird_exporter/protocol" "github.com/prometheus/client_golang/prometheus" ) type MetricCollector struct { - Protocols []ProtocolMetric + collectors []prometheus.Collector } -func NewMetricCollectorForProtocols(p []*protocol.Protocol) *MetricCollector { - m := make([]ProtocolMetric, 0) - for _, x := range p { - m = append(m, NewProtocolMetricFromProtocol(x)) +func NewMetricCollectorForProtocols(protocols []*protocol.Protocol) *MetricCollector { + b := make([]*protocol.Protocol, 0) + o := make([]*protocol.Protocol, 0) + + for _, p := range protocols { + if p.Proto == protocol.BGP { + b = append(b, p) + } else if p.Proto == protocol.OSPF { + o = append(o, p) + } } - return &MetricCollector{Protocols: m} + c := make([]prometheus.Collector, 0) + if len(b) > 0 { + c = append(c, bgp.NewCollector(b)) + } + if len(o) > 0 { + c = append(c, ospf.NewCollector(o)) + } + + return &MetricCollector{collectors: c} } func (m *MetricCollector) Describe(ch chan<- *prometheus.Desc) { - for _, p := range m.Protocols { - p.Describe(ch) + for _, c := range m.collectors { + c.Describe(ch) } } func (m *MetricCollector) Collect(ch chan<- prometheus.Metric) { - for _, p := range m.Protocols { - p.GetMetrics(ch) + for _, c := range m.collectors { + c.Collect(ch) } } diff --git a/ospf/ospf_collector.go b/ospf/ospf_collector.go new file mode 100644 index 0000000..a9bcd1d --- /dev/null +++ b/ospf/ospf_collector.go @@ -0,0 +1,54 @@ +package ospf + +import ( + "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 OspfCollector struct { + protocols []*protocol.Protocol +} + +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 getDesc(prefix string) *desc { + labels := []string{"name"} + + d := &desc{} + d.runningDesc = prometheus.NewDesc(prefix+"_running", "State of OSPF: 0 = Alone, 1 = Running (Neighbor-Adjacencies established)", labels, nil) + + return d +} + +func NewCollector(p []*protocol.Protocol) prometheus.Collector { + return &OspfCollector{protocols: p} +} + +func (m *OspfCollector) Describe(ch chan<- *prometheus.Desc) { + exporter[4].Describe(ch) + exporter[6].Describe(ch) + ch <- descriptions[4].runningDesc + ch <- descriptions[6].runningDesc +} + +func (m *OspfCollector) Collect(ch chan<- prometheus.Metric) { + for _, p := range m.protocols { + exporter[p.IpVersion].Export(p, ch) + ch <- prometheus.MustNewConstMetric(descriptions[p.IpVersion].runningDesc, prometheus.GaugeValue, p.Attributes["running"], p.Name) + } +} diff --git a/ospf/ospf_metric.go b/ospf/ospf_metric.go deleted file mode 100644 index 118e68d..0000000 --- a/ospf/ospf_metric.go +++ /dev/null @@ -1,63 +0,0 @@ -package ospf - -import ( - "github.com/czerwonk/bird_exporter/protocol" - "github.com/prometheus/client_golang/prometheus" -) - -var descriptions map[int]*desc - -type desc struct { - upDesc *prometheus.Desc - importCountDesc *prometheus.Desc - exportCountDesc *prometheus.Desc - filterCountDesc *prometheus.Desc - preferredCountDesc *prometheus.Desc - uptimeDesc *prometheus.Desc - runningDesc *prometheus.Desc -} - -type OspfMetric struct { - Protocol *protocol.Protocol -} - -func init() { - descriptions = make(map[int]*desc) - descriptions[4] = getDesc("ospf") - descriptions[6] = getDesc("ospfv3") -} - -func getDesc(prefix string) *desc { - labels := []string{"name"} - - d := &desc{} - d.upDesc = prometheus.NewDesc(prefix+"_up", "Protocol is up", labels, nil) - 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) - - return d -} - -func (m *OspfMetric) Describe(ch chan<- *prometheus.Desc) { - ch <- descriptions[m.Protocol.IpVersion].upDesc - 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 -} - -func (m *OspfMetric) GetMetrics(ch chan<- prometheus.Metric) { - ch <- prometheus.MustNewConstMetric(descriptions[m.Protocol.IpVersion].upDesc, prometheus.GaugeValue, float64(m.Protocol.Up), m.Protocol.Name) - 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) -} diff --git a/protocol/generic_exporter.go b/protocol/generic_exporter.go new file mode 100644 index 0000000..eaef809 --- /dev/null +++ b/protocol/generic_exporter.go @@ -0,0 +1,47 @@ +package protocol + +import "github.com/prometheus/client_golang/prometheus" + +type GenericProtocolMetricExporter struct { + upDesc *prometheus.Desc + importCountDesc *prometheus.Desc + exportCountDesc *prometheus.Desc + filterCountDesc *prometheus.Desc + preferredCountDesc *prometheus.Desc + uptimeDesc *prometheus.Desc +} + +func NewGenericProtocolMetricExporter(prefix string) *GenericProtocolMetricExporter { + m := &GenericProtocolMetricExporter{} + m.initDesc(prefix) + + return m +} + +func (m *GenericProtocolMetricExporter) initDesc(prefix string) { + labels := []string{"name"} + 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) + m.filterCountDesc = prometheus.NewDesc(prefix+"_prefix_count_filter", "Number of filtered routes", labels, nil) + m.preferredCountDesc = prometheus.NewDesc(prefix+"_prefix_count_preferred", "Number of preferred routes", labels, nil) + m.uptimeDesc = prometheus.NewDesc(prefix+"_uptime", "Uptime of the protocol in seconds", labels, nil) +} + +func (m *GenericProtocolMetricExporter) Describe(ch chan<- *prometheus.Desc) { + ch <- m.upDesc + ch <- m.importCountDesc + ch <- m.exportCountDesc + ch <- m.filterCountDesc + ch <- m.preferredCountDesc + ch <- m.uptimeDesc +} + +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) +} diff --git a/protocol_metric.go b/protocol_metric.go deleted file mode 100644 index d545ac2..0000000 --- a/protocol_metric.go +++ /dev/null @@ -1,25 +0,0 @@ -package main - -import ( - "github.com/czerwonk/bird_exporter/bgp" - "github.com/czerwonk/bird_exporter/ospf" - "github.com/czerwonk/bird_exporter/protocol" - "github.com/prometheus/client_golang/prometheus" -) - -type ProtocolMetric interface { - Describe(ch chan<- *prometheus.Desc) - GetMetrics(ch chan<- prometheus.Metric) -} - -func NewProtocolMetricFromProtocol(p *protocol.Protocol) ProtocolMetric { - if p.Proto == protocol.BGP { - return &bgp.BgpMetric{Protocol: p} - } - - if p.Proto == protocol.OSPF { - return &ospf.OspfMetric{Protocol: p} - } - - return nil -}