X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdf.c;h=a6fa526a9654135a6fa6fab42df101f56ba10a87;hb=79d834024d69d3b33e0fc4717b6560385b54cdd1;hp=540985d798ea46da3d12ad24aec2e638a0075643;hpb=103eff4c982d162e8317c222ca2ffbe2a2bb9ad5;p=collectd.git diff --git a/src/df.c b/src/df.c index 540985d7..a6fa526a 100644 --- a/src/df.c +++ b/src/df.c @@ -17,7 +17,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * * Authors: - * Florian octo Forster + * Florian octo Forster * Paul Sadauskas **/ @@ -304,21 +304,21 @@ static int df_read (void) df_submit_one (disk_name, "df_complex", "used", (gauge_t) (blk_used * blocksize)); } - + if (values_percentage) { if (statbuf.f_blocks > 0) { - df_submit_one (disk_name, "df_complex_pct", "free", + df_submit_one (disk_name, "percent_bytes", "free", (gauge_t) ((float_t)(blk_free) / statbuf.f_blocks * 100)); - df_submit_one (disk_name, "df_complex_pct", "reserved", + df_submit_one (disk_name, "percent_bytes", "reserved", (gauge_t) ((float_t)(blk_reserved) / statbuf.f_blocks * 100)); - df_submit_one (disk_name, "df_complex_pct", "used", + df_submit_one (disk_name, "percent_bytes", "used", (gauge_t) ((float_t)(blk_used) / statbuf.f_blocks * 100)); } else return (-1); } - + /* inode handling */ if (report_inodes) { @@ -331,7 +331,7 @@ static int df_read (void) statbuf.f_ffree = statbuf.f_favail; if (statbuf.f_files < statbuf.f_ffree) statbuf.f_files = statbuf.f_ffree; - + inode_free = (uint64_t) statbuf.f_favail; inode_reserved = (uint64_t) (statbuf.f_ffree - statbuf.f_favail); inode_used = (uint64_t) (statbuf.f_files - statbuf.f_ffree); @@ -340,11 +340,11 @@ static int df_read (void) { if (statbuf.f_files > 0) { - df_submit_one (disk_name, "df_inodes_pct", "free", + df_submit_one (disk_name, "percent_inodes", "free", (gauge_t) ((float_t)(inode_free) / statbuf.f_files * 100)); - df_submit_one (disk_name, "df_inodes_pct", "reserved", + df_submit_one (disk_name, "percent_inodes", "reserved", (gauge_t) ((float_t)(inode_reserved) / statbuf.f_files * 100)); - df_submit_one (disk_name, "df_inodes_pct", "used", + df_submit_one (disk_name, "percent_inodes", "used", (gauge_t) ((float_t)(inode_used) / statbuf.f_files * 100)); } else return (-1);