[checkmk-commits] Check_MK Git: check_mk: sni_octopuse_cpu: added PNP graph definition and Perf-O-Meter

Module: check_mk Branch: master Commit: 4c8c67bec3cc59c1a26459fa686b3db1523485ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c8c67bec3cc59… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 8 08:42:09 2014 +0200 sni_octopuse_cpu: added PNP graph definition and Perf-O-Meter --- .werks/1073 | 8 ++++++++ ChangeLog | 1 + pnp-templates/check_mk-sni_octopuse_cpu.php | 1 + pnp-templates/check_mk-winperf.cpuusage.php | 2 +- web/plugins/perfometer/check_mk.py | 1 + 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1073 b/.werks/1073 new file mode 100644 index 0000000..e57781e --- /dev/null +++ b/.werks/1073 @@ -0,0 +1,8 @@ +Title: sni_octopuse_cpu: added PNP graph definition and Perf-O-Meter +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1404801715 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index a0e167b..6231ef2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 1041 aix_memory: new check for RAM and SWAP on AIX * 0998 ibm_imm_health: Trying to recognice newer versions of IBM IMM now too * 0628 raritan_pdu_inlet: now also monitors the three phases of the inlet + * 1073 sni_octopuse_cpu: added PNP graph definition and Perf-O-Meter * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/pnp-templates/check_mk-sni_octopuse_cpu.php b/pnp-templates/check_mk-sni_octopuse_cpu.php new file mode 120000 index 0000000..aa15f0d --- /dev/null +++ b/pnp-templates/check_mk-sni_octopuse_cpu.php @@ -0,0 +1 @@ +check_mk-winperf.cpuusage.php \ No newline at end of file diff --git a/pnp-templates/check_mk-winperf.cpuusage.php b/pnp-templates/check_mk-winperf.cpuusage.php index e9a2cbe..5b0f737 100644 --- a/pnp-templates/check_mk-winperf.cpuusage.php +++ b/pnp-templates/check_mk-winperf.cpuusage.php @@ -26,7 +26,7 @@ $opt[1] = "--vertical-label 'Percent' -l0 -u100 --title \"CPU Utilization of $hostname\" "; -$def[1] = "DEF:usage=$RRDFILE[1]:$DS[1]:AVERAGE"; +$def[1] = "DEF:usage=$RRDFILE[1]:$DS[1]:AVERAGE "; $def[1] .= "AREA:usage#60f020:\"CPU utilization\" "; $def[1] .= "LINE:usage#40d010 "; diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 955532e..1deff32 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -541,6 +541,7 @@ perfometers["check_mk-enterasys_cpu_util"] = perfometer_cpu_utilization perfometers["check_mk-juniper_trpz_cpu_util"] = perfometer_cpu_utilization perfometers["check_mk-ibm_svc_nodestats.cpu_util"] = perfometer_cpu_utilization perfometers["check_mk-ibm_svc_systemstats.cpu_util"] = perfometer_cpu_utilization +perfometers["check_mk-sni_octopuse_cpu"] = perfometer_cpu_utilization def perfometer_ps_perf(row, check_command, perf_data): perf_dict = dict([(p[0], float(p[1])) for p in perf_data])