Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

Check_MK Git: check_mk: hp_proliant_*: improve scan function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c91e8fe78a597f87457480b11c1dd1ecc320dd5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c91e8fe78a597f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 14:05:50 2011 +0100 hp_proliant_*: improve scan function --- ChangeLog | 2 +- checks/hp_proliant_cpu | 2 +- checks/hp_proliant_da_phydrv | 2 +- checks/hp_proliant_fans | 2 +- checks/hp_proliant_mem | 2 +- checks/hp_proliant_psu | 2 +- checks/hp_proliant_temp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa92a64..5023ab0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,7 +28,7 @@ * Added Perf-O-Meter for non-df filesystem checks (e.g. netapp) * FIX: removed filesystem_trend_perfdata. It didn't work. Use now df-parameter "trend_perfdata" (see new man page of df) - + * hp_proliant_*: improve scan function (now just looks for "proliant") 1.1.9i9: Core, Setup, etc.: diff --git a/checks/hp_proliant_cpu b/checks/hp_proliant_cpu index 0daee95..501a334 100644 --- a/checks/hp_proliant_cpu +++ b/checks/hp_proliant_cpu @@ -53,4 +53,4 @@ snmp_info['hp_proliant_cpu'] = ( ".1.3.6.1.4.1.232.1.2.2.1.1", [ "1", # cpqSeCp ] ) snmp_scan_functions['hp_proliant_cpu'] = \ - lambda oid: oid("1.3.6.1.4.1.232.2.2.4.2.0").startswith('ProLiant') + lambda oid: "proliant" in oid("1.3.6.1.4.1.232.2.2.4.2.0").lower() diff --git a/checks/hp_proliant_da_phydrv b/checks/hp_proliant_da_phydrv index 0882603..accb6af 100644 --- a/checks/hp_proliant_da_phydrv +++ b/checks/hp_proliant_da_phydrv @@ -86,4 +86,4 @@ snmp_info['hp_proliant_da_phydrv'] = ( ".1.3.6.1.4.1.232.3.2.5.1.1", [ "1", # ] ) snmp_scan_functions['hp_proliant_da_phydrv'] = \ - lambda oid: oid("1.3.6.1.4.1.232.2.2.4.2.0").startswith('ProLiant') + lambda oid: "proliant" in oid("1.3.6.1.4.1.232.2.2.4.2.0").lower() diff --git a/checks/hp_proliant_fans b/checks/hp_proliant_fans index 19bec9b..735b9cd 100644 --- a/checks/hp_proliant_fans +++ b/checks/hp_proliant_fans @@ -91,4 +91,4 @@ snmp_info['hp_proliant_fans'] = ( ".1.3.6.1.4.1.232.6.2.6.7.1", [ "1", # cpqHe ] ) snmp_scan_functions['hp_proliant_fans'] = \ - lambda oid: oid("1.3.6.1.4.1.232.2.2.4.2.0").startswith('ProLiant') + lambda oid: "proliant" in oid("1.3.6.1.4.1.232.2.2.4.2.0").lower() diff --git a/checks/hp_proliant_mem b/checks/hp_proliant_mem index 91c19ca..62a4813 100644 --- a/checks/hp_proliant_mem +++ b/checks/hp_proliant_mem @@ -128,4 +128,4 @@ snmp_info['hp_proliant_mem'] = ( ".1.3.6.1.4.1.232.6.2.14.13.1", [ "2", # cpqH ] ) snmp_scan_functions['hp_proliant_mem'] = \ - lambda oid: oid("1.3.6.1.4.1.232.2.2.4.2.0").startswith('ProLiant') + lambda oid: "proliant" in oid("1.3.6.1.4.1.232.2.2.4.2.0").lower() diff --git a/checks/hp_proliant_psu b/checks/hp_proliant_psu index 922ac4f..ad49450 100644 --- a/checks/hp_proliant_psu +++ b/checks/hp_proliant_psu @@ -56,4 +56,4 @@ snmp_info['hp_proliant_psu'] = ( ".1.3.6.1.4.1.232.6.2.9.3.1", [ "1", # cpqHeFl ] ) snmp_scan_functions['hp_proliant_psu'] = \ - lambda oid: oid("1.3.6.1.4.1.232.2.2.4.2.0").startswith('ProLiant') + lambda oid: "proliant" in oid("1.3.6.1.4.1.232.2.2.4.2.0").lower() diff --git a/checks/hp_proliant_temp b/checks/hp_proliant_temp index ec7e292..ed453b6 100644 --- a/checks/hp_proliant_temp +++ b/checks/hp_proliant_temp @@ -75,4 +75,4 @@ snmp_info['hp_proliant_temp'] = ( ".1.3.6.1.4.1.232.6.2.6.8.1", [ "1", # cpqHeT "6", # cpqHeTemperatureCondition ] ) snmp_scan_functions['hp_proliant_temp'] = \ - lambda oid: oid("1.3.6.1.4.1.232.2.2.4.2.0").startswith('ProLiant') + lambda oid: "proliant" in oid("1.3.6.1.4.1.232.2.2.4.2.0").lower()

13 years, 6 months

Check_MK Git: check_mk: setup.sh: do not prepend current directory to url_prefix

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 49af4f29a4eed519181e5bb740a0dbd1810e1f64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49af4f29a4eed5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 14:02:24 2011 +0100 setup.sh: do not prepend current directory to url_prefix --- ChangeLog | 1 + scripts/setup.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e8e5aff..fa92a64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ checks * RPM: use BuildArch: noarch in spec file rather than as a command line option (thanks to Ulrich Kiermayr) + * FIX: setup.sh: do not prepend current directory to url_prefix Checks & Agents: * FIX: drbd now handles output of older version without an ep field diff --git a/scripts/setup.sh b/scripts/setup.sh index e9b7b89..20ca5b8 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -347,7 +347,7 @@ Please specify the complete path (dir + filename) of check_icmp" ask_title "Integration with Apache" # ------------------------------------------------------------------- -ask_dir url_prefix / / "URL Prefix for Web addons" \ +ask_dir -d url_prefix / / "URL Prefix for Web addons" \ "Usually the Multisite GUI is available at /check_mk/ and PNP4Nagios is located at /pnp4nagios/. In some cases you might want to define some prefix in order to be able to run more instances of Nagios on one host.

13 years, 6 months

Check_MK Git: check_mk: FIX: replaced filesystem_trend_perfdata with parameter "trend_perfdata"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2fbda338b2e6167bef7cfb57f1af7294faaa67db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fbda338b2e616… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 13:42:43 2011 +0100 FIX: replaced filesystem_trend_perfdata with parameter "trend_perfdata" --- ChangeLog | 2 ++ checkman/df | 17 +++++++++++------ checks/df.include | 12 ++++-------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index d797888..e8e5aff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,8 @@ 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) + * FIX: removed filesystem_trend_perfdata. It didn't work. Use + now df-parameter "trend_perfdata" (see new man page of df) 1.1.9i9: diff --git a/checkman/df b/checkman/df index 0445723..93b270b 100644 --- a/checkman/df +++ b/checkman/df @@ -48,11 +48,15 @@ examples: "trend_mb" : (10, 20), # MB of change during trend_range "trend_perc" : (1, 2), # Percent change during trend_range "trend_timeleft" : (72, 48) # run time left in hours until full + "trend_perfdata" : False # no performance data for trends } # alternative[2]: Just change the default partially filesystem_default_levels["magic"] = 0.8 + # Make df output trend performance data (beware of exsting RRDs) + filesystem_default_levels["trend_perfdata"] = True + # Override warning/critical levels for all checks where # levels are "filesystem_default_levels" @@ -81,13 +85,13 @@ examples: perfdata: One or three values: The first value is the used space of the filesystem in MB. Also the minimum (0 MB), maximum (size of the filesystem) and the warning and critical - levels in MB are provided. If you set {filesystem_trend_perfdata = True}, then + levels in MB are provided. If you set the parameter {"trend_perfdata" : True}, then two additional values are output: the change of the usage in MB per range since the last check (e.g. in MB per 24 hours) and the averaged change (so called trend), - also in MB per range. + also in MB per range. This can done globally in {main.mk} by {filesystem_default_levels["trend_perfdata"] = True}. Please note, that - until you use the storage type {MULTIPLE} in PNP4Nagios - - changing the setting of {filesystem_trend_perfdata} will stop all updates to + changing the parameter {"trend_perfdata"} will stop all updates to your existing filesystem RRDs. You need either to delete or convert your RRDs if you want to change. @@ -141,6 +145,10 @@ parameters (dict): This check supports two types of parameters. The the disk is full is 48 hours or less. It will get critical if only 24 hours are assumed to be left. + {"trend_perfdata"}: If this is set to {True}, then the check will + output two further performance data values: the current growth + and the trend. + It is still possible to specify a pair or triple of numbers {instead} of a dictionary: @@ -161,6 +169,3 @@ inventory_df_exclude_mountpoints (list of strings): List of mount points to excl filesystem_default_levels: Default levels for filesystem detected by inventory. This variable is preset to {{ "levels" : (80, 90), "magic_normsize" : 20, "levels_low" : (50, 60), "trend_range" : 24 }} -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. diff --git a/checks/df.include b/checks/df.include index b8e60bc..6baec92 100644 --- a/checks/df.include +++ b/checks/df.include @@ -53,16 +53,12 @@ filesystem_default_levels = { "levels" : (80, 90), # warn/crit in percent "magic_normsize" : 20, # Standard size if 20 GB "levels_low" : (50, 60), # Never move warn level below 50% due to magic factor - "trend_range" : 24 + "trend_range" : 24, + "trend_perfdata" : False, # do not send performance data for trends } # Users might have set filesystem_default_levels to old format like (80, 90) -# Turn off trend perfdata per default in order to keep -# compatible to existing RRDs -filesystem_trend_perfdata = False - - # needed by df, df_netapp and vms_df and maybe others in future: # compute warning and critical levels. Takes into account the size of # the filesystem and the magic number. Since the size is only known at @@ -164,7 +160,7 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): this_time = time.time() # rate in MB/s, allow negative timdif, rate = get_counter("df.%s.delta" % mountpoint, this_time, used_mb, True) - if filesystem_trend_perfdata: + if levels.get("trend_perfdata"): perfdata.append(("growth", rate * range_sec)) # average trend, initialize with zero timedif, rate_avg = get_average("df.%s.trend" % mountpoint, this_time, rate, range_sec, True) @@ -202,7 +198,7 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): status = 2 problems[-1] += "!" - if filesystem_trend_perfdata: + if levels.get("trend_perfdata"): perfdata.append(("trend", trend, wa, cr, 0, size_mb / range)) # compute time until filesystem is full (only for positive trend, of course)

13 years, 6 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits