diff options
| author | Timothy Asir <tjeyasin@redhat.com> | 2014-05-06 16:19:55 +0530 |
|---|---|---|
| committer | Sahina Bose <sabose@redhat.com> | 2014-05-12 23:49:12 -0700 |
| commit | cd58284e320d1a3ee189778714f378689911422a (patch) | |
| tree | 6a690384c9854372c4b699e9b87d39afc1067a14 /plugins | |
| parent | 02198ae496578b22e2283be80bf320cb5fbacc78 (diff) | |
Add disk and inode total usage in the performance data
Change-Id: Ifc2b679a4f4e6f7ab50ba091befacb4194790ccf
Signed-off-by: Timothy Asir <tjeyasin@redhat.com>
Reviewed-on: http://review.gluster.org/7684
Reviewed-by: Sahina Bose <sabose@redhat.com>
Tested-by: Sahina Bose <sabose@redhat.com>
Diffstat (limited to 'plugins')
| -rwxr-xr-x | plugins/check_disk_and_inode.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/plugins/check_disk_and_inode.py b/plugins/check_disk_and_inode.py index 5989180..bfa146c 100755 --- a/plugins/check_disk_and_inode.py +++ b/plugins/check_disk_and_inode.py @@ -149,28 +149,30 @@ def showDiskUsage(warn, crit, mountPaths, toListInode, usage=False, crit * inode['used'] / 100, inode['used']) else: - data = "%s=%.2f;%s;%s;0;100" % ( + data = "%s=%.2f;%s;%s;0;%s" % ( disk['path'], disk['usePcent'], warn, - crit) + crit, + disk['size']) if toListInode: - data += " %s=%.2f;%s;%s;0;100" % ( + data += " %s=%.2f;%s;%s;0;%s" % ( inode['path'], inode['usePcent'], warn, - crit) + crit, + inode['size']) diskPerf.append(data) if disk['usePcent'] >= crit or inode['usePcent'] >= crit: if disk['usePcent'] >= crit: critList.append( - "crit:disk:%s;%s;%s" % (disk['fs'], + "crit:disk:%s;%s;%s%%" % (disk['fs'], disk['path'], disk['usePcent'])) else: - critList.append("crit:inode:%s;%s;%s" % (inode['fs'], + critList.append("crit:inode:%s;%s;%s%%" % (inode['fs'], inode['path'], inode['usePcent'])) if not level > utils.PluginStatusCode.WARNING: @@ -178,11 +180,11 @@ def showDiskUsage(warn, crit, mountPaths, toListInode, usage=False, elif (disk['usePcent'] >= warn and disk['usePcent'] < crit) or ( inode['usePcent'] >= warn and inode['usePcent'] < crit): if disk['usePcent'] >= warn: - warnList.append("warn:disk:%s;%s;%s" % (disk['fs'], + warnList.append("warn:disk:%s;%s;%s%%" % (disk['fs'], disk['path'], disk['usePcent'])) else: - warnList.append("warn:inode:%s;%s;%s" % (inode['fs'], + warnList.append("warn:inode:%s;%s;%s%%" % (inode['fs'], inode['path'], inode['usePcent'])) if not level > utils.PluginStatusCode.OK: |