#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/statvfs.h>
#include <fcntl.h>
#include "common.h"
unsigned long major;
unsigned long minor;
int partition_id; // -1 = this is not a partition
+ char *mount_point;
char *family;
struct disk *next;
} *disk_root = NULL;
if(unlikely(!path_find_block_device_partition[0])) {
char filename[FILENAME_MAX + 1];
- snprintf(filename, FILENAME_MAX, "%s%s", global_host_prefix, "/sys/dev/block/%lu:%lu/partition");
- snprintf(path_find_block_device_partition, FILENAME_MAX, "%s", config_get("plugin:proc:/proc/diskstats", "path to get block device partition", filename));
+ snprintfz(filename, FILENAME_MAX, "%s%s", global_host_prefix, "/sys/dev/block/%lu:%lu/partition");
+ snprintfz(path_find_block_device_partition, FILENAME_MAX, "%s", config_get("plugin:proc:/proc/diskstats", "path to get block device partition", filename));
}
// not found
// find if it is a partition
// by reading /sys/dev/block/MAJOR:MINOR/partition
char buffer[FILENAME_MAX + 1];
- snprintf(buffer, FILENAME_MAX, path_find_block_device_partition, major, minor);
+ snprintfz(buffer, FILENAME_MAX, path_find_block_device_partition, major, minor);
int fd = open(buffer, O_RDONLY, 0666);
if(likely(fd != -1)) {
}
if(mi)
- d->family = strdup(mi->mount_point);
+ d->mount_point = strdup(mi->mount_point);
// no need to check for NULL
else
- d->family = NULL;
+ d->mount_point = NULL;
return d;
}
static procfile *ff = NULL;
static char path_to_get_hw_sector_size[FILENAME_MAX + 1] = "";
static int enable_new_disks = -1;
- static int do_io = -1, do_ops = -1, do_mops = -1, do_iotime = -1, do_qops = -1, do_util = -1, do_backlog = -1;
+ static int do_io = -1, do_ops = -1, do_mops = -1, do_iotime = -1, do_qops = -1, do_util = -1, do_backlog = -1, do_space = -1;
if(enable_new_disks == -1) enable_new_disks = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "enable new disks detected at runtime", CONFIG_ONDEMAND_ONDEMAND);
if(do_qops == -1) do_qops = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "queued operations for all disks", CONFIG_ONDEMAND_ONDEMAND);
if(do_util == -1) do_util = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "utilization percentage for all disks", CONFIG_ONDEMAND_ONDEMAND);
if(do_backlog == -1)do_backlog = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "backlog for all disks", CONFIG_ONDEMAND_ONDEMAND);
+ if(do_space == -1) do_space = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "space usage for all disks", CONFIG_ONDEMAND_ONDEMAND);
if(!ff) {
char filename[FILENAME_MAX + 1];
- snprintf(filename, FILENAME_MAX, "%s%s", global_host_prefix, "/proc/diskstats");
+ 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(!path_to_get_hw_sector_size[0]) {
char filename[FILENAME_MAX + 1];
- snprintf(filename, FILENAME_MAX, "%s%s", global_host_prefix, "/sys/block/%s/queue/hw_sector_size");
- snprintf(path_to_get_hw_sector_size, FILENAME_MAX, "%s", config_get("plugin:proc:/proc/diskstats", "path to get h/w sector size", filename));
+ snprintfz(filename, 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", filename));
}
ff = procfile_readall(ff);
if(!ff) return 0; // we return 0, so that we will retry to open it next time
+ struct statvfs * buff_statvfs;
+ if ( !(buff_statvfs = (struct statvfs *)
+ malloc(sizeof(struct statvfs)))) {
+ error("Failed to allocate memory to buffer.");
+ }
+
uint32_t lines = procfile_lines(ff), l;
uint32_t words;
unsigned long long major = 0, minor = 0,
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;
+ queued_ios = 0, busy_ms = 0, backlog_ms = 0,
+ space_avail = 0, space_avail_root = 0, space_used = 0;
unsigned long long last_reads = 0, last_readsectors = 0, last_readms = 0,
last_writes = 0, last_writesectors = 0, last_writems = 0,
for(s = disk; *s ;s++) if(*s == '/') *s = '_';
struct disk *d = get_disk(major, minor);
+
+ /*
if(d->partition_id == -1)
def_enabled = enable_new_disks;
else
def_enabled = 0;
+ */
- char *family = d->family;
- if(!family) family = disk;
-
-/*
+ // Enable real disks by default.
+ // To fine out if it is a harddrive we use
+ // Linux Assigned Names and Numbers Authority (http://www.lanana.org/)
switch(major) {
- case 9: // MDs
- case 43: // network block
- case 144: // nfs
- case 145: // nfs
- case 146: // nfs
- case 199: // veritas
- case 201: // veritas
- case 251: // dm
- case 253: // virtio
- def_enabled = enable_new_disks;
- break;
-
- case 48: // RAID
- case 49: // RAID
- case 50: // RAID
- case 51: // RAID
- case 52: // RAID
- case 53: // RAID
- case 54: // RAID
- case 55: // RAID
- case 112: // RAID
- case 136: // RAID
- case 137: // RAID
- case 138: // RAID
- case 139: // RAID
- case 140: // RAID
- case 141: // RAID
- case 142: // RAID
- case 143: // RAID
- case 179: // MMC
- case 180: // USB
- if(minor % 8) def_enabled = 0; // partitions
- else def_enabled = enable_new_disks;
- break;
-
- case 8: // scsi disks
- case 65: // scsi disks
- case 66: // scsi disks
- case 67: // scsi disks
- case 68: // scsi disks
- case 69: // scsi disks
- case 70: // scsi disks
- case 71: // scsi disks
- case 72: // scsi disks
- case 73: // scsi disks
- case 74: // scsi disks
- case 75: // scsi disks
- case 76: // scsi disks
- case 77: // scsi disks
- case 78: // scsi disks
- case 79: // scsi disks
- case 80: // i2o
- case 81: // i2o
- case 82: // i2o
- case 83: // i2o
- case 84: // i2o
- case 85: // i2o
- case 86: // i2o
- case 87: // i2o
- case 101: // hyperdisk
- case 102: // compressed
- case 104: // scsi
- case 105: // scsi
- case 106: // scsi
- case 107: // scsi
- case 108: // scsi
- case 109: // scsi
- case 110: // scsi
- case 111: // scsi
- case 114: // bios raid
- case 116: // ram board
- case 128: // scsi
- case 129: // scsi
- case 130: // scsi
- case 131: // scsi
- case 132: // scsi
- case 133: // scsi
- case 134: // scsi
- case 135: // scsi
- case 153: // raid
- case 202: // xen
- case 254: // virtio3
- case 256: // flash
- case 257: // flash
- case 259: // nvme0n1 issue #119
- if(minor % 16) def_enabled = 0; // partitions
- else def_enabled = enable_new_disks;
- break;
-
- case 160: // raid
- case 161: // raid
- if(minor % 32) def_enabled = 0; // partitions
- else def_enabled = enable_new_disks;
- break;
-
- case 3: // ide
- case 13: // 8bit ide
- case 22: // ide
- case 33: // ide
- case 34: // ide
- case 56: // ide
- case 57: // ide
- case 88: // ide
- case 89: // ide
- case 90: // ide
- case 91: // ide
- if(minor % 64) def_enabled = 0; // partitions
- else def_enabled = enable_new_disks;
- break;
-
- case 252: // zram
- def_enabled = 0;
+ case 8: // SCSI disk devices (0-15)
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 21: // Acorn MFM hard drive interface
+ if(!(minor % 64)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 28: // ACSI disk (68k/Atari)
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 36: // MCA ESDI hard disk
+ if(!(minor % 64)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 48: // Mylex DAC960 PCI RAID controller; first controller
+ if(!(minor % 8)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 49: // Mylex DAC960 PCI RAID controller; second controller
+ if(!(minor % 8)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 50: // Mylex DAC960 PCI RAID controller; third controller
+ if(!(minor % 8)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 51: // Mylex DAC960 PCI RAID controller; fourth controller
+ if(!(minor % 8)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 52: // Mylex DAC960 PCI RAID controller; fifth controller
+ if(!(minor % 8)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 53: // Mylex DAC960 PCI RAID controller; sixth controller
+ if(!(minor % 8)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 54: // Mylex DAC960 PCI RAID controller; seventh controller
+ if(!(minor % 8)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 55: // Mylex DAC960 PCI RAID controller; eigth controller
+ if(!(minor % 8)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 65: // SCSI disk devices (16-31)
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 66: // SCSI disk devices (32-47)
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 67: // SCSI disk devices (48-63)
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 68: // SCSI disk devices (64-79)
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 69: // SCSI disk devices (80-95)
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 70: // SCSI disk devices (96-111)
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 71: // SCSI disk devices (112-127)
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 80: // I2O hard disk
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 81: // I2O hard disk
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 82: // I2O hard disk
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 83: // I2O hard disk
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 84: // I2O hard disk
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 85: // I2O hard disk
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 86: // I2O hard disk
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 87: // I2O hard disk
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 128: // SCSI disk devices (128-143)
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 129: // SCSI disk devices (144-159)
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 130: // SCSI disk devices (160-175)
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 131: // SCSI disk devices (176-191)
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 132: // SCSI disk devices (192-207)
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 133: // SCSI disk devices (208-223)
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 134: // SCSI disk devices (224-239)
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 135: // SCSI disk devices (240-255)
+ if(!(minor % 16)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 136: // Mylex DAC960 PCI RAID controller; nineth controller
+ if(!(minor % 8)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 137: // Mylex DAC960 PCI RAID controller; tenth controller
+ if(!(minor % 8)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 138: // Mylex DAC960 PCI RAID controller; eleventh controller
+ if(!(minor % 8)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 139: // Mylex DAC960 PCI RAID controller; twelfth controller
+ if(!(minor % 8)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 140: // Mylex DAC960 PCI RAID controller; thirteenth controller
+ if(!(minor % 8)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 141: // Mylex DAC960 PCI RAID controller; fourteenth controller
+ if(!(minor % 8)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 142: // Mylex DAC960 PCI RAID controller; fifteenth controller
+ if(!(minor % 8)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 143: // Mylex DAC960 PCI RAID controller; sixteenth controller
+ if(!(minor % 8)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 160: // Carmel 8-port SATA Disks on First Controller
+ if(!(minor % 32)) {
+ def_enabled = enable_new_disks;
+ }
+ break;
+ case 161: // Carmel 8-port SATA Disks on Second Controller
+ if(!(minor % 32)) {
+ def_enabled = enable_new_disks;
+ }
break;
-
default:
def_enabled = 0;
break;
}
-*/
- int ddo_io = do_io, ddo_ops = do_ops, ddo_mops = do_mops, ddo_iotime = do_iotime, ddo_qops = do_qops, ddo_util = do_util, ddo_backlog = do_backlog;
+ char *mount_point = d->mount_point;
+ char *family = d->mount_point;
+ if(!family) family = disk;
+
+ int ddo_io = do_io, ddo_ops = do_ops, ddo_mops = do_mops, ddo_iotime = do_iotime, ddo_qops = do_qops, ddo_util = do_util, ddo_backlog = do_backlog, ddo_space = do_space;
// check which charts are enabled for this disk
{
char var_name[4096 + 1];
- snprintf(var_name, 4096, "plugin:proc:/proc/diskstats:%s", disk);
+ snprintfz(var_name, 4096, "plugin:proc:/proc/diskstats:%s", disk);
def_enabled = config_get_boolean_ondemand(var_name, "enabled", def_enabled);
if(def_enabled == CONFIG_ONDEMAND_NO) continue;
if(def_enabled == CONFIG_ONDEMAND_ONDEMAND && !reads && !writes) continue;
ddo_qops = config_get_boolean_ondemand(var_name, "queued operations", ddo_qops);
ddo_util = config_get_boolean_ondemand(var_name, "utilization percentage", ddo_util);
ddo_backlog = config_get_boolean_ondemand(var_name, "backlog", ddo_backlog);
+ ddo_space = config_get_boolean_ondemand(var_name, "space", ddo_space);
// by default, do not add charts that do not have values
if(ddo_io == CONFIG_ONDEMAND_ONDEMAND && !reads && !writes) ddo_io = 0;
char tf[FILENAME_MAX + 1], *t;
char ssfilename[FILENAME_MAX + 1];
- strncpy(tf, disk, FILENAME_MAX);
- tf[FILENAME_MAX] = '\0';
+ strncpyz(tf, disk, FILENAME_MAX);
// replace all / with !
while((t = strchr(tf, '/'))) *t = '!';
- snprintf(ssfilename, FILENAME_MAX, path_to_get_hw_sector_size, tf);
+ snprintfz(ssfilename, FILENAME_MAX, path_to_get_hw_sector_size, tf);
FILE *fpss = fopen(ssfilename, "r");
if(fpss) {
char ssbuffer[1025];
rrdset_done(st);
}
+ // --------------------------------------------------------------------
+
+ if(ddo_space) {
+ if(mount_point) {
+ st = rrdset_find_bytype("disk_space", disk);
+ if(!st) {
+ st = rrdset_create("disk_space", disk, NULL, family, "disk.space", "Disk Space Usage", "Megabyte", 2023, update_every, RRDSET_TYPE_AREA);
+ st->isdetail = 1;
+
+ rrddim_add(st, "avail", NULL, 1, 1048576, RRDDIM_ABSOLUTE);
+ rrddim_add(st, "reserved for root", NULL, 1, 1048576, RRDDIM_ABSOLUTE);
+ rrddim_add(st, "used" , NULL, 1, 1045576, RRDDIM_ABSOLUTE);
+ }
+ else rrdset_next_usec(st, dt);
+
+
+
+ if (statvfs(family, buff_statvfs) < 0) {
+ error("Faild checking disk space usage of %s", family);
+ } 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;
+ }
+
+ rrddim_set(st, "avail", space_avail);
+ rrddim_set(st, "reserved for root", space_avail_root);
+ rrddim_set(st, "used", space_used);
+ rrdset_done(st);
+ } else {
+ if(ddo_space != CONFIG_ONDEMAND_ONDEMAND) {
+ error("Cannot find space usage for disk %s. It does not have a mount point.", family);
+ }
+ }
+ }
+
// --------------------------------------------------------------------
// calculate differential charts
// only if this is not the first time we run
}
}
}
+ free(buff_statvfs);
return 0;
}
projects / netdata.git / blobdiff