curl_xml: Renamed 'PluginName' option to unified 'Plugin'.

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 05e205f..ee7902c 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -1888,6 +1888,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">
      Host "my_host"
  <Plugin "curl_xml">
    <URL "http://localhost/stats.xml">
      Host "my_host"

+     #Plugin "curl_xml"

      Instance "some_instance"
      User "collectd"
      Password "thaiNg0I"
      Instance "some_instance"
      User "collectd"
      Password "thaiNg0I"


@@ -1928,12 +1929,13 @@ host name setting.
 
 =item B<Instance> I<Instance>
 
 
 =item B<Instance> I<Instance>
 

-Use I<Instance> as the plugin instance when submitting values. Defaults to an
-empty string (no plugin instance).
+Use I<Instance> as the plugin instance when submitting values.
+May be overridden by B<PluginInstanceFrom> option inside B<XPath> blocks.
+Defaults to an empty string (no plugin instance).

 
 

-=item B<PluginName> I<PluginName>
+=item B<Plugin> I<Plugin>

 
 

-Use I<PluginName> as the plugin name when submitting values.
+Use I<Plugin> as the plugin name when submitting values.

 Defaults to 'curl_xml'.
 
 =item B<Namespace> I<Prefix> I<URL>
 Defaults to 'curl_xml'.
 
 =item B<Namespace> I<Prefix> I<URL>

diff --git a/src/curl_xml.c b/src/curl_xml.c
index 6479b94..20048d0 100644 (file)
--- a/src/curl_xml.c
+++ b/src/curl_xml.c
@@ -959,7 +959,7 @@ static int cx_config_add_url(oconfig_item_t *ci) /* {{{ */
 
     if (strcasecmp("Instance", child->key) == 0)
       status = cf_util_get_string(child, &db->instance);
 
     if (strcasecmp("Instance", child->key) == 0)
       status = cf_util_get_string(child, &db->instance);

-    else if (strcasecmp("PluginName", child->key) == 0)
+    else if (strcasecmp("Plugin", child->key) == 0)

       status = cf_util_get_string(child, &db->plugin_name);
     else if (strcasecmp("Host", child->key) == 0)
       status = cf_util_get_string(child, &db->host);
       status = cf_util_get_string(child, &db->plugin_name);
     else if (strcasecmp("Host", child->key) == 0)
       status = cf_util_get_string(child, &db->host);