diff options
Diffstat (limited to '')
-rw-r--r-- | collectors/diskspace.plugin/plugin_diskspace.c (renamed from src/plugin_proc_diskspace.c) | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/src/plugin_proc_diskspace.c b/collectors/diskspace.plugin/plugin_diskspace.c index 0a229f38e..dca7c9076 100644 --- a/src/plugin_proc_diskspace.c +++ b/collectors/diskspace.plugin/plugin_diskspace.c @@ -1,7 +1,11 @@ -#include "common.h" +// SPDX-License-Identifier: GPL-3.0-or-later + +#include "plugin_diskspace.h" + +#define PLUGIN_DISKSPACE_NAME "diskspace.plugin" #define DELAULT_EXCLUDED_PATHS "/proc/* /sys/* /var/run/user/* /run/user/* /snap/* /var/lib/docker/*" -#define DEFAULT_EXCLUDED_FILESYSTEMS "" +#define DEFAULT_EXCLUDED_FILESYSTEMS "*gvfs *gluster* *s3fs *ipfs *davfs2 *httpfs *sshfs *gdfs *moosefs fusectl" #define CONFIG_SECTION_DISKSPACE "plugin:proc:diskspace" static struct mountinfo *disk_mountinfo_root = NULL; @@ -129,7 +133,8 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) { } // check if the mount point is a directory #2407 - { + // but only when it is enabled by default #4491 + if(def_space != CONFIG_BOOLEAN_NO || def_inodes != CONFIG_BOOLEAN_NO) { struct stat bs; if(stat(mi->mount_point, &bs) == -1) { error("DISKSPACE: Cannot stat() mount point '%s' (disk '%s', filesystem '%s', root '%s')." @@ -259,9 +264,9 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) { , "disk.space" , title , "GB" - , "diskspace" + , PLUGIN_DISKSPACE_NAME , NULL - , 2023 + , NETDATA_CHART_PRIO_DISKSPACE_SPACE , update_every , RRDSET_TYPE_STACKED ); @@ -299,9 +304,9 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) { , "disk.inodes" , title , "Inodes" - , "diskspace" + , PLUGIN_DISKSPACE_NAME , NULL - , 2024 + , NETDATA_CHART_PRIO_DISKSPACE_INODES , update_every , RRDSET_TYPE_STACKED ); @@ -337,7 +342,7 @@ static void diskspace_main_cleanup(void *ptr) { static_thread->enabled = NETDATA_MAIN_THREAD_EXITED; } -void *proc_diskspace_main(void *ptr) { +void *diskspace_main(void *ptr) { netdata_thread_cleanup_push(diskspace_main_cleanup, ptr); int vdo_cpu_netdata = config_get_boolean("plugin:proc", "netdata server resources", 1); @@ -359,7 +364,7 @@ void *proc_diskspace_main(void *ptr) { heartbeat_t hb; heartbeat_init(&hb); while(!netdata_exit) { - duration = heartbeat_dt_usec(&hb); + duration = heartbeat_monotonic_dt_to_now_usec(&hb); /* usec_t hb_dt = */ heartbeat_next(&hb, step); if(unlikely(netdata_exit)) break; @@ -406,9 +411,9 @@ void *proc_diskspace_main(void *ptr) { , NULL , "NetData Disk Space Plugin CPU usage" , "milliseconds/s" - , "diskspace" + , PLUGIN_DISKSPACE_NAME , NULL - , 132020 + , NETDATA_CHART_PRIO_NETDATA_DISKSPACE , update_every , RRDSET_TYPE_STACKED ); @@ -434,7 +439,7 @@ void *proc_diskspace_main(void *ptr) { , NULL , "NetData Disk Space Plugin Duration" , "milliseconds/run" - , "diskspace" + , PLUGIN_DISKSPACE_NAME , NULL , 132021 , update_every |