Checkmk git commits February 2011

checkmk-commits@lists.checkmk.com

3 participants
186 discussions

Check_MK Git: check_mk: added perf-O-Meter for non-df filesystem checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b871d1da273d00fef86fdea6b6e4522b62ad00b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b871d1da273d00… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 13:41:01 2011 +0100 added perf-O-Meter for non-df filesystem checks --- ChangeLog | 1 + web/.f12 | 2 +- web/plugins/perfometer/check_mk.py | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6dd0f1f..d797888 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * FIX: df_netapp/32: fixed output of used percentage (was always 0% due to integer division) * FIX: fixed manual of df (magic_norm -> magic_normsize) + * Added Perf-O-Meter for non-df filesystem checks (e.g. netapp) 1.1.9i9: diff --git a/web/.f12 b/web/.f12 index 2e15990..b869ee7 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,2 +1,2 @@ sudo cp -prv * /omd/versions/default/share/check_mk/web/ -sudo su - -c 'omd restart wato apache' +sudo su - -c 'omd restart eins apache' diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index c23ddeb..90f4bad 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -59,13 +59,14 @@ def perfometer_check_mk_df(row, check_command, perf_data): h += perfometer_td(perc_used, color) h += perfometer_td(perc_free, "white") h += "</tr></table>" - # return "%d%% of %.1fGB used" % (perc_used, float(value)/1024.0), h return "%d%%" % perc_used, h - return "%d%% used" % perc_used, h perfometers["check_mk-df"] = perfometer_check_mk_df perfometers["check_mk-vms_df"] = perfometer_check_mk_df perfometers["check_disk"] = perfometer_check_mk_df +perfometers["check_mk-df_netapp"] = perfometer_check_mk_df +perfometers["check_mk-df_netapp32"] = perfometer_check_mk_df +perfometers["check_mk-hr_fs"] = perfometer_check_mk_df def perfometer_check_mk_kernel_util(row, check_command, perf_data):

13 years, 4 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e6bd0805958a54be4d6d0bb1a96ae42c67c7b773 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6bd0805958a54… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 13:18:52 2011 +0100 Updated bug entries --- .bugs/160 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/160 b/.bugs/160 new file mode 100644 index 0000000..4aaa475 --- /dev/null +++ b/.bugs/160 @@ -0,0 +1,9 @@ +Title: Uptime-Check for SNMP hosts +Component: checks +Benefit: 1 +State: open +Cost: 1 +Date: 2011-02-27 13:18:21 +Class: feature + +Like the agent based one but retrieved via SNMP.

13 years, 4 months

Check_MK Git: check_mk: RPM: use BuildArch: noarch

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 63fd6adc21d605eab32db8b1831736f145553ed4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63fd6adc21d605… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 13:16:48 2011 +0100 RPM: use BuildArch: noarch --- ChangeLog | 2 ++ Makefile | 2 +- check_mk.spec | 2 ++ 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 309aa11..6dd0f1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ they are not SNMP hosts. * FIX: precompile: make sure check includes are added before actual checks + * RPM: use BuildArch: noarch in spec file rather than as a command + line option (thanks to Ulrich Kiermayr) Checks & Agents: * FIX: drbd now handles output of older version without an ep field diff --git a/Makefile b/Makefile index 574c130..87d7dee 100644 --- a/Makefile +++ b/Makefile @@ -130,7 +130,7 @@ rpm $(DISTNAME)-1.noarch.rpm: $(MAKE) dist cp $(DISTNAME).tar.gz $(RPM_TOPDIR)/SOURCES sed "s/^Version:.*/Version: $(VERSION)/" $(NAME).spec > $(NAME)-$(VERSION).spec - rpmbuild -ba --target=noarch --buildroot "$$(pwd)/$(RPM_BUILDROOT)" --define "_topdir $$(pwd)/$(RPM_TOPDIR)" $(NAME)-$(VERSION).spec + rpmbuild -ba --buildroot "$$(pwd)/$(RPM_BUILDROOT)" --define "_topdir $$(pwd)/$(RPM_TOPDIR)" $(NAME)-$(VERSION).spec rm -f $(DISTNAME).spec mv -v $(RPM_TOPDIR)/RPMS/*/* . mv -v $(RPM_TOPDIR)/SRPMS/* . diff --git a/check_mk.spec b/check_mk.spec index 18a7d1a..c834767 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -33,6 +33,8 @@ Source: check_mk-%{version}.tar.gz BuildRoot: /tmp/rpm.buildroot.check_mk-%{version} AutoReq: off AutoProv: off +BuildArch: noarch + %description check_mk is a xinetd-based remote agent for monitoring Linux and Unix-Servers

13 years, 4 months

Check_MK Git: check_mk: FIX: fixed manual of df (magic_norm -> magic_normsize)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 772bfa0939d8cd4cebb98291d94f726492511bf5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=772bfa0939d8cd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 13:09:24 2011 +0100 FIX: fixed manual of df (magic_norm -> magic_normsize) --- ChangeLog | 1 + checkman/df | 4 ++-- checks/df.include | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e924e1a..529e16d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ (thanks to Claas Rockmann-Buchterkirche) * FIX: df_netapp/32: fixed output of used percentage (was always 0% due to integer division) + * FIX: fixed manual of df (magic_norm -> magic_normsize) 1.1.9i9: diff --git a/checkman/df b/checkman/df index 13880e2..a38630b 100644 --- a/checkman/df +++ b/checkman/df @@ -42,7 +42,7 @@ examples: filesystem_default_levels = { "levels" : (80, 90), # levels in percent "magic" : 0.8, # magic factor - "magic_norm" : 20, # normsize in GB + "magic_normsize" : 20, # normsize in GB "levels_low" : (50, 60), # magic never lowers levels below this (percent) "trend_range" : 48, # hours "trend_mb" : (10, 20), # MB of change during trend_range @@ -113,7 +113,7 @@ parameters (dict): This check supports two types of parameters. The the levels for large filesystems and lowers them for small ones. Please look at online documentation for more details about the magic factor. - {"magic_norm"}: Norm size of a filesystem for the magic computation. + {"magic_normsize"}: Norm size of a filesystem for the magic computation. The default for this is {20}. It is measured in {GB}. {"levels_low"}: When applying the magic factor the warn/crit levels diff --git a/checks/df.include b/checks/df.include index 9a47e5b..5fbb42d 100644 --- a/checks/df.include +++ b/checks/df.include @@ -42,7 +42,7 @@ inventory_df_exclude_mountpoints = [ '/dev' ] # Alternative syntax for parameters: # { "levels" : (80, 90), # levels in percent # "magic" : 0.5, # magic factor -# "magic_norm" : 20, # normsize in GB +# "magic_normsize" : 20, # normsize in GB # "levels_low" : (50, 60), # magic never lowers levels below this (percent) # "trend_range" : 24, # hours # "trend_mb" : (10, 20), # MB of change during trend_range

13 years, 4 months

Check_MK Git: check_mk: df: use levels_low instaed of df_lowest_...

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1e2311db556d506f598e81aa4afdea9db8b87ed8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e2311db556d50… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 13:12:41 2011 +0100 df: use levels_low instaed of df_lowest_... --- ChangeLog | 2 +- checkman/df | 2 -- checks/df.include | 14 +++++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 529e16d..309aa11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,7 +14,7 @@ * 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. + magic number. levels_low is now honored. * FIX: scan function avoids hr_cpu and ucd_cpu_utilization at the same time * FIX: HP-UX agent: fixed output of df for long mount points diff --git a/checkman/df b/checkman/df index a38630b..0445723 100644 --- a/checkman/df +++ b/checkman/df @@ -164,5 +164,3 @@ 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 5fbb42d..b8e60bc 100644 --- a/checks/df.include +++ b/checks/df.include @@ -28,9 +28,8 @@ # 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 @@ -103,10 +102,11 @@ 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 < df_lowest_warning_level: - warn_scaled = df_lowest_warning_level - if crit_scaled < df_lowest_critical_level: - crit_scaled = df_lowest_critical_level + lowest_warning_level, lowest_critical_level = levels["levels_low"] + if warn_scaled < lowest_warning_level: + warn_scaled = lowest_warning_level + if crit_scaled < lowest_critical_level: + crit_scaled = lowest_critical_level else: warn_scaled = warn crit_scaled = crit

13 years, 4 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8c0050ebbcca08eaa52cb5b97a4c065c7c0374a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c0050ebbcca08… 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% --- ChangeLog | 4 +++- checks/df.include | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94d9768..e924e1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,8 +17,10 @@ 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 + * FIX: HP-UX agent: fixed output of df for long mount points (thanks to Claas Rockmann-Buchterkirche) + * FIX: df_netapp/32: fixed output of used percentage (was always + 0% due to integer division) 1.1.9i9: 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, 4 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4c1e2763a081907e30f1da454ad23cd8e2afe645 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c1e2763a08190… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 12:50:13 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 4 months

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, 4 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, 4 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, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2011