CVS commit: pkgsrc/sysutils/node_exporter

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Apr  6 08:01:00 UTC 2025

Modified Files:
        pkgsrc/sysutils/node_exporter: distinfo
        pkgsrc/sysutils/node_exporter/patches:
            patch-collector_netdev__netbsd.go

Log Message:
node_exporter: fix NetBSD build

migrate the netdev_netbsd.go file to the new log/slog logger.

Noticed by wiz@, thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/node_exporter/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/node_exporter/patches/patch-collector_netdev__netbsd.go

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/node_exporter/distinfo
diff -u pkgsrc/sysutils/node_exporter/distinfo:1.17 pkgsrc/sysutils/node_exporter/distinfo:1.18
--- pkgsrc/sysutils/node_exporter/distinfo:1.17 Tue Apr  1 20:30:09 2025
+++ pkgsrc/sysutils/node_exporter/distinfo      Sun Apr  6 08:01:00 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2025/04/01 20:30:09 bsiegert Exp $
+$NetBSD: distinfo,v 1.18 2025/04/06 08:01:00 bsiegert Exp $
 
 BLAKE2s (github.com_alecthomas_kingpin_v2_@v_v2.4.0.mod) = 20c554bf73adc1d4faea9cf1eba7f569d362037f364d643d7176e790eed60759
 SHA512 (github.com_alecthomas_kingpin_v2_@v_v2.4.0.mod) = 27b647208aec705c995e523035f278c6b81102ba59f5a95e6e7adf1e8cba2e166d73f0d1115946acfcb736918b5b0db66d2f2aeba084a3581a7a29d342f511b2
@@ -358,4 +358,4 @@ BLAKE2s (node_exporter-1.9.1.tar.gz) = 4
 SHA512 (node_exporter-1.9.1.tar.gz) = 233d1d856d9e2598818f7487357a51b94a39207810d9f35e0cb44c4703583be07ebde6eb658c25560d9345d0c43651a880be5fc42fe3cbe1975d6f6c348eeddf
 Size (node_exporter-1.9.1.tar.gz) = 353747 bytes
 SHA1 (patch-collector_netdev__common.go) = e09435c33bab26ac85a6affa280605caeb3b2b7f
-SHA1 (patch-collector_netdev__netbsd.go) = 59d5409ea5ab267c48c9a5d299e66c7c283f8680
+SHA1 (patch-collector_netdev__netbsd.go) = 890ad5d2a3532284102a2c7dbc110531a249aad5

Index: pkgsrc/sysutils/node_exporter/patches/patch-collector_netdev__netbsd.go
diff -u pkgsrc/sysutils/node_exporter/patches/patch-collector_netdev__netbsd.go:1.1 pkgsrc/sysutils/node_exporter/patches/patch-collector_netdev__netbsd.go:1.2
--- pkgsrc/sysutils/node_exporter/patches/patch-collector_netdev__netbsd.go:1.1 Sun Jul 28 01:14:24 2024
+++ pkgsrc/sysutils/node_exporter/patches/patch-collector_netdev__netbsd.go     Sun Apr  6 08:01:00 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-collector_netdev__netbsd.go,v 1.1 2024/07/28 01:14:24 tnn Exp $
+$NetBSD: patch-collector_netdev__netbsd.go,v 1.2 2025/04/06 08:01:00 bsiegert Exp $
 
 https://github.com/prometheus/node_exporter/pull/3078
 
---- collector/netdev_netbsd.go.orig    2024-07-28 01:10:15.812170143 +0000
+--- collector/netdev_netbsd.go.orig    2025-04-06 07:33:45.669286845 +0000
 +++ collector/netdev_netbsd.go
-@@ -0,0 +1,91 @@
+@@ -0,0 +1,95 @@
 +// Copyright 2024 The Prometheus Authors
 +// Licensed under the Apache License, Version 2.0 (the "License");
 +// you may not use this file except in compliance with the License.
@@ -27,8 +27,7 @@ https://github.com/prometheus/node_expor
 +      "errors"
 +
 +      "fmt"
-+      "github.com/go-kit/log"
-+      "github.com/go-kit/log/level"
++      "log/slog"
 +      "unsafe"
 +)
 +
@@ -43,7 +42,7 @@ https://github.com/prometheus/node_expor
 +*/
 +import "C"
 +
-+func getNetDevStats(filter *deviceFilter, logger log.Logger) (netDevStats, error) {
++func getNetDevStats(filter *deviceFilter, logger *slog.Logger) (netDevStats, error) {
 +      netDev := netDevStats{}
 +
 +      var ifap, ifa *C.struct_ifaddrs
@@ -59,7 +58,7 @@ https://github.com/prometheus/node_expor
 +
 +              dev := C.GoString(ifa.ifa_name)
 +              if filter.ignored(dev) {
-+                      level.Debug(logger).Log("msg", "Ignoring device", "device", dev)
++                      logger.Debug("Ignoring device", "device", dev)
 +                      continue
 +              }
 +
@@ -96,3 +95,8 @@ https://github.com/prometheus/node_expor
 +
 +      return netDev, nil
 +}
++
++func getNetDevLabels() (map[string]map[string]string, error) {
++      // to be implemented if needed
++      return nil, nil
++}