Merge branch 'sh/teamspeak2'

[collectd.git] / src / collectd.conf.in

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 9771cfd..036916e 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -16,6 +16,7 @@ FQDNLookup   true
 @BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache
 @BUILD_PLUGIN_APCUPS_TRUE@LoadPlugin apcups
 @BUILD_PLUGIN_APPLE_SENSORS_TRUE@LoadPlugin apple_sensors
+@BUILD_PLUGIN_ASCENT_TRUE@LoadPlugin ascent
 @BUILD_PLUGIN_BATTERY_TRUE@LoadPlugin battery
 @BUILD_PLUGIN_CPU_TRUE@LoadPlugin cpu
 @BUILD_PLUGIN_CPUFREQ_TRUE@LoadPlugin cpufreq
@@ -57,7 +58,7 @@ FQDNLookup   true
 @BUILD_PLUGIN_SYSLOG_TRUE@LoadPlugin syslog
 @BUILD_PLUGIN_TAPE_TRUE@LoadPlugin tape
 @BUILD_PLUGIN_TCPCONNS_TRUE@LoadPlugin tcpconns
-@BUILD_PLUGIN_TSS2@LoadPlugin tss2
+@BUILD_PLUGIN_TEAMSPEAK2_TRUE@LoadPlugin teamspeak2
 @BUILD_PLUGIN_UNIXSOCK_TRUE@LoadPlugin unixsock
 @BUILD_PLUGIN_USERS_TRUE@LoadPlugin users
 @BUILD_PLUGIN_UUID_TRUE@LoadPlugin uuid
@@ -78,6 +79,13 @@ FQDNLookup   true
 #      Port "3551"
 #</Plugin>
 
+#<Plugin ascent>
+#      URL "http://localhost/ascent/status/"
+#      User "www-user"
+#      Password "secret"
+#      CACert "/etc/ssl/ca.crt"
+#</Plugin>
+
 #<Plugin csv>
 #      DataDir "@prefix@/var/lib/@PACKAGE_NAME@/csv"
 #      StoreRates false
@@ -280,10 +288,10 @@ FQDNLookup   true
 #      RemotePort "25"
 #</Plugin>
 
-#<Plugin tss2>
+#<Plugin teamspeak2>
 #      Host "127.0.0.1"
-#      Port 51234
-#      Server 8767
+#      Port "51234"
+#      Server "8767"
 #</Plugin>
 
 #<Plugin unixsock>