[checkmk-commits] 3697 sym_brightmail_queues: added support for newer symantec brightmail version

Module: check_mk Branch: master Commit: 7bd18cfdf3d600f1e99bb228508195bb87551116 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bd18cfdf3d600… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Mon Jul 25 16:34:53 2016 +0200 3697 sym_brightmail_queues: added support for newer symantec brightmail version --- .werks/3697 | 9 +++++++++ ChangeLog | 1 + checks/sym_brightmail_queues | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3697 b/.werks/3697 new file mode 100644 index 0000000..5077394 --- /dev/null +++ b/.werks/3697 @@ -0,0 +1,9 @@ +Title: sym_brightmail_queues: added support for newer symantec brightmail version +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1469457007 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b2882a5..394914a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -119,6 +119,7 @@ * 3695 f5_bigip_cluster_v11: Now WATO configurable... NOTE: Please refer to the migration notes! * 2241 check_mk_agent.openwrt: Added section for local scripts and plugins... + * 3697 sym_brightmail_queues: added support for newer symantec brightmail version * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/sym_brightmail_queues b/checks/sym_brightmail_queues index 1d60f49..9bd05f7 100644 --- a/checks/sym_brightmail_queues +++ b/checks/sym_brightmail_queues @@ -106,7 +106,8 @@ check_info["sym_brightmail_queues"] = { "inventory_function" : inventory_sym_brightmail_queues, "service_description" : "Queue %s", "has_perfdata" : False, - "snmp_scan_function" : lambda oid: "el5_sms" in oid(".1.3.6.1.2.1.1.1.0").lower(), + "snmp_scan_function" : lambda oid: "el5_sms" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ + "el6" in oid(".1.3.6.1.2.1.1.1.0").lower(), "snmp_info" : ( ".1.3.6.1.4.1.393.200.130.2", [ "2.1.1.2", # InstanceDescr