X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcollectd.conf.in;h=f712f5f684f45a44546a0bdc2701514d225c1aaa;hb=67a330cb7ba890a03142a089ed1aebea8842072f;hp=851e8eb6e590c5097080cb9dd5a54f39024f41f6;hpb=7d2294322c1e6239ede5cfa3edb8783fb1e7fcd3;p=collectd.git
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 851e8eb6..f712f5f6 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -70,7 +70,7 @@
# Lines beginning with a single `#' belong to plugins which have been built #
# but are disabled by default. #
# #
-# Lines begnning with `##' belong to plugins which have not been built due #
+# Lines beginning with `##' belong to plugins which have not been built due #
# to missing dependencies or because they have been deactivated explicitly. #
##############################################################################
@@ -137,18 +137,14 @@
#@BUILD_PLUGIN_ONEWIRE_TRUE@LoadPlugin onewire
#@BUILD_PLUGIN_OPENVPN_TRUE@LoadPlugin openvpn
#@BUILD_PLUGIN_ORACLE_TRUE@LoadPlugin oracle
-#@BUILD_PLUGIN_PERL_TRUE@
-#@BUILD_PLUGIN_PERL_TRUE@ Globals true
-#@BUILD_PLUGIN_PERL_TRUE@
+#@BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl
#@BUILD_PLUGIN_PINBA_TRUE@LoadPlugin pinba
#@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_PROTOCOLS_TRUE@LoadPlugin protocols
-#@BUILD_PLUGIN_PYTHON_TRUE@
-#@BUILD_PLUGIN_PYTHON_TRUE@ Globals true
-#@BUILD_PLUGIN_PYTHON_TRUE@
+#@BUILD_PLUGIN_PYTHON_TRUE@LoadPlugin python
#@BUILD_PLUGIN_REDIS_TRUE@LoadPlugin redis
#@BUILD_PLUGIN_ROUTEROS_TRUE@LoadPlugin routeros
#@BUILD_PLUGIN_RRDCACHED_TRUE@LoadPlugin rrdcached
@@ -182,7 +178,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 +294,41 @@
#
#
+#
+# Instance "test_http_json"
+#
+# Type "gauge"
+# # Expect: 1
+#
+#
+# Type "gauge"
+# # Expect: 2
+#
+#
+# Type "gauge"
+# # Expect: 3
+#
+#
+# Type "gauge"
+# # Expect: 4
+#
+#
+# Type "gauge"
+# # Expect: 5
+#
+#
+# Type "gauge"
+# # Expect: 6
+#
+#
+# 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
#
# Instance "httpd"
@@ -377,7 +407,6 @@
# FSType "ext3"
# IgnoreSelected false
# ReportByDevice false
-# ReportReserved false
# ReportInodes false
# ValuesAbsolute true
# ValuesPercentage false
@@ -459,6 +488,7 @@
#
# Chain table chain
+# Chain6 table chain
#
#
@@ -643,7 +673,7 @@
# Password "secret"
# Interface "eth0"
@LOAD_PLUGIN_NETWORK@
-# TimeToLive "128"
+# TimeToLive 128
#
# # server setup:
# Listen "ff18::efc0:4a42" "25826"
@@ -652,7 +682,7 @@
# AuthFile "/etc/collectd/passwd"
# Interface "eth0"
#
-# MaxPacketSize 1024
+# MaxPacketSize 1452
#
# # proxy setup (client and server as above):
# Forward true
@@ -968,6 +998,12 @@
# DeleteGauges false
# DeleteSets false
# TimerPercentile 90.0
+# TimerPercentile 95.0
+# TimerPercentile 99.0
+# TimerLower false
+# TimerUpper false
+# TimerSum false
+# TimerCount false
#
#
@@ -1188,14 +1224,6 @@
# Tag "foobar"
#
-#
-#
-# Host "localhost"
-# Port "4242"
-# HostTags "status=production"
-#
-#
-
##############################################################################
# Filter configuration #
#----------------------------------------------------------------------------#