mudhorn/node_exporter
1
0
Fork 0
mirror of https://github.com/prometheus/node_exporter.git synced 2025-03-05 21:00:12 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix changes with node_exporter on bsd.

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
collector/exec_bsd.go
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.", description: "System calls since system boot. Resets at architecture unsigned integer.",
mib: "vm.stats.sys.v_syscall", mib: "vm.stats.sys.v_syscall",
}, },
labels: nil,
{ {
name: "exec_device_interrupts_total", name: "exec_device_interrupts_total",
description: "Device interrupts since system boot. Resets at architecture unsigned integer.", description: "Device interrupts since system boot. Resets at architecture unsigned integer.",

2
collector/filesystem_freebsd.go
View file

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

2
collector/netdev_bsd.go
View file

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

4
collector/zfs_freebsd.go
View file

@ -337,11 +337,11 @@ func (c *zfsCollector) parseFreeBSDPoolObjsetStats() error {
for dataset, _ := range zfsDatasets { for dataset, _ := range zfsDatasets {
if strings.HasSuffix(dataset, ".dataset_name") { 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{ zfsDatasetLabels := map[string]string{
"dataset": zpoolDataset, "dataset": zpoolDataset,
"zpool": strings.SplitAfter(zpoolDataset, "/")[0], "zpool": strings.SplitAfter(zpoolDataset, "/")[0],