mudhorn/node_exporter
1
0
Fork 0
mirror of https://github.com/prometheus/node_exporter.git synced 2025-03-05 21:00:12 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correctly exporting values

Browse source 
Moved to exporting via a string, which is then
split and parsed.

The string is sometimes duplicated, however.
This commit is contained in:
stuart nelson 2016-09-18 14:16:26 +02:00
parent 4b4385bd44
commit 3e4a154656
1 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
collector/cpu_dragonfly.go
View file

@ -19,6 +19,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"strconv" "strconv"
"strings"
"unsafe" "unsafe"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
@ -29,6 +30,7 @@ import (
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <kinfo.h> #include <kinfo.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
static int mibs_set_up = 0; static int mibs_set_up = 0;
@ -40,21 +42,15 @@ static size_t mib_kern_clockrate_len = 2;
// Setup method for MIBs not available as constants. // Setup method for MIBs not available as constants.
// Calls to this method must be synchronized externally. // Calls to this method must be synchronized externally.
int setupSysctlMIBs() { int
setupSysctlMIBs() {
int ret = sysctlnametomib("kern.cputime", mib_kern_cp_times, &mib_kern_cp_times_len); int ret = sysctlnametomib("kern.cputime", mib_kern_cp_times, &mib_kern_cp_times_len);
if (ret == 0) mibs_set_up = 1; if (ret == 0) mibs_set_up = 1;
return ret; return ret;
} }
struct exported_cputime { int
uint64_t cp_user; getCPUTimes(int *ncpu, char **cputime) {
uint64_t cp_nice;
uint64_t cp_sys;
uint64_t cp_intr;
uint64_t cp_idle;
};
int getCPUTimes(int *ncpu, struct exported_cputime **cputime) {
size_t len; size_t len;
// Get number of cpu cores. // Get number of cpu cores.
@ -74,9 +70,7 @@ int getCPUTimes(int *ncpu, struct exported_cputime **cputime) {
return -1; return -1;
} }
// What are the consequences of casting this immediately to uint64_t long freq = clockrate.stathz > 0 ? clockrate.stathz : clockrate.hz;
// instead of long?
uint64_t cpufreq = clockrate.stathz > 0 ? clockrate.stathz : clockrate.hz;
// Get the cpu times. // Get the cpu times.
struct kinfo_cputime cp_t[*ncpu]; struct kinfo_cputime cp_t[*ncpu];
@ -86,16 +80,20 @@ int getCPUTimes(int *ncpu, struct exported_cputime **cputime) {
return -1; return -1;
} }
struct exported_cputime xp_t[*ncpu]; // string needs to hold (5*ncpu)(uint64_t + char)
for (int i = 0; i < *ncpu; ++i) { // The char is the space between values.
xp_t[i].cp_user = cp_t[i].cp_user/cpufreq; *cputime = (char *) malloc((sizeof(uint64_t)+sizeof(char))*(5*(*ncpu)));
xp_t[i].cp_nice = cp_t[i].cp_nice/cpufreq;
xp_t[i].cp_sys = cp_t[i].cp_sys/cpufreq;
xp_t[i].cp_intr = cp_t[i].cp_intr/cpufreq;
xp_t[i].cp_idle = cp_t[i].cp_idle/cpufreq;
}
*cputime = &xp_t[0]; uint64_t user, nice, sys, intr, idle;
user = nice = sys = intr = idle = 0;
for (int i = 0; i < *ncpu; ++i) {
user = ((double) cp_t[i].cp_user) / freq;
nice = ((double) cp_t[i].cp_nice) / freq;
sys = ((double) cp_t[i].cp_sys) / freq;
intr = ((double) cp_t[i].cp_intr) / freq;
idle = ((double) cp_t[i].cp_idle) / freq;
sprintf(*cputime + strlen(*cputime), "%llu %llu %llu %llu %llu ", user, nice, sys, intr, idle );
}
return 0; return 0;
@ -106,7 +104,7 @@ import "C"
const maxCPUTimesLen = C.MAXCPU * C.CPUSTATES const maxCPUTimesLen = C.MAXCPU * C.CPUSTATES
type statCollector struct { type statCollector struct {
cpu *prometheus.CounterVec cpu *prometheus.Desc
} }
func init() { func init() {
@ -120,19 +118,16 @@ func NewStatCollector() (Collector, error) {
return nil, errors.New("could not initialize sysctl MIBs") return nil, errors.New("could not initialize sysctl MIBs")
} }
return &statCollector{ return &statCollector{
cpu: prometheus.NewCounterVec( cpu: prometheus.NewDesc(
prometheus.CounterOpts{ prometheus.BuildFQName(Namespace, "", "cpu"),
Namespace: Namespace, "Seconds the cpus spent in each mode.",
Name: "cpu_seconds_total", []string{"cpu", "mode"}, nil,
Help: "Seconds the CPU spent in each mode.",
},
[]string{"cpu", "mode"},
), ),
}, nil }, nil
} }
// Expose CPU stats using sysctl. // Expose CPU stats using sysctl.
func (c *statCollector) Update(ch chan<- prometheus.Metric) (err error) { func (c *statCollector) Update(ch chan<- prometheus.Metric) error {
// We want time spent per-cpu per CPUSTATE. // We want time spent per-cpu per CPUSTATE.
// CPUSTATES (number of CPUSTATES) is defined as 5U. // CPUSTATES (number of CPUSTATES) is defined as 5U.
@ -144,24 +139,29 @@ func (c *statCollector) Update(ch chan<- prometheus.Metric) (err error) {
// Look into sys/kern/kern_clock.c for details. // Look into sys/kern/kern_clock.c for details.
var ncpu C.int var ncpu C.int
var cpuTimesC *C.struct_exported_cputime var cpuTimesC *C.char
var fieldsCount = 5
if C.getCPUTimes(&ncpu, &cpuTimesC) == -1 { if C.getCPUTimes(&ncpu, &cpuTimesC) == -1 {
return errors.New("could not retrieve CPU times") return errors.New("could not retrieve CPU times")
} }
cpuTimes := (*[1 << 30]C.struct_exported_cputime)(unsafe.Pointer(cpuTimesC))[:ncpu:ncpu] // TODO: Find better way to remove trailing white space.
cpuTimes := strings.Split(strings.TrimSpace(C.GoString(cpuTimesC)), " ")
C.free(unsafe.Pointer(cpuTimesC))
// TODO: Figure out why the string is always growing
fmt.Println(cpuTimes) fmt.Println(cpuTimes)
for i, cpu := range cpuTimes { // Export order: user nice sys intr idle
c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(i), "mode": "user"}).Set(float64(cpu.cp_user)) cpuFields := []string{"user", "nice", "sys", "interrupt", "idle"}
c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(i), "mode": "nice"}).Set(float64(cpu.cp_nice)) for i, v := range cpuTimes {
c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(i), "mode": "system"}).Set(float64(cpu.cp_sys)) cpux := fmt.Sprintf("cpu%d", i/fieldsCount)
c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(i), "mode": "interrupt"}).Set(float64(cpu.cp_intr)) value, err := strconv.ParseFloat(v, 64)
c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(i), "mode": "idle"}).Set(float64(cpu.cp_idle)) if err != nil {
return err
}
ch <- prometheus.MustNewConstMetric(c.cpu, prometheus.CounterValue, value, cpux, cpuFields[i%fieldsCount])
} }
c.cpu.Collect(ch) return nil
return err
} }