Module: check_mk
Branch: master
Commit: 4e425c18d7635e4df65b28cd77c616c0ef26868f
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e425c18d7635e…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Mon Oct 22 15:13:20 2012 +0200
Solved merge conflict
---
ChangeLog | 1 +
checks/win_dhcp_pools | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 37cf8e7..d42b028 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -118,6 +118,7 @@
update information for 30 minutes
* FIX: netapp_vfiler: fix inventory function (thanks to Falk Krentzlin)
* FIX: ps: avoid exception, when CPU% is missing (Zombies on Solaris)
+ * FIX: win_dhcp_pools: fixed calculation of perc_free
1.2.1i1:
Core:
diff --git a/checks/win_dhcp_pools b/checks/win_dhcp_pools
index 6334765..58dfff8 100644
--- a/checks/win_dhcp_pools
+++ b/checks/win_dhcp_pools
@@ -124,7 +124,7 @@ def check_win_dhcp_pools(item, params, info):
return (3, "UNKNOWN - DHCP Pool contains no IP addresses / is
deactivated")
if free > 0:
- perc_free = 100 - size / free
+ percFree = 100 * size / free
else:
perc_free = 0