Merge branch 'collectd-4.4'

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

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 1b5696b..7c36643 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -51,6 +51,7 @@ FQDNLookup   true
 @BUILD_PLUGIN_NUT_TRUE@LoadPlugin nut
 @BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl
 @BUILD_PLUGIN_PING_TRUE@LoadPlugin ping
+@BUILD_PLUGIN_POSTGRESQL_TRUE@LoadPlugin postgresql
 @BUILD_PLUGIN_POWERDNS_TRUE@LoadPlugin powerdns
 @BUILD_PLUGIN_PROCESSES_TRUE@LoadPlugin processes
 @BUILD_PLUGIN_RRDTOOL_TRUE@LoadPlugin rrdtool
@@ -63,6 +64,7 @@ FQDNLookup   true
 @BUILD_PLUGIN_TAPE_TRUE@LoadPlugin tape
 @BUILD_PLUGIN_TCPCONNS_TRUE@LoadPlugin tcpconns
 @BUILD_PLUGIN_TEAMSPEAK2_TRUE@LoadPlugin teamspeak2
+@BUILD_PLUGIN_THERMAL_TRUE@LoadPlugin thermal
 @BUILD_PLUGIN_UNIXSOCK_TRUE@LoadPlugin unixsock
 @BUILD_PLUGIN_USERS_TRUE@LoadPlugin users
 @BUILD_PLUGIN_UUID_TRUE@LoadPlugin uuid
@@ -122,7 +124,7 @@ FQDNLookup   true
 
 #<Plugin exec>
 #      Exec "user:group" "/path/to/exec"
-#      NotificationExec "/path/to/exec"
+#      NotificationExec "user:group" "/path/to/exec"
 #</Plugin>
 
 @BUILD_PLUGIN_HDDTEMP_TRUE@<Plugin hddtemp>
@@ -246,6 +248,22 @@ FQDNLookup   true
 #      TTL 255
 #</Plugin>
 
+#<Plugin postgresql>
+#      <Database foo>
+#              Host "hostname"
+#              Port 5432
+#              User "username"
+#              Password "secret"
+#
+#              SSLMode "prefer"
+#              KRBSrvName "kerberos_service_name"
+#      </Database>
+#
+#      <Database bar>
+#              Service "service_name"
+#      </Database>
+#</Plugin>
+
 #<Plugin powerdns>
 #  <Server "server_name">
 #    Collect "latency"
@@ -353,6 +371,12 @@ FQDNLookup   true
 #      Server "8767"
 #</Plugin>
 
+#<Plugin thermal>
+#      ForceUseProcfs false
+#      Device "THRM"
+#      IgnoreSelected false
+#</Plugin>
+
 #<Plugin unixsock>
 #      SocketFile "@prefix@/var/run/@PACKAGE_NAME@-unixsock"
 #      SocketGroup "collectd"