fix(inputs.snmp_trap): Remove timeout deprecation (#16145)

(cherry picked from commit 9680123)
influxdata · Nov 18, 2024 · 48bfa34 · 48bfa34
1 parent a98979d
commit 48bfa34
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/plugins/inputs/snmp_trap/README.md b/plugins/inputs/snmp_trap/README.md
@@ -62,8 +62,8 @@ details.
   ## To add paths when translating with netsnmp, use the MIBDIRS environment variable
   # path = ["/usr/share/snmp/mibs"]
   ##
-  ## Deprecated in 1.20.0; no longer running snmptranslate
   ## Timeout running snmptranslate command
+  ## Used by the netsnmp translator only
   # timeout = "5s"
   ## Snmp version; one of "1", "2c" or "3".
   # version = "2c"

diff --git a/plugins/inputs/snmp_trap/sample.conf b/plugins/inputs/snmp_trap/sample.conf
@@ -14,8 +14,8 @@
   ## To add paths when translating with netsnmp, use the MIBDIRS environment variable
   # path = ["/usr/share/snmp/mibs"]
   ##
-  ## Deprecated in 1.20.0; no longer running snmptranslate
   ## Timeout running snmptranslate command
+  ## Used by the netsnmp translator only
   # timeout = "5s"
   ## Snmp version; one of "1", "2c" or "3".
   # version = "2c"

diff --git a/plugins/inputs/snmp_trap/snmp_trap.go b/plugins/inputs/snmp_trap/snmp_trap.go
@@ -43,7 +43,7 @@ func (l wrapLog) Print(args ...interface{}) {
 
 type SnmpTrap struct {
 	ServiceAddress string          `toml:"service_address"`
-	Timeout        config.Duration `toml:"timeout" deprecated:"1.20.0;1.35.0;unused option"`
+	Timeout        config.Duration `toml:"timeout"`
 	Version        string          `toml:"version"`
 	Translator     string          `toml:"-"`
 	Path           []string        `toml:"path"`