2022-02-03 16:52:55 +01:00
|
|
|
package metricAggregator
|
2022-01-30 15:03:21 +01:00
|
|
|
|
|
|
|
import (
|
|
|
|
"errors"
|
|
|
|
"fmt"
|
|
|
|
"regexp"
|
|
|
|
"strings"
|
|
|
|
|
2023-08-29 14:12:49 +02:00
|
|
|
"golang.org/x/exp/slices"
|
|
|
|
|
2022-10-10 11:53:11 +02:00
|
|
|
topo "github.com/ClusterCockpit/cc-metric-collector/pkg/ccTopology"
|
2022-01-30 15:03:21 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Arithmetic functions on value arrays
|
|
|
|
*/
|
|
|
|
|
2023-08-29 14:12:49 +02:00
|
|
|
func sumAnyType[T float64 | float32 | int | int32 | int64](values []T) (T, error) {
|
|
|
|
if len(values) == 0 {
|
|
|
|
return 0.0, errors.New("sum function requires at least one argument")
|
|
|
|
}
|
|
|
|
var sum T
|
|
|
|
for _, value := range values {
|
|
|
|
sum += value
|
|
|
|
}
|
|
|
|
return sum, nil
|
|
|
|
}
|
|
|
|
|
2022-01-30 15:03:21 +01:00
|
|
|
// Sum up values
|
2023-08-29 14:12:49 +02:00
|
|
|
func sumfunc(args interface{}) (interface{}, error) {
|
|
|
|
|
|
|
|
var err error
|
|
|
|
switch values := args.(type) {
|
|
|
|
case []float64:
|
|
|
|
return sumAnyType(values)
|
|
|
|
case []float32:
|
|
|
|
return sumAnyType(values)
|
|
|
|
case []int:
|
|
|
|
return sumAnyType(values)
|
|
|
|
case []int64:
|
|
|
|
return sumAnyType(values)
|
|
|
|
case []int32:
|
|
|
|
return sumAnyType(values)
|
|
|
|
default:
|
|
|
|
err = errors.New("function 'sum' only on list of values (float64, float32, int, int32, int64)")
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0.0, err
|
|
|
|
}
|
|
|
|
|
|
|
|
func minAnyType[T float64 | float32 | int | int32 | int64](values []T) (T, error) {
|
|
|
|
if len(values) == 0 {
|
|
|
|
return 0.0, errors.New("min function requires at least one argument")
|
2022-01-30 15:03:21 +01:00
|
|
|
}
|
2023-08-29 14:12:49 +02:00
|
|
|
return slices.Min(values), nil
|
2022-01-30 15:03:21 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Get the minimum value
|
2023-08-29 14:12:49 +02:00
|
|
|
func minfunc(args interface{}) (interface{}, error) {
|
|
|
|
switch values := args.(type) {
|
2022-01-30 15:03:21 +01:00
|
|
|
case []float64:
|
2023-08-29 14:12:49 +02:00
|
|
|
return minAnyType(values)
|
2022-01-30 15:03:21 +01:00
|
|
|
case []float32:
|
2023-08-29 14:12:49 +02:00
|
|
|
return minAnyType(values)
|
2022-01-30 15:03:21 +01:00
|
|
|
case []int:
|
2023-08-29 14:12:49 +02:00
|
|
|
return minAnyType(values)
|
2022-01-30 15:03:21 +01:00
|
|
|
case []int64:
|
2023-08-29 14:12:49 +02:00
|
|
|
return minAnyType(values)
|
2022-01-30 15:03:21 +01:00
|
|
|
case []int32:
|
2023-08-29 14:12:49 +02:00
|
|
|
return minAnyType(values)
|
2022-01-30 15:03:21 +01:00
|
|
|
default:
|
2023-08-29 14:12:49 +02:00
|
|
|
return 0.0, errors.New("function 'min' only on list of values (float64, float32, int, int32, int64)")
|
2022-01-30 15:03:21 +01:00
|
|
|
}
|
2023-08-29 14:12:49 +02:00
|
|
|
}
|
2022-01-30 15:03:21 +01:00
|
|
|
|
2023-08-29 14:12:49 +02:00
|
|
|
func avgAnyType[T float64 | float32 | int | int32 | int64](values []T) (float64, error) {
|
|
|
|
if len(values) == 0 {
|
|
|
|
return 0.0, errors.New("average function requires at least one argument")
|
|
|
|
}
|
|
|
|
sum, err := sumAnyType[T](values)
|
|
|
|
return float64(sum) / float64(len(values)), err
|
2022-01-30 15:03:21 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Get the average or mean value
|
2023-08-29 14:12:49 +02:00
|
|
|
func avgfunc(args interface{}) (interface{}, error) {
|
|
|
|
switch values := args.(type) {
|
2022-01-30 15:03:21 +01:00
|
|
|
case []float64:
|
2023-08-29 14:12:49 +02:00
|
|
|
return avgAnyType(values)
|
2022-01-30 15:03:21 +01:00
|
|
|
case []float32:
|
2023-08-29 14:12:49 +02:00
|
|
|
return avgAnyType(values)
|
2022-01-30 15:03:21 +01:00
|
|
|
case []int:
|
2023-08-29 14:12:49 +02:00
|
|
|
return avgAnyType(values)
|
2022-01-30 15:03:21 +01:00
|
|
|
case []int64:
|
2023-08-29 14:12:49 +02:00
|
|
|
return avgAnyType(values)
|
|
|
|
case []int32:
|
|
|
|
return avgAnyType(values)
|
|
|
|
default:
|
|
|
|
return 0.0, errors.New("function 'average' only on list of values (float64, float32, int, int32, int64)")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func maxAnyType[T float64 | float32 | int | int32 | int64](values []T) (T, error) {
|
|
|
|
if len(values) == 0 {
|
|
|
|
return 0.0, errors.New("max function requires at least one argument")
|
2022-01-30 15:03:21 +01:00
|
|
|
}
|
2023-08-29 14:12:49 +02:00
|
|
|
return slices.Max(values), nil
|
2022-01-30 15:03:21 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Get the maximum value
|
2023-08-29 14:12:49 +02:00
|
|
|
func maxfunc(args interface{}) (interface{}, error) {
|
|
|
|
switch values := args.(type) {
|
|
|
|
case []float64:
|
|
|
|
return maxAnyType(values)
|
|
|
|
case []float32:
|
|
|
|
return maxAnyType(values)
|
|
|
|
case []int:
|
|
|
|
return maxAnyType(values)
|
|
|
|
case []int64:
|
|
|
|
return maxAnyType(values)
|
|
|
|
case []int32:
|
|
|
|
return maxAnyType(values)
|
|
|
|
default:
|
|
|
|
return 0.0, errors.New("function 'max' only on list of values (float64, float32, int, int32, int64)")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func medianAnyType[T float64 | float32 | int | int32 | int64](values []T) (T, error) {
|
|
|
|
if len(values) == 0 {
|
|
|
|
return 0.0, errors.New("median function requires at least one argument")
|
|
|
|
}
|
|
|
|
slices.Sort(values)
|
|
|
|
var median T
|
|
|
|
if midPoint := len(values) % 2; midPoint == 0 {
|
|
|
|
median = (values[midPoint-1] + values[midPoint]) / 2
|
|
|
|
} else {
|
|
|
|
median = values[midPoint]
|
2022-01-30 15:03:21 +01:00
|
|
|
}
|
2023-08-29 14:12:49 +02:00
|
|
|
return median, nil
|
2022-01-30 15:03:21 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Get the median value
|
2023-08-29 14:12:49 +02:00
|
|
|
func medianfunc(args interface{}) (interface{}, error) {
|
|
|
|
switch values := args.(type) {
|
2022-01-30 15:03:21 +01:00
|
|
|
case []float64:
|
2023-08-29 14:12:49 +02:00
|
|
|
return medianAnyType(values)
|
|
|
|
case []float32:
|
|
|
|
return medianAnyType(values)
|
2022-01-30 15:03:21 +01:00
|
|
|
case []int:
|
2023-08-29 14:12:49 +02:00
|
|
|
return medianAnyType(values)
|
|
|
|
case []int64:
|
|
|
|
return medianAnyType(values)
|
|
|
|
case []int32:
|
|
|
|
return medianAnyType(values)
|
|
|
|
default:
|
|
|
|
return 0.0, errors.New("function 'median' only on list of values (float64, float32, int, int32, int64)")
|
2022-01-30 15:03:21 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get number of values in list. Returns always an int
|
|
|
|
*/
|
|
|
|
|
2023-08-29 14:12:49 +02:00
|
|
|
func lenfunc(args interface{}) (interface{}, error) {
|
2022-01-30 15:03:21 +01:00
|
|
|
var err error = nil
|
|
|
|
var length int = 0
|
2023-08-29 14:12:49 +02:00
|
|
|
switch values := args.(type) {
|
2022-01-30 15:03:21 +01:00
|
|
|
case []float64:
|
|
|
|
length = len(values)
|
|
|
|
case []float32:
|
|
|
|
length = len(values)
|
|
|
|
case []int:
|
|
|
|
length = len(values)
|
|
|
|
case []int64:
|
|
|
|
length = len(values)
|
|
|
|
case []int32:
|
|
|
|
length = len(values)
|
|
|
|
case float64:
|
|
|
|
err = errors.New("function 'len' can only be applied on arrays and strings")
|
|
|
|
case float32:
|
|
|
|
err = errors.New("function 'len' can only be applied on arrays and strings")
|
|
|
|
case int:
|
|
|
|
err = errors.New("function 'len' can only be applied on arrays and strings")
|
|
|
|
case int64:
|
|
|
|
err = errors.New("function 'len' can only be applied on arrays and strings")
|
|
|
|
case string:
|
|
|
|
length = len(values)
|
|
|
|
}
|
|
|
|
return length, err
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check if a values is in a list
|
|
|
|
* In constrast to most of the other functions, this one is an infix operator for
|
|
|
|
* - substring matching: `"abc" in "abcdef"` -> true
|
|
|
|
* - substring matching with int casting: `3 in "abd3"` -> true
|
|
|
|
* - search for an int in an int list: `3 in getCpuList()` -> true (if you have more than 4 CPU hardware threads)
|
|
|
|
*/
|
|
|
|
|
|
|
|
func infunc(a interface{}, b interface{}) (interface{}, error) {
|
|
|
|
switch match := a.(type) {
|
|
|
|
case string:
|
|
|
|
switch total := b.(type) {
|
|
|
|
case string:
|
|
|
|
return strings.Contains(total, match), nil
|
|
|
|
}
|
|
|
|
case int:
|
|
|
|
switch total := b.(type) {
|
|
|
|
case []int:
|
|
|
|
for _, x := range total {
|
|
|
|
if x == match {
|
|
|
|
return true, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
case string:
|
|
|
|
smatch := fmt.Sprintf("%d", match)
|
|
|
|
return strings.Contains(total, smatch), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
return false, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Regex matching of strings (metric name, tag keys, tag values, meta keys, meta values)
|
|
|
|
* Since we cannot use \ inside JSON strings without escaping, we use % instead for the
|
|
|
|
* format keys \d = %d, \w = %d, ... Not sure how to fix this
|
|
|
|
*/
|
|
|
|
|
|
|
|
func matchfunc(args ...interface{}) (interface{}, error) {
|
|
|
|
switch match := args[0].(type) {
|
|
|
|
case string:
|
|
|
|
switch total := args[1].(type) {
|
|
|
|
case string:
|
|
|
|
smatch := strings.Replace(match, "%", "\\", -1)
|
|
|
|
regex, err := regexp.Compile(smatch)
|
|
|
|
if err != nil {
|
|
|
|
return false, err
|
|
|
|
}
|
|
|
|
s := regex.Find([]byte(total))
|
|
|
|
return s != nil, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* System topology getter functions
|
|
|
|
*/
|
|
|
|
|
|
|
|
// for a given cpuid, it returns the core id
|
2023-08-29 14:12:49 +02:00
|
|
|
func getCpuCoreFunc(args interface{}) (interface{}, error) {
|
|
|
|
switch cpuid := args.(type) {
|
2022-01-30 15:03:21 +01:00
|
|
|
case int:
|
2022-05-13 14:28:07 +02:00
|
|
|
return topo.GetHwthreadCore(cpuid), nil
|
2022-01-30 15:03:21 +01:00
|
|
|
}
|
|
|
|
return -1, errors.New("function 'getCpuCore' accepts only an 'int' cpuid")
|
|
|
|
}
|
|
|
|
|
|
|
|
// for a given cpuid, it returns the socket id
|
2023-08-29 14:12:49 +02:00
|
|
|
func getCpuSocketFunc(args interface{}) (interface{}, error) {
|
|
|
|
switch cpuid := args.(type) {
|
2022-01-30 15:03:21 +01:00
|
|
|
case int:
|
2022-05-13 14:28:07 +02:00
|
|
|
return topo.GetHwthreadSocket(cpuid), nil
|
2022-01-30 15:03:21 +01:00
|
|
|
}
|
|
|
|
return -1, errors.New("function 'getCpuCore' accepts only an 'int' cpuid")
|
|
|
|
}
|
|
|
|
|
|
|
|
// for a given cpuid, it returns the id of the NUMA node
|
2023-08-29 14:12:49 +02:00
|
|
|
func getCpuNumaDomainFunc(args interface{}) (interface{}, error) {
|
|
|
|
switch cpuid := args.(type) {
|
2022-01-30 15:03:21 +01:00
|
|
|
case int:
|
2022-05-13 14:28:07 +02:00
|
|
|
return topo.GetHwthreadNumaDomain(cpuid), nil
|
2022-01-30 15:03:21 +01:00
|
|
|
}
|
|
|
|
return -1, errors.New("function 'getCpuNuma' accepts only an 'int' cpuid")
|
|
|
|
}
|
|
|
|
|
|
|
|
// for a given cpuid, it returns the id of the CPU die
|
2023-08-29 14:12:49 +02:00
|
|
|
func getCpuDieFunc(args interface{}) (interface{}, error) {
|
|
|
|
switch cpuid := args.(type) {
|
2022-01-30 15:03:21 +01:00
|
|
|
case int:
|
2022-05-13 14:28:07 +02:00
|
|
|
return topo.GetHwthreadDie(cpuid), nil
|
2022-01-30 15:03:21 +01:00
|
|
|
}
|
|
|
|
return -1, errors.New("function 'getCpuDie' accepts only an 'int' cpuid")
|
|
|
|
}
|
|
|
|
|
|
|
|
// for a given core id, it returns the list of cpuids
|
2023-08-29 14:12:49 +02:00
|
|
|
func getCpuListOfCoreFunc(args interface{}) (interface{}, error) {
|
2022-01-30 15:03:21 +01:00
|
|
|
cpulist := make([]int, 0)
|
2023-08-29 14:12:49 +02:00
|
|
|
switch in := args.(type) {
|
2022-01-30 15:03:21 +01:00
|
|
|
case int:
|
|
|
|
for _, c := range topo.CpuData() {
|
|
|
|
if c.Core == in {
|
Merge develop into main (#109)
* Add cpu_used (all-cpu_idle) to CpustatCollector
* Update to line-protocol/v2
* Update runonce.yml with Golang 1.20
* Update fsnotify in LIKWID Collector
* Use not a pointer to line-protocol.Encoder
* Simplify Makefile
* Use only as many arguments as required
* Allow sum function to handle non float types
* Allow values to be a slice of type float64, float32, int, int64, int32, bool
* Use generic function to simplify code
* Add missing case for type []int32
* Use generic function to compute minimum
* Use generic function to compute maximum
* Use generic function to compute average
* Add error value to sumAnyType
* Use generic function to compute median
* For older versions of go slices is not part of the installation
* Remove old entries from go.sum
* Use simpler sort function
* Compute metrics ib_total and ib_total_pkts
* Add aggregated metrics.
Add missing units
* Update likwidMetric.go
Fixes a potential bug when `fsnotify.NewWatcher()` fails with an error
* Completly avoid memory allocations in infinibandMetric read()
* Fixed initialization: Initalization and measurements should run in the same thread
* Add safe.directory to Release action
* Fix path after installation to /usr/bin after installation
* ioutil.ReadFile is deprecated: As of Go 1.16, this function simply calls os.ReadFile
* Switch to package slices from the golang 1.21 default library
* Read file line by line
* Read file line by line
* Read file line by line
* Use CamelCase
* Use CamelCase
* Fix function getNumaDomain, it always returned 0
* Avoid type conversion by using Atoi
Avoid copying structs by using pointer access
Increase readability with CamelCase variable names
* Add caching
* Cache CpuData
* Cleanup
* Use init function to initalize cache structure to avoid multi threading problems
* Reuse information from /proc/cpuinfo
* Avoid slice cloning. Directly use the cache
* Add DieList
* Add NumaDomainList and SMTList
* Cleanup
* Add comment
* Lookup core ID from /sys/devices/system/cpu, /proc/cpuinfo is not portable
* Lookup all information from /sys/devices/system/cpu, /proc/cpuinfo is not portable
* Correctly handle lists from /sys
* Add Simultaneous Multithreading siblings
* Replace deprecated thread_siblings_list by core_cpus_list
* Reduce number of required slices
* Allow to send total values per core, socket and node
* Send all metrics with same time stamp
calcEventsetMetrics does only computiation, counter measurement is done before
* Input parameters should be float64 when evaluating to float64
* Send all metrics with same time stamp
calcGlobalMetrics does only computiation, counter measurement is done before
* Remove unused variable gmresults
* Add comments
* Updated go packages
* Add build with golang 1.21
* Switch to checkout action version 4
* Switch to setup-go action version 4
* Add workflow_dispatch to allow manual run of workflow
* Add workflow_dispatch to allow manual run of workflow
* Add release build jobs to runonce.yml
* Switch to golang 1.20 for RHEL based distributions
* Use dnf to download golang
* Remove golang versions before 1.20
* Upgrade Ubuntu focal -> jammy
* Pipe golang tar package directly to tar
* Update golang version
* Fix Ubuntu version number
* Add links to ipmi and redfish receivers
* Fix http server addr format
* github.com/influxdata/line-protocol -> github.com/influxdata/line-protocol/v2/lineprotocol
* Corrected spelling
* Add some comments
* github.com/influxdata/line-protocol -> github.com/influxdata/line-protocol/v2/lineprotocol
* Allow other fields not only field "value"
* Add some basic debugging documentation
* Add some basic debugging documentation
* Use a lock for the flush timer
* Add tags in lexical order as required by AddTag()
* Only access meta data, when it gets used as tag
* Use slice to store lexialicly orderd key value pairs
* Increase golang version requirement to 1.20.
* Avoid package cmp to allow builds with golang v1.20
* Fix: Error NVML library not found did crash
cc-metric-collector with "SIGSEGV: segmentation violation"
* Add config option idle_timeout
* Add basic authentication support
* Add basic authentication support
* Avoid unneccessary memory allocations
* Add documentation for send_*_total values
* Use generic package maps to clone maps
* Reuse flush timer
* Add Influx client options
* Reuse ccTopology functionality
* Do not store unused topology information
* Add batch_size config
* Cleanup
* Use stype and stype-id for the NIC in NetstatCollector
* Wait for concurrent flush operations to finish
* Be more verbose in error messages
* Reverted previous changes.
Made the code to complex without much advantages
* Use line protocol encoder
* Go pkg update
* Stop flush timer, when immediatelly flushing
* Fix: Corrected unlock access to batch slice
* Add config option to specify whether to use GZip compression in influx write requests
* Add asynchron send of encoder metrics
* Use DefaultServeMux instead of github.com/gorilla/mux
* Add config option for HTTP keep-alives
* Be more strict, when parsing json
* Add config option for HTTP request timeout and Retry interval
* Allow more then one background send operation
* Fix %sysusers_create_package args (#108)
%sysusers_create_package requires two arguments. See: https://github.com/systemd/systemd/blob/main/src/rpm/macros.systemd.in#L165
* Add nfsiostat to list of collectors
---------
Co-authored-by: Holger Obermaier <40787752+ho-ob@users.noreply.github.com>
Co-authored-by: Holger Obermaier <holgerob@gmx.de>
Co-authored-by: Obihörnchen <obihoernchende@gmail.com>
2023-12-04 12:21:26 +01:00
|
|
|
cpulist = append(cpulist, c.CpuID)
|
2022-01-30 15:03:21 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return cpulist, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// for a given socket id, it returns the list of cpuids
|
2023-08-29 14:12:49 +02:00
|
|
|
func getCpuListOfSocketFunc(args interface{}) (interface{}, error) {
|
2022-01-30 15:03:21 +01:00
|
|
|
cpulist := make([]int, 0)
|
2023-08-29 14:12:49 +02:00
|
|
|
switch in := args.(type) {
|
2022-01-30 15:03:21 +01:00
|
|
|
case int:
|
|
|
|
for _, c := range topo.CpuData() {
|
|
|
|
if c.Socket == in {
|
Merge develop into main (#109)
* Add cpu_used (all-cpu_idle) to CpustatCollector
* Update to line-protocol/v2
* Update runonce.yml with Golang 1.20
* Update fsnotify in LIKWID Collector
* Use not a pointer to line-protocol.Encoder
* Simplify Makefile
* Use only as many arguments as required
* Allow sum function to handle non float types
* Allow values to be a slice of type float64, float32, int, int64, int32, bool
* Use generic function to simplify code
* Add missing case for type []int32
* Use generic function to compute minimum
* Use generic function to compute maximum
* Use generic function to compute average
* Add error value to sumAnyType
* Use generic function to compute median
* For older versions of go slices is not part of the installation
* Remove old entries from go.sum
* Use simpler sort function
* Compute metrics ib_total and ib_total_pkts
* Add aggregated metrics.
Add missing units
* Update likwidMetric.go
Fixes a potential bug when `fsnotify.NewWatcher()` fails with an error
* Completly avoid memory allocations in infinibandMetric read()
* Fixed initialization: Initalization and measurements should run in the same thread
* Add safe.directory to Release action
* Fix path after installation to /usr/bin after installation
* ioutil.ReadFile is deprecated: As of Go 1.16, this function simply calls os.ReadFile
* Switch to package slices from the golang 1.21 default library
* Read file line by line
* Read file line by line
* Read file line by line
* Use CamelCase
* Use CamelCase
* Fix function getNumaDomain, it always returned 0
* Avoid type conversion by using Atoi
Avoid copying structs by using pointer access
Increase readability with CamelCase variable names
* Add caching
* Cache CpuData
* Cleanup
* Use init function to initalize cache structure to avoid multi threading problems
* Reuse information from /proc/cpuinfo
* Avoid slice cloning. Directly use the cache
* Add DieList
* Add NumaDomainList and SMTList
* Cleanup
* Add comment
* Lookup core ID from /sys/devices/system/cpu, /proc/cpuinfo is not portable
* Lookup all information from /sys/devices/system/cpu, /proc/cpuinfo is not portable
* Correctly handle lists from /sys
* Add Simultaneous Multithreading siblings
* Replace deprecated thread_siblings_list by core_cpus_list
* Reduce number of required slices
* Allow to send total values per core, socket and node
* Send all metrics with same time stamp
calcEventsetMetrics does only computiation, counter measurement is done before
* Input parameters should be float64 when evaluating to float64
* Send all metrics with same time stamp
calcGlobalMetrics does only computiation, counter measurement is done before
* Remove unused variable gmresults
* Add comments
* Updated go packages
* Add build with golang 1.21
* Switch to checkout action version 4
* Switch to setup-go action version 4
* Add workflow_dispatch to allow manual run of workflow
* Add workflow_dispatch to allow manual run of workflow
* Add release build jobs to runonce.yml
* Switch to golang 1.20 for RHEL based distributions
* Use dnf to download golang
* Remove golang versions before 1.20
* Upgrade Ubuntu focal -> jammy
* Pipe golang tar package directly to tar
* Update golang version
* Fix Ubuntu version number
* Add links to ipmi and redfish receivers
* Fix http server addr format
* github.com/influxdata/line-protocol -> github.com/influxdata/line-protocol/v2/lineprotocol
* Corrected spelling
* Add some comments
* github.com/influxdata/line-protocol -> github.com/influxdata/line-protocol/v2/lineprotocol
* Allow other fields not only field "value"
* Add some basic debugging documentation
* Add some basic debugging documentation
* Use a lock for the flush timer
* Add tags in lexical order as required by AddTag()
* Only access meta data, when it gets used as tag
* Use slice to store lexialicly orderd key value pairs
* Increase golang version requirement to 1.20.
* Avoid package cmp to allow builds with golang v1.20
* Fix: Error NVML library not found did crash
cc-metric-collector with "SIGSEGV: segmentation violation"
* Add config option idle_timeout
* Add basic authentication support
* Add basic authentication support
* Avoid unneccessary memory allocations
* Add documentation for send_*_total values
* Use generic package maps to clone maps
* Reuse flush timer
* Add Influx client options
* Reuse ccTopology functionality
* Do not store unused topology information
* Add batch_size config
* Cleanup
* Use stype and stype-id for the NIC in NetstatCollector
* Wait for concurrent flush operations to finish
* Be more verbose in error messages
* Reverted previous changes.
Made the code to complex without much advantages
* Use line protocol encoder
* Go pkg update
* Stop flush timer, when immediatelly flushing
* Fix: Corrected unlock access to batch slice
* Add config option to specify whether to use GZip compression in influx write requests
* Add asynchron send of encoder metrics
* Use DefaultServeMux instead of github.com/gorilla/mux
* Add config option for HTTP keep-alives
* Be more strict, when parsing json
* Add config option for HTTP request timeout and Retry interval
* Allow more then one background send operation
* Fix %sysusers_create_package args (#108)
%sysusers_create_package requires two arguments. See: https://github.com/systemd/systemd/blob/main/src/rpm/macros.systemd.in#L165
* Add nfsiostat to list of collectors
---------
Co-authored-by: Holger Obermaier <40787752+ho-ob@users.noreply.github.com>
Co-authored-by: Holger Obermaier <holgerob@gmx.de>
Co-authored-by: Obihörnchen <obihoernchende@gmail.com>
2023-12-04 12:21:26 +01:00
|
|
|
cpulist = append(cpulist, c.CpuID)
|
2022-01-30 15:03:21 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return cpulist, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// for a given id of a NUMA domain, it returns the list of cpuids
|
2023-08-29 14:12:49 +02:00
|
|
|
func getCpuListOfNumaDomainFunc(args interface{}) (interface{}, error) {
|
2022-01-30 15:03:21 +01:00
|
|
|
cpulist := make([]int, 0)
|
2023-08-29 14:12:49 +02:00
|
|
|
switch in := args.(type) {
|
2022-01-30 15:03:21 +01:00
|
|
|
case int:
|
|
|
|
for _, c := range topo.CpuData() {
|
Merge develop into main (#109)
* Add cpu_used (all-cpu_idle) to CpustatCollector
* Update to line-protocol/v2
* Update runonce.yml with Golang 1.20
* Update fsnotify in LIKWID Collector
* Use not a pointer to line-protocol.Encoder
* Simplify Makefile
* Use only as many arguments as required
* Allow sum function to handle non float types
* Allow values to be a slice of type float64, float32, int, int64, int32, bool
* Use generic function to simplify code
* Add missing case for type []int32
* Use generic function to compute minimum
* Use generic function to compute maximum
* Use generic function to compute average
* Add error value to sumAnyType
* Use generic function to compute median
* For older versions of go slices is not part of the installation
* Remove old entries from go.sum
* Use simpler sort function
* Compute metrics ib_total and ib_total_pkts
* Add aggregated metrics.
Add missing units
* Update likwidMetric.go
Fixes a potential bug when `fsnotify.NewWatcher()` fails with an error
* Completly avoid memory allocations in infinibandMetric read()
* Fixed initialization: Initalization and measurements should run in the same thread
* Add safe.directory to Release action
* Fix path after installation to /usr/bin after installation
* ioutil.ReadFile is deprecated: As of Go 1.16, this function simply calls os.ReadFile
* Switch to package slices from the golang 1.21 default library
* Read file line by line
* Read file line by line
* Read file line by line
* Use CamelCase
* Use CamelCase
* Fix function getNumaDomain, it always returned 0
* Avoid type conversion by using Atoi
Avoid copying structs by using pointer access
Increase readability with CamelCase variable names
* Add caching
* Cache CpuData
* Cleanup
* Use init function to initalize cache structure to avoid multi threading problems
* Reuse information from /proc/cpuinfo
* Avoid slice cloning. Directly use the cache
* Add DieList
* Add NumaDomainList and SMTList
* Cleanup
* Add comment
* Lookup core ID from /sys/devices/system/cpu, /proc/cpuinfo is not portable
* Lookup all information from /sys/devices/system/cpu, /proc/cpuinfo is not portable
* Correctly handle lists from /sys
* Add Simultaneous Multithreading siblings
* Replace deprecated thread_siblings_list by core_cpus_list
* Reduce number of required slices
* Allow to send total values per core, socket and node
* Send all metrics with same time stamp
calcEventsetMetrics does only computiation, counter measurement is done before
* Input parameters should be float64 when evaluating to float64
* Send all metrics with same time stamp
calcGlobalMetrics does only computiation, counter measurement is done before
* Remove unused variable gmresults
* Add comments
* Updated go packages
* Add build with golang 1.21
* Switch to checkout action version 4
* Switch to setup-go action version 4
* Add workflow_dispatch to allow manual run of workflow
* Add workflow_dispatch to allow manual run of workflow
* Add release build jobs to runonce.yml
* Switch to golang 1.20 for RHEL based distributions
* Use dnf to download golang
* Remove golang versions before 1.20
* Upgrade Ubuntu focal -> jammy
* Pipe golang tar package directly to tar
* Update golang version
* Fix Ubuntu version number
* Add links to ipmi and redfish receivers
* Fix http server addr format
* github.com/influxdata/line-protocol -> github.com/influxdata/line-protocol/v2/lineprotocol
* Corrected spelling
* Add some comments
* github.com/influxdata/line-protocol -> github.com/influxdata/line-protocol/v2/lineprotocol
* Allow other fields not only field "value"
* Add some basic debugging documentation
* Add some basic debugging documentation
* Use a lock for the flush timer
* Add tags in lexical order as required by AddTag()
* Only access meta data, when it gets used as tag
* Use slice to store lexialicly orderd key value pairs
* Increase golang version requirement to 1.20.
* Avoid package cmp to allow builds with golang v1.20
* Fix: Error NVML library not found did crash
cc-metric-collector with "SIGSEGV: segmentation violation"
* Add config option idle_timeout
* Add basic authentication support
* Add basic authentication support
* Avoid unneccessary memory allocations
* Add documentation for send_*_total values
* Use generic package maps to clone maps
* Reuse flush timer
* Add Influx client options
* Reuse ccTopology functionality
* Do not store unused topology information
* Add batch_size config
* Cleanup
* Use stype and stype-id for the NIC in NetstatCollector
* Wait for concurrent flush operations to finish
* Be more verbose in error messages
* Reverted previous changes.
Made the code to complex without much advantages
* Use line protocol encoder
* Go pkg update
* Stop flush timer, when immediatelly flushing
* Fix: Corrected unlock access to batch slice
* Add config option to specify whether to use GZip compression in influx write requests
* Add asynchron send of encoder metrics
* Use DefaultServeMux instead of github.com/gorilla/mux
* Add config option for HTTP keep-alives
* Be more strict, when parsing json
* Add config option for HTTP request timeout and Retry interval
* Allow more then one background send operation
* Fix %sysusers_create_package args (#108)
%sysusers_create_package requires two arguments. See: https://github.com/systemd/systemd/blob/main/src/rpm/macros.systemd.in#L165
* Add nfsiostat to list of collectors
---------
Co-authored-by: Holger Obermaier <40787752+ho-ob@users.noreply.github.com>
Co-authored-by: Holger Obermaier <holgerob@gmx.de>
Co-authored-by: Obihörnchen <obihoernchende@gmail.com>
2023-12-04 12:21:26 +01:00
|
|
|
if c.NumaDomain == in {
|
|
|
|
cpulist = append(cpulist, c.CpuID)
|
2022-01-30 15:03:21 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return cpulist, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// for a given CPU die id, it returns the list of cpuids
|
2023-08-29 14:12:49 +02:00
|
|
|
func getCpuListOfDieFunc(args interface{}) (interface{}, error) {
|
2022-01-30 15:03:21 +01:00
|
|
|
cpulist := make([]int, 0)
|
2023-08-29 14:12:49 +02:00
|
|
|
switch in := args.(type) {
|
2022-01-30 15:03:21 +01:00
|
|
|
case int:
|
|
|
|
for _, c := range topo.CpuData() {
|
|
|
|
if c.Die == in {
|
Merge develop into main (#109)
* Add cpu_used (all-cpu_idle) to CpustatCollector
* Update to line-protocol/v2
* Update runonce.yml with Golang 1.20
* Update fsnotify in LIKWID Collector
* Use not a pointer to line-protocol.Encoder
* Simplify Makefile
* Use only as many arguments as required
* Allow sum function to handle non float types
* Allow values to be a slice of type float64, float32, int, int64, int32, bool
* Use generic function to simplify code
* Add missing case for type []int32
* Use generic function to compute minimum
* Use generic function to compute maximum
* Use generic function to compute average
* Add error value to sumAnyType
* Use generic function to compute median
* For older versions of go slices is not part of the installation
* Remove old entries from go.sum
* Use simpler sort function
* Compute metrics ib_total and ib_total_pkts
* Add aggregated metrics.
Add missing units
* Update likwidMetric.go
Fixes a potential bug when `fsnotify.NewWatcher()` fails with an error
* Completly avoid memory allocations in infinibandMetric read()
* Fixed initialization: Initalization and measurements should run in the same thread
* Add safe.directory to Release action
* Fix path after installation to /usr/bin after installation
* ioutil.ReadFile is deprecated: As of Go 1.16, this function simply calls os.ReadFile
* Switch to package slices from the golang 1.21 default library
* Read file line by line
* Read file line by line
* Read file line by line
* Use CamelCase
* Use CamelCase
* Fix function getNumaDomain, it always returned 0
* Avoid type conversion by using Atoi
Avoid copying structs by using pointer access
Increase readability with CamelCase variable names
* Add caching
* Cache CpuData
* Cleanup
* Use init function to initalize cache structure to avoid multi threading problems
* Reuse information from /proc/cpuinfo
* Avoid slice cloning. Directly use the cache
* Add DieList
* Add NumaDomainList and SMTList
* Cleanup
* Add comment
* Lookup core ID from /sys/devices/system/cpu, /proc/cpuinfo is not portable
* Lookup all information from /sys/devices/system/cpu, /proc/cpuinfo is not portable
* Correctly handle lists from /sys
* Add Simultaneous Multithreading siblings
* Replace deprecated thread_siblings_list by core_cpus_list
* Reduce number of required slices
* Allow to send total values per core, socket and node
* Send all metrics with same time stamp
calcEventsetMetrics does only computiation, counter measurement is done before
* Input parameters should be float64 when evaluating to float64
* Send all metrics with same time stamp
calcGlobalMetrics does only computiation, counter measurement is done before
* Remove unused variable gmresults
* Add comments
* Updated go packages
* Add build with golang 1.21
* Switch to checkout action version 4
* Switch to setup-go action version 4
* Add workflow_dispatch to allow manual run of workflow
* Add workflow_dispatch to allow manual run of workflow
* Add release build jobs to runonce.yml
* Switch to golang 1.20 for RHEL based distributions
* Use dnf to download golang
* Remove golang versions before 1.20
* Upgrade Ubuntu focal -> jammy
* Pipe golang tar package directly to tar
* Update golang version
* Fix Ubuntu version number
* Add links to ipmi and redfish receivers
* Fix http server addr format
* github.com/influxdata/line-protocol -> github.com/influxdata/line-protocol/v2/lineprotocol
* Corrected spelling
* Add some comments
* github.com/influxdata/line-protocol -> github.com/influxdata/line-protocol/v2/lineprotocol
* Allow other fields not only field "value"
* Add some basic debugging documentation
* Add some basic debugging documentation
* Use a lock for the flush timer
* Add tags in lexical order as required by AddTag()
* Only access meta data, when it gets used as tag
* Use slice to store lexialicly orderd key value pairs
* Increase golang version requirement to 1.20.
* Avoid package cmp to allow builds with golang v1.20
* Fix: Error NVML library not found did crash
cc-metric-collector with "SIGSEGV: segmentation violation"
* Add config option idle_timeout
* Add basic authentication support
* Add basic authentication support
* Avoid unneccessary memory allocations
* Add documentation for send_*_total values
* Use generic package maps to clone maps
* Reuse flush timer
* Add Influx client options
* Reuse ccTopology functionality
* Do not store unused topology information
* Add batch_size config
* Cleanup
* Use stype and stype-id for the NIC in NetstatCollector
* Wait for concurrent flush operations to finish
* Be more verbose in error messages
* Reverted previous changes.
Made the code to complex without much advantages
* Use line protocol encoder
* Go pkg update
* Stop flush timer, when immediatelly flushing
* Fix: Corrected unlock access to batch slice
* Add config option to specify whether to use GZip compression in influx write requests
* Add asynchron send of encoder metrics
* Use DefaultServeMux instead of github.com/gorilla/mux
* Add config option for HTTP keep-alives
* Be more strict, when parsing json
* Add config option for HTTP request timeout and Retry interval
* Allow more then one background send operation
* Fix %sysusers_create_package args (#108)
%sysusers_create_package requires two arguments. See: https://github.com/systemd/systemd/blob/main/src/rpm/macros.systemd.in#L165
* Add nfsiostat to list of collectors
---------
Co-authored-by: Holger Obermaier <40787752+ho-ob@users.noreply.github.com>
Co-authored-by: Holger Obermaier <holgerob@gmx.de>
Co-authored-by: Obihörnchen <obihoernchende@gmail.com>
2023-12-04 12:21:26 +01:00
|
|
|
cpulist = append(cpulist, c.CpuID)
|
2022-01-30 15:03:21 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return cpulist, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// wrapper function to get a list of all cpuids of the node
|
2023-08-29 14:12:49 +02:00
|
|
|
func getCpuListOfNode() (interface{}, error) {
|
2022-05-13 14:28:07 +02:00
|
|
|
return topo.HwthreadList(), nil
|
2022-01-30 15:03:21 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// helper function to get the cpuid list for a CCMetric type tag set (type and type-id)
|
|
|
|
// since there is no access to the metric data in the function, is should be called like
|
|
|
|
// `getCpuListOfType()`
|
|
|
|
func getCpuListOfType(args ...interface{}) (interface{}, error) {
|
|
|
|
cpulist := make([]int, 0)
|
|
|
|
switch typ := args[0].(type) {
|
|
|
|
case string:
|
|
|
|
switch typ {
|
|
|
|
case "node":
|
2022-05-13 14:28:07 +02:00
|
|
|
return topo.HwthreadList(), nil
|
2022-01-30 15:03:21 +01:00
|
|
|
case "socket":
|
|
|
|
return getCpuListOfSocketFunc(args[1])
|
|
|
|
case "numadomain":
|
|
|
|
return getCpuListOfNumaDomainFunc(args[1])
|
|
|
|
case "core":
|
|
|
|
return getCpuListOfCoreFunc(args[1])
|
2022-05-13 14:09:45 +02:00
|
|
|
case "hwthread":
|
2022-01-30 15:03:21 +01:00
|
|
|
var cpu int
|
|
|
|
|
|
|
|
switch id := args[1].(type) {
|
|
|
|
case string:
|
|
|
|
_, err := fmt.Scanf(id, "%d", &cpu)
|
|
|
|
if err == nil {
|
|
|
|
cpulist = append(cpulist, cpu)
|
|
|
|
}
|
|
|
|
case int:
|
|
|
|
cpulist = append(cpulist, id)
|
|
|
|
case int64:
|
|
|
|
cpulist = append(cpulist, int(id))
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return cpulist, errors.New("no valid args type and type-id")
|
|
|
|
}
|