From 732dd67729c6df0453811edd56cab173e675f0d2 Mon Sep 17 00:00:00 2001 From: Dominik Honnef Date: Thu, 5 Jan 2017 03:08:40 +0100 Subject: [PATCH] Fix build of cpu_freebsd.go Corrects an incorrect merge in 8e50b80 --- collector/cpu_freebsd.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/collector/cpu_freebsd.go b/collector/cpu_freebsd.go index f22b0276..11a9b33e 100644 --- a/collector/cpu_freebsd.go +++ b/collector/cpu_freebsd.go @@ -78,7 +78,7 @@ func getCPUTimes() ([]cputime, error) { } type statCollector struct { - cpu *prometheus.CounterVec + cpu typedDesc } func init() { @@ -115,11 +115,11 @@ func (c *statCollector) Update(ch chan<- prometheus.Metric) (err error) { return err } for cpu, t := range cpuTimes { - ch <- c.cpu.mustNewConstMetric(float64(cpuTimes[base_idx+C.CP_USER]), strconv.Itoa(cpu), "user") - ch <- c.cpu.mustNewConstMetric(float64(cpuTimes[base_idx+C.CP_NICE]), strconv.Itoa(cpu), "nice") - ch <- c.cpu.mustNewConstMetric(float64(cpuTimes[base_idx+C.CP_SYS]), strconv.Itoa(cpu), "system") - ch <- c.cpu.mustNewConstMetric(float64(cpuTimes[base_idx+C.CP_INTR]), strconv.Itoa(cpu), "interrupt") - ch <- c.cpu.mustNewConstMetric(float64(cpuTimes[base_idx+C.CP_IDLE]), strconv.Itoa(cpu), "idle") + ch <- c.cpu.mustNewConstMetric(float64(t.user), strconv.Itoa(cpu), "user") + ch <- c.cpu.mustNewConstMetric(float64(t.nice), strconv.Itoa(cpu), "nice") + ch <- c.cpu.mustNewConstMetric(float64(t.sys), strconv.Itoa(cpu), "system") + ch <- c.cpu.mustNewConstMetric(float64(t.intr), strconv.Itoa(cpu), "interrupt") + ch <- c.cpu.mustNewConstMetric(float64(t.idle), strconv.Itoa(cpu), "idle") } return err }