Adding a drop_undefined conf option to drop undefined traps (#658)

kentik · Feb 2, 2024 · 7959aca · 7959aca
1 parent 687e4eb
commit 7959aca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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 {