Checkmk git commits February 2014

checkmk-commits@lists.checkmk.com

6 participants
141 discussions

Check_MK Git: check_mk: event state in ec: Fixed class of new attribute

by Lars Michelsen

Module: check_mk Branch: master Commit: 7df41ca49e14f53761800eb4642f260e97d0de0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7df41ca49e14f5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 19 09:25:24 2014 +0100 event state in ec: Fixed class of new attribute --- mkeventd/web/plugins/wato/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 2011a7a..e46a025 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1876,7 +1876,7 @@ register_rule( ) ), ( "item", - RegExp( + TextAscii( title = _("Item (Used in service description)"), help = _("If you enter an item name here, this will be used as " "part of the service description after the prefix \"Events \". "

10 years, 6 months

Check_MK Git: check_mk: FIX Service item of " Check event state in event console" checks can now be configured

by Lars Michelsen

Module: check_mk Branch: master Commit: f4a57f158891f5b68aacba737561033a8b49cc5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4a57f158891f5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 19 09:22:30 2014 +0100 FIX Service item of "Check event state in event console" checks can now be configured In the past the application regex was used as part of the service descriptin, which resulted in nagios validation errors in case of regexes, where e.g. "$" signs were used. Now you can use such regexes and define the item option to create a custom item for the service description. --- .werks/672 | 12 ++++++++++++ ChangeLog | 1 + mkeventd/checks/check_mkevents | 5 +++-- mkeventd/web/plugins/wato/mkeventd.py | 14 +++++++++++++- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.werks/672 b/.werks/672 new file mode 100644 index 0000000..27249a9 --- /dev/null +++ b/.werks/672 @@ -0,0 +1,12 @@ +Title: Service item of "Check event state in event console" checks can now be configured +Level: 1 +Component: ec +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1392798026 + +In the past the application regex was used as part of the service descriptin, which + resulted in nagios validation errors in case of regexes, where e.g. "$" signs were +used. Now you can use such regexes and define the item option to create a custom +item for the service description. diff --git a/ChangeLog b/ChangeLog index 03b0ba7..f9afdc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -306,6 +306,7 @@ * 0427 FIX: Fixed exception when handling connections from event unix socket... * 0679 FIX: Allow non-Ascii characters in generated events * 0680 FIX: Do not allow spaces in host names in event simulator... + * 0672 FIX: Service item of "Check event state in event console" checks can now be configured... Livestatus: * 0337 New header for limiting the execution time of a query... diff --git a/mkeventd/checks/check_mkevents b/mkeventd/checks/check_mkevents index 1f322ca..aa9a3f3 100644 --- a/mkeventd/checks/check_mkevents +++ b/mkeventd/checks/check_mkevents @@ -17,8 +17,9 @@ def check_mkevents_arguments(params): return args def check_mkevents_description(params): - if "application" in params: - return "Events %s" % params["application"] + item = params.get('item', params.get('application')) + if item: + return "Events %s" % item else: return "Events" diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 5250f5b..2011a7a 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1875,6 +1875,18 @@ register_rule( default_value = '$HOSTNAME$', ) ), + ( "item", + RegExp( + title = _("Item (Used in service description)"), + help = _("If you enter an item name here, this will be used as " + "part of the service description after the prefix \"Events \". " + "The prefix plus the configured item must result in an unique " + "service description per host. If you leave this empty either the " + "string provided in \"Application\" is used as item or the service " + "gets no item when the \"Application\" field is also not configured."), + allow_empty = False, + ) + ), ( "application", RegExp( title = _("Application (regular expression)"), @@ -1934,7 +1946,7 @@ register_rule( ) ), ], - optional_keys = [ "application", "remote", "ignore_acknowledged" ], + optional_keys = [ "application", "remote", "ignore_acknowledged", "item" ], ), match = 'all', )

10 years, 6 months

Check_MK Git: check_mk: Compiled 64-Bit agent for Windows

by Mathias Kettner

Module: check_mk Branch: master Commit: 68a57dd3340756fbe9a33c1faaf7fd4f82bc88f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68a57dd3340756… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 18 18:19:26 2014 +0100 Compiled 64-Bit agent for Windows --- agents/windows/check_mk_agent-64.exe | Bin 0 -> 190464 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe new file mode 100755 index 0000000..acf48d7 Binary files /dev/null and b/agents/windows/check_mk_agent-64.exe differ

10 years, 7 months

Check_MK Git: check_mk: FIX availability: fixed exception on specific filter settings

by Andreas Boesl

Module: check_mk Branch: master Commit: b6c2178fb05af355efa7c63fa311b0221367556e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6c2178fb05af3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 18 14:56:57 2014 +0100 FIX availability: fixed exception on specific filter settings The generation of the availability data could raise an exception if the "Scheduled Downtimes" filter were set to "Exclude scheduled downtimes" --- .werks/558 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/availability.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/558 b/.werks/558 new file mode 100644 index 0000000..bb71be3 --- /dev/null +++ b/.werks/558 @@ -0,0 +1,10 @@ +Title: availability: fixed exception on specific filter settings +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1392731502 + +The generation of the availability data could raise an exception +if the "Scheduled Downtimes" filter were set to "Exclude scheduled downtimes" diff --git a/ChangeLog b/ChangeLog index a189a00..9a3f495 100644 --- a/ChangeLog +++ b/ChangeLog @@ -223,6 +223,7 @@ * 0278 FIX: Fixed bookmark icon images for non-english user languages... * 0670 FIX: LDAP: Fixed sync when non lower case attributes are configured... * 0671 FIX: LDAP: Disable logging of password changes received from LDAP + * 0558 FIX: availability: fixed exception on specific filter settings... WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 93d2590..eb57cdc 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -645,7 +645,7 @@ def do_render_availability(rows, what, avoptions, timeline, timewarpcode): (avoptions["downtimes"]["exclude_ok"] and state == 0) and not \ avoptions["downtimes"]["include"] == "ignore": if avoptions["downtimes"]["include"] == "exclude": - consider = false + consider = False else: s = "in_downtime" elif span["host_down"] and avoptions["consider"]["host_down"]:

10 years, 7 months

Check_MK Git: check_mk: FIX check_mk_agent.solaris: removed section statgrab mem

by Andreas Boesl

Module: check_mk Branch: master Commit: ff0b718216cd1f4ad4938cae0a600f219b1a71fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff0b718216cd1f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 18 13:32:42 2014 +0100 FIX check_mk_agent.solaris: removed section statgrab mem The data from statgrab_mem section was already provided by the solaris_mem section. <<<statgrab_mem>>> is hereby removed from the check_mk_agent.solaris output. --- .werks/557 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.solaris | 5 +++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/557 b/.werks/557 new file mode 100644 index 0000000..c831707 --- /dev/null +++ b/.werks/557 @@ -0,0 +1,9 @@ +Title: check_mk_agent.solaris: removed section statgrab mem +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1392726543 +Class: fix + +The data from statgrab_mem section was already provided by the solaris_mem section. +<<<statgrab_mem>>> is hereby removed from the check_mk_agent.solaris output. diff --git a/ChangeLog b/ChangeLog index 1931758..a189a00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -178,6 +178,7 @@ * 0667 FIX: oracle_asm_diskgroup: Now really uses the generic filesystem levels... * 0555 FIX: snmp_uptime: no longer fails if uptime is < 1 seconds * 0136 FIX: cisco_fru_power: Prevent inventory of not exsisting devices + * 0557 FIX: check_mk_agent.solaris: removed section statgrab mem... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 89dd922..20a2c51 100644 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -158,8 +158,9 @@ then grep "^$s\." /tmp/statgrab.$$ | cut -d. -f2-99 | sed 's/ *= */ /' done - echo '<<<statgrab_mem>>>' - egrep "^(swap|mem)\." /tmp/statgrab.$$ | sed 's/ *= */ /' +# this info is already provided by solaris_mem +# echo '<<<statgrab_mem>>>' +# egrep "^(swap|mem)\." /tmp/statgrab.$$ | sed 's/ *= */ /' [ -f /tmp/statgrab.$$ ] && rm -f /tmp/statgrab.$$ fi

10 years, 7 months

Check_MK Git: check_mk: fixed syntax errors in check manpages f5_bigip_conns and genua_pfstate

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 1af33d4ea72c27e164781387046c5bc47230cbd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1af33d4ea72c27… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Feb 18 12:43:16 2014 +0100 fixed syntax errors in check manpages f5_bigip_conns and genua_pfstate --- checkman/f5_bigip_conns | 4 ++-- checkman/genua_pfstate | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checkman/f5_bigip_conns b/checkman/f5_bigip_conns index 66688e1..1c5003d 100644 --- a/checkman/f5_bigip_conns +++ b/checkman/f5_bigip_conns @@ -19,8 +19,8 @@ perfdata: [parameters] parameters(dict): parameters is a dictionary with two keys {"conns"} and {"ssl_conns"}. -The keys may be a tuple of warning and critical levels. However, when using predictive levels -via WATO, the keys are dictionaries themselves with several keys and values. + The keys may be a tuple of warning and critical levels. However, when using predictive levels + via WATO, the keys are dictionaries themselves with several keys and values. [configuration] f5_bigip_conns_default_levels(dict): This variable is preset to {{ "conns": ( 25000, 30000 ) }, "ssl_conns": ( 25000, 30000 )} diff --git a/checkman/genua_pfstate b/checkman/genua_pfstate index ecbacbc..80b5c3d 100644 --- a/checkman/genua_pfstate +++ b/checkman/genua_pfstate @@ -28,7 +28,7 @@ inventory: parameters(dict): parameters is a dictionary with one key {"used"}: a tuple of lower warning and critical values for the number -of used PF states + of used PF states [configuration] genua_pfstate_default_levels(dict): This variable is preset to

10 years, 7 months

Check_MK Git: check_mk: updated and enhanced check catalog: some fixes

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 50161b2599d1585a8cfb9580be3490261a8cfd3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50161b2599d158… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Feb 18 10:41:35 2014 +0100 updated and enhanced check catalog: some fixes --- checkman/apc_mod_pdu_modules | 2 +- checkman/cmctc.temp | 2 +- checkman/genua_carp | 2 +- checkman/genua_fan | 2 +- checkman/genua_pfstate | 2 +- checkman/genua_state_correlation | 2 +- checkman/sensatronics_temp | 2 +- checkman/ups_test | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/checkman/apc_mod_pdu_modules b/checkman/apc_mod_pdu_modules index 962e658..102259c 100644 --- a/checkman/apc_mod_pdu_modules +++ b/checkman/apc_mod_pdu_modules @@ -1,6 +1,6 @@ title: APC Modular PDU: Modul Status agents: snmp -catalog: hw/power +catalog: hw/power/apc license: GPL distribution: check_mk description: diff --git a/checkman/cmctc.temp b/checkman/cmctc.temp index 4ab79a5..8302226 100644 --- a/checkman/cmctc.temp +++ b/checkman/cmctc.temp @@ -1,6 +1,6 @@ title: Rittal CMC TC: Temperature agents: snmp -catalog: hw/environment +catalog: hw/environment/rittal license: GPL distribution: check_mk description: diff --git a/checkman/genua_carp b/checkman/genua_carp index 42be42f..6ce15cf 100644 --- a/checkman/genua_carp +++ b/checkman/genua_carp @@ -1,4 +1,4 @@ -title: State of carp interfaces on carp clusters and nodes of genuscreen devices +title: Genuscreen: State of Carp Interfaces on Carp Clusters and Nodes agents: snmp catalog: hw/network/genua license: GPL diff --git a/checkman/genua_fan b/checkman/genua_fan index d5f2387..b3c9c96 100644 --- a/checkman/genua_fan +++ b/checkman/genua_fan @@ -1,4 +1,4 @@ -title: Check for fan state and rpm on genua devices +title: Genuscreen: Fan State and RPM agents: snmp catalog: hw/network/genua license: GPL diff --git a/checkman/genua_pfstate b/checkman/genua_pfstate index dfd5ee9..ecbacbc 100644 --- a/checkman/genua_pfstate +++ b/checkman/genua_pfstate @@ -1,4 +1,4 @@ -title: State of packetfilter engine for genuscreen firewalls +title: Genuscreen: State of Packetfilter Engine agents: snmp catalog: hw/network/genua license: GPL diff --git a/checkman/genua_state_correlation b/checkman/genua_state_correlation index 0005332..3cbff5e 100644 --- a/checkman/genua_state_correlation +++ b/checkman/genua_state_correlation @@ -1,4 +1,4 @@ -title: Correlation of the state of carp interfaces on genuscreen devices +title: Genuscreen: Correlation of the State of Carp Interfaces agents: snmp catalog: hw/network/genua license: GPL diff --git a/checkman/sensatronics_temp b/checkman/sensatronics_temp index cd425e3..fa12576 100644 --- a/checkman/sensatronics_temp +++ b/checkman/sensatronics_temp @@ -1,6 +1,6 @@ title: Sensatronics E4 Temperature sensors agents: snmp -catalog: hw/environment/sensatronic +catalog: hw/environment/sensatronics license: GPL distribution: check_mk description: diff --git a/checkman/ups_test b/checkman/ups_test index 8f3e402..147f62d 100644 --- a/checkman/ups_test +++ b/checkman/ups_test @@ -1,4 +1,4 @@ -title: Generic UPS Device: self test +title: Generic UPS Device: Self Test agents: snmp catalog: hw/power/generic license: GPL

10 years, 7 months

Check_MK Git: check_mk: fixed syntax error in mikrotik_signal check manpage

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 1af68919e2987ac0255912c6488338ef252f570e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1af68919e2987a… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Feb 18 12:15:21 2014 +0100 fixed syntax error in mikrotik_signal check manpage --- checkman/mikrotik_signal | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checkman/mikrotik_signal b/checkman/mikrotik_signal index 65462d3..695303d 100644 --- a/checkman/mikrotik_signal +++ b/checkman/mikrotik_signal @@ -9,9 +9,8 @@ description: It reads the current singnal strenght in decibel and calculates the quality in a scale up to 100. 100 means optimal signal quality. - inventory: One service for each network will be created. [parameters] - Tuple, levels for warn/ crit +parameters(tuple): levels for warn/crit

10 years, 7 months

Check_MK Git: check_mk: updated and enhanced check catalog

by Bernd Stroessenreuther

10 years, 7 months

Check_MK Git: check_mk: esx_vsphere_counters.diskio: now also shows disk latency

by Andreas Boesl

Module: check_mk Branch: master Commit: c2ab83d35666ffab99e551a3fc8bb692ddd4dcf4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2ab83d35666ff… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 17 16:20:54 2014 +0100 esx_vsphere_counters.diskio: now also shows disk latency --- .werks/556 | 8 ++++++++ ChangeLog | 1 + checks/esx_vsphere_counters | 9 ++++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/556 b/.werks/556 new file mode 100644 index 0000000..378740a --- /dev/null +++ b/.werks/556 @@ -0,0 +1,8 @@ +Title: esx_vsphere_counters.diskio: now also shows disk latency +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1392650420 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b66d930..1931758 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,7 @@ * 0701 emc_isilon_diskstatus: new check for Status of Disks in EMC Isilon Storage Systems * 0581 emc_datadomain_disks emc_datadomain_fs: new checks to monitor disks and filesystems of EMC Datadomain * 0718 logwatch.ec: Optionally monitor the list of forwarded logfiles... + * 0556 esx_vsphere_counters.diskio: now also shows disk latency * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index 58f7385..89941be 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -77,6 +77,7 @@ def inventory_esx_vsphere_counters_diskio(info): def check_esx_vsphere_counters_diskio(_no_item, _no_params, info): reads = 0 writes = 0 + latency = 0 for counter, item, value, unit in info: if item == '': if counter == 'disk.read': @@ -87,10 +88,12 @@ def check_esx_vsphere_counters_diskio(_no_item, _no_params, info): reads += int(value) elif counter == 'disk.numberWrite': writes += int(value) + elif counter == 'disk.deviceLatency': + latency = max(latency, int(value)) - return 0, "%s/sec read, %s/sec write, IOs: %.2f/sec" % ( - get_bytes_human_readable(read_bytes), get_bytes_human_readable(write_bytes), reads + writes,), \ - [ ("read", read_bytes), ("write", write_bytes), ("ios", reads + writes) ] + return 0, "%s/sec read, %s/sec write, IOs: %.2f/sec, latency: %d ms" % ( + get_bytes_human_readable(read_bytes), get_bytes_human_readable(write_bytes), reads + writes, latency), \ + [ ("read", read_bytes), ("write", write_bytes), ("ios", reads + writes), ("latency" , latency) ] check_info['esx_vsphere_counters.diskio'] = {

10 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2014