Merge remote-tracking branch 'origin/pr/371'

diff --git a/src/df.c b/src/df.c
index 540985d798ea46da3d12ad24aec2e638a0075643..3d5a402c7949b8741b7568b78d987c1fe033dc6a 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -304,21 +304,21 @@ static int df_read (void)
                        df_submit_one (disk_name, "df_complex", "used",
                                (gauge_t) (blk_used * blocksize));
                }
-               
+
                if (values_percentage)
                {
                        if (statbuf.f_blocks > 0)
                                {
-                               df_submit_one (disk_name, "df_complex_pct", "free",
+                               df_submit_one (disk_name, "percent_bytes", "free",
                                        (gauge_t) ((float_t)(blk_free) / statbuf.f_blocks * 100));
-                               df_submit_one (disk_name, "df_complex_pct", "reserved",
+                               df_submit_one (disk_name, "percent_bytes", "reserved",
                                        (gauge_t) ((float_t)(blk_reserved) / statbuf.f_blocks * 100));
-                               df_submit_one (disk_name, "df_complex_pct", "used",
+                               df_submit_one (disk_name, "percent_bytes", "used",
                                        (gauge_t) ((float_t)(blk_used) / statbuf.f_blocks * 100));
                                }
                        else return (-1);
                }
-               
+
                /* inode handling */
                if (report_inodes)
                {
@@ -331,7 +331,7 @@ static int df_read (void)
                                statbuf.f_ffree = statbuf.f_favail;
                        if (statbuf.f_files < statbuf.f_ffree)
                                statbuf.f_files = statbuf.f_ffree;
-                               
+
                        inode_free = (uint64_t) statbuf.f_favail;
                        inode_reserved = (uint64_t) (statbuf.f_ffree - statbuf.f_favail);
                        inode_used = (uint64_t) (statbuf.f_files - statbuf.f_ffree);
@@ -340,11 +340,11 @@ static int df_read (void)
                        {
                                if (statbuf.f_files > 0)
                                {
-                                       df_submit_one (disk_name, "df_inodes_pct", "free",
+                                       df_submit_one (disk_name, "percent_inodes", "free",
                                                (gauge_t) ((float_t)(inode_free) / statbuf.f_files * 100));
-                                       df_submit_one (disk_name, "df_inodes_pct", "reserved",
+                                       df_submit_one (disk_name, "percent_inodes", "reserved",
                                                (gauge_t) ((float_t)(inode_reserved) / statbuf.f_files * 100));
-                                       df_submit_one (disk_name, "df_inodes_pct", "used",
+                                       df_submit_one (disk_name, "percent_inodes", "used",
                                                (gauge_t) ((float_t)(inode_used) / statbuf.f_files * 100));
                                }
                                else return (-1);

diff --git a/src/types.db b/src/types.db
index 4922aa75f06338626e661878fb8d296eecec74e3..f1d30f0d1a17df08e41124ce73bac2fde3c0e240 100644 (file)
--- a/src/types.db
+++ b/src/types.db
@@ -114,6 +114,8 @@ node_tx_rate                value:GAUGE:0:127
 objects                        value:GAUGE:0:U
 operations             value:DERIVE:0:U
 percent                        value:GAUGE:0:100.1
+percent_bytes          value:GAUGE:0:100.1
+percent_inodes         value:GAUGE:0:100.1
 pf_counters            value:DERIVE:0:U
 pf_limits              value:DERIVE:0:U
 pf_source              value:DERIVE:0:U