diff --git a/collectors/beegfsmetaMetric.go b/collectors/beegfsmetaMetric.go index 603e078..f8786b8 100644 --- a/collectors/beegfsmetaMetric.go +++ b/collectors/beegfsmetaMetric.go @@ -14,7 +14,7 @@ import ( "strings" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" ) diff --git a/collectors/beegfsstorageMetric.go b/collectors/beegfsstorageMetric.go index 8af2598..3fc27e6 100644 --- a/collectors/beegfsstorageMetric.go +++ b/collectors/beegfsstorageMetric.go @@ -14,7 +14,7 @@ import ( "strings" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" ) diff --git a/collectors/collectorManager.go b/collectors/collectorManager.go index 7bf2507..2aea6c0 100644 --- a/collectors/collectorManager.go +++ b/collectors/collectorManager.go @@ -5,8 +5,8 @@ import ( "sync" "time" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" 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/cpufreqCpuinfoMetric.go b/collectors/cpufreqCpuinfoMetric.go index eabeff2..7bee412 100644 --- a/collectors/cpufreqCpuinfoMetric.go +++ b/collectors/cpufreqCpuinfoMetric.go @@ -10,8 +10,8 @@ import ( "strings" "time" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" ) // CPUFreqCollector diff --git a/collectors/cpufreqMetric.go b/collectors/cpufreqMetric.go index f6215d9..2106d06 100644 --- a/collectors/cpufreqMetric.go +++ b/collectors/cpufreqMetric.go @@ -9,7 +9,7 @@ import ( "strings" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" "github.com/ClusterCockpit/cc-metric-collector/pkg/ccTopology" "golang.org/x/sys/unix" diff --git a/collectors/cpustatMetric.go b/collectors/cpustatMetric.go index c0cd64f..7f1fdc9 100644 --- a/collectors/cpustatMetric.go +++ b/collectors/cpustatMetric.go @@ -9,8 +9,8 @@ import ( "strings" "time" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" sysconf "github.com/tklauser/go-sysconf" ) diff --git a/collectors/diskstatMetric.go b/collectors/diskstatMetric.go index 92e53f3..f0db3d3 100644 --- a/collectors/diskstatMetric.go +++ b/collectors/diskstatMetric.go @@ -8,7 +8,7 @@ import ( "syscall" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" ) @@ -16,7 +16,7 @@ const MOUNTFILE = `/proc/self/mounts` type DiskstatCollectorConfig struct { ExcludeMetrics []string `json:"exclude_metrics,omitempty"` - ExcludeMounts []string `json:"exclude_mounts,omitempty"` + ExcludeMounts []string `json:"exclude_mounts,omitempty"` } type DiskstatCollector struct { diff --git a/collectors/gpfsMetric.go b/collectors/gpfsMetric.go index 865c99e..9753566 100644 --- a/collectors/gpfsMetric.go +++ b/collectors/gpfsMetric.go @@ -13,7 +13,7 @@ import ( "strings" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" ) diff --git a/collectors/infinibandMetric.go b/collectors/infinibandMetric.go index 4ff6813..50bc3d0 100644 --- a/collectors/infinibandMetric.go +++ b/collectors/infinibandMetric.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" "golang.org/x/sys/unix" diff --git a/collectors/iostatMetric.go b/collectors/iostatMetric.go index 5df0469..be37abc 100644 --- a/collectors/iostatMetric.go +++ b/collectors/iostatMetric.go @@ -9,7 +9,7 @@ import ( "strings" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" ) diff --git a/collectors/ipmiMetric.go b/collectors/ipmiMetric.go index 2e8184a..16a1f83 100644 --- a/collectors/ipmiMetric.go +++ b/collectors/ipmiMetric.go @@ -13,7 +13,7 @@ import ( "strings" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" ) diff --git a/collectors/likwidMetric.go b/collectors/likwidMetric.go index a68013f..4ddb8cf 100644 --- a/collectors/likwidMetric.go +++ b/collectors/likwidMetric.go @@ -24,9 +24,9 @@ import ( "time" "unsafe" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" 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" "github.com/NVIDIA/go-nvml/pkg/dl" "github.com/fsnotify/fsnotify" diff --git a/collectors/loadavgMetric.go b/collectors/loadavgMetric.go index 412e1ee..4cdf704 100644 --- a/collectors/loadavgMetric.go +++ b/collectors/loadavgMetric.go @@ -8,8 +8,8 @@ import ( "strings" "time" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" ) // LoadavgCollector collects: diff --git a/collectors/lustreMetric.go b/collectors/lustreMetric.go index a9de106..1678d1d 100644 --- a/collectors/lustreMetric.go +++ b/collectors/lustreMetric.go @@ -10,8 +10,8 @@ import ( "strings" "time" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" ) const LUSTRE_SYSFS = `/sys/fs/lustre` diff --git a/collectors/memstatMetric.go b/collectors/memstatMetric.go index 041d9a3..632d8b3 100644 --- a/collectors/memstatMetric.go +++ b/collectors/memstatMetric.go @@ -12,7 +12,7 @@ import ( "strings" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" ) diff --git a/collectors/netstatMetric.go b/collectors/netstatMetric.go index 4cff5d8..5f55a56 100644 --- a/collectors/netstatMetric.go +++ b/collectors/netstatMetric.go @@ -9,17 +9,17 @@ import ( "strings" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" ) const NETSTATFILE = "/proc/net/dev" type NetstatCollectorConfig struct { - IncludeDevices []string `json:"include_devices"` - SendAbsoluteValues bool `json:"send_abs_values"` - SendDerivedValues bool `json:"send_derived_values"` - InterfaceAliases map[string][]string `json:"interface_aliases,omitempty"` + IncludeDevices []string `json:"include_devices"` + SendAbsoluteValues bool `json:"send_abs_values"` + SendDerivedValues bool `json:"send_derived_values"` + InterfaceAliases map[string][]string `json:"interface_aliases,omitempty"` } type NetstatCollectorMetric struct { diff --git a/collectors/nfsiostatMetric.go b/collectors/nfsiostatMetric.go index 28491bb..e75efff 100644 --- a/collectors/nfsiostatMetric.go +++ b/collectors/nfsiostatMetric.go @@ -9,7 +9,7 @@ import ( "strings" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" ) diff --git a/collectors/numastatsMetric.go b/collectors/numastatsMetric.go index 094cfe5..2a5730c 100644 --- a/collectors/numastatsMetric.go +++ b/collectors/numastatsMetric.go @@ -10,7 +10,7 @@ import ( "strings" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" ) diff --git a/collectors/nvidiaMetric.go b/collectors/nvidiaMetric.go index 265beed..4f6dbde 100644 --- a/collectors/nvidiaMetric.go +++ b/collectors/nvidiaMetric.go @@ -8,8 +8,8 @@ import ( "strings" "time" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" "github.com/NVIDIA/go-nvml/pkg/nvml" ) diff --git a/collectors/raplMetric.go b/collectors/raplMetric.go index 905d15f..6f16715 100644 --- a/collectors/raplMetric.go +++ b/collectors/raplMetric.go @@ -9,7 +9,7 @@ import ( "strings" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" ) diff --git a/collectors/rocmsmiMetric.go b/collectors/rocmsmiMetric.go index acc5cb3..c70dfd0 100644 --- a/collectors/rocmsmiMetric.go +++ b/collectors/rocmsmiMetric.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" "github.com/ClusterCockpit/go-rocm-smi/pkg/rocm_smi" ) diff --git a/collectors/sampleMetric.go b/collectors/sampleMetric.go index 7b53d5e..acdf83f 100644 --- a/collectors/sampleMetric.go +++ b/collectors/sampleMetric.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" ) // These are the fields we read from the JSON configuration diff --git a/collectors/sampleTimerMetric.go b/collectors/sampleTimerMetric.go index e76464f..3971799 100644 --- a/collectors/sampleTimerMetric.go +++ b/collectors/sampleTimerMetric.go @@ -5,8 +5,8 @@ import ( "sync" "time" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" ) // These are the fields we read from the JSON configuration diff --git a/collectors/schedstatMetric.go b/collectors/schedstatMetric.go index 7f574a0..039071c 100644 --- a/collectors/schedstatMetric.go +++ b/collectors/schedstatMetric.go @@ -10,7 +10,7 @@ import ( "strings" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" ) diff --git a/collectors/selfMetric.go b/collectors/selfMetric.go index c3ea9b1..a97484b 100644 --- a/collectors/selfMetric.go +++ b/collectors/selfMetric.go @@ -6,7 +6,7 @@ import ( "syscall" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" ) diff --git a/collectors/tempMetric.go b/collectors/tempMetric.go index 2e0e9b6..503e41f 100644 --- a/collectors/tempMetric.go +++ b/collectors/tempMetric.go @@ -9,7 +9,7 @@ import ( "strings" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" ) diff --git a/internal/metricAggregator/metricAggregator.go b/internal/metricAggregator/metricAggregator.go index 69ee27a..2f53616 100644 --- a/internal/metricAggregator/metricAggregator.go +++ b/internal/metricAggregator/metricAggregator.go @@ -9,7 +9,7 @@ import ( "sync" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" topo "github.com/ClusterCockpit/cc-metric-collector/pkg/ccTopology" diff --git a/internal/metricRouter/metricCache.go b/internal/metricRouter/metricCache.go index a645909..b200fba 100644 --- a/internal/metricRouter/metricCache.go +++ b/internal/metricRouter/metricCache.go @@ -4,10 +4,10 @@ import ( "sync" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" - agg "github.com/ClusterCockpit/cc-metric-collector/internal/metricAggregator" lp "github.com/ClusterCockpit/cc-lib/ccMessage" + agg "github.com/ClusterCockpit/cc-metric-collector/internal/metricAggregator" mct "github.com/ClusterCockpit/cc-metric-collector/pkg/multiChanTicker" ) diff --git a/internal/metricRouter/metricRouter.go b/internal/metricRouter/metricRouter.go index e3c4351..6453558 100644 --- a/internal/metricRouter/metricRouter.go +++ b/internal/metricRouter/metricRouter.go @@ -8,7 +8,7 @@ import ( "sync" "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" lp "github.com/ClusterCockpit/cc-lib/ccMessage" mp "github.com/ClusterCockpit/cc-lib/messageProcessor" diff --git a/pkg/ccTopology/ccTopology.go b/pkg/ccTopology/ccTopology.go index d180682..ee05dd3 100644 --- a/pkg/ccTopology/ccTopology.go +++ b/pkg/ccTopology/ccTopology.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - cclogger "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclogger "github.com/ClusterCockpit/cc-lib/ccLogger" "golang.org/x/exp/slices" ) diff --git a/pkg/multiChanTicker/multiChanTicker.go b/pkg/multiChanTicker/multiChanTicker.go index 1791474..5707378 100644 --- a/pkg/multiChanTicker/multiChanTicker.go +++ b/pkg/multiChanTicker/multiChanTicker.go @@ -3,7 +3,7 @@ package multiChanTicker import ( "time" - cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger" + cclog "github.com/ClusterCockpit/cc-lib/ccLogger" ) type multiChanTicker struct {