diff --git a/ZenPacks.community.IBMSystemxIMM/EGG-INFO/PKG-INFO b/ZenPacks.community.IBMSystemxIMM/EGG-INFO/PKG-INFO new file mode 100644 index 0000000..060ab2a --- /dev/null +++ b/ZenPacks.community.IBMSystemxIMM/EGG-INFO/PKG-INFO @@ -0,0 +1,10 @@ +Metadata-Version: 1.0 +Name: ZenPacks.community.IBMSystemxIMM +Version: 1.0.0 +Summary: UNKNOWN +Home-page: UNKNOWN +Author: IBM +Author-email: UNKNOWN +License: UNKNOWN +Description: UNKNOWN +Platform: UNKNOWN diff --git a/ZenPacks.community.IBMSystemxIMM/EGG-INFO/SOURCES.txt b/ZenPacks.community.IBMSystemxIMM/EGG-INFO/SOURCES.txt new file mode 100644 index 0000000..ec3b7c2 --- /dev/null +++ b/ZenPacks.community.IBMSystemxIMM/EGG-INFO/SOURCES.txt @@ -0,0 +1,83 @@ +MANIFEST.in +README.txt +setup.py +ZenPacks/__init__.py +ZenPacks/__init__.pyc +ZenPacks.community.IBMSystemxIMM.egg-info/PKG-INFO +ZenPacks.community.IBMSystemxIMM.egg-info/SOURCES.txt +ZenPacks.community.IBMSystemxIMM.egg-info/dependency_links.txt +ZenPacks.community.IBMSystemxIMM.egg-info/entry_points.txt +ZenPacks.community.IBMSystemxIMM.egg-info/namespace_packages.txt +ZenPacks.community.IBMSystemxIMM.egg-info/not-zip-safe +ZenPacks.community.IBMSystemxIMM.egg-info/test_info.txt +ZenPacks.community.IBMSystemxIMM.egg-info/top_level.txt +ZenPacks.community.IBMSystemxIMM.egg-info/zenpack_info +ZenPacks/community/__init__.py +ZenPacks/community/__init__.pyc +ZenPacks/community/IBMSystemxIMM/IMMComponentLog.py +ZenPacks/community/IBMSystemxIMM/IMMComponentLog.pyc +ZenPacks/community/IBMSystemxIMM/IMMComponentVpd.py +ZenPacks/community/IBMSystemxIMM/IMMComponentVpd.pyc +ZenPacks/community/IBMSystemxIMM/IMMCpuVpd.py +ZenPacks/community/IBMSystemxIMM/IMMCpuVpd.pyc +ZenPacks/community/IBMSystemxIMM/IMMDevice.py +ZenPacks/community/IBMSystemxIMM/IMMDevice.pyc +ZenPacks/community/IBMSystemxIMM/IMMFanMon.py +ZenPacks/community/IBMSystemxIMM/IMMFanMon.pyc +ZenPacks/community/IBMSystemxIMM/IMMFwVpd.py +ZenPacks/community/IBMSystemxIMM/IMMFwVpd.pyc +ZenPacks/community/IBMSystemxIMM/IMMMemVpd.py +ZenPacks/community/IBMSystemxIMM/IMMMemVpd.pyc +ZenPacks/community/IBMSystemxIMM/IMMVoltMon.py +ZenPacks/community/IBMSystemxIMM/IMMVoltMon.pyc +ZenPacks/community/IBMSystemxIMM/__init__.py +ZenPacks/community/IBMSystemxIMM/__init__.pyc +ZenPacks/community/IBMSystemxIMM/__init__.pyo +ZenPacks/community/IBMSystemxIMM/configure.zcml +ZenPacks/community/IBMSystemxIMM/info.py +ZenPacks/community/IBMSystemxIMM/info.pyc +ZenPacks/community/IBMSystemxIMM/interfaces.py +ZenPacks/community/IBMSystemxIMM/interfaces.pyc +ZenPacks/community/IBMSystemxIMM/datasources/__init__.py +ZenPacks/community/IBMSystemxIMM/datasources/__init__.pyo +ZenPacks/community/IBMSystemxIMM/lib/__init__.py +ZenPacks/community/IBMSystemxIMM/lib/__init__.pyo +ZenPacks/community/IBMSystemxIMM/migrate/__init__.py +ZenPacks/community/IBMSystemxIMM/migrate/__init__.pyo +ZenPacks/community/IBMSystemxIMM/modeler/__init__.py +ZenPacks/community/IBMSystemxIMM/modeler/__init__.pyc +ZenPacks/community/IBMSystemxIMM/modeler/__init__.pyo +ZenPacks/community/IBMSystemxIMM/modeler/plugins/__init__.py +ZenPacks/community/IBMSystemxIMM/modeler/plugins/__init__.pyc +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/__init__.py +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/__init__.pyc +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMComponentLogMap.py +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMComponentLogMap.pyc +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMComponentVpdMap.py +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMComponentVpdMap.pyc +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMCpuVpdMap.py +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMCpuVpdMap.pyc +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMDeviceMap.py +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMDeviceMap.pyc +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMFanMonMap.py +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMFanMonMap.pyc +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMFwVpdMap.py +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMFwVpdMap.pyc +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMMemVpdMap.py +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMMemVpdMap.pyc +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMVoltMonMap.py +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMVoltMonMap.pyc +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/__init__.py +ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/__init__.pyc +ZenPacks/community/IBMSystemxIMM/objects/objects.xml +ZenPacks/community/IBMSystemxIMM/resources/IBMSystemxIMM.js +ZenPacks/community/IBMSystemxIMM/skins/ZenPacks.community.IBMSystemxIMM/IMMComponentLogDetail.pt +ZenPacks/community/IBMSystemxIMM/skins/ZenPacks.community.IBMSystemxIMM/IMMComponentVpdDetail.pt +ZenPacks/community/IBMSystemxIMM/skins/ZenPacks.community.IBMSystemxIMM/IMMCpuVpdDetail.pt +ZenPacks/community/IBMSystemxIMM/skins/ZenPacks.community.IBMSystemxIMM/IMMFanMonDetail.pt +ZenPacks/community/IBMSystemxIMM/skins/ZenPacks.community.IBMSystemxIMM/IMMFwVpdDetail.pt +ZenPacks/community/IBMSystemxIMM/skins/ZenPacks.community.IBMSystemxIMM/IMMMemVpdDetail.pt +ZenPacks/community/IBMSystemxIMM/skins/ZenPacks.community.IBMSystemxIMM/IMMVoltMonDetail.pt +ZenPacks/community/IBMSystemxIMM/skins/ZenPacks.community.IBMSystemxIMM/README.txt +ZenPacks/community/IBMSystemxIMM/tests/__init__.py +ZenPacks/community/IBMSystemxIMM/tests/__init__.pyo \ No newline at end of file diff --git a/ZenPacks.community.IBMSystemxIMM/EGG-INFO/dependency_links.txt b/ZenPacks.community.IBMSystemxIMM/EGG-INFO/dependency_links.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/ZenPacks.community.IBMSystemxIMM/EGG-INFO/dependency_links.txt @@ -0,0 +1 @@ + diff --git a/ZenPacks.community.IBMSystemxIMM/EGG-INFO/entry_points.txt b/ZenPacks.community.IBMSystemxIMM/EGG-INFO/entry_points.txt new file mode 100644 index 0000000..b9ad7f9 --- /dev/null +++ b/ZenPacks.community.IBMSystemxIMM/EGG-INFO/entry_points.txt @@ -0,0 +1,3 @@ +[zenoss.zenpacks] +ZenPacks.community.IBMSystemxIMM = ZenPacks.community.IBMSystemxIMM + diff --git a/ZenPacks.community.IBMSystemxIMM/EGG-INFO/namespace_packages.txt b/ZenPacks.community.IBMSystemxIMM/EGG-INFO/namespace_packages.txt new file mode 100644 index 0000000..2c732cd --- /dev/null +++ b/ZenPacks.community.IBMSystemxIMM/EGG-INFO/namespace_packages.txt @@ -0,0 +1,2 @@ +ZenPacks +ZenPacks.community diff --git a/ZenPacks.community.IBMSystemxIMM/EGG-INFO/not-zip-safe b/ZenPacks.community.IBMSystemxIMM/EGG-INFO/not-zip-safe new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/ZenPacks.community.IBMSystemxIMM/EGG-INFO/not-zip-safe @@ -0,0 +1 @@ + diff --git a/ZenPacks.community.IBMSystemxIMM/EGG-INFO/test_info.txt b/ZenPacks.community.IBMSystemxIMM/EGG-INFO/test_info.txt new file mode 100644 index 0000000..bfc2b1c --- /dev/null +++ b/ZenPacks.community.IBMSystemxIMM/EGG-INFO/test_info.txt @@ -0,0 +1,4 @@ +test_module = None +test_suite = None +test_loader = None +tests_require = diff --git a/ZenPacks.community.IBMSystemxIMM/EGG-INFO/top_level.txt b/ZenPacks.community.IBMSystemxIMM/EGG-INFO/top_level.txt new file mode 100644 index 0000000..7b6739c --- /dev/null +++ b/ZenPacks.community.IBMSystemxIMM/EGG-INFO/top_level.txt @@ -0,0 +1 @@ +ZenPacks diff --git a/ZenPacks.community.IBMSystemxIMM/EGG-INFO/zenpack_info b/ZenPacks.community.IBMSystemxIMM/EGG-INFO/zenpack_info new file mode 100644 index 0000000..f24de47 --- /dev/null +++ b/ZenPacks.community.IBMSystemxIMM/EGG-INFO/zenpack_info @@ -0,0 +1 @@ +compatZenossVers: >= 3.0 \ No newline at end of file diff --git a/ZenPacks.community.IBMSystemxIMM/INSTALL.txt b/ZenPacks.community.IBMSystemxIMM/INSTALL.txt index 588d262..66625eb 100644 --- a/ZenPacks.community.IBMSystemxIMM/INSTALL.txt +++ b/ZenPacks.community.IBMSystemxIMM/INSTALL.txt @@ -1 +1 @@ -Add installation notes here. +See README.TXT diff --git a/ZenPacks.community.IBMSystemxIMM/README.txt b/ZenPacks.community.IBMSystemxIMM/README.txt index 244ffc0..29adaf1 100644 --- a/ZenPacks.community.IBMSystemxIMM/README.txt +++ b/ZenPacks.community.IBMSystemxIMM/README.txt @@ -1 +1,146 @@ -This directory is a template for the creation of new ZenPacks. When a user creates a new ZenPack via the Zenoss gui this directory is copied, modified and installed in $ZENHOME/ZenPacks. \ No newline at end of file +======================================================================================================================== +Zenpack: IBM System x Integrated Management Module... +======================================================================================================================== +------------------------------------------------------------------------------------------------------------------------ +Developed by: +------------------------------------------------------------------------------------------------------------------------ +IBM Linux Technology Center + +------------------------------------------------------------------------------------------------------------------------ +Description: +------------------------------------------------------------------------------------------------------------------------ +The IBMSystemxIMM Zenpack supports out-of-band management (that is, independent of the running OS) for IBM System x servers with Integrated Management Module (IMM). IMM is an onboard Management Processor that provides monitoring, alerting, remote management and remote control of IBM servers. IMM supports IPMI 2.0, Serial over LAN (SOL), SNMP v1 and v3, telnet, ssh, SMASH CLP, SLP, CIM, SMTP and Web Access via HTTP/HTTPS. + +The primary interface to IMM for the IBMSystemxIMM Zenpack is via SNMP. (as of v0.3.1 it has been tested with SNMP v1 only) The Zenpack currently supports the following features: + +Configuration data (Modeler Plugins): +- Device-level Vital Product Data (VPD): Machine Type Model (MTM), Serial Number, UUID, etc. +- Firmware VPD +- CPU VPD (not supported on all IBM servers) +- Memory VPD +- Chassis Component VPD +- Chassis Component Log +- System Fan Monitors +- System Voltage Monitors + +Performance data (Monitoring Templates): +- Ambient Temperature (device level) +- Fan Speeds (component level) +- System Voltages (component level) + +Device Classes: + - /Server/IMM + +Event Classes: + - /Events/IMM + + +------------------------------------------------------------------------------------------------------------------------ +Components: +------------------------------------------------------------------------------------------------------------------------ +The Zenpack automatically installs the following: + +Device Class: /Server/IMM + +Modeler Plugins: + - community.snmp.IBMIMMDeviceMap + - community.snmp.IBMIMMFwVpdMap + - community.snmp.IBMIMMCpuVpdMap + - community.snmp.IBMIMMMemVpdMap + - community.snmp.IBMIMMComponentVpdMap + - community.snmp.IBMIMMComponentLogMap + - community.snmp.IBMIMMFanMonMap + - community.snmp.IBMIMMVoltMonMap + +Monitoring Templates (only IMMAmbientTemp will be bound the the device (green checkmark); the other two are component-level collectors): + + - Devices + `- Server + `- IMM + |- IMMAmbientTemp (Locally defined) + |- IMMFanMon (Locally defined) + `- IMMVoltMon (Locally defined) + +Event Class: /Events/IMM + +Event Mappings: for all traps defined in IMMALERT-MIB, mapped to /Events/IMM, severity mapped to Zenoss severity levels. + + +------------------------------------------------------------------------------------------------------------------------ +Requirements: +------------------------------------------------------------------------------------------------------------------------ + - Zenoss Versions Supported: >= 3.0 + - External Dependencies: IBM System x server with Integrated Management Module, SNMP enabled. + - ZenPack Dependencies: None + - Installation Notes: See above + - Configuration: No config required other than SNMP community string, etc. + + +------------------------------------------------------------------------------------------------------------------------ +Installation: +------------------------------------------------------------------------------------------------------------------------ + 1. Enable SNMP protocol on the IMM via the IMM's web UI. Specifically you need to configure: IMM Control > Network Protocols, and optionally IMM Control > Alert. Follow your server admin guide or the online help (in the web UI). + + 2. Install the IMM-MIB and IMMALERT-MIB in Zenoss per the standard procedure, i.e. Advanced > MIBs > Add MIB. The IMM mibs are included with any IMM firmware download (http://www.ibm.com/support/). Look for the .mib files in zip file containing the firmware. + + Alternately, to install MIBs from the command line, copy the files to: /opt/zenoss/share/mibs/site/ and: + + $ su - zenoss + $ zenmib run $ZENHOME/share/mibs/site/imm.mib + $ zenmib run $ZENHOME/share/mibs/site/immalert.mib + + 3. Install the IBMSystemxIMM Zenpack from .egg per the standard procedure, i.e. Advanced > Zenpacks > Install Zenpack. 'zopectl restart' after installing. + + Alternately, to install from command line: + $ zenpack --install ZenPacks.community.IBMSystemxIMM-0.3.0-py2.6.egg + + 4. Discover the server via the IP address of the IMM (not the IP of the running OS instance) per the standard procedure, i.e. Infrastructure > Devices > Add Device. Use device class: /Server/IMM. Follow the discovery output or wait a few mins for modeling to complete. + + Alternately, to discover from command line (device cannot exist first): + $ zendisc run --now -d myserverIMM.mydomain.com --monitor localhost --deviceclass /Server/IMM + +5. After it's discovered (and modeled) navigate to the device and you should see the following entries under Components: + + - Components + |- IMM Chassis Component Log + |- IMM Chassis Component VPD + |- IMM CPU VPD # if applicable; not supported on M2/M3 + |- IMM Fan Monitors + |- IMM Firmware VPD + |- IMM Memory VPD + `- IMM Voltage Monitors + + The Fan and Voltage Monitors should have Graphs. The Device level Graphs should include AmbientTemp. + + It should model it on discovery but just fyi, to run the modeler from cli: + + $ zenmodeler run -d myserverIMM.mydomain.com + +6. Troubleshooting: + + If you have missing entries under Components list try restarting zopeclt & zenhub. Navigate AWAY from the device in the UI then navigate back. If all else fails try deleting and rediscovering the device. + + If it's not collecting performance data (graphs) you can try this, or the steps below. (IMMAmbientTemp and IMMVoltMon are SNMP Datasources; IMMFanMon is a COMMAND Datasource): + + $ zenperfsnmp restart + $ zencommand restart + + +================================================================================ +TROUBLESHOOTING PERF COLLECTION PROBLEMS: +================================================================================ +## -- look for errors here... +tail -F /opt/zenoss/log/zenperfsnmp.log + +## -- Check timestamp of RRD files... this is a reliable indicator of when they were last updated... +find /opt/zenoss/perf/Devices/mydevice.mydomain.com/ -name \*.rrd -exec ls -la {} \; +find /opt/zenoss/perf/Devices/mydevice.mydomain.com/IMM* -name \*.rrd -exec ls -la {} \; + +## -- Run the poller daemons manually... +## If everything is good this will force collection and therefore update of RRD files. But that's NO GUARANTEE automatic collection is working! +zenperfsnmp run -v10 -d mydevice.mydomain.com +zencommand run -v10 -d mydevice.mydomain.com + +## -- Restart the thing, if nothing else works... +zenperfsnmp restart +zencommand restart diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMComponentLog.py b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMComponentLog.py index d6fe43e..e99f5d6 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMComponentLog.py +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMComponentLog.py @@ -2,7 +2,7 @@ # IMMDevice object class # # Zenoss community Zenpack for IBM SystemX Integrated Management Module -# version: 0.3 +# version: 1.0 # # (C) Copyright IBM Corp. 2011. All Rights Reserved. # @@ -25,7 +25,7 @@ __author__ = "IBM" __copyright__ = "(C) Copyright IBM Corp. 2011. All Rights Reserved." __license__ = "GPL" -__version__ = "0.3.0" +__version__ = "1.0.0" from Globals import DTMLFile from Globals import InitializeClass diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMComponentVpd.py b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMComponentVpd.py index 7e5bcbf..40bd2d6 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMComponentVpd.py +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMComponentVpd.py @@ -2,7 +2,7 @@ # IMMComponentVpd object class # # Zenoss community Zenpack for IBM SystemX Integrated Management Module -# version: 0.3 +# version: 1.0 # # (C) Copyright IBM Corp. 2011. All Rights Reserved. # @@ -25,7 +25,7 @@ __author__ = "IBM" __copyright__ = "(C) Copyright IBM Corp. 2011. All Rights Reserved." __license__ = "GPL" -__version__ = "0.3.0" +__version__ = "1.0.0" from Globals import DTMLFile from Globals import InitializeClass diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMCpuVpd.py b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMCpuVpd.py index 277a4b4..b73852a 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMCpuVpd.py +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMCpuVpd.py @@ -2,7 +2,7 @@ # IMMCpuVpd object class # # Zenoss community Zenpack for IBM SystemX Integrated Management Module -# version: 0.3 +# version: 1.0 # # (C) Copyright IBM Corp. 2011. All Rights Reserved. # @@ -25,7 +25,7 @@ __author__ = "IBM" __copyright__ = "(C) Copyright IBM Corp. 2011. All Rights Reserved." __license__ = "GPL" -__version__ = "0.3.0" +__version__ = "1.0.0" from Globals import DTMLFile from Globals import InitializeClass diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMDevice.py b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMDevice.py index 90ef464..9f69456 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMDevice.py +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMDevice.py @@ -2,7 +2,7 @@ # IMMDevice object class # # Zenoss community Zenpack for IBM SystemX Integrated Management Module -# version: 0.3 +# version: 1.0 # # (C) Copyright IBM Corp. 2011. All Rights Reserved. # @@ -25,7 +25,7 @@ __author__ = "IBM" __copyright__ = "(C) Copyright IBM Corp. 2011. All Rights Reserved." __license__ = "GPL" -__version__ = "0.3.0" +__version__ = "1.0.0" from Globals import InitializeClass from Products.ZenRelations.RelSchema import * @@ -53,45 +53,48 @@ class IMMDevice(Device): 'ZenPacks.community.IBMSystemxIMM.IMMVoltMon', 'IMMDev')), ) - # Previously these were tabs but in 3.0 the appear as separate menu item in the device view - factory_type_information = deepcopy(Device.factory_type_information) - factory_type_information[0]['actions'] += ( - { 'id' : 'IMMFWVPD' - , 'name' : 'IMM Firmware VPD' - , 'action' : 'IMMFwVpdDetail' - , 'permissions' : (ZEN_VIEW, ) - }, - { 'id' : 'IMMCPUPD' - , 'name' : 'IMM CPU VPD' - , 'action' : 'IMMCpuVpdDetail' - , 'permissions' : (ZEN_VIEW, ) - }, - { 'id' : 'IMMMEMVPD' - , 'name' : 'IMM Memory VPD' - , 'action' : 'IMMMemVpdDetail' - , 'permissions' : (ZEN_VIEW, ) - }, - { 'id' : 'IMMCOMPVPD' - , 'name' : 'IMM Chassis Component VPD' - , 'action' : 'IMMComponentVpdDetail' - , 'permissions' : (ZEN_VIEW, ) - }, - { 'id' : 'IMMCOMPLOG' - , 'name' : 'IMM Chassis Component Log' - , 'action' : 'IMMComponentLogDetail' - , 'permissions' : (ZEN_VIEW, ) - }, - { 'id' : 'IMMFANMON' - , 'name' : 'IMM Fan Monitor' - , 'action' : 'IMMFanMonDetail' - , 'permissions' : (ZEN_VIEW, ) - }, - { 'id' : 'IMMVOLTMON' - , 'name' : 'IMM Voltage Monitor' - , 'action' : 'IMMVoltMonDetail' - , 'permissions' : (ZEN_VIEW, ) - }, - ) + # These were tabs in zenoss 2.0 but in 3.0 they appear as separate menu items in the device view + # and are redundant with items in the Components list; hence they are commented out. The .pt files + # are present in the skins dir; uncomment this chunk of code to reactivate them. + # Note: SHOULD work but NOT TESTED on zenoss 2.0. +# factory_type_information = deepcopy(Device.factory_type_information) +# factory_type_information[0]['actions'] += ( +# { 'id' : 'IMMFWVPD' +# , 'name' : 'IMM Firmware VPD' +# , 'action' : 'IMMFwVpdDetail' +# , 'permissions' : (ZEN_VIEW, ) +# }, +# { 'id' : 'IMMCPUPD' +# , 'name' : 'IMM CPU VPD' +# , 'action' : 'IMMCpuVpdDetail' +# , 'permissions' : (ZEN_VIEW, ) +# }, +# { 'id' : 'IMMMEMVPD' +# , 'name' : 'IMM Memory VPD' +# , 'action' : 'IMMMemVpdDetail' +# , 'permissions' : (ZEN_VIEW, ) +# }, +# { 'id' : 'IMMCOMPVPD' +# , 'name' : 'IMM Chassis Component VPD' +# , 'action' : 'IMMComponentVpdDetail' +# , 'permissions' : (ZEN_VIEW, ) +# }, +# { 'id' : 'IMMCOMPLOG' +# , 'name' : 'IMM Chassis Component Log' +# , 'action' : 'IMMComponentLogDetail' +# , 'permissions' : (ZEN_VIEW, ) +# }, +# { 'id' : 'IMMFANMON' +# , 'name' : 'IMM Fan Monitor' +# , 'action' : 'IMMFanMonDetail' +# , 'permissions' : (ZEN_VIEW, ) +# }, +# { 'id' : 'IMMVOLTMON' +# , 'name' : 'IMM Voltage Monitor' +# , 'action' : 'IMMVoltMonDetail' +# , 'permissions' : (ZEN_VIEW, ) +# }, +# ) def __init__(self, *args, **kw): Device.__init__(self, *args, **kw) diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMFanMon.py b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMFanMon.py index c11fd91..6120ff2 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMFanMon.py +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMFanMon.py @@ -2,7 +2,7 @@ # IMMFanMon object class # # Zenoss community Zenpack for IBM SystemX Integrated Management Module -# version: 0.3 +# version: 1.0 # # (C) Copyright IBM Corp. 2011. All Rights Reserved. # @@ -25,7 +25,7 @@ __author__ = "IBM" __copyright__ = "(C) Copyright IBM Corp. 2011. All Rights Reserved." __license__ = "GPL" -__version__ = "0.3.0" +__version__ = "1.0.0" from Globals import DTMLFile from Globals import InitializeClass diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMFwVpd.py b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMFwVpd.py index 11e571a..0252f6a 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMFwVpd.py +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMFwVpd.py @@ -2,7 +2,7 @@ # IMMFwVpd object class # # Zenoss community Zenpack for IBM SystemX Integrated Management Module -# version: 0.3 +# version: 1.0 # # (C) Copyright IBM Corp. 2011. All Rights Reserved. # @@ -25,7 +25,7 @@ __author__ = "IBM" __copyright__ = "(C) Copyright IBM Corp. 2011. All Rights Reserved." __license__ = "GPL" -__version__ = "0.3.0" +__version__ = "1.0.0" from Globals import DTMLFile from Globals import InitializeClass diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMMemVpd.py b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMMemVpd.py index e0959ff..de5ad06 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMMemVpd.py +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMMemVpd.py @@ -2,7 +2,7 @@ # IMMMemVpd object class # # Zenoss community Zenpack for IBM SystemX Integrated Management Module -# version: 0.3 +# version: 1.0 # # (C) Copyright IBM Corp. 2011. All Rights Reserved. # @@ -25,7 +25,7 @@ __author__ = "IBM" __copyright__ = "(C) Copyright IBM Corp. 2011. All Rights Reserved." __license__ = "GPL" -__version__ = "0.3.0" +__version__ = "1.0.0" from Globals import DTMLFile from Globals import InitializeClass diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMVoltMon.py b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMVoltMon.py index b3b4846..9a00cfd 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMVoltMon.py +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/IMMVoltMon.py @@ -2,7 +2,7 @@ # IMMVoltMon object class # # Zenoss community Zenpack for IBM SystemX Integrated Management Module -# version: 0.3 +# version: 1.0 # # (C) Copyright IBM Corp. 2011. All Rights Reserved. # @@ -25,7 +25,7 @@ __author__ = "IBM" __copyright__ = "(C) Copyright IBM Corp. 2011. All Rights Reserved." __license__ = "GPL" -__version__ = "0.3.0" +__version__ = "1.0.0" from Globals import DTMLFile from Globals import InitializeClass @@ -103,7 +103,7 @@ def viewName(self): return "Unknown" else: return str( self.voltIndex ) + " - " + self.voltDescr -# return self.voltDescr +# return self.voltDescr # use viewName as titleOrId because that method is used to display a human # readable version of the object in the breadcrumbs diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/info.py b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/info.py index 9a06a70..b417bcb 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/info.py +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/info.py @@ -1,6 +1,6 @@ # ============================================================================== # Zenoss community Zenpack for IBM SystemX Integrated Management Module -# version: 0.3 +# version: 1.0 # # (C) Copyright IBM Corp. 2011. All Rights Reserved. # @@ -23,7 +23,7 @@ __author__ = "IBM" __copyright__ = "(C) Copyright IBM Corp. 2011. All Rights Reserved." __license__ = "GPL" -__version__ = "0.3.0" +__version__ = "1.0.0" from zope.interface import implements from Products.Zuul.infos import ProxyProperty diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/interfaces.py b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/interfaces.py index 939245d..ad6d649 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/interfaces.py +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/interfaces.py @@ -1,6 +1,6 @@ # ============================================================================== # Zenoss community Zenpack for IBM SystemX Integrated Management Module -# version: 0.3 +# version: 1.0 # # (C) Copyright IBM Corp. 2011. All Rights Reserved. # @@ -23,7 +23,7 @@ __author__ = "IBM" __copyright__ = "(C) Copyright IBM Corp. 2011. All Rights Reserved." __license__ = "GPL" -__version__ = "0.3.0" +__version__ = "1.0.0" from Products.Zuul.interfaces import IComponentInfo from Products.Zuul.form import schema diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMComponentLogMap.py b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMComponentLogMap.py index 886d76b..fa348f0 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMComponentLogMap.py +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMComponentLogMap.py @@ -2,7 +2,7 @@ # IBMIMMComponentLogMap modeler plugin # # Zenoss community Zenpack for IBM SystemX Integrated Management Module -# version: 0.3 +# version: 1.0 # # (C) Copyright IBM Corp. 2011. All Rights Reserved. # @@ -25,7 +25,7 @@ __author__ = "IBM" __copyright__ = "(C) Copyright IBM Corp. 2011. All Rights Reserved." __license__ = "GPL" -__version__ = "0.3.0" +__version__ = "1.0.0" from Products.DataCollector.plugins.CollectorPlugin import SnmpPlugin, GetTableMap, GetMap from Products.DataCollector.plugins.DataMaps import ObjectMap @@ -58,16 +58,16 @@ def process(self, device, results, log): getdata, tabledata = results # Debug: print data retrieved from device. - log.warn( "Get data = %s", getdata ) - log.warn( "Table data = %s", tabledata ) + log.debug( "Get data = %s", getdata ) + log.debug( "Table data = %s", tabledata ) VpdTable = tabledata.get("systemComponentLevelVpdTrackingEntry") # If no data retrieved return nothing. if not VpdTable: log.warn( 'No data collected from %s for the %s plugin', device.id, self.name() ) - log.warn( "Data = %s", getdata ) - log.warn( "Columns = %s", self.columns ) + log.debug( "Data = %s", getdata ) + log.debug( "Columns = %s", self.columns ) return rm = self.relMap() diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMComponentVpdMap.py b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMComponentVpdMap.py index 58a14f8..fc621ea 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMComponentVpdMap.py +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMComponentVpdMap.py @@ -2,7 +2,7 @@ # IBMIMMComponentVpdMap modeler plugin # # Zenoss community Zenpack for IBM SystemX Integrated Management Module -# version: 0.3 +# version: 1.0 # # (C) Copyright IBM Corp. 2011. All Rights Reserved. # @@ -25,7 +25,7 @@ __author__ = "IBM" __copyright__ = "(C) Copyright IBM Corp. 2011. All Rights Reserved." __license__ = "GPL" -__version__ = "0.3.0" +__version__ = "1.0.0" from Products.DataCollector.plugins.CollectorPlugin import SnmpPlugin, GetTableMap, GetMap from Products.DataCollector.plugins.DataMaps import ObjectMap @@ -56,16 +56,16 @@ def process(self, device, results, log): getdata, tabledata = results # Debug: print data retrieved from device. - log.warn( "Get data = %s", getdata ) - log.warn( "Table data = %s", tabledata ) + log.debug( "Get data = %s", getdata ) + log.debug( "Table data = %s", tabledata ) VpdTable = tabledata.get("systemComponentLevelVpdEntry") # If no data retrieved return nothing. if not VpdTable: log.warn( 'No data collected from %s for the %s plugin', device.id, self.name() ) - log.warn( "Data = %s", getdata ) - log.warn( "Columns = %s", self.columns ) + log.debug( "Data = %s", getdata ) + log.debug( "Columns = %s", self.columns ) return rm = self.relMap() diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMCpuVpdMap.py b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMCpuVpdMap.py index f3524b8..ff7bf5d 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMCpuVpdMap.py +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMCpuVpdMap.py @@ -2,7 +2,7 @@ # IBMIMMCpuVpdMap modeler plugin # # Zenoss community Zenpack for IBM SystemX Integrated Management Module -# version: 0.3 +# version: 1.0 # # (C) Copyright IBM Corp. 2011. All Rights Reserved. # @@ -25,7 +25,7 @@ __author__ = "IBM" __copyright__ = "(C) Copyright IBM Corp. 2011. All Rights Reserved." __license__ = "GPL" -__version__ = "0.3.0" +__version__ = "1.0.0" from Products.DataCollector.plugins.CollectorPlugin import SnmpPlugin, GetTableMap, GetMap from Products.DataCollector.plugins.DataMaps import ObjectMap @@ -61,16 +61,16 @@ def process(self, device, results, log): getdata, tabledata = results # Debug: print data retrieved from device. - log.warn( "Get data = %s", getdata ) - log.warn( "Table data = %s", tabledata ) + log.debug( "Get data = %s", getdata ) + log.debug( "Table data = %s", tabledata ) VpdTable = tabledata.get("systemCPUVpdEntry") # If no data retrieved return nothing. if not VpdTable: log.warn( 'No data collected from %s for the %s plugin', device.id, self.name() ) - log.warn( "Data = %s", getdata ) - log.warn( "Columns = %s", self.columns ) + log.debug( "Data = %s", getdata ) + log.debug( "Columns = %s", self.columns ) return rm = self.relMap() diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMDeviceMap.py b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMDeviceMap.py index 4c18cda..a25af2d 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMDeviceMap.py +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMDeviceMap.py @@ -2,7 +2,7 @@ # IBMIMMDeviceMap modeler plugin # # Zenoss community Zenpack for IBM SystemX Integrated Management Module -# version: 0.3 +# version: 1.0 # # (C) Copyright IBM Corp. 2011. All Rights Reserved. # @@ -25,7 +25,7 @@ __author__ = "IBM" __copyright__ = "(C) Copyright IBM Corp. 2011. All Rights Reserved." __license__ = "GPL" -__version__ = "0.3.0" +__version__ = "1.0.0" from Products.DataCollector.plugins.CollectorPlugin import SnmpPlugin, GetTableMap, GetMap from Products.DataCollector.plugins.DataMaps import MultiArgs @@ -41,9 +41,15 @@ class IBMIMMDeviceMap(SnmpPlugin): '.1.3.6.1.4.1.2.3.51.3.1.5.2.1.3.0' : 'machineLevelSerialNumber', '.1.3.6.1.4.1.2.3.51.3.1.5.2.1.4.0' : 'machineLevelUUID', '.1.3.6.1.4.1.2.3.51.3.1.5.2.1.5.0' : 'machineLevelProductName', - '.1.3.6.1.2.1.1.1.0' : 'sysDescr', + # Assuming the IMM firmware is always the first instance in immVpdTable. + # If that turns out to be a bad assumption will need more logic here (i.e. like IBMIMMFwVpdMap). + '.1.3.6.1.4.1.2.3.51.3.1.5.1.1.2.1' : 'immFirmwareVpdType', + '.1.3.6.1.4.1.2.3.51.3.1.5.1.1.3.1' : 'immFirmwareVersionString', + '.1.3.6.1.4.1.2.3.51.3.1.5.1.1.4.1' : 'immFirmwareReleaseDate', + # Uncomment this if sysDescr will be used below. +# '.1.3.6.1.2.1.1.1.0' : 'sysDescr', }) - + def process(self, device, results, log): """collect snmp information from this device""" log.info('processing %s for device %s', self.name(), device.id) @@ -51,11 +57,21 @@ def process(self, device, results, log): getdata, tabledata = results # Debug: print data retrieved from device. - log.warn( "Get data = %s", getdata ) - log.warn( "Table data = %s", tabledata ) + log.debug( "Get data = %s", getdata ) + log.debug( "Table data = %s", tabledata ) om = self.objectMap(getdata) +# log.debug("MTM string length = %i", len(str(om.machineLevelVpdMachineModel))) + + # Expecting 7-char MTM here. If so, break into 4 char Machine Type + 3 char Model, + # hyphenate for readability. Otherwise leave unaltered. + if len(str(om.machineLevelVpdMachineModel)) == 7: + om.machineLevelVpdMachineModel = str(om.machineLevelVpdMachineModel)[:4] + '-' + str(om.machineLevelVpdMachineModel)[-3:] + + # Assemble the string to be used as "OS Model" below. + immFirmwareString = om.immFirmwareVpdType + "-FW-" + om.immFirmwareVersionString + "-" + om.immFirmwareReleaseDate + # Set values on Overview page # see: http://community.zenoss.org/docs/DOC-2350 # setHWTag -> "Tag" field @@ -65,24 +81,19 @@ def process(self, device, results, log): # comments -> "Comments" field # also: snmpContact, snmpSysName, snmpLocation, snmpUpTime - om.setHWTag = str(om.machineLevelProductName) + om.setHWTag = str(om.machineLevelVpdMachineModel) om.setHWSerialNumber = str(om.machineLevelSerialNumber) - log.debug("MTM string length = %i", len(str(om.machineLevelVpdMachineModel))) - - # Expecting 7-char MTM here. If so, break into 4 char Machine Type + 3 char Model, - # hyphenate for readability. Otherwise leave unaltered. - if len(str(om.machineLevelVpdMachineModel)) == 7: - om.machineLevelVpdMachineModel = str(om.machineLevelVpdMachineModel)[:4] + '-' + str(om.machineLevelVpdMachineModel)[-3:] - # Test... # om.setHWProductKey = MultiArgs("Hardware Model", "Hardware Manufacturer") # om.setOSProductKey = MultiArgs("OS Model", "OS Manufacturer") - om.setHWProductKey = MultiArgs(om.machineLevelVpdMachineModel, "IBM") - om.setOSProductKey = MultiArgs("Integrated Management Module", "IBM") + om.setHWProductKey = MultiArgs(om.machineLevelProductName, "IBM") +# om.setOSProductKey = MultiArgs("Integrated Management Module", "IBM") + om.setOSProductKey = MultiArgs(immFirmwareString, "IBM") # 2nd field of sysDescr is hostname as set on Network Interfaces page in web UI. - om.comments = "IMM Hostname: " + str(om.sysDescr).split(' ')[1] + "\nSystem UUID: " + om.machineLevelUUID + # Uncomment to add this data to Comment field. +# om.comments = "IMM Hostname: " + str(om.sysDescr).split(' ')[1] + "\nSystem UUID: " + om.machineLevelUUID return om diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMFanMonMap.py b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMFanMonMap.py index ddf80ef..6955875 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMFanMonMap.py +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMFanMonMap.py @@ -2,7 +2,7 @@ # IBMIMMFanMonMap modeler plugin # # Zenoss community Zenpack for IBM SystemX Integrated Management Module -# version: 0.3 +# version: 1.0 # # (C) Copyright IBM Corp. 2011. All Rights Reserved. # @@ -25,7 +25,7 @@ __author__ = "IBM" __copyright__ = "(C) Copyright IBM Corp. 2011. All Rights Reserved." __license__ = "GPL" -__version__ = "0.3.0" +__version__ = "1.0.0" from Products.DataCollector.plugins.CollectorPlugin import SnmpPlugin, GetTableMap, GetMap from Products.DataCollector.plugins.DataMaps import ObjectMap @@ -59,16 +59,16 @@ def process(self, device, results, log): getdata, tabledata = results # Debug: print data retrieved from device. - log.warn( "Get data = %s", getdata ) - log.warn( "Table data = %s", tabledata ) + log.debug( "Get data = %s", getdata ) + log.debug( "Table data = %s", tabledata ) VpdTable = tabledata.get("fanEntry") # If no data retrieved return nothing. if not VpdTable: log.warn( 'No data collected from %s for the %s plugin', device.id, self.name() ) - log.warn( "Data = %s", getdata ) - log.warn( "Columns = %s", self.columns ) + log.debug( "Data = %s", getdata ) + log.debug( "Columns = %s", self.columns ) return rm = self.relMap() diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMFwVpdMap.py b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMFwVpdMap.py index 5b560eb..75e5545 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMFwVpdMap.py +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMFwVpdMap.py @@ -2,7 +2,7 @@ # IBMIMMFwVpdMap modeler plugin # # Zenoss community Zenpack for IBM SystemX Integrated Management Module -# version: 0.3 +# version: 1.0 # # (C) Copyright IBM Corp. 2011. All Rights Reserved. # @@ -25,7 +25,7 @@ __author__ = "IBM" __copyright__ = "(C) Copyright IBM Corp. 2011. All Rights Reserved." __license__ = "GPL" -__version__ = "0.3.0" +__version__ = "1.0.0" from Products.DataCollector.plugins.CollectorPlugin import SnmpPlugin, GetTableMap, GetMap from Products.DataCollector.plugins.DataMaps import ObjectMap @@ -55,16 +55,16 @@ def process(self, device, results, log): getdata, tabledata = results # Debug: print data retrieved from device. - log.warn( "Get data = %s", getdata ) - log.warn( "Table data = %s", tabledata ) + log.debug( "Get data = %s", getdata ) + log.debug( "Table data = %s", tabledata ) VpdTable = tabledata.get("immVpdEntry") # If no data retrieved return nothing. if not VpdTable: log.warn( 'No data collected from %s for the %s plugin', device.id, self.name() ) - log.warn( "Data = %s", getdata ) - log.warn( "Columns = %s", self.columns ) + log.debug( "Data = %s", getdata ) + log.debug( "Columns = %s", self.columns ) return rm = self.relMap() diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMMemVpdMap.py b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMMemVpdMap.py index cb5f23a..1272193 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMMemVpdMap.py +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMMemVpdMap.py @@ -2,7 +2,7 @@ # IBMIMMMemVpdMap modeler plugin # # Zenoss community Zenpack for IBM SystemX Integrated Management Module -# version: 0.3 +# version: 1.0 # # (C) Copyright IBM Corp. 2011. All Rights Reserved. # @@ -25,7 +25,7 @@ __author__ = "IBM" __copyright__ = "(C) Copyright IBM Corp. 2011. All Rights Reserved." __license__ = "GPL" -__version__ = "0.3.0" +__version__ = "1.0.0" from Products.DataCollector.plugins.CollectorPlugin import SnmpPlugin, GetTableMap, GetMap from Products.DataCollector.plugins.DataMaps import ObjectMap @@ -58,16 +58,16 @@ def process(self, device, results, log): getdata, tabledata = results # Debug: print data retrieved from device. - log.warn( "Get data = %s", getdata ) - log.warn( "Table data = %s", tabledata ) + log.debug( "Get data = %s", getdata ) + log.debug( "Table data = %s", tabledata ) VpdTable = tabledata.get("systemMemoryVpdEntry") # If no data retrieved return nothing. if not VpdTable: log.warn( 'No data collected from %s for the %s plugin', device.id, self.name() ) - log.warn( "Data = %s", getdata ) - log.warn( "Columns = %s", self.columns ) + log.debug( "Data = %s", getdata ) + log.debug( "Columns = %s", self.columns ) return rm = self.relMap() diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMVoltMonMap.py b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMVoltMonMap.py index 209d22d..9204bb0 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMVoltMonMap.py +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/modeler/plugins/community/snmp/IBMIMMVoltMonMap.py @@ -2,7 +2,7 @@ # IBMIMMVoltMonMap modeler plugin # # Zenoss community Zenpack for IBM SystemX Integrated Management Module -# version: 0.3 +# version: 1.0 # # (C) Copyright IBM Corp. 2011. All Rights Reserved. # @@ -25,7 +25,7 @@ __author__ = "IBM" __copyright__ = "(C) Copyright IBM Corp. 2011. All Rights Reserved." __license__ = "GPL" -__version__ = "0.3.0" +__version__ = "1.0.0" from Products.DataCollector.plugins.CollectorPlugin import SnmpPlugin, GetTableMap, GetMap from Products.DataCollector.plugins.DataMaps import ObjectMap @@ -60,16 +60,16 @@ def process(self, device, results, log): getdata, tabledata = results # Debug: print data retrieved from device. - log.warn( "Get data = %s", getdata ) - log.warn( "Table data = %s", tabledata ) + log.debug( "Get data = %s", getdata ) + log.debug( "Table data = %s", tabledata ) VpdTable = tabledata.get("voltEntry") # If no data retrieved return nothing. if not VpdTable: log.warn( 'No data collected from %s for the %s plugin', device.id, self.name() ) - log.warn( "Data = %s", getdata ) - log.warn( "Columns = %s", self.columns ) + log.debug( "Data = %s", getdata ) + log.debug( "Columns = %s", self.columns ) return rm = self.relMap() diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/objects/objects.xml b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/objects/objects.xml index 7717cc0..b318d08 100644 --- a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/objects/objects.xml +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/objects/objects.xml @@ -9,7 +9,7 @@ Integrated Management Module Integrated Management Module -['zenoss.snmp.NewDeviceMap', 'zenoss.snmp.DeviceMap', 'community.snmp.IBMIMMDeviceMap', 'community.snmp.IBMIMMFwVpdMap', 'community.snmp.IBMIMMCpuVpdMap', 'community.snmp.IBMIMMMemVpdMap', 'community.snmp.IBMIMMComponentLogMap', 'community.snmp.IBMIMMComponentVpdMap', 'community.snmp.IBMIMMFanMonMap', 'community.snmp.IBMIMMVoltMonMap'] +['zenoss.snmp.NewDeviceMap', 'zenoss.snmp.DeviceMap', 'zenoss.snmp.InterfaceMap', 'zenoss.snmp.RouteMap', 'zenoss.snmp.IpServiceMap', 'community.snmp.IBMIMMDeviceMap', 'community.snmp.IBMIMMFwVpdMap', 'community.snmp.IBMIMMCpuVpdMap', 'community.snmp.IBMIMMMemVpdMap', 'community.snmp.IBMIMMComponentLogMap', 'community.snmp.IBMIMMComponentVpdMap', 'community.snmp.IBMIMMFanMonMap', 'community.snmp.IBMIMMVoltMonMap'] 10.0 diff --git a/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/skins/ZenPacks.community.IBMSystemxIMM/README.txt b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/skins/ZenPacks.community.IBMSystemxIMM/README.txt new file mode 100644 index 0000000..db82f9f --- /dev/null +++ b/ZenPacks.community.IBMSystemxIMM/ZenPacks/community/IBMSystemxIMM/skins/ZenPacks.community.IBMSystemxIMM/README.txt @@ -0,0 +1 @@ +These skins are disabled by default. To enable, uncomment the factory_type_information codeblock in IMMDevice.py. diff --git a/ZenPacks.community.IBMSystemxIMM/setup.py b/ZenPacks.community.IBMSystemxIMM/setup.py index 99ce207..1301e46 100644 --- a/ZenPacks.community.IBMSystemxIMM/setup.py +++ b/ZenPacks.community.IBMSystemxIMM/setup.py @@ -3,7 +3,7 @@ # or saved. Do not modify them directly here. # NB: PACKAGES is deprecated NAME = "ZenPacks.community.IBMSystemxIMM" -VERSION = "0.3.1" +VERSION = "1.0.0" AUTHOR = "IBM" LICENSE = "" NAMESPACE_PACKAGES = ['ZenPacks', 'ZenPacks.community']