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

Fix cpu freq failure.

Browse source
This commit is contained in:
matt durham 2023-10-04 12:14:05 -04:00
parent a372120527
commit 3f53cb406d
No known key found for this signature in database
GPG key ID: A62E920AE398897B
5 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
collector/collector.go
View file

@ -126,10 +126,10 @@ func collectorFlagAction(collector string) func(ctx *kingpin.ParseContext) error
}
// NewNodeCollector creates a new NodeCollector.
func NewNodeCollector(config *NodeCollectorConfig, enabledCollectors map[string]bool, logger log.Logger, filters ...string) (*NodeCollector, error) {
func NewNodeCollector(config *NodeCollectorConfig, logger log.Logger, filters ...string) (*NodeCollector, error) {
f := make(map[string]bool)
for _, filter := range filters {
enabled, exist := enabledCollectors[filter]
enabled, exist := config.Collectors[filter]
if !exist {
return nil, fmt.Errorf("missing collector: %s", filter)
}
@ -140,7 +140,7 @@ func NewNodeCollector(config *NodeCollectorConfig, enabledCollectors map[string]
}
collectors := make(map[string]Collector)
for key, enabled := range enabledCollectors {
for key, enabled := range config.Collectors {
if !enabled || (len(f) > 0 && !f[key]) {
continue
}

2
collector/config.go
View file

@ -42,6 +42,8 @@ type NodeCollectorConfig struct {
TextFile TextFileConfig
VmStat VmStatConfig
Wifi WifiConfig
Collectors map[string]bool
}
type WifiConfig struct {

3
collector/cpu_linux.go
View file

@ -201,6 +201,8 @@ func (c *cpuCollector) updateInfo(ch chan<- prometheus.Metric) error {
cpu.CacheSize)
}
// This should only run if CPUFREQ is NOT enabled.
if found, enabled := c.config.Collectors["cpufreq"]; found && !enabled {
for _, cpu := range info {
ch <- prometheus.MustNewConstMetric(c.cpuFrequencyHz,
prometheus.GaugeValue,
@ -209,6 +211,7 @@ func (c *cpuCollector) updateInfo(ch chan<- prometheus.Metric) error {
cpu.CoreID,
strconv.Itoa(int(cpu.Processor)))
}
}
if len(info) != 0 {
cpu := info[0]

4
collector/devstat_dragonfly.go
View file

@ -102,11 +102,11 @@ type devstatCollector struct {
}
func init() {
registerCollector("devstat", defaultDisabled,NewDevstatCollector)
registerCollector("devstat", defaultDisabled, NewDevstatCollector)
}
// NewDevstatCollector returns a new Collector exposing Device stats.
func NewDevstatCollector(config *NodeCollectorConfiglogger log.Logger) (Collector, error) {
func NewDevstatCollector(config *NodeCollectorConfig, logger log.Logger) (Collector, error) {
return &devstatCollector{
bytesDesc: prometheus.NewDesc(
prometheus.BuildFQName(namespace, devstatSubsystem, "bytes_total"),

4
node_exporter.go
View file

@ -102,7 +102,7 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// (in which case it will log all the collectors enabled via command-line
// flags).
func (h *handler) innerHandler(filters ...string) (http.Handler, error) {
nc, err := collector.NewNodeCollector(h.collectorConfig, collector.GetFlagDefaults(), h.logger, filters...)
nc, err := collector.NewNodeCollector(h.collectorConfig, h.logger, filters...)
if err != nil {
return nil, fmt.Errorf("couldn't create collector: %s", err)
}
@ -188,7 +188,7 @@ func main() {
}
runtime.GOMAXPROCS(*maxProcs)
level.Debug(logger).Log("msg", "Go MAXPROCS", "procs", runtime.GOMAXPROCS(0))
collectorConfig.Collectors = collector.GetFlagDefaults()
http.Handle(*metricsPath, newHandler(!*disableExporterMetrics, *maxRequests, collectorConfig, logger))
if *metricsPath != "/" {
landingConfig := web.LandingConfig{