Merge branch 'collectd-4.1' into collectd-4.2

[collectd.git] / contrib / README

diff --git a/contrib/README b/contrib/README
index 6f0836f..398d13b 100644 (file)
--- a/contrib/README
+++ b/contrib/README
@@ -47,6 +47,11 @@ plugins to use the output format understood by the exec-plugin is recommended.
 See the embedded POD documentation for more details:
  $ perldoc contrib/exec-munin.px
 
+exec-smartctl
+-------------
+  Sample script for the exec plugin. Please refer to the documentation in the
+file - you will have to adapt it to your needs anyway.
+
 extractDS.px
 ------------
   Creates a new RRD-file with only one data-source (DS) of the source-RRD-
@@ -67,3 +72,12 @@ been renamed) and others have bee split up into multiple files. This script
 prints a bash-script to STDOUT which should do most of the work for you. You
 may still need to do some things by hand, read `README.migration' for more
 details.
+
+snmp-data.conf
+--------------
+  Sample configuration for the SNMP plugin. This config includes a few standard
+<Data ..> definitions that you can include in your own config using the
+`Include' statement (available since version 4.2.0). The config includes some
+data that is defined in the IF-MIB, e. g. octet or packet counters, UPS-MIB and
+whatever people have send in. If you have some more definitions please send
+them in, so others can profit from it.