ClusterCockpit/cc-metric-collector
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-collector.git synced 2026-03-10 18:47:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve error reporting

Browse Source
This commit is contained in:
Holger Obermaier
2026-03-06 10:47:05 +01:00
parent f716605f9f
commit 29c84df5bc
1 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
collectors/smartmonMetric.go
View File

@@ -11,8 +11,8 @@ import (
) )
type SmartMonCollectorConfig struct { type SmartMonCollectorConfig struct {
UseSudo bool `json:"use_sudo"` UseSudo bool `json:"use_sudo,omitempty"`
ExcludeDevices []string `json:"exclude_devices"` ExcludeDevices []string `json:"exclude_devices,omitempty"`
} }
type SmartMonCollector struct { type SmartMonCollector struct {
@@ -26,7 +26,6 @@ type SmartMonCollector struct {
} }
func (m *SmartMonCollector) getSmartmonDevices() error { func (m *SmartMonCollector) getSmartmonDevices() error {
var command *exec.Cmd
var scan struct { var scan struct {
Devices []struct { Devices []struct {
Name string `json:"name"` Name string `json:"name"`
@@ -34,19 +33,24 @@ func (m *SmartMonCollector) getSmartmonDevices() error {
} `json:"devices"` } `json:"devices"`
} }
m.devices = make([]string, 0) m.devices = make([]string, 0)
var command *exec.Cmd
if m.config.UseSudo { if m.config.UseSudo {
command = exec.Command(m.sudoCmd, m.smartCtlCmd, "--scan", "-j") command = exec.Command(m.sudoCmd, m.smartCtlCmd, "--scan", "--json=c")
} else { } else {
command = exec.Command(m.smartCtlCmd, "--scan", "-j") command = exec.Command(m.smartCtlCmd, "--scan", "--json=c")
} }
stdout, err := command.Output() stdout, err := command.Output()
if err != nil { if err != nil {
return err return fmt.Errorf(
"%s getSmartmonDevices(): Failed to execute device scan command %s: %w",
m.name, command.String(), err)
} }
err = json.Unmarshal(stdout, &scan) err = json.Unmarshal(stdout, &scan)
if err != nil { if err != nil {
return err return fmt.Errorf("%s getSmartmonDevices(): Failed to parse JSON output from device scan command: %w",
m.name, err)
} }
for _, d := range scan.Devices { for _, d := range scan.Devices {
if len(d.Name) > 0 { if len(d.Name) > 0 {
@@ -58,36 +62,42 @@ func (m *SmartMonCollector) getSmartmonDevices() error {
} }
func (m *SmartMonCollector) Init(config json.RawMessage) error { func (m *SmartMonCollector) Init(config json.RawMessage) error {
var err error = nil
m.name = "SmartMonCollector" m.name = "SmartMonCollector"
if err := m.setup(); err != nil { if err := m.setup(); err != nil {
return fmt.Errorf("%s Init(): setup() call failed: %w", m.name, err) return fmt.Errorf("%s Init(): setup() call failed: %w", m.name, err)
} }
m.parallel = true m.parallel = true
m.meta = map[string]string{"source": m.name, "group": "Disk"} m.meta = map[string]string{
m.tags = map[string]string{"type": "node", "stype": "disk"} "source": m.name,
"group": "Disk",
}
m.tags = map[string]string{
"type": "node",
"stype": "disk",
}
// Read in the JSON configuration // Read in the JSON configuration
if len(config) > 0 { if len(config) > 0 {
err = json.Unmarshal(config, &m.config) if err := json.Unmarshal(config, &m.config); err != nil {
if err != nil { return fmt.Errorf("%s Init(): Error reading config: %w", m.name, err)
cclog.ComponentError(m.name, "Error reading config:", err.Error())
return err
} }
} }
// Check if sudo and smartctl are in search path
if m.config.UseSudo { if m.config.UseSudo {
p, err := exec.LookPath("sudo") p, err := exec.LookPath("sudo")
if err != nil { if err != nil {
return err return fmt.Errorf("%s Init(): No sudo command found in search path: %w", m.name, err)
} }
m.sudoCmd = p m.sudoCmd = p
} }
p, err := exec.LookPath("smartctl") p, err := exec.LookPath("smartctl")
if err != nil { if err != nil {
return err return fmt.Errorf("%s Init(): No smartctl command found in search path: %w", m.name, err)
} }
m.smartCtlCmd = p m.smartCtlCmd = p
err = m.getSmartmonDevices()
if err != nil { if err = m.getSmartmonDevices(); err != nil {
return err return err
} }