X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcollectd.conf.in;h=5088eaeaabe9847b82cb3b1c74cf40b2c2fdb382;hb=1ec46a6e59cb17f11633a0c07865c2e9e44d374e;hp=851e8eb6e590c5097080cb9dd5a54f39024f41f6;hpb=d0268299fc6a628f27667c22666f571cac839857;p=collectd.git

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 851e8eb6..5088eaea 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -182,7 +182,6 @@
 #@BUILD_PLUGIN_WRITE_MONGODB_TRUE@LoadPlugin write_mongodb
 #@BUILD_PLUGIN_WRITE_REDIS_TRUE@LoadPlugin write_redis
 #@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@LoadPlugin write_riemann
-#@BUILD_PLUGIN_WRITE_TSDB_TRUE@LoadPlugin write_tsdb
 #@BUILD_PLUGIN_XMMS_TRUE@LoadPlugin xmms
 #@BUILD_PLUGIN_ZFS_ARC_TRUE@LoadPlugin zfs_arc
 
@@ -299,6 +298,41 @@
 #</Plugin>
 
 #<Plugin curl_json>
+#  <URL "http://localhost:80/test.json">
+#    Instance "test_http_json"
+#    <Key "testArray/0">
+#      Type "gauge"
+#      # Expect: 1
+#    </Key>
+#    <Key "testArray/1">
+#      Type "gauge"
+#      # Expect: 2
+#    </Key>
+#    <Key "testArrayInbetween/0/blarg">
+#      Type "gauge"
+#      # Expect: 3
+#    </Key>
+#    <Key "testArrayInbetween/1/blub">
+#      Type "gauge"
+#      # Expect: 4
+#    </Key>
+#    <Key "testDirectHit">
+#      Type "gauge"
+#      # Expect: 5
+#    </Key>
+#    <Key "testSubLevelHit/oneMoreLevel">
+#      Type "gauge"
+#      # Expect: 6
+#    </Key>
+#  </URL>
+# put this as test.json on your webserver, the above config demonstraces
+# how to match them.
+# {
+#  "testArray":[1,2],
+#  "testArrayInbetween":[{"blarg":3},{"blub":4}],
+#  "testDirectHit":5,
+#  "testSubLevelHit":{"oneMoreLevel":6}
+# }
 ## See: http://wiki.apache.org/couchdb/Runtime_Statistics
 #  <URL "http://localhost:5984/_stats">
 #    Instance "httpd"
@@ -643,7 +677,7 @@
 #		Password "secret"
 #		Interface "eth0"
 @LOAD_PLUGIN_NETWORK@	</Server>
-#	TimeToLive "128"
+#	TimeToLive 128
 #
 #	# server setup:
 #	Listen "ff18::efc0:4a42" "25826"
@@ -652,7 +686,7 @@
 #		AuthFile "/etc/collectd/passwd"
 #		Interface "eth0"
 #	</Listen>
-#	MaxPacketSize 1024
+#	MaxPacketSize 1452
 #
 #	# proxy setup (client and server as above):
 #	Forward true
@@ -968,6 +1002,12 @@
 #  DeleteGauges   false
 #  DeleteSets     false
 #  TimerPercentile 90.0
+#  TimerPercentile 95.0
+#  TimerPercentile 99.0
+#  TimerLower     false
+#  TimerUpper     false
+#  TimerSum       false
+#  TimerCount     false
 #</Plugin>
 
 #<Plugin "swap">
@@ -1188,14 +1228,6 @@
 #	Tag "foobar"
 #</Plugin>
 
-#<Plugin write_tsdb>
-#	<Node>
-#		Host "localhost"
-#		Port "4242"
-#		HostTags "status=production"
-#	</Node>
-#</Plugin>
-
 ##############################################################################
 # Filter configuration                                                       #
 #----------------------------------------------------------------------------#