projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #313 from tiwilliam/master
[collectd.git]
/
src
/
collectd.conf.in
diff --git
a/src/collectd.conf.in
b/src/collectd.conf.in
index
d4d5a20
..
fc9b10c
100644
(file)
--- a/
src/collectd.conf.in
+++ b/
src/collectd.conf.in
@@
-52,6
+52,7
@@
@LOAD_PLUGIN_SYSLOG@LoadPlugin syslog
@LOAD_PLUGIN_LOGFILE@LoadPlugin logfile
@LOAD_PLUGIN_SYSLOG@LoadPlugin syslog
@LOAD_PLUGIN_LOGFILE@LoadPlugin logfile
+@LOAD_PLUGIN_LOG_LOGSTASH@LoadPlugin log_logstash
#<Plugin logfile>
# LogLevel @DEFAULT_LOG_LEVEL@
#<Plugin logfile>
# LogLevel @DEFAULT_LOG_LEVEL@
@@
-60,6
+61,11
@@
# PrintSeverity false
#</Plugin>
# PrintSeverity false
#</Plugin>
+#<Plugin log_logstash>
+# LogLevel @DEFAULT_LOG_LEVEL@
+# File "@localstatedir@/log/@PACKAGE_NAME@.json.log"
+#</Plugin>
+
#<Plugin syslog>
# LogLevel @DEFAULT_LOG_LEVEL@
#</Plugin>
#<Plugin syslog>
# LogLevel @DEFAULT_LOG_LEVEL@
#</Plugin>
@@
-192,7
+198,7
@@
# ription of those options is available in the collectd.conf(5) manual page. #
##############################################################################
# ription of those options is available in the collectd.conf(5) manual page. #
##############################################################################
-#<Plugin
"aggregation"
>
+#<Plugin
aggregation
>
# <Aggregation>
# #Host "unspecified"
# Plugin "cpu"
# <Aggregation>
# #Host "unspecified"
# Plugin "cpu"
@@
-212,7
+218,7
@@
# </Aggregation>
#</Plugin>
# </Aggregation>
#</Plugin>
-#<Plugin
"amqp"
>
+#<Plugin
amqp
>
# <Publish "name">
# Host "localhost"
# Port "5672"
# <Publish "name">
# Host "localhost"
# Port "5672"
@@
-252,7
+258,7
@@
# CACert "/etc/ssl/ca.crt"
#</Plugin>
# CACert "/etc/ssl/ca.crt"
#</Plugin>
-#<Plugin
"bind"
>
+#<Plugin
bind
>
# URL "http://localhost:8053/"
# ParseTime false
# OpCodes true
# URL "http://localhost:8053/"
# ParseTime false
# OpCodes true
@@
-272,6
+278,17
@@
# </View>
#</Plugin>
# </View>
#</Plugin>
+#<Plugin cgroup>
+# CGroup "libvirt"
+# IgnoreSelected false
+#</Plugin>
+
+#<Plugin cpu>
+# ReportActive false
+# ReportByCpu true
+# ValuesPercentage false
+#</Plugin>
+#
#<Plugin csv>
# DataDir "@localstatedir@/lib/@PACKAGE_NAME@/csv"
# StoreRates false
#<Plugin csv>
# DataDir "@localstatedir@/lib/@PACKAGE_NAME@/csv"
# StoreRates false
@@
-323,7
+340,7
@@
# </URL>
#</Plugin>
# </URL>
#</Plugin>
-#<Plugin
"curl_xml"
>
+#<Plugin
curl_xml
>
# <URL "http://localhost/stats.xml">
# Host "my_host"
# Instance "some_instance"
# <URL "http://localhost/stats.xml">
# Host "my_host"
# Instance "some_instance"
@@
-373,11
+390,15
@@
# ReportByDevice false
# ReportReserved false
# ReportInodes false
# ReportByDevice false
# ReportReserved false
# ReportInodes false
+# ValuesAbsolute true
+# ValuesPercentage false
#</Plugin>
#<Plugin disk>
# Disk "/^[hs]d[a-f][0-9]?$/"
# IgnoreSelected false
#</Plugin>
#<Plugin disk>
# Disk "/^[hs]d[a-f][0-9]?$/"
# IgnoreSelected false
+# UseBSDName false
+# UdevNameAttr "DEVNAME"
#</Plugin>
#<Plugin dns>
#</Plugin>
#<Plugin dns>
@@
-416,7
+437,7
@@
# </Directory>
#</Plugin>
# </Directory>
#</Plugin>
-#<Plugin
"gmond"
>
+#<Plugin
gmond
>
# MCReceiveFrom "239.2.11.71" "8649"
# <Metric "swap_total">
# Type "swap"
# MCReceiveFrom "239.2.11.71" "8649"
# <Metric "swap_total">
# Type "swap"
@@
-460,7
+481,7
@@
# IgnoreSelected true
#</Plugin>
# IgnoreSelected true
#</Plugin>
-#<Plugin
"java"
>
+#<Plugin
java
>
# JVMArg "-verbose:jni"
# JVMArg "-Djava.class.path=@prefix@/share/collectd/java/collectd-api.jar"
#
# JVMArg "-verbose:jni"
# JVMArg "-Djava.class.path=@prefix@/share/collectd/java/collectd-api.jar"
#
@@
-479,6
+500,11
@@
# IgnoreSelected false
# HostnameFormat name
# InterfaceFormat name
# IgnoreSelected false
# HostnameFormat name
# InterfaceFormat name
+# PluginInstanceFormat name
+#</Plugin>
+
+#<Plugin load>
+# ReportRelative true
#</Plugin>
#<Plugin lpar>
#</Plugin>
#<Plugin lpar>
@@
-528,6
+554,11
@@
# </Instance>
#</Plugin>
# </Instance>
#</Plugin>
+#<Plugin memory>
+# ValuesAbsolute true
+# ValuesPercentage false
+#</Plugin>
+
#<Plugin modbus>
# <Data "data_name">
# RegisterBase 1234
#<Plugin modbus>
# <Data "data_name">
# RegisterBase 1234
@@
-555,9
+586,11
@@
# Password "secret"
# Database "db_name"
# MasterStats true
# Password "secret"
# Database "db_name"
# MasterStats true
+# ConnectTimeout 10
# </Database>
#
# <Database db_name2>
# </Database>
#
# <Database db_name2>
+# Alias "squeeze"
# Host "localhost"
# Socket "/var/run/mysql/mysqld.sock"
# SlaveStats true
# Host "localhost"
# Socket "/var/run/mysql/mysqld.sock"
# SlaveStats true
@@
-962,12
+995,14
@@
# TimerPercentile 90.0
#</Plugin>
# TimerPercentile 90.0
#</Plugin>
-#<Plugin
"swap"
>
+#<Plugin
swap
>
# ReportByDevice false
# ReportBytes true
# ReportByDevice false
# ReportBytes true
+# ValuesAbsolute true
+# ValuesPercentage false
#</Plugin>
#</Plugin>
-#<Plugin
"table"
>
+#<Plugin
table
>
# <Table "/proc/slabinfo">
# Instance "slabinfo"
# Separator " "
# <Table "/proc/slabinfo">
# Instance "slabinfo"
# Separator " "
@@
-986,9
+1021,10
@@
# </Table>
#</Plugin>
# </Table>
#</Plugin>
-#<Plugin
"tail"
>
+#<Plugin
tail
>
# <File "/var/log/exim4/mainlog">
# Instance "exim"
# <File "/var/log/exim4/mainlog">
# Instance "exim"
+# Interval 60
# <Match>
# Regex "S=([1-9][0-9]*)"
# DSType "CounterAdd"
# <Match>
# Regex "S=([1-9][0-9]*)"
# DSType "CounterAdd"
@@
-1005,7
+1041,7
@@
# </File>
#</Plugin>
# </File>
#</Plugin>
-#<Plugin
"tail_csv"
>
+#<Plugin
tail_csv
>
# <Metric "dropped">
# Type "percent"
# Instance "dropped"
# <Metric "dropped">
# Type "percent"
# Instance "dropped"
@@
-1126,7
+1162,7
@@
# <Node "example">
# Host "localhost"
# Port "2003"
# <Node "example">
# Host "localhost"
# Port "2003"
-# Protocol "
ud
p"
+# Protocol "
tc
p"
# LogSendErrors true
# Prefix "collectd"
# Postfix "collectd"
# LogSendErrors true
# Prefix "collectd"
# Postfix "collectd"
@@
-1143,6
+1179,11
@@
# VerifyPeer true
# VerifyHost true
# CACert "/etc/ssl/ca.crt"
# VerifyPeer true
# VerifyHost true
# CACert "/etc/ssl/ca.crt"
+# CAPath "/etc/ssl/certs/"
+# ClientKey "/etc/ssl/client.pem"
+# ClientCert "/etc/ssl/client.crt"
+# ClientKeyPass "secret"
+# SSLVersion "TLSv1"
# Format "Command"
# StoreRates false
# </URL>
# Format "Command"
# StoreRates false
# </URL>
@@
-1175,8
+1216,10
@@
# Protocol UDP
# StoreRates true
# AlwaysAppendDS false
# Protocol UDP
# StoreRates true
# AlwaysAppendDS false
+# TTLFactor 2.0
# </Node>
# Tag "foobar"
# </Node>
# Tag "foobar"
+# Attribute "foo" "bar"
#</Plugin>
##############################################################################
#</Plugin>
##############################################################################
@@
-1219,7
+1262,7
@@
##############################################################################
#@BUILD_PLUGIN_THRESHOLD_TRUE@LoadPlugin "threshold"
##############################################################################
#@BUILD_PLUGIN_THRESHOLD_TRUE@LoadPlugin "threshold"
-#<Plugin
"threshold"
>
+#<Plugin
threshold
>
# <Type "foo">
# WarningMin 0.00
# WarningMax 1000.00
# <Type "foo">
# WarningMin 0.00
# WarningMax 1000.00