Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 4 commits into from
Nov 18, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61d0ee5
fix(inputs.snmp_trap): Only log timeout deprecation if set
DStrand1 Nov 5, 2024
89fb5d9
remove deprecation
DStrand1 Nov 15, 2024
d1141c5
update sample.conf and readme
DStrand1 Nov 18, 2024
4cdcbf3
address reviews
DStrand1 Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/inputs/snmp_trap/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion plugins/inputs/snmp_trap/sample.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion plugins/inputs/snmp_trap/snmp_trap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
Loading