Kiu/Node_Exporter
Kiu/Node_Exporter
1
0
Fork 0
mirror of https://github.com/prometheus/node_exporter.git synced 2024-12-04 07:51:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

collector: use path/filepath for handling file paths (#1245)

Browse Source 
Similar to #1228.  Update the remaining collectors to use
'path/filepath' intead of 'path' for manipulating file paths.

Signed-off-by: Paul Gier <pgier@redhat.com>
This commit is contained in:
Paul Gier 2019-02-05 09:37:27 -06:00 committed by Ben Kochie
parent dda51ad06a
commit 2b81bff518
5 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
collector/bonding_linux.go
View File

@ -19,7 +19,7 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os" "os"
"path" "path/filepath"
"strings" "strings"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
@ -71,21 +71,21 @@ func (c *bondingCollector) Update(ch chan<- prometheus.Metric) error {
func readBondingStats(root string) (status map[string][2]int, err error) { func readBondingStats(root string) (status map[string][2]int, err error) {
status = map[string][2]int{} status = map[string][2]int{}
masters, err := ioutil.ReadFile(path.Join(root, "bonding_masters")) masters, err := ioutil.ReadFile(filepath.Join(root, "bonding_masters"))
if err != nil { if err != nil {
return nil, err return nil, err
} }
for _, master := range strings.Fields(string(masters)) { for _, master := range strings.Fields(string(masters)) {
slaves, err := ioutil.ReadFile(path.Join(root, master, "bonding", "slaves")) slaves, err := ioutil.ReadFile(filepath.Join(root, master, "bonding", "slaves"))
if err != nil { if err != nil {
return nil, err return nil, err
} }
sstat := [2]int{0, 0} sstat := [2]int{0, 0}
for _, slave := range strings.Fields(string(slaves)) { for _, slave := range strings.Fields(string(slaves)) {
state, err := ioutil.ReadFile(path.Join(root, master, fmt.Sprintf("lower_%s", slave), "operstate")) state, err := ioutil.ReadFile(filepath.Join(root, master, fmt.Sprintf("lower_%s", slave), "operstate"))
if os.IsNotExist(err) { if os.IsNotExist(err) {
// some older? kernels use slave_ prefix // some older? kernels use slave_ prefix
state, err = ioutil.ReadFile(path.Join(root, master, fmt.Sprintf("slave_%s", slave), "operstate")) state, err = ioutil.ReadFile(filepath.Join(root, master, fmt.Sprintf("slave_%s", slave), "operstate"))
} }
if err != nil { if err != nil {
return nil, err return nil, err

13
collector/edac_linux.go
View File

@ -17,7 +17,6 @@ package collector
import ( import (
"fmt" "fmt"
"path"
"path/filepath" "path/filepath"
"regexp" "regexp"
@ -82,28 +81,28 @@ func (c *edacCollector) Update(ch chan<- prometheus.Metric) error {
} }
controllerNumber := controllerMatch[1] controllerNumber := controllerMatch[1]
value, err := readUintFromFile(path.Join(controller, "ce_count")) value, err := readUintFromFile(filepath.Join(controller, "ce_count"))
if err != nil { if err != nil {
return fmt.Errorf("couldn't get ce_count for controller %s: %s", controllerNumber, err) return fmt.Errorf("couldn't get ce_count for controller %s: %s", controllerNumber, err)
} }
ch <- prometheus.MustNewConstMetric( ch <- prometheus.MustNewConstMetric(
c.ceCount, prometheus.CounterValue, float64(value), controllerNumber) c.ceCount, prometheus.CounterValue, float64(value), controllerNumber)
value, err = readUintFromFile(path.Join(controller, "ce_noinfo_count")) value, err = readUintFromFile(filepath.Join(controller, "ce_noinfo_count"))
if err != nil { if err != nil {
return fmt.Errorf("couldn't get ce_noinfo_count for controller %s: %s", controllerNumber, err) return fmt.Errorf("couldn't get ce_noinfo_count for controller %s: %s", controllerNumber, err)
} }
ch <- prometheus.MustNewConstMetric( ch <- prometheus.MustNewConstMetric(
c.csRowCECount, prometheus.CounterValue, float64(value), controllerNumber, "unknown") c.csRowCECount, prometheus.CounterValue, float64(value), controllerNumber, "unknown")
value, err = readUintFromFile(path.Join(controller, "ue_count")) value, err = readUintFromFile(filepath.Join(controller, "ue_count"))
if err != nil { if err != nil {
return fmt.Errorf("couldn't get ue_count for controller %s: %s", controllerNumber, err) return fmt.Errorf("couldn't get ue_count for controller %s: %s", controllerNumber, err)
} }
ch <- prometheus.MustNewConstMetric( ch <- prometheus.MustNewConstMetric(
c.ueCount, prometheus.CounterValue, float64(value), controllerNumber) c.ueCount, prometheus.CounterValue, float64(value), controllerNumber)
value, err = readUintFromFile(path.Join(controller, "ue_noinfo_count")) value, err = readUintFromFile(filepath.Join(controller, "ue_noinfo_count"))
if err != nil { if err != nil {
return fmt.Errorf("couldn't get ue_noinfo_count for controller %s: %s", controllerNumber, err) return fmt.Errorf("couldn't get ue_noinfo_count for controller %s: %s", controllerNumber, err)
} }
@ -122,14 +121,14 @@ func (c *edacCollector) Update(ch chan<- prometheus.Metric) error {
} }
csrowNumber := csrowMatch[1] csrowNumber := csrowMatch[1]
value, err = readUintFromFile(path.Join(csrow, "ce_count")) value, err = readUintFromFile(filepath.Join(csrow, "ce_count"))
if err != nil { if err != nil {
return fmt.Errorf("couldn't get ce_count for controller/csrow %s/%s: %s", controllerNumber, csrowNumber, err) return fmt.Errorf("couldn't get ce_count for controller/csrow %s/%s: %s", controllerNumber, csrowNumber, err)
} }
ch <- prometheus.MustNewConstMetric( ch <- prometheus.MustNewConstMetric(
c.csRowCECount, prometheus.CounterValue, float64(value), controllerNumber, csrowNumber) c.csRowCECount, prometheus.CounterValue, float64(value), controllerNumber, csrowNumber)
value, err = readUintFromFile(path.Join(csrow, "ue_count")) value, err = readUintFromFile(filepath.Join(csrow, "ue_count"))
if err != nil { if err != nil {
return fmt.Errorf("couldn't get ue_count for controller/csrow %s/%s: %s", controllerNumber, csrowNumber, err) return fmt.Errorf("couldn't get ue_count for controller/csrow %s/%s: %s", controllerNumber, csrowNumber, err)
} }

23
collector/hwmon_linux.go
View File

@ -19,7 +19,6 @@ import (
"errors" "errors"
"io/ioutil" "io/ioutil"
"os" "os"
"path"
"path/filepath" "path/filepath"
"regexp" "regexp"
"strconv" "strconv"
@ -138,7 +137,7 @@ func collectSensorData(dir string, data map[string]map[string]string) error {
for _, t := range hwmonSensorTypes { for _, t := range hwmonSensorTypes {
if t == sensorType { if t == sensorType {
addValueFile(data, sensorType+strconv.Itoa(sensorNum), sensorProperty, path.Join(dir, file.Name())) addValueFile(data, sensorType+strconv.Itoa(sensorNum), sensorProperty, filepath.Join(dir, file.Name()))
break break
} }
} }
@ -157,8 +156,8 @@ func (c *hwMonCollector) updateHwmon(ch chan<- prometheus.Metric, dir string) er
if err != nil { if err != nil {
return err return err
} }
if _, err := os.Stat(path.Join(dir, "device")); err == nil { if _, err := os.Stat(filepath.Join(dir, "device")); err == nil {
err := collectSensorData(path.Join(dir, "device"), data) err := collectSensorData(filepath.Join(dir, "device"), data)
if err != nil { if err != nil {
return err return err
} }
@ -353,10 +352,10 @@ func (c *hwMonCollector) hwmonName(dir string) (string, error) {
// preference 1: construct a name based on device name, always unique // preference 1: construct a name based on device name, always unique
devicePath, devErr := filepath.EvalSymlinks(path.Join(dir, "device")) devicePath, devErr := filepath.EvalSymlinks(filepath.Join(dir, "device"))
if devErr == nil { if devErr == nil {
devPathPrefix, devName := path.Split(devicePath) devPathPrefix, devName := filepath.Split(devicePath)
_, devType := path.Split(strings.TrimRight(devPathPrefix, "/")) _, devType := filepath.Split(strings.TrimRight(devPathPrefix, "/"))
cleanDevName := cleanMetricName(devName) cleanDevName := cleanMetricName(devName)
cleanDevType := cleanMetricName(devType) cleanDevType := cleanMetricName(devType)
@ -371,7 +370,7 @@ func (c *hwMonCollector) hwmonName(dir string) (string, error) {
} }
// preference 2: is there a name file // preference 2: is there a name file
sysnameRaw, nameErr := ioutil.ReadFile(path.Join(dir, "name")) sysnameRaw, nameErr := ioutil.ReadFile(filepath.Join(dir, "name"))
if nameErr == nil && string(sysnameRaw) != "" { if nameErr == nil && string(sysnameRaw) != "" {
cleanName := cleanMetricName(string(sysnameRaw)) cleanName := cleanMetricName(string(sysnameRaw))
if cleanName != "" { if cleanName != "" {
@ -388,7 +387,7 @@ func (c *hwMonCollector) hwmonName(dir string) (string, error) {
} }
// take the last path element, this will be hwmonX // take the last path element, this will be hwmonX
_, name := path.Split(realDir) _, name := filepath.Split(realDir)
cleanName := cleanMetricName(name) cleanName := cleanMetricName(name)
if cleanName != "" { if cleanName != "" {
return cleanName, nil return cleanName, nil
@ -399,7 +398,7 @@ func (c *hwMonCollector) hwmonName(dir string) (string, error) {
// hwmonHumanReadableChipName is similar to the methods in hwmonName, but with // hwmonHumanReadableChipName is similar to the methods in hwmonName, but with
// different precedences -- we can allow duplicates here. // different precedences -- we can allow duplicates here.
func (c *hwMonCollector) hwmonHumanReadableChipName(dir string) (string, error) { func (c *hwMonCollector) hwmonHumanReadableChipName(dir string) (string, error) {
sysnameRaw, nameErr := ioutil.ReadFile(path.Join(dir, "name")) sysnameRaw, nameErr := ioutil.ReadFile(filepath.Join(dir, "name"))
if nameErr != nil { if nameErr != nil {
return "", nameErr return "", nameErr
} }
@ -418,7 +417,7 @@ func (c *hwMonCollector) Update(ch chan<- prometheus.Metric) error {
// Step 1: scan /sys/class/hwmon, resolve all symlinks and call // Step 1: scan /sys/class/hwmon, resolve all symlinks and call
// updatesHwmon for each folder // updatesHwmon for each folder
hwmonPathName := path.Join(sysFilePath("class"), "hwmon") hwmonPathName := filepath.Join(sysFilePath("class"), "hwmon")
hwmonFiles, err := ioutil.ReadDir(hwmonPathName) hwmonFiles, err := ioutil.ReadDir(hwmonPathName)
if err != nil { if err != nil {
@ -431,7 +430,7 @@ func (c *hwMonCollector) Update(ch chan<- prometheus.Metric) error {
} }
for _, hwDir := range hwmonFiles { for _, hwDir := range hwmonFiles {
hwmonXPathName := path.Join(hwmonPathName, hwDir.Name()) hwmonXPathName := filepath.Join(hwmonPathName, hwDir.Name())
if hwDir.Mode()&os.ModeSymlink > 0 { if hwDir.Mode()&os.ModeSymlink > 0 {
hwDir, err = os.Stat(hwmonXPathName) hwDir, err = os.Stat(hwmonXPathName)

4
collector/ksmd_linux.go
View File

@ -17,7 +17,7 @@ package collector
import ( import (
"fmt" "fmt"
"path" "path/filepath"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
) )
@ -62,7 +62,7 @@ func NewKsmdCollector() (Collector, error) {
// Update implements Collector and exposes kernel and system statistics. // Update implements Collector and exposes kernel and system statistics.
func (c *ksmdCollector) Update(ch chan<- prometheus.Metric) error { func (c *ksmdCollector) Update(ch chan<- prometheus.Metric) error {
for _, n := range ksmdFiles { for _, n := range ksmdFiles {
val, err := readUintFromFile(sysFilePath(path.Join("kernel/mm/ksm", n))) val, err := readUintFromFile(sysFilePath(filepath.Join("kernel/mm/ksm", n)))
if err != nil { if err != nil {
return err return err
} }

5
collector/meminfo_numa_linux.go
View File

@ -20,7 +20,6 @@ import (
"fmt" "fmt"
"io" "io"
"os" "os"
"path"
"path/filepath" "path/filepath"
"regexp" "regexp"
"strconv" "strconv"
@ -86,7 +85,7 @@ func getMemInfoNuma() ([]meminfoMetric, error) {
return nil, err return nil, err
} }
for _, node := range nodes { for _, node := range nodes {
meminfoFile, err := os.Open(path.Join(node, "meminfo")) meminfoFile, err := os.Open(filepath.Join(node, "meminfo"))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -98,7 +97,7 @@ func getMemInfoNuma() ([]meminfoMetric, error) {
} }
metrics = append(metrics, numaInfo...) metrics = append(metrics, numaInfo...)
numastatFile, err := os.Open(path.Join(node, "numastat")) numastatFile, err := os.Open(filepath.Join(node, "numastat"))
if err != nil { if err != nil {
return nil, err return nil, err
} }