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 #695 from mfournier/curlopt_username-fixups
[collectd.git]
/
src
/
collectd.conf.in
diff --git
a/src/collectd.conf.in
b/src/collectd.conf.in
index
18a74c6
..
eed7bc8
100644
(file)
--- a/
src/collectd.conf.in
+++ b/
src/collectd.conf.in
@@
-292,7
+292,7
@@
# </View>
#</Plugin>
# </View>
#</Plugin>
-#<Plugin cgroup>
+#<Plugin cgroup
s
>
# CGroup "libvirt"
# IgnoreSelected false
#</Plugin>
# CGroup "libvirt"
# IgnoreSelected false
#</Plugin>
@@
-313,7
+313,15
@@
# URL "http://finance.google.com/finance?q=NYSE%3AAMD"
# User "foo"
# Password "bar"
# URL "http://finance.google.com/finance?q=NYSE%3AAMD"
# User "foo"
# Password "bar"
+# Digest false
+# VerifyPeer true
+# VerifyHost true
+# CACert "/path/to/ca.crt"
+# Header "X-Custom-Header: foobar"
+# Post "foo=bar"
+#
# MeasureResponseTime false
# MeasureResponseTime false
+# MeasureResponseCode false
# <Match>
# Regex "<span +class=\"pr\"[^>]*> *([0-9]*\\.[0-9]+) *</span>"
# DSType "GaugeAverage"
# <Match>
# Regex "<span +class=\"pr\"[^>]*> *([0-9]*\\.[0-9]+) *</span>"
# DSType "GaugeAverage"
@@
-360,9
+368,12
@@
# Instance "some_instance"
# User "collectd"
# Password "thaiNg0I"
# Instance "some_instance"
# User "collectd"
# Password "thaiNg0I"
+# Digest false
# VerifyPeer true
# VerifyHost true
# CACert "/path/to/ca.crt"
# VerifyPeer true
# VerifyHost true
# CACert "/path/to/ca.crt"
+# Header "X-Custom-Header: foobar"
+# Post "foo=bar"
#
# <XPath "table[@id=\"magic_level\"]/tr">
# Type "magic_level"
#
# <XPath "table[@id=\"magic_level\"]/tr">
# Type "magic_level"
@@
-1239,6
+1250,7
@@
# StoreRates true
# AlwaysAppendDS false
# TTLFactor 2.0
# StoreRates true
# AlwaysAppendDS false
# TTLFactor 2.0
+# EventServicePrefix ""
# </Node>
# Tag "foobar"
# Attribute "foo" "bar"
# </Node>
# Tag "foobar"
# Attribute "foo" "bar"