'dbi', 'oracle' and 'postgresql' plugins: Use 'Plugin' as option name

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 8ab20d192b2ccc482d95a72e11c9ca092435cd10..6b677d269e6a4995c9a05211bb15d42deb265f3f 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -491,7 +491,7 @@
 #              </Result>
 #      </Query>
 #      <Database "customers_db">
-#              #PluginName "mycompany"
+#              #Plugin "mycompany"
 #              Driver "mysql"
 #              DriverOption "host" "localhost"
 #              DriverOption "username" "collectd"
@@ -1015,7 +1015,7 @@
 #    </Result>
 #  </Query>
 #  <Database "product_information">
-#    #PluginName "warehouse"
+#    #Plugin "warehouse"
 #    ConnectID "db01"
 #    Username "oracle"
 #    Password "secret"
@@ -1102,7 +1102,7 @@
 #              StoreRates true
 #      </Writer>
 #      <Database foo>
-#              #PluginName "kingdom"
+#              #Plugin "kingdom"
 #              Host "hostname"
 #              Port "5432"
 #              User "username"

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index b4fe2f967bd48dbee29f047ba867ab3590096e26..cf34e9ed706841ea1bce1a837944131843e4f1ed 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -2017,7 +2017,7 @@ than those of other plugins. It usually looks something like this:
       </Result>
     </Query>
     <Database "product_information">
-      #PluginName "warehouse"
+      #Plugin "warehouse"
       Driver "mysql"
       Interval 120
       DriverOption "host" "localhost"
@@ -2199,9 +2199,9 @@ the daemon. Other than that, that name is not used.
 
 =over 4
 
-=item B<PluginName> I<PluginName>
+=item B<Plugin> I<Plugin>
 
-Use I<PluginName> as the plugin name when submitting query results from
+Use I<Plugin> as the plugin name when submitting query results from
 this B<Database>. Defaults to 'dbi'.
 
 =item B<Interval> I<Interval>
@@ -5595,7 +5595,7 @@ plugin's documentation above for details.
       </Result>
     </Query>
     <Database "product_information">
-      #PluginName "warehouse"
+      #Plugin "warehouse"
       ConnectID "db01"
       Username "oracle"
       Password "secret"
@@ -5618,9 +5618,9 @@ values submitted to the daemon. Other than that, that name is not used.
 
 =over 4
 
-=item B<PluginName> I<PluginName>
+=item B<Plugin> I<Plugin>
 
-Use I<PluginName> as the plugin name when submitting query results from
+Use I<Plugin> as the plugin name when submitting query results from
 this B<Database>. Defaults to 'oracle'.
 
 =item B<ConnectID> I<ID>
@@ -5976,7 +5976,7 @@ L<http://www.postgresql.org/docs/manuals/>.
     </Writer>
 
     <Database foo>
-      PluginName "kingdom"
+      Plugin "kingdom"
       Host "hostname"
       Port "5432"
       User "username"
@@ -6298,9 +6298,9 @@ activating this option. The draw-back is, that data covering the specified
 amount of time will be lost, for example, if a single statement within the
 transaction fails or if the database server crashes.
 
-=item B<PluginName> I<PluginName>
+=item B<Plugin> I<Plugin>
 
-Use I<PluginName> as the plugin name when submitting query results from
+Use I<Plugin> as the plugin name when submitting query results from
 this B<Database>. Defaults to 'postgresql'.
 
 =item B<Instance> I<name>

diff --git a/src/dbi.c b/src/dbi.c
index ba91bffc51b24b8b769058ad8712a0c983de5e0d..7f3f2072a756c0b7842291720441e2058c8037e1 100644 (file)
--- a/src/dbi.c
+++ b/src/dbi.c
@@ -302,7 +302,7 @@ static int cdbi_config_add_database(oconfig_item_t *ci) /* {{{ */
       status = cf_util_get_string(child, &db->host);
     else if (strcasecmp("Interval", child->key) == 0)
       status = cf_util_get_cdtime(child, &db->interval);
-    else if (strcasecmp("PluginName", child->key) == 0)
+    else if (strcasecmp("Plugin", child->key) == 0)
       status = cf_util_get_string(child, &db->plugin_name);
     else {
       WARNING("dbi plugin: Option `%s' not allowed here.", child->key);

diff --git a/src/oracle.c b/src/oracle.c
index 69e519bdf1280a6f36c3def18c21dc15e8967b4a..6d245dd93016d1c144ad926d327f4e4c87eb32c7 100644 (file)
--- a/src/oracle.c
+++ b/src/oracle.c
@@ -214,7 +214,7 @@ static int o_config_add_database(oconfig_item_t *ci) /* {{{ */
       status = cf_util_get_string(child, &db->username);
     else if (strcasecmp("Password", child->key) == 0)
       status = cf_util_get_string(child, &db->password);
-    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("Query", child->key) == 0)
       status = udb_query_pick_from_list(child, queries, queries_num,

diff --git a/src/postgresql.c b/src/postgresql.c
index 70467c21a2b8e9133ddd486584f1aefa423962e2..45cd001e98c17f19f7d917e446d5958aadaf3907 100644 (file)
--- a/src/postgresql.c
+++ b/src/postgresql.c
@@ -1146,7 +1146,7 @@ static int c_psql_config_database(oconfig_item_t *ci) {
       cf_util_get_string(c, &db->password);
     else if (0 == strcasecmp(c->key, "Instance"))
       cf_util_get_string(c, &db->instance);
-    else if (0 == strcasecmp (c->key, "PluginName"))
+    else if (0 == strcasecmp (c->key, "Plugin"))
       cf_util_get_string (c, &db->plugin_name);
     else if (0 == strcasecmp(c->key, "SSLMode"))
       cf_util_get_string(c, &db->sslmode);