Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: #1695 FIX brocade_vdx_status: Is now not bein inventorized anymore for devices not supporting the check

by Lars Michelsen

Module: check_mk Branch: master Commit: 28aaa9de8426490f3e8add2b591354113db23a34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28aaa9de842649… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 09:15:58 2014 +0100 #1695 FIX brocade_vdx_status: Is now not bein inventorized anymore for devices not supporting the check --- .werks/1695 | 9 +++++++++ ChangeLog | 1 + checks/brocade_vdx_status | 8 ++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/1695 b/.werks/1695 new file mode 100644 index 0000000..f5e2b42 --- /dev/null +++ b/.werks/1695 @@ -0,0 +1,9 @@ +Title: brocade_vdx_status: Is now not bein inventorized anymore for devices not supporting the check +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418112916 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 5cf17a7..de3b50c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -133,6 +133,7 @@ * 1713 FIX: check_fstab_mounts: now correctly ignores swap space... * 1716 FIX: windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now * 1721 FIX: dell_om_mem: Handle formerly unhandled situations with multiple errors... + * 1695 FIX: brocade_vdx_status: Is now not bein inventorized anymore for devices not supporting the check Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/brocade_vdx_status b/checks/brocade_vdx_status index b6eecda..1f9d6a4 100644 --- a/checks/brocade_vdx_status +++ b/checks/brocade_vdx_status @@ -53,8 +53,12 @@ check_info["brocade_vdx_status"] = { "check_function" : check_brocade_vdx_status, "inventory_function" : inventory_brocade_vdx_status, "service_description" : "Status", - "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0').startswith( ".1.3.6.1.4.1.1588") and - not oid('.1.3.6.1.2.1.1.2.0').startswith( ".1.3.6.1.4.1.1588.2.1.1.1"), + # It does not seem to work to exclude several OIDs here, there seem + # to be too many devices which do not have the needed OIDs. We try + # another approach: check for existance of the first needed OID + #not oid('.1.3.6.1.2.1.1.2.0').startswith( ".1.3.6.1.4.1.1588.2.1.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") \ + and oid(".1.3.6.1.4.1.1588.2.1.1.1.1.6") != None, "snmp_info" : ( ".1.3.6.1.4.1.1588.2.1.1.1.1", [ 6, # Firmware 7 # Status

9 years, 9 months

Check_MK Git: check_mk: #1696 FIX cisco_temp_sensor: Cleaned up value scaling (precision) code in check, should be more robust now

by Lars Michelsen

Module: check_mk Branch: master Commit: 4986baf89db74091f5566811a07e6eb6af2b8892 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4986baf89db740… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 09:33:03 2014 +0100 #1696 FIX cisco_temp_sensor: Cleaned up value scaling (precision) code in check, should be more robust now --- .werks/1696 | 9 +++++++++ ChangeLog | 1 + checks/cisco_temp_sensor | 27 ++++++++++----------------- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.werks/1696 b/.werks/1696 new file mode 100644 index 0000000..ff0705d --- /dev/null +++ b/.werks/1696 @@ -0,0 +1,9 @@ +Title: cisco_temp_sensor: Cleaned up value scaling (precision) code in check, should be more robust now +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418113954 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index de3b50c..133ca5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -134,6 +134,7 @@ * 1716 FIX: windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now * 1721 FIX: dell_om_mem: Handle formerly unhandled situations with multiple errors... * 1695 FIX: brocade_vdx_status: Is now not bein inventorized anymore for devices not supporting the check + * 1696 FIX: cisco_temp_sensor: Cleaned up value scaling (precision) code in check, should be more robust now Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/cisco_temp_sensor b/checks/cisco_temp_sensor index cb49d6c..8a61ccc 100644 --- a/checks/cisco_temp_sensor +++ b/checks/cisco_temp_sensor @@ -116,27 +116,19 @@ def parse_cisco_temp_sensor(info): # Create dict with thresholds thresholds = {} - for id, sensortype, value, sensorstate in state_info: - thresholds.setdefault(id, []) + for id, sensortype, precision, value, sensorstate in state_info: + thresholds.setdefault(id, []) - for endoid, levels in levels_info: - # endoid is e.g. 21549.9 or 21459.10 - level = saveint(levels) - if level > 150: - level = level / 10 - id, subid = endoid.split('.') - thresholds.setdefault(id, []).append(level) + for endoid, level in levels_info: + level = int(level)*(10**int(precision)) + # endoid is e.g. 21549.9 or 21459.10 + id, subid = endoid.split('.') + thresholds.setdefault(id, []).append(level) # Create main dictionary (only of temperature sensors) sensors = [] - for id, sensortype, value, sensorstate in state_info: - # Poor try to find temperature values, which are given in tenths of degrees. - # Seems that some new firmware shows this behaviour. - # A normal temperature sensor has only a range up to - # 60 degree, so we've chosen 150. - value = saveint(value) - if value > 150: - value = value / 10 + for id, sensortype, precision, value, sensorstate in state_info: + value = int(value)*(10**int(precision)) sensors.append( ( id, descriptions.get(id), sensortype, value, sensorstate, thresholds[id] ) ) return sensors @@ -187,6 +179,7 @@ check_info['cisco_temp_sensor'] = { ( ".1.3.6.1.4.1.9.9.91.1.1.1.1", [ OID_END, 1, # Type (see above), 8 = Celsius, 12 = truth value + 3, # Precision 4, # Most recent measurement 5, # Status of the sensor 1 == ok, 2 == cannot report, 3 == broken ]),

9 years, 9 months

Check_MK Git: check_mk: Updated werk texts

by Lars Michelsen

Module: check_mk Branch: master Commit: 930c06ec8e7170995d476a0da8cbd32371eba657 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=930c06ec8e7170… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 09:34:45 2014 +0100 Updated werk texts --- .werks/1696 | 6 ++++-- ChangeLog | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.werks/1696 b/.werks/1696 index ff0705d..f06e774 100644 --- a/.werks/1696 +++ b/.werks/1696 @@ -1,4 +1,4 @@ -Title: cisco_temp_sensor: Cleaned up value scaling (precision) code in check, should be more robust now +Title: cisco_temp_sensor: Value reported of check was not always correct (precision was wrong) Level: 1 Component: checks Compatible: compat @@ -6,4 +6,6 @@ Version: 1.2.5i7 Date: 1418113954 Class: fix - +We already had a workaround to get the correct precision of the value reported by the device, +but this code was kind of a hack. No we retrieve the precision value from the target device +and then scale the value according to it. diff --git a/ChangeLog b/ChangeLog index 133ca5c..c7f0ef4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -134,7 +134,7 @@ * 1716 FIX: windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now * 1721 FIX: dell_om_mem: Handle formerly unhandled situations with multiple errors... * 1695 FIX: brocade_vdx_status: Is now not bein inventorized anymore for devices not supporting the check - * 1696 FIX: cisco_temp_sensor: Cleaned up value scaling (precision) code in check, should be more robust now + * 1696 FIX: cisco_temp_sensor: Value reported of check was not always correct (precision was wrong)... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results...

9 years, 9 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by Bastian Kuhn

Module: check_mk Branch: master Commit: 79a4ac6dec346dfffa511d8696a51702d4638912 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79a4ac6dec346d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Dec 9 09:17:41 2014 +0100 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 9813cea..faf7b61 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2272 +2282

9 years, 9 months

Check_MK Git: check_mk: #1694 cisco_wlc/cisco_wlc_clients:

by Lars Michelsen

Added support for Cisco AIR-CT2504-K9 Message-ID: <5486abda.BblZ4mjtp89NhHsv%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: c851cb37a835c9607cb1aeb552dbb1ab2b5ee096 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c851cb37a835c9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 08:59:18 2014 +0100 #1694 cisco_wlc/cisco_wlc_clients: Added support for Cisco AIR-CT2504-K9 --- .werks/1694 | 9 +++++++++ ChangeLog | 1 + checks/cisco_wlc | 3 ++- checks/cisco_wlc_clients | 3 ++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/1694 b/.werks/1694 new file mode 100644 index 0000000..145f932 --- /dev/null +++ b/.werks/1694 @@ -0,0 +1,9 @@ +Title: cisco_wlc/cisco_wlc_clients: Added support for Cisco AIR-CT2504-K9 +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418111935 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 51a278d..5cf17a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ * 1699 Windows agent: new option "file" for writing output into a file... * 1684 cisco_vpn_tunnel: Now supporting VPN 3000 Conncentrator devices * 1685 enterasys_*: Now supporting device C2G124-48 (Rev 05.02.18.0002) + * 1694 cisco_wlc/cisco_wlc_clients: Added support for Cisco AIR-CT2504-K9 * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/checks/cisco_wlc b/checks/cisco_wlc index a948dae..4b4688a 100644 --- a/checks/cisco_wlc +++ b/checks/cisco_wlc @@ -76,7 +76,8 @@ check_info["cisco_wlc"] = { "node_info" : True, "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') in [".1.3.6.1.4.1.9.1.1069", ".1.3.6.1.4.1.14179.1.1.4.3", - ".1.3.6.1.4.1.9.1.1645"], + ".1.3.6.1.4.1.9.1.1645", + ".1.3.6.1.4.1.9.1.1279"], "snmp_info" : [( ".1.3.6.1.4.1.14179.2.2.1.1.3", [ OID_END, '' ]), ( ".1.3.6.1.4.1.14179.2.2.1.1.1", [ OID_END, '' ]), ( ".1.3.6.1.4.1.14179.2.2.1.1.6", [ OID_END, '' ]), diff --git a/checks/cisco_wlc_clients b/checks/cisco_wlc_clients index d37379d..1a7b4bf 100644 --- a/checks/cisco_wlc_clients +++ b/checks/cisco_wlc_clients @@ -73,7 +73,8 @@ check_info["cisco_wlc_clients"] = { "group" : "wlc_clients", "has_perfdata" : True, "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') in [".1.3.6.1.4.1.9.1.1069", - ".1.3.6.1.4.1.9.1.1645"], + ".1.3.6.1.4.1.9.1.1645", + ".1.3.6.1.4.1.9.1.1279"], "snmp_info" : ( ".1.3.6.1.4.1.14179.2.1.1.1", [ 2, 42, 38 ]), }

9 years, 9 months

Check_MK Git: check_mk: Added note to badly written check plugin

by Mathias Kettner

Module: check_mk Branch: master Commit: c8402e1d3ca5cdf0b26c6e0d13c01154497c9e4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8402e1d3ca5cd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 9 08:48:42 2014 +0100 Added note to badly written check plugin --- checks/apc_symmetra_test | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/apc_symmetra_test b/checks/apc_symmetra_test index aa8d882..25f297e 100644 --- a/checks/apc_symmetra_test +++ b/checks/apc_symmetra_test @@ -53,6 +53,8 @@ # import datetime +# What the F**k! Importing of module is absolutely discouraged in checks. +# Also we use time in check_mk, not datetime. ups_test_default = ( 0, 0 )

9 years, 9 months

Check_MK Git: check_mk: Thanks to Hermann Maurer.

by Mathias Kettner

Module: check_mk Branch: master Commit: f64c6fb215f313e8b935d8cec2b3f4ad03816595 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f64c6fb215f313… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 22:41:53 2014 +0100 Thanks to Hermann Maurer. --- .werks/1721 | 9 ++++++++ ChangeLog | 1 + checks/dell_om_mem | 64 ++++++++++++++++++++++++++++------------------------ 3 files changed, 44 insertions(+), 30 deletions(-) diff --git a/.werks/1721 b/.werks/1721 new file mode 100644 index 0000000..d922ed3 --- /dev/null +++ b/.werks/1721 @@ -0,0 +1,9 @@ +Title: dell_om_mem: Handle formerly unhandled situations with multiple errors +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418074869 +Class: fix + +Thanks for the bug report to Hermann Maurer. diff --git a/ChangeLog b/ChangeLog index e09711c..51a278d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,7 @@ * 1712 FIX: hyper_vms: fixed for snapshot VMs with (...) in their names... * 1713 FIX: check_fstab_mounts: now correctly ignores swap space... * 1716 FIX: windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now + * 1721 FIX: dell_om_mem: Handle formerly unhandled situations with multiple errors... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/dell_om_mem b/checks/dell_om_mem index 3ed4562..4122758 100644 --- a/checks/dell_om_mem +++ b/checks/dell_om_mem @@ -27,52 +27,56 @@ def inventory_dell_om_mem(info): return [ (x[0], None) for x in info ] +# DellMemoryDeviceFailureModes ::= INTEGER { +# -- Note: These values are bit masks, so combination values are possible. +# -- If value is 0 (zero), memory device has no faults. +# eccSingleBitCorrectionWarningRate(1), -- ECC single bit correction warning rate exceeded +# eccSingleBitCorrectionFailureRate(2), -- ECC single bit correction failure rate exceeded +# eccMultiBitFault(4), -- ECC multibit fault encountered +# eccSingleBitCorrectionLoggingDisabled(8), -- ECC single bit correction logging disabled +# deviceDisabledBySpareActivation(16) -- device disabled because of spare activation + + def check_dell_om_mem(item, _no_params, info): - failure_mode = { - 0 : 'No failure', - 1 : 'ECC single bit correction warning rate exceeded', - 2 : 'ECC single bit correction failure rate exceeded', - 4 : 'ECC multibit fault encountered', - 8 : 'ECC single bit correction logging disabled', + failure_modes = { + 1 : 'ECC single bit correction warning rate exceeded', + 2 : 'ECC single bit correction failure rate exceeded', + 4 : 'ECC multibit fault encountered', + 8 : 'ECC single bit correction logging disabled', 16 : 'device disabled because of spare activation', } for location, status, size, failuremode in info: if location == item: - status = saveint(status) - failuremode = saveint(failuremode) - state = 0 - msg = "" - if status != 3: - state = 2 - msg = "Modul State is %s(!!), " % status - label = "" - if failuremode in [ 2, 4 ]: - state = 2 - label = "(!!)" - elif failuremode in [ 1, 8, 16 ]: - state = 1 - label = "(!)" - - size = get_bytes_human_readable(int(size)*1024) - return state, msg + "Failuremode: %s%s, Size: %s" % \ - (failure_mode[failuremode], label, size) + status = int(status) + failuremode = int(failuremode) + if failuremode == 0: + yield 0, "No failure" + else: + bitmask = 1 + while bitmask <= 16: + if failuremode & bitmask != 0: + if bitmask in [2, 4]: + yield 2, failure_modes[bitmask] + elif bitmask in [1, 8, 16]: + yield 1, failure_modes[bitmask] + bitmask *= 2 + yield 0, "Size: %s" % get_bytes_human_readable(int(size) * 1024) - return 3, "Module not found in SNMP tree" check_info["dell_om_mem"] = { "check_function" : check_dell_om_mem, "inventory_function" : inventory_dell_om_mem, - "service_description" : "Module %s", + "service_description" : "Memory Module %s", "has_perfdata" : False, # There is no other way to find out that openmanage is present. "snmp_scan_function" : scan_dell_om, "snmp_info" : ( ".1.3.6.1.4.1.674.10892.1.1100.50.1", [ - "8.1", #Location - "5.1", #Status - "14.1", #Size - "20.1", #FailureMode + "8.1", # Location + "5.1", # Status + "14.1", # Size + "20.1", # FailureMode ]), "includes" : [ "dell_om.include" ], }

9 years, 9 months

Check_MK Git: check_mk: #1721 FIX dell_om_mem: Handle formerly unhandled status code 3 ( ECC single bit correction failure rate exceeded)

by Mathias Kettner

Module: check_mk Branch: master Commit: dc13e6b9a3de1397a0e24ac6b221ac715fcffcd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc13e6b9a3de13… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 22:41:53 2014 +0100 #1721 FIX dell_om_mem: Handle formerly unhandled status code 3 (ECC single bit correction failure rate exceeded) Thanks to Hermann Maurer. --- .werks/1721 | 9 +++++++++ ChangeLog | 1 + checks/dell_om_mem | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1721 b/.werks/1721 new file mode 100644 index 0000000..9d645f9 --- /dev/null +++ b/.werks/1721 @@ -0,0 +1,9 @@ +Title: dell_om_mem: Handle formerly unhandled status code 3 (ECC single bit correction failure rate exceeded) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418074869 +Class: fix + +Thanks to Hermann Maurer. diff --git a/ChangeLog b/ChangeLog index e09711c..5bb1085 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,7 @@ * 1712 FIX: hyper_vms: fixed for snapshot VMs with (...) in their names... * 1713 FIX: check_fstab_mounts: now correctly ignores swap space... * 1716 FIX: windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now + * 1721 FIX: dell_om_mem: Handle formerly unhandled status code 3 (ECC single bit correction failure rate exceeded)... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/dell_om_mem b/checks/dell_om_mem index 3ed4562..ccf51d2 100644 --- a/checks/dell_om_mem +++ b/checks/dell_om_mem @@ -32,6 +32,7 @@ def check_dell_om_mem(item, _no_params, info): 0 : 'No failure', 1 : 'ECC single bit correction warning rate exceeded', 2 : 'ECC single bit correction failure rate exceeded', + 3 : 'ECC single bit correction failure rate exceeded', 4 : 'ECC multibit fault encountered', 8 : 'ECC single bit correction logging disabled', 16 : 'device disabled because of spare activation', @@ -47,7 +48,7 @@ def check_dell_om_mem(item, _no_params, info): state = 2 msg = "Modul State is %s(!!), " % status label = "" - if failuremode in [ 2, 4 ]: + if failuremode in [ 2, 4, 3 ]: state = 2 label = "(!!)" elif failuremode in [ 1, 8, 16 ]:

9 years, 9 months

Check_MK Git: check_mk: #1718 Show groups of regex match of events in details views of Event Console

by Mathias Kettner

Module: check_mk Branch: master Commit: 5a67a618742930bf6b4663a649045963e1442cb2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a67a618742930… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 21:48:19 2014 +0100 #1718 Show groups of regex match of events in details views of Event Console --- .werks/1718 | 9 +++++++++ ChangeLog | 1 + mkeventd/web/plugins/views/mkeventd.py | 19 +++++++++++++++++++ web/htdocs/status.css | 10 ++++++++++ 4 files changed, 39 insertions(+) diff --git a/.werks/1718 b/.werks/1718 new file mode 100644 index 0000000..5daef04 --- /dev/null +++ b/.werks/1718 @@ -0,0 +1,9 @@ +Title: Show groups of regex match of events in details views of Event Console +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.5i7 +Date: 1418071673 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 9286c23..59e40f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -252,6 +252,7 @@ Event Console: * 1169 Added host state type filter to "recent event history" view + * 1718 Show groups of regex match of events in details views of Event Console * 1531 FIX: Fixed exception in event history view when displaying CHANGESTATE events * 1610 FIX: Hostname translation now also works for incoming SNMP traps * 1643 FIX: Improved error handling of exceptions when processing log lines diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index f30494e..d6643d3 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -334,6 +334,23 @@ if mkeventd_enabled: "paint" : lambda row: ("", row["event_text"].replace("\x01"," ")), } + def paint_ec_match_groups(row): + groups = row["event_match_groups"] + if groups: + code = "" + for text in groups: + code += '%s' % text + return "matchgroups", code + else: + return "", "" + + multisite_painters["event_match_groups"] = { + "title" : _("Match Groups"), + "short" : _("Match"), + "columns" : ["event_match_groups"], + "paint" : paint_ec_match_groups, + } + multisite_painters["event_first"] = { "title" : _("Time of first occurrance of this serial"), "short" : _("First"), @@ -906,6 +923,7 @@ if mkeventd_enabled: ('host_contacts', None, ''), ('host_icons', None, ''), ('event_text', None, ''), + ('event_match_groups', None, ''), ('event_comment', None, ''), ('event_owner', None, ''), ('event_first', None, ''), @@ -1002,6 +1020,7 @@ if mkeventd_enabled: ('event_state', None, ''), ('event_host', 'ec_history_of_host', ''), ('event_text', None, ''), + ('event_match_groups', None, ''), ('event_comment', None, ''), ('event_owner', None, ''), ('event_first', None, ''), diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 0631c30..4836d29 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -397,3 +397,13 @@ table.data tr.data td table.customvars td:last-child { border-left: 1px solid #bbb; padding-left: 5px; } + +td.matchgroups span { + margin-right: 3px; + background-color: #ffffff; + border: 1px solid #eeeeee; + border-radius: 3px; + box-shadow: 0px 0px 1px #888; + padding: 0px 3px; + font-family: monospace; +}

9 years, 9 months

Check_MK Git: check_mk: #1719 Allow to allow both host name and IP address when checking for events in Event Console

by Mathias Kettner

Module: check_mk Branch: master Commit: 3821ae6d250e93dd2fe33b511d44503211bd291b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3821ae6d250e93… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 22:22:41 2014 +0100 #1719 Allow to allow both host name and IP address when checking for events in Event Console The check Check for events in Event Console used to allow either a match for the host name or the IP address when trying to find events that belong to a monitored host. Now there is a new third option Try both host name and IP address that will try to match the host name and the IP address at the same time and will match the event if one of both matches succeeds. This helps in situations where the Event Console sometimes just gets the IP address of the remote host correctly, but has no host name. --- .werks/1719 | 15 ++++++++++++ ChangeLog | 1 + mkeventd/lib/check_mkevents.cc | 41 +++++++++++++++++++++++++++------ mkeventd/web/plugins/wato/mkeventd.py | 8 ++++--- 4 files changed, 55 insertions(+), 10 deletions(-) diff --git a/.werks/1719 b/.werks/1719 new file mode 100644 index 0000000..a5d2b48 --- /dev/null +++ b/.werks/1719 @@ -0,0 +1,15 @@ +Title: Allow to allow both host name and IP address when checking for events in Event Console +Level: 2 +Component: ec +Compatible: compat +Version: 1.2.5i7 +Date: 1418073600 +Class: feature + +The check Check for events in Event Console used to allow either a +match for the host name or the IP address when trying to find events that +belong to a monitored host. Now there is a new third option Try both +host name and IP address that will try to match the host name and the +IP address at the same time and will match the event if one of both matches +succeeds. This helps in situations where the Event Console sometimes just +gets the IP address of the remote host correctly, but has no host name. diff --git a/ChangeLog b/ChangeLog index 59e40f5..5ac7b22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -253,6 +253,7 @@ Event Console: * 1169 Added host state type filter to "recent event history" view * 1718 Show groups of regex match of events in details views of Event Console + * 1719 Allow to allow both host name and IP address when checking for events in Event Console... * 1531 FIX: Fixed exception in event history view when displaying CHANGESTATE events * 1610 FIX: Hostname translation now also works for incoming SNMP traps * 1643 FIX: Improved error handling of exceptions when processing log lines diff --git a/mkeventd/lib/check_mkevents.cc b/mkeventd/lib/check_mkevents.cc index 4d54be5..c9bcfeb 100644 --- a/mkeventd/lib/check_mkevents.cc +++ b/mkeventd/lib/check_mkevents.cc @@ -47,6 +47,26 @@ void usage() { printf("Usage: check_mkevents [-s SOCKETPATH] [-H REMOTE:PORT] [-a] HOST [APPLICATION]"); printf("\n -a do not take into account acknowledged events.\n"); + printf(" HOST may be a hostname, and IP address or hostname/IP-address.\n"); +} + + +string prepare_hostname_regex(const char *s) +{ + const char *scan = s; + string result = ""; + while (*scan) { + if (strchr("[](){}^$.*+?|\\", *scan)) { + result += "\\"; + result += *scan; + } + else if (*scan == '/') + result += "|"; + else + result += *scan; + scan ++; + } + return result; } @@ -174,15 +194,22 @@ int main(int argc, char** argv) // Create query message string query_message; - query_message.append("GET events\nFilter: event_host =~ "); - query_message.append(host); - query_message.append("\nFilter: event_phase in open ack\n"); - query_message.append("OutputFormat: plain\n"); + query_message += "GET events\nFilter: event_host "; + if (strchr(host, '/')) { + query_message += "~~ "; + query_message += prepare_hostname_regex(host); + } + else { + query_message += "=~ "; + query_message += host; + } + query_message += "\nFilter: event_phase in open ack\n"; + query_message += "OutputFormat: plain\n"; if (application) { - query_message.append("Filter: event_application ~~ "); - query_message.append(application); - query_message.append("\n"); + query_message += "Filter: event_application ~~ "; + query_message += application; + query_message += "\n"; } // Send message diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 298146f..bbd54ab 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1947,11 +1947,13 @@ register_rule( "host. This is needed in cases where the event source (syslog, snmptrapd) " "do not send a host name that matches the monitoring host name."), choices = [ - ( '$HOSTNAME$', _("Monitoring Host name") ), - ( '$HOSTADDRESS$', _("Host IP Address" ) ) ], + ( '$HOSTNAME$', _("Monitoring host name") ), + ( '$HOSTADDRESS$', _("Host IP address" ) ), + ( '$HOSTNAME$/$HOSTADDRESS$', _("Try both host name and IP address" ) ), + ], otherlabel = _("Specify explicitly"), explicit = TextAscii(allow_empty = False, attrencode = True), - default_value = '$HOSTNAME$', + default_value = '$HOSTNAME$/$HOSTADDRESS$', ) ), ( "item",

9 years, 9 months

← Newer
1
...
21
22
23
24
25
26
27
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014