projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.3' into collectd-5.4
[collectd.git]
/
src
/
df.c
diff --git
a/src/df.c
b/src/df.c
index
0b22308
..
3d5a402
100644
(file)
--- a/
src/df.c
+++ b/
src/df.c
@@
-231,7
+231,7
@@
static int df_read (void)
if (!statbuf.f_blocks)
continue;
if (!statbuf.f_blocks)
continue;
- if (by_device)
+ if (by_device)
{
/* eg, /dev/hda1 -- strip off the "/dev/" */
if (strncmp (mnt_ptr->spec_device, "/dev/", strlen ("/dev/")) == 0)
{
/* eg, /dev/hda1 -- strip off the "/dev/" */
if (strncmp (mnt_ptr->spec_device, "/dev/", strlen ("/dev/")) == 0)
@@
-239,13
+239,13
@@
static int df_read (void)
else
sstrncpy (disk_name, mnt_ptr->spec_device, sizeof (disk_name));
else
sstrncpy (disk_name, mnt_ptr->spec_device, sizeof (disk_name));
- if (strlen(disk_name) < 1)
+ if (strlen(disk_name) < 1)
{
{
- DEBUG("df: no device name
name
for mountpoint %s, skipping", mnt_ptr->dir);
+ DEBUG("df: no device name for mountpoint %s, skipping", mnt_ptr->dir);
continue;
}
continue;
}
- }
- else
+ }
+ else
{
if (strcmp (mnt_ptr->dir, "/") == 0)
{
{
if (strcmp (mnt_ptr->dir, "/") == 0)
{
@@
-304,21
+304,21
@@
static int df_read (void)
df_submit_one (disk_name, "df_complex", "used",
(gauge_t) (blk_used * blocksize));
}
df_submit_one (disk_name, "df_complex", "used",
(gauge_t) (blk_used * blocksize));
}
-
+
if (values_percentage)
{
if (values_percentage)
{
- if (statbuf.f_blocks > 0)
+ 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));
(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));
(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);
}
(gauge_t) ((float_t)(blk_used) / statbuf.f_blocks * 100));
}
else return (-1);
}
-
+
/* inode handling */
if (report_inodes)
{
/* inode handling */
if (report_inodes)
{
@@
-331,25
+331,25
@@
static int df_read (void)
statbuf.f_ffree = statbuf.f_favail;
if (statbuf.f_files < statbuf.f_ffree)
statbuf.f_files = statbuf.f_ffree;
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);
if (values_percentage)
{
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);
if (values_percentage)
{
- if (statbuf.f_files > 0)
+ 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));
(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));
(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);
}
(gauge_t) ((float_t)(inode_used) / statbuf.f_files * 100));
}
else return (-1);
}
- if (values_absolute)
+ if (values_absolute)
{
df_submit_one (disk_name, "df_inodes", "free",
(gauge_t) inode_free);
{
df_submit_one (disk_name, "df_inodes", "free",
(gauge_t) inode_free);