From: Job Snijders <job@bsd.nl>
Subject: munin: unbreak if_/if_pps_ suggest
To: ports@openbsd.org
Date: Sun, 13 Sep 2026 10:45:05 +0000

I'm not sure the 'suggest' feature ever correctly worked for 'if_' plugin, 
and if_pps_ was suggesting 'enc' interfaces which I don't think should be
the default.

This changeset materially improves 'munin-node-configure --shell'

OK?

ps. how do you work with these patches of patches? what are the simple
steps to regenerate these normally?

Index: patches/patch-plugins_node_d_openbsd_if__in
===================================================================
RCS file: /cvs/ports/net/munin/patches/patch-plugins_node_d_openbsd_if__in,v
diff -u -p -r1.8 patch-plugins_node_d_openbsd_if__in
--- patches/patch-plugins_node_d_openbsd_if__in	17 Nov 2025 07:01:24 -0000	1.8
+++ patches/patch-plugins_node_d_openbsd_if__in	13 Sep 2026 10:39:58 -0000
@@ -13,24 +13,26 @@ Index: plugins/node.d.openbsd/if_.in
  #
  # To aggregate all network interfaces on the system (except lo0),
  # link if_aggregated to this file.
-@@ -31,13 +31,15 @@ if [ "$1" = "autoconf" ]; then
- 	fi
+@@ -32,26 +32,28 @@
  fi
  
-+DESCR=$(/sbin/ifconfig ${INTERFACE} | /usr/bin/awk -F ': ' '/description:(.*)$/ {print substr($2, 1, 12);}')
-+
  if [ "$1" = "suggest" ]; then
- 	if [ -x /sbin/ifconfig ]
- 	then
- 		ifconfig -l | sed -Ee 's/[[:<:]](pfsync|faith|pf(log|sync)|lo|plip|carp|enc|fwe)[^ ]*//g' | xargs -n 1 echo
+-	if [ -x /sbin/ifconfig ]
+-	then
+-		ifconfig -l | sed -Ee 's/[[:<:]](pfsync|faith|pf(log|sync)|lo|plip|carp|enc|fwe)[^ ]*//g' | xargs -n 1 echo
++	if [ -x /usr/bin/netstat ]; then
++		netstat -i -b -n | sed -n -E -e '/^faith/d' -e '/^(enc|lo)[0-9]/d' -e '/^pf(log|sync)/d' -e '/<Link>/s/\** .*//p'
  		exit 0
- 	elif [ -x /usr/bin/netstat ]; then
+-	elif [ -x /usr/bin/netstat ]; then
 -		netstat -i -b -n | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pf(log|sync)/d' -e '/<Link#[0-9]*>/s/\** .*//p'
-+		netstat -i -b -n | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pf(log|sync)/d' -e '/<Link>/s/\** .*//p'
- 		exit 0
+-		exit 0
  	else
  		exit 1
-@@ -47,11 +49,15 @@ fi
+ 	fi
+ fi
+ 
++DESCR=$(/sbin/ifconfig ${INTERFACE} | /usr/bin/awk -F ': ' '/description:(.*)$/ {print substr($2, 1, 12);}')
++
  if [ "$1" = "config" ]; then
  
  	echo "graph_order rbytes obytes"
@@ -48,7 +50,7 @@ Index: plugins/node.d.openbsd/if_.in
  	echo 'rbytes.label received'
          echo 'rbytes.type DERIVE'
          echo 'rbytes.graph no'
-@@ -69,9 +75,11 @@ fi
+@@ -69,9 +71,11 @@
  if [ "$INTERFACE" = "aggregated" ]; then
  	/usr/bin/netstat -i -b -n | grep -v '^lo' | awk '
  BEGIN { rsum = 0; osum = 0; }
@@ -63,7 +65,7 @@ Index: plugins/node.d.openbsd/if_.in
  	} else if (NF == 11) {
  		if ($4 ~ /:/) {
  			rsum += $7; osum += $10;
-@@ -79,7 +87,7 @@ BEGIN { rsum = 0; osum = 0; }
+@@ -79,7 +83,7 @@
  			rsum += $7; osum += $10;
  		}
  	} else { # NF == 12
@@ -72,7 +74,7 @@ Index: plugins/node.d.openbsd/if_.in
  	}
  }
  END {
-@@ -89,17 +97,20 @@ END {
+@@ -89,17 +93,20 @@
  
  else
  	/usr/bin/netstat -i -b -n -I $INTERFACE | awk '
Index: patches/patch-plugins_node_d_openbsd_if_pps__in
===================================================================
RCS file: /cvs/ports/net/munin/patches/patch-plugins_node_d_openbsd_if_pps__in,v
diff -u -p -r1.1 patch-plugins_node_d_openbsd_if_pps__in
--- patches/patch-plugins_node_d_openbsd_if_pps__in	17 Nov 2025 07:01:24 -0000	1.1
+++ patches/patch-plugins_node_d_openbsd_if_pps__in	13 Sep 2026 10:39:58 -0000
@@ -9,7 +9,8 @@ Index: plugins/node.d.openbsd/if_pps_.in
 +
  if [ "$1" = "suggest" ]; then
  	if [ -x /usr/bin/netstat ]; then
- 		netstat -i -n | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '/<Link>/s/\** .*//p'
+- 		netstat -i -n | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '/<Link>/s/\** .*//p'
++ 		netstat -i -n | sed -n -E -e '/^faith/d' -e '/^(enc|lo)[0-9]/d' -e '/^pflog/d' -e '/<Link>/s/\** .*//p'
 @@ -42,7 +44,11 @@ fi
  
  if [ "$1" = "config" ]; then