curl_xml plugin: add AddressFamily

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

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index f62417b..cf04872 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -1841,10 +1841,12 @@ extract information from this data, non-binary data is a big plus here ;)
 IP version to resolve URL to. Useful in cases when hostname in URL resolves
 to both IPv4 and IPv6 addresses, and you are interested in using one of them
 specifically.
 IP version to resolve URL to. Useful in cases when hostname in URL resolves
 to both IPv4 and IPv6 addresses, and you are interested in using one of them
 specifically.

-Use C<ipv4> to enforce IPv4, C<ipv6> to enforce IPv6. If C<libcurl> is compiled
-without IPv6 support, the latter will result in a warning, and fallback to C<any>.
-If C<Type> cannot be parsed, C<any> will be used as well (all IP versions that
-your system allows).
+Use C<ipv4> to enforce IPv4, C<ipv6> to enforce IPv6, or C<any> to keep the
+default behavior of resolving addresses to all IP versions your system allows.
+If C<libcurl> is compiled without IPv6 support, using C<ipv6> will result in
+a warning and fallback to C<any>.
+If C<Type> cannot be parsed, a warning will be printed and the whole B<Page>
+block will be ignored.

 
 =item B<User> I<Name>
 
 
 =item B<User> I<Name>
 


@@ -1957,6 +1959,7 @@ C<_stats> runtime statistics module of I<CouchDB>
 
   <Plugin curl_json>
     <URL "http://localhost:5984/_stats">
 
   <Plugin curl_json>
     <URL "http://localhost:5984/_stats">

+      AddressFamily "any"

       Instance "httpd"
       <Key "httpd/requests/count">
         Type "http_requests"
       Instance "httpd"
       <Key "httpd/requests/count">
         Type "http_requests"


@@ -2001,6 +2004,18 @@ The following options are valid within B<URL> blocks:
 
 =over 4
 
 
 =over 4
 

+=item B<AddressFamily> I<Type>
+
+IP version to resolve URL to. Useful in cases when hostname in URL resolves
+to both IPv4 and IPv6 addresses, and you are interested in using one of them
+specifically.
+Use C<ipv4> to enforce IPv4, C<ipv6> to enforce IPv6, or C<any> to keep the
+default behavior of resolving addresses to all IP versions your system allows.
+If C<libcurl> is compiled without IPv6 support, using C<ipv6> will result in
+a warning and fallback to C<any>.
+If C<Type> cannot be parsed, a warning will be printed and the whole B<URL>
+block will be ignored.
+

 =item B<Host> I<Name>
 
 Use I<Name> as the host name when submitting values. Defaults to the global
 =item B<Host> I<Name>
 
 Use I<Name> as the host name when submitting values. Defaults to the global


@@ -2072,6 +2087,7 @@ The B<curl_xml plugin> uses B<libcurl> (L<http://curl.haxx.se/>) and B<libxml2>
 
  <Plugin "curl_xml">
    <URL "http://localhost/stats.xml">
 
  <Plugin "curl_xml">
    <URL "http://localhost/stats.xml">

+     AddressFamily "any"

      Host "my_host"
      #Plugin "curl_xml"
      Instance "some_instance"
      Host "my_host"
      #Plugin "curl_xml"
      Instance "some_instance"


@@ -2108,6 +2124,18 @@ Within the B<URL> block the following options are accepted:
 
 =over 4
 
 
 =over 4
 

+=item B<AddressFamily> I<Type>
+
+IP version to resolve URL to. Useful in cases when hostname in URL resolves
+to both IPv4 and IPv6 addresses, and you are interested in using one of them
+specifically.
+Use C<ipv4> to enforce IPv4, C<ipv6> to enforce IPv6, or C<any> to keep the
+default behavior of resolving addresses to all IP versions your system allows.
+If C<libcurl> is compiled without IPv6 support, using C<ipv6> will result in
+a warning and fallback to C<any>.
+If C<Type> cannot be parsed, a warning will be printed and the whole B<URL>
+block will be ignored.
+

 =item B<Host> I<Name>
 
 Use I<Name> as the host name when submitting values. Defaults to the global
 =item B<Host> I<Name>
 
 Use I<Name> as the host name when submitting values. Defaults to the global