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

Addapt to new ccMessage syntax

Browse Source
This commit is contained in:
Holger Obermaier
2026-03-05 14:32:45 +01:00
parent 337419943c
commit b241c2cd66
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
collectors/smartmonMetric.go
View File

@@ -5,8 +5,8 @@ import (
"os/exec" "os/exec"
"time" "time"
cclog "github.com/ClusterCockpit/cc-metric-collector/internal/ccLogger" cclog "github.com/ClusterCockpit/cc-lib/v2/ccLogger"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric" lp "github.com/ClusterCockpit/cc-lib/v2/ccMessage"
) )
type SmartMonCollectorConfig struct { type SmartMonCollectorConfig struct {
@@ -116,7 +116,7 @@ type SmartMonData struct {
} `json:"nvme_smart_health_information_log"` } `json:"nvme_smart_health_information_log"`
} }
func (m *SmartMonCollector) Read(interval time.Duration, output chan lp.CCMetric) { 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 command *exec.Cmd
@@ -137,76 +137,76 @@ func (m *SmartMonCollector) Read(interval time.Duration, output chan lp.CCMetric
cclog.ComponentError(m.name, "cannot unmarshal data for device", d) cclog.ComponentError(m.name, "cannot unmarshal data for device", d)
continue continue
} }
y, err := lp.New("smartmon_temp", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.Temperature}, timestamp) y, err := lp.NewMessage("smartmon_temp", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.Temperature}, timestamp)
if err == nil { if err == nil {
y.AddTag("stype-id", d) y.AddTag("stype-id", d)
y.AddMeta("unit", "degC") y.AddMeta("unit", "degC")
output <- y output <- y
} }
y, err = lp.New("smartmon_percent_used", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.PercentageUsed}, timestamp) y, err = lp.NewMessage("smartmon_percent_used", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.PercentageUsed}, timestamp)
if err == nil { if err == nil {
y.AddTag("stype-id", d) y.AddTag("stype-id", d)
y.AddMeta("unit", "percent") y.AddMeta("unit", "percent")
output <- y output <- y
} }
y, err = lp.New("smartmon_avail_spare", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.AvailableSpare}, timestamp) y, err = lp.NewMessage("smartmon_avail_spare", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.AvailableSpare}, timestamp)
if err == nil { if err == nil {
y.AddTag("stype-id", d) y.AddTag("stype-id", d)
y.AddMeta("unit", "percent") y.AddMeta("unit", "percent")
output <- y output <- y
} }
y, err = lp.New("smartmon_data_units_read", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.DataUnitsRead}, timestamp) y, err = lp.NewMessage("smartmon_data_units_read", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.DataUnitsRead}, timestamp)
if err == nil { if err == nil {
y.AddTag("stype-id", d) y.AddTag("stype-id", d)
output <- y output <- y
} }
y, err = lp.New("smartmon_data_units_write", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.DataUnitsWrite}, timestamp) y, err = lp.NewMessage("smartmon_data_units_write", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.DataUnitsWrite}, timestamp)
if err == nil { if err == nil {
y.AddTag("stype-id", d) y.AddTag("stype-id", d)
output <- y output <- y
} }
y, err = lp.New("smartmon_host_reads", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.HostReads}, timestamp) y, err = lp.NewMessage("smartmon_host_reads", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.HostReads}, timestamp)
if err == nil { if err == nil {
y.AddTag("stype-id", d) y.AddTag("stype-id", d)
output <- y output <- y
} }
y, err = lp.New("smartmon_host_writes", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.HostWrites}, timestamp) y, err = lp.NewMessage("smartmon_host_writes", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.HostWrites}, timestamp)
if err == nil { if err == nil {
y.AddTag("stype-id", d) y.AddTag("stype-id", d)
output <- y output <- y
} }
y, err = lp.New("smartmon_power_cycles", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.PowerCycles}, timestamp) y, err = lp.NewMessage("smartmon_power_cycles", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.PowerCycles}, timestamp)
if err == nil { if err == nil {
y.AddTag("stype-id", d) y.AddTag("stype-id", d)
output <- y output <- y
} }
y, err = lp.New("smartmon_power_on", m.tags, m.meta, map[string]interface{}{"value": int64(data.HealthLog.PowerOnHours) * 3600}, timestamp) y, err = lp.NewMessage("smartmon_power_on", m.tags, m.meta, map[string]interface{}{"value": int64(data.HealthLog.PowerOnHours) * 3600}, timestamp)
if err == nil { if err == nil {
y.AddTag("stype-id", d) y.AddTag("stype-id", d)
y.AddMeta("unit", "seconds") y.AddMeta("unit", "seconds")
output <- y output <- y
} }
y, err = lp.New("smartmon_unsafe_shutdowns", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.UnsafeShutdowns}, timestamp) y, err = lp.NewMessage("smartmon_unsafe_shutdowns", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.UnsafeShutdowns}, timestamp)
if err == nil { if err == nil {
y.AddTag("stype-id", d) y.AddTag("stype-id", d)
output <- y output <- y
} }
y, err = lp.New("smartmon_media_errors", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.MediaErrors}, timestamp) y, err = lp.NewMessage("smartmon_media_errors", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.MediaErrors}, timestamp)
if err == nil { if err == nil {
y.AddTag("stype-id", d) y.AddTag("stype-id", d)
output <- y output <- y
} }
y, err = lp.New("smartmon_errlog_entries", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.NumErrorLogEntries}, timestamp) y, err = lp.NewMessage("smartmon_errlog_entries", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.NumErrorLogEntries}, timestamp)
if err == nil { if err == nil {
y.AddTag("stype-id", d) y.AddTag("stype-id", d)
output <- y output <- y
} }
y, err = lp.New("smartmon_warn_temp_time", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.WarnTempTime}, timestamp) y, err = lp.NewMessage("smartmon_warn_temp_time", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.WarnTempTime}, timestamp)
if err == nil { if err == nil {
y.AddTag("stype-id", d) y.AddTag("stype-id", d)
output <- y output <- y
} }
y, err = lp.New("smartmon_crit_temp_time", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.CriticalTempTime}, timestamp) y, err = lp.NewMessage("smartmon_crit_temp_time", m.tags, m.meta, map[string]interface{}{"value": data.HealthLog.CriticalTempTime}, timestamp)
if err == nil { if err == nil {
y.AddTag("stype-id", d) y.AddTag("stype-id", d)
output <- y output <- y