Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 905d604d8a2691c66460ac07cb70af6a1be7983e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=905d604d8a2691… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 13 12:37:19 2017 +0100 Fixed invalid parameters Change-Id: Ie3184eb18a3cfa33f65796d5231cbb1e9beed17c --- checks/hr_cpu | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/checks/hr_cpu b/checks/hr_cpu index ca03596..fc4d573 100644 --- a/checks/hr_cpu +++ b/checks/hr_cpu @@ -29,12 +29,14 @@ # .1.3.6.1.2.1.25.3.3.1.2.769 1 --> HOST-RESOURCES-MIB::hrProcessorLoad.769 -hr_cpu_default_levels = (80.0, 90.0) +factory_settings["hr_cpu_default_levels"] = { + "levels" : (80.0, 90.0), +} def inventory_hr_cpu(info): if len(info) >= 1: - return [(None, "hr_cpu_default_levels")] + return [(None, {})] def check_hr_cpu(_no_item, params, info): @@ -54,14 +56,15 @@ def check_hr_cpu(_no_item, params, info): check_info["hr_cpu"] = { - 'inventory_function' : inventory_hr_cpu, - 'check_function' : check_hr_cpu, - 'service_description' : 'CPU utilization', - 'has_perfdata' : True, - 'snmp_info' : ('.1.3.6.1.2.1.25.3.3.1', [2]), - 'snmp_scan_function' : lambda oid: \ - not not oid('.1.3.6.1.2.1.25.1.1.0'), - # HOST-RESOURCES-MIB::hrSystemUptime.0 - 'group' : 'cpu_utilization_os', - 'includes' : [ 'cpu_util.include' ], + 'inventory_function' : inventory_hr_cpu, + 'check_function' : check_hr_cpu, + 'service_description' : 'CPU utilization', + 'has_perfdata' : True, + 'snmp_info' : ('.1.3.6.1.2.1.25.3.3.1', [2]), + 'snmp_scan_function' : lambda oid: \ + not not oid('.1.3.6.1.2.1.25.1.1.0'), + # HOST-RESOURCES-MIB::hrSystemUptime.0 + 'group' : 'cpu_utilization_os', + 'includes' : [ 'cpu_util.include' ], + 'default_levels_variable' : 'hr_cpu_default_levels', }

7 years, 6 months

4519 FIX mbg_lantime_ng_refclock: Added missing refclock types

by Simon Betz

Module: check_mk Branch: master Commit: 159b3e71baa42b993094648280a3fd669626eac9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=159b3e71baa42b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 13 12:09:42 2017 +0100 4519 FIX mbg_lantime_ng_refclock: Added missing refclock types Change-Id: I11b901af07af75e97d9d5f7a68140ce5b11fa25e --- .werks/4519 | 11 +++++++++++ checks/mbg_lantime_ng_refclock | 14 ++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/.werks/4519 b/.werks/4519 new file mode 100644 index 0000000..59969c6 --- /dev/null +++ b/.werks/4519 @@ -0,0 +1,11 @@ +Title: mbg_lantime_ng_refclock: Added missing refclock types +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.4.0b4 +Date: 1489403291 + + diff --git a/checks/mbg_lantime_ng_refclock b/checks/mbg_lantime_ng_refclock index 78ec0d4..24b0a6c 100644 --- a/checks/mbg_lantime_ng_refclock +++ b/checks/mbg_lantime_ng_refclock @@ -97,6 +97,20 @@ mbg_lantime_ng_refclock_types = { "45" : "liu", "46" : "dcf600HS", "47" : "dcf600RS", + "48" : "mri", + "49" : "bpe", + "50" : "gln180Pex", + "51" : "n2x", + "52" : "rsc180", + "53" : "lneGb", + "54" : "lnePpg180", + "55" : "scg", + "56" : "mdu300", + "57" : "sdi", + "58" : "fdm180", + "59" : "spt", + "60" : "pzf180", + "61" : "rel1000", } def mbg_lantime_ng_generalstate(clock_type, usage, state, substate):

7 years, 6 months

Fixed invalid parameters during discovery

by Simon Betz

Module: check_mk Branch: master Commit: b66c1142b060df1a4a94dbd0f3ae2c59683a5083 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b66c1142b060df… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 13 11:53:41 2017 +0100 Fixed invalid parameters during discovery Change-Id: Iabd86b0bc776c3c76f912981b1cc02d752f3bb32 --- checks/winperf_msx_queues | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/winperf_msx_queues b/checks/winperf_msx_queues index 488f1ad..6a9cb71 100644 --- a/checks/winperf_msx_queues +++ b/checks/winperf_msx_queues @@ -86,7 +86,7 @@ def inventory_winperf_msx_queues(info): queues = inventory_rules else: queues = winperf_msx_queues - return [ (name, { "offset" : offset } ) for name, offset in queues.items() ] + return [ (name, { "offset" : int(offset) } ) for name, offset in queues.items() ] def check_winperf_msx_queues(item, params, info): # current windows agents should not produce winperf sections with no data after the header but

7 years, 6 months

4497 Alert handling: Added several missing match conditions

by Lars Michelsen

Module: check_mk Branch: master Commit: 38c2a6c6487f29d89d97a2cd159f6914175b257d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38c2a6c6487f29… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 13 11:40:59 2017 +0100 4497 Alert handling: Added several missing match conditions The following match conditions have been added: <ul> <li>Exclude list of services</li> <li>Check type</li> <li>Plugin output</li> <li>Contacts</li> <li>Contact groups</li> <li>Service level</li> <li>Matching during timeperiod</li> <ul> Change-Id: If386c16baca014faa6c87f40352bffe302520ee4 --- .werks/4497 | 20 ++++++++++++++++++++ web/htdocs/wato.py | 2 -- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.werks/4497 b/.werks/4497 new file mode 100644 index 0000000..e8cd399 --- /dev/null +++ b/.werks/4497 @@ -0,0 +1,20 @@ +Title: Alert handling: Added several missing match conditions +Level: 1 +Component: core +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1489401357 +Class: feature + +The following match conditions have been added: + +<ul> +<li>Exclude list of services</li> +<li>Check type</li> +<li>Plugin output</li> +<li>Contacts</li> +<li>Contact groups</li> +<li>Service level</li> +<li>Matching during timeperiod</li> +<ul> diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8a1cc43..d7a1130 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7659,8 +7659,6 @@ def generic_rule_match_conditions(): orientation = "horizontal", ) ), - # BEWARE: If you add further match conditions here, you might have to adjust - # the the number in the_alert_handlers.py:ModeAlertHandlerRule._alert_handler_conditions ( "match_checktype", CheckTypeSelection( title = _("Match the following check types"),

7 years, 6 months

4518 FIX citrix_licenses: Fixed related PNP template with error ' Unused Arguments " " in AREA:used...'

by Simon Betz

Module: check_mk Branch: master Commit: ddfd30c36eea961ba1201ad310412d3d00562a3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddfd30c36eea96… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 13 11:44:20 2017 +0100 4518 FIX citrix_licenses: Fixed related PNP template with error 'Unused Arguments " " in AREA:used...' Change-Id: I6673db989fc0215582bea577ec394b58bac95a44 --- .werks/4518 | 11 +++++++++++ pnp-templates/check_mk-citrix_licenses.php | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.werks/4518 b/.werks/4518 new file mode 100644 index 0000000..d4e7513 --- /dev/null +++ b/.werks/4518 @@ -0,0 +1,11 @@ +Title: citrix_licenses: Fixed related PNP template with error 'Unused Arguments " " in AREA:used...' +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.4.0b4 +Date: 1489401772 + + diff --git a/pnp-templates/check_mk-citrix_licenses.php b/pnp-templates/check_mk-citrix_licenses.php index 205811b..a10ee77 100644 --- a/pnp-templates/check_mk-citrix_licenses.php +++ b/pnp-templates/check_mk-citrix_licenses.php @@ -28,10 +28,10 @@ $opt[1] = "--vertical-label Licenses -l 0 -u $MAX[1] --title 'Used Citrix Licens $def[1] = "" . "DEF:used=$RRDFILE[1]:$DS[1]:MAX " - . "AREA:used#60d070:\"Used Licenses: \" " - . "GPRINT:used:LAST:\"last\\: % 6.0lf\" " - . "GPRINT:used:MAX:\"maximum\\: % 6.0lf\" " - . "GPRINT:used:AVERAGE:\"average\\:% 6.0lf\\n\" " + . "AREA:used#60d070:\"Used Licenses\: \" " + . "GPRINT:used:LAST:\"last\: % 6.0lf\" " + . "GPRINT:used:MAX:\"maximum\: % 6.0lf\" " + . "GPRINT:used:AVERAGE:\"average\:% 6.0lf\\n\" " . "HRULE:$MAX[1]#000000:\"Installed Licences\" " . "LINE:used#008000 " . "";

7 years, 6 months

fixed fix

by Marcel Arentz

Module: check_mk Branch: master Commit: 5ab62ef6b4b5c9b8a01e30736336cc3bfae708da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ab62ef6b4b5c9… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 13 11:31:08 2017 +0100 fixed fix Change-Id: Ia1fb8693177057bce5be8a6865ed33a2ceca199e --- checks/f5_bigip_vserver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/f5_bigip_vserver b/checks/f5_bigip_vserver index 1a72e24..6c83e83 100644 --- a/checks/f5_bigip_vserver +++ b/checks/f5_bigip_vserver @@ -65,7 +65,7 @@ def inventory_f5_bigip_vserver(parsed): def check_f5_bigip_vserver(item, params, parsed): # Need compatibility to version with _no_params - if params = None + if params == None params = {} if item in parsed:

7 years, 6 months

werk finally fixed...

by Marcel Arentz

Module: check_mk Branch: master Commit: 10651c17d440c2ea71a57d8cbb7f076fbc8be436 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10651c17d440c2… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 13 11:34:37 2017 +0100 werk finally fixed... Change-Id: I59bdd5e3fb6c96a37da05dbeb2dbf0916b4bf3c3 --- checks/f5_bigip_vserver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/f5_bigip_vserver b/checks/f5_bigip_vserver index 6c83e83..47eaf42 100644 --- a/checks/f5_bigip_vserver +++ b/checks/f5_bigip_vserver @@ -65,7 +65,7 @@ def inventory_f5_bigip_vserver(parsed): def check_f5_bigip_vserver(item, params, parsed): # Need compatibility to version with _no_params - if params == None + if params == None: params = {} if item in parsed:

7 years, 6 months

4444 FIX f5_bigip_vserver: Fixed crash when Service has no params

by Marcel Arentz

Module: check_mk Branch: master Commit: 45d7a4c59c7763a667dbca63046c667437fcbec6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45d7a4c59c7763… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 13 11:25:48 2017 +0100 4444 FIX f5_bigip_vserver: Fixed crash when Service has no params In older version this check had no params. To be compatible with newer version we need to take care of this circumstance and convert the variable. Change-Id: I260969121154c2cf91f70a9b8b4fdc4f1db21a95 --- .werks/4444 | 11 +++++++++++ checks/f5_bigip_vserver | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/.werks/4444 b/.werks/4444 new file mode 100644 index 0000000..fb7e5d3 --- /dev/null +++ b/.werks/4444 @@ -0,0 +1,11 @@ +Title: f5_bigip_vserver: Fixed crash when Service has no params +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1489400639 +Class: fix + +In older version this check had no params. To be compatible with newer +version we need to take care of this circumstance and convert the variable. diff --git a/checks/f5_bigip_vserver b/checks/f5_bigip_vserver index bfaa309..1a72e24 100644 --- a/checks/f5_bigip_vserver +++ b/checks/f5_bigip_vserver @@ -64,6 +64,10 @@ def inventory_f5_bigip_vserver(parsed): def check_f5_bigip_vserver(item, params, parsed): + # Need compatibility to version with _no_params + if params = None + params = {} + if item in parsed: vserver = parsed[item]

7 years, 6 months

fixed wrong titles in ruleset

by Simon Betz

Module: check_mk Branch: master Commit: 5cd7b7e7ba8c5c33e6a2b1122132d15563cc32c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cd7b7e7ba8c5c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 13 11:25:33 2017 +0100 fixed wrong titles in ruleset Change-Id: I120420799ac6b602ec4f2185be5638b68777feb5 --- web/plugins/wato/check_parameters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 090300f..dd343dd 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -13486,7 +13486,7 @@ register_check_parameters( )), ( "levels_5v_lower", Tuple( - title = _("3.3 Volt Output Lower Levels"), + title = _("5 Volt Output Lower Levels"), elements = [ Float(title = _("warning if below or equal"), unit = "V", default_value = 3.25), Float(title = _("critical if below or equal"), unit = "V", default_value = 3.20), @@ -13494,7 +13494,7 @@ register_check_parameters( )), ( "levels_5v_upper", Tuple( - title = _("3.3 Volt Output Upper Levels"), + title = _("5 Volt Output Upper Levels"), elements = [ Float(title = _("warning if above or equal"), unit = "V", default_value = 3.4), Float(title = _("critical if above or equal"), unit = "V", default_value = 3.45),

7 years, 6 months

4516 FIX check_mk_agent.linux: Escaped quotes in run_cached function used for ipmi-sensors command

by Simon Betz

Module: check_mk Branch: master Commit: ec87a5638f626d41562eb9d9445959ca064304af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec87a5638f626d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 13 11:10:31 2017 +0100 4516 FIX check_mk_agent.linux: Escaped quotes in run_cached function used for ipmi-sensors command Change-Id: I15ad587e8a8f68a4ed26c3d90f683391a5b04958 --- .werks/4516 | 11 +++++++++++ agents/check_mk_agent.linux | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4516 b/.werks/4516 new file mode 100644 index 0000000..07ce79c --- /dev/null +++ b/.werks/4516 @@ -0,0 +1,11 @@ +Title: check_mk_agent.linux: Escaped quotes in run_cached function used for ipmi-sensors command +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1489399702 + + diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 5b5c748..cecb049 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -444,7 +444,7 @@ then # At least with ipmi-sensors 0.7.16 this group is Power_Unit instead of "Power Unit" run_cached -s ipmi_sensors 300 "for class in Temperature Power_Unit Fan do - ipmi-sensors $IPMI_FORMAT --sdr-cache-directory /var/cache $IPMI_GROUP_OPT "$class" | sed -e 's/ /_/g' -e 's/:_\?/ /g' -e 's@ $[^(]*$_($[^)]*$)@ \2_\1@' + ipmi-sensors $IPMI_FORMAT --sdr-cache-directory /var/cache $IPMI_GROUP_OPT \"$class\" | sed -e 's/ /_/g' -e 's/:_\?/ /g' -e 's@ $[^(]*$_($[^)]*$)@ \2_\1@' # In case of a timeout immediately leave loop. if [ $? = 255 ] ; then break ; fi done"

7 years, 6 months

← Newer
1
...
16
17
18
19
20
21
22
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017