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): Copy GoSNMP global defaults to prevent side-effects #13542

Merged
merged 12 commits into from
Jul 5, 2023
Merged

fix(inputs.snmp_trap): Copy GoSNMP global defaults to prevent side-effects #13542

merged 12 commits into from
Jul 5, 2023

Conversation

mark-chandler
Copy link
Contributor

Required for all PRs

resolves #13414

Setting up the SNMP parameters using gosnmp.Default seems to be using the same pointer for every instance.
Replace this with code that creates a separate variable each time copied from gosnmp.Default, then passes the pointer to that variable into the listener.Params.

Bump version of gosnmp package to a more recent commit.

Add some extra logging for gosnmp.

bramblek1 and others added 12 commits June 20, 2023 17:57
@bramblek1
Best guess at the problem of snmp_trap Auth
0747b07 
When multiple listeners are used with different
auth configs - they are all using the same pointer
to global default values and scribbling all over
it. Causes the last defined auth settings to succeed.
Yuk
@bramblek1
add shim logger for gosnmp
b270910
@bramblek1
contain log interface wrapper to snmp_trap
ce016b8
@bramblek1
Revert "add shim logger for gosnmp"
d4350a6 
This reverts commit b270910.
@bramblek1
set debug level for gosnmp internal logging
495fe75
@bramblek1
using latest master of gosnmp seems to work
aed9064
@mc-k1
fix zx2c4 dependency; add test for snmp_trap
67c3027
@mc-k1
add linter changes
29d13b5
@mc-k1
undo go118/netup replacement. seems fixed upstream
1c994d1
@mc-k1
rewrite snmp_trap multi-receiver tests
4d373bb
@mc-k1
undo go118/net-ip go.sum changes. seems fixed upstream
964afa7
@mc-k1
fixes for linter errors
db19769
@mark-chandler mark-chandler changed the title fix (plugins:inputs:snmp_trap) GoSNMP global defaults fix fix (plugins:inputs:snmp_trap): GoSNMP global defaults fix Jul 4, 2023
@mark-chandler mark-chandler changed the title fix (plugins:inputs:snmp_trap): GoSNMP global defaults fix fix (inputs.snmp_trap): GoSNMP global defaults fix Jul 4, 2023
@mark-chandler mark-chandler changed the title fix (inputs.snmp_trap): GoSNMP global defaults fix fix(inputs.snmp_trap): GoSNMP global defaults fix Jul 4, 2023
@telegraf-tiger
Copy link
Contributor

telegraf-tiger bot commented Jul 4, 2023

Download PR build artifacts for linux_amd64.tar.gz, darwin_amd64.tar.gz, and windows_amd64.zip.
Downloads for additional architectures and packages are available below.

☺️ This pull request doesn't significantly change the Telegraf binary size (less than 1%)

📦 Click here to get additional PR build artifacts

Artifact URLs

DEB RPM TAR GZ ZIP
amd64.deb aarch64.rpm darwin_amd64.tar.gz windows_amd64.zip
arm64.deb armel.rpm darwin_arm64.tar.gz windows_arm64.zip
armel.deb armv6hl.rpm freebsd_amd64.tar.gz windows_i386.zip
armhf.deb i386.rpm freebsd_armv7.tar.gz
i386.deb ppc64le.rpm freebsd_i386.tar.gz
mips.deb riscv64.rpm linux_amd64.tar.gz
mipsel.deb s390x.rpm linux_arm64.tar.gz
ppc64el.deb x86_64.rpm linux_armel.tar.gz
riscv64.deb linux_armhf.tar.gz
s390x.deb linux_i386.tar.gz
linux_mips.tar.gz
linux_mipsel.tar.gz
linux_ppc64le.tar.gz
linux_riscv64.tar.gz
linux_s390x.tar.gz

srebhan
srebhan approved these changes Jul 4, 2023
View reviewed changes
Copy link
Member

@srebhan srebhan left a comment

Choose a reason for hiding this comment

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

Nice fix @mark-chandler! Thanks for your contribution!

@srebhan srebhan changed the title fix(inputs.snmp_trap): GoSNMP global defaults fix fix(inputs.snmp_trap): Copy GoSNMP global defaults to prevent side-effects Jul 4, 2023
@srebhan srebhan added area/snmp fix pr to fix corresponding bug ready for final review This pull request has been reviewed and/or tested by multiple users and is ready for a final review. plugin/input 1. Request for new input plugins 2. Issues/PRs that are related to input plugins labels Jul 4, 2023
@mark-chandler
Copy link
Contributor Author

Nice fix @mark-chandler! Thanks for your contribution!

No worries. Always nice to give back to a great project.
@bramblek1 is a Go developer and contributed the main fix. I'm not a Go developer and the tests that I've added are a copy/paste from the existing tests with some mods for multiple configs. That part might need the closest look as I've made educated guesses on how it should work.

@powersj powersj merged commit ae16353 into influxdata:master Jul 5, 2023
powersj pushed a commit to powersj/telegraf that referenced this pull request Jul 5, 2023
@mark-chandler @powersj
fix(inputs.snmp_trap): Copy GoSNMP global defaults to prevent side-ef…
a0a80fa 
…fects (influxdata#13542)
powersj pushed a commit that referenced this pull request Jul 10, 2023
@mark-chandler @powersj
fix(inputs.snmp_trap): Copy GoSNMP global defaults to prevent side-ef…
1e8748a 
…fects (#13542)

(cherry picked from commit ae16353)
@srebhan srebhan added this to the v1.27.2 milestone Jul 10, 2023
@p-linnane p-linnane mentioned this pull request Jul 10, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@powersj powersj powersj approved these changes

@srebhan srebhan srebhan approved these changes

Assignees

@powersj powersj

Labels
area/snmp fix pr to fix corresponding bug plugin/input 1. Request for new input plugins 2. Issues/PRs that are related to input plugins ready for final review This pull request has been reviewed and/or tested by multiple users and is ready for a final review.
Projects
None yet
Milestone
v1.27.2
Development

Successfully merging this pull request may close these issues.

input: snmp_trap: only one v3 config can be used
5 participants
@mark-chandler @powersj @srebhan @bramblek1 @mc-k1