Add kstat-based Solaris metrics (#1197)
* collector/loadavg_solaris.go: Use libkstat to gather load averages. * go.mod: Added go-kstat. * boot_time_solaris.go: Added. * cpu_solaris.go: Added. * README.md: Updated entries for Solaris. * collector/zfs_solaris.go: Added. * CHANGELOG.md: Added note about kstat-based Solaris metrics. Signed-off-by: Jonathan Davies <jpds@protonmail.com>
This commit is contained in:
parent
a616953b9a
commit
e766485286
9 changed files with 583 additions and 14 deletions
140
collector/cpu_solaris.go
Normal file
140
collector/cpu_solaris.go
Normal file
|
|
@ -0,0 +1,140 @@
|
|||
// Copyright 2018 The Prometheus Authors
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
// +build solaris
|
||||
// +build !nocpu
|
||||
|
||||
package collector
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
"github.com/siebenmann/go-kstat"
|
||||
)
|
||||
|
||||
// #include <unistd.h>
|
||||
import "C"
|
||||
|
||||
type cpuCollector struct {
|
||||
cpu typedDesc
|
||||
cpuFreq *prometheus.Desc
|
||||
cpuFreqMax *prometheus.Desc
|
||||
}
|
||||
|
||||
func init() {
|
||||
registerCollector("cpu", defaultEnabled, NewCpuCollector)
|
||||
}
|
||||
|
||||
func NewCpuCollector() (Collector, error) {
|
||||
return &cpuCollector{
|
||||
cpu: typedDesc{nodeCPUSecondsDesc, prometheus.CounterValue},
|
||||
cpuFreq: prometheus.NewDesc(
|
||||
prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "frequency_hertz"),
|
||||
"Current cpu thread frequency in hertz.",
|
||||
[]string{"cpu"}, nil,
|
||||
),
|
||||
cpuFreqMax: prometheus.NewDesc(
|
||||
prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "frequency_max_hertz"),
|
||||
"Maximum cpu thread frequency in hertz.",
|
||||
[]string{"cpu"}, nil,
|
||||
),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (c *cpuCollector) Update(ch chan<- prometheus.Metric) error {
|
||||
if err := c.updateCPUstats(ch); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := c.updateCPUfreq(ch); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *cpuCollector) updateCPUstats(ch chan<- prometheus.Metric) error {
|
||||
ncpus := C.sysconf(C._SC_NPROCESSORS_ONLN)
|
||||
|
||||
tok, err := kstat.Open()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
defer tok.Close()
|
||||
|
||||
for cpu := 0; cpu < int(ncpus); cpu++ {
|
||||
ksCPU, err := tok.Lookup("cpu", cpu, "sys")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for k, v := range map[string]string{
|
||||
"idle": "cpu_ticks_idle",
|
||||
"kernel": "cpu_ticks_kernel",
|
||||
"user": "cpu_ticks_user",
|
||||
"wait": "cpu_ticks_wait",
|
||||
} {
|
||||
kstatValue, err := ksCPU.GetNamed(v)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
ch <- c.cpu.mustNewConstMetric(float64(kstatValue.UintVal), strconv.Itoa(cpu), k)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *cpuCollector) updateCPUfreq(ch chan<- prometheus.Metric) error {
|
||||
ncpus := C.sysconf(C._SC_NPROCESSORS_ONLN)
|
||||
|
||||
tok, err := kstat.Open()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
defer tok.Close()
|
||||
|
||||
for cpu := 0; cpu < int(ncpus); cpu++ {
|
||||
ksCPUInfo, err := tok.Lookup("cpu_info", cpu, fmt.Sprintf("cpu_info%d", cpu))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
cpuFreqV, err := ksCPUInfo.GetNamed("current_clock_Hz")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
cpuFreqMaxV, err := ksCPUInfo.GetNamed("clock_MHz")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
lcpu := strconv.Itoa(cpu)
|
||||
ch <- prometheus.MustNewConstMetric(
|
||||
c.cpuFreq,
|
||||
prometheus.GaugeValue,
|
||||
float64(cpuFreqV.UintVal),
|
||||
lcpu,
|
||||
)
|
||||
// Multiply by 1e+6 to convert MHz to Hz.
|
||||
ch <- prometheus.MustNewConstMetric(
|
||||
c.cpuFreqMax,
|
||||
prometheus.GaugeValue,
|
||||
float64(cpuFreqMaxV.IntVal)*1e+6,
|
||||
lcpu,
|
||||
)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue