Checkmk git commits February 2011

checkmk-commits@lists.checkmk.com

3 participants
186 discussions

Check_MK Git: check_mk: setup.sh: local installation honors livestatus

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a1078c633e221392bc2f196a3918d32dfe4ba262 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1078c633e2213… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 28 12:32:04 2011 +0100 setup.sh: local installation honors livestatus --- scripts/setup.sh | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index 3539b3a..c6fa6c3 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -601,10 +601,14 @@ do if [ "${PIPESTATUS[0]}" = 0 ] then - if [ "$livestatus_in_nagioscfg" = False -a -n "$DESTDIR$nagios_config_file" ] + if [ -z "$OMD_ROOT" -a "$livestatus_in_nagioscfg" = False -a -n "$DESTDIR$nagios_config_file" ] then echo -e "# Load Livestatus Module\nbroker_module=$libdir/livestatus.o $livesock\nevent_broker_options=-1" \ >> $DESTDIR$nagios_config_file + elif [ "$OMD_ROOT" ] ; then + echo -e "# Load Livestatus Module\nbroker_module=$OMD_ROOT/local/lib/mk-livestatus/livestatus.o pnp_path=$OMD_ROOT/var/pnp4nagios/perfdata $livesock\nevent_broker_options=-1" \ + >> $OMD_ROOT/etc/mk-livestatus/nagios-local.cfg + ln -sfn ../../mk-livestatus/nagios-local.cfg $OMD_ROOT/etc/nagios/nagios.d/mk-livestatus.cfg fi else echo -e "\E[1;31;40m ERROR compiling livestatus! \E[0m.\nLogfile is in $SRCDIR/livestatus.log" @@ -664,6 +668,7 @@ do if [ ! -e $DESTDIR$confdir/multisite.mk ] ; then cp $DESTDIR$confdir/multisite.mk-$VERSION $DESTDIR$confdir/multisite.mk fi && + mkdir -p $DESTDIR$confdir/multisite.d && mkdir -p $DESTDIR$confdir/conf.d && echo 'All files in this directory that end with .mk will be read in after main.mk' > $DESTDIR$confdir/conf.d/README && if [ ! -d $DESTDIR$rrddir ] ; then

13 years, 6 months

Check_MK Git: check_mk: setup.sh: allow installation into OMD site ( experimental)

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 89bf6e555e467eea4e4388d951951d5d82d24e55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89bf6e555e467e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 28 11:48:29 2011 +0100 setup.sh: allow installation into OMD site (experimental) --- ChangeLog | 2 + scripts/autodetect.py | 379 +++++++++++++++++++++++++++---------------------- scripts/setup.sh | 125 ++++++++++++----- 3 files changed, 302 insertions(+), 204 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=89bf6e555e…

13 years, 6 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c2d39e9646538ff547dc1c097101e7260bc001fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2d39e9646538f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 16:55:18 2011 +0100 Updated bug entries --- .bugs/129 | 10 +++++++--- .bugs/157 | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.bugs/129 b/.bugs/129 index 8c7d68a..0333eb6 100644 --- a/.bugs/129 +++ b/.bugs/129 @@ -1,11 +1,15 @@ Title: check include files must be loaded first Component: core +State: done +Class: bug +Date: 2011-02-11 09:13:34 Benefit: 1 -State: open Cost: 1 -Date: 2011-02-11 09:13:34 -Class: bug +Fun: 0 When loading all check files, the files with the extension ".include" must be loaded first. Otherwise unresolved functions might occur (see df_netapp32). + +2011-02-27 16:54:27: changed state open -> done +Fixed in 1.1.10b1 diff --git a/.bugs/157 b/.bugs/157 index ab0e75e..380e058 100644 --- a/.bugs/157 +++ b/.bugs/157 @@ -1,10 +1,14 @@ Title: df magic broken Component: checks +State: done +Class: bug +Date: 2011-02-26 13:15:33 Benefit: 1 -State: open Cost: 1 -Date: 2011-02-26 13:15:33 -Class: bug +Fun: 0 filesystem_default_levels["magic"] = 0.8 seems to break the df check in 1.1.9i9 + +2011-02-27 16:53:38: changed state open -> done +Is fixed in 1.1.10b1

13 years, 6 months

Check_MK Git: check_mk: FIX: repair PNP template for df when using trends

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1d176fe148755cad6b7dbd39f754c34efa05a372 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d176fe148755c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 15:53:43 2011 +0100 FIX: repair PNP template for df when using trends --- ChangeLog | 1 + pnp-templates/check_mk-df.php | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a4086bd..b6151d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ now df-parameter "trend_perfdata" (see new man page of df) * hp_proliant_*: improve scan function (now just looks for "proliant") * FIX: cisco_temp_perf: fix return state in case of WARNING (was 0 = OK) + * FIX: repair PNP template for df when using trends 1.1.9i9: Core, Setup, etc.: diff --git a/pnp-templates/check_mk-df.php b/pnp-templates/check_mk-df.php index c28e4ac..7c0bdd3 100644 --- a/pnp-templates/check_mk-df.php +++ b/pnp-templates/check_mk-df.php @@ -71,6 +71,8 @@ if (isset($DS[2])) { $def[2] .= "DEF:trend=$RRDFILE[3]:$DS[3]:AVERAGE "; $def[2] .= "CDEF:growth_pos=growth_max,0,MAX "; $def[2] .= "CDEF:growth_neg=growth_min,0,MIN "; + $def[2] .= "CDEF:growth_minabs=0,growth_min,- "; + $def[2] .= "CDEF:growth=growth_minabs,growth_max,MAX "; $def[2] .= "HRULE:0#c0c0c0 "; $def[2] .= "AREA:growth_pos#3060f0:\"Grow\" "; $def[2] .= "AREA:growth_neg#30f060:\"Shrink \" ";

13 years, 6 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 13a5bb2bfb5f2d34144433f0a4fa79e942ded110 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13a5bb2bfb5f2d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 14:25:32 2011 +0100 Updated bug entries --- .bugs/162 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/162 b/.bugs/162 new file mode 100644 index 0000000..8fd6afe --- /dev/null +++ b/.bugs/162 @@ -0,0 +1,10 @@ +Title: Drop direct RRD updates +Component: core +Benefit: 1 +State: open +Cost: 2 +Date: 2011-02-27 14:24:50 +Class: cleanup + +That feature should be completely removed from the code and +documentation as soon as we open the 1.1.11 series.

13 years, 6 months

Check_MK Git: check_mk: cisco_temp_perf: fix return state in case of WARNING

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5be034f34ff60ae99a8dee853f3633494dd6d479 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5be034f34ff60a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 14:19:57 2011 +0100 cisco_temp_perf: fix return state in case of WARNING --- ChangeLog | 1 + checks/cisco_temp_perf | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5023ab0..a4086bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * 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") + * FIX: cisco_temp_perf: fix return state in case of WARNING (was 0 = OK) 1.1.9i9: Core, Setup, etc.: diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index a76ebec..f6f30aa 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -74,7 +74,7 @@ def check_cisco_temp_perf(item, params, info): if state == 1: return (0, "OK - state is normal%s" % temptext, perfdata) elif state == 2: - return (0, "WARN - state is %s%s" % (statename, temptext), perfdata) + return (1, "WARN - state is %s%s" % (statename, temptext), perfdata) elif state in [ 5, 6 ]: return (3, "UNKNOWN - state is %s" % statename) else:

13 years, 6 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 97a6e06fea257f668ebe089e74ba498ae3e977dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97a6e06fea257f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 14:09:38 2011 +0100 Updated bug entries --- .bugs/161 | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/.bugs/161 b/.bugs/161 new file mode 100644 index 0000000..4a16a46 --- /dev/null +++ b/.bugs/161 @@ -0,0 +1,18 @@ +Title: Add -Cc to snmpwalk options +Component: core +Benefit: 1 +State: open +Cost: 1 +Date: 2011-02-27 14:08:10 +Class: feature + +This avoids problem on some devices. Might other introduce new ones. +So I'm not sure what to do here. From the manpage of snmpwalk: + +-Cc Do not check whether the returned OIDs are increasing. Some agents +(LaserJets are an example) return OIDs out of order, but can complete the walk +anyway. Other agents return OIDs that are out of order and can cause +snmpwalk to loop indefinitely. By default, snmpwalk tries to detect +this behavior and warns you when it hits an agent acting illegally. +Use -Cc to turn off this check. +

13 years, 6 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2011