mirror of
https://github.com/ClusterCockpit/cc-metric-collector.git
synced 2026-02-13 06:31:46 +01:00
Suggestions from the gocritic linter
This commit is contained in:
@@ -78,7 +78,7 @@ func (m *BeegfsMetaCollector) Init(config json.RawMessage) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//create map with possible variables
|
// Create map with possible variables
|
||||||
m.matches = make(map[string]string)
|
m.matches = make(map[string]string)
|
||||||
for _, value := range nodeMdstat_array {
|
for _, value := range nodeMdstat_array {
|
||||||
if slices.Contains(m.config.ExcludeMetrics, value) {
|
if slices.Contains(m.config.ExcludeMetrics, value) {
|
||||||
@@ -123,7 +123,7 @@ func (m *BeegfsMetaCollector) Read(interval time.Duration, output chan lp.CCMess
|
|||||||
if !m.init {
|
if !m.init {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
//get mounpoint
|
// Get mounpoint
|
||||||
buffer, _ := os.ReadFile(string("/proc/mounts"))
|
buffer, _ := os.ReadFile(string("/proc/mounts"))
|
||||||
mounts := strings.Split(string(buffer), "\n")
|
mounts := strings.Split(string(buffer), "\n")
|
||||||
var mountpoints []string
|
var mountpoints []string
|
||||||
|
|||||||
@@ -562,30 +562,30 @@ func (m *GpfsCollector) Read(interval time.Duration, output chan lp.CCMessage) {
|
|||||||
// compute total metrics (map[...] will return 0 if key not found)
|
// compute total metrics (map[...] will return 0 if key not found)
|
||||||
// bytes read and written
|
// bytes read and written
|
||||||
if br, br_ok := newstate["_br_"]; br_ok {
|
if br, br_ok := newstate["_br_"]; br_ok {
|
||||||
newstate["bytesTotal"] = newstate["bytesTotal"] + br
|
newstate["bytesTotal"] += br
|
||||||
}
|
}
|
||||||
if bw, bw_ok := newstate["_bw_"]; bw_ok {
|
if bw, bw_ok := newstate["_bw_"]; bw_ok {
|
||||||
newstate["bytesTotal"] = newstate["bytesTotal"] + bw
|
newstate["bytesTotal"] += bw
|
||||||
}
|
}
|
||||||
// read and write count
|
// read and write count
|
||||||
if rdc, rdc_ok := newstate["_rdc_"]; rdc_ok {
|
if rdc, rdc_ok := newstate["_rdc_"]; rdc_ok {
|
||||||
newstate["iops"] = newstate["iops"] + rdc
|
newstate["iops"] += rdc
|
||||||
}
|
}
|
||||||
if wc, wc_ok := newstate["_wc_"]; wc_ok {
|
if wc, wc_ok := newstate["_wc_"]; wc_ok {
|
||||||
newstate["iops"] = newstate["iops"] + wc
|
newstate["iops"] += wc
|
||||||
}
|
}
|
||||||
// meta operations
|
// meta operations
|
||||||
if oc, oc_ok := newstate["_oc_"]; oc_ok {
|
if oc, oc_ok := newstate["_oc_"]; oc_ok {
|
||||||
newstate["metaops"] = newstate["metaops"] + oc
|
newstate["metaops"] += oc
|
||||||
}
|
}
|
||||||
if cc, cc_ok := newstate["_cc_"]; cc_ok {
|
if cc, cc_ok := newstate["_cc_"]; cc_ok {
|
||||||
newstate["metaops"] = newstate["metaops"] + cc
|
newstate["metaops"] += cc
|
||||||
}
|
}
|
||||||
if dir, dir_ok := newstate["_dir_"]; dir_ok {
|
if dir, dir_ok := newstate["_dir_"]; dir_ok {
|
||||||
newstate["metaops"] = newstate["metaops"] + dir
|
newstate["metaops"] += dir
|
||||||
}
|
}
|
||||||
if iu, iu_ok := newstate["_iu_"]; iu_ok {
|
if iu, iu_ok := newstate["_iu_"]; iu_ok {
|
||||||
newstate["metaops"] = newstate["metaops"] + iu
|
newstate["metaops"] += iu
|
||||||
}
|
}
|
||||||
// send desired metrics for this filesystem
|
// send desired metrics for this filesystem
|
||||||
for _, metric := range m.definitions {
|
for _, metric := range m.definitions {
|
||||||
|
|||||||
@@ -1022,7 +1022,7 @@ func readNVLinkStats(device *NvidiaCollectorDevice, output chan lp.CCMessage) er
|
|||||||
if !device.excludeMetrics["nv_nvlink_crc_errors"] {
|
if !device.excludeMetrics["nv_nvlink_crc_errors"] {
|
||||||
// Data link receive data CRC error counter
|
// Data link receive data CRC error counter
|
||||||
count, ret := nvml.DeviceGetNvLinkErrorCounter(device.device, i, nvml.NVLINK_ERROR_DL_CRC_DATA)
|
count, ret := nvml.DeviceGetNvLinkErrorCounter(device.device, i, nvml.NVLINK_ERROR_DL_CRC_DATA)
|
||||||
aggregate_crc_errors = aggregate_crc_errors + count
|
aggregate_crc_errors += count
|
||||||
if ret == nvml.SUCCESS {
|
if ret == nvml.SUCCESS {
|
||||||
y, err := lp.NewMessage("nv_nvlink_crc_errors", device.tags, device.meta, map[string]any{"value": count}, time.Now())
|
y, err := lp.NewMessage("nv_nvlink_crc_errors", device.tags, device.meta, map[string]any{"value": count}, time.Now())
|
||||||
if err == nil {
|
if err == nil {
|
||||||
@@ -1035,7 +1035,7 @@ func readNVLinkStats(device *NvidiaCollectorDevice, output chan lp.CCMessage) er
|
|||||||
if !device.excludeMetrics["nv_nvlink_ecc_errors"] {
|
if !device.excludeMetrics["nv_nvlink_ecc_errors"] {
|
||||||
// Data link receive data ECC error counter
|
// Data link receive data ECC error counter
|
||||||
count, ret := nvml.DeviceGetNvLinkErrorCounter(device.device, i, nvml.NVLINK_ERROR_DL_ECC_DATA)
|
count, ret := nvml.DeviceGetNvLinkErrorCounter(device.device, i, nvml.NVLINK_ERROR_DL_ECC_DATA)
|
||||||
aggregate_ecc_errors = aggregate_ecc_errors + count
|
aggregate_ecc_errors += count
|
||||||
if ret == nvml.SUCCESS {
|
if ret == nvml.SUCCESS {
|
||||||
y, err := lp.NewMessage("nv_nvlink_ecc_errors", device.tags, device.meta, map[string]any{"value": count}, time.Now())
|
y, err := lp.NewMessage("nv_nvlink_ecc_errors", device.tags, device.meta, map[string]any{"value": count}, time.Now())
|
||||||
if err == nil {
|
if err == nil {
|
||||||
@@ -1048,7 +1048,7 @@ func readNVLinkStats(device *NvidiaCollectorDevice, output chan lp.CCMessage) er
|
|||||||
if !device.excludeMetrics["nv_nvlink_replay_errors"] {
|
if !device.excludeMetrics["nv_nvlink_replay_errors"] {
|
||||||
// Data link transmit replay error counter
|
// Data link transmit replay error counter
|
||||||
count, ret := nvml.DeviceGetNvLinkErrorCounter(device.device, i, nvml.NVLINK_ERROR_DL_REPLAY)
|
count, ret := nvml.DeviceGetNvLinkErrorCounter(device.device, i, nvml.NVLINK_ERROR_DL_REPLAY)
|
||||||
aggregate_replay_errors = aggregate_replay_errors + count
|
aggregate_replay_errors += count
|
||||||
if ret == nvml.SUCCESS {
|
if ret == nvml.SUCCESS {
|
||||||
y, err := lp.NewMessage("nv_nvlink_replay_errors", device.tags, device.meta, map[string]any{"value": count}, time.Now())
|
y, err := lp.NewMessage("nv_nvlink_replay_errors", device.tags, device.meta, map[string]any{"value": count}, time.Now())
|
||||||
if err == nil {
|
if err == nil {
|
||||||
@@ -1061,7 +1061,7 @@ func readNVLinkStats(device *NvidiaCollectorDevice, output chan lp.CCMessage) er
|
|||||||
if !device.excludeMetrics["nv_nvlink_recovery_errors"] {
|
if !device.excludeMetrics["nv_nvlink_recovery_errors"] {
|
||||||
// Data link transmit recovery error counter
|
// Data link transmit recovery error counter
|
||||||
count, ret := nvml.DeviceGetNvLinkErrorCounter(device.device, i, nvml.NVLINK_ERROR_DL_RECOVERY)
|
count, ret := nvml.DeviceGetNvLinkErrorCounter(device.device, i, nvml.NVLINK_ERROR_DL_RECOVERY)
|
||||||
aggregate_recovery_errors = aggregate_recovery_errors + count
|
aggregate_recovery_errors += count
|
||||||
if ret == nvml.SUCCESS {
|
if ret == nvml.SUCCESS {
|
||||||
y, err := lp.NewMessage("nv_nvlink_recovery_errors", device.tags, device.meta, map[string]any{"value": count}, time.Now())
|
y, err := lp.NewMessage("nv_nvlink_recovery_errors", device.tags, device.meta, map[string]any{"value": count}, time.Now())
|
||||||
if err == nil {
|
if err == nil {
|
||||||
@@ -1074,7 +1074,7 @@ func readNVLinkStats(device *NvidiaCollectorDevice, output chan lp.CCMessage) er
|
|||||||
if !device.excludeMetrics["nv_nvlink_crc_flit_errors"] {
|
if !device.excludeMetrics["nv_nvlink_crc_flit_errors"] {
|
||||||
// Data link receive flow control digit CRC error counter
|
// Data link receive flow control digit CRC error counter
|
||||||
count, ret := nvml.DeviceGetNvLinkErrorCounter(device.device, i, nvml.NVLINK_ERROR_DL_CRC_FLIT)
|
count, ret := nvml.DeviceGetNvLinkErrorCounter(device.device, i, nvml.NVLINK_ERROR_DL_CRC_FLIT)
|
||||||
aggregate_crc_flit_errors = aggregate_crc_flit_errors + count
|
aggregate_crc_flit_errors += count
|
||||||
if ret == nvml.SUCCESS {
|
if ret == nvml.SUCCESS {
|
||||||
y, err := lp.NewMessage("nv_nvlink_crc_flit_errors", device.tags, device.meta, map[string]any{"value": count}, time.Now())
|
y, err := lp.NewMessage("nv_nvlink_crc_flit_errors", device.tags, device.meta, map[string]any{"value": count}, time.Now())
|
||||||
if err == nil {
|
if err == nil {
|
||||||
|
|||||||
@@ -137,7 +137,6 @@ func (c *metricAggregator) Eval(starttime time.Time, endtime time.Time, metrics
|
|||||||
matches := make([]lp.CCMessage, 0)
|
matches := make([]lp.CCMessage, 0)
|
||||||
for _, m := range metrics {
|
for _, m := range metrics {
|
||||||
vars["metric"] = m
|
vars["metric"] = m
|
||||||
//value, err := gval.Evaluate(f.Condition, vars, c.language)
|
|
||||||
value, err := f.gvalCond.EvalBool(context.Background(), vars)
|
value, err := f.gvalCond.EvalBool(context.Background(), vars)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
cclog.ComponentError("MetricCache", "COLLECT", f.Name, "COND", f.Condition, ":", err.Error())
|
cclog.ComponentError("MetricCache", "COLLECT", f.Name, "COND", f.Condition, ":", err.Error())
|
||||||
|
|||||||
@@ -137,12 +137,12 @@ func (c *metricCache) Add(metric lp.CCMessage) {
|
|||||||
p := c.intervals[c.curPeriod]
|
p := c.intervals[c.curPeriod]
|
||||||
if p.numMetrics < p.sizeMetrics {
|
if p.numMetrics < p.sizeMetrics {
|
||||||
p.metrics[p.numMetrics] = metric
|
p.metrics[p.numMetrics] = metric
|
||||||
p.numMetrics = p.numMetrics + 1
|
p.numMetrics++
|
||||||
p.stopstamp = metric.Time()
|
p.stopstamp = metric.Time()
|
||||||
} else {
|
} else {
|
||||||
p.metrics = append(p.metrics, metric)
|
p.metrics = append(p.metrics, metric)
|
||||||
p.numMetrics = p.numMetrics + 1
|
p.numMetrics++
|
||||||
p.sizeMetrics = p.sizeMetrics + 1
|
p.sizeMetrics++
|
||||||
p.stopstamp = metric.Time()
|
p.stopstamp = metric.Time()
|
||||||
}
|
}
|
||||||
c.lock.Unlock()
|
c.lock.Unlock()
|
||||||
|
|||||||
Reference in New Issue
Block a user