From 7959aca88329070359a3c43b15ea8b5c24ca73c0 Mon Sep 17 00:00:00 2001
From: Ian <i3149@users.noreply.github.com>
Date: Thu, 1 Feb 2024 21:36:11 -0800
Subject: [PATCH] Adding a drop_undefined conf option to drop undefined traps
 (#658)

---
 pkg/inputs/snmp/traps/traps.go |  2 +-
 pkg/kt/snmp.go                 | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkg/inputs/snmp/traps/traps.go b/pkg/inputs/snmp/traps/traps.go
index e667a5c8..3b317db3 100644
--- a/pkg/inputs/snmp/traps/traps.go
+++ b/pkg/inputs/snmp/traps/traps.go
@@ -227,7 +227,7 @@ func (s *SnmpTrap) handle(packet *gosnmp.SnmpPacket, addr *net.UDPAddr) {
 		}
 
 		// If we don't want undefined vars, pass along here.
-		if res == nil && trap.DropUndefinedVars() {
+		if res == nil && (s.conf.Trap.DropUndefined || trap.DropUndefinedVars()) {
 			continue
 		}
 
diff --git a/pkg/kt/snmp.go b/pkg/kt/snmp.go
index f108d4bf..2a77774d 100644
--- a/pkg/kt/snmp.go
+++ b/pkg/kt/snmp.go
@@ -216,12 +216,13 @@ type SnmpDeviceConfig struct {
 }
 
 type SnmpTrapConfig struct {
-	Listen    string        `yaml:"listen"`
-	Community string        `yaml:"community"`
-	Version   string        `yaml:"version"`
-	Transport string        `yaml:"transport"`
-	V3        *V3SNMPConfig `yaml:"v3_config"`
-	TrapOnly  bool          `yaml:"trap_only"`
+	Listen        string        `yaml:"listen"`
+	Community     string        `yaml:"community"`
+	Version       string        `yaml:"version"`
+	Transport     string        `yaml:"transport"`
+	V3            *V3SNMPConfig `yaml:"v3_config"`
+	TrapOnly      bool          `yaml:"trap_only"`
+	DropUndefined bool          `yaml:"drop_undefined"`
 }
 
 type KentikMatch struct {