Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64478 discussions

Check_MK Git: check_mk: FIX: mrpe: gracefully handle invalid exit code of plugin

by Mathias Kettner

Module: check_mk Branch: master Commit: 8b53efa3cb3c7715de507eff96e59bdf4ee2fc9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b53efa3cb3c77… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 26 09:45:55 2013 +0200 FIX: mrpe: gracefully handle invalid exit code of plugin --- ChangeLog | 1 + checks/mrpe | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 98893f9..a74ba76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ by the check plugin * FIX: check_disk_smb: Remove $ from share when creating service description. Otherwise Nagios will not accept the service description. + * FIX: mrpe: gracefully handle invalid exit code of plugin Notifications: * notify.py: Matching service level: Use the hosts service level if a diff --git a/checks/mrpe b/checks/mrpe index aa1390e..986e73b 100644 --- a/checks/mrpe +++ b/checks/mrpe @@ -59,6 +59,7 @@ def check_mrpe(item, params, info): check_name = None if line[0] == item: state = int(line[1]) + # convert to original format by joining and replacing \1 back with \n rest = " ".join(line[2:]).replace("\1", "\n") # split into lines @@ -66,6 +67,9 @@ def check_mrpe(item, params, info): # First line: OUTPUT|PERFDATA parts = lines[0].split("|", 1) output = [parts[0].strip()] + if state not in [ 0, 1, 2, 3]: + output[0] = "Invalid plugin status %d. Output is: %s" % (state, output[0]) + state = 3 if len(parts) > 1: perfdata = parts[1].strip().split() else:

11 years

Check_MK Git: check_mk: Futher checkhelper supports .site

by Mathias Kettner

Module: check_mk Branch: master Commit: 8e6c2d7ed4a6af94182f2c8d6137adddc1dff84b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e6c2d7ed4a6af… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 26 09:42:45 2013 +0200 Futher checkhelper supports .site --- checks/.f12 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/.f12 b/checks/.f12 index c4e5e87..5e1a7fa 100644 --- a/checks/.f12 +++ b/checks/.f12 @@ -1,3 +1,5 @@ +#!/bin/bash +SITE=${SITE:-$(cat ../.site)} SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo rsync -ar --delete-after ./ /omd/sites/$SITE/share/check_mk/checks/

11 years

Check_MK Git: check_mk: Updated bug entries #0987, #0956

by Mathias Kettner

Module: check_mk Branch: master Commit: fb6098d94b12408c82534f4c141ae63a35440a72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb6098d94b1240… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 26 09:42:08 2013 +0200 Updated bug entries #0987, #0956 --- .bugs/956 | 14 ++++++++++++++ .bugs/987 | 13 +++++++++++++ 2 files changed, 27 insertions(+) diff --git a/.bugs/956 b/.bugs/956 new file mode 100644 index 0000000..592a32e --- /dev/null +++ b/.bugs/956 @@ -0,0 +1,14 @@ +Title: Handle extra IP addresses of service boards intelligently +Component: core +State: open +Date: 2013-09-26 09:30:22 +Targetversion: future +Class: feature + +Many people have servers with service boards. The servers are monitored +with TCP and maybe also SNMP. The service boards have different IP +addresses and are monitored via SNMP. It would be *very* nice to have that +services mapped onto the actual server, not onto a separate host in +the monitoring. + +Find a good, simple solution with a simple and clear code impact. diff --git a/.bugs/987 b/.bugs/987 new file mode 100644 index 0000000..2167aec --- /dev/null +++ b/.bugs/987 @@ -0,0 +1,13 @@ +Title: Manage members of a contactgroup in the contactgroup +Component: wato +State: open +Date: 2013-09-26 09:32:08 +Targetversion: 1.4.0 +Class: feature + +It would be very nice if one could manage the members of +a contactgroup also in the settings of the contact group, not only +on that of the contacts. + +We could us the new membership valuespec that show two selection +lists.

11 years

Check_MK Git: check_mk: option --update-dns-cache: continue on errors

by Mathias Kettner

Module: check_mk Branch: master Commit: 04bf0fe8cea98a3cff550b078c2db623b537189a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04bf0fe8cea98a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 26 09:30:03 2013 +0200 option --update-dns-cache: continue on errors --- .bugs/954 | 9 +++++++++ .bugs/955 | 13 +++++++++++++ .bugs/config | 2 +- modules/.f12 | 2 ++ modules/check_mk.py | 10 ++++++++-- web/.f12 | 1 + 6 files changed, 34 insertions(+), 3 deletions(-) diff --git a/.bugs/954 b/.bugs/954 new file mode 100644 index 0000000..f6d460d --- /dev/null +++ b/.bugs/954 @@ -0,0 +1,9 @@ +Title: During config generation show all errors, not just one +Component: core +State: open +Date: 2013-09-26 09:22:17 +Targetversion: future +Class: feature + +When there are more than one errors during config generation, +we could display all of them, not just one. diff --git a/.bugs/955 b/.bugs/955 new file mode 100644 index 0000000..0595fb7 --- /dev/null +++ b/.bugs/955 @@ -0,0 +1,13 @@ +Title: Automatically remove duplicate checks +Component: core +State: open +Date: 2013-09-26 09:23:02 +Targetversion: 1.2.3i3 +Class: nastiness + +When you check a host with TCP and SNMP, you most times have +duplicate checks. This is nasty because you manually have +to ignore the duplicate. + +We simply could silently disable the SNMP based variants +if a TCP based variant already exist. diff --git a/.bugs/config b/.bugs/config index fb82208..fb57ae1 100644 --- a/.bugs/config +++ b/.bugs/config @@ -31,8 +31,8 @@ classes = [ targetversions = [ "1.2.2", - "1.2.3", "1.2.3i2", + "1.2.3i3", "1.4.0", "future", ] diff --git a/modules/.f12 b/modules/.f12 index ab5e57d..f106c3a 100644 --- a/modules/.f12 +++ b/modules/.f12 @@ -1,3 +1,5 @@ +#!/bin/bash +SITE=${SITE:-$(cat ../.site)} SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo cp -v *.py /omd/sites/$SITE/share/check_mk/modules/ sudo su - $SITE -c "cmk --debug -U" diff --git a/modules/check_mk.py b/modules/check_mk.py index b2faee7..f518e88 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1213,8 +1213,14 @@ def do_update_dns_cache(): for hostname in all_active_hosts() + all_active_clusters(): # Use intelligent logic. This prevents DNS lookups for hosts # with statically configured addresses, etc. - lookup_ipaddress(hostname) - + try: + lookup_ipaddress(hostname) + except Exception, e: + if opt_verbose: + print "Failed to lookup IP address of %s: %s" % (hostname, e) + if opt_debug: + raise + continue def agent_port_of(hostname): diff --git a/web/.f12 b/web/.f12 index fccf129..aaee97d 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,4 +1,5 @@ #!/bin/bash +SITE=${SITE:-$(cat ../.site)} SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo rsync --exclude=defaults.py --exclude "*mkevent*" --delete -varx htdocs plugins /omd/sites/$SITE/share/check_mk/web/ echo "$C files copied"

11 years

Check_MK Git: check_mk: Livestatus: removed debug messages from statehist

by Mathias Kettner

Module: check_mk Branch: master Commit: 1a1ac5e6e82b3470dd99e2e844822fd29db0e2a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a1ac5e6e82b34… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 25 18:22:20 2013 +0200 Livestatus: removed debug messages from statehist --- livestatus/src/TableStateHistory.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 10b583c..fa8522e 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -589,9 +589,9 @@ void TableStateHistory::answerQuery(Query *query) } } - logger(LOG_NOTICE, "Processed statehist logentries: %d", logentry_counter); - logger(LOG_NOTICE, "Total calls %d saved: %d", total_update_calls, total_calls_saved); - logger(LOG_NOTICE, "Objects: %d, Blacklisted: %d", state_info.size(), object_blacklist.size()); + logger(LOG_DEBUG, "Processed statehist logentries: %d", logentry_counter); + logger(LOG_DEBUG, "Total calls %d saved: %d", total_update_calls, total_calls_saved); + logger(LOG_DEBUG, "Objects: %d, Blacklisted: %d", state_info.size(), object_blacklist.size()); // Create final reports state_info_t::iterator it_hst = state_info.begin();

11 years

Check_MK Git: check_mk: levels for the ups_capacity check can now be configured in WATO

by Götz Golla

Module: check_mk Branch: master Commit: 796158cf9c4cdcc74418fcfeac2e45e2c78d3040 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=796158cf9c4cdc… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Sep 25 18:06:34 2013 +0200 levels for the ups_capacity check can now be configured in WATO --- checkman/ups_capacity | 40 +++++++++++++++++++++---- checks/ups_capacity | 40 +++++++++++++++++++------ web/plugins/wato/check_parameters.py | 53 +++++++++++++++++++++++++++++++++- 3 files changed, 118 insertions(+), 15 deletions(-) diff --git a/checkman/ups_capacity b/checkman/ups_capacity index cca4fb4..8233e09 100644 --- a/checkman/ups_capacity +++ b/checkman/ups_capacity @@ -4,13 +4,43 @@ catalog: hw/power license: GPL distribution: check_mk description: - This checks monitors the remaining capacity in minutes of a UPS - that supports the generic UPS-MIB - (such as General Electric (GE) SitePro UPS). The check is always - OK, there are currently neither levels nor other parameters. + This checks monitors a UPS that supports the generic UPS-MIB, + such as General Electric (GE) SitePro UPS, and many more. + The check monitors + the time the UPS is on battery (in seconds), + the battery capacity (in percent), + and the remaining runtime (in minutes). + Warning and critical levels can + be given for the time on battery and the capacity. perfdata: - The remaining capacity in minutes + The remaining runtime in minutes and the capacity in percent inventory: Supported. + +examples: + ups_capacity_default_levels = { + 'battime': (0, 0), + 'capacity': (90, 80) + } + + checkgroup_parameters.setdefault('ups_capacity', []) + + checkgroup_parameters['ups_capacity'] = [ + ( {'capacity': ( 90, 80 ) }, ["prod"], ALL_HOSTS, ["ups_capacity"]' ), + ] + checkgroup_parameters['ups_capacity'] + +[configuration] +ups_capacity_default_levels(dict): This variable is preset to {{ 'battime': (0, 0), 'capacity': (95, 90) }} + + +[parameters] +parameters(dict): with the keys "battime" and "capacity" + + 'battime' is a tuple containing warning and critical levels for the + time in seconds the USV is on battery. Default levels are (0, 0) + + 'capacity' is a tuple containing the warning and critical levels for + the battery capacity in percent. Default levels are (95, 90) + diff --git a/checks/ups_capacity b/checks/ups_capacity index 9039082..d376435 100644 --- a/checks/ups_capacity +++ b/checks/ups_capacity @@ -42,18 +42,24 @@ # SNMPv2-SMI::mib-2.33.1.3.1.0 = Counter32: 13 # SNMPv2-SMI::mib-2.33.1.3.2.0 = INTEGER: 3 -ups_capacity_defaul_levels = (0, 0) +#ups_capacity_defaul_levels = (0, 0) +ups_capacity_default_levels = { 'battime': (0, 0), 'capacity': (95, 90) } def inventory_ups_capacity(info): if len(info) > 0: - return [(None, 'ups_capacity_defaul_levels')] + return [(None, 'ups_capacity_default_levels')] def check_ups_capacity(item, params, info): - #To support inventorys with the old version - if params != None: + # To support inventories with the old version + if type(params) is tuple: # old format with 2 params in tuple warn, crit = params + cap_warn, cap_crit = (95, 90) + elif type(params) is dict: # new dict format + warn,crit = params.get('battime',(0,0)) + cap_warn,cap_crit = params.get('capacity',(95,90)) else: warn, crit = (0, 0) + cap_warn, cap_crit = (95, 90) time_on_bat, minutes_left, percent_fuel = map(int, info[0]) perf = [ @@ -61,19 +67,35 @@ def check_ups_capacity(item, params, info): ('percent', percent_fuel), ] - info_text = "remaining capacity %d minutes (%d%%)" % (minutes_left, percent_fuel) + state = 0 + time_label = "" + cap_label = "" if time_on_bat > crit: - return(2, "On battery since %ds(!!) " % time_on_bat + info_text, perf) + state = 2 + time_label = "On battery since %ds(%ds/%dss)(!!), " % time_on_bat, warn, crit + #return(2, "On battery since %ds(!!) " % time_on_bat + info_text, perf) elif time_on_bat > warn: - return(1, "On battery since %ds(!) " % time_on_bat + info_text, perf) - else: - return(0, info_text, perf) + state = 1 + time_label = "On battery since %ds(%ds/%dss)(!)" % time_on_bat, warn, crit + #return(1, "On battery since %ds(!) " % time_on_bat + info_text, perf) + if percent_fuel < cap_crit: + state = 2 + cap_label = "(!!)" + elif percent_fuel < cap_warn: + state = 1 + cap_label = "(!)" + + info_text = "%sremaining capacity %dmin, percentage %d%% (%d/%d) %s" \ + % (time_label, minutes_left, percent_fuel, cap_warn, cap_crit, cap_label ) + return(state, info_text, perf) + check_info["ups_capacity"] = { "check_function" : check_ups_capacity, "inventory_function" : inventory_ups_capacity, "service_description" : "Battery capacity", "has_perfdata" : True, + "group" : "ups_capacity", "snmp_info" : ( ".1.3.6.1.2.1.33.1.2", [ "2.0" , "3.0" ,"4.0" ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 123ed17..defab5d 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3189,7 +3189,7 @@ register_check_parameters( elements = [ Integer( title = _("Critical Battery Capacity"), - help = _("The battery capacity in percent at and below which a critical state is be triggered"), + help = _("The battery capacity in percent at and below which a critical state is triggered"), unit = _("%"), default_value = 95, ), @@ -3247,6 +3247,57 @@ register_check_parameters( "first" ) +register_check_parameters( + subgroup_environment, + "ups_capacity", + _("UPS Capacity"), + Dictionary( + title = _("Levels for battery parameters"), + optional_keys = False, + elements = [ + ("capacity", + Tuple( + title = _("Battery Capacity"), + elements = [ + Integer( + title = _("Warning Level"), + help = _("The battery capacity in percent at and below which a warning state is triggered"), + unit = _("%"), + default_value = 95, + ), + Integer( + title = _("Critical Level"), + help = _("The battery capacity in percent at and below which a critical state is triggered"), + unit = _("%"), + default_value = 90, + ), + ], + ), + ), + ("battime", + Tuple( + title = _("Time Left on Battery"), + elements = [ + Integer( + title = _("Warning Level"), + help = _("Time left on Battery at and below which a warning state is triggered"), + unit = _("%"), + default_value = 0, + ), + Integer( + title = _("Critical Level"), + help = _("Time Left on Battery at and below which a critical state is triggered"), + unit = _("min"), + default_value = 0, + ), + ], + ), + )], + ), + None, + "first" +) + syslog_facilities = [ (0, "kern"), (1, "user"),

11 years

Check_MK Git: check_mk: fixed typo in dictionary valuespec

by Andreas Boesl

Module: check_mk Branch: master Commit: 94fa4120bfeaf68d8e8dc04087e54043770d4862 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94fa4120bfeaf6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 25 13:26:00 2013 +0200 fixed typo in dictionary valuespec --- web/htdocs/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 7b3b1f6..239b87a 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2327,7 +2327,7 @@ class Dictionary(ValueSpec): except MKUserError, e: raise MKUserError(e.varname, _("%s: %s") % (vs.title(), e.message)) elif not self._optional_keys or param in self._required_keys: - raise MKUserError(varprefix, _("The entry %s is missing") % vp.title()) + raise MKUserError(varprefix, _("The entry %s is missing") % vs.title()) # Check for exceeding keys allowed_keys = [ p for (p,v) in self._get_elements() ]

11 years

Check_MK Git: check_mk: New helper for finding orphaned piggy hosts

by Mathias Kettner

Module: check_mk Branch: master Commit: 47b8e86df9687f645bcdeee3da0a768cca72c2dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47b8e86df9687f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 24 17:34:22 2013 +0200 New helper for finding orphaned piggy hosts --- doc/treasures/find_piggy_orphans | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/treasures/find_piggy_orphans b/doc/treasures/find_piggy_orphans new file mode 100755 index 0000000..87c9cb1 --- /dev/null +++ b/doc/treasures/find_piggy_orphans @@ -0,0 +1,7 @@ +#!/bin/bash +cd $OMD_ROOT +for h in $(cd tmp/check_mk/piggyback ; echo *) +do + lq "GET hosts\nColumns: address name\nFilter: address = $h\nFilter: name = $h\nOr: 2" | grep -q . || echo "$h" +done +

11 years

Check_MK Git: check_mk: FIX: check_disk_smb: Remove $ from share when creating service description.

by Mathias Kettner

Module: check_mk Branch: master Commit: 7d404ed7af4173bc35d4646f5283ccee1c6a3b59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d404ed7af4173… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 24 17:33:54 2013 +0200 FIX: check_disk_smb: Remove $ from share when creating service description. --- ChangeLog | 3 ++- checks/check_disk_smb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f55961..98893f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -112,7 +112,8 @@ is now possible using WATO * FIX: check_mk-ipmi.php: PNP template now displays correct units as delivered by the check plugin - + * FIX: check_disk_smb: Remove $ from share when creating service description. + Otherwise Nagios will not accept the service description. Notifications: * notify.py: Matching service level: Use the hosts service level if a diff --git a/checks/check_disk_smb b/checks/check_disk_smb index efb5a7c..ff2313a 100644 --- a/checks/check_disk_smb +++ b/checks/check_disk_smb @@ -48,7 +48,7 @@ def check_disk_smb_arguments(params): active_check_info['disk_smb'] = { "command_line" : '$USER1$/check_disk_smb $ARG1$', "argument_function" : check_disk_smb_arguments, - "service_description" : lambda params: "SMB Share " + params["share"], + "service_description" : lambda params: "SMB Share " + params["share"].replace("$", ""), "has_perfdata" : True, }

11 years

Check_MK Git: check_mk: Fixed exception in ldap_attribute_plugins without parameters

by Andreas Boesl

Module: check_mk Branch: master Commit: b1e9d1a36bea3bac71a3e60f4d2a74c3b4e5fc28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1e9d1a36bea3b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 24 16:16:31 2013 +0200 Fixed exception in ldap_attribute_plugins without parameters --- web/plugins/userdb/ldap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index d08d00b..10fe2eb 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -577,7 +577,7 @@ def ldap_attribute_plugins_elements(): elements.append((key, FixedValue( title = plugin['title'], help = plugin['help'], - value = None, + value = {}, totext = 'no_param_txt' in plugin and plugin['no_param_txt'] \ or _('This synchronization plugin has no parameters.'), )))

11 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits