Change to ccMessage from cc-lib

2025-07-30 08:26:08 +02:00 · 2025-02-24 18:29:27 +01:00
parent 0e57c8db1c
commit a476f1753e
54 changed files with 129 additions and 117 deletions
--- a/collectors/beegfsmetaMetric.go
+++ b/collectors/beegfsmetaMetric.go
@@ -15,7 +15,7 @@ import (
 	"time"

 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 )

 const DEFAULT_BEEGFS_CMD = "beegfs-ctl"
--- a/collectors/beegfsstorageMetric.go
+++ b/collectors/beegfsstorageMetric.go
@@ -15,7 +15,7 @@ import (
 	"time"

 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 )

 // Struct for the collector-specific JSON config
--- a/collectors/collectorManager.go
+++ b/collectors/collectorManager.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"

-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
 	mct "github.com/ClusterCockpit/cc-metric-collector/pkg/multiChanTicker"
 )
--- a/collectors/cpufreqCpuinfoMetric.go
+++ b/collectors/cpufreqCpuinfoMetric.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"

-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
 )

--- a/collectors/cpufreqMetric.go
+++ b/collectors/cpufreqMetric.go
@@ -10,7 +10,7 @@ import (
 	"time"

 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 	"github.com/ClusterCockpit/cc-metric-collector/pkg/ccTopology"
 	"golang.org/x/sys/unix"
 )
--- a/collectors/cpustatMetric.go
+++ b/collectors/cpustatMetric.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"

-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
 	sysconf "github.com/tklauser/go-sysconf"
 )
--- a/collectors/customCmdMetric.go
+++ b/collectors/customCmdMetric.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"

-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 	influx "github.com/influxdata/line-protocol"
 )

--- a/collectors/gpfsMetric.go
+++ b/collectors/gpfsMetric.go
@@ -14,7 +14,7 @@ import (
 	"time"

 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 )

 const DEFAULT_GPFS_CMD = "mmpmon"
--- a/collectors/infinibandMetric.go
+++ b/collectors/infinibandMetric.go
@@ -5,7 +5,7 @@ import (
 	"os"

 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 	"golang.org/x/sys/unix"

 	"encoding/json"
--- a/collectors/ipmiMetric.go
+++ b/collectors/ipmiMetric.go
@@ -14,7 +14,7 @@ import (
 	"time"

 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 )

 const IPMISENSORS_PATH = `ipmi-sensors`
--- a/collectors/likwidMetric.go
+++ b/collectors/likwidMetric.go
@@ -24,7 +24,7 @@ import (
 	"time"
 	"unsafe"

-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 	agg "github.com/ClusterCockpit/cc-metric-collector/internal/metricAggregator"
 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
 	topo "github.com/ClusterCockpit/cc-metric-collector/pkg/ccTopology"
--- a/collectors/loadavgMetric.go
+++ b/collectors/loadavgMetric.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"

-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
 )

--- a/collectors/lustreMetric.go
+++ b/collectors/lustreMetric.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"

+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
 )

 const LUSTRE_SYSFS = `/sys/fs/lustre`
--- a/collectors/memstatMetric.go
+++ b/collectors/memstatMetric.go
@@ -13,7 +13,7 @@ import (
 	"time"

 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 )

 const MEMSTATFILE = "/proc/meminfo"
--- a/collectors/metricCollector.go
+++ b/collectors/metricCollector.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"

-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 )

 type MetricCollector interface {
@@ -14,7 +14,7 @@ type MetricCollector interface {
 	Initialized() bool                 // Is metric collector initialized?
 	Parallel() bool
 	Read(duration time.Duration, output chan lp.CCMessage) // Read metrics from metric collector
-	Close()                                               // Close / finish metric collector
+	Close()                                                // Close / finish metric collector
 }

 type metricCollector struct {
--- a/collectors/nfsMetric.go
+++ b/collectors/nfsMetric.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"

-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 )

 // First part contains the code for the general NfsCollector.
--- a/collectors/nvidiaMetric.go
+++ b/collectors/nvidiaMetric.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"

-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
 	"github.com/NVIDIA/go-nvml/pkg/nvml"
 )
--- a/collectors/raplMetric.go
+++ b/collectors/raplMetric.go
@@ -10,7 +10,7 @@ import (
 	"time"

 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 )

 // running average power limit (RAPL) monitoring attributes for a zone
--- a/collectors/rocmsmiMetric.go
+++ b/collectors/rocmsmiMetric.go
@@ -7,7 +7,7 @@ import (
 	"time"

 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 	"github.com/ClusterCockpit/go-rocm-smi/pkg/rocm_smi"
 )

--- a/collectors/sampleMetric.go
+++ b/collectors/sampleMetric.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"time"

-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
 )

--- a/collectors/sampleTimerMetric.go
+++ b/collectors/sampleTimerMetric.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"

-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
 )

--- a/collectors/schedstatMetric.go
+++ b/collectors/schedstatMetric.go
@@ -11,7 +11,7 @@ import (
 	"time"

 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 )

 const SCHEDSTATFILE = `/proc/schedstat`
--- a/collectors/selfMetric.go
+++ b/collectors/selfMetric.go
@@ -7,7 +7,7 @@ import (
 	"time"

 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 )

 type SelfCollectorConfig struct {
--- a/collectors/tempMetric.go
+++ b/collectors/tempMetric.go
@@ -10,7 +10,7 @@ import (
 	"time"

 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 )

 // See: https://www.kernel.org/doc/html/latest/hwmon/sysfs-interface.html
--- a/collectors/topprocsMetric.go
+++ b/collectors/topprocsMetric.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"

-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
+	lp "github.com/ClusterCockpit/cc-lib/ccMessage"
 )

 const MAX_NUM_PROCS = 10