Checkmk git commits March 2013

checkmk-commits@lists.checkmk.com

3 participants
209 discussions

Check_MK Git: check_mk: cisco_qos: pnp template coloring. added perfometer. fixed unit conversion(base 1000)

by Andreas Boesl

Module: check_mk Branch: master Commit: 2594bb5e3c300a3624a30d00c7de7f63b30efaad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2594bb5e3c300a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 8 15:41:07 2013 +0100 cisco_qos: pnp template coloring. added perfometer. fixed unit conversion(base 1000) --- pnp-templates/check_mk-cisco_qos.php | 6 +++--- web/plugins/perfometer/check_mk.py | 11 +++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pnp-templates/check_mk-cisco_qos.php b/pnp-templates/check_mk-cisco_qos.php index f74f417..c7ff952 100644 --- a/pnp-templates/check_mk-cisco_qos.php +++ b/pnp-templates/check_mk-cisco_qos.php @@ -47,7 +47,7 @@ if($bandwidth > $base * $base * $base) { } $ds_name[1] = 'QoS Class Traffic'; -$opt[1] = "--vertical-label \"MBit/sec\" -X0 -b 1024 --title \"$hostname / $servicedesc\" "; +$opt[1] = "--vertical-label \"MBit/sec\" -X0 -b 1000 --title \"$hostname / $servicedesc\" "; $def[1] = "HRULE:0#c0c0c0 ". "HRULE:$bandwidth#808080:\"Interface speed\: " . sprintf("%.1f", $bandwidth) . " ".$bwuom."Bit/s\\n\" ". @@ -76,11 +76,11 @@ $def[1] .= "DEF:postbytes_avg=$RRDFILE[3]:$DS[1]:MAX ". "CDEF:drop_traffic_avg=dropbytes_avg,8,* ". "CDEF:postmbit_avg=post_traffic_avg,1000000,/ ". "CDEF:dropmbit_avg=drop_traffic_avg,1000000,/ ". - "LINE:postmbit_avg#a3f090:\"post avg \" ". + "LINE:postmbit_avg#3b762e:\"post avg \" ". "GPRINT:post_traffic_avg:LAST:\"%5.1lf %sBit/s last\" ". "GPRINT:post_traffic_avg:AVERAGE:\"%5.1lf %sBit/s avg\" ". "GPRINT:post_traffic_avg:MAX:\"%5.1lf %sBit/s max\\n\" ". - "LINE:dropmbit_avg#6030f0:\"drop avg \" ". + "LINE:dropmbit_avg#1255a9:\"drop avg \" ". "GPRINT:drop_traffic_avg:LAST:\"%5.1lf %sBit/s last\" ". "GPRINT:drop_traffic_avg:AVERAGE:\"%5.1lf %sBit/s avg\" ". "GPRINT:drop_traffic_avg:MAX:\"%5.1lf %sBit/s max\\n\" "; diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index a8ea017..12612db 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -300,6 +300,16 @@ def perfometer_check_mk_brocade_fcport(row, check_command, perf_data): out_bw = savefloat(perf_data[1][6]), ) +def perfometer_check_mk_cisco_qos(row, check_command, perf_data): + unit = "Bit/s" in row["service_plugin_output"] and "Bit" or "B" + return perfometer_bandwidth( + in_traffic = savefloat(perf_data[0][1]), + out_traffic = savefloat(perf_data[1][1]), + in_bw = savefloat(perf_data[0][5]) , + out_bw = savefloat(perf_data[1][5]) , + unit = unit + ) + perfometers["check_mk-if"] = perfometer_check_mk_if perfometers["check_mk-if64"] = perfometer_check_mk_if perfometers["check_mk-vms_if"] = perfometer_check_mk_if @@ -308,6 +318,7 @@ perfometers["check_mk-lnx_if"] = perfometer_check_mk_if perfometers["check_mk-hpux_if"] = perfometer_check_mk_if perfometers["check_mk-mcdata_fcport"] = perfometer_check_mk_if perfometers["check_mk-brocade_fcport"] = perfometer_check_mk_brocade_fcport +perfometers["check_mk-cisco_qos"] = perfometer_check_mk_cisco_qos def perfometer_oracle_tablespaces(row, check_command, perf_data): current = float(perf_data[0][1])

11 years, 3 months

Check_MK Git: check_mk: perfometer: Bit values now using base of 1000

by Andreas Boesl

Module: check_mk Branch: master Commit: 33ccf81c4bfee98b018bc5a53b215976cd9e31cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33ccf81c4bfee9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 8 15:39:59 2013 +0100 perfometer: Bit values now using base of 1000 --- ChangeLog | 1 + web/plugins/views/perfometer.py | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92fe1ad..b64a43c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * Added plugins to config module to make registration of default values possible for addons like mkeventd - reset to default values works now correctly even for multisite related settings + * perfometer: Bit values now using base of 1000 * ADD: check_disk_smb pnp-template Event Console: diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 8553c3f..a334f05 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -91,14 +91,18 @@ def perfometer_logarithmic_dual(value_left, color_left, value_right, color_right def number_human_readable(n, precision=1, unit="B"): + base = 1024.0 + if unit == "Bit": + base = 1000.0 + n = float(n) f = "%." + str(precision) + "f" - if abs(n) > 1024 * 1024 * 1024: - return (f + "G%s") % (n / (1024.0 * 1024 * 1024), unit) - elif abs(n) > 1024 * 1024: - return (f + "M%s") % (n / (1024.0 * 1024), unit) - elif abs(n) > 1024: - return (f + "k%s") % (n / 1024.0, unit) + if abs(n) > base * base * base: + return (f + "G%s") % (n / (base * base * base), unit) + elif abs(n) > base * base: + return (f + "M%s") % (n / (base * base), unit) + elif abs(n) > base: + return (f + "k%s") % (n / base, unit) else: return (f + "%s") % (n, unit)

11 years, 3 months

Check_MK Git: check_mk: new: check_disk_smb pnp template

by Andreas Boesl

Module: check_mk Branch: master Commit: 04d5c4b6d5a203754208a7d124c3eddb45f369c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04d5c4b6d5a203… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 8 14:34:16 2013 +0100 new: check_disk_smb pnp template --- ChangeLog | 1 + pnp-templates/check_mk_active-disk_smb.php | 63 ++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce91457..070e965 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * Added plugins to config module to make registration of default values possible for addons like mkeventd - reset to default values works now correctly even for multisite related settings + * ADD: check_disk_smb pnp-template Event Console: * New rule feature: automatically delete event after actions diff --git a/pnp-templates/check_mk_active-disk_smb.php b/pnp-templates/check_mk_active-disk_smb.php new file mode 100644 index 0000000..f5ee3e9 --- /dev/null +++ b/pnp-templates/check_mk_active-disk_smb.php @@ -0,0 +1,63 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +setlocale(LC_ALL, "POSIX"); + +# RRDtool Options +#$servicedes=$NAGIOS_SERVICEDESC + +$fsname = str_replace("_", "/", substr($servicedesc, 3)); +$fstitle = $fsname; + +# Hack for windows: replace C// with C:\ +if (strlen($fsname) == 3 && substr($fsname, 1, 2) == '//') { + $fsname = $fsname[0] . "\:\\\\"; + $fstitle = $fsname[0] . ":\\"; +} + +$mega = 1024.0 * 1024.0; +$giga = 1024.0 * 1024.0 * 1024.0; +$sizegb = sprintf("%.1f", $MAX[1] / $giga); +$maxgb = $MAX[1] / $giga; +$warngb = $WARN[1] / $giga; +$critgb = $CRIT[1] / $giga; +$warngbtxt = sprintf("%.1f", $warngb); +$critgbtxt = sprintf("%.1f", $critgb); + +$opt[1] = "--vertical-label GB -l 0 -u $maxgb -b 1024 --title '$hostname: Filesystem $fstitle ($sizegb GB)' "; + +# First graph show current filesystem usage +$def[1] = "DEF:used_bytes=$RRDFILE[1]:$DS[1]:MAX "; +$def[1] .= "CDEF:var1=used_bytes,$giga,/ "; +$def[1] .= "AREA:var1#00ffc6:\"used space on $fsname\\n\" "; +$def[1] .= "LINE1:var1#226600: "; +$def[1] .= "HRULE:$maxgb#003300:\"Size ($sizegb GB) \" "; +$def[1] .= "HRULE:$warngb#ffff00:\"Warning at $warngbtxt GB \" "; +$def[1] .= "HRULE:$critgb#ff0000:\"Critical at $critgbtxt GB \\n\" "; +$def[1] .= "GPRINT:var1:LAST:\"current\: %6.2lf GB\" "; +$def[1] .= "GPRINT:var1:MAX:\"max\: %6.2lf GB \" "; +$def[1] .= "GPRINT:var1:AVERAGE:\"avg\: %6.2lf GB\" "; + +?>

11 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: be6d256154c6d6a510f711b464d8187f30a36aa6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be6d256154c6d6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 8 14:34:27 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: Removed the nagios_state_names variable from several checks

by Lars Michelsen

Module: check_mk Branch: master Commit: 5573ec346a82aa70d3a9c2170a9a11fff580748a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5573ec346a82aa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 8 09:23:46 2013 +0100 Removed the nagios_state_names variable from several checks --- checks/db2_mem | 6 +++--- checks/df.include | 4 +--- checks/esx_vsphere_hostsystem | 8 ++++---- checks/hpux_tunables | 8 ++------ checks/mem | 5 ++--- checks/mysql_capacity | 4 ++-- checks/netapp_fcpio | 4 ++-- checks/postgres_stat_database | 2 +- checks/printer_supply_ricoh | 4 ++-- checks/vms_cpu | 4 ++-- checks/vxvm_objstatus | 2 +- checks/wmic_process | 7 +++---- checks/zypper | 4 ++-- 13 files changed, 27 insertions(+), 35 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5573ec346a…

11 years, 3 months

Check_MK Git: check_mk: Removed the nagios_state_names variable from several checks

by Lars Michelsen

Module: check_mk Branch: master Commit: 9cc9121e6789607ce9dc9793e542a2210e9bd2a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cc9121e678960… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 8 09:12:40 2013 +0100 Removed the nagios_state_names variable from several checks --- checks/aix_lvm | 2 +- checks/aix_multipath | 2 +- checks/blade_bx_blades | 2 +- checks/blade_bx_powermod | 2 +- checks/bonding.include | 2 +- checks/cbl_airlaser | 2 +- checks/cisco_asa_failover | 2 +- checks/cisco_hsrp | 2 +- checks/cisco_temp_sensor | 2 +- checks/cups_queues | 2 +- checks/esx_vsphere_hostsystem | 4 ++-- checks/esx_vsphere_virtualmachine | 2 +- checks/fileinfo | 2 +- checks/fortigate_memory | 2 +- checks/fortigate_sessions | 2 +- checks/hpux_fchba | 5 +---- checks/hwg_temp | 2 +- checks/megaraid_bbu | 2 +- checks/ntp | 2 +- checks/raritan_emx | 2 +- checks/sym_brightmail_queues | 2 +- checks/tsm_stagingpools | 2 +- checks/ups_eaton_enviroment | 2 +- checks/vxvm_multipath | 2 +- checks/windows_multipath | 2 +- checks/zpool_status | 2 +- 26 files changed, 27 insertions(+), 30 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9cc9121e67…

11 years, 3 months

Check_MK Git: check_mk: Removed a lot of hardcoded state texts from checks

by Lars Michelsen

11 years, 3 months

Check_MK Git: check_mk: Removed the nagios_state_names variable from a bit more checks

by Lars Michelsen

11 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 8195af3063161e4288313e33e7beea1da38f6aec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8195af3063161e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 8 11:25:24 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 3 months

Check_MK Git: check_mk: Removed a lot of hardcoded state texts from checks

by Lars Michelsen

11 years, 3 months

← Newer
1
...
8
9
10
11
12
13
14
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2013