Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64454 discussions

Check_MK Git: check_mk: viprinet_* checks: fix SNMP scan function

by Mathias Kettner

Module: check_mk Branch: master Commit: 8c76f556c6972d9f6681c7e9d4592b14bead4dbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c76f556c6972d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 14 12:14:23 2013 +0200 viprinet_* checks: fix SNMP scan function --- checks/viprinet_firmware | 2 +- checks/viprinet_mem | 2 +- checks/viprinet_power | 2 +- checks/viprinet_router | 2 +- checks/viprinet_serial | 2 +- checks/viprinet_temp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/checks/viprinet_firmware b/checks/viprinet_firmware index 0b4262d..11c3626 100644 --- a/checks/viprinet_firmware +++ b/checks/viprinet_firmware @@ -45,5 +45,5 @@ check_info["viprinet_firmware"] = { 'service_description' : "Firmware Version", 'has_perfdata' : False, 'snmp_info' : (".1.3.6.1.4.1.35424.1.1", [4, 7]), - 'snmp_scan' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], } diff --git a/checks/viprinet_mem b/checks/viprinet_mem index f7b4f30..63f8d2a 100644 --- a/checks/viprinet_mem +++ b/checks/viprinet_mem @@ -30,5 +30,5 @@ check_info["viprinet_mem"] = { 'service_description' : "Memory", 'has_perfdata' : False, 'snmp_info' : (".1.3.6.1.4.1.35424.1.2", [2]), - 'snmp_scan' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], } diff --git a/checks/viprinet_power b/checks/viprinet_power index b04b1a1..c3808eb 100644 --- a/checks/viprinet_power +++ b/checks/viprinet_power @@ -41,5 +41,5 @@ check_info["viprinet_power"] = { 'service_description' : "Power-Supply", 'has_perfdata' : False, 'snmp_info' : (".1.3.6.1.4.1.35424.1.2", [5]), - 'snmp_scan' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], } diff --git a/checks/viprinet_router b/checks/viprinet_router index 6eec67d..ca287b6 100644 --- a/checks/viprinet_router +++ b/checks/viprinet_router @@ -43,6 +43,6 @@ check_info["viprinet_router"] = { 'service_description' : "Router Mode", 'has_perfdata' : False, 'snmp_info' : (".1.3.6.1.4.1.35424.1.1", [5]), - 'snmp_scan' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], } diff --git a/checks/viprinet_serial b/checks/viprinet_serial index c89cfb6..0106fb4 100644 --- a/checks/viprinet_serial +++ b/checks/viprinet_serial @@ -30,6 +30,6 @@ check_info["viprinet_serial"] = { 'service_description' : "Serial Number", 'has_perfdata' : False, 'snmp_info' : (".1.3.6.1.4.1.35424.1.1", [2]), - 'snmp_scan' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], } diff --git a/checks/viprinet_temp b/checks/viprinet_temp index e55f252..80a77ea 100644 --- a/checks/viprinet_temp +++ b/checks/viprinet_temp @@ -51,6 +51,6 @@ check_info["viprinet_temp"] = { 'group' : "room_temperature", 'has_perfdata' : True, 'snmp_info' : (".1.3.6.1.4.1.35424.1.2", [3, 4]), - 'snmp_scan' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.35424"], }

11 years, 4 months

Check_MK Git: check_mk: FIX: f5_bigip_psu: handle more than first power supply

by Mathias Kettner

Module: check_mk Branch: master Commit: 1d5e836023e3131a8ed9fdda08db7fc849885991 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d5e836023e313… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 14 12:07:19 2013 +0200 FIX: f5_bigip_psu: handle more than first power supply Conflicts: checks/f5_bigip_psu --- ChangeLog | 1 + checks/f5_bigip_psu | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c47cf60..15a2ce5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -128,6 +128,7 @@ * FIX: jolokia_info: ignore ERROR instances * FIX: apache_status: use (also) apache_status.cfg instead of apache_status.conf * FIX: f5_bigip_vserver: fix wrong OID (13 instead of 1), thanks to Miro Ramza + * FIX: f5_bigip_psu: handle more than first power supply, thanks to Miro Ramza 1.2.2p1: diff --git a/checks/f5_bigip_psu b/checks/f5_bigip_psu index caa4fca..99a0066 100644 --- a/checks/f5_bigip_psu +++ b/checks/f5_bigip_psu @@ -40,7 +40,8 @@ def inventory_f5_bigip_psu(info): inventory = [] for line in info: - psu, state = line[0] + psu = line[0] + state = line[1] # inventorize the PSU unless it's in state 2 (notpresent) if state != "2": inventory.append((psu, None)) @@ -48,8 +49,8 @@ def inventory_f5_bigip_psu(info): def check_f5_bigip_psu(item, _no_params, info): for line in info: - psu = line[0][0] - state = int(line[0][1]) + psu = line[0] + state = int(line[1]) if psu == item: if state == 1: return (0, "PSU state: good") @@ -68,7 +69,7 @@ check_info["f5_bigip_psu"] = { 'inventory_function': inventory_f5_bigip_psu, 'service_description': 'PSU %s', # Get ID and status from the SysChassisPowerSupplyTable - 'snmp_info': [('.1.3.6.1.4.1.3375.2.1.3.2.2.2.1', [1, 2])], + 'snmp_info': ('.1.3.6.1.4.1.3375.2.1.3.2.2.2.1', [1, 2]), 'snmp_scan_function': \ # Check using the vendor mib Id and verify it's a loadbalancer lambda oid: '.1.3.6.1.4.1.3375.2' in oid(".1.3.6.1.2.1.1.2.0") \

11 years, 4 months

Check_MK Git: check_mk: FIX: f5_bigip_vserver: fix wrong OID (

by Mathias Kettner

13 instead of 1) Message-ID: <51920c17.9EzWG2OWZNKAPyGo%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 7fb7f1828a40407973fea01f1cafe88450955745 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fb7f1828a4040… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 14 12:02:25 2013 +0200 FIX: f5_bigip_vserver: fix wrong OID (13 instead of 1) Conflicts: ChangeLog checks/f5_bigip_vserver --- ChangeLog | 3 ++- checks/f5_bigip_vserver | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28f415f..c47cf60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -127,7 +127,8 @@ Checks & Agents: * FIX: jolokia_info: ignore ERROR instances * FIX: apache_status: use (also) apache_status.cfg instead of apache_status.conf - + * FIX: f5_bigip_vserver: fix wrong OID (13 instead of 1), thanks to Miro Ramza + 1.2.2p1: Core: diff --git a/checks/f5_bigip_vserver b/checks/f5_bigip_vserver index 93120ea..10beec6 100644 --- a/checks/f5_bigip_vserver +++ b/checks/f5_bigip_vserver @@ -69,7 +69,7 @@ check_info["f5_bigip_vserver"] = { 'check_function': check_f5_bigip_vserver, 'inventory_function': inventory_f5_bigip_vserver, 'service_description': 'Virtual Server %s', - 'snmp_info': ('.1.3.6.1.4.1.3375.2.2.10.1.2.1', [ + 'snmp_info': ('.1.3.6.1.4.1.3375.2.2.10.13.2.1', [ 1, # Name 2, # Status ]),

11 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0930

by Andreas Boesl

Module: check_mk Branch: master Commit: dd81546e6008ab486efbf1c530342ecebe4faf05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd81546e6008ab… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 8 15:10:13 2013 +0200 Updated bug entries #0930 --- .bugs/930 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/930 b/.bugs/930 new file mode 100644 index 0000000..33ccd2d --- /dev/null +++ b/.bugs/930 @@ -0,0 +1,13 @@ +Title: cleanup tmp/nagios/checkresults +Component: core +State: open +Date: 2013-05-08 15:07:10 +Targetversion: future +Class: nastiness + +If nagios stops/crashes/reloads while the service Check_MK creates an checkresult file +the .ok file might be missing. Thus thrashing the checkresults directory since no +one is interested in cleaning up this mess. + +Solution: +cronjob in omd which regularly cleans files older than 1 hour

11 years, 4 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 7204268abf0a532e3e39f92d5fe26940a857320d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7204268abf0a53… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 8 10:29:02 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 4 months

Check_MK Git: check_mk: Removed debug output

by Lars Michelsen

Module: check_mk Branch: master Commit: f6d2ee42f51cb2b8f12f86ec850aa65c50620073 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6d2ee42f51cb2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 8 10:28:59 2013 +0200 Removed debug output --- checks/sap | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/sap b/checks/sap index f27bdc1..5af2b49 100644 --- a/checks/sap +++ b/checks/sap @@ -95,7 +95,6 @@ def inventory_sap_value(info): for line in info: for pattern, limit_item_levels in patterns: - print pattern, limit_item_levels if sap_value_path_matches(line[3], pattern): params = {} if limit_item_levels:

11 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0928, #0929, #0927

by Andreas Boesl

Module: check_mk Branch: master Commit: d854ee487fff74722d9f7a99a3c0211344518da4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d854ee487fff74… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 8 09:56:57 2013 +0200 Updated bug entries #0928, #0929, #0927 --- .bugs/927 | 12 ++++++++++++ .bugs/928 | 17 +++++++++++++++++ .bugs/929 | 20 ++++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/.bugs/927 b/.bugs/927 new file mode 100644 index 0000000..2d64244 --- /dev/null +++ b/.bugs/927 @@ -0,0 +1,12 @@ +Title: rising service check latency when using livecheck +Component: livecheck +State: open +Date: 2013-05-08 09:40:42 +Targetversion: future +Class: nastiness + +It seems that there are still some performance problems when using livecheck +Scenario: 16000 services +20 livecheck helpers, no livecheck overflows + +When running nagios the service check latency goes up (7 minutes and further) diff --git a/.bugs/928 b/.bugs/928 new file mode 100644 index 0000000..68a18c7 --- /dev/null +++ b/.bugs/928 @@ -0,0 +1,17 @@ +Title: livestatus table statehist speedup +Component: livestatus +State: open +Date: 2013-05-08 09:47:22 +Targetversion: future +Class: feature + +Querying large timeframes within the statehist table can eat up +lots of time. This is because for every host/service an object is +generated which stores the data. +On global changes (timeperiod change) each of these objects need to be updated + +Sometimes the query just want to get info about a single host - using Filters +statehist disregards this wish when collecting data, thus resulting in the slow performance + +Possible solution: +Take the queries filter into account when creating the objects for the host/services diff --git a/.bugs/929 b/.bugs/929 new file mode 100644 index 0000000..82ab67e --- /dev/null +++ b/.bugs/929 @@ -0,0 +1,20 @@ +Title: Notification speedup +Component: core +State: open +Date: 2013-05-08 09:51:56 +Targetversion: future +Class: nastiness + +When using large monitoring environments ( thousands of hosts / hundreds of users ) +notifications from nagios take quite some time to process (~1 seconds) + +Problem: +If there are multiple users within the contact group of a service, nagios will +start a notification command for each single user, which adds up quite some time +e.g. 10 users -> 10 seconds + +Even worse, nagios hangs while the notifications are processed! + +Solution: +Each user gets a precompiled notification file. +So its no longer neccessary to read the entire configuration from scratch when a notication is raised

11 years, 4 months

Check_MK Git: check_mk: Reserved 20 bug IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 5e19fdcac9240d279e85a75b7546f48e4a605b0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e19fdcac9240d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 8 09:40:08 2013 +0200 Reserved 20 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 866faa8..43c16f4 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -927 +947

11 years, 4 months

Check_MK Git: check_mk: winperf_processor: Now displays (and scales) to number of cpus in pnpgraph

by Andreas Boesl

Module: check_mk Branch: master Commit: f43f4b8662613f93f75ed929a99104e0f1fca427 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f43f4b8662613f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 7 16:27:47 2013 +0200 winperf_processor: Now displays (and scales) to number of cpus in pnpgraph --- ChangeLog | 1 + checkman/winperf_processor.util | 25 +++++--- checks/winperf_processor | 3 +- pnp-templates/check_mk-winperf_processor.util.php | 65 +-------------------- 4 files changed, 20 insertions(+), 74 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91a8996..28f415f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ * viprinet checks: New checks for firmware version/update, memory usage, power supply status, router mode, serialnumber and temperature sensors * uptime, snmp_uptime, esx_vsphere_counters.uptime: allow to set lower and upper levels + * winperf_processor: Now displays (and scales) to number of cpus in pnpgraph Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/checkman/winperf_processor.util b/checkman/winperf_processor.util index bef6f38..774a4d1 100644 --- a/checkman/winperf_processor.util +++ b/checkman/winperf_processor.util @@ -10,22 +10,29 @@ description: Setting a level for warning or a critical state is possible, but might not be very usefull, since the computed value is an average over - just one check cycle. A combination with a larger value of {max_check_attempts} - or {notification_delay} might be useful here. + just one check cycle. Consider to set the {average} option for this purpose. + A combination with a larger value of {max_check_attempts} + or {notification_delay} might also be useful here. perfdata: - The averaged percentage of CPU utilization during the last check cycle. + One or two values: the first value is current usage in percent - ranging from + 0 to 100. The "maximum" value is not 100, but the number of CPU threads. This + case be used for scaling the graph in terms of the number of used CPU threads. + + If averaging is enabled then a second value is sent: the averaged CPU utilization + ranging from 0 to 100. inventory: A check of this type is automatically created for all Windows hosts. [parameters] -warning (int): The percentage of CPU usage that triggers - a WARNING state -critical (int): The percentage of CPU usage that triggers - a CRITICAL state +parameters(dict): A dictionary with the following keys: -[configuration] -winperf_cpu_default_levels (int, int): Default levels warning and critical + {"levels"}: Either {None} for no levels, a tuple of warn and crit (in percent) or + a dictionary with predictive levels settings. + {"average"}: A number of minutes for enabling averaging. + +[configuration] +winperf_cpu_default_levels(dict): Default levels, preset to { "levels": (101.0, 101.0) } diff --git a/checks/winperf_processor b/checks/winperf_processor index 9c16d67..140ed02 100644 --- a/checks/winperf_processor +++ b/checks/winperf_processor @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. -winperf_cpu_default_levels = ( 101.0, 101.0 ) +winperf_cpu_default_levels = { "levels": ( 101.0, 101.0 ) } def inventory_winperf_util(info): if len(info) <= 1: @@ -71,6 +71,7 @@ def check_winperf_util(_no_item, params, info): used_perc = 100 state, infotext, perfdata = check_cpu_util(used_perc, params, this_time) + perfdata[0] = perfdata[0][:5] + (num_cpus,) infotext += ", %d CPUs" % num_cpus return state, infotext, perfdata diff --git a/pnp-templates/check_mk-winperf_processor.util.php b/pnp-templates/check_mk-winperf_processor.util.php deleted file mode 100644 index 1da3886..0000000 --- a/pnp-templates/check_mk-winperf_processor.util.php +++ /dev/null @@ -1,64 +0,0 @@ -<?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. - -# Do not depend on numbers, use names -$RRD = array(); -foreach ($NAME as $i => $n) { - $RRD[$n] = "$RRDFILE[$i]:$DS[$i]:MAX"; - $WARN[$n] = $WARN[$i]; - $CRIT[$n] = $CRIT[$i]; - $MIN[$n] = $MIN[$i]; - $MAX[$n] = $MAX[$i]; -} - -$desc = str_replace("_", " ", $servicedesc); -$opt[1] = "--vertical-label 'CPU utilization %' -l0 -u 100 --title \"$hostname - $desc\" "; - -$def[1] = "DEF:util=$RRD[util] ". - "AREA:util#60f020:\"Utilization\:\" ". - "LINE:util#40a018 ". - "GPRINT:util:LAST:\"%4.1lf%%,\" ". - "GPRINT:util:MIN:\"min\: %4.1lf%%,\" ". - "GPRINT:util:MAX:\"max\: %4.1lf%%\\n\" ". - ""; - -if (isset($RRD["avg"])) { - $def[1] .= "DEF:avg=$RRD[avg] ". - "LINE:avg#000080:\"Averaged \" ". - "GPRINT:avg:LAST:\"%4.1lf%%,\" ". - "GPRINT:avg:MIN:\"min\: %4.1lf%%,\" ". - "GPRINT:avg:MAX:\"max\: %4.1lf%%\\n\" ". - ""; -} - -if ($WARN[1]) { - $def[1] .= - "HRULE:$WARN[1]#ffe000:\"Warning at $WARN[1]%\" ". - "HRULE:$CRIT[1]#ff0000:\"Critical at $CRIT[1]%\\n\" ". - ""; -} -# - -?> diff --git a/pnp-templates/check_mk-winperf_processor.util.php b/pnp-templates/check_mk-winperf_processor.util.php new file mode 120000 index 0000000..a7d9073 --- /dev/null +++ b/pnp-templates/check_mk-winperf_processor.util.php @@ -0,0 +1 @@ +check_mk-esx_vsphere_hostsystem.cpu_usage.php \ No newline at end of file

11 years, 4 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 822462001fa117011eda2d4fd31fc316cbf717c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=822462001fa117… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 7 15:04:58 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits