Module: check_mk Branch: master Commit: 65c9d0cf5fd9316ddc13a6c46e2fcccb929ad57c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65c9d0cf5fd931… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri May 30 16:29:26 2014 +0200 FIX pnp-template ps.perf: fixed display bug of cpu averaging --- .werks/931 | 8 ++++++++ ChangeLog | 1 + pnp-templates/check_mk-ps.perf.php | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/931 b/.werks/931 new file mode 100644 index 0000000..ccc36c8 --- /dev/null +++ b/.werks/931 @@ -0,0 +1,8 @@ +Title: pnp-template ps.perf: fixed display bug of cpu averaging +Level: 1 +Component: multisite +Version: 1.2.5i3 +Date: 1401460117 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1bbfc65..edd58e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -110,6 +110,7 @@ * 0912 FIX: Multisite Views: Fixed bug where custom views could not get deleted * 0921 FIX: dashboards: fixed bug not updating header timestamp... * 0923 FIX: json export: fixed bug not stripping html tags from output + * 0931 FIX: pnp-template ps.perf: fixed display bug of cpu averaging WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids diff --git a/pnp-templates/check_mk-ps.perf.php b/pnp-templates/check_mk-ps.perf.php index f815c48..68a5922 100644 --- a/pnp-templates/check_mk-ps.perf.php +++ b/pnp-templates/check_mk-ps.perf.php @@ -91,8 +91,8 @@ if (isset($RRD["pcpu"])) { $def[3] .= "HRULE:$CRIT[pcpu]#FF0000:\"Critical at $CRIT[pcpu]%\" "; if (isset($RRD["pcpuavg"])) { - $def[3] .= "DEF:pcpuavg=$RRD[pcpuavg] - LINE:pcpuavg#000000:\"Average over $MAX[pcpuavg] minutes\\n\" "; + $def[3] .= "DEF:pcpuavg=$RRD[pcpuavg] "; + $def[3] .= "LINE:pcpuavg#000000:\"Average over $MAX[pcpuavg] minutes\\n\" "; } }