Merge branch 'collectd-4.9'

diff --git a/README b/README
index e95bae6..96fbdf3 100644 (file)
--- a/README
+++ b/README
@@ -223,6 +223,9 @@ Features
       collectd without the need to start a heavy interpreter every interval.
       See collectd-python(5) for details.
 
+    - routeros
+      Query interface and wireless registration statistics from RouterOS.
+
     - rrdcached
       RRDtool caching daemon (RRDcacheD) statistics.
 
@@ -386,6 +389,9 @@ Features
     - match_empty_counter
       Match counter values which are currently zero.
 
+    - match_hashed
+      Match values using a hash function of the hostname.
+
     - match_regex
       Match values by their identifier based on regular expressions.
 
@@ -401,6 +407,9 @@ Features
     - target_replace
       Replace parts of an identifier using regular expressions.
 
+    - target_scale
+      Scale (multiply) values by an arbitrary value.
+
     - target_set
       Set (overwrite) entire parts of an identifier.
 

diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index b81340b..f39e9bb 100644 (file)
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -7,6 +7,7 @@ endif
 EXTRA_DIST = perl/Makefile.PL \
             perl/lib/Collectd.pm \
             perl/lib/Collectd/Unixsock.pm \
+            perl/lib/Collectd/Plugins/Monitorus.pm \
             perl/lib/Collectd/Plugins/OpenVZ.pm
 
 all-local: @PERL_BINDINGS@

diff --git a/bindings/perl/lib/Collectd/Plugins/Monitorus.pm b/bindings/perl/lib/Collectd/Plugins/Monitorus.pm
index 0fee138..7054fbf 100644 (file)
--- a/bindings/perl/lib/Collectd/Plugins/Monitorus.pm
+++ b/bindings/perl/lib/Collectd/Plugins/Monitorus.pm
@@ -19,7 +19,7 @@
 #   Jeff Green <jeff at kikisoso.org>
 #
 
-package Collectd::Plugin::Monitorus;
+package Collectd::Plugins::Monitorus;
 
 use strict;
 use warnings;

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 1204d84..049b07d 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -190,6 +190,7 @@ FQDNLookup   true
 #    URL "http://finance.google.com/finance?q=NYSE%3AAMD"
 #    User "foo"
 #    Password "bar"
+#    MeasureResponseTime false
 #    <Match>
 #      Regex "<span +class=\"pr\"[^>]*> *([0-9]*\\.[0-9]+) *</span>"
 #      DSType "GaugeAverage"
@@ -563,7 +564,8 @@ FQDNLookup   true
 #      IncludeDir "/my/include/path"
 #      BaseName "Collectd::Plugin"
 #      EnableDebugger ""
-#      LoadPlugin foo
+#      LoadPlugin Monitorus
+#      LoadPlugin OpenVZ
 #
 #      <Plugin foo>
 #              Foo "Bar"
@@ -573,7 +575,12 @@ FQDNLookup   true
 
 #<Plugin ping>
 #      Host "host.foo.bar"
+#      Interval 1.0
+#      Timeout 0.9
 #      TTL 255
+#      SourceAddress "1.2.3.4"
+#      Device "eth0"
+#      MaxMissed -1
 #</Plugin>
 
 #<Plugin postgresql>
@@ -819,6 +826,7 @@ FQDNLookup   true
 
 # Load required matches:
 #@BUILD_PLUGIN_MATCH_EMPTY_COUNTER_TRUE@LoadPlugin match_empty_counter
+#@BUILD_PLUGIN_MATCH_HASHED_TRUE@LoadPlugin match_hashed
 #@BUILD_PLUGIN_MATCH_REGEX_TRUE@LoadPlugin match_regex
 #@BUILD_PLUGIN_MATCH_VALUE_TRUE@LoadPlugin match_value
 #@BUILD_PLUGIN_MATCH_TIMEDIFF_TRUE@LoadPlugin match_timediff
@@ -826,6 +834,7 @@ FQDNLookup   true
 # Load required targets:
 #@BUILD_PLUGIN_TARGET_NOTIFICATION_TRUE@LoadPlugin target_notification
 #@BUILD_PLUGIN_TARGET_REPLACE_TRUE@LoadPlugin target_replace
+#@BUILD_PLUGIN_TARGET_SCALE_TRUE@LoadPlugin target_scale
 #@BUILD_PLUGIN_TARGET_SET_TRUE@LoadPlugin target_set
 
 #----------------------------------------------------------------------------#