diskstats: change default configuration

Also enable performance charts for mounted virtual disks by default.

diff --git a/src/proc_diskstats.c b/src/proc_diskstats.c
index b7cea624e79ecef829175985a056982a07c8da8b..fc835800e6e73226a368660875e63fd2a0371449 100644 (file)
--- a/src/proc_diskstats.c
+++ b/src/proc_diskstats.c
@@ -136,7 +136,7 @@ int do_proc_diskstats(int update_every, unsigned long long dt) {
        static procfile *ff = NULL;
        static char path_to_get_hw_sector_size[FILENAME_MAX + 1] = "";
        static int enable_autodetection;
-       static int enable_physical_disks, enable_virtual_disks, enable_partitions, enable_mountpoints, enable_space_metrics;
+       static int enable_physical_disks, enable_virtual_disks, enable_partitions, enable_mountpoints, enable_virtual_mountpoints, enable_space_metrics;
        static int do_io, do_ops, do_mops, do_iotime, do_qops, do_util, do_backlog, do_space, do_inodes;
        static struct statvfs buff_statvfs;
        static struct stat buff_stat;
@@ -147,6 +147,7 @@ int do_proc_diskstats(int update_every, unsigned long long dt) {
        enable_virtual_disks = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "performance metrics for virtual disks", CONFIG_ONDEMAND_NO);
        enable_partitions = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "performance metrics for partitions", CONFIG_ONDEMAND_NO);
        enable_mountpoints = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "performance metrics for mounted filesystems", CONFIG_ONDEMAND_NO);
+       enable_virtual_mountpoints = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "performance metrics for mounted virtual disks", CONFIG_ONDEMAND_ONDEMAND);
        enable_space_metrics = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "space metrics for mounted filesystems", CONFIG_ONDEMAND_ONDEMAND);
 
        do_io      = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "bandwidth for all disks", CONFIG_ONDEMAND_ONDEMAND);
@@ -267,6 +268,8 @@ int do_proc_diskstats(int update_every, unsigned long long dt) {
                                def_performance = enable_virtual_disks;
                        } else if(enable_partitions && (d->type == DISK_TYPE_PARTITION)) {
                                def_performance = enable_partitions;
+                       } else if(enable_virtual_mountpoints && (d->type == DISK_TYPE_CONTAINER) && (d->mount_point != NULL)) {
+                               def_performance = enable_virtual_mountpoints;
                        } else if(enable_mountpoints && (d->mount_point != NULL)) {
                                def_performance = enable_mountpoints;
                        }

diff --git a/web/index.html b/web/index.html
index 544028ed2bd364770f64d0d133654602a3d77fe4..510488542eb0ff858b9c6d8f8d66e8c44b2eedd7 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -1192,7 +1192,7 @@ var menuData = {
 
        'disk': {
                title: 'Disks',
-               info: 'Charts with performance information for all the system disks. Special care has been given to present disk performance metrics in a way compatible with <code>iostat -x</code>. netdata by default prevents rendering performance charts for individual partitions. Partitions can still be enabled by altering the relative settings in the netdata configuration file.'
+               info: 'Charts with performance information for all the system disks. Special care has been given to present disk performance metrics in a way compatible with <code>iostat -x</code>. netdata by default prevents rendering performance charts for individual partitions and unmounted virtual disks. Disabled charts can still be enabled by altering the relative settings in the netdata configuration file.'
        },
 
        'sensors': {