Skip to content

Commit f491eb1

Browse files
committed
Fix changes with node_exporter on bsd.
1 parent 26e058a commit f491eb1

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

collector/exec_bsd.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ func NewExecCollector(config *NodeCollectorConfig, logger log.Logger) (Collector
6262
description: "System calls since system boot. Resets at architecture unsigned integer.",
6363
mib: "vm.stats.sys.v_syscall",
6464
},
65-
labels: nil,
6665
{
6766
name: "exec_device_interrupts_total",
6867
description: "Device interrupts since system boot. Resets at architecture unsigned integer.",

collector/filesystem_freebsd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (c *filesystemCollector) GetStats(_ PathConfig) ([]filesystemStats, error)
6565
stats = append(stats, filesystemStats{
6666
labels: filesystemLabels{
6767
device: device,
68-
mountPoint: rootfsStripPrefix(mountpoint),
68+
mountPoint: c.config.Path.rootfsStripPrefix(mountpoint),
6969
fsType: fstype,
7070
},
7171
size: float64(fs.Blocks) * float64(fs.Bsize),

collector/netdev_bsd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
*/
3535
import "C"
3636

37-
func getNetDevStats(filter *deviceFilter, logger log.Logger) (netDevStats, error) {
37+
func getNetDevStats(_ *NodeCollectorConfig, _ *bool, filter *deviceFilter, logger log.Logger) (netDevStats, error) {
3838
netDev := netDevStats{}
3939

4040
var ifap, ifa *C.struct_ifaddrs

collector/zfs_freebsd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,11 +337,11 @@ func (c *zfsCollector) parseFreeBSDPoolObjsetStats() error {
337337

338338
for dataset, _ := range zfsDatasets {
339339
if strings.HasSuffix(dataset, ".dataset_name") {
340-
zfsDatasetNames = append(zfsDatasetNames, strings.SplitAfter(dataset, ".")[3])
340+
zfsDatasetsNames = append(zfsDatasetsNames, strings.SplitAfter(dataset, ".")[3])
341341
}
342342
}
343343

344-
for zpoolDataset := range zfsDatasetsNames {
344+
for _, zpoolDataset := range zfsDatasetsNames {
345345
zfsDatasetLabels := map[string]string{
346346
"dataset": zpoolDataset,
347347
"zpool": strings.SplitAfter(zpoolDataset, "/")[0],

0 commit comments

Comments
 (0)