[checkmk-commits] Check_MK Git: check_mk: #1463 FIX juniper_screenos_mem, juniper_trpz_mem: pnp template fixed

Module: check_mk Branch: master Commit: 5fd0ed5a72b2dc0b03ca3b9b31fec290083077d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fd0ed5a72b2dc… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jan 9 14:30:35 2015 +0100 #1463 FIX juniper_screenos_mem, juniper_trpz_mem: pnp template fixed --- .werks/1463 | 9 +++++++ ChangeLog | 1 + pnp-templates/check_mk-juniper_screenos_mem.php | 30 +++++++++++++++++------ 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/.werks/1463 b/.werks/1463 new file mode 100644 index 0000000..4fd25ac --- /dev/null +++ b/.werks/1463 @@ -0,0 +1,9 @@ +Title: juniper_screenos_mem, juniper_trpz_mem: pnp template fixed +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1420810131 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 9f4eae1..f3a6d62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * 1819 FIX: dell_poweredge_temp: Make output and service description consistent with other temperature checks... NOTE: Please refer to the migration notes! * 1833 FIX: jolokia_metrics.gc: fix recently introduced exception for missing variable + * 1463 FIX: juniper_screenos_mem, juniper_trpz_mem: pnp template fixed Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/pnp-templates/check_mk-juniper_screenos_mem.php b/pnp-templates/check_mk-juniper_screenos_mem.php index 2eac2f2..8756a5e 100644 --- a/pnp-templates/check_mk-juniper_screenos_mem.php +++ b/pnp-templates/check_mk-juniper_screenos_mem.php @@ -23,13 +23,29 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -$opt[1] = "--vertical-label 'MB' -l 0 --title \"Main Memory (RAM)\" "; +if ($MAX[1]/1024/1024 > 10000) { + $scale = 1024 * 1024 * 1024; + $unit = 'GB'; +} +else { + $scale = 1024 * 1024; + $unit = 'MB'; +} + +$total = sprintf("%.2f", $MAX[1] / $scale); +$warn = sprintf("%.2f", $WARN[1] / $scale); +$crit = sprintf("%.2f", $CRIT[1] / $scale); + +$opt[1] = "--vertical-label $unit -l 0 --title \"Main Memory (RAM)\" -X0 --upper-limit " . $total; # -$def[1] = "DEF:used=$RRDFILE[1]:$DS[1]:AVERAGE " ; + +$def[1] = "DEF:used_bytes=$RRDFILE[1]:$DS[1]:AVERAGE " ; +$def[1] .= "CDEF:used=used_bytes,$scale,/ "; $def[1] .= "AREA:used#60f020:\"Used\" " ; -$def[1] .= "GPRINT:used:MIN:\"Min\: %2.0lf MB\" " ; -$def[1] .= "GPRINT:used:MAX:\"Max\: %2.0lf MB\" " ; -$def[1] .= "GPRINT:used:LAST:\"Last\: %2.0lf MB\\n\" " ; -$def[1] .= "HRULE:$WARN[1]#FFFF00:\"Warn\" "; -$def[1] .= "HRULE:$CRIT[1]#FF0000:\"Crit\\n\" "; +$def[1] .= "GPRINT:used:MIN:\"Min\: %2.1lf $unit\" " ; +$def[1] .= "GPRINT:used:MAX:\"Max\: %2.1lf $unit\" " ; +$def[1] .= "GPRINT:used:LAST:\"Last\: %2.1lf $unit\\n\" " ; +$def[1] .= "HRULE:$warn#FFFF00:\"Warn\" "; +$def[1] .= "HRULE:$crit#FF0000:\"Crit\" "; +$def[1] .= "HRULE:$total#000000:\"RAM installed $total $unit\\n\" "; ?>