Merge pull request #2354 from rpv-tomsk/issue-2344-nut-rework

nut plugin: Multi-threaded ups polling with connect timeout.

diff --combined src/collectd.conf.pod
index 88822af,de5dc98..67ee0a9
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -5291,6 -5291,11 +5291,11 @@@ generate links like the one described a
  Example usage:
  C<c_rehash /path/to/certs/folder>
  
+ =item B<ConnectTimeout> I<Milliseconds>
+ 
+ The B<ConnectTimeout> option sets the connect timeout, in milliseconds.
+ By default, the configured B<Interval> is used to set the timeout.
+ 
  =back
  
  =head2 Plugin C<olsrd>
@@@ -7189,7 -7194,6 +7194,7 @@@ B<Synopsis:
    <Plugin snmp_agent>
      <Data "memAvailReal">
        Plugin "memory"
 +      #PluginInstance "some"
        Type "memory"
        TypeInstance "free"
        OIDs "1.3.6.1.4.1.2021.4.6.0"
@@@ -7233,12 -7237,6 +7238,12 @@@ scalar data type B<Instance> has no eff
  
  Read plugin name whose collected data will be mapped to specified OIDs.
  
 +=item B<PluginInstance> I<String>
 +
 +Read plugin instance whose collected data will be mapped to specified OIDs.
 +The field is optional and by default there is no plugin instance check.
 +Allowed only if B<Data> block defines scalar data type.
 +
  =item B<Type> I<String>
  
  Collectd's type that is to be used for specified OID, e.E<nbsp>g. "if_octets"
@@@ -7251,9 -7249,9 +7256,9 @@@ Collectd's type-instance that is to be 
  =item B<OIDs> I<OID> [I<OID> ...]
  
  Configures the OIDs to be handled by I<snmp_agent> plugin. Values for these OIDs
 -are taken from collectd data type specified by B<Plugin>, B<Type>,
 -B<TypeInstance> fields of this B<Data> block. Number of the OIDs configured
 -should correspond to number of values in specified B<Type>.
 +are taken from collectd data type specified by B<Plugin>, B<PluginInstance>,
 +B<Type>, B<TypeInstance> fields of this B<Data> block. Number of the OIDs
 +configured should correspond to number of values in specified B<Type>.
  For example two OIDs "IF-MIB::ifInOctets" "IF-MIB::ifOutOctets" can be mapped to
  "rx" and "tx" values of "if_octets" type.