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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

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

Changes from 1 commit
Commits
Show all changes
2 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
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
4 changes: 3 additions & 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 @@ -84,7 +84,6 @@ func init() {
return &SnmpTrap{
timeFunc: time.Now,
ServiceAddress: "udp://:162",
Timeout: defaultTimeout,
Path: []string{"/usr/share/snmp/mibs"},
Version: "2c",
}
Expand All @@ -104,6 +103,9 @@ func (s *SnmpTrap) Init() error {
return err
}
case "netsnmp":
if s.Timeout == 0 {
s.Timeout = defaultTimeout
}
Comment on lines +106 to +108
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why setting it if it's an unused option?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree. However, I'm not sure anymore the parameter is actually unused... It is used with the netsnmp translator isn't it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does seem like it's still used, so I removed the deprecation. I left the refactor in though since it is a more typical way to do things than before

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How/where?

s.transl = newNetsnmpTranslator(s.Timeout)
default:
return errors.New("invalid translator value")
Expand Down
Loading