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

Merge branch 'master' into collectd

parents 8ae7e976 baed119d
No related branches found
No related tags found
1 merge request!213Collectd
Hide whitespace changes
Inline Side-by-side
roles/collectd/templates/collectd.conf.j2
+ 2
− 4
View file @ cc87b3ae
...@@ -76,6 +76,8 @@ LoadPlugin network ...@@ -76,6 +76,8 @@ LoadPlugin network
</Plugin> </Plugin>
<Plugin network> <Plugin network>
<Server "{{ collectd_server }}" "25826"> <Server "{{ collectd_server }}" "25826">
Username collectd
Password "{{ collectd_password }}"
</Server> </Server>
</Plugin> </Plugin>
...@@ -1395,7 +1397,3 @@ LoadPlugin users ...@@ -1395,7 +1397,3 @@ LoadPlugin users
# Port "2181" # Port "2181"
#</Plugin> #</Plugin>
<Include "/etc/collectd/collectd.conf.d">
Filter "*.conf"
</Include>
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