![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Wed, 3 Jul 2013 16:21:08 +0000 (18:21 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Wed, 3 Jul 2013 16:21:08 +0000 (18:21 +0200) |
| contrib/collectd_network.py | patch | blob | history | |
| src/collectd.conf.pod | patch | blob | history | |
| src/df.c | patch | blob | history |
index 9c1e9fb1ba7aad1877ba90bb3cb5bf86315d1d06..809f19dee65d2ec89a030a762bacb5e98041d8aa 100644 (file)
assert double.size == number.size
result = []
- for dstype in buf[header.size+short.size:off]:
+ for dstype in [ord(x) for x in buf[header.size+short.size:off]]:
if dstype == DS_TYPE_COUNTER:
result.append((dstype, number.unpack_from(buf, off)[0]))
off += valskip
diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 55b964330b41600337cd67e6ed8fa950096cbbbb..6ef2822ec68669d61cb4cebe05d4ae45e4deb975 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
many small files are stored on the disk. This is a usual scenario for mail
transfer agents and web caches.
-=item B<ReportPercentage> B<false>|B<true>
+=item B<ValuesAbsolute> B<true>|B<false>
-Enables or disables reporting of disk space and inodes as a percentage.
-Defaults to B<false>.
+Enables or disables reporting of free, used and used disk space in 1K-blocks.
+Defaults to true.
+
+=item B<ValuesPercentage> B<true>|B<false>
+
+Enables or disables reporting of free, used and used disk space in percentage.
+Defaults to false.
-This is useful for deploying I<collectd> on the cloud, where machines with
-different disk size may exist. Then it is more practical to configure
-thresholds based on relative disk size.
+This is useful for deploying collectd on the cloud, where machines with
+different disk size may exist. Then it is more practical to configure thresholds
+based on relative disk size.
=back
diff --git a/src/df.c b/src/df.c
index 5ff3f59be8cbcb401dd288c17ec4b89777251b43..540985d798ea46da3d12ad24aec2e638a0075643 100644 (file)
--- a/src/df.c
+++ b/src/df.c
"ReportByDevice",
"ReportReserved",
"ReportInodes",
- "ReportPercentage"
+ "ValuesAbsolute",
+ "ValuesPercentage"
};
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
static _Bool by_device = 0;
static _Bool report_inodes = 0;
-static _Bool report_percentage = 0;
+static _Bool values_absolute = 1;
+static _Bool values_percentage = 0;
static int df_init (void)
{
return (0);
}
+ else if (strcasecmp (key, "ValuesAbsolute") == 0)
+ {
+ if (IS_TRUE (value))
+ values_absolute = 1;
+ else
+ values_absolute = 0;
- else if (strcasecmp (key, "ReportPercentage") == 0)
+ return (0);
+ }
+ else if (strcasecmp (key, "ValuesPercentage") == 0)
{
if (IS_TRUE (value))
- report_percentage = 1;
+ values_percentage = 1;
else
- report_percentage = 0;
+ values_percentage = 0;
return (0);
}
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;
}
}
blk_reserved = (uint64_t) (statbuf.f_bfree - statbuf.f_bavail);
blk_used = (uint64_t) (statbuf.f_blocks - statbuf.f_bfree);
- if (report_percentage && (statbuf.f_blocks > 0))
- {
- uint64_t blk_total = (uint64_t) statbuf.f_blocks;
- char plugin_instance[DATA_MAX_NAME_LEN];
-
- ssnprintf (plugin_instance, sizeof (plugin_instance),
- "%s-bytes", disk_name);
-
- df_submit_one (plugin_instance, "percent", "free",
- 100.0 * ((gauge_t) blk_free) / ((gauge_t) blk_total));
- df_submit_one (plugin_instance, "percent", "reserved",
- 100.0 * ((gauge_t) blk_reserved) / ((gauge_t) blk_total));
- df_submit_one (plugin_instance, "percent", "used",
- 100.0 * ((gauge_t) blk_used) / ((gauge_t) blk_total));
- }
- else if (!report_percentage)
+ if (values_absolute)
{
df_submit_one (disk_name, "df_complex", "free",
(gauge_t) (blk_free * blocksize));
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",
+ (gauge_t) ((float_t)(blk_free) / statbuf.f_blocks * 100));
+ df_submit_one (disk_name, "df_complex_pct", "reserved",
+ (gauge_t) ((float_t)(blk_reserved) / statbuf.f_blocks * 100));
+ df_submit_one (disk_name, "df_complex_pct", "used",
+ (gauge_t) ((float_t)(blk_used) / statbuf.f_blocks * 100));
+ }
+ else return (-1);
+ }
+
/* inode handling */
if (report_inodes)
{
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 (report_percentage && (statbuf.f_files > 0))
+ if (values_percentage)
{
- uint64_t inode_total = (uint64_t) statbuf.f_files;
- char plugin_instance[DATA_MAX_NAME_LEN];
-
- ssnprintf (plugin_instance, sizeof (plugin_instance),
- "%s-inodes", disk_name);
-
- df_submit_one (plugin_instance, "percent", "free",
- 100.0 * ((gauge_t) inode_free) / ((gauge_t) inode_total));
- df_submit_one (plugin_instance, "percent", "reserved",
- 100.0 * ((gauge_t) inode_reserved) / ((gauge_t) inode_total));
- df_submit_one (plugin_instance, "percent", "used",
- 100.0 * ((gauge_t) inode_used) / ((gauge_t) inode_total));
+ if (statbuf.f_files > 0)
+ {
+ df_submit_one (disk_name, "df_inodes_pct", "free",
+ (gauge_t) ((float_t)(inode_free) / statbuf.f_files * 100));
+ df_submit_one (disk_name, "df_inodes_pct", "reserved",
+ (gauge_t) ((float_t)(inode_reserved) / statbuf.f_files * 100));
+ df_submit_one (disk_name, "df_inodes_pct", "used",
+ (gauge_t) ((float_t)(inode_used) / statbuf.f_files * 100));
+ }
+ else return (-1);
}
- else if (!report_percentage)
+ if (values_absolute)
{
df_submit_one (disk_name, "df_inodes", "free",
(gauge_t) inode_free);