[checkmk-commits] Check_MK Git: check_mk: #2585 FIX include file for elecritcal phases handles warn/ crit levels correct

Module: check_mk Branch: master Commit: a95182dcc5a5ffe062f4af9d7f9c3a6f9a2ea4f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a95182dcc5a5ff… Author: Simon Betz &lt;si(a)mathias-kettner.de&gt; Date: Thu Sep 3 11:16:06 2015 +0200 #2585 FIX include file for elecritcal phases handles warn/crit levels correct --- .werks/2585 | 9 +++++++++ ChangeLog | 2 ++ checks/elphase.include | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/2585 b/.werks/2585 new file mode 100644 index 0000000..a2f8ef7 --- /dev/null +++ b/.werks/2585 @@ -0,0 +1,9 @@ +Title: include file for elecritcal phases handles warn/crit levels correct +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1441271732 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index adb725b..e0a81f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -155,6 +155,8 @@ * 2575 FIX: cpu.loads: Fix exception in displaying parameters for CPU load check... * 2574 FIX: postfix_mailq: speed up agent part on FreeBSD * 2566 FIX: ups_modulys_battery.temp: fixed missing manpage + * 2584 FIX: include file for electrical phases handles warn/crit levels correct + * 2585 FIX: include file for elecritcal phases handles warn/crit levels correct Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/elphase.include b/checks/elphase.include index ca2e8a0..a82b489 100644 --- a/checks/elphase.include +++ b/checks/elphase.include @@ -76,7 +76,7 @@ def check_elphase(item, params, parsed): warn_lower, crit_lower = params[what] if warn_lower: - levelstext = " (warn/crit Lower %s/%s%s)" %\ + levelstext = " (warn/crit lower %s/%s%s)" %\ (tostring(warn_lower), tostring(crit_lower), unit) if value < crit_lower: status = 2 @@ -85,7 +85,7 @@ def check_elphase(item, params, parsed): status = max(status, 1) infotext += levelstext - if crit_lower: + if warn: levelstext = " (warn/crit at %s/%s%s)" %\ (tostring(warn), tostring(crit), unit) if value > crit: