ston1th/node_exporter
0
0
Fork 0
Code Issues Releases Activity

Reduce number of global variables used

Browse source 
This is the first step to make the exporter more testable.
This commit is contained in:
Tobias Schmidt 2014-11-24 21:00:17 -05:00
commit 872f921867
15 changed files with 473 additions and 482 deletions
Download patch file Download diff file Expand all files Collapse all files

23
collector/netstat.go
View file

@ -18,12 +18,9 @@ const (
netStatsSubsystem = "netstat"
)
var (
netStatsMetrics = map[string]prometheus.Gauge{}
)
type netStatCollector struct {
config Config
config Config
metrics map[string]prometheus.Gauge
}
func init() {
@ -33,10 +30,10 @@ func init() {
// NewNetStatCollector takes a config struct and returns
// a new Collector exposing network stats.
func NewNetStatCollector(config Config) (Collector, error) {
c := netStatCollector{
config: config,
}
return &c, nil
return &netStatCollector{
config: config,
metrics: map[string]prometheus.Gauge{},
}, nil
}
func (c *netStatCollector) Update(ch chan<- prometheus.Metric) (err error) {
@ -47,8 +44,8 @@ func (c *netStatCollector) Update(ch chan<- prometheus.Metric) (err error) {
for protocol, protocolStats := range netStats {
for name, value := range protocolStats {
key := protocol + "_" + name
if _, ok := netStatsMetrics[key]; !ok {
netStatsMetrics[key] = prometheus.NewGauge(
if _, ok := c.metrics[key]; !ok {
c.metrics[key] = prometheus.NewGauge(
prometheus.GaugeOpts{
Namespace: Namespace,
Subsystem: netStatsSubsystem,
@ -61,10 +58,10 @@ func (c *netStatCollector) Update(ch chan<- prometheus.Metric) (err error) {
if err != nil {
return fmt.Errorf("invalid value %s in netstats: %s", value, err)
}
netStatsMetrics[key].Set(v)
c.metrics[key].Set(v)
}
}
for _, m := range netStatsMetrics {
for _, m := range c.metrics {
m.Collect(ch)
}
return err