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

Store query command for later reuse

Browse Source
This commit is contained in:
Holger Obermaier
2026-03-06 13:12:51 +01:00
parent 5b922924e4
commit 510e916c0f
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
collectors/smartmonMetric.go
View File

@@ -17,8 +17,9 @@ type SmartMonCollectorConfig struct {
} }
type deviceT struct { type deviceT struct {
Name string `json:"name"` Name string `json:"name"`
Type string `json:"type"` Type string `json:"type"`
queryCommand []string
} }
type SmartMonCollector struct { type SmartMonCollector struct {
@@ -36,12 +37,12 @@ func (m *SmartMonCollector) getSmartmonDevices() error {
Devices []deviceT `json:"devices"` Devices []deviceT `json:"devices"`
} }
var command *exec.Cmd var scanCmd []string
if m.config.UseSudo { if m.config.UseSudo {
command = exec.Command(m.sudoCmd, m.smartCtlCmd, "--scan", "--json=c") scanCmd = append(scanCmd, m.sudoCmd)
} else {
command = exec.Command(m.smartCtlCmd, "--scan", "--json=c")
} }
scanCmd = append(scanCmd, m.smartCtlCmd, "--scan", "--json=c")
command := exec.Command(scanCmd[0], scanCmd[1:]...)
stdout, err := command.Output() stdout, err := command.Output()
if err != nil { if err != nil {
@@ -58,6 +59,11 @@ func (m *SmartMonCollector) getSmartmonDevices() error {
m.devices = make([]deviceT, 0) m.devices = make([]deviceT, 0)
for _, d := range scan.Devices { for _, d := range scan.Devices {
if !slices.Contains(m.config.ExcludeDevices, d.Name) { if !slices.Contains(m.config.ExcludeDevices, d.Name) {
if m.config.UseSudo {
d.queryCommand = append(d.queryCommand, m.sudoCmd)
}
d.queryCommand = append(d.queryCommand, m.smartCtlCmd, "--json=c", "--device="+d.Type, "--all", d.Name)
m.devices = append(m.devices, d) m.devices = append(m.devices, d)
} }
} }
@@ -136,13 +142,8 @@ type SmartMonData struct {
func (m *SmartMonCollector) Read(interval time.Duration, output chan lp.CCMessage) { func (m *SmartMonCollector) Read(interval time.Duration, output chan lp.CCMessage) {
timestamp := time.Now() timestamp := time.Now()
for _, d := range m.devices { for _, d := range m.devices {
var command *exec.Cmd
var data SmartMonData var data SmartMonData
if m.config.UseSudo { command := exec.Command(d.queryCommand[0], d.queryCommand[1:]...)
command = exec.Command(m.sudoCmd, m.smartCtlCmd, "--json=c", "--device="+d.Type, "--all", d.Name)
} else {
command = exec.Command(m.smartCtlCmd, "--json=c", "--device="+d.Type, "--all", d.Name)
}
stdout, err := command.Output() stdout, err := command.Output()
if err != nil { if err != nil {