df plugin: Remove the "ReportReserved" config option.

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 2cfa196f3124ee67ccae17269b1e6ed17405e835..d7cad071d5867b0891c7eb06e874373120fcfadc 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -994,22 +994,6 @@ Report using the device name rather than the mountpoint. i.e. with this I<false>
 (the default), it will report a disk as "root", but with it I<true>, it will be
 "sda1" (or whichever).
 
-=item B<ReportReserved> B<true>|B<false>
-
-When enabled, the blocks reserved for root are reported separately. When
-disabled (the default for backwards compatibility reasons) the reserved space
-will be included in the "free" space.
-
-When disabled, the "df" type will be used to store "free" and "used" space. The
-mount point or disk name (see option B<ReportByDevice>) is used as type
-instance in this case (again: backwards compatibility).
-
-When enabled, the type "df_complex" is used and three files are created. The
-mount point or disk name is used as plugin instance and the type instance is
-set to "free", "reserved" and "used" as appropriate.
-
-Enabling this option is recommended.
-
 =item B<ReportInodes> B<true>|B<false>
 
 Enables or disables reporting of free, reserved and used inodes. Defaults to

diff --git a/src/df.c b/src/df.c
index 61d0c28cb79deb01a222c510ffc57b33ea5911bc..a96b79e5fa9f0d4cf867e2c12ff18510f1e4310f 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -120,11 +120,6 @@ static int df_config (const char *key, const char *value)
 
                return (0);
        }
-       else if (strcasecmp (key, "ReportReserved") == 0)
-       {
-               /* Nop for backwards compatibility. */
-               return (0);
-       }
        else if (strcasecmp (key, "ReportInodes") == 0)
        {
                if (IS_TRUE (value))