diff -ruN templates/vmware-esx4/cpu/message templates-trunk/vmware-esx4/cpu/message --- templates/vmware-esx4/cpu/message 2010-10-29 09:16:29.000000000 -0500 +++ templates-trunk/vmware-esx4/cpu/message 1969-12-31 18:00:00.000000000 -0600 @@ -1,21 +0,0 @@ -Host: {sysDescr} - -{sysUpTimeSecs.color} Uptime: {UpTimeTxt} - -Load Averages: - -1 minute : {laLoad1} -5 minute : {laLoad5} {laLoad5.color} -10 minute : {laLoad10} {laLoad10.color} - - -CPU utilization: - -User : {CpuUser} -Nice : {CpuNice} -System : {CpuSystem} -CpuIdle : {CpuIdle} - - - diff -ruN templates/vmware-esx4/cpu/oids templates-trunk/vmware-esx4/cpu/oids --- templates/vmware-esx4/cpu/oids 2010-10-29 08:28:40.000000000 -0500 +++ templates-trunk/vmware-esx4/cpu/oids 1969-12-31 18:00:00.000000000 -0600 @@ -1,10 +0,0 @@ -sysDescr : .1.3.6.1.2.1.1.1.0 : leaf -sysUpTime : .1.3.6.1.2.1.1.3.0 : leaf -hrProcessorLoad : .1.3.6.1.2.1.25.3.3.1.2.768 : leaf -laLoad1 : .1.3.6.1.4.1.2021.10.1.3.1 : leaf -laLoad5 : .1.3.6.1.4.1.2021.10.1.3.2 : leaf -laLoad10 : .1.3.6.1.4.1.2021.10.1.3.3 : leaf -ssCpuRawUser : .1.3.6.1.4.1.2021.11.50.0 : leaf -ssCpuRawNice : .1.3.6.1.4.1.2021.11.51.0 : leaf -ssCpuRawSystem : .1.3.6.1.4.1.2021.11.52.0 : leaf -ssCpuRawIdle : .1.3.6.1.4.1.2021.11.53.0 : leaf diff -ruN templates/vmware-esx4/cpu/thresholds templates-trunk/vmware-esx4/cpu/thresholds --- templates/vmware-esx4/cpu/thresholds 2010-10-29 08:29:04.000000000 -0500 +++ templates-trunk/vmware-esx4/cpu/thresholds 1969-12-31 18:00:00.000000000 -0600 @@ -1,11 +0,0 @@ -laLoad5 : red : >10 : CPU utilization is very high -laLoad5 : yellow : >=5 : CPU utilization is high -laLoad5 : green : : CPU utilization is nominal - -laLoad10 : red : >10 : CPU utilization is very high -laLoad10 : yellow : >=5 : CPU utilization is high -laLoad10 : green : : CPU utilization is nominal - -sysUpTimeSecs : red : <600 : Device rebooted recently. System uptime: {UpTimeTxt} -sysUpTimeSecs : yellow : <5000 : Device rebooted recently. System uptime: {UpTimeTxt} -sysUpTimeSecs : green : : System uptime: {UpTimeTxt} diff -ruN templates/vmware-esx4/cpu/transforms templates-trunk/vmware-esx4/cpu/transforms --- templates/vmware-esx4/cpu/transforms 2010-10-29 08:29:21.000000000 -0500 +++ templates-trunk/vmware-esx4/cpu/transforms 1969-12-31 18:00:00.000000000 -0600 @@ -1,7 +0,0 @@ -sysUpTimeSecs : MATH : {sysUpTime} / 100 -UpTimeTxt : ELAPSED : {sysUpTimeSecs} - -CpuUser : DELTA : {ssCpuRawUser} -CpuNice : DELTA : {ssCpuRawNice} -CpuSystem : DELTA : {ssCpuRawSystem} -CpuIdle : DELTA : {ssCpuRawIdle} diff -ruN templates/vmware-esx4/disk/exceptions templates-trunk/vmware-esx4/disk/exceptions --- templates/vmware-esx4/disk/exceptions 2009-03-12 15:19:26.000000000 -0500 +++ templates-trunk/vmware-esx4/disk/exceptions 1969-12-31 18:00:00.000000000 -0600 @@ -1,2 +0,0 @@ -DiskName : alarm : .* -DiskName : ignore : Real.Memory.*|Swap Space diff -ruN templates/vmware-esx4/disk/message templates-trunk/vmware-esx4/disk/message --- templates/vmware-esx4/disk/message 2009-03-12 15:19:26.000000000 -0500 +++ templates-trunk/vmware-esx4/disk/message 1969-12-31 18:00:00.000000000 -0600 @@ -1,3 +0,0 @@ -TABLE:plain,noalarmsmsg -Filesystem 1024-blocks Used Available Capacity Mounted on -{DiskName} {DiskSize} {DiskSizeUsed} {DiskAvail} {DiskPerUse}% {DiskName} {DiskPerUse.color} diff -ruN templates/vmware-esx4/disk/oids templates-trunk/vmware-esx4/disk/oids --- templates/vmware-esx4/disk/oids 2009-03-12 15:19:26.000000000 -0500 +++ templates-trunk/vmware-esx4/disk/oids 1969-12-31 18:00:00.000000000 -0600 @@ -1,4 +0,0 @@ -DiskName : .1.3.6.1.2.1.25.2.3.1.3 : branch -DiskBlocks : .1.3.6.1.2.1.25.2.3.1.5 : branch -DiskBlocksUsed : .1.3.6.1.2.1.25.2.3.1.6 : branch -DiskBlockSize : .1.3.6.1.2.1.25.2.3.1.4 : branch diff -ruN templates/vmware-esx4/disk/thresholds templates-trunk/vmware-esx4/disk/thresholds --- templates/vmware-esx4/disk/thresholds 2009-03-12 15:19:26.000000000 -0500 +++ templates-trunk/vmware-esx4/disk/thresholds 1969-12-31 18:00:00.000000000 -0600 @@ -1,2 +0,0 @@ -DiskPerUse : yellow : 90 : Disk utilization is high -DiskPerUse : red : 95 : Disk utilization is critical diff -ruN templates/vmware-esx4/disk/transforms templates-trunk/vmware-esx4/disk/transforms --- templates/vmware-esx4/disk/transforms 2009-03-12 15:19:26.000000000 -0500 +++ templates-trunk/vmware-esx4/disk/transforms 1969-12-31 18:00:00.000000000 -0600 @@ -1,4 +0,0 @@ -DiskSize : MATH : {DiskBlocks} x {DiskBlockSize} / 1024 : 0 -DiskSizeUsed : MATH : {DiskBlocksUsed} x {DiskBlockSize} / 1024 : 0 -DiskAvail : MATH : {DiskSize} - {DiskSizeUsed} : 0 -DiskPerUse : MATH : ({DiskSizeUsed} x 100) / {DiskSize} : 0 diff -ruN templates/vmware-esx4/guests/exceptions templates-trunk/vmware-esx4/guests/exceptions --- templates/vmware-esx4/guests/exceptions 2010-10-29 11:13:08.000000000 -0500 +++ templates-trunk/vmware-esx4/guests/exceptions 1969-12-31 18:00:00.000000000 -0600 @@ -1 +0,0 @@ -vmwVmState : alarm : HereLiesBogusTextArrrr diff -ruN templates/vmware-esx4/guests/message templates-trunk/vmware-esx4/guests/message --- templates/vmware-esx4/guests/message 2010-10-29 11:12:22.000000000 -0500 +++ templates-trunk/vmware-esx4/guests/message 1969-12-31 18:00:00.000000000 -0600 @@ -1,5 +0,0 @@ -Guests : - -TABLE: -ID | Name | RAM Provisioned | Guest Tools | VM State -{vmwVmVMID} | {vmwVmDisplayName} | {vmwVmMemSize} | {vmwVmGuestState} | {vmwVmState.color}{vmwVmState} diff -ruN templates/vmware-esx4/guests/oids templates-trunk/vmware-esx4/guests/oids --- templates/vmware-esx4/guests/oids 2010-10-29 11:12:06.000000000 -0500 +++ templates-trunk/vmware-esx4/guests/oids 1969-12-31 18:00:00.000000000 -0600 @@ -1,5 +0,0 @@ -vmwVmDisplayName : .1.3.6.1.4.1.6876.2.1.1.2 : branch -vmwVmMemSize : .1.3.6.1.4.1.6876.2.1.1.5 : branch -vmwVmState : .1.3.6.1.4.1.6876.2.1.1.6 : branch -vmwVmVMID : .1.3.6.1.4.1.6876.2.1.1.7 : branch -vmwVmGuestState : .1.3.6.1.4.1.6876.2.1.1.8 : branch diff -ruN templates/vmware-esx4/guests/thresholds templates-trunk/vmware-esx4/guests/thresholds --- templates/vmware-esx4/guests/thresholds 2010-10-29 11:12:36.000000000 -0500 +++ templates-trunk/vmware-esx4/guests/thresholds 1969-12-31 18:00:00.000000000 -0600 @@ -1,2 +0,0 @@ -vmwVmState : green : On : VM {vmwVmDisplayName} is {vmwVmState} - diff -ruN templates/vmware-esx4/memory/message templates-trunk/vmware-esx4/memory/message --- templates/vmware-esx4/memory/message 2009-03-12 15:19:26.000000000 -0500 +++ templates-trunk/vmware-esx4/memory/message 1969-12-31 18:00:00.000000000 -0600 @@ -1,4 +0,0 @@ -Memory Used Total Percentage -Physical {MemSizeUsed}kB {MemSize}kB {MemPerUse}% {MemPerUse.color} -Swap {SwapSizeUsed}kB {SwapSize}kB {SwapPerUse}% {SwapPerUse.color} - diff -ruN templates/vmware-esx4/memory/oids templates-trunk/vmware-esx4/memory/oids --- templates/vmware-esx4/memory/oids 2009-03-12 15:19:26.000000000 -0500 +++ templates-trunk/vmware-esx4/memory/oids 1969-12-31 18:00:00.000000000 -0600 @@ -1,6 +0,0 @@ -MemBlocks : .1.3.6.1.2.1.25.2.3.1.5.2 : leaf -MemBlocksUsed : .1.3.6.1.2.1.25.2.3.1.6.2 : leaf -MemBlockSize : .1.3.6.1.2.1.25.2.3.1.4.2 : leaf -SwapBlocks : .1.3.6.1.2.1.25.2.3.1.5.3 : leaf -SwapBlocksUsed : .1.3.6.1.2.1.25.2.3.1.6.3 : leaf -SwapBlockSize : .1.3.6.1.2.1.25.2.3.1.4.3 : leaf diff -ruN templates/vmware-esx4/memory/thresholds templates-trunk/vmware-esx4/memory/thresholds --- templates/vmware-esx4/memory/thresholds 2009-03-12 15:19:26.000000000 -0500 +++ templates-trunk/vmware-esx4/memory/thresholds 1969-12-31 18:00:00.000000000 -0600 @@ -1,6 +0,0 @@ -MemPerUse : red : >99 : Memory utilization is critical -MemPerUse : yellow : >95 : Memory utilization is high - -SwapPerUse : red : >80 : Swap utilization is critical -SwapPerUse : yellow : >50 : Swap utilization is high - diff -ruN templates/vmware-esx4/memory/transforms templates-trunk/vmware-esx4/memory/transforms --- templates/vmware-esx4/memory/transforms 2009-03-12 15:19:26.000000000 -0500 +++ templates-trunk/vmware-esx4/memory/transforms 1969-12-31 18:00:00.000000000 -0600 @@ -1,11 +0,0 @@ -MemSize : MATH : {MemBlocks} x {MemBlockSize} / 1024 : 0 -MemSizeUsed : MATH : {MemBlocksUsed} x {MemBlockSize} / 1024 : 0 -MemAvail : MATH : {MemSize} - {MemSizeUsed} : 0 -MemPerUse : MATH : ({MemSizeUsed} x 100) / {MemSize} : 0 - -SwapSize : MATH : {SwapBlocks} x {SwapBlockSize} / 1024 : 0 -SwapSizeUsed : MATH : {SwapBlocksUsed} x {SwapBlockSize} / 1024 : 0 -SwapAvail : MATH : {SwapSize} - {SwapSizeUsed} : 0 -SwapPerUse : MATH : ({SwapSizeUsed} x 100) / {SwapSize} : 0 - - diff -ruN templates/vmware-esx4/specs templates-trunk/vmware-esx4/specs --- templates/vmware-esx4/specs 2010-10-28 11:33:30.000000000 -0500 +++ templates-trunk/vmware-esx4/specs 1969-12-31 18:00:00.000000000 -0600 @@ -1,4 +0,0 @@ -vendor : vmware -model : esx4 -snmpver : 2 -sysdesc : VmwareESX4