diff options
| -rwxr-xr-x | plugins/check_mounts.py | 8 | ||||
| -rw-r--r-- | tests/test_mounts.py | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/check_mounts.py b/plugins/check_mounts.py index 342c20a..8316bad 100755 --- a/plugins/check_mounts.py +++ b/plugins/check_mounts.py @@ -89,8 +89,8 @@ def _getPerfdata(detail, warn, crit): if detail['thinpool_size']: template += " {mount_point}.thinpool={thinpool_used_percent:.3f}%;" \ "{warn};{crit};0;{thinpool_size:.3f} {mount_point}." \ - "thinpool-metadata={metadata_used_percent:.3f}%;{warn};{crit};0;" \ - "{metadata_size:.3f}" + "thinpool-metadata={metadata_used_percent:.3f}" \ + "%;{warn};{crit};0;{metadata_size:.3f}" return template.format(warn=warn, crit=crit, **detail) @@ -218,10 +218,10 @@ def getMountStats(exclude, include): out['metadata_used_percent'] = float( lvs[thinpool]['LVM2_METADATA_PERCENT']) out['thinpool_free'] = out['thinpool_size'] * ( - 1 - out['thinpool_used_percent']/100.0) + 1 - out['thinpool_used_percent'] / 100.0) out['thinpool_used'] = out['thinpool_size'] - out['thinpool_free'] out['metadata_free'] = out['metadata_size'] * ( - 1 - out['metadata_used_percent']/100.0) + 1 - out['metadata_used_percent'] / 100.0) out['metadata_used'] = out['metadata_size'] - out['metadata_free'] return out diff --git a/tests/test_mounts.py b/tests/test_mounts.py index 5503e50..49e8104 100644 --- a/tests/test_mounts.py +++ b/tests/test_mounts.py @@ -275,7 +275,7 @@ class diskTests(TestCaseBase): "90;0;1048576 /run/gluster/snaps/680bdbbeed4744a9bcba941" \ "580a5feed/brick1.thinpool=1.210%;80;90;0;1.500 /run/" \ "gluster/snaps/680bdbbeed4744a9bcba941580a5feed/brick1." \ - "metadata=1.370%;80;90;0;0.004" + "thinpool-metadata=1.370%;80;90;0;0.004" self.assertEquals(actual, expected) def test_getStatusInfo(self): @@ -364,7 +364,7 @@ class diskTests(TestCaseBase): '/brick/brk1=3.195%;2;4;0;0.990 ' '/brick/brk1.inode=1.000%;2;4;0;1048576 ' '/brick/brk1.thinpool=1.210%;2;4;0;1.500 ' - '/brick/brk1.metadata=1.370%;2;4;0;0.004', + '/brick/brk1.thinpool-metadata=1.370%;2;4;0;0.004', '/home=0.241%;2;4;0;17.835 ' '/home.inode=1.000%;2;4;0;1196032'] warning = 2 |