mudhorn/node_exporter
1
0
Fork 0
mirror of https://github.com/prometheus/node_exporter.git synced 2024-12-28 23:19:46 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #178 from prometheus/cpu

Browse source 
Do a make format run.
This commit is contained in:
Julius Volz 2015-12-19 09:22:16 +01:00
parent 514f5ad4a9 2f0d697f8c
commit 3d7658eea5
11 changed files with 49 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
collector/cpu_freebsd.go
View file

@ -100,11 +100,11 @@ func (c *statCollector) Update(ch chan<- prometheus.Metric) (err error) {
for i := 0; i < int(ncpus); i++ { for i := 0; i < int(ncpus); i++ {
pcpu := C.kvm_getpcpu(kd, C.int(i)) pcpu := C.kvm_getpcpu(kd, C.int(i))
cp_time := ((*C.struct_pcpu)(unsafe.Pointer(pcpu))).pc_cp_time cp_time := ((*C.struct_pcpu)(unsafe.Pointer(pcpu))).pc_cp_time
c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(i), "mode": "user"}).Set(float64(cp_time[C.CP_USER])/clockrate) c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(i), "mode": "user"}).Set(float64(cp_time[C.CP_USER]) / clockrate)
c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(i), "mode": "nice"}).Set(float64(cp_time[C.CP_NICE])/clockrate) c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(i), "mode": "nice"}).Set(float64(cp_time[C.CP_NICE]) / clockrate)
c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(i), "mode": "system"}).Set(float64(cp_time[C.CP_SYS])/clockrate) c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(i), "mode": "system"}).Set(float64(cp_time[C.CP_SYS]) / clockrate)
c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(i), "mode": "interrupt"}).Set(float64(cp_time[C.CP_INTR])/clockrate) c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(i), "mode": "interrupt"}).Set(float64(cp_time[C.CP_INTR]) / clockrate)
c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(i), "mode": "idle"}).Set(float64(cp_time[C.CP_IDLE])/clockrate) c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(i), "mode": "idle"}).Set(float64(cp_time[C.CP_IDLE]) / clockrate)
} }
c.cpu.Collect(ch) c.cpu.Collect(ch)
return err return err

1
collector/interrupts_common.go
View file

@ -40,4 +40,3 @@ func NewInterruptsCollector() (Collector, error) {
), ),
}, nil }, nil
} }

3
collector/interrupts_openbsd.go
View file

@ -94,7 +94,6 @@ sysctl_intr(struct intr *intr, int idx)
*/ */
import "C" import "C"
var ( var (
interruptLabelNames = []string{"CPU", "type", "devices"} interruptLabelNames = []string{"CPU", "type", "devices"}
) )
@ -126,7 +125,7 @@ type interrupt struct {
func getInterrupts() (map[string]interrupt, error) { func getInterrupts() (map[string]interrupt, error) {
var ( var (
cintr C.struct_intr cintr C.struct_intr
interrupts = map[string]interrupt{} interrupts = map[string]interrupt{}
) )

16
collector/ipvs_test.go
View file

@ -36,7 +36,7 @@ var (
OutgoingBytes: 0, OutgoingBytes: 0,
} }
expectedIPVSBackendStatuses = []procfs.IPVSBackendStatus{ expectedIPVSBackendStatuses = []procfs.IPVSBackendStatus{
procfs.IPVSBackendStatus{ {
LocalAddress: net.ParseIP("192.168.0.22"), LocalAddress: net.ParseIP("192.168.0.22"),
LocalPort: 3306, LocalPort: 3306,
RemoteAddress: net.ParseIP("192.168.82.22"), RemoteAddress: net.ParseIP("192.168.82.22"),
@ -46,7 +46,7 @@ var (
ActiveConn: 248, ActiveConn: 248,
InactConn: 2, InactConn: 2,
}, },
procfs.IPVSBackendStatus{ {
LocalAddress: net.ParseIP("192.168.0.22"), LocalAddress: net.ParseIP("192.168.0.22"),
LocalPort: 3306, LocalPort: 3306,
RemoteAddress: net.ParseIP("192.168.83.24"), RemoteAddress: net.ParseIP("192.168.83.24"),
@ -56,7 +56,7 @@ var (
ActiveConn: 248, ActiveConn: 248,
InactConn: 2, InactConn: 2,
}, },
procfs.IPVSBackendStatus{ {
LocalAddress: net.ParseIP("192.168.0.22"), LocalAddress: net.ParseIP("192.168.0.22"),
LocalPort: 3306, LocalPort: 3306,
RemoteAddress: net.ParseIP("192.168.83.21"), RemoteAddress: net.ParseIP("192.168.83.21"),
@ -66,7 +66,7 @@ var (
ActiveConn: 248, ActiveConn: 248,
InactConn: 1, InactConn: 1,
}, },
procfs.IPVSBackendStatus{ {
LocalAddress: net.ParseIP("192.168.0.57"), LocalAddress: net.ParseIP("192.168.0.57"),
LocalPort: 3306, LocalPort: 3306,
RemoteAddress: net.ParseIP("192.168.84.22"), RemoteAddress: net.ParseIP("192.168.84.22"),
@ -76,7 +76,7 @@ var (
ActiveConn: 0, ActiveConn: 0,
InactConn: 0, InactConn: 0,
}, },
procfs.IPVSBackendStatus{ {
LocalAddress: net.ParseIP("192.168.0.57"), LocalAddress: net.ParseIP("192.168.0.57"),
LocalPort: 3306, LocalPort: 3306,
RemoteAddress: net.ParseIP("192.168.82.21"), RemoteAddress: net.ParseIP("192.168.82.21"),
@ -86,7 +86,7 @@ var (
ActiveConn: 1499, ActiveConn: 1499,
InactConn: 0, InactConn: 0,
}, },
procfs.IPVSBackendStatus{ {
LocalAddress: net.ParseIP("192.168.0.57"), LocalAddress: net.ParseIP("192.168.0.57"),
LocalPort: 3306, LocalPort: 3306,
RemoteAddress: net.ParseIP("192.168.50.21"), RemoteAddress: net.ParseIP("192.168.50.21"),
@ -96,7 +96,7 @@ var (
ActiveConn: 1498, ActiveConn: 1498,
InactConn: 0, InactConn: 0,
}, },
procfs.IPVSBackendStatus{ {
LocalAddress: net.ParseIP("192.168.0.55"), LocalAddress: net.ParseIP("192.168.0.55"),
LocalPort: 3306, LocalPort: 3306,
RemoteAddress: net.ParseIP("192.168.50.26"), RemoteAddress: net.ParseIP("192.168.50.26"),
@ -106,7 +106,7 @@ var (
ActiveConn: 0, ActiveConn: 0,
InactConn: 0, InactConn: 0,
}, },
procfs.IPVSBackendStatus{ {
LocalAddress: net.ParseIP("192.168.0.55"), LocalAddress: net.ParseIP("192.168.0.55"),
LocalPort: 3306, LocalPort: 3306,
RemoteAddress: net.ParseIP("192.168.49.32"), RemoteAddress: net.ParseIP("192.168.49.32"),

14
collector/mdadm_test.go
View file

@ -25,13 +25,13 @@ func TestMdadm(t *testing.T) {
} }
refs := map[string]mdStatus{ refs := map[string]mdStatus{
"md3": mdStatus{"md3", true, 8, 8, 5853468288, 5853468288}, "md3": {"md3", true, 8, 8, 5853468288, 5853468288},
"md127": mdStatus{"md127", true, 2, 2, 312319552, 312319552}, "md127": {"md127", true, 2, 2, 312319552, 312319552},
"md0": mdStatus{"md0", true, 2, 2, 248896, 248896}, "md0": {"md0", true, 2, 2, 248896, 248896},
"md4": mdStatus{"md4", false, 2, 2, 4883648, 4883648}, "md4": {"md4", false, 2, 2, 4883648, 4883648},
"md6": mdStatus{"md6", true, 1, 2, 195310144, 16775552}, "md6": {"md6", true, 1, 2, 195310144, 16775552},
"md8": mdStatus{"md8", true, 2, 2, 195310144, 16775552}, "md8": {"md8", true, 2, 2, 195310144, 16775552},
"md7": mdStatus{"md7", true, 3, 4, 7813735424, 7813735424}, "md7": {"md7", true, 3, 4, 7813735424, 7813735424},
} }
for _, md := range mdStates { for _, md := range mdStates {

1
collector/netdev_common.go
View file

@ -77,4 +77,3 @@ func (c *netDevCollector) Update(ch chan<- prometheus.Metric) (err error) {
} }
return nil return nil
} }

2
collector/netdev_freebsd.go
View file

@ -17,8 +17,8 @@ package collector
import ( import (
"errors" "errors"
"strconv"
"regexp" "regexp"
"strconv"
"github.com/prometheus/common/log" "github.com/prometheus/common/log"
) )

2
collector/netdev_linux.go
View file

@ -27,7 +27,7 @@ import (
) )
var ( var (
procNetDevFieldSep = regexp.MustCompile("[ :] *") procNetDevFieldSep = regexp.MustCompile("[ :] *")
) )
func getNetDevStats(ignore *regexp.Regexp) (map[string]map[string]string, error) { func getNetDevStats(ignore *regexp.Regexp) (map[string]map[string]string, error) {

2
collector/netdev_openbsd.go
View file

@ -17,8 +17,8 @@ package collector
import ( import (
"errors" "errors"
"strconv"
"regexp" "regexp"
"strconv"
"github.com/prometheus/common/log" "github.com/prometheus/common/log"
) )

47
collector/stat_linux.go
View file

@ -38,7 +38,6 @@ type statCollector struct {
procsBlocked *prometheus.Desc procsBlocked *prometheus.Desc
} }
func init() { func init() {
Factories["stat"] = NewStatCollector Factories["stat"] = NewStatCollector
} }
@ -48,39 +47,39 @@ func init() {
func NewStatCollector() (Collector, error) { func NewStatCollector() (Collector, error) {
return &statCollector{ return &statCollector{
cpu: prometheus.NewDesc( cpu: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, "", "cpu"), prometheus.BuildFQName(Namespace, "", "cpu"),
"Seconds the cpus spent in each mode.", "Seconds the cpus spent in each mode.",
[]string{"cpu", "mode"}, nil, []string{"cpu", "mode"}, nil,
), ),
intr: prometheus.NewDesc( intr: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, "", "intr"), prometheus.BuildFQName(Namespace, "", "intr"),
"Total number of interrupts serviced.", "Total number of interrupts serviced.",
nil, nil, nil, nil,
), ),
ctxt: prometheus.NewDesc( ctxt: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, "", "context_switches"), prometheus.BuildFQName(Namespace, "", "context_switches"),
"Total number of context switches.", "Total number of context switches.",
nil, nil, nil, nil,
), ),
forks: prometheus.NewDesc( forks: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, "", "forks"), prometheus.BuildFQName(Namespace, "", "forks"),
"Total number of forks.", "Total number of forks.",
nil, nil, nil, nil,
), ),
btime: prometheus.NewDesc( btime: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, "", "boot_time"), prometheus.BuildFQName(Namespace, "", "boot_time"),
"Node boot time, in unixtime.", "Node boot time, in unixtime.",
nil, nil, nil, nil,
), ),
procsRunning: prometheus.NewDesc( procsRunning: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, "", "procs_running"), prometheus.BuildFQName(Namespace, "", "procs_running"),
"Number of processes in runnable state.", "Number of processes in runnable state.",
nil, nil, nil, nil,
), ),
procsBlocked: prometheus.NewDesc( procsBlocked: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, "", "procs_blocked"), prometheus.BuildFQName(Namespace, "", "procs_blocked"),
"Number of processes blocked waiting for I/O to complete.", "Number of processes blocked waiting for I/O to complete.",
nil, nil, nil, nil,
), ),
}, nil }, nil
} }
@ -119,7 +118,7 @@ func (c *statCollector) Update(ch chan<- prometheus.Metric) (err error) {
} }
// Convert from ticks to seconds // Convert from ticks to seconds
value /= userHz value /= userHz
ch <- prometheus.MustNewConstMetric(c.cpu, prometheus.CounterValue, value, parts[0], cpuFields[i]) ch <- prometheus.MustNewConstMetric(c.cpu, prometheus.CounterValue, value, parts[0], cpuFields[i])
} }
case parts[0] == "intr": case parts[0] == "intr":
// Only expose the overall number, use the 'interrupts' collector for more detail. // Only expose the overall number, use the 'interrupts' collector for more detail.
@ -127,37 +126,37 @@ func (c *statCollector) Update(ch chan<- prometheus.Metric) (err error) {
if err != nil { if err != nil {
return err return err
} }
ch <- prometheus.MustNewConstMetric(c.intr, prometheus.CounterValue, value) ch <- prometheus.MustNewConstMetric(c.intr, prometheus.CounterValue, value)
case parts[0] == "ctxt": case parts[0] == "ctxt":
value, err := strconv.ParseFloat(parts[1], 64) value, err := strconv.ParseFloat(parts[1], 64)
if err != nil { if err != nil {
return err return err
} }
ch <- prometheus.MustNewConstMetric(c.ctxt, prometheus.CounterValue, value) ch <- prometheus.MustNewConstMetric(c.ctxt, prometheus.CounterValue, value)
case parts[0] == "processes": case parts[0] == "processes":
value, err := strconv.ParseFloat(parts[1], 64) value, err := strconv.ParseFloat(parts[1], 64)
if err != nil { if err != nil {
return err return err
} }
ch <- prometheus.MustNewConstMetric(c.forks, prometheus.CounterValue, value) ch <- prometheus.MustNewConstMetric(c.forks, prometheus.CounterValue, value)
case parts[0] == "btime": case parts[0] == "btime":
value, err := strconv.ParseFloat(parts[1], 64) value, err := strconv.ParseFloat(parts[1], 64)
if err != nil { if err != nil {
return err return err
} }
ch <- prometheus.MustNewConstMetric(c.btime, prometheus.GaugeValue, value) ch <- prometheus.MustNewConstMetric(c.btime, prometheus.GaugeValue, value)
case parts[0] == "procs_running": case parts[0] == "procs_running":
value, err := strconv.ParseFloat(parts[1], 64) value, err := strconv.ParseFloat(parts[1], 64)
if err != nil { if err != nil {
return err return err
} }
ch <- prometheus.MustNewConstMetric(c.procsRunning, prometheus.GaugeValue, value) ch <- prometheus.MustNewConstMetric(c.procsRunning, prometheus.GaugeValue, value)
case parts[0] == "procs_blocked": case parts[0] == "procs_blocked":
value, err := strconv.ParseFloat(parts[1], 64) value, err := strconv.ParseFloat(parts[1], 64)
if err != nil { if err != nil {
return err return err
} }
ch <- prometheus.MustNewConstMetric(c.procsBlocked, prometheus.GaugeValue, value) ch <- prometheus.MustNewConstMetric(c.procsBlocked, prometheus.GaugeValue, value)
} }
} }
return err return err

4
collector/textfile.go
View file

@ -128,7 +128,7 @@ func (c *textFileCollector) parseTextFiles() []*dto.MetricFamily {
mtimeMetricFamily.Metric = append(mtimeMetricFamily.Metric, mtimeMetricFamily.Metric = append(mtimeMetricFamily.Metric,
&dto.Metric{ &dto.Metric{
Label: []*dto.LabelPair{ Label: []*dto.LabelPair{
&dto.LabelPair{ {
Name: proto.String("file"), Name: proto.String("file"),
Value: proto.String(filename), Value: proto.String(filename),
}, },
@ -145,7 +145,7 @@ func (c *textFileCollector) parseTextFiles() []*dto.MetricFamily {
Help: proto.String("1 if there was an error opening or reading a file, 0 otherwise"), Help: proto.String("1 if there was an error opening or reading a file, 0 otherwise"),
Type: dto.MetricType_GAUGE.Enum(), Type: dto.MetricType_GAUGE.Enum(),
Metric: []*dto.Metric{ Metric: []*dto.Metric{
&dto.Metric{ {
Gauge: &dto.Gauge{Value: &error}, Gauge: &dto.Gauge{Value: &error},
}, },
}, },