From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 14 Jun 2016 05:44:35 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~4
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e2b289ea039269b60edd459d2d514d3f82820e3a;p=collectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

e2b289ea039269b60edd459d2d514d3f82820e3a
diff --cc src/collectd-perl.pod
index 7308648f,02563066..0102e921
--- a/src/collectd-perl.pod
+++ b/src/collectd-perl.pod
@@@ -705,10 -705,10 +705,10 @@@ types used by the read, write and matc
  
  =over 4
  
- =item
+ =item *
  
  Please feel free to send in new plugins to collectd's mailing list at
 -E<lt>collectdE<nbsp>atE<nbsp>verplant.orgE<gt> for review and, possibly,
 +E<lt>collectdE<nbsp>atE<nbsp>collectd.orgE<gt> for review and, possibly,
  inclusion in the main distribution. In the latter case, we will take care of
  keeping the plugin up to date and adapting it to new versions of collectd.
  
diff --cc src/collectd-python.pod
index 0da891f1,8564ae77..773a6cd4
--- a/src/collectd-python.pod
+++ b/src/collectd-python.pod
@@@ -611,33 -609,7 +611,33 @@@ I<identifier> is either the string tha
  or a callback function. The identifier will be constructed in the same way as
  for the register functions.
  
 +=item B<get_dataset>(I<name>) -> I<definition>
 +
 +Returns the definition of a dataset specified by I<name>. I<definition> is a list
 +of tuples, each representing one data source. Each tuple has 4 values:
 +
 +=over 4
 +
 +=item name
 +
 +A string, the name of the data source.
 +
 +=item type
 +
 +A string that is equal to either of the variables B<DS_TYPE_COUNTER>,
 +B<DS_TYPE_GAUGE>, B<DS_TYPE_DERIVE> or B<DS_TYPE_ABSOLUTE>.
 +
 +=item min
 +
 +A float or None, the minimum value.
 +
 +=item max
 +
 +A float or None, the maximum value.
 +
 +=back
 +
- =item B<flush>(I<plugin>[, I<timeout>][, I<identifier>]) -> None
+ =item B<flush>(I<plugin[, timeout][, identifier]) -> None
  
  Flush one or all plugins. I<timeout> and the specified I<identifiers> are
  passed on to the registered flush-callbacks. If omitted, the timeout defaults
@@@ -681,10 -653,10 +681,10 @@@ types used by the read, write and matc
  
  =over 4
  
- =item
+ =item *
  
  Please feel free to send in new plugins to collectd's mailing list at
 -E<lt>collectdE<nbsp>atE<nbsp>verplant.orgE<gt> for review and, possibly,
 +E<lt>collectdE<nbsp>atE<nbsp>collectd.orgE<gt> for review and, possibly,
  inclusion in the main distribution. In the latter case, we will take care of
  keeping the plugin up to date and adapting it to new versions of collectd.
  
diff --cc src/collectd.conf.pod
index c8c4813d,f85c7e79..e5a5c754
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -1338,68 -991,6 +1338,68 @@@ at all, B<all> cgroups are selected
  
  =back
  
 +=head2 Plugin C<conntrack>
 +
 +This plugin collects IP conntrack statistics.
 +
 +=over 4
 +
 +=item B<OldFiles>
 +
 +Assume the B<conntrack_count> and B<conntrack_max> files to be found in
 +F</proc/sys/net/ipv4/netfilter> instead of F</proc/sys/net/netfilter/>.
 +
 +=back
 +
 +=head2 Plugin C<cpu>
 +
 +The I<CPU plugin> collects CPU usage metrics. By default, CPU usage is reported
 +as Jiffies, using the C<cpu> type. Two aggregations are available:
 +
 +=over 4
 +
- =item
++=item *
 +
 +Sum, per-state, over all CPUs installed in the system; and
 +
- =item
++=item *
 +
 +Sum, per-CPU, over all non-idle states of a CPU, creating an "active" state.
 +
 +=back
 +
 +The two aggregations can be combined, leading to I<collectd> only emitting a
 +single "active" metric for the entire system. As soon as one of these
 +aggregations (or both) is enabled, the I<cpu plugin> will report a percentage,
 +rather than Jiffies. In addition, you can request individual, per-state,
 +per-CPU metrics to be reported as percentage.
 +
 +The following configuration options are available:
 +
 +=over 4
 +
 +=item B<ReportByState> B<true>|B<false>
 +
 +When set to B<true>, the default, reports per-state metrics, e.g. "system",
 +"user" and "idle".
 +When set to B<false>, aggregates (sums) all I<non-idle> states into one
 +"active" metric.
 +
 +=item B<ReportByCpu> B<true>|B<false>
 +
 +When set to B<true>, the default, reports per-CPU (per-core) metrics.
 +When set to B<false>, instead of reporting metrics for individual CPUs, only a
 +global sum of CPU states is emitted.
 +
 +=item B<ValuesPercentage> B<false>|B<true>
 +
 +This option is only considered when both, B<ReportByCpu> and B<ReportByState>
 +are set to B<true>. In this case, by default, metrics will be reported as
 +Jiffies. By setting this option to B<true>, you can request percentage values
 +in the un-aggregated (per-CPU, per-state) mode as well.
 +
 +=back
 +
  =head2 Plugin C<cpufreq>
  
  This plugin doesn't have any options. It reads