Skip to content
Snippets Groups Projects
Commit f6d3dac0 authored by Chris Hines's avatar Chris Hines
Browse files

Merge branch 'master' into 'ft-telegraf-networking' 

# Conflicts:
#   roles/telegraf/tasks/main.yml
parents 0ac448f2 3c3f045d
No related branches found
No related tags found
2 merge requests!505Fix syntax error in telegraf config for softnet_stats,!338Update telegraf config to parse /proc/net/softnet_stat details
This commit is part of merge request !338. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 664 additions and 125 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment