From 2e027c850efc3c583d37c6278b3464a5d36b1d0b Mon Sep 17 00:00:00 2001
From: matt durham <mattdurham@ppog.org>
Date: Wed, 27 Sep 2023 12:24:00 -0400
Subject: [PATCH] fix issues

---
 collector/config_bsds.go       | 4 ++--
 collector/filesystem_bsd.go    | 4 ++--
 collector/filesystem_common.go | 2 +-
 collector/loadavg.go           | 2 +-
 collector/netdev_common.go     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/collector/config_bsds.go b/collector/config_bsds.go
index 7537c010..5d11748c 100644
--- a/collector/config_bsds.go
+++ b/collector/config_bsds.go
@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build dragonfly || freebsd || netbsd || openbsd
-// +build dragonfly freebsd netbsd openbsd
+//go:build dragonfly || freebsd || netbsd || openbsd || 386
+// +build dragonfly freebsd netbsd openbsd 386
 
 package collector
 
diff --git a/collector/filesystem_bsd.go b/collector/filesystem_bsd.go
index d3025a01..ccd71a77 100644
--- a/collector/filesystem_bsd.go
+++ b/collector/filesystem_bsd.go
@@ -39,7 +39,7 @@ const (
 )
 
 // Expose filesystem fullness.
-func (c *filesystemCollector) GetStats() (stats []filesystemStats, err error) {
+func (c *filesystemCollector) GetStats(p PathConfig) (stats []filesystemStats, err error) {
 	var mntbuf *C.struct_statfs
 	count := C.getmntinfo(&mntbuf, C.MNT_NOWAIT)
 	if count == 0 {
@@ -70,7 +70,7 @@ func (c *filesystemCollector) GetStats() (stats []filesystemStats, err error) {
 		stats = append(stats, filesystemStats{
 			labels: filesystemLabels{
 				device:     device,
-				mountPoint: rootfsStripPrefix(mountpoint),
+				mountPoint: p.rootfsStripPrefix(mountpoint),
 				fsType:     fstype,
 			},
 			size:      float64(mnt[i].f_blocks) * float64(mnt[i].f_bsize),
diff --git a/collector/filesystem_common.go b/collector/filesystem_common.go
index 80727818..6e0deddc 100644
--- a/collector/filesystem_common.go
+++ b/collector/filesystem_common.go
@@ -165,7 +165,7 @@ func NewFilesystemCollector(config *NodeCollectorConfig, logger log.Logger) (Col
 }
 
 func (c *filesystemCollector) Update(ch chan<- prometheus.Metric) error {
-	stats, err := c.GetStats()
+	stats, err := c.GetStats(c.config.Path)
 	if err != nil {
 		return err
 	}
diff --git a/collector/loadavg.go b/collector/loadavg.go
index 086886c4..62e3f5c4 100644
--- a/collector/loadavg.go
+++ b/collector/loadavg.go
@@ -49,7 +49,7 @@ func NewLoadavgCollector(config *NodeCollectorConfig, logger log.Logger) (Collec
 }
 
 func (c *loadavgCollector) Update(ch chan<- prometheus.Metric) error {
-	loads, err := getLoad(c.config)
+	loads, err := getLoad()
 	if err != nil {
 		return fmt.Errorf("couldn't get load: %w", err)
 	}
diff --git a/collector/netdev_common.go b/collector/netdev_common.go
index e789bdd3..33ef2023 100644
--- a/collector/netdev_common.go
+++ b/collector/netdev_common.go
@@ -112,7 +112,7 @@ func (c *netDevCollector) metricDesc(key string) *prometheus.Desc {
 }
 
 func (c *netDevCollector) Update(ch chan<- prometheus.Metric) error {
-	netDev, err := getNetDevStats(c.config, c.config.NetDev.Netlink, &c.deviceFilter, c.logger)
+	netDev, err := getNetDevStats(&c.deviceFilter, c.logger)
 	if err != nil {
 		return fmt.Errorf("couldn't get netstats: %w", err)
 	}