Merge branch 'master' into procevent

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

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 184d0b9..8b970ec 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -180,6 +180,7 @@
 #@BUILD_PLUGIN_POSTGRESQL_TRUE@LoadPlugin postgresql
 #@BUILD_PLUGIN_POWERDNS_TRUE@LoadPlugin powerdns
 #@BUILD_PLUGIN_PROCESSES_TRUE@LoadPlugin processes
+#@BUILD_PLUGIN_PROCEVENT_TRUE@LoadPlugin procevent
 #@BUILD_PLUGIN_PROTOCOLS_TRUE@LoadPlugin protocols
 #@BUILD_PLUGIN_PYTHON_TRUE@LoadPlugin python
 #@BUILD_PLUGIN_REDIS_TRUE@LoadPlugin redis
@@ -1257,6 +1258,12 @@
 #      </Process>
 #</Plugin>
 
+#<Plugin "procevent">
+#  BufferLength 10
+#  ProcessRegex "/^ovs.*$/" 
+#  Process tuned
+#</Plugin>
+
 #<Plugin protocols>
 #      Value "/^Tcp:/"
 #      IgnoreSelected false
@@ -1793,7 +1800,7 @@
 #  CredentialFile "/path/to/gcp-project-id-12345.json"
 #  Email "123456789012@developer.gserviceaccount.com"
 #  <Resource "global">
-#    project_id "gcp-project-id"
+#    Label "project_id" "gcp-project-id"
 #  </Resource>
 #  Url "https://monitoring.googleapis.com/v3"
 #</Plugin>