Skip to content
Snippets Groups Projects
Commit 62f117f6 authored by Kerri Wait's avatar Kerri Wait
Browse files

Merge branch 'master' into 'telegraf-1.15' 

# Conflicts:
#   roles/telegraf/tasks/main.yml
#   roles/telegraf/templates/telegraf.conf.j2
parents b683c2cc 682db1c8
No related branches found
No related tags found
3 merge requests!399Capture extra NFS stats,!393Hotfix: monitor NFS GETATTR stats via telegraf,!392Temporarily disable inputs.filecount in telegraf
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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