[checkmk-commits] 4114 FIX innovaphone_licenses: fixed wrong percentage calculation

Module: check_mk Branch: master Commit: 121b39b247194ff4184f773087730073f95b1cc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=121b39b247194f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 12 11:21:03 2016 +0100 4114 FIX innovaphone_licenses: fixed wrong percentage calculation Change-Id: I60be31cb9c40e7a847a8c33a53cd88263b48f25e --- .werks/4114 | 10 ++++++++++ ChangeLog | 1 + checks/innovaphone_licenses | 7 +++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/4114 b/.werks/4114 new file mode 100644 index 0000000..b98304c --- /dev/null +++ b/.werks/4114 @@ -0,0 +1,10 @@ +Title: innovaphone_licenses: fixed wrong percentage calculation +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1481538027 + + diff --git a/ChangeLog b/ChangeLog index fb6dca0..3f6126a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * 4112 FIX: db2_logsizes: fixed invalid data handling * 4100 FIX: mk_mysql: Only perform queries if mysqladmin ping is successful#... * 4113 FIX: postgres_locks: fixed missing include file + * 4114 FIX: innovaphone_licenses: fixed wrong percentage calculation Multisite: * 4070 Added a painter for the service check period diff --git a/checks/innovaphone_licenses b/checks/innovaphone_licenses index d178aae..888f11c 100644 --- a/checks/innovaphone_licenses +++ b/checks/innovaphone_licenses @@ -24,14 +24,17 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + innovaphone_licenses_default_levels = ( 90.0, 95.0 ) + def inventory_innovaphone_licenses(info): return [ ( None, 'innovaphone_licenses_default_levels') ] + def check_innovaphone_licenses(_no_item, params, info): total, used = map(savefloat, info[0]) - perc_used = ( used/ 100 ) * total + perc_used = (100.0 * used) / total warn, crit = params message = "Used %.0f/%.0f Licences (%.0f%%)" % ( used, total, perc_used) levels = "Warning/ Critical at (%s/%s)" % ( warn, crit ) @@ -42,10 +45,10 @@ def check_innovaphone_licenses(_no_item, params, info): return 1, message + levels, perf return 0, message, perf + check_info["innovaphone_licenses"] = { "check_function" : check_innovaphone_licenses, "inventory_function" : inventory_innovaphone_licenses, "service_description" : "Licenses", "has_perfdata" : True, } -