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

Merge pull request #2343 from binjip978/staticcheck-linux

Browse source 
Fix staticcheck warnings on linux
This commit is contained in:
Ben Kochie 2022-04-09 10:10:55 -05:00 committed by GitHub
parent 6a5a238da3 e5f384dfe6
commit 3d9ee5d9cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
collector/helper.go
View file

@ -48,7 +48,7 @@ func bytesToString(byteArray []byte) string {
var metricNameRegex = regexp.MustCompile(`_*[^0-9A-Za-z_]+_*`)
// Sanitize the given metric name by replacing invalid characters by underscores.
// SanitizeMetricName sanitize the given metric name by replacing invalid characters by underscores.
//
// OpenMetrics and the Prometheus exposition format require the metric name
// to consist only of alphanumericals and "_", ":" and they must not start

2
collector/lnstat_linux.go
View file

@ -49,7 +49,7 @@ func (c *lnstatCollector) Update(ch chan<- prometheus.Metric) error {
netStats, err := fs.NetStat()
if err != nil {
return fmt.Errorf("Lnstat error: %s", err)
return fmt.Errorf("lnstat error: %s", err)
}
for _, netStatFile := range netStats {

11
collector/perf_linux.go
View file

@ -50,7 +50,7 @@ func perfTracepointFlagToTracepoints(tracepointsFlag []string) ([]*perfTracepoin
for i, tracepoint := range tracepointsFlag {
split := strings.Split(tracepoint, ":")
if len(split) != 2 {
return nil, fmt.Errorf("Invalid tracepoint config %v", tracepoint)
return nil, fmt.Errorf("invalid tracepoint config %v", tracepoint)
}
tracepoints[i] = &perfTracepoint{
subsystem: split[0],
@ -598,9 +598,6 @@ func (c *perfCollector) updateHardwareStats(ch chan<- prometheus.Metric) error {
if err := (*profiler).Profile(hwProfile); err != nil {
return err
}
if hwProfile == nil {
continue
}
cpuid := strconv.Itoa(c.hwProfilerCPUMap[profiler])
@ -670,9 +667,6 @@ func (c *perfCollector) updateSoftwareStats(ch chan<- prometheus.Metric) error {
if err := (*profiler).Profile(swProfile); err != nil {
return err
}
if swProfile == nil {
continue
}
cpuid := strconv.Itoa(c.swProfilerCPUMap[profiler])
@ -726,9 +720,6 @@ func (c *perfCollector) updateCacheStats(ch chan<- prometheus.Metric) error {
if err := (*profiler).Profile(cacheProfile); err != nil {
return err
}
if cacheProfile == nil {
continue
}
cpuid := strconv.Itoa(c.cacheProfilerCPUMap[profiler])

1
collector/systemd_linux.go
View file

@ -74,7 +74,6 @@ type systemdCollector struct {
socketCurrentConnectionsDesc *prometheus.Desc
socketRefusedConnectionsDesc *prometheus.Desc
systemdVersionDesc *prometheus.Desc
systemdVersion float64
unitIncludePattern *regexp.Regexp
unitExcludePattern *regexp.Regexp
logger log.Logger

2
collector/systemd_linux_test.go
View file

@ -14,11 +14,11 @@
package collector
import (
"github.com/go-kit/log"
"regexp"
"testing"
"github.com/coreos/go-systemd/dbus"
"github.com/go-kit/log"
)
// Creates mock UnitLists