[checkmk-commits] Check_MK Git: check_mk: cmciii_access cmciii_io cmciii_psm_current cmciii_psm_plugs: Support other firmeware versions as well

Module: check_mk Branch: master Commit: e304bdc6d5247363a9e6546dfdb68ce5da77dab4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e304bdc6d52473… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Wed Dec 18 12:20:49 2013 +0100 cmciii_access cmciii_io cmciii_psm_current cmciii_psm_plugs: Support other firmeware versions as well Some of the devices are named <tt>Rittal CMC-III-PU</tt> instead of <tt>Rittal CMC III PU</tt>. Those are now also detected by the SNM scan. --- .werks/396 | 11 +++++++++++ ChangeLog | 1 + checks/cmciii_access | 2 +- checks/cmciii_io | 2 +- checks/cmciii_psm_current | 2 +- checks/cmciii_psm_plugs | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.werks/396 b/.werks/396 new file mode 100644 index 0000000..79c4f4a --- /dev/null +++ b/.werks/396 @@ -0,0 +1,11 @@ +Title: cmciii_access cmciii_io cmciii_psm_current cmciii_psm_plugs: Support other firmeware versions as well +Level: 1 +Component: checks +Class: feature +State: unknown +Version: 1.2.5i1 +Date: 1387365574 +Targetversion: future + +Some of the devices are named <tt>Rittal CMC-III-PU</tt> instead of <tt>Rittal +CMC III PU</tt>. Those are now also detected by the SNM scan. diff --git a/ChangeLog b/ChangeLog index 833dab6..894ed98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * 0377 check_http: Certificate Age mode now supports SNI... * 0317 emc_isilon: New checks for EMC Isilon Storage System * 0395 cmctc.temp: also detect older CMC devices + * 0396 cmciii_access cmciii_io cmciii_psm_current cmciii_psm_plugs: Support other firmeware versions as well... * 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/cmciii_access b/checks/cmciii_access index cd855d4..90ac668 100644 --- a/checks/cmciii_access +++ b/checks/cmciii_access @@ -56,7 +56,7 @@ check_info['cmciii_access'] = { "inventory_function" : inventory_cmciii_access, "has_perfdata" : False, "service_description" : "%s", - "snmp_scan_function" : lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0"), + "snmp_scan_function" : lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0").replace("-", " "), "snmp_info" : [ [".1.3.6.1.4.1.2606.7.4.2.2.1", [ "10", OID_END ] ], [".1.3.6.1.4.1.2606.7.4.1.2.1", ( "2", "3" ) ] diff --git a/checks/cmciii_io b/checks/cmciii_io index 8b5bb5c..3c42296 100644 --- a/checks/cmciii_io +++ b/checks/cmciii_io @@ -76,7 +76,7 @@ check_info['cmciii_io'] = { "inventory_function" : inventory_cmciii_io, "has_perfdata" : False, "service_description" : "IO Unit %s", - "snmp_scan_function" : lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0"), + "snmp_scan_function" : lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0").replace("-", " "), "snmp_info" : ( ".1.3.6.1.4.1.2606.7.4.2.2.1.10", [OID_END]+range(1,9) # read complete subtree :( ) diff --git a/checks/cmciii_psm_current b/checks/cmciii_psm_current index b2c8bff..57eedbb 100644 --- a/checks/cmciii_psm_current +++ b/checks/cmciii_psm_current @@ -65,7 +65,7 @@ check_info['cmciii_psm_current'] = { "inventory_function" : inventory_cmciii_psm_current, "has_perfdata" : True, "service_description" : "PSM %s", - "snmp_scan_function" : lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0"), + "snmp_scan_function" : lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0").replace("-", " "), "snmp_info" : ( ".1.3.6.1.4.1.2606.7.4.2.2.1.10", [OID_END]+range(1,9) # read complete subtree :( ) diff --git a/checks/cmciii_psm_plugs b/checks/cmciii_psm_plugs index 7f5131c..544790e 100644 --- a/checks/cmciii_psm_plugs +++ b/checks/cmciii_psm_plugs @@ -61,7 +61,7 @@ check_info['cmciii_psm_plugs'] = { "inventory_function" : inventory_cmciii_psm_plugs, "has_perfdata" : False, "service_description" : "PSM Plug %s", - "snmp_scan_function" : lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0"), + "snmp_scan_function" : lambda oid: "Rittal CMC III PU" in oid(".1.3.6.1.2.1.1.1.0").replace("-", " "), "snmp_info" : ( ".1.3.6.1.4.1.2606.7.4.2.2.1.10", [OID_END]+range(1,6) # read complete subtree :( )