From b12e471407b91c7beeb64c634cfdf0fd3ef3f69d Mon Sep 17 00:00:00 2001 From: brinkcoder Date: Fri, 7 Mar 2025 14:15:41 +0100 Subject: [PATCH] switch to cc-lib ccMessage and messageProcessor --- cc-metric-collector.go | 2 +- collectors/beegfsmetaMetric.go | 2 +- collectors/beegfsstorageMetric.go | 2 +- collectors/collectorManager.go | 2 +- collectors/gpfsMetric.go | 2 +- collectors/metricCollector.go | 2 +- collectors/raplMetric.go | 2 +- collectors/rocmsmiMetric.go | 2 +- collectors/sampleMetric.go | 2 +- collectors/sampleTimerMetric.go | 2 +- collectors/selfMetric.go | 2 +- internal/metricAggregator/metricAggregator.go | 2 +- internal/metricRouter/metricCache.go | 2 +- internal/metricRouter/metricRouter.go | 4 ++-- pkg/messageProcessor/messageProcessor.go | 2 +- pkg/messageProcessor/messageProcessorFuncs.go | 2 +- pkg/messageProcessor/messageProcessor_test.go | 2 +- receivers/httpReceiver.go | 4 ++-- receivers/ipmiReceiver.go | 4 ++-- receivers/metricReceiver.go | 4 ++-- receivers/natsReceiver.go | 4 ++-- receivers/prometheusReceiver.go | 2 +- receivers/receiveManager.go | 2 +- receivers/redfishReceiver.go | 4 ++-- receivers/sampleReceiver.go | 2 +- sinks/gangliaCommon.go | 2 +- sinks/gangliaSink.go | 4 ++-- sinks/httpSink.go | 4 ++-- sinks/influxAsyncSink.go | 4 ++-- sinks/influxSink.go | 4 ++-- sinks/libgangliaSink.go | 4 ++-- sinks/metricSink.go | 4 ++-- sinks/natsSink.go | 4 ++-- sinks/prometheusSink.go | 4 ++-- sinks/sampleSink.go | 4 ++-- sinks/sinkManager.go | 2 +- sinks/stdoutSink.go | 4 ++-- 37 files changed, 53 insertions(+), 53 deletions(-) diff --git a/cc-metric-collector.go b/cc-metric-collector.go index 823cb5e..ad05901 100644 --- a/cc-metric-collector.go +++ b/cc-metric-collector.go @@ -17,7 +17,7 @@ import ( mr "github.com/ClusterCockpit/cc-metric-collector/internal/metricRouter" 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" mct "github.com/ClusterCockpit/cc-metric-collector/pkg/multiChanTicker" ) diff --git a/collectors/beegfsmetaMetric.go b/collectors/beegfsmetaMetric.go index 613cd4a..94f35dc 100644 --- a/collectors/beegfsmetaMetric.go +++ b/collectors/beegfsmetaMetric.go @@ -14,7 +14,7 @@ import ( "strings" "time" - lp "github.com/ClusterCockpit/cc-lib/pkg/ccMessage" + lp "github.com/ClusterCockpit/cc-lib/ccMessage" cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" ) diff --git a/collectors/beegfsstorageMetric.go b/collectors/beegfsstorageMetric.go index 500979b..b9bda15 100644 --- a/collectors/beegfsstorageMetric.go +++ b/collectors/beegfsstorageMetric.go @@ -14,7 +14,7 @@ import ( "strings" "time" - lp "github.com/ClusterCockpit/cc-lib/pkg/ccMessage" + lp "github.com/ClusterCockpit/cc-lib/ccMessage" cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" ) diff --git a/collectors/collectorManager.go b/collectors/collectorManager.go index 2cfbde0..fbc4138 100644 --- a/collectors/collectorManager.go +++ b/collectors/collectorManager.go @@ -6,7 +6,7 @@ import ( "sync" "time" - lp "github.com/ClusterCockpit/cc-lib/pkg/ccMessage" + 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" ) diff --git a/collectors/gpfsMetric.go b/collectors/gpfsMetric.go index ac7fc0b..c76cc47 100644 --- a/collectors/gpfsMetric.go +++ b/collectors/gpfsMetric.go @@ -13,7 +13,7 @@ import ( "strings" "time" - lp "github.com/ClusterCockpit/cc-lib/pkg/ccMessage" + lp "github.com/ClusterCockpit/cc-lib/ccMessage" cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" ) diff --git a/collectors/metricCollector.go b/collectors/metricCollector.go index f827391..e9bb6ae 100644 --- a/collectors/metricCollector.go +++ b/collectors/metricCollector.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - lp "github.com/ClusterCockpit/cc-lib/pkg/ccMessage" + lp "github.com/ClusterCockpit/cc-lib/ccMessage" ) type MetricCollector interface { diff --git a/collectors/raplMetric.go b/collectors/raplMetric.go index 1be1506..d96377d 100644 --- a/collectors/raplMetric.go +++ b/collectors/raplMetric.go @@ -9,7 +9,7 @@ import ( "strings" "time" - lp "github.com/ClusterCockpit/cc-lib/pkg/ccMessage" + lp "github.com/ClusterCockpit/cc-lib/ccMessage" cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" ) diff --git a/collectors/rocmsmiMetric.go b/collectors/rocmsmiMetric.go index a748ae9..2f473f6 100644 --- a/collectors/rocmsmiMetric.go +++ b/collectors/rocmsmiMetric.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - lp "github.com/ClusterCockpit/cc-lib/pkg/ccMessage" + lp "github.com/ClusterCockpit/cc-lib/ccMessage" cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" "github.com/ClusterCockpit/go-rocm-smi/pkg/rocm_smi" ) diff --git a/collectors/sampleMetric.go b/collectors/sampleMetric.go index 13b48bc..7b53d5e 100644 --- a/collectors/sampleMetric.go +++ b/collectors/sampleMetric.go @@ -4,7 +4,7 @@ import ( "encoding/json" "time" - lp "github.com/ClusterCockpit/cc-lib/pkg/ccMessage" + lp "github.com/ClusterCockpit/cc-lib/ccMessage" cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" ) diff --git a/collectors/sampleTimerMetric.go b/collectors/sampleTimerMetric.go index abe518b..e76464f 100644 --- a/collectors/sampleTimerMetric.go +++ b/collectors/sampleTimerMetric.go @@ -5,7 +5,7 @@ import ( "sync" "time" - lp "github.com/ClusterCockpit/cc-lib/pkg/ccMessage" + lp "github.com/ClusterCockpit/cc-lib/ccMessage" cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" ) diff --git a/collectors/selfMetric.go b/collectors/selfMetric.go index e89a300..699b857 100644 --- a/collectors/selfMetric.go +++ b/collectors/selfMetric.go @@ -6,7 +6,7 @@ import ( "syscall" "time" - lp "github.com/ClusterCockpit/cc-lib/pkg/ccMessage" + lp "github.com/ClusterCockpit/cc-lib/ccMessage" cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" ) diff --git a/internal/metricAggregator/metricAggregator.go b/internal/metricAggregator/metricAggregator.go index c300df5..69ee27a 100644 --- a/internal/metricAggregator/metricAggregator.go +++ b/internal/metricAggregator/metricAggregator.go @@ -11,7 +11,7 @@ import ( 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" topo "github.com/ClusterCockpit/cc-metric-collector/pkg/ccTopology" "github.com/PaesslerAG/gval" diff --git a/internal/metricRouter/metricCache.go b/internal/metricRouter/metricCache.go index b0fcd3d..a645909 100644 --- a/internal/metricRouter/metricCache.go +++ b/internal/metricRouter/metricCache.go @@ -7,7 +7,7 @@ import ( cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" agg "github.com/ClusterCockpit/cc-metric-collector/internal/metricAggregator" - lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message" + lp "github.com/ClusterCockpit/cc-lib/ccMessage" mct "github.com/ClusterCockpit/cc-metric-collector/pkg/multiChanTicker" ) diff --git a/internal/metricRouter/metricRouter.go b/internal/metricRouter/metricRouter.go index e30e436..3397fa8 100644 --- a/internal/metricRouter/metricRouter.go +++ b/internal/metricRouter/metricRouter.go @@ -10,9 +10,9 @@ import ( 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" agg "github.com/ClusterCockpit/cc-metric-collector/internal/metricAggregator" - mp "github.com/ClusterCockpit/cc-metric-collector/pkg/messageProcessor" + mp "github.com/ClusterCockpit/cc-lib/messageProcessor" mct "github.com/ClusterCockpit/cc-metric-collector/pkg/multiChanTicker" ) diff --git a/pkg/messageProcessor/messageProcessor.go b/pkg/messageProcessor/messageProcessor.go index 9bcc54a..2d916e4 100644 --- a/pkg/messageProcessor/messageProcessor.go +++ b/pkg/messageProcessor/messageProcessor.go @@ -6,7 +6,7 @@ import ( "strings" "sync" - 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" lplegacy "github.com/ClusterCockpit/cc-metric-collector/pkg/ccMetric" diff --git a/pkg/messageProcessor/messageProcessorFuncs.go b/pkg/messageProcessor/messageProcessorFuncs.go index 8fa5661..fb25adc 100644 --- a/pkg/messageProcessor/messageProcessorFuncs.go +++ b/pkg/messageProcessor/messageProcessorFuncs.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - lp2 "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message" + lp2 "github.com/ClusterCockpit/cc-lib/ccMessage" units "github.com/ClusterCockpit/cc-units" "github.com/expr-lang/expr" "github.com/expr-lang/expr/vm" diff --git a/pkg/messageProcessor/messageProcessor_test.go b/pkg/messageProcessor/messageProcessor_test.go index 55a3088..ec372d1 100644 --- a/pkg/messageProcessor/messageProcessor_test.go +++ b/pkg/messageProcessor/messageProcessor_test.go @@ -7,7 +7,7 @@ import ( "testing" "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" ) diff --git a/receivers/httpReceiver.go b/receivers/httpReceiver.go index d7965c6..f1cdc33 100644 --- a/receivers/httpReceiver.go +++ b/receivers/httpReceiver.go @@ -10,9 +10,9 @@ 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" - mp "github.com/ClusterCockpit/cc-metric-collector/pkg/messageProcessor" + mp "github.com/ClusterCockpit/cc-lib/messageProcessor" influx "github.com/influxdata/line-protocol/v2/lineprotocol" ) diff --git a/receivers/ipmiReceiver.go b/receivers/ipmiReceiver.go index 9f045ee..9e87c1e 100644 --- a/receivers/ipmiReceiver.go +++ b/receivers/ipmiReceiver.go @@ -13,10 +13,10 @@ 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" "github.com/ClusterCockpit/cc-metric-collector/pkg/hostlist" - mp "github.com/ClusterCockpit/cc-metric-collector/pkg/messageProcessor" + mp "github.com/ClusterCockpit/cc-lib/messageProcessor" ) type IPMIReceiverClientConfig struct { diff --git a/receivers/metricReceiver.go b/receivers/metricReceiver.go index 609eab7..2d043c2 100644 --- a/receivers/metricReceiver.go +++ b/receivers/metricReceiver.go @@ -3,8 +3,8 @@ package receivers import ( "encoding/json" - lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message" - mp "github.com/ClusterCockpit/cc-metric-collector/pkg/messageProcessor" + lp "github.com/ClusterCockpit/cc-lib/ccMessage" + mp "github.com/ClusterCockpit/cc-lib/messageProcessor" ) type defaultReceiverConfig struct { diff --git a/receivers/natsReceiver.go b/receivers/natsReceiver.go index 4f9f552..b2389b2 100644 --- a/receivers/natsReceiver.go +++ b/receivers/natsReceiver.go @@ -7,9 +7,9 @@ import ( "os" "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" - mp "github.com/ClusterCockpit/cc-metric-collector/pkg/messageProcessor" + mp "github.com/ClusterCockpit/cc-lib/messageProcessor" influx "github.com/influxdata/line-protocol/v2/lineprotocol" nats "github.com/nats-io/nats.go" ) diff --git a/receivers/prometheusReceiver.go b/receivers/prometheusReceiver.go index 3e777a8..190c30b 100644 --- a/receivers/prometheusReceiver.go +++ b/receivers/prometheusReceiver.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" ) type PrometheusReceiverConfig struct { diff --git a/receivers/receiveManager.go b/receivers/receiveManager.go index ac3d998..48b6582 100644 --- a/receivers/receiveManager.go +++ b/receivers/receiveManager.go @@ -7,7 +7,7 @@ import ( "sync" 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" ) var AvailableReceivers = map[string]func(name string, config json.RawMessage) (Receiver, error){ diff --git a/receivers/redfishReceiver.go b/receivers/redfishReceiver.go index b237231..ad985b3 100644 --- a/receivers/redfishReceiver.go +++ b/receivers/redfishReceiver.go @@ -13,10 +13,10 @@ 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" "github.com/ClusterCockpit/cc-metric-collector/pkg/hostlist" - mp "github.com/ClusterCockpit/cc-metric-collector/pkg/messageProcessor" + mp "github.com/ClusterCockpit/cc-lib/messageProcessor" // See: https://pkg.go.dev/github.com/stmcginnis/gofish "github.com/stmcginnis/gofish" diff --git a/receivers/sampleReceiver.go b/receivers/sampleReceiver.go index 8fe7e1c..cb4c422 100644 --- a/receivers/sampleReceiver.go +++ b/receivers/sampleReceiver.go @@ -5,7 +5,7 @@ import ( "fmt" cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" - mp "github.com/ClusterCockpit/cc-metric-collector/pkg/messageProcessor" + mp "github.com/ClusterCockpit/cc-lib/messageProcessor" ) // SampleReceiver configuration: receiver type, listen address, port diff --git a/sinks/gangliaCommon.go b/sinks/gangliaCommon.go index 010b94a..76ba517 100644 --- a/sinks/gangliaCommon.go +++ b/sinks/gangliaCommon.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message" + lp "github.com/ClusterCockpit/cc-lib/ccMessage" ) func GangliaMetricName(point lp.CCMessage) string { diff --git a/sinks/gangliaSink.go b/sinks/gangliaSink.go index e716ae4..3491e5a 100644 --- a/sinks/gangliaSink.go +++ b/sinks/gangliaSink.go @@ -10,9 +10,9 @@ import ( // "time" "os/exec" - 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" - mp "github.com/ClusterCockpit/cc-metric-collector/pkg/messageProcessor" + mp "github.com/ClusterCockpit/cc-lib/messageProcessor" ) const GMETRIC_EXEC = `gmetric` diff --git a/sinks/httpSink.go b/sinks/httpSink.go index 8e1a8fd..703e400 100644 --- a/sinks/httpSink.go +++ b/sinks/httpSink.go @@ -9,9 +9,9 @@ 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" - mp "github.com/ClusterCockpit/cc-metric-collector/pkg/messageProcessor" + mp "github.com/ClusterCockpit/cc-lib/messageProcessor" influx "github.com/influxdata/line-protocol/v2/lineprotocol" "golang.org/x/exp/slices" ) diff --git a/sinks/influxAsyncSink.go b/sinks/influxAsyncSink.go index e496627..0a589f0 100644 --- a/sinks/influxAsyncSink.go +++ b/sinks/influxAsyncSink.go @@ -10,9 +10,9 @@ 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" - mp "github.com/ClusterCockpit/cc-metric-collector/pkg/messageProcessor" + mp "github.com/ClusterCockpit/cc-lib/messageProcessor" influxdb2 "github.com/influxdata/influxdb-client-go/v2" influxdb2Api "github.com/influxdata/influxdb-client-go/v2/api" influxdb2ApiHttp "github.com/influxdata/influxdb-client-go/v2/api/http" diff --git a/sinks/influxSink.go b/sinks/influxSink.go index a3dba6a..e587cd5 100644 --- a/sinks/influxSink.go +++ b/sinks/influxSink.go @@ -10,9 +10,9 @@ 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" - mp "github.com/ClusterCockpit/cc-metric-collector/pkg/messageProcessor" + mp "github.com/ClusterCockpit/cc-lib/messageProcessor" influxdb2 "github.com/influxdata/influxdb-client-go/v2" influxdb2Api "github.com/influxdata/influxdb-client-go/v2/api" influx "github.com/influxdata/line-protocol/v2/lineprotocol" diff --git a/sinks/libgangliaSink.go b/sinks/libgangliaSink.go index 4700eee..267de48 100644 --- a/sinks/libgangliaSink.go +++ b/sinks/libgangliaSink.go @@ -72,9 +72,9 @@ import ( "fmt" "unsafe" - 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" - mp "github.com/ClusterCockpit/cc-metric-collector/pkg/messageProcessor" + mp "github.com/ClusterCockpit/cc-lib/messageProcessor" "github.com/NVIDIA/go-nvml/pkg/dl" ) diff --git a/sinks/metricSink.go b/sinks/metricSink.go index f3e95a3..7cea89f 100644 --- a/sinks/metricSink.go +++ b/sinks/metricSink.go @@ -3,8 +3,8 @@ package sinks import ( "encoding/json" - lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message" - mp "github.com/ClusterCockpit/cc-metric-collector/pkg/messageProcessor" + lp "github.com/ClusterCockpit/cc-lib/ccMessage" + mp "github.com/ClusterCockpit/cc-lib/messageProcessor" influx "github.com/influxdata/line-protocol/v2/lineprotocol" "golang.org/x/exp/slices" ) diff --git a/sinks/natsSink.go b/sinks/natsSink.go index 08cb4d1..6cbf620 100644 --- a/sinks/natsSink.go +++ b/sinks/natsSink.go @@ -9,9 +9,9 @@ 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" - mp "github.com/ClusterCockpit/cc-metric-collector/pkg/messageProcessor" + mp "github.com/ClusterCockpit/cc-lib/messageProcessor" influx "github.com/influxdata/line-protocol/v2/lineprotocol" nats "github.com/nats-io/nats.go" "golang.org/x/exp/slices" diff --git a/sinks/prometheusSink.go b/sinks/prometheusSink.go index 677cfd6..5a3c4b3 100644 --- a/sinks/prometheusSink.go +++ b/sinks/prometheusSink.go @@ -10,9 +10,9 @@ import ( "strings" "sync" - 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" - mp "github.com/ClusterCockpit/cc-metric-collector/pkg/messageProcessor" + mp "github.com/ClusterCockpit/cc-lib/messageProcessor" "github.com/gorilla/mux" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/sinks/sampleSink.go b/sinks/sampleSink.go index 24e2911..60dbd2a 100644 --- a/sinks/sampleSink.go +++ b/sinks/sampleSink.go @@ -6,9 +6,9 @@ import ( "fmt" "log" - 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" - mp "github.com/ClusterCockpit/cc-metric-collector/pkg/messageProcessor" + mp "github.com/ClusterCockpit/cc-lib/messageProcessor" ) type SampleSinkConfig struct { diff --git a/sinks/sinkManager.go b/sinks/sinkManager.go index 487a693..ab75a07 100644 --- a/sinks/sinkManager.go +++ b/sinks/sinkManager.go @@ -7,7 +7,7 @@ import ( "sync" 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 SINK_MAX_FORWARD = 50 diff --git a/sinks/stdoutSink.go b/sinks/stdoutSink.go index a95e866..105476b 100644 --- a/sinks/stdoutSink.go +++ b/sinks/stdoutSink.go @@ -8,9 +8,9 @@ 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" - mp "github.com/ClusterCockpit/cc-metric-collector/pkg/messageProcessor" + mp "github.com/ClusterCockpit/cc-lib/messageProcessor" ) type StdoutSink struct {