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.

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

Split out -w argument in iptables input #6304

Merged
merged 2 commits into from
Aug 23, 2019
Merged

Split out -w argument in iptables input #6304

merged 2 commits into from
Aug 23, 2019

Conversation

danielnelson
Copy link
Contributor

closes #6234

Required for all PRs:

  • Signed CLA.
  • Associated README.md updated.
  • Has appropriate unit tests.

@danielnelson danielnelson added this to the 1.11.5 milestone Aug 22, 2019
@danielnelson danielnelson added the fix pr to fix corresponding bug label Aug 22, 2019
@@ -91,7 +91,7 @@ func (ipt *Iptables) chainList(table, chain string) (string, error) {
}
iptablesBaseArgs := "-nvL"
if ipt.UseLock {
iptablesBaseArgs = "-wnvL"
iptablesBaseArgs = "-w -nvL"
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't this be a slice in the command args?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah

@danielnelson danielnelson merged commit 66d6b1f into master Aug 23, 2019
@danielnelson danielnelson deleted the iptables-args branch August 23, 2019 03:00
danielnelson added a commit that referenced this pull request Aug 26, 2019
bitcharmer pushed a commit to bitcharmer/telegraf that referenced this pull request Oct 18, 2019
athoune pushed a commit to bearstech/telegraf that referenced this pull request Apr 17, 2020
idohalevi pushed a commit to idohalevi/telegraf that referenced this pull request Sep 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
fix pr to fix corresponding bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

iptables input plugin use_lock error
2 participants