From 37fd7cf2aaad9a2ee5d1183fb2052f8bb29082e0 Mon Sep 17 00:00:00 2001 From: Andrejs Kozlovs Date: Fri, 17 Jan 2020 15:42:55 +0200 Subject: ...G...... [ZBXNEXT-5490] added new JSON format for inodes * commit 'ef3bc4c0c493b344f7178045cfe7d34e2b138f60': ...G...... [ZBXNEXT-5490] rename structure name ...G...... [ZBXNEXT-5490] correct typo in aix ...G...... [ZBXNEXT-5490] correct makefiles ...G...... [ZBXNEXT-5490] add include to inodes.h ...G...... [ZBXNEXT-5490] added new JSON format for inodes ...G...... [ZBXNEXT-5490] fixed typo for HPUX (cherry picked from commit b0707386bcbeef7882ed10847341fa998b0631c3) (cherry picked from commit b8027b543f75d02d2a6ea4cf32f71bad570a09b7) --- include/sysinfo.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'include/sysinfo.h') diff --git a/include/sysinfo.h b/include/sysinfo.h index 6a1fcdaedcb..0f970a7daa2 100644 --- a/include/sysinfo.h +++ b/include/sysinfo.h @@ -318,14 +318,21 @@ MODE_FUNCTION; typedef struct { - char fsname[MAX_STRING_LEN]; - char fstype[MAX_STRING_LEN]; zbx_uint64_t total; zbx_uint64_t not_used; zbx_uint64_t used; double pfree; double pused; } +zbx_fs_metrics_t; + +typedef struct +{ + char fsname[MAX_STRING_LEN]; + char fstype[MAX_STRING_LEN]; + zbx_fs_metrics_t bytes; + zbx_fs_metrics_t inodes; +} zbx_mpoint_t; #define ZBX_LLD_MACRO_FSNAME "{#FSNAME}" @@ -335,6 +342,8 @@ zbx_mpoint_t; #define ZBX_SYSINFO_TAG_FSNAME "fsname" #define ZBX_SYSINFO_TAG_FSTYPE "fstype" #define ZBX_SYSINFO_TAG_FSDRIVETYPE "fsdrivetype" +#define ZBX_SYSINFO_TAG_BYTES "bytes" +#define ZBX_SYSINFO_TAG_INODES "inodes" #define ZBX_SYSINFO_TAG_TOTAL "total" #define ZBX_SYSINFO_TAG_FREE "free" #define ZBX_SYSINFO_TAG_USED "used" -- cgit v1.2.3