Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed 2.5 loading issue, hard-coded path and sed bug

git-svn-id: http://zenpacks.zenoss.org/svn/zenpacks@449 db08cffe-75b9-45d1-af1a-46ad9ef135f6
  • Loading branch information...
commit b2cb93a7274606b426969f319d57b66af3071e4e 1 parent 10d756e
Matt Ray authored
View
5 ZenPacks.vmware.VirtualMachines/ZenPacks/vmware/VirtualMachines/__init__.py
@@ -6,10 +6,11 @@
# If the ZenPack contains a skins directory it needs to be registered when
# the ZenPack module is loaded.
+skinsDir = os.path.join(os.path.dirname(__file__), 'skins')
from Products.CMFCore.DirectoryView import registerDirectory
-
-registerDirectory('skins', globals())
+if os.path.isdir(skinsDir):
+ registerDirectory(skinsDir, globals())
# When a user creates a ZenPack through the Zenoss Create New ZenPack
# command in the UI the ZenPack that's created is an instance of
View
2  ZenPacks.vmware.VirtualMachines/ZenPacks/vmware/VirtualMachines/objects/objects.xml
@@ -23,7 +23,7 @@ True
3
</property>
<property type="string" id="commandTemplate" mode="w" >
-/home/zenoss/ZenPacks.vmware.VirtualMachines/ZenPacks/vmware/VirtualMachines/libexec/check_esx2 -N -H ${dev/id} -C ${here/zSnmpCommunity} -v ${here/vmDisplayName} -l CPU -w 90 -c 95 |sed -e 's/.*CPU\susage\sis\s/cpuUtil=/;s#%##;s/on.*(/cpuSec=/;s#s##;s/average.*$$//'
+${here/ZenPackManager/packs/ZenPacks.vmware.VirtualMachines/path}/libexec/check_esx2 -N -H ${dev/id} -C ${here/zSnmpCommunity} -v ${here/vmDisplayName} -l CPU -w 90 -c 95 |sed -e 's/.*CPU\susage\sis\s/|cpuUtil=/;s#%##;s/on.*(/cpuSec=/;s#s##;s/average.*$$//'
</property>
<property type="int" id="cycletime" mode="w" >
300
View
2  ZenPacks.vmware.VirtualMachines/setup.py
@@ -15,7 +15,7 @@
# These variables are overwritten by Zenoss when the ZenPack is exported
# or saved. Do not modify them directly here.
NAME = 'ZenPacks.vmware.VirtualMachines'
-VERSION = '1.2'
+VERSION = '1.2.3'
AUTHOR = 'Michael C. Hoffman'
LICENSE = ''
NAMESPACE_PACKAGES = ['ZenPacks', 'ZenPacks.vmware']
Please sign in to comment.
Something went wrong with that request. Please try again.