ClusterCockpit/cc-metric-collector
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-collector.git synced 2025-04-06 21:45:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid staticcheck warning: redundant return statement

Browse Source
This commit is contained in:
Holger Obermaier 2022-01-21 15:12:14 +01:00
parent 7a54a9b170
commit 699f69ff59
16 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
collectors/cpustatMetric.go
View File

@ -3,11 +3,12 @@ package collectors
import (
"encoding/json"
"fmt"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
"io/ioutil"
"strconv"
"strings"
"time"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
)
const CPUSTATFILE = `/proc/stat`
@ -89,5 +90,4 @@ func (m *CpustatCollector) Read(interval time.Duration, output chan lp.CCMetric)
func (m *CpustatCollector) Close() {
m.init = false
return
}

6
collectors/customCmdMetric.go
View File

@ -3,13 +3,14 @@ package collectors
import (
"encoding/json"
"errors"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
influx "github.com/influxdata/line-protocol"
"io/ioutil"
"log"
"os/exec"
"strings"
"time"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
influx "github.com/influxdata/line-protocol"
)
const CUSTOMCMDPATH = `/home/unrz139/Work/cc-metric-collector/collectors/custom`
@ -128,5 +129,4 @@ func (m *CustomCmdCollector) Read(interval time.Duration, output chan lp.CCMetri
func (m *CustomCmdCollector) Close() {
m.init = false
return
}

6
collectors/diskstatMetric.go
View File

@ -1,8 +1,10 @@
package collectors
import (
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
"io/ioutil"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
// "log"
"encoding/json"
"errors"
@ -108,10 +110,8 @@ func (m *DiskstatCollector) Read(interval time.Duration, output chan lp.CCMetric
}
}
}
return
}
func (m *DiskstatCollector) Close() {
m.init = false
return
}

9
collectors/gpfs.go → collectors/gpfsMetric.go
View File

@ -17,14 +17,12 @@ import (
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
)
type GpfsCollectorConfig struct {
Mmpmon string `json:"mmpmon"`
}
type GpfsCollector struct {
metricCollector
tags map[string]string
config GpfsCollectorConfig
config struct {
Mmpmon string `json:"mmpmon"`
}
}
func (m *GpfsCollector) Init(config json.RawMessage) error {
@ -243,5 +241,4 @@ func (m *GpfsCollector) Read(interval time.Duration, output chan lp.CCMetric) {
func (m *GpfsCollector) Close() {
m.init = false
return
}

1
collectors/infinibandMetric.go
View File

@ -240,5 +240,4 @@ func (m *InfinibandCollector) Read(interval time.Duration, output chan lp.CCMetr
func (m *InfinibandCollector) Close() {
m.init = false
return
}

4
collectors/ipmiMetric.go
View File

@ -3,13 +3,14 @@ package collectors
import (
"encoding/json"
"errors"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
"log"
"os"
"os/exec"
"strconv"
"strings"
"time"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
)
const IPMITOOL_PATH = `/usr/bin/ipmitool`
@ -138,5 +139,4 @@ func (m *IpmiCollector) Read(interval time.Duration, output chan lp.CCMetric) {
func (m *IpmiCollector) Close() {
m.init = false
return
}

6
collectors/likwidMetric.go
View File

@ -12,8 +12,6 @@ import (
"encoding/json"
"errors"
"fmt"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
"gopkg.in/Knetic/govaluate.v2"
"io/ioutil"
"log"
"math"
@ -22,6 +20,9 @@ import (
"strings"
"time"
"unsafe"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
"gopkg.in/Knetic/govaluate.v2"
)
type MetricScope int
@ -326,5 +327,4 @@ func (m *LikwidCollector) Close() {
C.perfmon_finalize()
C.topology_finalize()
}
return
}

4
collectors/loadavgMetric.go
View File

@ -2,11 +2,12 @@ package collectors
import (
"encoding/json"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
"io/ioutil"
"strconv"
"strings"
"time"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
)
const LOADAVGFILE = `/proc/loadavg`
@ -77,5 +78,4 @@ func (m *LoadavgCollector) Read(interval time.Duration, output chan lp.CCMetric)
func (m *LoadavgCollector) Close() {
m.init = false
return
}

4
collectors/lustreMetric.go
View File

@ -3,12 +3,13 @@ package collectors
import (
"encoding/json"
"errors"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
"io/ioutil"
"log"
"strconv"
"strings"
"time"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
)
const LUSTREFILE = `/proc/fs/lustre/llite/lnec-XXXXXX/stats`
@ -106,5 +107,4 @@ func (m *LustreCollector) Read(interval time.Duration, output chan lp.CCMetric)
func (m *LustreCollector) Close() {
m.init = false
return
}

4
collectors/memstatMetric.go
View File

@ -4,12 +4,13 @@ import (
"encoding/json"
"errors"
"fmt"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
"io/ioutil"
"log"
"strconv"
"strings"
"time"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
)
const MEMSTATFILE = `/proc/meminfo`
@ -126,5 +127,4 @@ func (m *MemstatCollector) Read(interval time.Duration, output chan lp.CCMetric)
func (m *MemstatCollector) Close() {
m.init = false
return
}

4
collectors/netstatMetric.go
View File

@ -2,12 +2,13 @@ package collectors
import (
"encoding/json"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
"io/ioutil"
"log"
"strconv"
"strings"
"time"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
)
const NETSTATFILE = `/proc/net/dev`
@ -91,5 +92,4 @@ func (m *NetstatCollector) Read(interval time.Duration, output chan lp.CCMetric)
func (m *NetstatCollector) Close() {
m.init = false
return
}

6
collectors/nvidiaMetric.go
View File

@ -4,10 +4,11 @@ import (
"encoding/json"
"errors"
"fmt"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
"github.com/NVIDIA/go-nvml/pkg/nvml"
"log"
"time"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
"github.com/NVIDIA/go-nvml/pkg/nvml"
)
type NvidiaCollectorConfig struct {
@ -271,5 +272,4 @@ func (m *NvidiaCollector) Close() {
nvml.Shutdown()
m.init = false
}
return
}

4
collectors/tempMetric.go
View File

@ -3,7 +3,6 @@ package collectors
import (
"encoding/json"
"fmt"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
"io/ioutil"
"log"
"os"
@ -11,6 +10,8 @@ import (
"strconv"
"strings"
"time"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
)
const HWMON_PATH = `/sys/class/hwmon`
@ -112,5 +113,4 @@ func (m *TempCollector) Read(interval time.Duration, output chan lp.CCMetric) {
func (m *TempCollector) Close() {
m.init = false
return
}

4
collectors/topprocsMetric.go
View File

@ -4,11 +4,12 @@ import (
"encoding/json"
"errors"
"fmt"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
"log"
"os/exec"
"strings"
"time"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
)
const MAX_NUM_PROCS = 10
@ -75,5 +76,4 @@ func (m *TopProcsCollector) Read(interval time.Duration, output chan lp.CCMetric
func (m *TopProcsCollector) Close() {
m.init = false
return
}

5
sinks/sinkManager.go
View File

@ -2,12 +2,12 @@ package sinks
import (
"encoding/json"
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
"log"
"os"
"sync"
)
lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
)
var AvailableSinks = map[string]Sink{
"influxdb": &InfluxSink{},
@ -129,7 +129,6 @@ func (sm *sinkManager) AddOutput(rawConfig json.RawMessage) error {
func (sm *sinkManager) Close() {
sm.done <- true
log.Print("[SinkManager] CLOSE")
return
}
func New(wg *sync.WaitGroup, sinkConfigFile string) (SinkManager, error) {

4
sinks/stdoutSink.go
View File

@ -66,6 +66,4 @@ func (s *StdoutSink) Flush() error {
return nil
}
func (s *StdoutSink) Close() {
return
}
func (s *StdoutSink) Close() {}