Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

Check_MK Git: check_mk: df_netapp/32: fixed output of used percent

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 770b125a5a5e268e618d22b90dd5a5eb198e9fc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=770b125a5a5e26… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 12:49:28 2011 +0100 df_netapp/32: fixed output of used percent Du to an integer division this was always 0.0% --- checks/df.include | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/df.include b/checks/df.include index a6d6f4d..9a47e5b 100644 --- a/checks/df.include +++ b/checks/df.include @@ -123,7 +123,7 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): return (1, "WARN - size of filesystem is 0 MB") used_mb = size_mb - avail_mb - used_perc = 100.0 * (used_mb / size_mb) + used_perc = 100.0 * (float(used_mb) / size_mb) size_gb = size_mb / 1024.0 # Get warning and critical levels already with 'magic factor' applied

13 years, 6 months

Check_MK Git: check_mk: FIX: precompile: include files before checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7fbcd746b446cb3776808aab8e9e70fd1e39aacf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fbcd746b446cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 12:45:13 2011 +0100 FIX: precompile: include files before checks --- ChangeLog | 2 ++ modules/check_mk.py | 22 +++++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index decec2f..94d9768 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Core, Setup, etc.: * FIX: do not assume 127.0.0.1 as IP address for usewalk_hosts if they are not SNMP hosts. + * FIX: precompile: make sure check includes are added before actual + checks Checks & Agents: * FIX: drbd now handles output of older version without an ep field diff --git a/modules/check_mk.py b/modules/check_mk.py index 6685637..51ececb 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2015,20 +2015,25 @@ no_inventory_possible = None # check info table # We need to include all those plugins that are referenced in the host's # check table - filenames = set([]) + filenames = [] for checktype in needed_types: + # Add library files needed by check (also look in local) + for lib in check_includes.get(checktype, []): + if local_checks_dir and os.path.exists(local_checks_dir + "/" + lib): + to_add = local_checks_dir + "/" + lib + else: + to_add = checks_dir + "/" + lib + if to_add not in filenames: + filenames.append(to_add) + + # Now add check file itself path = find_check_plugin(checktype) if not path: raise MKGeneralException("Cannot find plugin for check type %s (missing file %s/%s)\n" % \ (checktype, checks_dir, checktype)) - filenames.add(path) + if path not in filenames: + filenames.append(path) - # Add library files needed by check (also look in local) - for lib in check_includes.get(checktype, []): - if local_checks_dir and os.path.exists(local_checks_dir + "/" + lib): - filenames.add(local_checks_dir + "/" + lib) - else: - filenames.add(checks_dir + "/" + lib) output.write("check_info = {}\n" + "check_includes = {}\n" + @@ -2038,7 +2043,6 @@ no_inventory_possible = None "snmp_info_single = {}\n" + "snmp_scan_functions = {}\n") - for filename in filenames: output.write("# %s\n" % filename) output.write(stripped_python_file(filename))

13 years, 6 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c03bfc8b5c13b10bba0191ca998afa97742b3830 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c03bfc8b5c13b1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 12:36:06 2011 +0100 Updated bug entries --- .bugs/159 | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/.bugs/159 b/.bugs/159 new file mode 100644 index 0000000..67832a3 --- /dev/null +++ b/.bugs/159 @@ -0,0 +1,18 @@ +Title: Make PING timeouts configurable via main.mk +Component: core +Benefit: 3 +State: open +Cost: 2 +Date: 2011-02-27 12:33:39 +Class: feature + +The proposed way via extra_host_conf["check_command"] is possible +but difficult for many. + +Better would be: + +ping_levels = [ ( 200, 500, 40, 80 ), [ "wan" ], ALL_HOSTS ] + +Wie would need to make the check-host-alive and check-mk-ping commands +take an argument $ARG1$ that would be appended to the command line +and would the infuse options like -w and -c there.

13 years, 6 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 54bf582e76ebd76f10076a3cfd2cf49ad05dd5a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54bf582e76ebd7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 12:26:14 2011 +0100 Updated bug entries --- .bugs/158 | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/.bugs/158 b/.bugs/158 new file mode 100644 index 0000000..c8e8ecb --- /dev/null +++ b/.bugs/158 @@ -0,0 +1,16 @@ +Title: if: allow to configure link speed statically +Component: checks +Benefit: 1 +State: open +Cost: 1 +Date: 2011-02-27 12:24:35 +Class: feature + +In some cases the link speed of an interface is either detected wrong +or the actually usable maximum is other then the nominal speed. + +In that cases it would be helpful to be able to configure that +actual link speed statically in the check parameters (and also +disable speed checking by this). + +This could be done by a new paramter "assumed_speed" = 10000000.

13 years, 6 months

Check_MK Git: check_mk: HP-UX agent: fix output for df on long mount points

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9e030c77ea60fe9f69c4149facbf0c0de2f46573 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e030c77ea60fe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 12:16:16 2011 +0100 HP-UX agent: fix output for df on long mount points --- ChangeLog | 2 ++ agents/check_mk_agent.hpux | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index dde512b..decec2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ magic number. * FIX: scan function avoids hr_cpu and ucd_cpu_utilization at the same time + * FIX: HP-UX agent: fix output of df for long mount points + (thanks to Claas Rockmann-Buchterkirche) 1.1.9i9: diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 89905d9..405face 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -51,7 +51,7 @@ echo AgentDirectory: $MK_CONFDIR # modern systems with vxfs only here. The filesystem type is currently # not used by the check anyway. echo '<<<df>>>' -df -Pkl | sed -e 's/ / vxfs /' -e 1d +df -kP -F vxfs | sed 's/ / - /' | awk '/^(.*-.*)$/ { print $0 } /^([^-]+)$/ { printf $0 }' | grep -v ^/proc | grep -v ^Filesystem | grep -v : # Process table: HP-UX does not provide a resident size of processes. # We send a 0 here for RSZ.

13 years, 6 months

Check_MK Git: check_mk: SNMP scan: use hr_cpu *or* ucd_cpu_utilizatoin

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a0a964f99a6ab0ec24e9e64ef02b7aade2ac738d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0a964f99a6ab0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 12:10:17 2011 +0100 SNMP scan: use hr_cpu *or* ucd_cpu_utilizatoin --- ChangeLog | 2 ++ checks/hr_cpu | 6 +++++- .../{check_mk-hr_df.php => check_mk-hr_fs.php} | 0 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a74094..dde512b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,8 @@ for SNMP) * FIX: df, hr_fs and other filesystem checks: fix bug if using magic number. + * FIX: scan function avoids hr_cpu and ucd_cpu_utilization + at the same time 1.1.9i9: diff --git a/checks/hr_cpu b/checks/hr_cpu index 17ce48b..0fb1f6f 100644 --- a/checks/hr_cpu +++ b/checks/hr_cpu @@ -50,5 +50,9 @@ def check_hr_cpu(item, params, info): check_info["hr_cpu"] = (check_hr_cpu, "CPU utilization", 1, inventory_hr_cpu) snmp_info["hr_cpu"] = ( ".1.3.6.1.2.1.25.3.3.1", [ 2 ] ) + +# HOST-RESOURCES-MIB::hrSystemUptime.0 snmp_scan_functions["hr_cpu"] = lambda oid: \ - not not oid('.1.3.6.1.2.1.25.1.1.0') # HOST-RESOURCES-MIB::hrSystemUptime.0 + not not oid('.1.3.6.1.2.1.25.1.1.0') and not \ + ("linux" in oid("1.3.6.1.2.1.1.1.0").lower() + and oid("1.3.6.1.4.1.2021.10.1.6.1")) diff --git a/pnp-templates/check_mk-hr_df.php b/pnp-templates/check_mk-hr_fs.php similarity index 100% rename from pnp-templates/check_mk-hr_df.php rename to pnp-templates/check_mk-hr_fs.php

13 years, 6 months

Check_MK Git: check_mk: df: fix bug when using magic number

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 53c3738eabacadc17526c5f3160592c209357d39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53c3738eabacad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 11:59:33 2011 +0100 df: fix bug when using magic number --- ChangeLog | 2 ++ checkman/df | 2 ++ checks/df.include | 13 +++++++------ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ba9f10..7a74094 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ * Added SNMP scan function of df_netapp and df_netapp32 * FIX: repaired apc_symmetra (was broken due to new option -Ot for SNMP) + * FIX: df, hr_fs and other filesystem checks: fix bug if using + magic number. 1.1.9i9: diff --git a/checkman/df b/checkman/df index 7f26520..13880e2 100644 --- a/checkman/df +++ b/checkman/df @@ -164,3 +164,5 @@ filesystem_default_levels: Default levels for filesystem detected by inventory. filesystem_trend_perfdata (boolean): Whether or not to output trend performance data. This is preset to {False} so that no trend performance data is output. If you change this setting you need to convert or delete all RRD databases of filesystems. +df_lowest_warning_level(int): The magic factor will never lower the warning level for filesystems below this percentage. The default is {50}. +df_lowest_critical_level(int): This is the minimum critical level when using the magic factor. This is preset to {60} (percent). diff --git a/checks/df.include b/checks/df.include index b2f3699..a6d6f4d 100644 --- a/checks/df.include +++ b/checks/df.include @@ -28,8 +28,9 @@ # OBSOLETE: # df_magicnumber_normsize = 20 # Standard size if 20 GB -# df_lowest_warning_level = 50 # Never move warn level below 50% due to magic factor -# df_lowest_critical_level = 60 # Never move crit level below 60% due to magic factor + +df_lowest_warning_level = 50 # Never move warn level below 50% due to magic factor +df_lowest_critical_level = 60 # Never move crit level below 60% due to magic factor # Settings for filesystem checks (df, df_vms, df_netapp and maybe others) filesystem_levels = [] # obsolete. Just here to check config and warn if changed @@ -102,10 +103,10 @@ def get_filesystem_levels(host, mountpoint, size_gb, params): crit_scaled = 100 - (( 100 - crit ) * scale) # Make sure, levels do never get too low due to magic factor - if warn_scaled < lowest_warning_level: - warn_scaled = lowest_warning_level - if crit_scaled < lowest_critical_level: - crit_scaled = lowest_critical_level + if warn_scaled < df_lowest_warning_level: + warn_scaled = df_lowest_warning_level + if crit_scaled < df_lowest_critical_level: + crit_scaled = df_lowest_critical_level else: warn_scaled = warn crit_scaled = crit

13 years, 6 months

Check_MK Git: check_mk: FIX: repaired broken apc_symmetra

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 07457cf7dcc263f3b695c80a5fe14d50da0064fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07457cf7dcc263… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 11:37:26 2011 +0100 FIX: repaired broken apc_symmetra Was broken due to new -Ot --- ChangeLog | 2 ++ checks/apc_symmetra | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b75e0be..9ba9f10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ (needs agent update) * FIX: repaired df_netapp32 * Added SNMP scan function of df_netapp and df_netapp32 + * FIX: repaired apc_symmetra (was broken due to new option -Ot + for SNMP) 1.1.9i9: diff --git a/checks/apc_symmetra b/checks/apc_symmetra index f64d443..bec7bf9 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -112,10 +112,8 @@ def check_apc(item, params, info): # 8. run time remaining # RunTimeRemaining == "0:0:26:00.00" - parts = RunTimeRemaining.split(":") - secs = int(float(parts[-1])) - mins = int(parts[-2]) - hrs = int(parts[-3]) + hrs = int(RunTimeRemaining) / 3600 + mins, secs = divmod(int(RunTimeRemaining) % 3600, 60) single_states.append( (0, "run time remaining: %02d:%02d:%02d" % (hrs, mins, secs), None) ) # create summary state

13 years, 6 months

Check_MK Git: check_mk: Fix df_netapp32, add scan functions for netapp/32

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5a6bfe42238ae9d55ef9898569d1f479f5b60c81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a6bfe42238ae9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 11:26:29 2011 +0100 Fix df_netapp32, add scan functions for netapp/32 --- ChangeLog | 2 ++ checks/df_netapp | 3 +++ checks/df_netapp.include | 4 ++++ checks/df_netapp32 | 14 ++++---------- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index f39c5cc..b75e0be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ * FIX: drbd now handles output of older version without an ep field * systemtime: new simple check for time synchronization on Windows (needs agent update) + * FIX: repaired df_netapp32 + * Added SNMP scan function of df_netapp and df_netapp32 1.1.9i9: diff --git a/checks/df_netapp b/checks/df_netapp index c32e3b0..c9ce35b 100644 --- a/checks/df_netapp +++ b/checks/df_netapp @@ -28,3 +28,6 @@ check_includes['df_netapp'] = [ "df.include", "df_netapp.include" ] check_info['df_netapp'] = (check_df_netapp, "fs_%s", 1, inventory_df_netapp) snmp_info['df_netapp'] = ("1.3.6.1.4.1.789.1.5.4.1", [ 2, 29, 30 ] ) + +snmp_scan_functions['df_netapp'] = \ + lambda oid: is_netapp_filer(oid) and oid("1.3.6.1.4.1.789.1.5.4.1.29.1") diff --git a/checks/df_netapp.include b/checks/df_netapp.include index 64430f1..00925a2 100644 --- a/checks/df_netapp.include +++ b/checks/df_netapp.include @@ -44,3 +44,7 @@ def check_df_netapp(volume, params, info): avail_mb = size_mb - used_mb return df_check_filesystem(g_hostname, volume, size_mb, avail_mb, params) + +def is_netapp_filer(oid): + return "ontap" in oid("1.3.6.1.2.1.1.1.0").lower() or \ + oid("1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.789") diff --git a/checks/df_netapp32 b/checks/df_netapp32 index 451ef2e..633f7cf 100644 --- a/checks/df_netapp32 +++ b/checks/df_netapp32 @@ -26,14 +26,8 @@ check_includes['df_netapp32'] = [ "df.include", "df_netapp.include" ] -# These dummy functions prevent 'name 'inventory_df_netapp' is not defined' -# errors on loading this file before loading the check_includes -def check_df_netapp_local(*args): - check_df_netapp(*args) - -def inventory_df_netapp_local(*args): - inventory_df_netapp(*args) - - -check_info['df_netapp32'] = (check_df_netapp_local, "fs_%s", 1, inventory_df_netapp_local) +check_info['df_netapp32'] = (check_df_netapp, "fs_%s", 1, inventory_df_netapp) snmp_info['df_netapp32'] = ("1.3.6.1.4.1.789.1.5.4.1", [ 2, 3, 4 ] ) + +snmp_scan_functions['df_netapp32'] = \ + lambda oid: is_netapp_filer(oid) and not oid("1.3.6.1.4.1.789.1.5.4.1.29.1")

13 years, 6 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b34414dd37a558da1c30d764d683d118f5f59345 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b34414dd37a558… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 26 15:11:07 2011 +0100 Updated bug entries --- .bugs/157 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/157 b/.bugs/157 new file mode 100644 index 0000000..ab0e75e --- /dev/null +++ b/.bugs/157 @@ -0,0 +1,10 @@ +Title: df magic broken +Component: checks +Benefit: 1 +State: open +Cost: 1 +Date: 2011-02-26 13:15:33 +Class: bug + +filesystem_default_levels["magic"] = 0.8 +seems to break the df check in 1.1.9i9

13 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits