Fix changes with node_exporter on bsd.

This commit is contained in:
matt durham 2023-10-04 10:13:11 -04:00
parent 26e058a40f
commit f491eb14df
No known key found for this signature in database
GPG key ID: A62E920AE398897B
4 changed files with 4 additions and 5 deletions

View file

@ -62,7 +62,6 @@ func NewExecCollector(config *NodeCollectorConfig, logger log.Logger) (Collector
description: "System calls since system boot. Resets at architecture unsigned integer.",
mib: "vm.stats.sys.v_syscall",
},
labels: nil,
{
name: "exec_device_interrupts_total",
description: "Device interrupts since system boot. Resets at architecture unsigned integer.",

View file

@ -65,7 +65,7 @@ func (c *filesystemCollector) GetStats(_ PathConfig) ([]filesystemStats, error)
stats = append(stats, filesystemStats{
labels: filesystemLabels{
device: device,
mountPoint: rootfsStripPrefix(mountpoint),
mountPoint: c.config.Path.rootfsStripPrefix(mountpoint),
fsType: fstype,
},
size: float64(fs.Blocks) * float64(fs.Bsize),

View file

@ -34,7 +34,7 @@ import (
*/
import "C"
func getNetDevStats(filter *deviceFilter, logger log.Logger) (netDevStats, error) {
func getNetDevStats(_ *NodeCollectorConfig, _ *bool, filter *deviceFilter, logger log.Logger) (netDevStats, error) {
netDev := netDevStats{}
var ifap, ifa *C.struct_ifaddrs

View file

@ -337,11 +337,11 @@ func (c *zfsCollector) parseFreeBSDPoolObjsetStats() error {
for dataset, _ := range zfsDatasets {
if strings.HasSuffix(dataset, ".dataset_name") {
zfsDatasetNames = append(zfsDatasetNames, strings.SplitAfter(dataset, ".")[3])
zfsDatasetsNames = append(zfsDatasetsNames, strings.SplitAfter(dataset, ".")[3])
}
}
for zpoolDataset := range zfsDatasetsNames {
for _, zpoolDataset := range zfsDatasetsNames {
zfsDatasetLabels := map[string]string{
"dataset": zpoolDataset,
"zpool": strings.SplitAfter(zpoolDataset, "/")[0],