ClusterCockpit/cc-metric-collector
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-collector.git synced 2024-12-25 23:19:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove doubled import and remove merge artifacts

Browse Source
This commit is contained in:
Thomas Roehl 2022-02-21 14:50:11 +01:00
parent 24a2c9992f
commit eed9cd227c
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
collectors/customCmdMetric.go
View File

@ -9,13 +9,8 @@ import (
"strings" "strings"
"time" "time"
<<<<<<< HEAD
lp "github.com/influxdata/line-protocol"
=======
ccmetric "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric" lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
influx "github.com/influxdata/line-protocol" influx "github.com/influxdata/line-protocol"
>>>>>>> develop
) )
const CUSTOMCMDPATH = `/home/unrz139/Work/cc-metric-collector/collectors/custom` const CUSTOMCMDPATH = `/home/unrz139/Work/cc-metric-collector/collectors/custom`
@ -103,7 +98,7 @@ func (m *CustomCmdCollector) Read(interval time.Duration, output chan lp.CCMetri
continue continue
} }
y := ccmetric.FromInfluxMetric(c) y := lp.FromInfluxMetric(c)
if err == nil { if err == nil {
output <- y output <- y
} }
@ -125,7 +120,7 @@ func (m *CustomCmdCollector) Read(interval time.Duration, output chan lp.CCMetri
if skip { if skip {
continue continue
} }
y := ccmetric.FromInfluxMetric(f) y := lp.FromInfluxMetric(f)
if err == nil { if err == nil {
output <- y output <- y
} }