Checkmk git commits September 2013

checkmk-commits@lists.checkmk.com

6 participants
227 discussions

Check_MK Git: check_mk: minor comment changes

by Götz Golla

Module: check_mk Branch: master Commit: c8538ee449a6d40b8efbe2345d7c4190320daf10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8538ee449a6d4… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Sep 23 16:45:05 2013 +0200 minor comment changes --- checks/apc_symmetra | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/apc_symmetra b/checks/apc_symmetra index 5a9a5b8..a77554f 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -66,7 +66,7 @@ # ::= { upsAdvTest 4 } # -# altes Format: +# old format: # apc_default_levels = ( 95, 40, 1, 220 ) apc_default_levels = { "levels": ( 95, 40, 1, 220 ) } @@ -81,9 +81,9 @@ def check_apc(item, params, info): RunTimeRemaining = AdvBatteryRunTimeRemaining / 100 delay_after_test, alt_crit_capacity = None, None - if len(params) == 4 and type(params) is tuple: # früher gab es 4 Parameter im tuple + if len(params) == 4 and type(params) is tuple: # old format with 4 params in tuple crit_capacity, crit_batt_temp, crit_batt_curr, crit_voltage = params - else: # nun sind es 6 im dict + else: # new format with up to 6 params in dict crit_capacity, crit_batt_temp, crit_batt_curr, crit_voltage = params['levels'] if params.get("post_calibration_levels"): delay_after_test = params['post_calibration_levels']['additional_time_span']

10 years, 11 months

Check_MK Git: check_mk: check_mk agent package now requires package time: fixing bug 1047

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: db3f9d3fdeeaba9b5cded853b69e55e84ac1ba38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db3f9d3fdeeaba… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Sep 23 16:09:14 2013 +0200 check_mk agent package now requires package time: fixing bug 1047 --- check_mk.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/check_mk.spec b/check_mk.spec index 4f36971..f8af9b6 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -43,7 +43,7 @@ This package is only needed on the Nagios server. %package agent Group: System/Monitoring -Requires: xinetd +Requires: xinetd, time Summary: Linux-Agent for check_mk AutoReq: off AutoProv: off @@ -55,7 +55,7 @@ xinetd to run this agent. %package agent-scriptless Group: System/Monitoring -Requires: xinetd +Requires: xinetd, time Summary: Linux-Agent for check_mk AutoReq: off AutoProv: off @@ -69,7 +69,7 @@ own. %package caching-agent Group: System/Monitoring -Requires: xinetd +Requires: xinetd, time Summary: Caching Linux-Agent for check_mk AutoReq: off AutoProv: off

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1047

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: e72d99ab5ba82f05991edb5fd4dfff927ac24306 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e72d99ab5ba82f… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Sep 23 16:11:01 2013 +0200 Updated bug entries #1047 --- .bugs/1047 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.bugs/1047 b/.bugs/1047 index 41f186e..cfd96d1 100644 --- a/.bugs/1047 +++ b/.bugs/1047 @@ -1,10 +1,15 @@ Title: check-mk-agent package needs dependency to time package Component: checks -State: open +Class: bug +State: done Date: 2013-09-06 09:36:53 Targetversion: 1.2.3i2 -Class: bug mk-job uses /usr/bin/time this is included in package time (as well in CentOS as in Ubuntu) package should require package time + +2013-09-23 16:10:57: changed state open -> done +added dependency in check_mk.spec +tested positive on CentOS 6.4: pulls package time as depenency +tested on Ubuntu12.04: no negative issues found, package still installs

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1055

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 567d683e4ba83351cbcd91514e7d657e26a432fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=567d683e4ba833… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Sep 23 15:11:56 2013 +0200 Updated bug entries #1055 --- .bugs/1055 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/.bugs/1055 b/.bugs/1055 new file mode 100644 index 0000000..a4ba84d --- /dev/null +++ b/.bugs/1055 @@ -0,0 +1,29 @@ +Title: in version 1.2.2p3 livestatus does not compile +Component: livestatus +State: open +Date: 2013-09-23 15:08:41 +Targetversion: 1.2.2 +Class: bug + +when compiling livestatus from the actual 1.2.2 branch it breaks: + +last lines in livestatus.log are: +mv -f .deps/livestatus_so-ServicelistStateColumn.Tpo .deps/livestatus_so-ServicelistStateColumn.Po +g++ -DHAVE_CONFIG_H -I. -I.. -I../nagios -fPIC -g -O2 -MT livestatus_so-TableColumns.o -MD -MP -MF .deps/livestatus_so-TableColumns.Tpo -c -o livestatus_so-TableColumns.o `test -f 'TableColumns.cc' || echo './'`TableColumns.cc +make[2]: *** No rule to make target `HostSpecialDoubleColumn.cc', needed by `livestatus_so-HostSpecialDoubleColumn.o'. Stop. +make[2]: *** Waiting for unfinished jobs.... +mv -f .deps/livestatus_so-strutil.Tpo .deps/livestatus_so-strutil.Po +mv -f .deps/livestatus_so-StringColumnFilter.Tpo .deps/livestatus_so-StringColumnFilter.Po +mv -f .deps/livestatus_so-store.Tpo .deps/livestatus_so-store.Po +mv -f .deps/livestatus_so-StringColumn.Tpo .deps/livestatus_so-StringColumn.Po +mv -f .deps/livestatus_so-Table.Tpo .deps/livestatus_so-Table.Po +mv -f .deps/livestatus_so-Store.Tpo .deps/livestatus_so-Store.Po +mv -f .deps/livestatus_so-TableColumns.Tpo .deps/livestatus_so-TableColumns.Po +mv -f .deps/livestatus_so-Query.Tpo .deps/livestatus_so-Query.Po +make[2]: Leaving directory `/usr/local/src/check_mk-1.2.2p2/livestatus.src/src' +make[1]: *** [all-recursive] Error 1 +make[1]: Leaving directory `/usr/local/src/check_mk-1.2.2p2/livestatus.src' +make: *** [all] Error 2 + +compiling livestatus 1.2.2p2 on the same system works +system is CentOS 5.9 64bit, Nagios 3.5.1

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0902

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: a1dd993e855a2d43aa5619ba1b4d5a1aea430bd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1dd993e855a2d… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Sep 23 15:13:47 2013 +0200 Updated bug entries #0902 --- .bugs/902 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.bugs/902 b/.bugs/902 index 90654ba..6947328 100644 --- a/.bugs/902 +++ b/.bugs/902 @@ -19,3 +19,6 @@ when installing check_mk-1.2.2p1 manually (by setup.sh) the directory and as long as this directory is missing *all* notifications fail silently!! directory needs to be created in setup.sh + +2013-09-23 bs: should be fixed, added creation of directory to setup.sh +but TEST IS STILL OPEN, needs to wait for 1055 to be fixed

10 years, 11 months

Check_MK Git: check_mk: new check feature: alternative battery level in post-calibration phase

by Götz Golla

Module: check_mk Branch: master Commit: 6aed363bb47ebb97a70714028e14279ad307194b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6aed363bb47ebb… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Sep 23 15:03:36 2013 +0200 new check feature: alternative battery level in post-calibration phase --- checks/apc_symmetra | 70 ++++++++++++++++++++++----- web/plugins/wato/check_parameters.py | 86 ++++++++++++++++++++++++---------- 2 files changed, 119 insertions(+), 37 deletions(-) diff --git a/checks/apc_symmetra b/checks/apc_symmetra index fb31375..5a9a5b8 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -41,19 +41,59 @@ # hardwareFailureBypass(10), sleepingUntilPowerReturn(11), onSmartTrim(12) # upsAdvTestCalibrationResults: ok(1), invalidTest(2), calibrationInProgress(3) -# levels refer to the apc_symentra group which has 6 values, -# only the first four are needed in this test -# the others belong to the apc_symmetra_test check -apc_default_levels = ( 95, 40, 1, 220 ) +# PowerNet-MIB::upsAdvTestDiagnosticsResults .1.3.6.1.4.1.318.1.1.1.7.2.3 +# upsAdvTestDiagnosticsResults OBJECT-TYPE +# SYNTAX INTEGER { +# ok(1), +# failed(2), +# invalidTest(3), +# testInProgress(4) +# } +# ACCESS read-only +# STATUS mandatory +# DESCRIPTION +# "The results of the last UPS diagnostics test performed." +# ::= { upsAdvTest 3 } + +# PowerNet-MIB::upsAdvTestLastDiagnosticsDate .1.3.6.1.4.1.318.1.1.1.7.2.4 +# upsAdvTestLastDiagnosticsDate OBJECT-TYPE +# SYNTAX DisplayString +# ACCESS read-only +# STATUS mandatory +# DESCRIPTION +# "The date the last UPS diagnostics test was performed in +# mm/dd/yy format." +# ::= { upsAdvTest 4 } +# + +# altes Format: +# apc_default_levels = ( 95, 40, 1, 220 ) + +apc_default_levels = { "levels": ( 95, 40, 1, 220 ) } def check_apc(item, params, info): BasicBatteryStatus, BasicOutputStatus, AdvBatteryCapacity, \ AdvBatteryTemperature, AdvBatteryCurrent, AdvOutputVoltage, \ AdvOutputCurrent, AdvBatteryRunTimeRemaining, AdvTestCalibrationResults \ = [ saveint(x) for x in info[0][:9] ] + + LastDiagnosticsDate = info[0][-1] RunTimeRemaining = AdvBatteryRunTimeRemaining / 100 - crit_capacity, crit_batt_temp, crit_batt_curr, crit_voltage = params + delay_after_test, alt_crit_capacity = None, None + if len(params) == 4 and type(params) is tuple: # früher gab es 4 Parameter im tuple + crit_capacity, crit_batt_temp, crit_batt_curr, crit_voltage = params + else: # nun sind es 6 im dict + crit_capacity, crit_batt_temp, crit_batt_curr, crit_voltage = params['levels'] + if params.get("post_calibration_levels"): + delay_after_test = params['post_calibration_levels']['additional_time_span'] + alt_crit_capacity = params['post_calibration_levels']['altcapacity'] + month, day, year = map(saveint, LastDiagnosticsDate.split('/')) + last_diag_date = datetime.date( year, month, day) + today = datetime.date.today() + diag_diff = today - last_diag_date + oneday = datetime.timedelta(days=1) + delay = datetime.timedelta(minutes=delay_after_test) single_states = [] @@ -83,12 +123,20 @@ def check_apc(item, params, info): single_states.append( (state, infotxt, None) ) # 3. Check battery capacity - infotxt = "capacity %d%%" % AdvBatteryCapacity - if AdvBatteryCapacity <= crit_capacity: - state = 2 - infotxt += "(!!)" + state = 0 + infotxt = "capacity %d%% (crit at " % AdvBatteryCapacity + + if alt_crit_capacity != None and diag_diff < oneday + delay: + infotxt += "%d%% in delay after calib.)" % alt_crit_capacity + if AdvBatteryCapacity <= alt_crit_capacity: + state = 2 + infotxt += "(!!)" else: - state = 0 + infotxt += "%d%%)" % crit_capacity + if AdvBatteryCapacity <= crit_capacity: + state = 2 + infotxt += "(!!)" + single_states.append( (state, infotxt, ("capacity", AdvBatteryCapacity, "", crit_capacity, 0, 100)) ) # 4. Check battery temperature @@ -148,5 +196,5 @@ check_info['apc_symmetra'] = { "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), "snmp_info" : (".1.3.6.1.4.1.318.1.1.1", [ "2.1.1.0", "4.1.1.0", "2.2.1.0", "2.2.2.0", - "2.2.9.0", "4.2.1.0", "4.2.4.0", "2.2.3.0", "7.2.6.0" ] ) + "2.2.9.0", "4.2.1.0", "4.2.4.0", "2.2.3.0", "7.2.6.0", "7.2.4.0" ] ) } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b367fd2..123ed17 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3181,33 +3181,67 @@ register_check_parameters( subgroup_environment, "apc_symentra", _("APC Symmetra Checks"), - Tuple( + Dictionary( elements = [ - Integer( - title = _("Critical Battery Capacity"), - help = _("The battery capacity in percent at and below which a critical state is be triggered"), - unit = _("%"), - default_value = 95, - ), - Integer( - title = _("Critical Battery Temperature"), - help = _("The critical temperature of the battery"), - unit = _("C"), - default_value = 40, - ), - Integer( - title = _("Critical Battery Current"), - help = _("The critical battery current in Ampere"), - unit = _("A"), - default_value = 1, - ), - Integer( - title = _("Critical Battery Voltage"), - help = _("The output voltage at and below which a critical state is triggered."), - unit = _("V"), - default_value = 220, - ), - ] + ("levels", + Tuple( + title = _("Levels of battery parameters during normal operation"), + elements = [ + Integer( + title = _("Critical Battery Capacity"), + help = _("The battery capacity in percent at and below which a critical state is be triggered"), + unit = _("%"), + default_value = 95, + ), + Integer( + title = _("Critical Battery Temperature"), + help = _("The critical temperature of the battery"), + unit = _("C"), + default_value = 40, + ), + Integer( + title = _("Critical Battery Current"), + help = _("The critical battery current in Ampere"), + unit = _("A"), + default_value = 1, + ), + Integer( + title = _("Critical Battery Voltage"), + help = _("The output voltage at and below which a critical state is triggered."), + unit = _("V"), + default_value = 220, + ), + ] + )), + ("post_calibration_levels", + Dictionary( + title = _("Levels of battery parameters after calibration"), + help = _("After a battery calibration the battery capacity is reduced until the " + "battery is fully charged again. Here you can specify an alternative lower " + "level in this post-calibration phase. " + "Since apc devices remember the time of the last calibration only " + "as a date, the alternative lower level will be applied on the whole " + "day of the calibration until midnight. You can extend this time period " + "with an additional time span to make sure calibrations occuring just " + "before midnight do not trigger false alarms." + ), + elements = [ + ("altcapacity", + Percentage( + title = _("Alternative critical battery capacity after calibration"), + default_value = 50, + )), + ("additional_time_span", + Integer( + title = ("Extend post-calibration phase by additional time span"), + unit = _("minutes"), + default_value = 0, + )), + ], + optional_keys = False, + )), + ], + optional_keys = ['post_calibration_levels'], ), None, "first"

10 years, 11 months

Check_MK Git: check_mk: author removed from template

by Götz Golla

Module: check_mk Branch: master Commit: 890ec5c0e6fbff1fbeaaf4dcc867beabf8ab6d80 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=890ec5c0e6fbff… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Sep 23 10:25:16 2013 +0200 author removed from template --- doc/manpage.template | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/manpage.template b/doc/manpage.template index 89525f8..d62df76 100644 --- a/doc/manpage.template +++ b/doc/manpage.template @@ -1,7 +1,6 @@ title: Dummy check man page - used as template for new check manuals agents: linux, windows, aix, solaris, hpux, vms, freebsd, snmp catalog: -author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk description:

10 years, 11 months

Check_MK Git: check_mk: added documentation of the new, dict based configuration to check manpage of ps and ps.perf

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 0bd4f33fe5feb38c5fea0482dc782c362f2f931c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bd4f33fe5feb3… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Sep 23 13:34:14 2013 +0200 added documentation of the new, dict based configuration to check manpage of ps and ps.perf --- checkman/ps | 27 +++++++++++++++++++++++++++ checkman/ps.perf | 2 ++ 2 files changed, 29 insertions(+) diff --git a/checkman/ps b/checkman/ps index 7b7c5a5..d0dc807 100644 --- a/checkman/ps +++ b/checkman/ps @@ -78,6 +78,20 @@ examples: # make sure exactly one ntpd is running ( "somehost", "ps", "NTP", ( "/usr/sbin/ntpd", 1, 1, 1, 1 ) ), + # or this can be done with the new, dictionary based + # syntax; in this case additional parameters cpulevels and + # cpu_average can be passed + ( 'somehost', 'ps', 'NTP', { + 'process': '/usr/sbin/ntpd', + 'user': 'ntp', + 'warnmin': 1, + 'warnmax': 1, + 'okmin': 1 + 'okmax': 1, + 'cpulevels': (90.0, 98.0), + 'cpu_average': 15, + }), + # the same, but for all hosts with the tag "lnx" ( ["lnx"], ALL_HOSTS, "ps", "NTPD", ( "/usr/sbin/ntpd", 1, 1, 1, 1 ) ), @@ -143,3 +157,16 @@ okmin (int): Minimum number for OK state okmax (int): Maximum number for OK state warnmax (int): Maximum number for WARNING state. Counts less than warnmin or greater than warnmax are CRITICAL + +parameters (dict): Or the parameters can be given in the new, dictionary based syntax + with the elements below. + In this case additional parameters cpulevels and cpu_average can be passed. + +{"process"}: procname, see above +{"user"}: see above +{"warnmin"}: see above +{"warnmax"}: see above +{"okmin"}: see above +{"okmax"}: see above +{"cpulevels"}: (float, float): levels of CPU usage for {WARN} and {CRIT} in percent +{"cpu_average"}: int: build average over CPU usage for the given time in minutes diff --git a/checkman/ps.perf b/checkman/ps.perf index b1a0231..a45e3cd 100644 --- a/checkman/ps.perf +++ b/checkman/ps.perf @@ -28,6 +28,8 @@ inventory: [parameters] params (5 or 6 tuple): Please refer to {ps} for information about the parameters. +parameters (dict): or the parameters can be given in the new, dictionary based syntax. + Please refer to {ps} for information about the parameters. [configuration] inventory_processes_perf (list): A list of 7-tuples. See {ps} for details.

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1054

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 781ad19d81dbd7c5b0f9e6ec302eed7d53839094 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=781ad19d81dbd7… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Sep 23 12:33:47 2013 +0200 Updated bug entries #1054 --- .bugs/1054 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/1054 b/.bugs/1054 new file mode 100644 index 0000000..f4bd6ce --- /dev/null +++ b/.bugs/1054 @@ -0,0 +1,10 @@ +Title: ps check returns perfdata +Component: checks +State: open +Date: 2013-09-23 12:32:48 +Targetversion: 1.2.3i2 +Class: nastiness + +ps check returns (some) perfdata: +pcpuavg=0;90;98;0;15 +but it should not. only ps.perf should!

10 years, 11 months

Check_MK Git: check_mk: removed FIXME notes from check manpages, moved them into a gitbug

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 6efaada9b8799e3878168cc91ca64de5bcc22285 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6efaada9b8799e… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Sep 23 11:48:19 2013 +0200 removed FIXME notes from check manpages, moved them into a gitbug --- checkman/blade_bx_load | 2 -- checkman/blade_bx_powerfan | 2 -- checkman/blade_bx_powermod | 6 ++---- checkman/blade_bx_temp | 2 -- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/checkman/blade_bx_load b/checkman/blade_bx_load index e6b857c..d1dfae1 100644 --- a/checkman/blade_bx_load +++ b/checkman/blade_bx_load @@ -4,8 +4,6 @@ catalog: hw/server/fujitsu license: GPL distribution: check_mk description: - FIXME: is this really CPU of enclosure? Asked Bastian to figure this out... - This check measures and checks the averaged CPU load of a Primergy BX600 Blade Enclosure. The values for 1, 5 and 15 minute average are reported. diff --git a/checkman/blade_bx_powerfan b/checkman/blade_bx_powerfan index 3ba4c61..5554605 100644 --- a/checkman/blade_bx_powerfan +++ b/checkman/blade_bx_powerfan @@ -4,8 +4,6 @@ catalog: hw/server/fujitsu license: GPL distribution: check_mk description: - FIXME: in Blade or in Enclosure? - Checks fans in Primergy BX600 Blade Servers. Returns {CRIT} if the fan is not present or powered off or reports a diff --git a/checkman/blade_bx_powermod b/checkman/blade_bx_powermod index 6eabc1a..f27b8c3 100644 --- a/checkman/blade_bx_powermod +++ b/checkman/blade_bx_powermod @@ -1,12 +1,10 @@ -title: Primergy BX600 Blade Server: Power module +title: Primergy BX600 Blade Enclosure: Power module agents: snmp catalog: hw/server/fujitsu license: GPL distribution: check_mk description: - FIXME: Blade Server or Blade Enclosure? - - Checks the state of power modules in Primergy BX600 Blade Servers + Checks the state of power modules in Primergy BX600 Blade Enclosures Returns {OK} if the power module reports ok status and {CRIT} on any other status. diff --git a/checkman/blade_bx_temp b/checkman/blade_bx_temp index 1567b3b..70d30e3 100644 --- a/checkman/blade_bx_temp +++ b/checkman/blade_bx_temp @@ -4,8 +4,6 @@ catalog: hw/server/fujitsu license: GPL distribution: check_mk description: - FIXME: in Blade Servers or Blade Enclosures? - Checks temperature sensors in Primergy BX600 Blade Servers. Returns {CRIT} if the sensor is not present or powered off or if the sensor

10 years, 11 months

← Newer
1
...
4
5
6
7
8
9
10
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2013