From e570048463a30273bce9aa881f4b4510811a2bea Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Thu, 9 Aug 2018 06:43:29 +0000 Subject: [PATCH] metrics: allow label_strategy to be implemented as api I use this exporter as an api, and I need to implement another custom label strategy. Purpose being to habe business logic in those labels (datacenter, ...). Because the interface is private, this can not be implemented elsewhere. This commit makes it public. Signed-off-by: Arthur Gautier --- metrics/default_label_strategy.go | 4 ++-- metrics/generic_exporter.go | 4 ++-- metrics/label_strategy.go | 4 ++-- metrics/legacy_label_strategy.go | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/metrics/default_label_strategy.go b/metrics/default_label_strategy.go index 01fdb61..583b5ea 100644 --- a/metrics/default_label_strategy.go +++ b/metrics/default_label_strategy.go @@ -7,11 +7,11 @@ import ( type DefaultLabelStrategy struct { } -func (*DefaultLabelStrategy) labelNames() []string { +func (*DefaultLabelStrategy) LabelNames() []string { return []string{"name", "proto", "ip_version"} } -func (*DefaultLabelStrategy) labelValues(p *protocol.Protocol) []string { +func (*DefaultLabelStrategy) LabelValues(p *protocol.Protocol) []string { return []string{p.Name, protoString(p), p.IpVersion} } diff --git a/metrics/generic_exporter.go b/metrics/generic_exporter.go index b8488cf..188801b 100644 --- a/metrics/generic_exporter.go +++ b/metrics/generic_exporter.go @@ -43,7 +43,7 @@ func NewGenericProtocolMetricExporter(prefix string, newNaming bool, labelStrate } func (m *GenericProtocolMetricExporter) initDesc(prefix string, newNaming bool) { - labels := m.labelStrategy.labelNames() + labels := m.labelStrategy.LabelNames() m.upDesc = prometheus.NewDesc(prefix+"_up", "Protocol is up", labels, nil) if newNaming { @@ -111,7 +111,7 @@ func (m *GenericProtocolMetricExporter) Describe(ch chan<- *prometheus.Desc) { } func (m *GenericProtocolMetricExporter) Export(p *protocol.Protocol, ch chan<- prometheus.Metric) { - l := m.labelStrategy.labelValues(p) + 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...) diff --git a/metrics/label_strategy.go b/metrics/label_strategy.go index 5187244..f0fb358 100644 --- a/metrics/label_strategy.go +++ b/metrics/label_strategy.go @@ -3,6 +3,6 @@ package metrics import "github.com/czerwonk/bird_exporter/protocol" type LabelStrategy interface { - labelNames() []string - labelValues(p *protocol.Protocol) []string + LabelNames() []string + LabelValues(p *protocol.Protocol) []string } diff --git a/metrics/legacy_label_strategy.go b/metrics/legacy_label_strategy.go index 1fe4af5..c33bbfa 100644 --- a/metrics/legacy_label_strategy.go +++ b/metrics/legacy_label_strategy.go @@ -5,10 +5,10 @@ import "github.com/czerwonk/bird_exporter/protocol" type LegacyLabelStrategy struct { } -func (*LegacyLabelStrategy) labelNames() []string { +func (*LegacyLabelStrategy) LabelNames() []string { return []string{"name"} } -func (*LegacyLabelStrategy) labelValues(p *protocol.Protocol) []string { +func (*LegacyLabelStrategy) LabelValues(p *protocol.Protocol) []string { return []string{p.Name} }