RecycledCloud/smartctl_exporter
6
0
Fork 0
mirror of https://github.com/prometheus-community/smartctl_exporter.git synced 2024-11-16 01:33:07 +01:00
Code Issues Projects Releases 1 Packages Wiki Activity

Merge pull request #86 from CrabappleProject/fit_windows

Browse source 
FIX: remove `os.stat` in order to fit in windows
This commit is contained in:
Ben Kochie 2022-10-20 11:40:28 +01:00 committed by GitHub
commit cee06eca3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
main.go
View file

@ -94,17 +94,34 @@ func main() {
level.Info(logger).Log("msg", "Starting smartctl_exporter", "version", version.Info()) level.Info(logger).Log("msg", "Starting smartctl_exporter", "version", version.Info())
level.Info(logger).Log("msg", "Build context", "build_context", version.BuildContext()) level.Info(logger).Log("msg", "Build context", "build_context", version.BuildContext())
devices := *smartctlDevices // Scan the host devices
if len(devices) == 0 {
level.Info(logger).Log("msg", "No devices specified, trying to load them automatically")
json := readSMARTctlDevices(logger) json := readSMARTctlDevices(logger)
scannedDevices := json.Get("devices").Array() scanDevices := json.Get("devices").Array()
for _, d := range scannedDevices { scanDevicesSet := make(map[string]bool)
device := d.Get("name").String() var scanDeviceNames []string
level.Info(logger).Log("msg", "Found device", "device", device) for _, d := range scanDevices {
devices = append(devices, device) deviceName := d.Get("name").String()
level.Debug(logger).Log("msg", "Found device", "name", deviceName)
scanDevicesSet[deviceName] = true
scanDeviceNames = append(scanDeviceNames, deviceName)
} }
// Read the configuration and verify that it is available
devices := *smartctlDevices
var readDeviceNames []string
for _, device := range devices {
if _, ok := scanDevicesSet[device]; ok {
readDeviceNames = append(readDeviceNames, device)
} else {
level.Warn(logger).Log("msg", "Device unavailable", "name", device)
}
}
if len(readDeviceNames) > 0 {
devices = readDeviceNames
} else {
level.Info(logger).Log("msg", "No devices specified, trying to load them automatically")
devices = scanDeviceNames
} }
if len(devices) == 0 { if len(devices) == 0 {

4
readjson.go
View file

@ -16,7 +16,6 @@ package main
import ( import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os"
"os/exec" "os/exec"
"strings" "strings"
"time" "time"
@ -94,7 +93,6 @@ func readData(logger log.Logger, device string) (gjson.Result, error) {
return readFakeSMARTctl(logger, device), nil return readFakeSMARTctl(logger, device), nil
} }
if _, err := os.Stat(device); err == nil {
cacheValue, cacheOk := jsonCache[device] cacheValue, cacheOk := jsonCache[device]
if !cacheOk || time.Now().After(cacheValue.LastCollect.Add(*smartctlInterval)) { if !cacheOk || time.Now().After(cacheValue.LastCollect.Add(*smartctlInterval)) {
json, ok := readSMARTctl(logger, device) json, ok := readSMARTctl(logger, device)
@ -105,8 +103,6 @@ func readData(logger log.Logger, device string) (gjson.Result, error) {
return gjson.Parse("{}"), fmt.Errorf("smartctl returned bad data for device %s", device) return gjson.Parse("{}"), fmt.Errorf("smartctl returned bad data for device %s", device)
} }
return cacheValue.JSON, nil return cacheValue.JSON, nil
}
return gjson.Parse("{}"), fmt.Errorf("Device %s unavialable", device)
} }
// Parse smartctl return code // Parse smartctl return code