diff --git a/zbx-templates/zbx-dell-compellent/zbx-dell-compellent.xml b/zbx-templates/zbx-dell-compellent/zbx-dell-compellent.xml
index 849e563..2a6e397 100644
--- a/zbx-templates/zbx-dell-compellent/zbx-dell-compellent.xml
+++ b/zbx-templates/zbx-dell-compellent/zbx-dell-compellent.xml
@@ -941,7 +941,7 @@
                     <name>Server(s)</name>
                     <type>4</type>
                     <snmp_community>{$SNMP_COMMUNITY}</snmp_community>
-                    <snmp_oid>.1.3.6.1.4.1.16139.2.27.1.4.1</snmp_oid>
+                    <snmp_oid>.1.3.6.1.4.1.16139.2.27.1.4</snmp_oid>
                     <key>scServerName</key>
                     <delay>3600</delay>
                     <status>0</status>
diff --git a/zbx-templates/zbx-dell-powerconnect/zbx-dell-powerconnect-envmon/zbx-dell-powerconnect-envmon.xml b/zbx-templates/zbx-dell-powerconnect/zbx-dell-powerconnect-envmon/zbx-dell-powerconnect-envmon.xml
index 89a8f74..184631f 100644
--- a/zbx-templates/zbx-dell-powerconnect/zbx-dell-powerconnect-envmon/zbx-dell-powerconnect-envmon.xml
+++ b/zbx-templates/zbx-dell-powerconnect/zbx-dell-powerconnect-envmon/zbx-dell-powerconnect-envmon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>2.0</version>
-    <date>2012-11-05T15:17:17Z</date>
+    <date>2015-09-03T11:24:07Z</date>
     <groups>
         <group>
             <name>ZBX-DELL-POWERCONNECT-TEMPLATES</name>
@@ -11,6 +11,7 @@
         <template>
             <template>ZBX-DELL-POWERCONNECT-ENVMON</template>
             <name>ZBX-DELL-POWERCONNECT-ENVMON</name>
+            <description/>
             <groups>
                 <group>
                     <name>ZBX-DELL-POWERCONNECT-TEMPLATES</name>
@@ -40,9 +41,12 @@
                     <allowed_hosts/>
                     <units>bytes</units>
                     <delta>0</delta>
+                    <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
                     <snmpv3_authpassphrase/>
+                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
                     <formula>1000</formula>
                     <delay_flex/>
@@ -63,6 +67,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Contact</name>
@@ -79,9 +84,12 @@
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
+                    <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
                     <snmpv3_authpassphrase/>
+                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
@@ -102,6 +110,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Device Location</name>
@@ -118,9 +127,12 @@
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
+                    <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
                     <snmpv3_authpassphrase/>
+                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
@@ -141,6 +153,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Device Manufacter Name</name>
@@ -157,9 +170,12 @@
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
+                    <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
                     <snmpv3_authpassphrase/>
+                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
@@ -180,6 +196,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Device Model Name</name>
@@ -196,9 +213,12 @@
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
+                    <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
                     <snmpv3_authpassphrase/>
+                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
@@ -219,6 +239,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Device Name</name>
@@ -235,9 +256,12 @@
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
+                    <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
                     <snmpv3_authpassphrase/>
+                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
@@ -258,6 +282,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Device reachability using ICMP</name>
@@ -274,9 +299,12 @@
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
+                    <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
                     <snmpv3_authpassphrase/>
+                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
@@ -299,6 +327,7 @@
                     <valuemap>
                         <name>Host status</name>
                     </valuemap>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Device Serial Number</name>
@@ -315,9 +344,12 @@
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
+                    <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
                     <snmpv3_authpassphrase/>
+                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex>50/1-7,00:00-24:00</delay_flex>
@@ -338,6 +370,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Software version</name>
@@ -354,9 +387,12 @@
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
+                    <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
                     <snmpv3_authpassphrase/>
+                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
@@ -377,6 +413,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Software version (full)</name>
@@ -393,9 +430,12 @@
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
+                    <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
                     <snmpv3_authpassphrase/>
+                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
@@ -416,6 +456,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Unused memory for the last 5 minutes</name>
@@ -432,9 +473,12 @@
                     <allowed_hosts/>
                     <units>bytes</units>
                     <delta>0</delta>
+                    <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
                     <snmpv3_authpassphrase/>
+                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
                     <formula>1000</formula>
                     <delay_flex/>
@@ -455,6 +499,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Uptime</name>
@@ -471,9 +516,12 @@
                     <allowed_hosts/>
                     <units>uptime</units>
                     <delta>0</delta>
+                    <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
                     <snmpv3_authpassphrase/>
+                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
                     <formula>0.01</formula>
                     <delay_flex/>
@@ -494,6 +542,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Used CPU for the last 5 minutes</name>
@@ -510,9 +559,12 @@
                     <allowed_hosts/>
                     <units>%</units>
                     <delta>0</delta>
+                    <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
                     <snmpv3_authpassphrase/>
+                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
                     <formula>1</formula>
                     <delay_flex/>
@@ -533,6 +585,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
             </items>
             <discovery_rules>
@@ -545,9 +598,12 @@
                     <delay>300</delay>
                     <status>0</status>
                     <allowed_hosts/>
+                    <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
                     <snmpv3_authpassphrase/>
+                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
                     <delay_flex/>
                     <params/>
@@ -558,7 +614,11 @@
                     <publickey/>
                     <privatekey/>
                     <port/>
-                    <filter>:</filter>
+                    <filter>
+                        <evaltype>0</evaltype>
+                        <formula/>
+                        <conditions/>
+                    </filter>
                     <lifetime>7</lifetime>
                     <description/>
                     <item_prototypes>
@@ -568,7 +628,7 @@
                             <snmp_community>{$SNMP_COMMUNITY}</snmp_community>
                             <multiplier>0</multiplier>
                             <snmp_oid>.1.3.6.1.4.1.674.10895.3000.1.2.110.7.1.1.2.{#SNMPINDEX}</snmp_oid>
-                            <key>envMonFanStatusDescr[{#SNMPVALUE}]</key>
+                            <key>envMonFanStatusDescr[{#SNMPVALUE} {#SNMPINDEX}]</key>
                             <delay>300</delay>
                             <history>7</history>
                             <trends>365</trends>
@@ -577,9 +637,55 @@
                             <allowed_hosts/>
                             <units/>
                             <delta>0</delta>
+                            <snmpv3_contextname/>
+                            <snmpv3_securityname/>
+                            <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                            <snmpv3_authprotocol>0</snmpv3_authprotocol>
+                            <snmpv3_authpassphrase/>
+                            <snmpv3_privprotocol>0</snmpv3_privprotocol>
+                            <snmpv3_privpassphrase/>
+                            <formula>1</formula>
+                            <delay_flex/>
+                            <params/>
+                            <ipmi_sensor/>
+                            <data_type>0</data_type>
+                            <authtype>0</authtype>
+                            <username/>
+                            <password/>
+                            <publickey/>
+                            <privatekey/>
+                            <port/>
+                            <description/>
+                            <inventory_link>0</inventory_link>
+                            <applications>
+                                <application>
+                                    <name>System</name>
+                                </application>
+                            </applications>
+                            <valuemap/>
+                            <logtimefmt/>
+                        </item_prototype>
+                        <item_prototype>
+                            <name>$1 Speed</name>
+                            <type>4</type>
+                            <snmp_community>{$SNMP_COMMUNITY}</snmp_community>
+                            <multiplier>0</multiplier>
+                            <snmp_oid>.1.3.6.1.4.1.674.10895.3000.1.2.110.7.1.1.4.{#SNMPINDEX}</snmp_oid>
+                            <key>envMonFanSpeed[{#SNMPVALUE} {#SNMPINDEX}]</key>
+                            <delay>300</delay>
+                            <history>7</history>
+                            <trends>365</trends>
+                            <status>0</status>
+                            <value_type>3</value_type>
+                            <allowed_hosts/>
+                            <units/>
+                            <delta>0</delta>
+                            <snmpv3_contextname/>
                             <snmpv3_securityname/>
                             <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                            <snmpv3_authprotocol>0</snmpv3_authprotocol>
                             <snmpv3_authpassphrase/>
+                            <snmpv3_privprotocol>0</snmpv3_privprotocol>
                             <snmpv3_privpassphrase/>
                             <formula>1</formula>
                             <delay_flex/>
@@ -600,14 +706,15 @@
                                 </application>
                             </applications>
                             <valuemap/>
+                            <logtimefmt/>
                         </item_prototype>
                         <item_prototype>
-                            <name>$1 state</name>
+                            <name>$1 State</name>
                             <type>4</type>
                             <snmp_community>{$SNMP_COMMUNITY}</snmp_community>
                             <multiplier>0</multiplier>
                             <snmp_oid>.1.3.6.1.4.1.674.10895.3000.1.2.110.7.1.1.3.{#SNMPINDEX}</snmp_oid>
-                            <key>envMonFanState[{#SNMPVALUE}]</key>
+                            <key>envMonFanState[{#SNMPVALUE} {#SNMPINDEX}]</key>
                             <delay>300</delay>
                             <history>7</history>
                             <trends>365</trends>
@@ -616,9 +723,12 @@
                             <allowed_hosts/>
                             <units/>
                             <delta>0</delta>
+                            <snmpv3_contextname/>
                             <snmpv3_securityname/>
                             <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                            <snmpv3_authprotocol>0</snmpv3_authprotocol>
                             <snmpv3_authpassphrase/>
+                            <snmpv3_privprotocol>0</snmpv3_privprotocol>
                             <snmpv3_privpassphrase/>
                             <formula>1</formula>
                             <delay_flex/>
@@ -641,11 +751,12 @@
                             <valuemap>
                                 <name>dellEnvMonState</name>
                             </valuemap>
+                            <logtimefmt/>
                         </item_prototype>
                     </item_prototypes>
                     <trigger_prototypes>
                         <trigger_prototype>
-                            <expression>{ZBX-DELL-POWERCONNECT-ENVMON:envMonFanState[{#SNMPVALUE}].diff(0)}=1</expression>
+                            <expression>{ZBX-DELL-POWERCONNECT-ENVMON:envMonFanState[{#SNMPVALUE} {#SNMPINDEX}].diff(0)}=1</expression>
                             <name>Operational status for {#SNMPVALUE} was changed</name>
                             <url/>
                             <status>0</status>
@@ -655,6 +766,7 @@
                         </trigger_prototype>
                     </trigger_prototypes>
                     <graph_prototypes/>
+                    <host_prototypes/>
                 </discovery_rule>
                 <discovery_rule>
                     <name>Power Supply</name>
@@ -665,9 +777,12 @@
                     <delay>300</delay>
                     <status>0</status>
                     <allowed_hosts/>
+                    <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
                     <snmpv3_authpassphrase/>
+                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
                     <delay_flex/>
                     <params/>
@@ -678,7 +793,11 @@
                     <publickey/>
                     <privatekey/>
                     <port/>
-                    <filter>:</filter>
+                    <filter>
+                        <evaltype>0</evaltype>
+                        <formula/>
+                        <conditions/>
+                    </filter>
                     <lifetime>7</lifetime>
                     <description/>
                     <item_prototypes>
@@ -688,7 +807,7 @@
                             <snmp_community>{$SNMP_COMMUNITY}</snmp_community>
                             <multiplier>0</multiplier>
                             <snmp_oid>.1.3.6.1.4.1.674.10895.3000.1.2.110.7.2.1.2.{#SNMPINDEX}</snmp_oid>
-                            <key>envMonSupplyStatusDescr[{#SNMPVALUE}]</key>
+                            <key>envMonSupplyStatusDescr[{#SNMPVALUE}  {#SNMPINDEX}]</key>
                             <delay>300</delay>
                             <history>7</history>
                             <trends>365</trends>
@@ -697,9 +816,12 @@
                             <allowed_hosts/>
                             <units/>
                             <delta>0</delta>
+                            <snmpv3_contextname/>
                             <snmpv3_securityname/>
                             <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                            <snmpv3_authprotocol>0</snmpv3_authprotocol>
                             <snmpv3_authpassphrase/>
+                            <snmpv3_privprotocol>0</snmpv3_privprotocol>
                             <snmpv3_privpassphrase/>
                             <formula>1</formula>
                             <delay_flex/>
@@ -720,6 +842,7 @@
                                 </application>
                             </applications>
                             <valuemap/>
+                            <logtimefmt/>
                         </item_prototype>
                         <item_prototype>
                             <name>$1 power supply state</name>
@@ -727,7 +850,7 @@
                             <snmp_community>{$SNMP_COMMUNITY}</snmp_community>
                             <multiplier>0</multiplier>
                             <snmp_oid>.1.3.6.1.4.1.674.10895.3000.1.2.110.7.2.1.3.{#SNMPINDEX}</snmp_oid>
-                            <key>envMonSupplyState[{#SNMPVALUE}]</key>
+                            <key>envMonSupplyState[{#SNMPVALUE} {#SNMPINDEX}]</key>
                             <delay>300</delay>
                             <history>7</history>
                             <trends>365</trends>
@@ -736,9 +859,12 @@
                             <allowed_hosts/>
                             <units/>
                             <delta>0</delta>
+                            <snmpv3_contextname/>
                             <snmpv3_securityname/>
                             <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                            <snmpv3_authprotocol>0</snmpv3_authprotocol>
                             <snmpv3_authpassphrase/>
+                            <snmpv3_privprotocol>0</snmpv3_privprotocol>
                             <snmpv3_privpassphrase/>
                             <formula>1</formula>
                             <delay_flex/>
@@ -761,11 +887,12 @@
                             <valuemap>
                                 <name>dellEnvMonState</name>
                             </valuemap>
+                            <logtimefmt/>
                         </item_prototype>
                     </item_prototypes>
                     <trigger_prototypes>
                         <trigger_prototype>
-                            <expression>{ZBX-DELL-POWERCONNECT-ENVMON:envMonSupplyState[{#SNMPVALUE}].diff(0)}=1</expression>
+                            <expression>{ZBX-DELL-POWERCONNECT-ENVMON:envMonSupplyState[{#SNMPVALUE} {#SNMPINDEX}].diff(0)}=1</expression>
                             <name>Operational status for {#SNMPVALUE} power supply was changed</name>
                             <url/>
                             <status>0</status>
@@ -775,6 +902,7 @@
                         </trigger_prototype>
                     </trigger_prototypes>
                     <graph_prototypes/>
+                    <host_prototypes/>
                 </discovery_rule>
             </discovery_rules>
             <macros/>
@@ -797,7 +925,7 @@
             <expression>({ZBX-DELL-POWERCONNECT-ENVMON:agentSwitchCpuProcessMemAvailable.last(0)}-{ZBX-DELL-POWERCONNECT-ENVMON:agentSwitchCpuProcessMemFree.last(0)})&gt;0.6*{ZBX-DELL-POWERCONNECT-ENVMON:agentSwitchCpuProcessMemAvailable.last(0)}</expression>
             <name>Memory usage exceeded 60%</name>
             <url/>
-            <status>0</status>
+            <status>1</status>
             <priority>2</priority>
             <description/>
             <type>0</type>
@@ -807,7 +935,7 @@
             <expression>({ZBX-DELL-POWERCONNECT-ENVMON:agentSwitchCpuProcessMemAvailable.last(0)}-{ZBX-DELL-POWERCONNECT-ENVMON:agentSwitchCpuProcessMemFree.last(0)})&gt;0.7*{ZBX-DELL-POWERCONNECT-ENVMON:agentSwitchCpuProcessMemAvailable.last(0)}</expression>
             <name>Memory usage exceeded 70%</name>
             <url/>
-            <status>0</status>
+            <status>1</status>
             <priority>3</priority>
             <description/>
             <type>0</type>
@@ -817,7 +945,7 @@
             <expression>({ZBX-DELL-POWERCONNECT-ENVMON:agentSwitchCpuProcessMemAvailable.last(0)}-{ZBX-DELL-POWERCONNECT-ENVMON:agentSwitchCpuProcessMemFree.last(0)})&gt;0.8*{ZBX-DELL-POWERCONNECT-ENVMON:agentSwitchCpuProcessMemAvailable.last(0)}</expression>
             <name>Memory usage exceeded 80%</name>
             <url/>
-            <status>0</status>
+            <status>1</status>
             <priority>4</priority>
             <description/>
             <type>0</type>
diff --git a/zbx-templates/zbx-dell-powerconnect/zbx-dell-powerconnect-hardware/zbx-dell-powerconnect-hardware.xml b/zbx-templates/zbx-dell-powerconnect/zbx-dell-powerconnect-hardware/zbx-dell-powerconnect-hardware.xml
index d1e3951..1bf4104 100644
--- a/zbx-templates/zbx-dell-powerconnect/zbx-dell-powerconnect-hardware/zbx-dell-powerconnect-hardware.xml
+++ b/zbx-templates/zbx-dell-powerconnect/zbx-dell-powerconnect-hardware/zbx-dell-powerconnect-hardware.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>2.0</version>
-    <date>2012-11-05T15:20:12Z</date>
+    <date>2015-09-03T11:26:58Z</date>
     <groups>
         <group>
             <name>ZBX-DELL-POWERCONNECT-TEMPLATES</name>
@@ -11,6 +11,7 @@
         <template>
             <template>ZBX-DELL-POWERCONNECT-HARDWARE</template>
             <name>ZBX-DELL-POWERCONNECT-HARDWARE</name>
+            <description/>
             <groups>
                 <group>
                     <name>ZBX-DELL-POWERCONNECT-TEMPLATES</name>
@@ -32,9 +33,12 @@
                     <delay>300</delay>
                     <status>0</status>
                     <allowed_hosts/>
+                    <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
                     <snmpv3_authpassphrase/>
+                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
                     <delay_flex/>
                     <params/>
@@ -45,7 +49,11 @@
                     <publickey/>
                     <privatekey/>
                     <port/>
-                    <filter>:</filter>
+                    <filter>
+                        <evaltype>0</evaltype>
+                        <formula/>
+                        <conditions/>
+                    </filter>
                     <lifetime>7</lifetime>
                     <description/>
                     <item_prototypes>
@@ -55,7 +63,7 @@
                             <snmp_community>{$SNMP_COMMUNITY}</snmp_community>
                             <multiplier>0</multiplier>
                             <snmp_oid>.1.3.6.1.4.1.674.10895.3000.1.2.100.8.1.3.{#SNMPINDEX}</snmp_oid>
-                            <key>productIdentificationAssetTag[{#SNMPVALUE}]</key>
+                            <key>productIdentificationAssetTag[{#SNMPINDEX}]</key>
                             <delay>300</delay>
                             <history>7</history>
                             <trends>365</trends>
@@ -64,9 +72,12 @@
                             <allowed_hosts/>
                             <units/>
                             <delta>0</delta>
+                            <snmpv3_contextname/>
                             <snmpv3_securityname/>
                             <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                            <snmpv3_authprotocol>0</snmpv3_authprotocol>
                             <snmpv3_authpassphrase/>
+                            <snmpv3_privprotocol>0</snmpv3_privprotocol>
                             <snmpv3_privpassphrase/>
                             <formula>1</formula>
                             <delay_flex/>
@@ -87,6 +98,7 @@
                                 </application>
                             </applications>
                             <valuemap/>
+                            <logtimefmt/>
                         </item_prototype>
                         <item_prototype>
                             <name>Bootrom version of unit $1</name>
@@ -94,7 +106,7 @@
                             <snmp_community>{$SNMP_COMMUNITY}</snmp_community>
                             <multiplier>0</multiplier>
                             <snmp_oid>.1.3.6.1.4.1.674.10895.3000.1.2.100.8.1.6.{#SNMPINDEX}</snmp_oid>
-                            <key>productIdentificationBootromVersion[{#SNMPVALUE}]</key>
+                            <key>productIdentificationBootromVersion[{#SNMPINDEX}]</key>
                             <delay>300</delay>
                             <history>7</history>
                             <trends>365</trends>
@@ -103,9 +115,12 @@
                             <allowed_hosts/>
                             <units/>
                             <delta>0</delta>
+                            <snmpv3_contextname/>
                             <snmpv3_securityname/>
                             <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                            <snmpv3_authprotocol>0</snmpv3_authprotocol>
                             <snmpv3_authpassphrase/>
+                            <snmpv3_privprotocol>0</snmpv3_privprotocol>
                             <snmpv3_privpassphrase/>
                             <formula>1</formula>
                             <delay_flex/>
@@ -126,6 +141,7 @@
                                 </application>
                             </applications>
                             <valuemap/>
+                            <logtimefmt/>
                         </item_prototype>
                         <item_prototype>
                             <name>Chassis service tag of unit $1</name>
@@ -133,7 +149,7 @@
                             <snmp_community>{$SNMP_COMMUNITY}</snmp_community>
                             <multiplier>0</multiplier>
                             <snmp_oid>.1.3.6.1.4.1.674.10895.3000.1.2.100.8.1.5.{#SNMPINDEX}</snmp_oid>
-                            <key>productIdentificationChassisServiceTag[{#SNMPVALUE}]</key>
+                            <key>productIdentificationChassisServiceTag[{#SNMPINDEX}]</key>
                             <delay>300</delay>
                             <history>7</history>
                             <trends>365</trends>
@@ -142,9 +158,12 @@
                             <allowed_hosts/>
                             <units/>
                             <delta>0</delta>
+                            <snmpv3_contextname/>
                             <snmpv3_securityname/>
                             <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                            <snmpv3_authprotocol>0</snmpv3_authprotocol>
                             <snmpv3_authpassphrase/>
+                            <snmpv3_privprotocol>0</snmpv3_privprotocol>
                             <snmpv3_privpassphrase/>
                             <formula>1</formula>
                             <delay_flex/>
@@ -165,6 +184,7 @@
                                 </application>
                             </applications>
                             <valuemap/>
+                            <logtimefmt/>
                         </item_prototype>
                         <item_prototype>
                             <name>Serial number of unit $1</name>
@@ -172,7 +192,7 @@
                             <snmp_community>{$SNMP_COMMUNITY}</snmp_community>
                             <multiplier>0</multiplier>
                             <snmp_oid>.1.3.6.1.4.1.674.10895.3000.1.2.100.8.1.2.{#SNMPINDEX}</snmp_oid>
-                            <key>productIdentificationSerialNumber[{#SNMPVALUE}]</key>
+                            <key>productIdentificationSerialNumber[{#SNMPINDEX}]</key>
                             <delay>300</delay>
                             <history>7</history>
                             <trends>365</trends>
@@ -181,9 +201,12 @@
                             <allowed_hosts/>
                             <units/>
                             <delta>0</delta>
+                            <snmpv3_contextname/>
                             <snmpv3_securityname/>
                             <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                            <snmpv3_authprotocol>0</snmpv3_authprotocol>
                             <snmpv3_authpassphrase/>
+                            <snmpv3_privprotocol>0</snmpv3_privprotocol>
                             <snmpv3_privpassphrase/>
                             <formula>1</formula>
                             <delay_flex/>
@@ -204,6 +227,7 @@
                                 </application>
                             </applications>
                             <valuemap/>
+                            <logtimefmt/>
                         </item_prototype>
                         <item_prototype>
                             <name>Service tag of unit $1</name>
@@ -211,7 +235,7 @@
                             <snmp_community>{$SNMP_COMMUNITY}</snmp_community>
                             <multiplier>0</multiplier>
                             <snmp_oid>.1.3.6.1.4.1.674.10895.3000.1.2.100.8.1.4.{#SNMPINDEX}</snmp_oid>
-                            <key>productIdentificationServiceTag[{#SNMPVALUE}]</key>
+                            <key>productIdentificationServiceTag[{#SNMPINDEX}]</key>
                             <delay>300</delay>
                             <history>7</history>
                             <trends>365</trends>
@@ -220,9 +244,12 @@
                             <allowed_hosts/>
                             <units/>
                             <delta>0</delta>
+                            <snmpv3_contextname/>
                             <snmpv3_securityname/>
                             <snmpv3_securitylevel>0</snmpv3_securitylevel>
+                            <snmpv3_authprotocol>0</snmpv3_authprotocol>
                             <snmpv3_authpassphrase/>
+                            <snmpv3_privprotocol>0</snmpv3_privprotocol>
                             <snmpv3_privpassphrase/>
                             <formula>1</formula>
                             <delay_flex/>
@@ -243,11 +270,12 @@
                                 </application>
                             </applications>
                             <valuemap/>
+                            <logtimefmt/>
                         </item_prototype>
                     </item_prototypes>
                     <trigger_prototypes>
                         <trigger_prototype>
-                            <expression>{ZBX-DELL-POWERCONNECT-HARDWARE:productIdentificationBootromVersion[{#SNMPVALUE}].diff(0)}&gt;0</expression>
+                            <expression>{ZBX-DELL-POWERCONNECT-HARDWARE:productIdentificationBootromVersion[{#SNMPINDEX}].diff(0)}&gt;0</expression>
                             <name>Bootrom version of unit {#SNMPVALUE} was changed</name>
                             <url/>
                             <status>0</status>
@@ -256,7 +284,7 @@
                             <type>0</type>
                         </trigger_prototype>
                         <trigger_prototype>
-                            <expression>{ZBX-DELL-POWERCONNECT-HARDWARE:productIdentificationSerialNumber[{#SNMPVALUE}].diff(0)}&gt;0</expression>
+                            <expression>{ZBX-DELL-POWERCONNECT-HARDWARE:productIdentificationSerialNumber[{#SNMPINDEX}].diff(0)}&gt;0</expression>
                             <name>Serial number of unit {#SNMPVALUE} was changed</name>
                             <url/>
                             <status>0</status>
@@ -266,6 +294,7 @@
                         </trigger_prototype>
                     </trigger_prototypes>
                     <graph_prototypes/>
+                    <host_prototypes/>
                 </discovery_rule>
             </discovery_rules>
             <macros/>
diff --git a/zbx-templates/zbx-dell-powerconnect/zbx-dell-powerconnect-interfaces/zbx-dell-powerconnect-interfaces.xml b/zbx-templates/zbx-dell-powerconnect/zbx-dell-powerconnect-interfaces/zbx-dell-powerconnect-interfaces.xml
index 92307b0..6f9a28a 100644
--- a/zbx-templates/zbx-dell-powerconnect/zbx-dell-powerconnect-interfaces/zbx-dell-powerconnect-interfaces.xml
+++ b/zbx-templates/zbx-dell-powerconnect/zbx-dell-powerconnect-interfaces/zbx-dell-powerconnect-interfaces.xml
@@ -27,7 +27,7 @@
                     <name>Network Interfaces</name>
                     <type>4</type>
                     <snmp_community>{$SNMP_COMMUNITY}</snmp_community>
-                    <snmp_oid>.1.3.6.1.2.1.31.1.1.1.1</snmp_oid>
+                    <snmp_oid>IF-MIB::ifName</snmp_oid>
                     <key>ifName</key>
                     <delay>300</delay>
                     <status>0</status>
@@ -251,8 +251,8 @@
                             <type>4</type>
                             <snmp_community>{$SNMP_COMMUNITY}</snmp_community>
                             <multiplier>1</multiplier>
-                            <snmp_oid>IF-MIB::ifInOctets.{#SNMPINDEX}</snmp_oid>
-                            <key>ifInOctets[{#SNMPVALUE}]</key>
+                            <snmp_oid>IF-MIB::ifHCInOctets.{#SNMPINDEX}</snmp_oid>
+                            <key>ifHCInOctets[{#SNMPVALUE}]</key>
                             <delay>60</delay>
                             <history>7</history>
                             <trends>365</trends>
@@ -285,45 +285,6 @@
                             </applications>
                             <valuemap/>
                         </item_prototype>
-                        <item_prototype>
-                            <name>Length of the output packet queue for interface $1</name>
-                            <type>4</type>
-                            <snmp_community>{$SNMP_COMMUNITY}</snmp_community>
-                            <multiplier>0</multiplier>
-                            <snmp_oid>.1.3.6.1.2.1.2.2.1.21.{#SNMPINDEX}</snmp_oid>
-                            <key>ifOutQLen[{#SNMPVALUE}]</key>
-                            <delay>60</delay>
-                            <history>7</history>
-                            <trends>365</trends>
-                            <status>0</status>
-                            <value_type>3</value_type>
-                            <allowed_hosts/>
-                            <units>Packets</units>
-                            <delta>0</delta>
-                            <snmpv3_securityname/>
-                            <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                            <snmpv3_authpassphrase/>
-                            <snmpv3_privpassphrase/>
-                            <formula>1</formula>
-                            <delay_flex/>
-                            <params/>
-                            <ipmi_sensor/>
-                            <data_type>0</data_type>
-                            <authtype>0</authtype>
-                            <username/>
-                            <password/>
-                            <publickey/>
-                            <privatekey/>
-                            <port/>
-                            <description/>
-                            <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>Interface(s)</name>
-                                </application>
-                            </applications>
-                            <valuemap/>
-                        </item_prototype>
                         <item_prototype>
                             <name>Operational status of interface $1</name>
                             <type>4</type>
@@ -448,8 +409,8 @@
                             <type>4</type>
                             <snmp_community>{$SNMP_COMMUNITY}</snmp_community>
                             <multiplier>1</multiplier>
-                            <snmp_oid>IF-MIB::ifOutOctets.{#SNMPINDEX}</snmp_oid>
-                            <key>ifOutOctets[{#SNMPVALUE}]</key>
+                            <snmp_oid>IF-MIB::ifHCOutOctets.{#SNMPINDEX}</snmp_oid>
+                            <key>ifHCOutOctets[{#SNMPVALUE}]</key>
                             <delay>60</delay>
                             <history>7</history>
                             <trends>365</trends>
@@ -524,7 +485,7 @@
                     </item_prototypes>
                     <trigger_prototypes>
                         <trigger_prototype>
-                            <expression>{ZBX-DELL-POWERCONNECT-INTERFACES:if.speed[&quot;-d&quot;,&quot;{HOST.HOST}&quot;,&quot;-c&quot;,&quot;{$SNMP_COMMUNITY}&quot;,&quot;-s&quot;,&quot;{#SNMPINDEX}&quot;].last(0)}&gt;0 &amp; ({ZBX-DELL-POWERCONNECT-INTERFACES:ifInOctets[{#SNMPVALUE}].avg(300)})&gt;({ZBX-DELL-POWERCONNECT-INTERFACES:if.speed[&quot;-d&quot;,&quot;{HOST.HOST}&quot;,&quot;-c&quot;,&quot;{$SNMP_COMMUNITY}&quot;,&quot;-s&quot;,&quot;{#SNMPINDEX}&quot;].last(0)})*0.8</expression>
+                            <expression>{ZBX-DELL-POWERCONNECT-INTERFACES:if.speed[&quot;-d&quot;,&quot;{HOST.HOST}&quot;,&quot;-c&quot;,&quot;{$SNMP_COMMUNITY}&quot;,&quot;-s&quot;,&quot;{#SNMPINDEX}&quot;].last(0)}&gt;0 &amp; ({ZBX-DELL-POWERCONNECT-INTERFACES:ifHCInOctets[{#SNMPVALUE}].avg(300)})&gt;({ZBX-DELL-POWERCONNECT-INTERFACES:if.speed[&quot;-d&quot;,&quot;{HOST.HOST}&quot;,&quot;-c&quot;,&quot;{$SNMP_COMMUNITY}&quot;,&quot;-s&quot;,&quot;{#SNMPINDEX}&quot;].last(0)})*0.8</expression>
                             <name>Incoming use on interface {#SNMPVALUE} exceed 80% for the last 5 minutes</name>
                             <url/>
                             <status>0</status>
@@ -551,7 +512,7 @@
                             <type>0</type>
                         </trigger_prototype>
                         <trigger_prototype>
-                            <expression>{ZBX-DELL-POWERCONNECT-INTERFACES:if.speed[&quot;-d&quot;,&quot;{HOST.HOST}&quot;,&quot;-c&quot;,&quot;{$SNMP_COMMUNITY}&quot;,&quot;-s&quot;,&quot;{#SNMPINDEX}&quot;].last(0)}&gt;0 &amp; ({ZBX-DELL-POWERCONNECT-INTERFACES:ifOutOctets[{#SNMPVALUE}].avg(300)})&gt;({ZBX-DELL-POWERCONNECT-INTERFACES:if.speed[&quot;-d&quot;,&quot;{HOST.HOST}&quot;,&quot;-c&quot;,&quot;{$SNMP_COMMUNITY}&quot;,&quot;-s&quot;,&quot;{#SNMPINDEX}&quot;].last(0)})*0.8</expression>
+                            <expression>{ZBX-DELL-POWERCONNECT-INTERFACES:if.speed[&quot;-d&quot;,&quot;{HOST.HOST}&quot;,&quot;-c&quot;,&quot;{$SNMP_COMMUNITY}&quot;,&quot;-s&quot;,&quot;{#SNMPINDEX}&quot;].last(0)}&gt;0 &amp; ({ZBX-DELL-POWERCONNECT-INTERFACES:ifHCOutOctets[{#SNMPVALUE}].avg(300)})&gt;({ZBX-DELL-POWERCONNECT-INTERFACES:if.speed[&quot;-d&quot;,&quot;{HOST.HOST}&quot;,&quot;-c&quot;,&quot;{$SNMP_COMMUNITY}&quot;,&quot;-s&quot;,&quot;{#SNMPINDEX}&quot;].last(0)})*0.8</expression>
                             <name>Outgoing use on interface {#SNMPVALUE} exceed 80% for the last 5 minutes</name>
                             <url/>
                             <status>0</status>
@@ -559,15 +520,6 @@
                             <description/>
                             <type>0</type>
                         </trigger_prototype>
-                        <trigger_prototype>
-                            <expression>{ZBX-DELL-POWERCONNECT-INTERFACES:ifOutQLen[{#SNMPVALUE}].last(0)}&gt;0</expression>
-                            <name>Output packets queue for {#SNMPVALUE} is not empty</name>
-                            <url/>
-                            <status>0</status>
-                            <priority>1</priority>
-                            <description/>
-                            <type>0</type>
-                        </trigger_prototype>
                     </trigger_prototypes>
                     <graph_prototypes>
                         <graph_prototype>
@@ -638,38 +590,6 @@
                                 </graph_item>
                             </graph_items>
                         </graph_prototype>
-                        <graph_prototype>
-                            <name>Interface {#SNMPVALUE} - Length of the output packets queue</name>
-                            <width>900</width>
-                            <height>200</height>
-                            <yaxismin>0.0000</yaxismin>
-                            <yaxismax>100.0000</yaxismax>
-                            <show_work_period>1</show_work_period>
-                            <show_triggers>1</show_triggers>
-                            <type>0</type>
-                            <show_legend>1</show_legend>
-                            <show_3d>0</show_3d>
-                            <percent_left>0.0000</percent_left>
-                            <percent_right>0.0000</percent_right>
-                            <ymin_type_1>0</ymin_type_1>
-                            <ymax_type_1>0</ymax_type_1>
-                            <ymin_item_1>0</ymin_item_1>
-                            <ymax_item_1>0</ymax_item_1>
-                            <graph_items>
-                                <graph_item>
-                                    <sortorder>0</sortorder>
-                                    <drawtype>1</drawtype>
-                                    <color>C80000</color>
-                                    <yaxisside>0</yaxisside>
-                                    <calc_fnc>2</calc_fnc>
-                                    <type>0</type>
-                                    <item>
-                                        <host>ZBX-DELL-POWERCONNECT-INTERFACES</host>
-                                        <key>ifOutQLen[{#SNMPVALUE}]</key>
-                                    </item>
-                                </graph_item>
-                            </graph_items>
-                        </graph_prototype>
                         <graph_prototype>
                             <name>Interface {#SNMPVALUE} - Traffic (bits/sec, 95th Percentile)</name>
                             <width>900</width>
@@ -697,7 +617,7 @@
                                     <type>0</type>
                                     <item>
                                         <host>ZBX-DELL-POWERCONNECT-INTERFACES</host>
-                                        <key>ifInOctets[{#SNMPVALUE}]</key>
+                                        <key>ifHCInOctets[{#SNMPVALUE}]</key>
                                     </item>
                                 </graph_item>
                                 <graph_item>
@@ -709,7 +629,7 @@
                                     <type>0</type>
                                     <item>
                                         <host>ZBX-DELL-POWERCONNECT-INTERFACES</host>
-                                        <key>ifOutOctets[{#SNMPVALUE}]</key>
+                                        <key>ifHCOutOctets[{#SNMPVALUE}]</key>
                                     </item>
                                 </graph_item>
                             </graph_items>