Merge branch 'develop' into channels

collectors/cpufreqCpuinfoMetric.go

@@ -3,14 +3,15 @@ package collectors
 import (
 	"bufio"
 	"encoding/json"
+
 	"fmt"
 	"log"
 	"os"
 	"strconv"
 	"strings"
 	"time"
-
 	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
+
 )
 
 //
@@ -150,6 +151,7 @@ func (m *CPUFreqCpuInfoCollector) Init(config json.RawMessage) error {
 	return nil
 }
 
+
 func (m *CPUFreqCpuInfoCollector) Read(interval time.Duration, output chan lp.CCMetric) {
 	if !m.init {
 		return

collectors/cpufreqMetric.go

@@ -10,7 +10,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
 	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
 	"golang.org/x/sys/unix"
 )

collectors/cpustatMetric.go

@@ -7,7 +7,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
 	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
 )
 

collectors/diskstatMetric.go

@@ -2,9 +2,7 @@ package collectors
 
 import (
 	"io/ioutil"
-
 	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
-
 	//	"log"
 	"encoding/json"
 	"errors"

collectors/gpfsMetric.go

@@ -13,18 +13,19 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
 	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
 )
 
 type GpfsCollector struct {
 	metricCollector
 	tags   map[string]string
+
 	config struct {
 		Mmpmon string `json:"mmpmon"`
 	}
 }
 
+
 func (m *GpfsCollector) Init(config json.RawMessage) error {
 	var err error
 	m.name = "GpfsCollector"
@@ -116,8 +117,10 @@ func (m *GpfsCollector) Read(interval time.Duration, output chan lp.CCMetric) {
 				fmt.Fprintf(os.Stderr, "GpfsCollector.Read(): Failed to get filesystem name.\n")
 				continue
 			}
+
 			m.tags["filesystem"] = filesystem
 
+
 			// return code
 			rc, err := strconv.Atoi(key_value["_rc_"])
 			if err != nil {
@@ -150,6 +153,7 @@ func (m *GpfsCollector) Read(interval time.Duration, output chan lp.CCMetric) {
 					key_value["_br_"], err.Error())
 				continue
 			}
+
 			y, err := lp.New("gpfs_bytes_read", m.tags, m.meta, map[string]interface{}{"value": bytesRead}, timestamp)
 			if err == nil {
 				output <- y
@@ -163,6 +167,7 @@ func (m *GpfsCollector) Read(interval time.Duration, output chan lp.CCMetric) {
 					key_value["_bw_"], err.Error())
 				continue
 			}
+
 			y, err = lp.New("gpfs_bytes_written", m.tags, m.meta, map[string]interface{}{"value": bytesWritten}, timestamp)
 			if err == nil {
 				output <- y

collectors/infinibandMetric.go

@@ -5,9 +5,7 @@ import (
 	"io/ioutil"
 	"log"
 	"os/exec"
-
 	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
-
 	//	"os"
 	"encoding/json"
 	"errors"
@@ -171,6 +169,26 @@ func (m *InfinibandCollector) doPerfQuery(cmd string, dev string, lid string, po
 				}
 			}
 		}
+		if strings.HasPrefix(line, "PortRcvPkts") || strings.HasPrefix(line, "RcvPkts") {
+			lv := strings.Fields(line)
+			v, err := strconv.ParseFloat(lv[1], 64)
+			if err == nil {
+				y, err := lp.New("ib_recv_pkts", tags, map[string]interface{}{"value": float64(v)}, time.Now())
+				if err == nil {
+					*out = append(*out, y)
+				}
+			}
+		}
+		if strings.HasPrefix(line, "PortXmitPkts") || strings.HasPrefix(line, "XmtPkts") {
+			lv := strings.Fields(line)
+			v, err := strconv.ParseFloat(lv[1], 64)
+			if err == nil {
+				y, err := lp.New("ib_xmit_pkts", tags, map[string]interface{}{"value": float64(v)}, time.Now())
+				if err == nil {
+					*out = append(*out, y)
+				}
+			}
+		}
 	}
 	return nil
 }
@@ -221,7 +239,6 @@ func (m *InfinibandCollector) doSysfsRead(dev string, lid string, port string, t
 			}
 		}
 	}
-
 	return nil
 }
 

collectors/ipmiMetric.go

@@ -9,7 +9,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
 	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
 )
 

collectors/likwidMetric.go

@@ -20,7 +20,6 @@ import (
 	"strings"
 	"time"
 	"unsafe"
-
 	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
 	"gopkg.in/Knetic/govaluate.v2"
 )

collectors/loadavgMetric.go

@@ -6,7 +6,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
 	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
 )
 

collectors/lustreMetric.go

@@ -8,7 +8,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
 	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
 )
 

collectors/memstatMetric.go

@@ -9,7 +9,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
 	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
 )
 

collectors/netstatMetric.go

@@ -7,7 +7,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
 	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
 )
 

collectors/nvidiaMetric.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"log"
 	"time"
-
 	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
 	"github.com/NVIDIA/go-nvml/pkg/nvml"
 )

collectors/tempMetric.go

@@ -10,7 +10,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
 	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
 )
 

collectors/topprocsMetric.go

@@ -8,7 +8,6 @@ import (
 	"os/exec"
 	"strings"
 	"time"
-
 	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
 )