aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Horstmann <ralf+github@ackstorm.de>2019-02-05 07:46:50 +0100
committerBen Kochie <superq@gmail.com>2019-02-05 07:46:50 +0100
commitdda51ad06a024ea3a75b3399de46c0ce3ebab418 (patch)
treef1a9d266b726eae25f249bf1201aa665463d4de3
parent62e87ca00cc094ad137e8a6ca1b41c642006ecb2 (diff)
downloadprometheus_node_collector-dda51ad06a024ea3a75b3399de46c0ce3ebab418.tar.bz2
prometheus_node_collector-dda51ad06a024ea3a75b3399de46c0ce3ebab418.tar.xz
prometheus_node_collector-dda51ad06a024ea3a75b3399de46c0ce3ebab418.zip
Fix staticcheck ST1003 warnings (#1249)
This fixes a few staticcheck ST1003 warnings in OpenBSD CPU collector. No functional change. Signed-off-by: Ralf Horstmann <ralf+github@ackstorm.de>
-rw-r--r--collector/cpu_openbsd.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/collector/cpu_openbsd.go b/collector/cpu_openbsd.go
index 996e50e..cddc204 100644
--- a/collector/cpu_openbsd.go
+++ b/collector/cpu_openbsd.go
@@ -34,10 +34,10 @@ type cpuCollector struct {
34} 34}
35 35
36func init() { 36func init() {
37 registerCollector("cpu", defaultEnabled, NewCpuCollector) 37 registerCollector("cpu", defaultEnabled, NewCPUCollector)
38} 38}
39 39
40func NewCpuCollector() (Collector, error) { 40func NewCPUCollector() (Collector, error) {
41 return &cpuCollector{ 41 return &cpuCollector{
42 cpu: typedDesc{nodeCPUSecondsDesc, prometheus.CounterValue}, 42 cpu: typedDesc{nodeCPUSecondsDesc, prometheus.CounterValue},
43 }, nil 43 }, nil
@@ -56,18 +56,18 @@ func (c *cpuCollector) Update(ch chan<- prometheus.Metric) (err error) {
56 return err 56 return err
57 } 57 }
58 58
59 var cp_time [][C.CPUSTATES]C.int64_t 59 var cpTime [][C.CPUSTATES]C.int64_t
60 for i := 0; i < int(ncpus); i++ { 60 for i := 0; i < int(ncpus); i++ {
61 cp_timeb, err := unix.SysctlRaw("kern.cp_time2", i) 61 cpb, err := unix.SysctlRaw("kern.cp_time2", i)
62 if err != nil && err != unix.ENODEV { 62 if err != nil && err != unix.ENODEV {
63 return err 63 return err
64 } 64 }
65 if err != unix.ENODEV { 65 if err != unix.ENODEV {
66 cp_time = append(cp_time, *(*[C.CPUSTATES]C.int64_t)(unsafe.Pointer(&cp_timeb[0]))) 66 cpTime = append(cpTime, *(*[C.CPUSTATES]C.int64_t)(unsafe.Pointer(&cpb[0])))
67 } 67 }
68 } 68 }
69 69
70 for cpu, time := range cp_time { 70 for cpu, time := range cpTime {
71 lcpu := strconv.Itoa(cpu) 71 lcpu := strconv.Itoa(cpu)
72 ch <- c.cpu.mustNewConstMetric(float64(time[C.CP_USER])/hz, lcpu, "user") 72 ch <- c.cpu.mustNewConstMetric(float64(time[C.CP_USER])/hz, lcpu, "user")
73 ch <- c.cpu.mustNewConstMetric(float64(time[C.CP_NICE])/hz, lcpu, "nice") 73 ch <- c.cpu.mustNewConstMetric(float64(time[C.CP_NICE])/hz, lcpu, "nice")