Checkmk git commits September 2014

checkmk-commits@lists.checkmk.com

5 participants
195 discussions

Check_MK Git: check_mk: #1121 FIX Rule based notifications formular: No longer raises Request-Uri-Too-Large errors

by Andreas Boesl

Module: check_mk Branch: master Commit: 1f0723f5bb2573cf481ebc30eb7a3fe4867db16d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f0723f5bb2573… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 30 11:53:09 2014 +0200 #1121 FIX Rule based notifications formular: No longer raises Request-Uri-Too-Large errors If you wanted to create/edit a rule based notifcation and the formular itself had too much configurable host tags, contact groups, etc. there was a problem on sending this formular to the server. The data was sent with a GET request, which only allowed a limited url length. This formular is now sent with a POST request. --- .werks/1121 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/1121 b/.werks/1121 new file mode 100644 index 0000000..0a7d70a --- /dev/null +++ b/.werks/1121 @@ -0,0 +1,12 @@ +Title: Rule based notifications formular: No longer raises Request-Uri-Too-Large errors +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i6 +Date: 1412070448 +Class: fix + +If you wanted to create/edit a rule based notifcation and the formular itself had too much +configurable host tags, contact groups, etc. there was a problem on sending this formular to the server. +The data was sent with a GET request, which only allowed a limited url length. +This formular is now sent with a POST request. diff --git a/ChangeLog b/ChangeLog index 60164b4..f837830 100644 --- a/ChangeLog +++ b/ChangeLog @@ -129,6 +129,7 @@ * 1396 FIX: Fix default setting of Enable sounds in views... * 1109 FIX: WATO active checks: passwords no longer shown as plain text.... * 1119 FIX: WATO create rule: No longer raises an incorrect permission warning when creating a new rule... + * 1121 FIX: Rule based notifications formular: No longer raises Request-Uri-Too-Large errors... Notifications: * 1151 Add variables (HOST/SERVICE)ACK(AUTHOR/COMMENT) to notification context... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 12088e8..ad72b8d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9105,7 +9105,7 @@ def mode_notification_rule(phase, profilemode): return "notifications" - html.begin_form("rule") + html.begin_form("rule", method = "POST") vs.render_input("rule", rule) vs.set_focus("rule") forms.end()

10 years

Check_MK Git: check_mk: fsc_temp: Reworked to use new include function

by Konstantin Büttner

Module: check_mk Branch: master Commit: fb24fe0f0607641fa3c502624d328341bfbee07f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb24fe0f060764… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Sep 30 11:34:57 2014 +0200 fsc_temp: Reworked to use new include function --- checks/fsc_temp | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/checks/fsc_temp b/checks/fsc_temp index ce4e788..274acc5 100644 --- a/checks/fsc_temp +++ b/checks/fsc_temp @@ -32,29 +32,21 @@ # 8: critical level def inventory_fsc_temp(info): - # Ignore non-connected sensors - return [ (line[0], None) for line in info if int(line[1]) < 500 ] + for line in info: + # Ignore non-connected sensors + if int(line[1]) < 500: + yield (line[0], None) -def check_fsc_temp(item, _no_params, info): - for name, current, warn, crit in info: - if name != item: continue - current = int(current) - warn = int(warn) - crit = int(crit) - - infotext = "%d C (levels at %d C / %d C)" % (current, warn, crit) - perfdata = [ ("temp", current, warn, crit, 0 ) ] - if current == -1 or current == 4294967295: - return(3, "Problem with sensor") - elif current >= crit and crit > 0: - return (2, "%s" % infotext, perfdata) - elif current >= warn and warn > 0: - return (1, "%s" % infotext, perfdata) - else: - return (0, "%s" % infotext, perfdata) +def check_fsc_temp(item, _no_params, info): + for name, rawtemp, warn, crit in info: + if name == item: + temp = int(rawtemp) + if temp == -1 or temp == 4294967295: + return 3, "Sensor or component missing" + else: + return check_temperature(temp, (int(warn), int(crit))) - return (3, "Sensor %s not found in SNMP data" % item) check_info['fsc_temp'] = { "inventory_function" : inventory_fsc_temp, @@ -64,4 +56,5 @@ check_info['fsc_temp'] = { "snmp_info" : ( ".1.3.6.1.4.1.231.2.10.2.2.5.2.1.1", [ 13, 11, 6, 8 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.231.2.10.2.1.1.0"), "group" : "temperature_auto", + "includes" : [ "temperature.include" ], }

10 years

Check_MK Git: check_mk: Removed debugging output

by Konstantin Büttner

Module: check_mk Branch: master Commit: 64cc681e3316e2a72ad377c628bc7c09ca282aea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64cc681e3316e2… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Sep 30 11:11:42 2014 +0200 Removed debugging output --- checks/temperature.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/temperature.include b/checks/temperature.include index 83857c2..3db199e 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -37,7 +37,7 @@ def check_temperature(temp, params): warn, crit = params perfdata = [ ("temp", temp, warn, crit) ] - infotext = "Temperature is %s °C HAGARBL" % tostring(temp) + infotext = "Temperature is %s °C" % tostring(temp) levelstext = " (warn/crit at %s/%s °C)" % (tostring(warn), tostring(crit)) if temp >= crit:

10 years

Check_MK Git: check_mk: oracle_dataguard_stats: Removed print statement

by Mathias Kettner

Module: check_mk Branch: master Commit: f4af627e4db16a5a89d1d4b6691817ea5c65249b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4af627e4db16a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 30 10:03:50 2014 +0200 oracle_dataguard_stats: Removed print statement --- checks/oracle_dataguard_stats | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/checks/oracle_dataguard_stats b/checks/oracle_dataguard_stats index e040330..61cd167 100644 --- a/checks/oracle_dataguard_stats +++ b/checks/oracle_dataguard_stats @@ -93,16 +93,13 @@ def check_oracle_dataguard_stats(item, params, info): if crit == warn and crit == -1: - state = max(0, state) + pass elif seconds >= crit: - print "%s %d %d %d" % (parameter, warn, crit, seconds) infotext += '(!!) ' state = 2 elif seconds >= warn: infotext += '(!) ' state = max(1, state) - else: - state = max(0, state) perfdata.append([parameter.replace(' ', '_'), seconds, warn, crit])

10 years

Check_MK Git: check_mk: #1409 Extended Check_MK-API: check function may return None

by Mathias Kettner

Module: check_mk Branch: master Commit: 8cf6c82df14cfe477b663a4b99a3334b26c25081 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cf6c82df14cfe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 30 08:26:00 2014 +0200 #1409 Extended Check_MK-API: check function may return None A check function may now return <tt>None</tt> (or simply end without returning anything). This will no longer create an exception but return state <tt>UNKNOWN</tt> and - depending on the type of the check - one of the following outputs: <tt>Item not found in SNMP data</tt> <tt>Item not found in agent output</tt> This means that for the typical check that loops through the agent output looking for its item now does not need to manually do a C+: return 3, "Something not found in agent output" C-: anymore. This is now the default case. This has several advantages: <ul> <li>You save some code in the check implementation.</li> <li>The output of the various checks is unified.</li> <li>A future Check_MK version can easily have a rule for changing the state in such cases from UNKNOWN to WARN or CRIT.</li> </ul> --- .werks/1409 | 32 ++++++++++++++++++++++++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 21 +++++++++++++++++++-- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/.werks/1409 b/.werks/1409 new file mode 100644 index 0000000..d6ed902 --- /dev/null +++ b/.werks/1409 @@ -0,0 +1,32 @@ +Title: Extended Check_MK-API: check function may return None +Level: 2 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1412058117 +Class: feature + +A check function may now return <tt>None</tt> (or simply end without +returning anything). This will no longer create an exception but return +state <tt>UNKNOWN</tt> and - depending on the type of the check - +one of the following outputs: + +<tt>Item not found in SNMP data</tt> + +<tt>Item not found in agent output</tt> + +This means that for the typical check that loops through the agent +output looking for its item now does not need to manually do a + +C+: + return 3, "Something not found in agent output" +C-: + +anymore. This is now the default case. This has several advantages: + +<ul> +<li>You save some code in the check implementation.</li> +<li>The output of the various checks is unified.</li> +<li>A future Check_MK version can easily have a rule for changing the state +in such cases from UNKNOWN to WARN or CRIT.</li> +</ul> diff --git a/ChangeLog b/ChangeLog index 60164b4..243060e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,6 +65,7 @@ NOTE: Please refer to the migration notes! * 1117 agent_vsphere: now able to query license information from esx system... * 1118 bluecat_dns, bluecat_dhcp: no able to run as clustered checks... + * 1409 Extended Check_MK-API: check function may return None... * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index dfa1d03..8ebd08e 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1131,15 +1131,23 @@ def convert_check_info(): snmp_scan_functions[basename] = info["snmp_scan_function"] -def convert_check_result(result): +def convert_check_result(result, is_snmp): if type(result) == tuple: return result + elif result == None: + return item_not_found(is_snmp) + # The check function may either return a tuple (pair or triple) or an iterator # (using yield). The latter one is new since version 1.2.5i5. else: # We assume an iterator, convert to tuple subresults = list(result) + # Empty list? Check returned nothing + if not subresults: + return item_not_found(is_snmp) + + # Simple check with no separate subchecks (yield wouldn't have been neccessary here!) if len(subresults) == 1: return subresults[0] @@ -1166,6 +1174,13 @@ def convert_check_result(result): return status, ", ".join(infotexts), perfdata +def item_not_found(is_snmp): + if is_snmp: + return 3, "Item not found in SNMP data" + else: + return 3, "Item not found in agent output" + + # Loops over all checks for a host, gets the data, calls the check # function that examines that data and sends the result to Nagios def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): @@ -1232,9 +1247,11 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): try: dont_submit = False + is_snmp = check_info[checkname].get("snmp_info") or \ + ( infotype in check_info and check_info[infotype].get("snmp_info")) # Call the actual check function - result = convert_check_result(check_function(item, params, info)) + result = convert_check_result(check_function(item, params, info), is_snmp) # handle check implementations that do not yet support the

10 years

Check_MK Git: check_mk: enterasys_temp: avoid exception on empty info

by Mathias Kettner

Module: check_mk Branch: master Commit: bae038fb77fd4fe171369a1af0c5aef2c25d908e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bae038fb77fd4f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 30 08:14:54 2014 +0200 enterasys_temp: avoid exception on empty info --- checks/enterasys_temp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/checks/enterasys_temp b/checks/enterasys_temp index c25d9eb..32e787d 100644 --- a/checks/enterasys_temp +++ b/checks/enterasys_temp @@ -27,9 +27,7 @@ enterasys_temp_default_levels = (30, 35) def inventory_enterasys_temp(info): - if info[0][0] == "0": - return [] - else: + if info and info[0][0] != "0": return [ (None, "enterasys_temp_default_levels") ] def check_enterasys_temp(item, params, info):

10 years

Check_MK Git: check_mk: #1120 FIX Multisite filters Host/

by Andreas Boesl

Service Contactgroup: Fixed livestatus exception Message-ID: <54295647.NzOXiRQ7YENjocpn%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 2df93d322ed472713031813e9ebb3931741d8bf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2df93d322ed472… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 29 14:53:13 2014 +0200 #1120 FIX Multisite filters Host/Service Contactgroup: Fixed livestatus exception The multisite filters <tt>Host Contactgroups</tt> and <tt>Service Contactgroups</tt> were not working because of an incorrect livestatus filter formatting. This resulted in an livestatus exception every time any of these filters were actively used. --- .werks/1120 | 12 ++++++++++++ ChangeLog | 1 + web/plugins/views/filters.py | 6 ++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/1120 b/.werks/1120 new file mode 100644 index 0000000..eac58f7 --- /dev/null +++ b/.werks/1120 @@ -0,0 +1,12 @@ +Title: Multisite filters Host/Service Contactgroup: Fixed livestatus exception +Level: 2 +Component: multisite +Compatible: compat +Version: 1.2.5i6 +Date: 1411994905 +Class: fix + +The multisite filters <tt>Host Contactgroups</tt> and <tt>Service Contactgroups</tt> were +not working because of an incorrect livestatus filter formatting. +This resulted in an livestatus exception every time any of these filters were actively used. + diff --git a/ChangeLog b/ChangeLog index 4795829..60164b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -110,6 +110,7 @@ * 1094 FIX: sidebar snaping 'Tree of folders': fixed exception * 1154 FIX: Availability: Fixed unwanted redirect to edit annotation page after editing availability options... * 1401 FIX: Display options in views are now again persistent... + * 1120 FIX: Multisite filters Host/Service Contactgroup: Fixed livestatus exception... WATO: * 1096 New WATO webservices: manage hosts via webinterface... diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 40cc08b..d764df4 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -214,7 +214,8 @@ class FilterGroupCombo(Filter): if not self.enforce: return "" # Take first group with the name we search - current_value = html.live.query_value("GET %sgroups\nCache: reload\nColumns: name\nLimit: 1\n" % self.what, None) + table = self.what.replace("host_contact", "contact").replace("service_contact", "contact") + current_value = html.live.query_value("GET %sgroups\nCache: reload\nColumns: name\nLimit: 1\n" % table, None) if current_value == None: return "" # no {what}group exists! @@ -242,8 +243,9 @@ class FilterGroupCombo(Filter): def heading_info(self, infoname): current_value = self.current_value(infoname) if current_value: + table = self.what.replace("host_contact", "contact").replace("service_contact", "contact") alias = html.live.query_value("GET %sgroups\nCache: reload\nColumns: alias\nFilter: name = %s\n" % - (self.what, current_value), current_value) + (table, current_value), current_value) return alias

10 years

Check_MK Git: check_mk: check groups citrix_licenses, esx_licenses: changed match type to first

by Andreas Boesl

Module: check_mk Branch: master Commit: 3f56744239781fbd7c9271a89f5fbb65307b117b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f56744239781f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 29 11:39:49 2014 +0200 check groups citrix_licenses, esx_licenses: changed match type to first --- web/plugins/wato/check_parameters.py | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index da1c3dd..235e893 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1849,7 +1849,7 @@ register_check_parameters( "first" ) -def get_filesystem_valuespec(what): +def get_free_used_dynamic_valuespec(what, name, default_value = (80.0, 90.0)): if what == "used": title = _("used space") course = _("above") @@ -1874,17 +1874,16 @@ def get_filesystem_valuespec(what): ] return Alternative( - title = _("Levels for filesystem %s") % title, + title = _("Levels for %s %s") % (name, title), show_alternative_title = True, - default_value = (80.0, 90.0), + default_value = default_value, elements = vs_subgroup + [ ListOf( Tuple( orientation = "horizontal", elements = [ - Filesize(title = _("Filesystem larger than")), + Filesize(title = _("%s larger than") % name.title()), Alternative( - title = _("Levels for %s") % title, elements = vs_subgroup ) ] @@ -1933,9 +1932,9 @@ filesystem_elements = [ default_value = (80.0, 90.0), match = match_dual_level_type, elements = [ - get_filesystem_valuespec("used"), + get_free_used_dynamic_valuespec("used", "filesystem"), Transform( - get_filesystem_valuespec("free"), + get_free_used_dynamic_valuespec("free", "filesystem", default_value = (20.0, 10.0)), title = _("Levels for filesystem free space"), allow_empty = False, forth = transform_filesystem_free, @@ -3085,6 +3084,7 @@ register_check_parameters( None ) + register_check_parameters( subgroup_applications, "oracle_tablespaces", @@ -5592,6 +5592,18 @@ register_check_parameters( "dict", ) + +register_check_parameters( + subgroup_applications, + "db2_logsizes", + _("Size of DB2 logfiles"), + get_free_used_dynamic_valuespec("free", "logfile", default_value = (20.0, 10.0)), + TextAscii( + title = _("Logfile name"), + allow_empty = True), + "first" +) + register_check_parameters( subgroup_applications, "db2_mem", @@ -6027,7 +6039,7 @@ register_check_parameters( help = _("For example <tt>VMware vSphere 5 Standard</tt>"), allow_empty = False, ), - "dict" + "first" ) register_check_parameters( @@ -6039,7 +6051,7 @@ register_check_parameters( title = _("ID of the license, e.g. <tt>PVSD_STD_CCS</tt>"), allow_empty = False, ), - "dict" + "first" ) register_check_parameters(

10 years

Check_MK Git: check_mk: esx_vsphere_licenses: fixed exception when no params were set

by Andreas Boesl

Module: check_mk Branch: master Commit: 5accfd59a783d7e4233112a762d6fe141ae42565 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5accfd59a783d7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 29 11:20:01 2014 +0200 esx_vsphere_licenses: fixed exception when no params were set --- checks/esx_vsphere_licenses | 2 -- 1 file changed, 2 deletions(-) diff --git a/checks/esx_vsphere_licenses b/checks/esx_vsphere_licenses index 5fbb918..5006922 100644 --- a/checks/esx_vsphere_licenses +++ b/checks/esx_vsphere_licenses @@ -34,8 +34,6 @@ def inventory_esx_vsphere_licenses(info): return [ (line[0], None) for line in info ] def check_esx_vsphere_licenses(item, params, info): - if params == None: - params = {} # Transform: VMware vSphere 5 Standard 100 13 # Into dict: 'VMware vSphere 5 Standard': (100, 130) licenses = dict(map(

10 years

Check_MK Git: check_mk: Check no longer memorizes port states in inventory

by Goetz Golla

Module: check_mk Branch: master Commit: 6993a84222908f29038e1ed09266248cbec1a4ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6993a84222908f… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Sep 29 09:33:41 2014 +0200 Check no longer memorizes port states in inventory The scan function has been enabled again. The check does not inventorize when a brocade mib is also present --- checks/fc_port | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/checks/fc_port b/checks/fc_port index 8c84158..93b02c6 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -119,9 +119,8 @@ def inventory_fc_port(info): opstate not in fc_port_no_inventory_opstates and \ phystate not in fc_port_no_inventory_phystates: - inventory.append( (fc_port_getitem(len(info), index, portname), - '{ "admstate": [%d], "opstate": [%d], "phystate": [%d] }' - % (admstate, opstate, phystate) )) + inventory.append( (fc_port_getitem(len(info), index, portname), \ + 'fc_port_default_levels') ) return inventory @@ -317,9 +316,9 @@ check_info["fc_port"] = { 'has_perfdata' : True, 'group' : 'fc_port', 'default_levels_variable': 'fc_port_default_levels', - #'snmp_scan_function' : lambda oid: - # oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1") \ - # and not oid(".1.3.6.1.4.1.1588.2.1.1.1.6.2.1.1"), + 'snmp_scan_function' : lambda oid: + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1") \ + and oid(".1.3.6.1.4.1.1588.2.1.1.1.6.2.1.*") == None, 'snmp_scan_function' : lambda oid: False, 'snmp_info' : ( ".1.3.6.1.3.94", [ "1.10.1.2", # connUnitPortIndex # 0

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2014