diskstats: Monitor disk inodes
Simon Nagl committed
May 19, 2016 at 01:46 UTC
9ad0ece2bfc18b48074298063c1a73a2341d0dd5
1 file changed
+49
-22
src/proc_diskstats.c
+49
-22
@@ -138,7 +138,7 @@ int do_proc_diskstats(int update_every, unsigned long long dt) {
138
static char path_to_get_hw_sector_size[FILENAME_MAX + 1] = "";
139
static int enable_autodetection;
140
static int enable_physical_disks, enable_virtual_disks, enable_partitions, enable_mountpoints, enable_space_metrics;
141
- static int do_io, do_ops, do_mops, do_iotime, do_qops, do_util, do_backlog, do_space;
141
+ static int do_io, do_ops, do_mops, do_iotime, do_qops, do_util, do_backlog, do_space, do_inodes;
142
static struct statvfs buff_statvfs;
143
static struct stat buff_stat;
144
@@ -158,6 +158,7 @@ int do_proc_diskstats(int update_every, unsigned long long dt) {
158
do_util = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "utilization percentage for all disks", CONFIG_ONDEMAND_ONDEMAND);
159
do_backlog = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "backlog for all disks", CONFIG_ONDEMAND_ONDEMAND);
160
do_space = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "space usage for all disks", CONFIG_ONDEMAND_ONDEMAND);
161
+ do_inodes = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "inodes usage for all disks", CONFIG_ONDEMAND_ONDEMAND);
162
163
if(!ff) {
164
char filename[FILENAME_MAX + 1];
@@ -186,7 +187,8 @@ int do_proc_diskstats(int update_every, unsigned long long dt) {
187
reads = 0, mreads = 0, readsectors = 0, readms = 0,
188
writes = 0, mwrites = 0, writesectors = 0, writems = 0,
189
queued_ios = 0, busy_ms = 0, backlog_ms = 0,
189
- space_avail = 0, space_avail_root = 0, space_used = 0;
190
+ space_avail = 0, space_avail_root = 0, space_used = 0,
191
+ inodes_avail = 0, inodes_avail_root = 0, inodes_used = 0;
192
193
unsigned long long last_reads = 0, last_readsectors = 0, last_readms = 0,
194
last_writes = 0, last_writesectors = 0, last_writems = 0,
@@ -499,10 +501,11 @@ int do_proc_diskstats(int update_every, unsigned long long dt) {
501
// Do space metrics
502
def_space = config_get_boolean_ondemand(var_name, "enable space metrics", def_space);
503
if(def_space != CONFIG_ONDEMAND_NO) {
502
- int ddo_space = do_space;
504
+ int ddo_space = do_space, ddo_inodes = do_inodes;
505
506
ddo_space = config_get_boolean_ondemand(var_name, "space", ddo_space);
505
- if(ddo_space && mount_point) {
507
+ ddo_inodes = config_get_boolean_ondemand(var_name, "inodes", ddo_space);
508
+ if(mount_point && (ddo_space || ddo_inodes) ) {
509
// collect space metrics using statvfs
510
if (statvfs(mount_point, &buff_statvfs) < 0) {
511
error("Failed checking disk space usage of %s", family);
@@ -510,28 +513,52 @@ int do_proc_diskstats(int update_every, unsigned long long dt) {
513
// verify we collected the metrics for the right disk.
514
// if not the mountpoint has changed.
515
if(stat(mount_point, &buff_stat) == -1) {
516
+ error("Failed to call stat for %s", family);
517
} else {
518
if(major(buff_stat.st_dev) == major && minor(buff_stat.st_dev) == minor)
519
{
516
- space_avail = buff_statvfs.f_bavail * buff_statvfs.f_bsize;
517
- space_avail_root = (buff_statvfs.f_bfree - buff_statvfs.f_bavail) * buff_statvfs.f_bsize;
518
- space_used = (buff_statvfs.f_blocks - buff_statvfs.f_bfree) * buff_statvfs.f_bsize;
519
-
520
- st = rrdset_find_bytype("disk_space", disk);
521
- if(!st) {
522
- st = rrdset_create("disk_space", disk, NULL, family, "disk.space", "Disk Space Usage", "GB", 2023, update_every, RRDSET_TYPE_STACKED);
523
- st->isdetail = 1;
524
-
525
- rrddim_add(st, "avail", NULL, 1, 1000*1000*1000, RRDDIM_ABSOLUTE);
526
- rrddim_add(st, "reserved_for_root", "reserved for root", 1, 1000*1000*1000, RRDDIM_ABSOLUTE);
527
- rrddim_add(st, "used" , NULL, 1, 1000*1000*1000, RRDDIM_ABSOLUTE);
520
+ if(ddo_space) {
521
+ space_avail = buff_statvfs.f_bavail * buff_statvfs.f_bsize;
522
+ space_avail_root = (buff_statvfs.f_bfree - buff_statvfs.f_bavail) * buff_statvfs.f_bsize;
523
+ space_used = (buff_statvfs.f_blocks - buff_statvfs.f_bfree) * buff_statvfs.f_bsize;
524
+
525
+ st = rrdset_find_bytype("disk_space", disk);
526
+ if(!st) {
527
+ st = rrdset_create("disk_space", disk, NULL, family, "disk.space", "Disk Space Usage", "GB", 2023, update_every, RRDSET_TYPE_STACKED);
528
+ st->isdetail = 1;
529
+
530
+ rrddim_add(st, "avail", NULL, 1, 1000*1000*1000, RRDDIM_ABSOLUTE);
531
+ rrddim_add(st, "reserved_for_root", "reserved for root", 1, 1000*1000*1000, RRDDIM_ABSOLUTE);
532
+ rrddim_add(st, "used" , NULL, 1, 1000*1000*1000, RRDDIM_ABSOLUTE);
533
+ }
534
+ else rrdset_next_usec(st, dt);
535
+
536
+ rrddim_set(st, "avail", space_avail);
537
+ rrddim_set(st, "reserved_for_root", space_avail_root);
538
+ rrddim_set(st, "used", space_used);
539
+ rrdset_done(st);
540
+ }
541
+ if(ddo_inodes) {
542
+ inodes_avail = buff_statvfs.f_favail;
543
+ inodes_avail_root = buff_statvfs.f_ffree - buff_statvfs.f_favail;
544
+ inodes_used = buff_statvfs.f_files - buff_statvfs.f_ffree;
545
+
546
+ st = rrdset_find_bytype("disk_inodes", disk);
547
+ if(!st) {
548
+ st = rrdset_create("disk_inodes", disk, NULL, family, "disk.inodes", "Disk Inodes Usage", "Inodes", 2024, update_every, RRDSET_TYPE_STACKED);
549
+ st->isdetail = 1;
550
+
551
+ rrddim_add(st, "avail", NULL, 1, 1, RRDDIM_ABSOLUTE);
552
+ rrddim_add(st, "reserved_for_root", "reserved for root", 1, 1, RRDDIM_ABSOLUTE);
553
+ rrddim_add(st, "used" , NULL, 1, 1, RRDDIM_ABSOLUTE);
554
+ }
555
+ else rrdset_next_usec(st, dt);
556
+
557
+ rrddim_set(st, "avail", inodes_avail);
558
+ rrddim_set(st, "reserved_for_root", inodes_avail_root);
559
+ rrddim_set(st, "used", inodes_used);
560
+ rrdset_done(st);
561
}
529
- else rrdset_next_usec(st, dt);
530
-
531
- rrddim_set(st, "avail", space_avail);
532
- rrddim_set(st, "reserved_for_root", space_avail_root);
533
- rrddim_set(st, "used", space_used);
534
- rrdset_done(st);
562
}
563
}
564
}