#define DISK_TYPE_PARTITION 2
#define DISK_TYPE_CONTAINER 3
+#ifndef NETDATA_RELOAD_MOUNTINFO_EVERY
+#define NETDATA_RELOAD_MOUNTINFO_EVERY 10
+#endif
+
static struct disk {
char *disk; // the name of the disk (sda, sdb, etc)
unsigned long major;
unsigned long minor;
int sector_size;
int type;
+
char *mount_point;
+ uint32_t mount_point_hash;
// disk options caching
int configured;
static struct mountinfo *disk_mountinfo_root = NULL;
+static inline void mountinfo_reload(int force) {
+ static time_t last_loaded = 0;
+ time_t now = time(NULL);
+
+ if(force || now - last_loaded >= NETDATA_RELOAD_MOUNTINFO_EVERY) {
+//#ifdef NETDATA_INTERNAL_CHECKS
+// info("Reloading mountinfo");
+//#endif
+
+ // mountinfo_free() can be called with NULL disk_mountinfo_root
+ mountinfo_free(disk_mountinfo_root);
+
+ // re-read mountinfo in case something changed
+ disk_mountinfo_root = mountinfo_read();
+
+ last_loaded = now;
+ }
+}
+
+
+// linked list of mount points that are by default disabled
+static struct excluded_mount_point {
+ const char *prefix;
+ size_t len;
+ struct excluded_mount_point *next;
+} *excluded_mount_points = NULL;
+
+static inline int is_mount_point_excluded(const char *mount_point) {
+ static int initialized = 0;
+
+ if(unlikely(!initialized)) {
+ initialized = 1;
+
+ char *a = config_get("plugin:proc:/proc/diskstats", "exclude space metrics on paths", "/var/run/user/ /run/user/");
+ if(a && *a) {
+ char *s = a;
+
+ while(s && *s) {
+ // skip all spaces
+ while(isspace(*s)) s++;
+
+ // empty string
+ if(unlikely(!*s)) break;
+
+ // find the next space
+ char *c = s;
+ while(*c && !isspace(*c)) c++;
+
+ char *n;
+ if(likely(*c)) n = c + 1;
+ else n = NULL;
+
+ // terminate our string
+ *c = '\0';
+
+ // allocate the structure
+ struct excluded_mount_point *m = mallocz(sizeof(struct excluded_mount_point));
+ m->prefix = strdup(s);
+ m->len = strlen(m->prefix);
+ m->next = excluded_mount_points;
+ excluded_mount_points = m;
+
+ // prepare for next loop
+ s = n;
+ if(likely(n)) *c = ' ';
+ }
+ }
+ }
+
+ size_t len = strlen(mount_point);
+ struct excluded_mount_point *m;
+ for(m = excluded_mount_points; m ; m = m->next) {
+ if(m->len <= len) {
+ // fprintf(stderr, "SPACE: comparing '%s' with '%s'\n", mount_point, m->prefix);
+ if(unlikely(strncmp(m->prefix, mount_point, m->len) == 0)) {
+ // fprintf(stderr, "SPACE: excluded '%s'\n", mount_point);
+ return 1;
+ }
+ }
+ }
+
+ // fprintf(stderr, "SPACE: included '%s'\n", mount_point);
+ return 0;
+}
+
+// Data to be stored in DICTIONARY mount_points used by do_disk_space_stats().
+// This DICTIONARY is used to lookup the settings of the mount point on each iteration.
+struct mount_point_metadata {
+ int do_space;
+ int do_inodes;
+};
+
+static inline void do_disk_space_stats(struct disk *d, const char *mount_point, const char *mount_source, const char *disk, const char *family, int update_every, unsigned long long dt) {
+ (void)dt;
+
+ static DICTIONARY *mount_points = NULL;
+ int do_space, do_inodes;
+
+ if(unlikely(!mount_points)) {
+ mount_points = dictionary_create(DICTIONARY_FLAG_SINGLE_THREADED);
+ }
+
+ if(unlikely(d)) {
+ // verify we collected the metrics for the right disk.
+ // if not the mountpoint has changed.
+
+ struct stat buff_stat;
+ if(unlikely(stat(mount_point, &buff_stat) == -1)) {
+ error("Failed to stat() for '%s' (disk '%s')", mount_point, disk);
+ return;
+ }
+ else if(unlikely(major(buff_stat.st_dev) != d->major || minor(buff_stat.st_dev) != d->minor)) {
+ error("Disk '%s' (disk '%s') switched major:minor", mount_point, disk);
+ freez(d->mount_point);
+ d->mount_point = NULL;
+ d->mount_point_hash = 0;
+ return;
+ }
+
+ do_space = d->do_space;
+ do_inodes = d->do_inodes;
+ }
+ else {
+ struct mount_point_metadata *m = dictionary_get(mount_points, mount_point);
+ if(unlikely(!m)) {
+ char var_name[4096 + 1];
+ snprintfz(var_name, 4096, "plugin:proc:/proc/diskstats:%s", mount_point);
+
+ int def_space = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "space usage for all disks", CONFIG_ONDEMAND_ONDEMAND);
+ int def_inodes = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "inodes usage for all disks", CONFIG_ONDEMAND_ONDEMAND);
+
+ if(unlikely(is_mount_point_excluded(mount_point))) {
+ def_space = CONFIG_ONDEMAND_NO;
+ def_inodes = CONFIG_ONDEMAND_NO;
+ }
+
+ do_space = config_get_boolean_ondemand(var_name, "space usage", def_space);
+ do_inodes = config_get_boolean_ondemand(var_name, "inodes usage", def_inodes);
+
+ struct mount_point_metadata mp = {
+ .do_space = do_space,
+ .do_inodes = do_inodes
+ };
+
+ dictionary_set(mount_points, mount_point, &mp, sizeof(struct mount_point_metadata));
+ }
+ else {
+ do_space = m->do_space;
+ do_inodes = m->do_inodes;
+ }
+ }
+
+ if(unlikely(do_space == CONFIG_ONDEMAND_NO && do_inodes == CONFIG_ONDEMAND_NO))
+ return;
+
+ struct statvfs buff_statvfs;
+ if (statvfs(mount_point, &buff_statvfs) < 0) {
+ error("Failed statvfs() for '%s' (disk '%s')", mount_point, disk);
+ return;
+ }
+
+ // taken from get_fs_usage() found in coreutils
+ unsigned long bsize = (buff_statvfs.f_frsize) ? buff_statvfs.f_frsize : buff_statvfs.f_bsize;
+
+ fsblkcnt_t bavail = buff_statvfs.f_bavail;
+ fsblkcnt_t btotal = buff_statvfs.f_blocks;
+ fsblkcnt_t bavail_root = buff_statvfs.f_bfree;
+ fsblkcnt_t breserved_root = bavail_root - bavail;
+ fsblkcnt_t bused;
+ if(likely(btotal >= bavail_root))
+ bused = btotal - bavail_root;
+ else
+ bused = bavail_root - btotal;
+
+#ifdef NETDATA_INTERNAL_CHECKS
+ if(unlikely(btotal != bavail + breserved_root + bused))
+ error("Disk block statistics for '%s' (disk '%s') do not sum up: total = %llu, available = %llu, reserved = %llu, used = %llu", mount_point, disk, (unsigned long long)btotal, (unsigned long long)bavail, (unsigned long long)breserved_root, (unsigned long long)bused);
+#endif
+
+ // --------------------------------------------------------------------------
+
+ fsfilcnt_t favail = buff_statvfs.f_favail;
+ fsfilcnt_t ftotal = buff_statvfs.f_files;
+ fsfilcnt_t favail_root = buff_statvfs.f_ffree;
+ fsfilcnt_t freserved_root = favail_root - favail;
+ fsfilcnt_t fused = ftotal - favail_root;
+
+#ifdef NETDATA_INTERNAL_CHECKS
+ if(unlikely(btotal != bavail + breserved_root + bused))
+ error("Disk inode statistics for '%s' (disk '%s') do not sum up: total = %llu, available = %llu, reserved = %llu, used = %llu", mount_point, disk, (unsigned long long)ftotal, (unsigned long long)favail, (unsigned long long)freserved_root, (unsigned long long)fused);
+#endif
+
+ // --------------------------------------------------------------------------
+
+ RRDSET *st;
+
+ if(do_space == CONFIG_ONDEMAND_YES || (do_space == CONFIG_ONDEMAND_ONDEMAND && (bavail || breserved_root || bused))) {
+ st = rrdset_find_bytype("disk_space", disk);
+ if(unlikely(!st)) {
+ char title[4096 + 1];
+ snprintfz(title, 4096, "Disk Space Usage for %s [%s]", family, mount_source);
+ st = rrdset_create("disk_space", disk, NULL, family, "disk.space", title, "GB", 2023, update_every, RRDSET_TYPE_STACKED);
+
+ rrddim_add(st, "avail", NULL, bsize, 1024*1024*1024, RRDDIM_ABSOLUTE);
+ rrddim_add(st, "used" , NULL, bsize, 1024*1024*1024, RRDDIM_ABSOLUTE);
+ rrddim_add(st, "reserved_for_root", "reserved for root", bsize, 1024*1024*1024, RRDDIM_ABSOLUTE);
+ }
+ else rrdset_next(st);
+
+ rrddim_set(st, "avail", bavail);
+ rrddim_set(st, "used", bused);
+ rrddim_set(st, "reserved_for_root", breserved_root);
+ rrdset_done(st);
+ }
+
+ // --------------------------------------------------------------------------
+
+ if(do_inodes == CONFIG_ONDEMAND_YES || (do_inodes == CONFIG_ONDEMAND_ONDEMAND && (favail || freserved_root || fused))) {
+ st = rrdset_find_bytype("disk_inodes", disk);
+ if(unlikely(!st)) {
+ char title[4096 + 1];
+ snprintfz(title, 4096, "Disk Files (inodes) Usage for %s [%s]", family, mount_source);
+ st = rrdset_create("disk_inodes", disk, NULL, family, "disk.inodes", title, "Inodes", 2024, update_every, RRDSET_TYPE_STACKED);
+
+ rrddim_add(st, "avail", NULL, 1, 1, RRDDIM_ABSOLUTE);
+ rrddim_add(st, "used" , NULL, 1, 1, RRDDIM_ABSOLUTE);
+ rrddim_add(st, "reserved_for_root", "reserved for root", 1, 1, RRDDIM_ABSOLUTE);
+ }
+ else rrdset_next(st);
+
+ rrddim_set(st, "avail", favail);
+ rrddim_set(st, "used", fused);
+ rrddim_set(st, "reserved_for_root", freserved_root);
+ rrdset_done(st);
+ }
+}
+
static struct disk *get_disk(unsigned long major, unsigned long minor, char *disk) {
static char path_to_get_hw_sector_size[FILENAME_MAX + 1] = "";
static char path_to_get_hw_sector_size_partitions[FILENAME_MAX + 1] = "";
d->next = NULL;
// append it to the list
- if(!disk_root)
+ if(unlikely(!disk_root))
disk_root = d;
else {
struct disk *last;
// find if it is a partition
// by checking if /sys/dev/block/MAJOR:MINOR/partition is readable.
snprintfz(buffer, FILENAME_MAX, path_find_block_device, major, minor, "partition");
- if(access(buffer, R_OK) == 0) {
+ if(likely(access(buffer, R_OK) == 0)) {
d->type = DISK_TYPE_PARTITION;
- } else {
+ }
+ else {
// find if it is a container
// by checking if /sys/dev/block/MAJOR:MINOR/slaves has entries
snprintfz(buffer, FILENAME_MAX, path_find_block_device, major, minor, "slaves/");
- DIR *dirp = opendir(buffer);
- if (dirp != NULL) {
+ DIR *dirp = opendir(buffer);
+ if(likely(dirp != NULL)) {
struct dirent *dp;
while( (dp = readdir(dirp)) ) {
// . and .. are also files in empty folders.
- if(strcmp(dp->d_name, ".") == 0 || strcmp(dp->d_name, "..") == 0) {
+ if(unlikely(strcmp(dp->d_name, ".") == 0 || strcmp(dp->d_name, "..") == 0)) {
continue;
}
// Stop the loop after we found one file.
break;
}
- if(closedir(dirp) == -1)
+ if(unlikely(closedir(dirp) == -1))
error("Unable to close dir %s", buffer);
}
}
// mountinfo_find() can be called with NULL disk_mountinfo_root
struct mountinfo *mi = mountinfo_find(disk_mountinfo_root, d->major, d->minor);
- if(unlikely(!mi)) {
- // mountinfo_free() can be called with NULL disk_mountinfo_root
- mountinfo_free(disk_mountinfo_root);
-
- // re-read mountinfo in case something changed
- disk_mountinfo_root = mountinfo_read();
+/* if(unlikely(!mi)) {
+ mountinfo_reload(1);
// search again for this disk
mi = mountinfo_find(disk_mountinfo_root, d->major, d->minor);
}
-
- if(mi)
+*/
+ if(unlikely(mi)) {
d->mount_point = strdupz(mi->mount_point);
- // no need to check for NULL
- else
+ d->mount_point_hash = mi->mount_point_hash;
+ }
+ else {
d->mount_point = NULL;
+ d->mount_point_hash = 0;
+ }
// ------------------------------------------------------------------------
// find the disk sector size
- if(!path_to_get_hw_sector_size[0]) {
+ if(unlikely(!path_to_get_hw_sector_size[0])) {
snprintfz(buffer, FILENAME_MAX, "%s%s", global_host_prefix, "/sys/block/%s/queue/hw_sector_size");
snprintfz(path_to_get_hw_sector_size, FILENAME_MAX, "%s", config_get("plugin:proc:/proc/diskstats", "path to get h/w sector size", buffer));
}
- if(!path_to_get_hw_sector_size_partitions[0]) {
+ if(unlikely(!path_to_get_hw_sector_size_partitions[0])) {
snprintfz(buffer, FILENAME_MAX, "%s%s", global_host_prefix, "/sys/dev/block/%lu:%lu/subsystem/%s/../queue/hw_sector_size");
snprintfz(path_to_get_hw_sector_size_partitions, FILENAME_MAX, "%s", config_get("plugin:proc:/proc/diskstats", "path to get h/w sector size for partitions", buffer));
}
// replace all / with !
for(t = tf; *t ;t++)
- if(*t == '/') *t = '!';
+ if(unlikely(*t == '/')) *t = '!';
- if(d->type == DISK_TYPE_PARTITION)
+ if(likely(d->type == DISK_TYPE_PARTITION))
snprintfz(buffer, FILENAME_MAX, path_to_get_hw_sector_size_partitions, d->major, d->minor, tf);
else
snprintfz(buffer, FILENAME_MAX, path_to_get_hw_sector_size, tf);
FILE *fpss = fopen(buffer, "r");
- if(fpss) {
+ if(likely(fpss)) {
char buffer2[1024 + 1];
char *tmp = fgets(buffer2, 1024, fpss);
- if(tmp) {
+ if(likely(tmp)) {
d->sector_size = atoi(tmp);
- if(d->sector_size <= 0) {
+ if(unlikely(d->sector_size <= 0)) {
error("Invalid sector size %d for device %s in %s. Assuming 512.", d->sector_size, d->disk, buffer);
d->sector_size = 512;
}
}
static inline int select_positive_option(int option1, int option2) {
- if(option1 == CONFIG_ONDEMAND_YES || option2 == CONFIG_ONDEMAND_YES)
+ if(unlikely(option1 == CONFIG_ONDEMAND_YES || option2 == CONFIG_ONDEMAND_YES))
return CONFIG_ONDEMAND_YES;
- else if(option1 == CONFIG_ONDEMAND_ONDEMAND || option2 == CONFIG_ONDEMAND_ONDEMAND)
+ else if(unlikely(option1 == CONFIG_ONDEMAND_ONDEMAND || option2 == CONFIG_ONDEMAND_ONDEMAND))
return CONFIG_ONDEMAND_ONDEMAND;
return CONFIG_ONDEMAND_NO;
}
int do_proc_diskstats(int update_every, unsigned long long dt) {
+ (void)dt;
+
static procfile *ff = NULL;
- static struct statvfs buff_statvfs;
- static struct stat buff_stat;
static int global_enable_new_disks_detected_at_runtime = CONFIG_ONDEMAND_YES,
global_enable_performance_for_physical_disks = CONFIG_ONDEMAND_ONDEMAND,
global_enable_performance_for_virtual_disks = CONFIG_ONDEMAND_NO,
global_enable_performance_for_partitions = CONFIG_ONDEMAND_NO,
global_enable_performance_for_mountpoints = CONFIG_ONDEMAND_NO,
global_enable_performance_for_virtual_mountpoints = CONFIG_ONDEMAND_ONDEMAND,
- global_enable_space_for_mountpoints = CONFIG_ONDEMAND_ONDEMAND,
global_do_io = CONFIG_ONDEMAND_ONDEMAND,
global_do_ops = CONFIG_ONDEMAND_ONDEMAND,
global_do_mops = CONFIG_ONDEMAND_ONDEMAND,
global_do_qops = CONFIG_ONDEMAND_ONDEMAND,
global_do_util = CONFIG_ONDEMAND_ONDEMAND,
global_do_backlog = CONFIG_ONDEMAND_ONDEMAND,
- global_do_space = CONFIG_ONDEMAND_ONDEMAND,
- global_do_inodes = CONFIG_ONDEMAND_ONDEMAND,
globals_initialized = 0;
if(unlikely(!globals_initialized)) {
global_enable_performance_for_partitions = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "performance metrics for partitions", global_enable_performance_for_partitions);
global_enable_performance_for_mountpoints = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "performance metrics for mounted filesystems", global_enable_performance_for_mountpoints);
global_enable_performance_for_virtual_mountpoints = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "performance metrics for mounted virtual disks", global_enable_performance_for_virtual_mountpoints);
- global_enable_space_for_mountpoints = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "space metrics for mounted filesystems", global_enable_space_for_mountpoints);
global_do_io = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "bandwidth for all disks", global_do_io);
global_do_ops = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "operations for all disks", global_do_ops);
global_do_qops = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "queued operations for all disks", global_do_qops);
global_do_util = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "utilization percentage for all disks", global_do_util);
global_do_backlog = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "backlog for all disks", global_do_backlog);
- global_do_space = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "space usage for all disks", global_do_space);
- global_do_inodes = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "inodes usage for all disks", global_do_inodes);
globals_initialized = 1;
}
- if(!ff) {
+ if(unlikely(!ff)) {
char filename[FILENAME_MAX + 1];
snprintfz(filename, FILENAME_MAX, "%s%s", global_host_prefix, "/proc/diskstats");
ff = procfile_open(config_get("plugin:proc:/proc/diskstats", "filename to monitor", filename), " \t", PROCFILE_FLAG_DEFAULT);
}
- if(!ff) return 1;
+ if(unlikely(!ff)) return 1;
ff = procfile_readall(ff);
- if(!ff) return 0; // we return 0, so that we will retry to open it next time
+ if(unlikely(!ff)) return 0; // we return 0, so that we will retry to open it next time
uint32_t lines = procfile_lines(ff), l;
- uint32_t words;
+
+ // this is smart enough not to reload it every time
+ mountinfo_reload(0);
for(l = 0; l < lines ;l++) {
// --------------------------------------------------------------------------
// Read parameters
char *disk;
- unsigned long long major = 0, minor = 0,
- reads = 0, mreads = 0, readsectors = 0, readms = 0,
+ unsigned long major = 0, minor = 0;
+
+ collected_number reads = 0, mreads = 0, readsectors = 0, readms = 0,
writes = 0, mwrites = 0, writesectors = 0, writems = 0,
- queued_ios = 0, busy_ms = 0, backlog_ms = 0,
- space_avail = 0, space_avail_root = 0, space_used = 0,
- inodes_avail = 0, inodes_avail_root = 0, inodes_used = 0;
+ queued_ios = 0, busy_ms = 0, backlog_ms = 0;
- unsigned long long last_reads = 0, last_readsectors = 0, last_readms = 0,
+ collected_number last_reads = 0, last_readsectors = 0, last_readms = 0,
last_writes = 0, last_writesectors = 0, last_writems = 0,
last_busy_ms = 0;
- words = procfile_linewords(ff, l);
- if(words < 14) continue;
+ uint32_t words = procfile_linewords(ff, l);
+ if(unlikely(words < 14)) continue;
- major = strtoull(procfile_lineword(ff, l, 0), NULL, 10);
- minor = strtoull(procfile_lineword(ff, l, 1), NULL, 10);
+ major = strtoul(procfile_lineword(ff, l, 0), NULL, 10);
+ minor = strtoul(procfile_lineword(ff, l, 1), NULL, 10);
disk = procfile_lineword(ff, l, 2);
// # of reads completed # of writes completed
snprintfz(var_name, 4096, "plugin:proc:/proc/diskstats:%s", disk);
int def_enable = config_get_boolean_ondemand(var_name, "enable", global_enable_new_disks_detected_at_runtime);
- if(def_enable == CONFIG_ONDEMAND_NO) {
+ if(unlikely(def_enable == CONFIG_ONDEMAND_NO)) {
// the user does not want any metrics for this disk
d->do_io = CONFIG_ONDEMAND_NO;
d->do_ops = CONFIG_ONDEMAND_NO;
if(d->mount_point)
def_performance = select_positive_option(def_performance, global_enable_performance_for_virtual_mountpoints);
-
break;
}
ddo_backlog = CONFIG_ONDEMAND_NO;
// we enable individual performance charts only when def_performance is not disabled
- if(def_performance != CONFIG_ONDEMAND_NO) {
+ if(unlikely(def_performance != CONFIG_ONDEMAND_NO)) {
ddo_io = global_do_io,
ddo_ops = global_do_ops,
ddo_mops = global_do_mops,
d->do_backlog = config_get_boolean_ondemand(var_name, "backlog", ddo_backlog);
// def_space
- if(d->mount_point) {
+ if(unlikely(d->mount_point)) {
// check the user configuration (this will also show our 'on demand' decision)
def_space = config_get_boolean_ondemand(var_name, "enable space metrics", def_space);
d->do_io = CONFIG_ONDEMAND_YES;
st = rrdset_find_bytype(RRD_TYPE_DISK, disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create(RRD_TYPE_DISK, disk, NULL, family, "disk.io", "Disk I/O Bandwidth", "kilobytes/s", 2000, update_every, RRDSET_TYPE_AREA);
rrddim_add(st, "reads", NULL, d->sector_size, 1024, RRDDIM_INCREMENTAL);
rrddim_add(st, "writes", NULL, d->sector_size * -1, 1024, RRDDIM_INCREMENTAL);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
last_readsectors = rrddim_set(st, "reads", readsectors);
last_writesectors = rrddim_set(st, "writes", writesectors);
d->do_ops = CONFIG_ONDEMAND_YES;
st = rrdset_find_bytype("disk_ops", disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create("disk_ops", disk, NULL, family, "disk.ops", "Disk Completed I/O Operations", "operations/s", 2001, update_every, RRDSET_TYPE_LINE);
st->isdetail = 1;
rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_INCREMENTAL);
rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_INCREMENTAL);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
last_reads = rrddim_set(st, "reads", reads);
last_writes = rrddim_set(st, "writes", writes);
d->do_qops = CONFIG_ONDEMAND_YES;
st = rrdset_find_bytype("disk_qops", disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create("disk_qops", disk, NULL, family, "disk.qops", "Disk Current I/O Operations", "operations", 2002, update_every, RRDSET_TYPE_LINE);
st->isdetail = 1;
rrddim_add(st, "operations", NULL, 1, 1, RRDDIM_ABSOLUTE);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
rrddim_set(st, "operations", queued_ios);
rrdset_done(st);
d->do_backlog = CONFIG_ONDEMAND_YES;
st = rrdset_find_bytype("disk_backlog", disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create("disk_backlog", disk, NULL, family, "disk.backlog", "Disk Backlog", "backlog (ms)", 2003, update_every, RRDSET_TYPE_AREA);
st->isdetail = 1;
rrddim_add(st, "backlog", NULL, 1, 10, RRDDIM_INCREMENTAL);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
rrddim_set(st, "backlog", backlog_ms);
rrdset_done(st);
d->do_util = CONFIG_ONDEMAND_YES;
st = rrdset_find_bytype("disk_util", disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create("disk_util", disk, NULL, family, "disk.util", "Disk Utilization Time", "% of time working", 2004, update_every, RRDSET_TYPE_AREA);
st->isdetail = 1;
rrddim_add(st, "utilization", NULL, 1, 10, RRDDIM_INCREMENTAL);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
last_busy_ms = rrddim_set(st, "utilization", busy_ms);
rrdset_done(st);
d->do_mops = CONFIG_ONDEMAND_YES;
st = rrdset_find_bytype("disk_mops", disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create("disk_mops", disk, NULL, family, "disk.mops", "Disk Merged Operations", "merged operations/s", 2021, update_every, RRDSET_TYPE_LINE);
st->isdetail = 1;
rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_INCREMENTAL);
rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_INCREMENTAL);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
rrddim_set(st, "reads", mreads);
rrddim_set(st, "writes", mwrites);
d->do_iotime = CONFIG_ONDEMAND_YES;
st = rrdset_find_bytype("disk_iotime", disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create("disk_iotime", disk, NULL, family, "disk.iotime", "Disk Total I/O Time", "milliseconds/s", 2022, update_every, RRDSET_TYPE_LINE);
st->isdetail = 1;
rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_INCREMENTAL);
rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_INCREMENTAL);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
last_readms = rrddim_set(st, "reads", readms);
last_writems = rrddim_set(st, "writes", writems);
// calculate differential charts
// only if this is not the first time we run
- if(dt) {
+ if(likely(dt)) {
if( (d->do_iotime == CONFIG_ONDEMAND_YES || (d->do_iotime == CONFIG_ONDEMAND_ONDEMAND && (readms || writems))) &&
(d->do_ops == CONFIG_ONDEMAND_YES || (d->do_ops == CONFIG_ONDEMAND_ONDEMAND && (reads || writes)))) {
st = rrdset_find_bytype("disk_await", disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create("disk_await", disk, NULL, family, "disk.await", "Average Completed I/O Operation Time", "ms per operation", 2005, update_every, RRDSET_TYPE_LINE);
st->isdetail = 1;
rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_ABSOLUTE);
rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_ABSOLUTE);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
rrddim_set(st, "reads", (reads - last_reads) ? (readms - last_readms) / (reads - last_reads) : 0);
rrddim_set(st, "writes", (writes - last_writes) ? (writems - last_writems) / (writes - last_writes) : 0);
if( (d->do_io == CONFIG_ONDEMAND_YES || (d->do_io == CONFIG_ONDEMAND_ONDEMAND && (readsectors || writesectors))) &&
(d->do_ops == CONFIG_ONDEMAND_YES || (d->do_ops == CONFIG_ONDEMAND_ONDEMAND && (reads || writes)))) {
st = rrdset_find_bytype("disk_avgsz", disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create("disk_avgsz", disk, NULL, family, "disk.avgsz", "Average Completed I/O Operation Bandwidth", "kilobytes per operation", 2006, update_every, RRDSET_TYPE_AREA);
st->isdetail = 1;
rrddim_add(st, "reads", NULL, d->sector_size, 1024, RRDDIM_ABSOLUTE);
rrddim_add(st, "writes", NULL, d->sector_size * -1, 1024, RRDDIM_ABSOLUTE);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
rrddim_set(st, "reads", (reads - last_reads) ? (readsectors - last_readsectors) / (reads - last_reads) : 0);
rrddim_set(st, "writes", (writes - last_writes) ? (writesectors - last_writesectors) / (writes - last_writes) : 0);
if( (d->do_util == CONFIG_ONDEMAND_YES || (d->do_util == CONFIG_ONDEMAND_ONDEMAND && busy_ms)) &&
(d->do_ops == CONFIG_ONDEMAND_YES || (d->do_ops == CONFIG_ONDEMAND_ONDEMAND && (reads || writes)))) {
st = rrdset_find_bytype("disk_svctm", disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create("disk_svctm", disk, NULL, family, "disk.svctm", "Average Service Time", "ms per operation", 2007, update_every, RRDSET_TYPE_LINE);
st->isdetail = 1;
rrddim_add(st, "svctm", NULL, 1, 1, RRDDIM_ABSOLUTE);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
rrddim_set(st, "svctm", ((reads - last_reads) + (writes - last_writes)) ? (busy_ms - last_busy_ms) / ((reads - last_reads) + (writes - last_writes)) : 0);
rrdset_done(st);
}
}
+/*
// --------------------------------------------------------------------------
// space metrics
- if(d->mount_point && (d->do_space || d->do_inodes) ) {
- // collect space metrics using statvfs
+ if(unlikely( d->mount_point && (d->do_space || d->do_inodes) )) {
+ do_disk_space_stats(d, d->mount_point, disk, disk, family, update_every, dt);
+ }
+*/
+ }
- if (statvfs(d->mount_point, &buff_statvfs) < 0)
- error("Failed statvfs() for '%s' (disk '%s')", d->mount_point, d->disk);
- else {
- space_avail = buff_statvfs.f_bavail * buff_statvfs.f_bsize;
- space_avail_root = (buff_statvfs.f_bfree - buff_statvfs.f_bavail) * buff_statvfs.f_bsize;
- space_used = (buff_statvfs.f_blocks - buff_statvfs.f_bfree) * buff_statvfs.f_bsize;
+ // --------------------------------------------------------------------------
+ // space metrics for non-block devices
+
+ struct mountinfo *mi;
+ for(mi = disk_mountinfo_root; mi ;mi = mi->next) {
+ if(unlikely(mi->flags & (MOUNTINFO_IS_DUMMY|MOUNTINFO_IS_BIND|MOUNTINFO_IS_SAME_DEV|MOUNTINFO_NO_STAT|MOUNTINFO_NO_SIZE)))
+ continue;
+
+/*
+ // skip the ones with block devices
+ int skip = 0;
+ struct disk *d;
+ for(d = disk_root; d ;d = d->next) {
+ if(unlikely(d->mount_point && mi->mount_point_hash == d->mount_point_hash && strcmp(mi->mount_point, d->mount_point))) {
+ skip = 1;
+ break;
+ }
+ }
- inodes_avail = buff_statvfs.f_favail;
- inodes_avail_root = buff_statvfs.f_ffree - buff_statvfs.f_favail;
- inodes_used = buff_statvfs.f_files - buff_statvfs.f_ffree;
+ if(unlikely(skip))
+ continue;
- // verify we collected the metrics for the right disk.
- // if not the mountpoint has changed.
+ // fprintf(stderr, "Will process mount point '%s', source '%s', filesystem '%s'\n", mi->mount_point, mi->mount_source, mi->filesystem);
+*/
- if(stat(d->mount_point, &buff_stat) == -1)
- error("Failed to stat() for '%s' (disk '%s')", d->mount_point, d->disk);
- else {
- if(major(buff_stat.st_dev) == major && minor(buff_stat.st_dev) == minor) {
-
- // --------------------------------------------------------------------------
-
- if(d->do_space == CONFIG_ONDEMAND_YES || (d->do_space == CONFIG_ONDEMAND_ONDEMAND && (space_avail || space_avail_root || space_used))) {
- st = rrdset_find_bytype("disk_space", disk);
- if(!st) {
- st = rrdset_create("disk_space", disk, NULL, family, "disk.space", "Disk Space Usage", "GB", 2023, update_every, RRDSET_TYPE_STACKED);
- st->isdetail = 1;
-
- rrddim_add(st, "avail", NULL, 1, 1024*1024*1024, RRDDIM_ABSOLUTE);
- rrddim_add(st, "used" , NULL, 1, 1024*1024*1024, RRDDIM_ABSOLUTE);
- rrddim_add(st, "reserved_for_root", "reserved for root", 1, 1024*1024*1024, RRDDIM_ABSOLUTE);
- }
- else rrdset_next_usec(st, dt);
-
- rrddim_set(st, "avail", space_avail);
- rrddim_set(st, "used", space_used);
- rrddim_set(st, "reserved_for_root", space_avail_root);
- rrdset_done(st);
- }
-
- // --------------------------------------------------------------------------
-
- if(d->do_inodes == CONFIG_ONDEMAND_YES || (d->do_inodes == CONFIG_ONDEMAND_ONDEMAND && (inodes_avail || inodes_avail_root || inodes_used))) {
- st = rrdset_find_bytype("disk_inodes", disk);
- if(!st) {
- st = rrdset_create("disk_inodes", disk, NULL, family, "disk.inodes", "Disk Inodes Usage", "Inodes", 2024, update_every, RRDSET_TYPE_STACKED);
- st->isdetail = 1;
-
- rrddim_add(st, "avail", NULL, 1, 1, RRDDIM_ABSOLUTE);
- rrddim_add(st, "used" , NULL, 1, 1, RRDDIM_ABSOLUTE);
- rrddim_add(st, "reserved_for_root", "reserved for root", 1, 1, RRDDIM_ABSOLUTE);
- }
- else rrdset_next_usec(st, dt);
-
- rrddim_set(st, "avail", inodes_avail);
- rrddim_set(st, "used", inodes_used);
- rrddim_set(st, "reserved_for_root", inodes_avail_root);
- rrdset_done(st);
- }
- }
- }
- }
- }
+ do_disk_space_stats(NULL, mi->mount_point, mi->mount_source, mi->persistent_id, mi->mount_point , update_every, dt);
}
return 0;
projects / netdata.git / blobdiff