diff --git a/README.md b/README.md
index e00bd09c0d7f97eb618116523c5d2cb4ce8d044b..16f9b82232f20ef01642fec67939bca9b644aa57 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,10 @@ Template App Amavisd
 ======
 Monitoring for Amavisd service.
 
+Template App Apache
+======
+Monitoring for Apache service.
+
 Template App APC
 ======
 Monitoring memory usage of APC (http://pecl.php.net/package/APC) module. File ```bin/apc-stats.php``` need to be accessed via HTTP for example http://127.0.0.1/apc-stats.php
@@ -26,10 +30,18 @@ Template App BIND
 ======
 Monitoring for BIND (DNS server) service. Checking also version of BIND.
 
+Template App Brocade HBA
+======
+Monitoring for Network Adapters - Brocade. Template is using Discovery to create Items and Triggers. You need also add SUDO for zabbix user: ```zabbix ALL=(ALL) NOPASSWD: /usr/bin/bcu```
+
 Template App Clamav
 ======
 Monitoring for ClamAV.
 
+Template App cPanel
+======
+Monitoring basic WHM/cPanel services.
+
 Template App Dovecot
 ======
 Monitoring for Dovecot.
@@ -50,6 +62,10 @@ Template App mdadm
 ======
 Monitoring mdadm arrays. Checking number of corrupted disk arrays.
 
+Template App Monit
+=====
+Monitoring for Monit service.
+
 Template App MySQL
 =====
 Monitoring for MySQL 5.5, 5.6 and 5.7. It is using PHP-cli for monitoring. You need also add zabbix user to database. Please run SQL query:
@@ -76,56 +92,103 @@ Template App Nginx
 ======
 Monitoring for Nginx. It is using script ```nginx-check.sh``` written by Vincent Viallet.
 
-Template App Brocade HBA
+Template App Nscd
 ======
-Monitoring for Network Adapters - Brocade. Template is using Discovery to create Items and Triggers. You need also add SUDO for zabbix user: ```zabbix ALL=(ALL) NOPASSWD: /usr/bin/bcu```
+Nscd is a daemon that provides a cache for the most common name service requests. Nscd provides caching for accesses of the passwd(5), group(5), and hosts(5) databases through standard libc interfaces, such as getpwnam(3), getpwuid(3), getgrnam(3), getgrgid(3), gethostbyname(3), and others.
+
+You need also add SUDO for zabbix user: ```zabbix  ALL=(ALL) NOPASSWD: /usr/sbin/nscd -g```
+
+Template App OPcache
+======
+Monitoring memory usage of OPcache (http://php.net/manual/en/book.opcache.php). File ```bin/opcache.php``` need to be accessed via HTTP for example http://127.0.0.1/opcache.php. Curl need to be installed on server.
 
 Template App OpenDKIM
 ======
 Monitoring for OpenDKIM.
 
+Template App OpenVPN
+======
+Monitoring for OpenVPN service.
+
+Template App Percona XtraBackup
+======
+Monitoring for Percona XtraBackup.
+
+Template App PHP
+======
+Monitoring for PHP.
+
+Template App php-fpm
+======
+Monitoring for php-fpm.
+
 Template App Postfix
 ======
 Monitoring for mail server Postfix.
 
+Template App PostgreSQL
+=====
+Monitoring for PostgreSQL.
+
+Template App PowerPath
+======
+Monitoring for EMC PowerPath: Host-based software for automated data path management, failover and recovery, and optimized load balancing. PowerPath automates, standardizes, and optimizes data paths in physical and virtual environments as well as cloud deployments to deliver high availability and performance.
+
 Template App Pure-FTPd
 ======
 Monitoring for Pure-FTPd.
 
+Template App RabbitMQ
+======
+Monitoring RabbitMQ (http://www.rabbitmq.com/) basic parameters like queues, exchanges and memory usage. You need install PHP on server for monitoring RabbitMQ. You need also add SUDO for zabbix user:
+
+```
+zabbix ALL=(ALL) NOPASSWD: /usr/sbin/rabbitmqctl
+zabbix ALL=(ALL) NOPASSWD: /usr/bin/php /etc/zabbix/bin/rabbit.php
+```
+
 Template App Redis
 ======
 Monitoring for redis server 3.x. Support for redis cluster.
 
-Template App Spamassassin
+Template App Rserve
 ======
-Monitoring for Spamassassin.
+Monitoring for Rserve, Binary R server.
 
-Template App vsftpd
+Template App S.M.A.R.T.
 ======
-Monitoring for vsftpd.
+Monitoring for S.M.A.R.T. enabled storage devices (HDD's, SSD's and other). Uses discovery script to populate disks. INFO: For non present S.M.A.R.T. values disable items on per-host level.
 
-Template App Nscd
+Template and scripts created by:
+Michał Macioszek, Taras Baran, Michal Gębora, Marcin Wilk, Maks Bednarek, Anna Fałek, Mikołaj Szczuraszek
+
+Template App Solr
 ======
-Nscd is a daemon that provides a cache for the most common name service requests. Nscd provides caching for accesses of the passwd(5), group(5), and hosts(5) databases through standard libc interfaces, such as getpwnam(3), getpwuid(3), getgrnam(3), getgrgid(3), gethostbyname(3), and others.
+Monitoring for Solr.
 
-You need also add SUDO for zabbix user: ```zabbix  ALL=(ALL) NOPASSWD: /usr/sbin/nscd -g```
+Template App Spamassassin
+======
+Monitoring for Spamassassin.
 
-Template App OPcache
+Template App SPAM Blacklist
 ======
-Monitoring memory usage of OPcache (http://php.net/manual/en/book.opcache.php). File ```bin/opcache.php``` need to be accessed via HTTP for example http://127.0.0.1/opcache.php. Curl need to be installed on server.
+Monitoring for SPAM Blacklist.
 
-Template App RabbitMQ
+Template App Unicorn
 ======
-Monitoring RabbitMQ (http://www.rabbitmq.com/) basic parameters like queues, exchanges and memory usage. You need install PHP on server for monitoring RabbitMQ. You need also add SUDO for zabbix user:
+Monitoring for Unicorn.
 
-```
-zabbix ALL=(ALL) NOPASSWD: /usr/sbin/rabbitmqctl
-zabbix ALL=(ALL) NOPASSWD: /usr/bin/php /etc/zabbix/bin/rabbit.php
-```
+Template App Unicorn Rails
+======
+Monitoring for Unicorn Rails.
 
-Template App cPanel
+Template App vsftpd
 ======
-Monitoring basic WHM/cPanel services.
+Monitoring for vsftpd.
+
+Template Device Back-UPS ES 700G	
+======
+Monitoring of APC UPS dedicated battery power. Requires package apcupsd to be installed. 
 
 Template Device BigIP F5
 ======
@@ -273,22 +336,10 @@ Dell Open Manage System Status
 
 You need also add SUDO for zabbix user: ```zabbix  ALL=(ALL) NOPASSWD: /opt/dell/srvadmin/bin/omreport```
 
-Template App S.M.A.R.T.
-======
-Monitoring for S.M.A.R.T. enabled storage devices (HDD's, SSD's and other). Uses discovery script to populate disks. INFO: For non present S.M.A.R.T. values disable items on per-host level.
-
-Template and scripts created by:
-Michał Macioszek, Taras Baran, Michal Gębora, Marcin Wilk, Maks Bednarek, Anna Fałek, Mikołaj Szczuraszek
-
-
-Template App PowerPath
-======
-Monitoring for EMC PowerPath: Host-based software for automated data path management, failover and recovery, and optimized load balancing. PowerPath automates, standardizes, and optimizes data paths in physical and virtual environments as well as cloud deployments to deliver high availability and performance.
-
 Template Security
 ======
 Contains items related with basic linux security (iptables status, selinux status) and Fail2ban application. You need also add SUDO for zabbix user: ```zabbix  ALL=(ALL) NOPASSWD: /sbin/iptables -L INPUT -n```
 
-Template Device Back-UPS ES 700G	
+Template SELinux
 ======
-Monitoring of APC UPS dedicated battery power. Requires package apcupsd to be installed. 
+Monitoring for SELinux service.
\ No newline at end of file
diff --git a/templates/Template App APC.xml b/templates/Template App APC.xml
index a816bc05c2d093bd9e09475ef06eac729bf4993a..5b3c102f6c6b7956bfc5d39c7e1c9e0d55318ade 100644
--- a/templates/Template App APC.xml	
+++ b/templates/Template App APC.xml	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2014-08-11T09:42:01Z</date>
+    <version>3.0</version>
+    <date>2016-05-02T08:02:46Z</date>
     <groups>
         <group>
             <name>OS Linux</name>
@@ -14,6 +14,7 @@
         <template>
             <template>Template App APC</template>
             <name>Template App APC</name>
+            <description/>
             <groups>
                 <group>
                     <name>OS Linux</name>
@@ -29,12 +30,12 @@
             </applications>
             <items>
                 <item>
-                    <name>[APC] APC File Cache Hits</name>
+                    <name>[APC] File Cache Entries</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>apc[hits]</key>
+                    <key>apc[entries]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -69,14 +70,15 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
-                    <name>[APC] File Cache Entries</name>
+                    <name>[APC] APC File Cache Hits</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>apc[entries]</key>
+                    <key>apc[hits]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -111,6 +113,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>[APC] File Cache Hits in %</name>
@@ -153,6 +156,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>[APC] File Cache Memory Free</name>
@@ -195,6 +199,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>[APC] File Cache Memory Free in %</name>
@@ -237,6 +242,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>[APC] File Cache Memory Used</name>
@@ -279,6 +285,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>[APC] File Cache Misses</name>
@@ -321,6 +328,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>[APC] User Cache Entries</name>
@@ -363,6 +371,7 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
             </items>
             <discovery_rules/>
diff --git a/templates/Template App Amavisd.xml b/templates/Template App Amavisd.xml
index cc2a7a59500355f3374a4733fc1aa89b44e7bb6a..1cb64a806c9aeddb8aa9324d3fe76626e262c0bc 100644
--- a/templates/Template App Amavisd.xml	
+++ b/templates/Template App Amavisd.xml	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2015-08-12T06:52:13Z</date>
+    <version>3.0</version>
+    <date>2016-05-02T08:00:26Z</date>
     <groups>
         <group>
-            <name>Templates</name>
+            <name>Zabbix Templates</name>
         </group>
     </groups>
     <templates>
@@ -14,7 +14,7 @@
             <description/>
             <groups>
                 <group>
-                    <name>Templates</name>
+                    <name>Zabbix Templates</name>
                 </group>
             </groups>
             <applications/>
@@ -79,4 +79,19 @@
             <dependencies/>
         </trigger>
     </triggers>
+    <value_maps>
+        <value_map>
+            <name>Service state</name>
+            <mappings>
+                <mapping>
+                    <value>0</value>
+                    <newvalue>Down</newvalue>
+                </mapping>
+                <mapping>
+                    <value>1</value>
+                    <newvalue>Up</newvalue>
+                </mapping>
+            </mappings>
+        </value_map>
+    </value_maps>
 </zabbix_export>
diff --git a/templates/Template App Dovecot.xml b/templates/Template App Dovecot.xml
index 5f77f147ce6e862b73ac986e82d41077c0927b97..b55f38813010a032753cb6b6f1ddd494ec202b41 100644
--- a/templates/Template App Dovecot.xml	
+++ b/templates/Template App Dovecot.xml	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2015-08-12T06:59:56Z</date>
+    <version>3.0</version>
+    <date>2016-05-02T08:30:35Z</date>
     <groups>
         <group>
-            <name>Templates</name>
+            <name>Zabbix Templates</name>
         </group>
     </groups>
     <templates>
@@ -14,7 +14,7 @@
             <description/>
             <groups>
                 <group>
-                    <name>Templates</name>
+                    <name>Zabbix Templates</name>
                 </group>
             </groups>
             <applications>
@@ -75,7 +75,7 @@
                     <key>dovecot.version</key>
                     <delay>3600</delay>
                     <history>30</history>
-                    <trends>365</trends>
+                    <trends>0</trends>
                     <status>0</status>
                     <value_type>1</value_type>
                     <allowed_hosts/>
@@ -241,11 +241,26 @@
             <expression>{Template App Dovecot:net.tcp.service[pop].last(0)}=0</expression>
             <name>POP3 server is down</name>
             <url/>
-            <status>0</status>
+            <status>1</status>
             <priority>4</priority>
             <description/>
             <type>0</type>
             <dependencies/>
         </trigger>
     </triggers>
+    <value_maps>
+        <value_map>
+            <name>Service state</name>
+            <mappings>
+                <mapping>
+                    <value>0</value>
+                    <newvalue>Down</newvalue>
+                </mapping>
+                <mapping>
+                    <value>1</value>
+                    <newvalue>Up</newvalue>
+                </mapping>
+            </mappings>
+        </value_map>
+    </value_maps>
 </zabbix_export>
diff --git a/templates/Template App Etherpad.xml b/templates/Template App Etherpad.xml
index b4050e692a1bd49a7a085d3aaa33e07dc5bfa852..9c0c97433a64945300f4b911ad1afaeabc4a432c 100644
--- a/templates/Template App Etherpad.xml	
+++ b/templates/Template App Etherpad.xml	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2015-08-12T07:00:26Z</date>
+    <version>3.0</version>
+    <date>2016-05-02T08:31:01Z</date>
     <groups>
         <group>
-            <name>Templates</name>
+            <name>Zabbix Templates</name>
         </group>
     </groups>
     <templates>
@@ -14,7 +14,7 @@
             <description/>
             <groups>
                 <group>
-                    <name>Templates</name>
+                    <name>Zabbix Templates</name>
                 </group>
             </groups>
             <applications>
@@ -67,12 +67,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Etherpad is running</name>
+                    <name>Etherpad service is listening</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[node]</key>
+                    <key>net.tcp.service[tcp,,10000]</key>
                     <delay>60</delay>
                     <history>7</history>
                     <trends>365</trends>
@@ -112,12 +112,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Etherpad service is listening</name>
+                    <name>Etherpad is running</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.service[tcp,,10000]</key>
+                    <key>proc.num[node]</key>
                     <delay>60</delay>
                     <history>7</history>
                     <trends>365</trends>
@@ -185,4 +185,19 @@
             <dependencies/>
         </trigger>
     </triggers>
+    <value_maps>
+        <value_map>
+            <name>Service state</name>
+            <mappings>
+                <mapping>
+                    <value>0</value>
+                    <newvalue>Down</newvalue>
+                </mapping>
+                <mapping>
+                    <value>1</value>
+                    <newvalue>Up</newvalue>
+                </mapping>
+            </mappings>
+        </value_map>
+    </value_maps>
 </zabbix_export>
diff --git a/templates/Template App Exim.xml b/templates/Template App Exim.xml
index 2930c16644c1cf82c2e82f3bd58ca1368d3f73cb..05e90cb8c3a434edc39c27a4234a580ebb65d176 100644
--- a/templates/Template App Exim.xml	
+++ b/templates/Template App Exim.xml	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2015-08-12T07:00:43Z</date>
+    <version>3.0</version>
+    <date>2016-05-02T08:34:46Z</date>
     <groups>
         <group>
-            <name>Templates</name>
+            <name>Zabbix Templates</name>
         </group>
     </groups>
     <templates>
@@ -14,7 +14,7 @@
             <description/>
             <groups>
                 <group>
-                    <name>Templates</name>
+                    <name>Zabbix Templates</name>
                 </group>
             </groups>
             <applications>
@@ -75,7 +75,7 @@
                     <key>exim.version</key>
                     <delay>3600</delay>
                     <history>30</history>
-                    <trends>365</trends>
+                    <trends>0</trends>
                     <status>0</status>
                     <value_type>1</value_type>
                     <allowed_hosts/>
@@ -290,4 +290,19 @@
             </graph_items>
         </graph>
     </graphs>
+    <value_maps>
+        <value_map>
+            <name>Service state</name>
+            <mappings>
+                <mapping>
+                    <value>0</value>
+                    <newvalue>Down</newvalue>
+                </mapping>
+                <mapping>
+                    <value>1</value>
+                    <newvalue>Up</newvalue>
+                </mapping>
+            </mappings>
+        </value_map>
+    </value_maps>
 </zabbix_export>
diff --git a/templates/Template App MySQL.xml b/templates/Template App MySQL.xml
index c5a082afb24eba65f949de72d22ec259d1b5a3c5..9c06606030d6e706d22d88c3c5aa254d501f92a9 100644
--- a/templates/Template App MySQL.xml	
+++ b/templates/Template App MySQL.xml	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2015-08-12T06:50:17Z</date>
+    <version>3.0</version>
+    <date>2016-05-02T08:36:10Z</date>
     <groups>
         <group>
             <name>Templates</name>
@@ -24,23 +24,26 @@
                 <application>
                     <name>Database Fileystem</name>
                 </application>
+                <application>
+                    <name>MySQL Tables</name>
+                </application>
             </applications>
             <items>
                 <item>
-                    <name>Aborted clients</name>
+                    <name>MySQL is enabled in autostart</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Aborted_clients</key>
-                    <delay>120</delay>
-                    <history>30</history>
-                    <trends>365</trends>
+                    <key>chkconfig[mysql]</key>
+                    <delay>3600</delay>
+                    <history>7</history>
+                    <trends>30</trends>
                     <status>0</status>
-                    <value_type>0</value_type>
+                    <value_type>3</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -48,11 +51,11 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>0</formula>
+                    <formula>1</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>0</data_type>
+                    <data_type>3</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -70,12 +73,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Aborted connects</name>
+                    <name>Aborted clients</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Aborted_connects</key>
+                    <key>mysql.Aborted_clients</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -113,12 +116,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Active transactions</name>
+                    <name>Aborted connects</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.active_transactions</key>
+                    <key>mysql.Aborted_connects</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -126,7 +129,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -156,19 +159,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Adaptive hash memory</name>
+                    <name>Active transactions</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.adaptive_hash_memory</key>
+                    <key>mysql.active_transactions</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>B</units>
+                    <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -199,12 +202,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Additional pool alloc</name>
+                    <name>Adaptive hash memory</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.additional_pool_alloc</key>
+                    <key>mysql.adaptive_hash_memory</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -242,19 +245,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Binary log space</name>
+                    <name>Additional pool alloc</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.binary_log_space</key>
+                    <key>mysql.additional_pool_alloc</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units/>
+                    <units>B</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -285,20 +288,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Binlog cache disk use</name>
+                    <name>Binary log space</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Binlog_cache_disk_use</key>
+                    <key>mysql.binary_log_space</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>B</units>
-                    <delta>2</delta>
+                    <units/>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -328,20 +331,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Binlog cache size</name>
+                    <name>Binlog cache disk use</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.setting.binlog_cache_size</key>
-                    <delay>3600</delay>
+                    <key>mysql.Binlog_cache_disk_use</key>
+                    <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units/>
-                    <delta>0</delta>
+                    <units>B</units>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -500,20 +503,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Checksum of $1</name>
+                    <name>Com delete</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>vfs.file.cksum[/etc/my.cnf]</key>
-                    <delay>600</delay>
-                    <history>7</history>
-                    <trends>30</trends>
+                    <key>mysql.Com_delete</key>
+                    <delay>120</delay>
+                    <history>30</history>
+                    <trends>365</trends>
                     <status>0</status>
-                    <value_type>3</value_type>
+                    <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -521,7 +524,7 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>1</formula>
+                    <formula>0</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
@@ -543,12 +546,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Com delete</name>
+                    <name>Com delete multi</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Com_delete</key>
+                    <key>mysql.Com_delete_multi</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -586,12 +589,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Com delete multi</name>
+                    <name>Com insert</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Com_delete_multi</key>
+                    <key>mysql.Com_insert</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -629,12 +632,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Com insert</name>
+                    <name>Com insert select</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Com_insert</key>
+                    <key>mysql.Com_insert_select</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -672,12 +675,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Com insert select</name>
+                    <name>Com load</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Com_insert_select</key>
+                    <key>mysql.Com_load</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -715,12 +718,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Com load</name>
+                    <name>Com replace</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Com_load</key>
+                    <key>mysql.Com_replace</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -758,12 +761,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Com replace</name>
+                    <name>Com replace select</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Com_replace</key>
+                    <key>mysql.Com_replace_select</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -801,12 +804,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Com replace select</name>
+                    <name>Com select</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Com_replace_select</key>
+                    <key>mysql.Com_select</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -844,12 +847,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Com select</name>
+                    <name>Com update</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Com_select</key>
+                    <key>mysql.Com_update</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -887,12 +890,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Com update</name>
+                    <name>Com update multi</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Com_update</key>
+                    <key>mysql.Com_update_multi</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -930,20 +933,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Com update multi</name>
+                    <name>MySQL Connections</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Com_update_multi</key>
-                    <delay>120</delay>
+                    <key>mysql.connection</key>
+                    <delay>30</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>0</value_type>
+                    <value_type>3</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -951,7 +954,7 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>0</formula>
+                    <formula>1</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
@@ -1273,45 +1276,6 @@
                     <valuemap/>
                     <logtimefmt/>
                 </item>
-                <item>
-                    <name>File exists: $1</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <multiplier>0</multiplier>
-                    <snmp_oid/>
-                    <key>vfs.file.exists[/etc/my.cnf]</key>
-                    <delay>600</delay>
-                    <history>7</history>
-                    <trends>30</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/>
-                    <params/>
-                    <ipmi_sensor/>
-                    <data_type>0</data_type>
-                    <authtype>0</authtype>
-                    <username/>
-                    <password/>
-                    <publickey/>
-                    <privatekey/>
-                    <port/>
-                    <description/>
-                    <inventory_link>0</inventory_link>
-                    <applications/>
-                    <valuemap/>
-                    <logtimefmt/>
-                </item>
                 <item>
                     <name>File fsyncs</name>
                     <type>0</type>
@@ -1485,19 +1449,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Free disk space on $1</name>
+                    <name>Free pages</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>vfs.fs.size[/var/lib/mysql,free]</key>
-                    <delay>30</delay>
+                    <key>mysql.free_pages</key>
+                    <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>3</value_type>
+                    <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>B</units>
+                    <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -1506,7 +1470,7 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>1</formula>
+                    <formula>0</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
@@ -1521,27 +1485,27 @@
                     <inventory_link>0</inventory_link>
                     <applications>
                         <application>
-                            <name>Database Fileystem</name>
+                            <name>Database</name>
                         </application>
                     </applications>
                     <valuemap/>
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Free disk space on $1 in %</name>
+                    <name>Handler commit</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>vfs.fs.size[/var/lib/mysql,pfree]</key>
-                    <delay>30</delay>
+                    <key>mysql.Handler_commit</key>
+                    <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>%</units>
-                    <delta>0</delta>
+                    <units/>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -1549,7 +1513,7 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>1</formula>
+                    <formula>0</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
@@ -1564,27 +1528,27 @@
                     <inventory_link>0</inventory_link>
                     <applications>
                         <application>
-                            <name>Database Fileystem</name>
+                            <name>Database</name>
                         </application>
                     </applications>
                     <valuemap/>
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Free number of inodes on $1</name>
+                    <name>Handler delete</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>vfs.fs.inode[/var/lib/mysql,free]</key>
-                    <delay>60</delay>
+                    <key>mysql.Handler_delete</key>
+                    <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>3</value_type>
+                    <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -1592,7 +1556,7 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>1</formula>
+                    <formula>0</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
@@ -1607,27 +1571,27 @@
                     <inventory_link>0</inventory_link>
                     <applications>
                         <application>
-                            <name>Database Fileystem</name>
+                            <name>Database</name>
                         </application>
                     </applications>
                     <valuemap/>
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Free number of inodes on $1 in %</name>
+                    <name>Handler discover</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>vfs.fs.inode[/var/lib/mysql,pfree]</key>
-                    <delay>60</delay>
+                    <key>mysql.Handler_discover</key>
+                    <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>%</units>
-                    <delta>0</delta>
+                    <units/>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -1635,7 +1599,7 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>1</formula>
+                    <formula>0</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
@@ -1650,19 +1614,19 @@
                     <inventory_link>0</inventory_link>
                     <applications>
                         <application>
-                            <name>Database Fileystem</name>
+                            <name>Database</name>
                         </application>
                     </applications>
                     <valuemap/>
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Free pages</name>
+                    <name>Handler prepare</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.free_pages</key>
+                    <key>mysql.Handler_prepare</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -1670,7 +1634,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -1700,12 +1664,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Handler commit</name>
+                    <name>Handler read first</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Handler_commit</key>
+                    <key>mysql.Handler_read_first</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -1743,12 +1707,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Handler delete</name>
+                    <name>Handler read key</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Handler_delete</key>
+                    <key>mysql.Handler_read_key</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -1786,12 +1750,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Handler discover</name>
+                    <name>Handler read next</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Handler_discover</key>
+                    <key>mysql.Handler_read_next</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -1829,12 +1793,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Handler prepare</name>
+                    <name>Handler read prev</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Handler_prepare</key>
+                    <key>mysql.Handler_read_prev</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -1872,12 +1836,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Handler read first</name>
+                    <name>Handler read rnd</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Handler_read_first</key>
+                    <key>mysql.Handler_read_rnd</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -1915,12 +1879,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Handler read key</name>
+                    <name>Handler read rnd next</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Handler_read_key</key>
+                    <key>mysql.Handler_read_rnd_next</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -1958,12 +1922,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Handler read next</name>
+                    <name>Handler rollback</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Handler_read_next</key>
+                    <key>mysql.Handler_rollback</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2001,12 +1965,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Handler read prev</name>
+                    <name>Handler savepoint</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Handler_read_prev</key>
+                    <key>mysql.Handler_savepoint</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2044,12 +2008,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Handler read rnd</name>
+                    <name>Handler savepoint rollback</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Handler_read_rnd</key>
+                    <key>mysql.Handler_savepoint_rollback</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2087,12 +2051,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Handler read rnd next</name>
+                    <name>Handler update</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Handler_read_rnd_next</key>
+                    <key>mysql.Handler_update</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2130,12 +2094,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Handler rollback</name>
+                    <name>Handler write</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Handler_rollback</key>
+                    <key>mysql.Handler_write</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2173,12 +2137,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Handler savepoint</name>
+                    <name>Hash index cells total</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Handler_savepoint</key>
+                    <key>mysql.hash_index_cells_total</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2186,7 +2150,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -2216,12 +2180,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Handler savepoint rollback</name>
+                    <name>Hash index cells used</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Handler_savepoint_rollback</key>
+                    <key>mysql.hash_index_cells_used</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2229,7 +2193,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -2259,12 +2223,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Handler update</name>
+                    <name>History list</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Handler_update</key>
+                    <key>mysql.history_list</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2272,7 +2236,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -2302,12 +2266,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Handler write</name>
+                    <name>Ibuf cell count</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Handler_write</key>
+                    <key>mysql.ibuf_cell_count</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2315,7 +2279,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -2345,12 +2309,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Hash index cells total</name>
+                    <name>Ibuf free cells</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.hash_index_cells_total</key>
+                    <key>mysql.ibuf_free_cells</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2388,12 +2352,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Hash index cells used</name>
+                    <name>Ibuf inserts</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.hash_index_cells_used</key>
+                    <key>mysql.ibuf_inserts</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2401,7 +2365,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -2431,12 +2395,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>History list</name>
+                    <name>Ibuf merged</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.history_list</key>
+                    <key>mysql.ibuf_merged</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2444,7 +2408,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -2474,12 +2438,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Ibuf cell count</name>
+                    <name>Ibuf merges</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.ibuf_cell_count</key>
+                    <key>mysql.ibuf_merges</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2487,7 +2451,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -2517,12 +2481,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Ibuf free cells</name>
+                    <name>Ibuf used cells</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.ibuf_free_cells</key>
+                    <key>mysql.ibuf_used_cells</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2560,12 +2524,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Ibuf inserts</name>
+                    <name>InnoDB locked tables</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.ibuf_inserts</key>
+                    <key>mysql.innodb_locked_tables</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2573,7 +2537,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -2603,12 +2567,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Ibuf merged</name>
+                    <name>InnoDB lock structs</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.ibuf_merged</key>
+                    <key>mysql.innodb_lock_structs</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2616,7 +2580,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -2646,12 +2610,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Ibuf merges</name>
+                    <name>InnoDB lock wait secs</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.ibuf_merges</key>
+                    <key>mysql.innodb_lock_wait_secs</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2659,7 +2623,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -2689,19 +2653,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Ibuf used cells</name>
+                    <name>InnoDB log buffer size</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.ibuf_used_cells</key>
+                    <key>mysql.innodb_log_buffer_size</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units/>
+                    <units>B</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -2732,12 +2696,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>InnoDB locked tables</name>
+                    <name>InnoDB open files</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.innodb_locked_tables</key>
+                    <key>mysql.innodb_open_files</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2775,12 +2739,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>InnoDB lock structs</name>
+                    <name>Innodb row lock time</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.innodb_lock_structs</key>
+                    <key>mysql.Innodb_row_lock_time</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2818,12 +2782,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>InnoDB lock wait secs</name>
+                    <name>Innodb row lock waits</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.innodb_lock_wait_secs</key>
+                    <key>mysql.Innodb_row_lock_waits</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2861,19 +2825,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>InnoDB log buffer size</name>
+                    <name>InnoDB sem waits</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.innodb_log_buffer_size</key>
+                    <key>mysql.innodb_sem_waits</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>B</units>
+                    <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -2904,12 +2868,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>InnoDB open files</name>
+                    <name>InnoDB sem wait time ms</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.innodb_open_files</key>
+                    <key>mysql.innodb_sem_wait_time_ms</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2947,12 +2911,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Innodb row lock time</name>
+                    <name>InnoDB tables in use</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Innodb_row_lock_time</key>
+                    <key>mysql.innodb_tables_in_use</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2990,12 +2954,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Innodb row lock waits</name>
+                    <name>InnoDB transactions</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Innodb_row_lock_waits</key>
+                    <key>mysql.innodb_transactions</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -3003,7 +2967,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -3033,19 +2997,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>InnoDB sem waits</name>
+                    <name>MyISAM Key buf bytes unflushed</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.innodb_sem_waits</key>
+                    <key>mysql.Key_buf_bytes_unflushed</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units/>
+                    <units>B</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -3076,19 +3040,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>InnoDB sem wait time ms</name>
+                    <name>MyISAM Key buf bytes used</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.innodb_sem_wait_time_ms</key>
+                    <key>mysql.Key_buf_bytes_used</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units/>
+                    <units>B</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -3119,12 +3083,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>InnoDB tables in use</name>
+                    <name>MyISAM Key reads</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.innodb_tables_in_use</key>
+                    <key>mysql.Key_reads</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -3132,7 +3096,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -3162,12 +3126,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>InnoDB transactions</name>
+                    <name>MyISAM Key read requests</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.innodb_transactions</key>
+                    <key>mysql.Key_read_requests</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -3205,12 +3169,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Locked transactions</name>
+                    <name>MyISAM Key writes</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.locked_transactions</key>
+                    <key>mysql.Key_writes</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -3218,7 +3182,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -3248,20 +3212,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Lock system memory</name>
+                    <name>MyISAM Key write requests</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.lock_system_memory</key>
+                    <key>mysql.Key_write_requests</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>B</units>
-                    <delta>0</delta>
+                    <units/>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -3291,20 +3255,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Log bytes flushed</name>
+                    <name>Locked transactions</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.log_bytes_flushed</key>
+                    <key>mysql.locked_transactions</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>B</units>
-                    <delta>2</delta>
+                    <units/>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -3334,12 +3298,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Log bytes written</name>
+                    <name>Lock system memory</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.log_bytes_written</key>
+                    <key>mysql.lock_system_memory</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -3347,7 +3311,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units>B</units>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -3377,19 +3341,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Log writes</name>
+                    <name>Log bytes flushed</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.log_writes</key>
+                    <key>mysql.log_bytes_flushed</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units/>
+                    <units>B</units>
                     <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -3420,20 +3384,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Max connections</name>
+                    <name>Log bytes written</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.setting.max_connections</key>
-                    <delay>3600</delay>
+                    <key>mysql.log_bytes_written</key>
+                    <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units/>
-                    <delta>0</delta>
+                    <units>B</units>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -3463,12 +3427,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Max used connections</name>
+                    <name>Log writes</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Max_used_connections</key>
+                    <key>mysql.log_writes</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -3476,7 +3440,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -3506,12 +3470,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Modified pages</name>
+                    <name>Max used connections</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.modified_pages</key>
+                    <key>mysql.Max_used_connections</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -3549,19 +3513,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>MyISAM Key buf bytes unflushed</name>
+                    <name>Modified pages</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Key_buf_bytes_unflushed</key>
+                    <key>mysql.modified_pages</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>B</units>
+                    <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -3592,20 +3556,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>MyISAM Key buf bytes used</name>
+                    <name>Opened tables</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Key_buf_bytes_used</key>
+                    <key>mysql.Opened_tables</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>B</units>
-                    <delta>0</delta>
+                    <units/>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -3635,19 +3599,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>MyISAM key buffer size</name>
+                    <name>Open files</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.setting.key_buffer_size</key>
-                    <delay>3600</delay>
+                    <key>mysql.Open_files</key>
+                    <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>B</units>
+                    <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -3678,12 +3642,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>MyISAM Key read requests</name>
+                    <name>Open tables</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Key_read_requests</key>
+                    <key>mysql.Open_tables</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -3691,7 +3655,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -3721,12 +3685,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>MyISAM Key reads</name>
+                    <name>OS waits</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Key_reads</key>
+                    <key>mysql.os_waits</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -3764,12 +3728,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>MyISAM Key write requests</name>
+                    <name>Pages created</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Key_write_requests</key>
+                    <key>mysql.pages_created</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -3807,12 +3771,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>MyISAM Key writes</name>
+                    <name>Pages read</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Key_writes</key>
+                    <key>mysql.pages_read</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -3850,20 +3814,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>MySQL Connections</name>
+                    <name>Pages written</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.connection</key>
-                    <delay>30</delay>
+                    <key>mysql.pages_written</key>
+                    <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>3</value_type>
+                    <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -3871,7 +3835,7 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>1</formula>
+                    <formula>0</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
@@ -3893,19 +3857,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>MySQL is enabled in autostart</name>
+                    <name>Page hash memory</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>chkconfig[mysql]</key>
-                    <delay>3600</delay>
-                    <history>7</history>
-                    <trends>30</trends>
+                    <key>mysql.page_hash_memory</key>
+                    <delay>120</delay>
+                    <history>30</history>
+                    <trends>365</trends>
                     <status>0</status>
-                    <value_type>3</value_type>
+                    <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units/>
+                    <units>B</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -3914,11 +3878,11 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>1</formula>
+                    <formula>0</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>3</data_type>
+                    <data_type>0</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -3936,232 +3900,17 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>MySQL ping</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <multiplier>0</multiplier>
-                    <snmp_oid/>
-                    <key>mysql.ping</key>
-                    <delay>30</delay>
-                    <history>30</history>
-                    <trends>365</trends>
-                    <status>0</status>
-                    <value_type>3</value_type>
-                    <allowed_hosts>localhost</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>0</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>Database</name>
-                        </application>
-                    </applications>
-                    <valuemap/>
-                    <logtimefmt/>
-                </item>
-                <item>
-                    <name>MySQL QPS</name>
+                    <name>Pending AIO log ios</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.qps</key>
-                    <delay>30</delay>
+                    <key>mysql.pending_aio_log_ios</key>
+                    <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
-                    <allowed_hosts>localhost</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>0</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>Database</name>
-                        </application>
-                    </applications>
-                    <valuemap/>
-                    <logtimefmt/>
-                </item>
-                <item>
-                    <name>MySQL Server Version</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <multiplier>0</multiplier>
-                    <snmp_oid/>
-                    <key>mysql.version</key>
-                    <delay>3600</delay>
-                    <history>7</history>
-                    <trends>365</trends>
-                    <status>0</status>
-                    <value_type>1</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/>
-                    <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>Database</name>
-                        </application>
-                    </applications>
-                    <valuemap/>
-                    <logtimefmt/>
-                </item>
-                <item>
-                    <name>MySQL Slow Queries</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <multiplier>0</multiplier>
-                    <snmp_oid/>
-                    <key>mysql.slowqueries</key>
-                    <delay>30</delay>
-                    <history>30</history>
-                    <trends>365</trends>
-                    <status>0</status>
-                    <value_type>3</value_type>
-                    <allowed_hosts>localhost</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>0</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>Database</name>
-                        </application>
-                    </applications>
-                    <valuemap/>
-                    <logtimefmt/>
-                </item>
-                <item>
-                    <name>MySQL Threads</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <multiplier>0</multiplier>
-                    <snmp_oid/>
-                    <key>mysql.threads</key>
-                    <delay>30</delay>
-                    <history>30</history>
-                    <trends>365</trends>
-                    <status>0</status>
-                    <value_type>3</value_type>
-                    <allowed_hosts>localhost</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>0</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>Database</name>
-                        </application>
-                    </applications>
-                    <valuemap/>
-                    <logtimefmt/>
-                </item>
-                <item>
-                    <name>Number of running processes mysqld</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <multiplier>0</multiplier>
-                    <snmp_oid/>
-                    <key>proc.num[mysqld]</key>
-                    <delay>60</delay>
-                    <history>30</history>
-                    <trends>365</trends>
-                    <status>0</status>
-                    <value_type>3</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -4194,12 +3943,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Opened tables</name>
+                    <name>Pending AIO sync ios</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Opened_tables</key>
+                    <key>mysql.pending_aio_sync_ios</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -4207,7 +3956,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -4237,12 +3986,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Open files</name>
+                    <name>Pending buf pool flushes</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Open_files</key>
+                    <key>mysql.pending_buf_pool_flushes</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -4280,13 +4029,13 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Open files limit</name>
+                    <name>Pending chkp writes</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.setting.open_files_limit</key>
-                    <delay>3600</delay>
+                    <key>mysql.pending_chkp_writes</key>
+                    <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
@@ -4323,12 +4072,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Open tables</name>
+                    <name>Pending ibuf AIO reads</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Open_tables</key>
+                    <key>mysql.pending_ibuf_aio_reads</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -4366,12 +4115,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>OS waits</name>
+                    <name>Pending log flushes</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.os_waits</key>
+                    <key>mysql.pending_log_flushes</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -4379,7 +4128,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -4409,19 +4158,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Page hash memory</name>
+                    <name>Pending log writes</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.page_hash_memory</key>
+                    <key>mysql.pending_log_writes</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>B</units>
+                    <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -4452,12 +4201,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Pages created</name>
+                    <name>Pending normal AIO reads</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.pages_created</key>
+                    <key>mysql.pending_normal_aio_reads</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -4465,7 +4214,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -4495,12 +4244,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Pages read</name>
+                    <name>Pending normal AIO writes</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.pages_read</key>
+                    <key>mysql.pending_normal_aio_writes</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -4508,7 +4257,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -4538,20 +4287,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Pages written</name>
+                    <name>MySQL ping</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.pages_written</key>
-                    <delay>120</delay>
+                    <key>mysql.ping</key>
+                    <delay>30</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>0</value_type>
-                    <allowed_hosts/>
+                    <value_type>3</value_type>
+                    <allowed_hosts>localhost</allowed_hosts>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -4581,12 +4330,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Pending AIO log ios</name>
+                    <name>Qcache free blocks</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.pending_aio_log_ios</key>
+                    <key>mysql.Qcache_free_blocks</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -4624,19 +4373,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Pending AIO sync ios</name>
+                    <name>Qcache free memory</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.pending_aio_sync_ios</key>
+                    <key>mysql.Qcache_free_memory</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units/>
+                    <units>B</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -4667,12 +4416,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Pending buf pool flushes</name>
+                    <name>Qcache hits</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.pending_buf_pool_flushes</key>
+                    <key>mysql.Qcache_hits</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -4680,7 +4429,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -4710,12 +4459,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Pending chkp writes</name>
+                    <name>Qcache inserts</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.pending_chkp_writes</key>
+                    <key>mysql.Qcache_inserts</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -4723,7 +4472,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -4753,12 +4502,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Pending ibuf AIO reads</name>
+                    <name>Qcache lowmem prunes</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.pending_ibuf_aio_reads</key>
+                    <key>mysql.Qcache_lowmem_prunes</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -4766,7 +4515,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -4796,12 +4545,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Pending log flushes</name>
+                    <name>Qcache not cached</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.pending_log_flushes</key>
+                    <key>mysql.Qcache_not_cached</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -4809,7 +4558,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -4839,12 +4588,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Pending log writes</name>
+                    <name>Qcache queries in cache</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.pending_log_writes</key>
+                    <key>mysql.Qcache_queries_in_cache</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -4882,12 +4631,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Pending normal AIO reads</name>
+                    <name>Qcache total blocks</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.pending_normal_aio_reads</key>
+                    <key>mysql.Qcache_total_blocks</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -4925,18 +4674,18 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Pending normal AIO writes</name>
+                    <name>MySQL QPS</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.pending_normal_aio_writes</key>
-                    <delay>120</delay>
+                    <key>mysql.qps</key>
+                    <delay>30</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
-                    <allowed_hosts/>
+                    <allowed_hosts>localhost</allowed_hosts>
                     <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
@@ -4968,20 +4717,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Pool size</name>
+                    <name>Questions</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.setting.pool_size</key>
-                    <delay>3600</delay>
+                    <key>mysql.Questions</key>
+                    <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>B</units>
-                    <delta>0</delta>
+                    <units/>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -5011,12 +4760,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Qcache free blocks</name>
+                    <name>Read views</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Qcache_free_blocks</key>
+                    <key>mysql.read_views</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -5054,12 +4803,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Qcache free memory</name>
+                    <name>Recovery system memory</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Qcache_free_memory</key>
+                    <key>mysql.recovery_system_memory</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -5097,12 +4846,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Qcache hits</name>
+                    <name>Relay log space</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Qcache_hits</key>
+                    <key>mysql.relay_log_space</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -5110,7 +4859,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -5140,12 +4889,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Qcache inserts</name>
+                    <name>Rows deleted</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Qcache_inserts</key>
+                    <key>mysql.rows_deleted</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -5183,12 +4932,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Qcache lowmem prunes</name>
+                    <name>Rows inserted</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Qcache_lowmem_prunes</key>
+                    <key>mysql.rows_inserted</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -5226,12 +4975,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Qcache not cached</name>
+                    <name>Rows read</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Qcache_not_cached</key>
+                    <key>mysql.rows_read</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -5269,12 +5018,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Qcache queries in cache</name>
+                    <name>Rows updated</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Qcache_queries_in_cache</key>
+                    <key>mysql.rows_updated</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -5282,7 +5031,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -5312,12 +5061,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Qcache total blocks</name>
+                    <name>Select full join</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Qcache_total_blocks</key>
+                    <key>mysql.Select_full_join</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -5325,50 +5074,7 @@
                     <value_type>0</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>0</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>Database</name>
-                        </application>
-                    </applications>
-                    <valuemap/>
-                    <logtimefmt/>
-                </item>
-                <item>
-                    <name>Query cache size</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <multiplier>0</multiplier>
-                    <snmp_oid/>
-                    <key>mysql.setting.query_cache_size</key>
-                    <delay>3600</delay>
-                    <history>30</history>
-                    <trends>365</trends>
-                    <status>0</status>
-                    <value_type>0</value_type>
-                    <allowed_hosts/>
-                    <units>B</units>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -5398,12 +5104,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Questions</name>
+                    <name>Select full range join</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Questions</key>
+                    <key>mysql.Select_full_range_join</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -5441,12 +5147,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Read views</name>
+                    <name>Select range</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.read_views</key>
+                    <key>mysql.Select_range</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -5454,7 +5160,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -5484,20 +5190,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Recovery system memory</name>
+                    <name>Select range check</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.recovery_system_memory</key>
+                    <key>mysql.Select_range_check</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>B</units>
-                    <delta>0</delta>
+                    <units/>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -5527,12 +5233,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Relay log space</name>
+                    <name>Select scan</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.relay_log_space</key>
+                    <key>mysql.Select_scan</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -5540,7 +5246,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -5570,20 +5276,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Rows deleted</name>
+                    <name>Binlog cache size</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.rows_deleted</key>
-                    <delay>120</delay>
+                    <key>mysql.setting.binlog_cache_size</key>
+                    <delay>3600</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -5613,20 +5319,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Rows inserted</name>
+                    <name>MyISAM key buffer size</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.rows_inserted</key>
-                    <delay>120</delay>
+                    <key>mysql.setting.key_buffer_size</key>
+                    <delay>3600</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units/>
-                    <delta>2</delta>
+                    <units>B</units>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -5656,20 +5362,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Rows read</name>
+                    <name>Max connections</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.rows_read</key>
-                    <delay>120</delay>
+                    <key>mysql.setting.max_connections</key>
+                    <delay>3600</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -5699,20 +5405,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Rows updated</name>
+                    <name>Open files limit</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.rows_updated</key>
-                    <delay>120</delay>
+                    <key>mysql.setting.open_files_limit</key>
+                    <delay>3600</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -5742,20 +5448,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Select full join</name>
+                    <name>Pool size</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Select_full_join</key>
-                    <delay>120</delay>
+                    <key>mysql.setting.pool_size</key>
+                    <delay>3600</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units/>
-                    <delta>2</delta>
+                    <units>B</units>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -5785,20 +5491,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Select full range join</name>
+                    <name>Query cache size</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Select_full_range_join</key>
-                    <delay>120</delay>
+                    <key>mysql.setting.query_cache_size</key>
+                    <delay>3600</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units/>
-                    <delta>2</delta>
+                    <units>B</units>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -5828,20 +5534,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Select range</name>
+                    <name>Table cache</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Select_range</key>
-                    <delay>120</delay>
+                    <key>mysql.setting.table_cache</key>
+                    <delay>3600</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -5871,20 +5577,20 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Select range check</name>
+                    <name>Thread cache size</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Select_range_check</key>
-                    <delay>120</delay>
+                    <key>mysql.setting.thread_cache_size</key>
+                    <delay>3600</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -5914,12 +5620,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Select scan</name>
+                    <name>Slave lag</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Select_scan</key>
+                    <key>mysql.slave_lag</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -5927,7 +5633,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -5957,12 +5663,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Slave lag</name>
+                    <name>Slave open temp tables</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.slave_lag</key>
+                    <key>mysql.Slave_open_temp_tables</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -6000,12 +5706,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Slave open temp tables</name>
+                    <name>Slave retried transactions</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Slave_open_temp_tables</key>
+                    <key>mysql.Slave_retried_transactions</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -6013,7 +5719,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>2</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -6043,12 +5749,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Slave retried transactions</name>
+                    <name>Slave running</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.Slave_retried_transactions</key>
+                    <key>mysql.slave_running</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -6056,7 +5762,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>2</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -6086,12 +5792,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Slave running</name>
+                    <name>Slave stopped</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.slave_running</key>
+                    <key>mysql.slave_stopped</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -6129,18 +5835,18 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Slave stopped</name>
+                    <name>MySQL Slow Queries</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.slave_stopped</key>
-                    <delay>120</delay>
+                    <key>mysql.slowqueries</key>
+                    <delay>30</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>0</value_type>
-                    <allowed_hosts/>
+                    <value_type>3</value_type>
+                    <allowed_hosts>localhost</allowed_hosts>
                     <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
@@ -7203,49 +6909,6 @@
                     <valuemap/>
                     <logtimefmt/>
                 </item>
-                <item>
-                    <name>Table cache</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <multiplier>0</multiplier>
-                    <snmp_oid/>
-                    <key>mysql.setting.table_cache</key>
-                    <delay>3600</delay>
-                    <history>30</history>
-                    <trends>365</trends>
-                    <status>0</status>
-                    <value_type>0</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>0</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>Database</name>
-                        </application>
-                    </applications>
-                    <valuemap/>
-                    <logtimefmt/>
-                </item>
                 <item>
                     <name>Table locks immediate</name>
                     <type>0</type>
@@ -7333,18 +6996,18 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Thread cache size</name>
+                    <name>MySQL Threads</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.setting.thread_cache_size</key>
-                    <delay>3600</delay>
+                    <key>mysql.threads</key>
+                    <delay>30</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>0</value_type>
-                    <allowed_hosts/>
+                    <value_type>3</value_type>
+                    <allowed_hosts>localhost</allowed_hosts>
                     <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
@@ -7375,49 +7038,6 @@
                     <valuemap/>
                     <logtimefmt/>
                 </item>
-                <item>
-                    <name>Thread hash memory</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <multiplier>0</multiplier>
-                    <snmp_oid/>
-                    <key>mysql.thread_hash_memory</key>
-                    <delay>120</delay>
-                    <history>30</history>
-                    <trends>365</trends>
-                    <status>0</status>
-                    <value_type>0</value_type>
-                    <allowed_hosts/>
-                    <units>B</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</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>Database</name>
-                        </application>
-                    </applications>
-                    <valuemap/>
-                    <logtimefmt/>
-                </item>
                 <item>
                     <name>Threads cached</name>
                     <type>0</type>
@@ -7591,55 +7211,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Total disk space on $1</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <multiplier>0</multiplier>
-                    <snmp_oid/>
-                    <key>vfs.fs.size[/var/lib/mysql,total]</key>
-                    <delay>30</delay>
-                    <history>30</history>
-                    <trends>365</trends>
-                    <status>0</status>
-                    <value_type>3</value_type>
-                    <allowed_hosts/>
-                    <units>B</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>Database Fileystem</name>
-                        </application>
-                    </applications>
-                    <valuemap/>
-                    <logtimefmt/>
-                </item>
-                <item>
-                    <name>Total mem alloc</name>
+                    <name>Thread hash memory</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mysql.total_mem_alloc</key>
+                    <key>mysql.thread_hash_memory</key>
                     <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -7677,19 +7254,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Total number of inodes on $1</name>
+                    <name>Total mem alloc</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>vfs.fs.inode[/var/lib/mysql,total]</key>
-                    <delay>60</delay>
+                    <key>mysql.total_mem_alloc</key>
+                    <delay>120</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>3</value_type>
+                    <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units/>
+                    <units>B</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -7698,7 +7275,7 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>1</formula>
+                    <formula>0</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
@@ -7713,7 +7290,7 @@
                     <inventory_link>0</inventory_link>
                     <applications>
                         <application>
-                            <name>Database Fileystem</name>
+                            <name>Database</name>
                         </application>
                     </applications>
                     <valuemap/>
@@ -7806,19 +7383,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Used disk space on $1</name>
+                    <name>MySQL Server Version</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>vfs.fs.size[/var/lib/mysql,used]</key>
-                    <delay>30</delay>
-                    <history>30</history>
-                    <trends>365</trends>
+                    <key>mysql.version</key>
+                    <delay>3600</delay>
+                    <history>7</history>
+                    <trends>0</trends>
                     <status>0</status>
-                    <value_type>3</value_type>
+                    <value_type>1</value_type>
                     <allowed_hosts/>
-                    <units>B</units>
+                    <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -7842,26 +7419,26 @@
                     <inventory_link>0</inventory_link>
                     <applications>
                         <application>
-                            <name>Database Fileystem</name>
+                            <name>Database</name>
                         </application>
                     </applications>
                     <valuemap/>
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Used disk space on $1 in %</name>
+                    <name>Number of running processes mysqld</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>vfs.fs.size[/var/lib/mysql,pused]</key>
-                    <delay>30</delay>
+                    <key>proc.num[mysqld]</key>
+                    <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>0</value_type>
+                    <value_type>3</value_type>
                     <allowed_hosts/>
-                    <units>%</units>
+                    <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -7870,7 +7447,7 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>1</formula>
+                    <formula>0</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
@@ -7885,22 +7462,22 @@
                     <inventory_link>0</inventory_link>
                     <applications>
                         <application>
-                            <name>Database Fileystem</name>
+                            <name>Database</name>
                         </application>
                     </applications>
                     <valuemap/>
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Used number of inodes on $1</name>
+                    <name>Checksum of $1</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>vfs.fs.inode[/var/lib/mysql,used]</key>
-                    <delay>60</delay>
-                    <history>30</history>
-                    <trends>365</trends>
+                    <key>vfs.file.cksum[/etc/my.cnf]</key>
+                    <delay>600</delay>
+                    <history>7</history>
+                    <trends>30</trends>
                     <status>0</status>
                     <value_type>3</value_type>
                     <allowed_hosts/>
@@ -7928,26 +7505,26 @@
                     <inventory_link>0</inventory_link>
                     <applications>
                         <application>
-                            <name>Database Fileystem</name>
+                            <name>Database</name>
                         </application>
                     </applications>
                     <valuemap/>
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Used number of inodes on $1 in %</name>
+                    <name>File exists: $1</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>vfs.fs.inode[/var/lib/mysql,pused]</key>
-                    <delay>60</delay>
-                    <history>30</history>
-                    <trends>365</trends>
+                    <key>vfs.file.exists[/etc/my.cnf]</key>
+                    <delay>600</delay>
+                    <history>7</history>
+                    <trends>30</trends>
                     <status>0</status>
-                    <value_type>0</value_type>
+                    <value_type>3</value_type>
                     <allowed_hosts/>
-                    <units>%</units>
+                    <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -7969,16 +7546,146 @@
                     <port/>
                     <description/>
                     <inventory_link>0</inventory_link>
-                    <applications>
-                        <application>
-                            <name>Database Fileystem</name>
-                        </application>
-                    </applications>
+                    <applications/>
                     <valuemap/>
                     <logtimefmt/>
                 </item>
             </items>
-            <discovery_rules/>
+            <discovery_rules>
+                <discovery_rule>
+                    <name>MySQL tables</name>
+                    <type>0</type>
+                    <snmp_community/>
+                    <snmp_oid/>
+                    <key>mysql.discovertablesize</key>
+                    <delay>3600</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/>
+                    <ipmi_sensor/>
+                    <authtype>0</authtype>
+                    <username/>
+                    <password/>
+                    <publickey/>
+                    <privatekey/>
+                    <port/>
+                    <filter>
+                        <evaltype>0</evaltype>
+                        <formula/>
+                        <conditions>
+                            <condition>
+                                <macro>{#TABLENAME}</macro>
+                                <value>@excludeMySQLTables</value>
+                                <operator>8</operator>
+                                <formulaid>A</formulaid>
+                            </condition>
+                        </conditions>
+                    </filter>
+                    <lifetime>0</lifetime>
+                    <description/>
+                    <item_prototypes>
+                        <item_prototype>
+                            <name>MySQL table {#DBNAME}.{#TABLENAME} physical size</name>
+                            <type>0</type>
+                            <snmp_community/>
+                            <multiplier>0</multiplier>
+                            <snmp_oid/>
+                            <key>mysql.table_physical_size[{#DBNAME},{#TABLENAME}]</key>
+                            <delay>900</delay>
+                            <history>30</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/>
+                            <params/>
+                            <ipmi_sensor/>
+                            <data_type>0</data_type>
+                            <authtype>0</authtype>
+                            <username/>
+                            <password/>
+                            <publickey/>
+                            <privatekey/>
+                            <port/>
+                            <description>MySQL table size reported by filesystem</description>
+                            <inventory_link>0</inventory_link>
+                            <applications>
+                                <application>
+                                    <name>MySQL Tables</name>
+                                </application>
+                            </applications>
+                            <valuemap/>
+                            <logtimefmt/>
+                            <application_prototypes/>
+                        </item_prototype>
+                        <item_prototype>
+                            <name>MySQL table {#DBNAME}.{#TABLENAME} virtual size</name>
+                            <type>0</type>
+                            <snmp_community/>
+                            <multiplier>0</multiplier>
+                            <snmp_oid/>
+                            <key>mysql.table_virtual_size[{#DBNAME},{#TABLENAME}]</key>
+                            <delay>900</delay>
+                            <history>30</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/>
+                            <params/>
+                            <ipmi_sensor/>
+                            <data_type>0</data_type>
+                            <authtype>0</authtype>
+                            <username/>
+                            <password/>
+                            <publickey/>
+                            <privatekey/>
+                            <port/>
+                            <description>MySQL table size reported by MySQL database</description>
+                            <inventory_link>0</inventory_link>
+                            <applications>
+                                <application>
+                                    <name>MySQL Tables</name>
+                                </application>
+                            </applications>
+                            <valuemap/>
+                            <logtimefmt/>
+                            <application_prototypes/>
+                        </item_prototype>
+                    </item_prototypes>
+                    <trigger_prototypes/>
+                    <graph_prototypes/>
+                    <host_prototypes/>
+                </discovery_rule>
+            </discovery_rules>
             <macros/>
             <templates/>
             <screens>
@@ -8253,86 +7960,6 @@
             <type>0</type>
             <dependencies/>
         </trigger>
-        <trigger>
-            <expression>{Template App MySQL:vfs.fs.size[/var/lib/mysql,pfree].last(0)}&lt;1</expression>
-            <name>Low free (&lt;1%) disk space, volume /san/mysql-fs</name>
-            <url/>
-            <status>0</status>
-            <priority>5</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
-        <trigger>
-            <expression>{Template App MySQL:vfs.fs.inode[/var/lib/mysql,pfree].last(0)}&lt;1</expression>
-            <name>Low free (&lt;1%) inodes, volume /san/mysql-fs</name>
-            <url/>
-            <status>0</status>
-            <priority>5</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
-        <trigger>
-            <expression>{Template App MySQL:vfs.fs.size[/var/lib/mysql,pfree].last(0)}&lt;5</expression>
-            <name>Low free (&lt;5%) disk space, volume /san/mysql-fs</name>
-            <url/>
-            <status>0</status>
-            <priority>4</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
-        <trigger>
-            <expression>{Template App MySQL:vfs.fs.inode[/var/lib/mysql,pfree].last(0)}&lt;5</expression>
-            <name>Low free (&lt;5%) inodes, volume /san/mysql-fs</name>
-            <url/>
-            <status>0</status>
-            <priority>4</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
-        <trigger>
-            <expression>{Template App MySQL:vfs.fs.size[/var/lib/mysql,pfree].last(0)}&lt;10</expression>
-            <name>Low free (&lt;10%) disk space, volume /san/mysql-fs</name>
-            <url/>
-            <status>0</status>
-            <priority>3</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
-        <trigger>
-            <expression>{Template App MySQL:vfs.fs.inode[/var/lib/mysql,pfree].last(0)}&lt;10</expression>
-            <name>Low free (&lt;10%) inodes, volume /san/mysql-fs</name>
-            <url/>
-            <status>0</status>
-            <priority>3</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
-        <trigger>
-            <expression>{Template App MySQL:vfs.fs.size[/var/lib/mysql,pfree].last(0)}&lt;20</expression>
-            <name>Low free (&lt;20%) disk space, volume /san/mysql-fs</name>
-            <url/>
-            <status>0</status>
-            <priority>2</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
-        <trigger>
-            <expression>{Template App MySQL:vfs.fs.inode[/var/lib/mysql,pfree].last(0)}&lt;20</expression>
-            <name>Low free (&lt;20%) inodes, volume /san/mysql-fs</name>
-            <url/>
-            <status>0</status>
-            <priority>2</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
         <trigger>
             <expression>{Template App MySQL:mysql.Threads_connected.last(0)}&gt;300</expression>
             <name>More than 300 threads</name>
@@ -8413,6 +8040,16 @@
             <type>0</type>
             <dependencies/>
         </trigger>
+        <trigger>
+            <expression>{Template App MySQL:mysql.Table_locks_waited.delta(300)}&gt;20</expression>
+            <name>Server is waiting on table locks</name>
+            <url/>
+            <status>0</status>
+            <priority>2</priority>
+            <description/>
+            <type>0</type>
+            <dependencies/>
+        </trigger>
         <trigger>
             <expression>({TRIGGER.VALUE}=0 and {Template App MySQL:mysql.State_copying_to_tmp_table.count(900,1,&quot;ge&quot;)}&gt;10) or ({TRIGGER.VALUE}=1 and {Template App MySQL:mysql.State_copying_to_tmp_table.count(900,1,&quot;ge&quot;)}&gt;0)</expression>
             <name>Thread in state Copying_to_tmp_table for more than 15 min</name>
@@ -8423,6 +8060,26 @@
             <type>0</type>
             <dependencies/>
         </trigger>
+        <trigger>
+            <expression>{Template App MySQL:proc.num[mysqld].last(0)}&gt;1</expression>
+            <name>Too many instances of mysqld (current: {ITEM.LASTVALUE})</name>
+            <url/>
+            <status>0</status>
+            <priority>4</priority>
+            <description/>
+            <type>0</type>
+            <dependencies/>
+        </trigger>
+        <trigger>
+            <expression>{Template App MySQL:proc.num[mysqld].last(0)}&gt;1</expression>
+            <name>Too many instances of mysql running (current: {ITEM.LASTVALUE})</name>
+            <url/>
+            <status>0</status>
+            <priority>4</priority>
+            <description/>
+            <type>0</type>
+            <dependencies/>
+        </trigger>
     </triggers>
     <graphs>
         <graph>
@@ -8669,50 +8326,6 @@
                 </graph_item>
             </graph_items>
         </graph>
-        <graph>
-            <name>[MySQL] Database Filesystem Usage</name>
-            <width>900</width>
-            <height>200</height>
-            <yaxismin>0.0000</yaxismin>
-            <yaxismax>100.0000</yaxismax>
-            <show_work_period>0</show_work_period>
-            <show_triggers>0</show_triggers>
-            <type>1</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>1</sortorder>
-                    <drawtype>1</drawtype>
-                    <color>00C800</color>
-                    <yaxisside>0</yaxisside>
-                    <calc_fnc>2</calc_fnc>
-                    <type>0</type>
-                    <item>
-                        <host>Template App MySQL</host>
-                        <key>vfs.fs.size[/var/lib/mysql,pfree]</key>
-                    </item>
-                </graph_item>
-                <graph_item>
-                    <sortorder>0</sortorder>
-                    <drawtype>1</drawtype>
-                    <color>C80000</color>
-                    <yaxisside>0</yaxisside>
-                    <calc_fnc>2</calc_fnc>
-                    <type>0</type>
-                    <item>
-                        <host>Template App MySQL</host>
-                        <key>vfs.fs.size[/var/lib/mysql,pused]</key>
-                    </item>
-                </graph_item>
-            </graph_items>
-        </graph>
         <graph>
             <name>[MySQL] Files and Tables</name>
             <width>800</width>
@@ -8735,7 +8348,7 @@
                     <sortorder>0</sortorder>
                     <drawtype>0</drawtype>
                     <color>DE0056</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -8747,7 +8360,7 @@
                     <sortorder>1</sortorder>
                     <drawtype>0</drawtype>
                     <color>4A6959</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -8759,7 +8372,7 @@
                     <sortorder>2</sortorder>
                     <drawtype>0</drawtype>
                     <color>1D1159</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -8771,7 +8384,7 @@
                     <sortorder>3</sortorder>
                     <drawtype>1</drawtype>
                     <color>D09887</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -8931,7 +8544,7 @@
                     <sortorder>0</sortorder>
                     <drawtype>1</drawtype>
                     <color>C0C0C0</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -8943,7 +8556,7 @@
                     <sortorder>1</sortorder>
                     <drawtype>0</drawtype>
                     <color>FF0000</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -9275,7 +8888,7 @@
                     <sortorder>0</sortorder>
                     <drawtype>0</drawtype>
                     <color>4444FF</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -9287,7 +8900,7 @@
                     <sortorder>1</sortorder>
                     <drawtype>0</drawtype>
                     <color>FFF200</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -9299,7 +8912,7 @@
                     <sortorder>2</sortorder>
                     <drawtype>0</drawtype>
                     <color>FF7D00</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -9311,7 +8924,7 @@
                     <sortorder>3</sortorder>
                     <drawtype>0</drawtype>
                     <color>8F9286</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -9323,7 +8936,7 @@
                     <sortorder>4</sortorder>
                     <drawtype>0</drawtype>
                     <color>00A348</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -9335,7 +8948,7 @@
                     <sortorder>5</sortorder>
                     <drawtype>0</drawtype>
                     <color>6DC8FE</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -9347,7 +8960,7 @@
                     <sortorder>6</sortorder>
                     <drawtype>0</drawtype>
                     <color>B90054</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -9359,7 +8972,7 @@
                     <sortorder>7</sortorder>
                     <drawtype>0</drawtype>
                     <color>FF0000</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -9371,7 +8984,7 @@
                     <sortorder>8</sortorder>
                     <drawtype>0</drawtype>
                     <color>55009D</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -9827,7 +9440,7 @@
                     <sortorder>0</sortorder>
                     <drawtype>1</drawtype>
                     <color>AFECED</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -9839,7 +9452,7 @@
                     <sortorder>1</sortorder>
                     <drawtype>5</drawtype>
                     <color>EA8F00</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -9851,7 +9464,7 @@
                     <sortorder>2</sortorder>
                     <drawtype>5</drawtype>
                     <color>35962B</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -9863,7 +9476,7 @@
                     <sortorder>3</sortorder>
                     <drawtype>5</drawtype>
                     <color>DA4725</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -10319,7 +9932,7 @@
                     <sortorder>0</sortorder>
                     <drawtype>1</drawtype>
                     <color>4B2744</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -10331,7 +9944,7 @@
                     <sortorder>1</sortorder>
                     <drawtype>1</drawtype>
                     <color>E4C576</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -10755,7 +10368,7 @@
                     <sortorder>0</sortorder>
                     <drawtype>5</drawtype>
                     <color>13343B</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -10767,7 +10380,7 @@
                     <sortorder>1</sortorder>
                     <drawtype>5</drawtype>
                     <color>AA3B27</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -10779,7 +10392,7 @@
                     <sortorder>2</sortorder>
                     <drawtype>5</drawtype>
                     <color>EDAA41</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -10791,7 +10404,7 @@
                     <sortorder>3</sortorder>
                     <drawtype>1</drawtype>
                     <color>3D1500</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -10803,7 +10416,7 @@
                     <sortorder>4</sortorder>
                     <drawtype>5</drawtype>
                     <color>686240</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -11039,7 +10652,7 @@
                     <sortorder>0</sortorder>
                     <drawtype>2</drawtype>
                     <color>DE0056</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
@@ -11051,7 +10664,7 @@
                     <sortorder>1</sortorder>
                     <drawtype>1</drawtype>
                     <color>D8ACE0</color>
-                    <yaxisside>1</yaxisside>
+                    <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
diff --git a/templates/Template App Nginx.xml b/templates/Template App Nginx.xml
index a38b543bfd3d8f4b8ae3514a8d633a12ce8a4518..956113a0dd5c2bc45cea02ddb58114a3fb3ed833 100644
--- a/templates/Template App Nginx.xml	
+++ b/templates/Template App Nginx.xml	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2015-08-12T07:20:46Z</date>
+    <version>3.0</version>
+    <date>2016-05-02T08:37:16Z</date>
     <groups>
         <group>
-            <name>Templates</name>
+            <name>Zabbix Templates</name>
         </group>
     </groups>
     <templates>
@@ -14,7 +14,7 @@
             <description/>
             <groups>
                 <group>
-                    <name>Templates</name>
+                    <name>Zabbix Templates</name>
                 </group>
             </groups>
             <applications>
@@ -24,17 +24,60 @@
             </applications>
             <items>
                 <item>
-                    <name>Nginx $1</name>
+                    <name>Nginx is enabled in autostart</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>nginx[waiting]</key>
-                    <delay>60</delay>
+                    <key>chkconfig[nginx]</key>
+                    <delay>3600</delay>
                     <history>30</history>
-                    <trends>365</trends>
+                    <trends>1</trends>
                     <status>0</status>
-                    <value_type>0</value_type>
+                    <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/>
+                    <params/>
+                    <ipmi_sensor/>
+                    <data_type>3</data_type>
+                    <authtype>0</authtype>
+                    <username/>
+                    <password/>
+                    <publickey/>
+                    <privatekey/>
+                    <port/>
+                    <description/>
+                    <inventory_link>0</inventory_link>
+                    <applications>
+                        <application>
+                            <name>Nginx</name>
+                        </application>
+                    </applications>
+                    <valuemap/>
+                    <logtimefmt/>
+                </item>
+                <item>
+                    <name>nginx version</name>
+                    <type>0</type>
+                    <snmp_community/>
+                    <multiplier>0</multiplier>
+                    <snmp_oid/>
+                    <key>nginx.version</key>
+                    <delay>3600</delay>
+                    <history>7</history>
+                    <trends>0</trends>
+                    <status>0</status>
+                    <value_type>1</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -67,12 +110,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Nginx $1</name>
+                    <name>Nginx $1/sec</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>nginx[active_connections]</key>
+                    <key>nginx[accepted_connections]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -80,7 +123,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>1</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -115,7 +158,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>nginx[writing]</key>
+                    <key>nginx[active_connections]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -153,12 +196,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Nginx $1</name>
+                    <name>Nginx $1/sec</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>nginx[reading]</key>
+                    <key>nginx[handled_connections]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -166,7 +209,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>0</delta>
+                    <delta>1</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -239,12 +282,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Nginx $1/sec</name>
+                    <name>Nginx $1</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>nginx[accepted_connections]</key>
+                    <key>nginx[reading]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -252,7 +295,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>1</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -282,12 +325,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Nginx $1/sec</name>
+                    <name>Nginx $1</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>nginx[handled_connections]</key>
+                    <key>nginx[waiting]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -295,7 +338,7 @@
                     <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
-                    <delta>1</delta>
+                    <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
                     <snmpv3_securitylevel>0</snmpv3_securitylevel>
@@ -325,17 +368,17 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Nginx is enabled in autostart</name>
+                    <name>Nginx $1</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>chkconfig[nginx]</key>
-                    <delay>3600</delay>
+                    <key>nginx[writing]</key>
+                    <delay>60</delay>
                     <history>30</history>
-                    <trends>1</trends>
+                    <trends>365</trends>
                     <status>0</status>
-                    <value_type>3</value_type>
+                    <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -350,7 +393,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>3</data_type>
+                    <data_type>0</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -450,6 +493,16 @@
             <type>0</type>
             <dependencies/>
         </trigger>
+        <trigger>
+            <expression>{Template App Nginx:nginx.version.diff(0)}&gt;0</expression>
+            <name>Version of nginx server was changed</name>
+            <url/>
+            <status>0</status>
+            <priority>1</priority>
+            <description/>
+            <type>0</type>
+            <dependencies/>
+        </trigger>
     </triggers>
     <graphs>
         <graph>
diff --git a/templates/Template App OpenDKIM.xml b/templates/Template App OpenDKIM.xml
index 362766229dc73dc506530cd8ff0c1e333f0a26c1..050acdac851cff5bf8f24c1ede5e98bb03bda24f 100644
--- a/templates/Template App OpenDKIM.xml	
+++ b/templates/Template App OpenDKIM.xml	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2015-08-12T07:27:21Z</date>
+    <version>3.0</version>
+    <date>2016-05-02T08:38:04Z</date>
     <groups>
         <group>
-            <name>Templates</name>
+            <name>Zabbix Templates</name>
         </group>
     </groups>
     <templates>
@@ -14,7 +14,7 @@
             <description/>
             <groups>
                 <group>
-                    <name>Templates</name>
+                    <name>Zabbix Templates</name>
                 </group>
             </groups>
             <applications>
@@ -67,17 +67,17 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>OpenDKIM service is running</name>
+                    <name>OpenDKIM version</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[opendkim]</key>
-                    <delay>60</delay>
+                    <key>opendkim.version</key>
+                    <delay>3600</delay>
                     <history>30</history>
-                    <trends>365</trends>
+                    <trends>0</trends>
                     <status>0</status>
-                    <value_type>3</value_type>
+                    <value_type>1</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -110,17 +110,17 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>OpenDKIM version</name>
+                    <name>OpenDKIM service is running</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>opendkim.version</key>
-                    <delay>3600</delay>
+                    <key>proc.num[opendkim]</key>
+                    <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>1</value_type>
+                    <value_type>3</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
diff --git a/templates/Template App Postfix.xml b/templates/Template App Postfix.xml
index e0c977adf5dbb5a009ac878f441c88eec2f73380..f974cfe98500ad85e93e155096bb2e0298ca0252 100644
--- a/templates/Template App Postfix.xml	
+++ b/templates/Template App Postfix.xml	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2015-08-12T07:28:44Z</date>
+    <version>3.0</version>
+    <date>2016-05-02T08:42:40Z</date>
     <groups>
         <group>
-            <name>Templates</name>
+            <name>Zabbix Templates</name>
         </group>
     </groups>
     <templates>
@@ -14,7 +14,7 @@
             <description/>
             <groups>
                 <group>
-                    <name>Templates</name>
+                    <name>Zabbix Templates</name>
                 </group>
             </groups>
             <applications>
@@ -24,15 +24,15 @@
             </applications>
             <items>
                 <item>
-                    <name>Number of mails in queue - active</name>
+                    <name>Postfix is enabled in autostart</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mailqueue-postfix-queue[active]</key>
-                    <delay>60</delay>
-                    <history>30</history>
-                    <trends>365</trends>
+                    <key>chkconfig[postfix]</key>
+                    <delay>1800</delay>
+                    <history>7</history>
+                    <trends>30</trends>
                     <status>0</status>
                     <value_type>3</value_type>
                     <allowed_hosts/>
@@ -49,7 +49,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>0</data_type>
+                    <data_type>3</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -67,12 +67,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Number of mails in queue - deferred</name>
+                    <name>Number of mails in queue - active</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>mailqueue-postfix-queue[deferred]</key>
+                    <key>mailqueue-postfix-queue[active]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -110,15 +110,15 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Postfix is enabled in autostart</name>
+                    <name>Number of mails in queue - deferred</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>chkconfig[postfix]</key>
-                    <delay>1800</delay>
-                    <history>7</history>
-                    <trends>30</trends>
+                    <key>mailqueue-postfix-queue[deferred]</key>
+                    <delay>60</delay>
+                    <history>30</history>
+                    <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
                     <allowed_hosts/>
@@ -135,7 +135,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>3</data_type>
+                    <data_type>0</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -153,17 +153,17 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Postfix version</name>
+                    <name>SMTP service is running</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>postfix.version</key>
-                    <delay>3600</delay>
-                    <history>30</history>
+                    <key>net.tcp.service[smtp]</key>
+                    <delay>90</delay>
+                    <history>7</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>1</value_type>
+                    <value_type>3</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -192,21 +192,23 @@
                             <name>Postfix</name>
                         </application>
                     </applications>
-                    <valuemap/>
+                    <valuemap>
+                        <name>Service state</name>
+                    </valuemap>
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>SMTP service is running</name>
+                    <name>Postfix version</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.service[smtp]</key>
-                    <delay>90</delay>
-                    <history>7</history>
-                    <trends>365</trends>
+                    <key>postfix.version</key>
+                    <delay>3600</delay>
+                    <history>30</history>
+                    <trends>0</trends>
                     <status>0</status>
-                    <value_type>3</value_type>
+                    <value_type>1</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -235,9 +237,7 @@
                             <name>Postfix</name>
                         </application>
                     </applications>
-                    <valuemap>
-                        <name>Service state</name>
-                    </valuemap>
+                    <valuemap/>
                     <logtimefmt/>
                 </item>
             </items>
@@ -355,4 +355,19 @@
             </graph_items>
         </graph>
     </graphs>
+    <value_maps>
+        <value_map>
+            <name>Service state</name>
+            <mappings>
+                <mapping>
+                    <value>0</value>
+                    <newvalue>Down</newvalue>
+                </mapping>
+                <mapping>
+                    <value>1</value>
+                    <newvalue>Up</newvalue>
+                </mapping>
+            </mappings>
+        </value_map>
+    </value_maps>
 </zabbix_export>
diff --git a/templates/Template App Pure-FTPd.xml b/templates/Template App Pure-FTPd.xml
index c1cb5dd146796eefe452c67b085357f0ed8e1408..8deded87fd0258b7e992d450652eef5da0e17239 100644
--- a/templates/Template App Pure-FTPd.xml	
+++ b/templates/Template App Pure-FTPd.xml	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2015-08-12T07:32:04Z</date>
+    <version>3.0</version>
+    <date>2016-05-02T08:43:15Z</date>
     <groups>
         <group>
-            <name>Templates</name>
+            <name>Zabbix Templates</name>
         </group>
     </groups>
     <templates>
@@ -14,7 +14,7 @@
             <description/>
             <groups>
                 <group>
-                    <name>Templates</name>
+                    <name>Zabbix Templates</name>
                 </group>
             </groups>
             <applications>
@@ -67,12 +67,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Pure-FTPd is running</name>
+                    <name>Pure-FTPd server is listening</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[pure-ftpd]</key>
+                    <key>net.tcp.service[ftp]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -112,12 +112,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>Pure-FTPd server is listening</name>
+                    <name>Pure-FTPd is running</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.service[ftp]</key>
+                    <key>proc.num[pure-ftpd]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -195,4 +195,19 @@
             <dependencies/>
         </trigger>
     </triggers>
+    <value_maps>
+        <value_map>
+            <name>Service state</name>
+            <mappings>
+                <mapping>
+                    <value>0</value>
+                    <newvalue>Down</newvalue>
+                </mapping>
+                <mapping>
+                    <value>1</value>
+                    <newvalue>Up</newvalue>
+                </mapping>
+            </mappings>
+        </value_map>
+    </value_maps>
 </zabbix_export>
diff --git a/templates/Template App Spamassassin.xml b/templates/Template App Spamassassin.xml
index e84a762896ec774aca4694197c54b3aef127cbd4..60387d8643fc0c0375cc4dec110f1a54861901e0 100644
--- a/templates/Template App Spamassassin.xml	
+++ b/templates/Template App Spamassassin.xml	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2015-08-12T07:34:02Z</date>
+    <version>3.0</version>
+    <date>2016-05-02T08:44:17Z</date>
     <groups>
         <group>
-            <name>Templates</name>
+            <name>Zabbix Templates</name>
         </group>
     </groups>
     <templates>
@@ -14,7 +14,7 @@
             <description/>
             <groups>
                 <group>
-                    <name>Templates</name>
+                    <name>Zabbix Templates</name>
                 </group>
             </groups>
             <applications/>
@@ -67,7 +67,7 @@
     </templates>
     <triggers>
         <trigger>
-            <expression>{Template App Spamassassin:proc.num[spamd child].last(0)}&lt;2</expression>
+            <expression>{Template App Spamassassin:proc.num[spamd child].last(0)}=0</expression>
             <name>Service spamd is not running</name>
             <url/>
             <status>0</status>
diff --git a/templates/Template App cPanel.xml b/templates/Template App cPanel.xml
index c63a837c9de9524049d6df4ed4bf85a0616c3651..5712e81e99cedbad06a9ca0dbf1455e2432f8665 100644
--- a/templates/Template App cPanel.xml	
+++ b/templates/Template App cPanel.xml	
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2013-04-10T14:28:53Z</date>
+    <version>3.0</version>
+    <date>2016-05-02T08:30:02Z</date>
     <groups>
         <group>
-            <name>Templates</name>
+            <name>Zabbix Templates</name>
         </group>
     </groups>
     <templates>
         <template>
             <template>Template App cPanel</template>
             <name>Template App cPanel</name>
+            <description/>
             <groups>
                 <group>
-                    <name>Templates</name>
+                    <name>Zabbix Templates</name>
                 </group>
             </groups>
             <applications>
@@ -28,7 +29,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.listen[2082]</key>
+                    <key>net.tcp.service[tcp,,2082]</key>
                     <delay>120</delay>
                     <history>7</history>
                     <trends>365</trends>
@@ -37,9 +38,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/>
@@ -62,6 +66,7 @@
                     <valuemap>
                         <name>Service state</name>
                     </valuemap>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>cPanel SSL service is running</name>
@@ -69,7 +74,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.listen[2083]</key>
+                    <key>net.tcp.service[tcp,,2083]</key>
                     <delay>120</delay>
                     <history>7</history>
                     <trends>365</trends>
@@ -78,9 +83,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/>
@@ -103,6 +111,7 @@
                     <valuemap>
                         <name>Service state</name>
                     </valuemap>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>WebHost Manager is running</name>
@@ -110,7 +119,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.listen[2086]</key>
+                    <key>net.tcp.service[tcp,,2086]</key>
                     <delay>120</delay>
                     <history>7</history>
                     <trends>365</trends>
@@ -119,9 +128,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/>
@@ -144,6 +156,7 @@
                     <valuemap>
                         <name>Service state</name>
                     </valuemap>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>WebHost Manager SSL service is running</name>
@@ -151,7 +164,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.listen[2087]</key>
+                    <key>net.tcp.service[tcp,,2087]</key>
                     <delay>120</delay>
                     <history>7</history>
                     <trends>365</trends>
@@ -160,9 +173,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/>
@@ -185,6 +201,7 @@
                     <valuemap>
                         <name>Service state</name>
                     </valuemap>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Web mail service is running</name>
@@ -192,7 +209,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.listen[2095]</key>
+                    <key>net.tcp.service[tcp,,2095]</key>
                     <delay>120</delay>
                     <history>7</history>
                     <trends>365</trends>
@@ -201,9 +218,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/>
@@ -226,6 +246,7 @@
                     <valuemap>
                         <name>Service state</name>
                     </valuemap>
+                    <logtimefmt/>
                 </item>
                 <item>
                     <name>Web mail SSL service is running</name>
@@ -233,7 +254,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.listen[2096]</key>
+                    <key>net.tcp.service[tcp,,2096]</key>
                     <delay>120</delay>
                     <history>7</history>
                     <trends>365</trends>
@@ -242,9 +263,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/>
@@ -267,6 +291,7 @@
                     <valuemap>
                         <name>Service state</name>
                     </valuemap>
+                    <logtimefmt/>
                 </item>
             </items>
             <discovery_rules/>
@@ -277,28 +302,28 @@
     </templates>
     <triggers>
         <trigger>
-            <expression>{Template App cPanel:net.tcp.listen[2082].sum(#3)}=0</expression>
-            <name>cPanel service is down on {HOSTNAME}</name>
+            <expression>{Template App cPanel:net.tcp.service[tcp,,2082].sum(#3)}=0</expression>
+            <name>cPanel service is down</name>
             <url/>
             <status>0</status>
-            <priority>4</priority>
+            <priority>5</priority>
             <description/>
             <type>0</type>
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{Template App cPanel:net.tcp.listen[2083].sum(#3)}=0</expression>
-            <name>cPanel SSL service is down on {HOSTNAME}</name>
+            <expression>{Template App cPanel:net.tcp.service[tcp,,2083].sum(#3)}=0</expression>
+            <name>cPanel SSL service is down</name>
             <url/>
             <status>0</status>
-            <priority>4</priority>
+            <priority>5</priority>
             <description/>
             <type>0</type>
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{Template App cPanel:net.tcp.listen[2086].sum(#3)}=0</expression>
-            <name>WebHost Manager service is down on {HOSTNAME}</name>
+            <expression>{Template App cPanel:net.tcp.service[tcp,,2086].sum(#3)}=0</expression>
+            <name>WebHost Manager service is down</name>
             <url/>
             <status>0</status>
             <priority>4</priority>
@@ -307,8 +332,8 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{Template App cPanel:net.tcp.listen[2087].sum(#3)}=0</expression>
-            <name>WebHost Manager SSL service is down on {HOSTNAME}</name>
+            <expression>{Template App cPanel:net.tcp.service[tcp,,2087].sum(#3)}=0</expression>
+            <name>WebHost Manager SSL service is down</name>
             <url/>
             <status>0</status>
             <priority>4</priority>
@@ -317,8 +342,8 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{Template App cPanel:net.tcp.listen[2095].sum(#3)}=0</expression>
-            <name>Web mail service is down on {HOSTNAME}</name>
+            <expression>{Template App cPanel:net.tcp.service[tcp,,2095].sum(#3)}=0</expression>
+            <name>Webmail service is down</name>
             <url/>
             <status>0</status>
             <priority>4</priority>
@@ -327,8 +352,8 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{Template App cPanel:net.tcp.listen[2096].sum(#3)}=0</expression>
-            <name>Web mail SSL service is down on {HOSTNAME}</name>
+            <expression>{Template App cPanel:net.tcp.service[tcp,,2096].sum(#3)}=0</expression>
+            <name>Webmail SSL service is down</name>
             <url/>
             <status>0</status>
             <priority>4</priority>
@@ -365,7 +390,7 @@
                     <type>0</type>
                     <item>
                         <host>Template App cPanel</host>
-                        <key>net.tcp.listen[2082]</key>
+                        <key>net.tcp.service[tcp,,2082]</key>
                     </item>
                 </graph_item>
                 <graph_item>
@@ -377,7 +402,7 @@
                     <type>0</type>
                     <item>
                         <host>Template App cPanel</host>
-                        <key>net.tcp.listen[2083]</key>
+                        <key>net.tcp.service[tcp,,2083]</key>
                     </item>
                 </graph_item>
                 <graph_item>
@@ -389,7 +414,7 @@
                     <type>0</type>
                     <item>
                         <host>Template App cPanel</host>
-                        <key>net.tcp.listen[2086]</key>
+                        <key>net.tcp.service[tcp,,2086]</key>
                     </item>
                 </graph_item>
                 <graph_item>
@@ -401,7 +426,7 @@
                     <type>0</type>
                     <item>
                         <host>Template App cPanel</host>
-                        <key>net.tcp.listen[2087]</key>
+                        <key>net.tcp.service[tcp,,2087]</key>
                     </item>
                 </graph_item>
                 <graph_item>
@@ -413,7 +438,7 @@
                     <type>0</type>
                     <item>
                         <host>Template App cPanel</host>
-                        <key>net.tcp.listen[2095]</key>
+                        <key>net.tcp.service[tcp,,2095]</key>
                     </item>
                 </graph_item>
                 <graph_item>
@@ -425,10 +450,25 @@
                     <type>0</type>
                     <item>
                         <host>Template App cPanel</host>
-                        <key>net.tcp.listen[2096]</key>
+                        <key>net.tcp.service[tcp,,2096]</key>
                     </item>
                 </graph_item>
             </graph_items>
         </graph>
     </graphs>
+    <value_maps>
+        <value_map>
+            <name>Service state</name>
+            <mappings>
+                <mapping>
+                    <value>0</value>
+                    <newvalue>Down</newvalue>
+                </mapping>
+                <mapping>
+                    <value>1</value>
+                    <newvalue>Up</newvalue>
+                </mapping>
+            </mappings>
+        </value_map>
+    </value_maps>
 </zabbix_export>
diff --git a/templates/Template App lm_sensors.xml b/templates/Template App lm_sensors.xml
index 275667b817f2b7be406c0974c08a4ffaf915bf6b..3052b155b47b8dfa833bab6e04d610460e9bb8ac 100644
--- a/templates/Template App lm_sensors.xml	
+++ b/templates/Template App lm_sensors.xml	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2015-08-12T07:03:06Z</date>
+    <version>3.0</version>
+    <date>2016-05-02T08:35:04Z</date>
     <groups>
         <group>
-            <name>Templates</name>
+            <name>Zabbix Templates</name>
         </group>
     </groups>
     <templates>
@@ -14,89 +14,11 @@
             <description/>
             <groups>
                 <group>
-                    <name>Templates</name>
+                    <name>Zabbix Templates</name>
                 </group>
             </groups>
             <applications/>
             <items>
-                <item>
-                    <name>Sensor - CPU FAN Speed</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <multiplier>0</multiplier>
-                    <snmp_oid/>
-                    <key>lm_sensors[&quot;CPU FAN Speed&quot;]</key>
-                    <delay>300</delay>
-                    <history>30</history>
-                    <trends>365</trends>
-                    <status>0</status>
-                    <value_type>3</value_type>
-                    <allowed_hosts/>
-                    <units>RPM</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/>
-                    <valuemap/>
-                    <logtimefmt/>
-                </item>
-                <item>
-                    <name>Sensor - CPU Temperature</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <multiplier>0</multiplier>
-                    <snmp_oid/>
-                    <key>lm_sensors[&quot;CPU Temperature&quot;]</key>
-                    <delay>300</delay>
-                    <history>30</history>
-                    <trends>365</trends>
-                    <status>0</status>
-                    <value_type>0</value_type>
-                    <allowed_hosts/>
-                    <units>C</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/>
-                    <valuemap/>
-                    <logtimefmt/>
-                </item>
                 <item>
                     <name>Sensor - ISA Adapter Core 0</name>
                     <type>0</type>
@@ -253,201 +175,6 @@
                     <valuemap/>
                     <logtimefmt/>
                 </item>
-                <item>
-                    <name>Sensor - Motherboard Temperature</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <multiplier>0</multiplier>
-                    <snmp_oid/>
-                    <key>lm_sensors[&quot;MB Temperature&quot;]</key>
-                    <delay>300</delay>
-                    <history>30</history>
-                    <trends>365</trends>
-                    <status>0</status>
-                    <value_type>0</value_type>
-                    <allowed_hosts/>
-                    <units>C</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/>
-                    <valuemap/>
-                    <logtimefmt/>
-                </item>
-                <item>
-                    <name>Sensor - North Bridge Temperature</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <multiplier>0</multiplier>
-                    <snmp_oid/>
-                    <key>lm_sensors[&quot;NB Temperature&quot;]</key>
-                    <delay>300</delay>
-                    <history>30</history>
-                    <trends>365</trends>
-                    <status>0</status>
-                    <value_type>0</value_type>
-                    <allowed_hosts/>
-                    <units>C</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/>
-                    <valuemap/>
-                    <logtimefmt/>
-                </item>
-                <item>
-                    <name>Sensor - PCI adapter Temperature</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <multiplier>0</multiplier>
-                    <snmp_oid/>
-                    <key>lm_sensors[&quot;temp1&quot;]</key>
-                    <delay>300</delay>
-                    <history>30</history>
-                    <trends>365</trends>
-                    <status>0</status>
-                    <value_type>0</value_type>
-                    <allowed_hosts/>
-                    <units>C</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/>
-                    <valuemap/>
-                    <logtimefmt/>
-                </item>
-                <item>
-                    <name>Sensor - PWR_FAN FAN Speed</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <multiplier>0</multiplier>
-                    <snmp_oid/>
-                    <key>lm_sensors[&quot;PWR_FAN FAN Speed&quot;]</key>
-                    <delay>300</delay>
-                    <history>30</history>
-                    <trends>365</trends>
-                    <status>0</status>
-                    <value_type>3</value_type>
-                    <allowed_hosts/>
-                    <units>RPM</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/>
-                    <valuemap/>
-                    <logtimefmt/>
-                </item>
-                <item>
-                    <name>Sensor - South Bridge Temperature</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <multiplier>0</multiplier>
-                    <snmp_oid/>
-                    <key>lm_sensors[&quot;SB Temperature&quot;]</key>
-                    <delay>300</delay>
-                    <history>30</history>
-                    <trends>365</trends>
-                    <status>0</status>
-                    <value_type>0</value_type>
-                    <allowed_hosts/>
-                    <units>C</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/>
-                    <valuemap/>
-                    <logtimefmt/>
-                </item>
             </items>
             <discovery_rules/>
             <macros/>
@@ -456,16 +183,6 @@
         </template>
     </templates>
     <triggers>
-        <trigger>
-            <expression>{Template App lm_sensors:lm_sensors[&quot;CPU Temperature&quot;].last(#3)}&gt;60</expression>
-            <name>High CPU temperature on {HOSTNAME}</name>
-            <url/>
-            <status>0</status>
-            <priority>3</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
         <trigger>
             <expression>{Template App lm_sensors:lm_sensors[&quot;Core 0&quot;].last(#3)}&gt;80</expression>
             <name>High ISA Adapter Core 0 temperature on {HOSTNAME}</name>
@@ -506,56 +223,6 @@
             <type>0</type>
             <dependencies/>
         </trigger>
-        <trigger>
-            <expression>{Template App lm_sensors:lm_sensors[&quot;MB Temperature&quot;].last(#3)}&gt;45</expression>
-            <name>High Motherboard temperature on {HOSTNAME}</name>
-            <url/>
-            <status>0</status>
-            <priority>3</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
-        <trigger>
-            <expression>{Template App lm_sensors:lm_sensors[&quot;NB Temperature&quot;].last(0)}&gt;80</expression>
-            <name>High North Bridge temperature on {HOSTNAME}</name>
-            <url/>
-            <status>0</status>
-            <priority>3</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
-        <trigger>
-            <expression>{Template App lm_sensors:lm_sensors[&quot;temp1&quot;].last(#3)}&gt;100</expression>
-            <name>High PCI Adapter temperature on {HOSTNAME}</name>
-            <url/>
-            <status>0</status>
-            <priority>3</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
-        <trigger>
-            <expression>{Template App lm_sensors:lm_sensors[&quot;SB Temperature&quot;].last(#3)}&gt;65</expression>
-            <name>High South Bridge temperature on {HOSTNAME}</name>
-            <url/>
-            <status>0</status>
-            <priority>3</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
-        <trigger>
-            <expression>{Template App lm_sensors:lm_sensors[&quot;CPU Temperature&quot;].last(#3)}&gt;65</expression>
-            <name>Very high CPU temperature on {HOSTNAME}</name>
-            <url/>
-            <status>0</status>
-            <priority>3</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
         <trigger>
             <expression>{Template App lm_sensors:lm_sensors[&quot;Core 0&quot;].last(#3)}&gt;100</expression>
             <name>Very high ISA Adapter Core 0 temperature on {HOSTNAME}</name>
@@ -596,46 +263,6 @@
             <type>0</type>
             <dependencies/>
         </trigger>
-        <trigger>
-            <expression>{Template App lm_sensors:lm_sensors[&quot;MB Temperature&quot;].last(#3)}&gt;55</expression>
-            <name>Very high Motherboard temperature on {HOSTNAME}</name>
-            <url/>
-            <status>0</status>
-            <priority>3</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
-        <trigger>
-            <expression>{Template App lm_sensors:lm_sensors[&quot;NB Temperature&quot;].last(#3)}&gt;80</expression>
-            <name>Very high North Bridge temperature on {HOSTNAME}</name>
-            <url/>
-            <status>0</status>
-            <priority>3</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
-        <trigger>
-            <expression>{Template App lm_sensors:lm_sensors[&quot;temp1&quot;].last(#3)}&gt;120</expression>
-            <name>Very high PCI adapter temperature on {HOSTNAME}</name>
-            <url/>
-            <status>0</status>
-            <priority>3</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
-        <trigger>
-            <expression>{Template App lm_sensors:lm_sensors[&quot;SB Temperature&quot;].last(#3)}&gt;80</expression>
-            <name>Very high South Bridge temperature on {HOSTNAME}</name>
-            <url/>
-            <status>0</status>
-            <priority>3</priority>
-            <description/>
-            <type>0</type>
-            <dependencies/>
-        </trigger>
     </triggers>
     <graphs>
         <graph>
@@ -706,209 +333,5 @@
                 </graph_item>
             </graph_items>
         </graph>
-        <graph>
-            <name>Sensor - CPU temperature</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>1</ymin_type_1>
-            <ymax_type_1>1</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>Template App lm_sensors</host>
-                        <key>lm_sensors[&quot;CPU Temperature&quot;]</key>
-                    </item>
-                </graph_item>
-            </graph_items>
-        </graph>
-        <graph>
-            <name>Sensor - Fan speed</name>
-            <width>900</width>
-            <height>200</height>
-            <yaxismin>0.0000</yaxismin>
-            <yaxismax>130.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>1</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>2</drawtype>
-                    <color>00C800</color>
-                    <yaxisside>0</yaxisside>
-                    <calc_fnc>2</calc_fnc>
-                    <type>0</type>
-                    <item>
-                        <host>Template App lm_sensors</host>
-                        <key>lm_sensors[&quot;CPU FAN Speed&quot;]</key>
-                    </item>
-                </graph_item>
-                <graph_item>
-                    <sortorder>1</sortorder>
-                    <drawtype>2</drawtype>
-                    <color>0000C8</color>
-                    <yaxisside>0</yaxisside>
-                    <calc_fnc>2</calc_fnc>
-                    <type>0</type>
-                    <item>
-                        <host>Template App lm_sensors</host>
-                        <key>lm_sensors[&quot;PWR_FAN FAN Speed&quot;]</key>
-                    </item>
-                </graph_item>
-            </graph_items>
-        </graph>
-        <graph>
-            <name>Sensor - Motherboard temperature</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>1</ymin_type_1>
-            <ymax_type_1>1</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>DD0000</color>
-                    <yaxisside>0</yaxisside>
-                    <calc_fnc>2</calc_fnc>
-                    <type>0</type>
-                    <item>
-                        <host>Template App lm_sensors</host>
-                        <key>lm_sensors[&quot;MB Temperature&quot;]</key>
-                    </item>
-                </graph_item>
-            </graph_items>
-        </graph>
-        <graph>
-            <name>Sensor - North Bridge temperature</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>1</ymin_type_1>
-            <ymax_type_1>1</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>DD0000</color>
-                    <yaxisside>0</yaxisside>
-                    <calc_fnc>2</calc_fnc>
-                    <type>0</type>
-                    <item>
-                        <host>Template App lm_sensors</host>
-                        <key>lm_sensors[&quot;NB Temperature&quot;]</key>
-                    </item>
-                </graph_item>
-            </graph_items>
-        </graph>
-        <graph>
-            <name>Sensor - PCI Adapter temperature</name>
-            <width>900</width>
-            <height>200</height>
-            <yaxismin>0.0000</yaxismin>
-            <yaxismax>130.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>1</ymin_type_1>
-            <ymax_type_1>1</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>DD0000</color>
-                    <yaxisside>0</yaxisside>
-                    <calc_fnc>2</calc_fnc>
-                    <type>0</type>
-                    <item>
-                        <host>Template App lm_sensors</host>
-                        <key>lm_sensors[&quot;temp1&quot;]</key>
-                    </item>
-                </graph_item>
-            </graph_items>
-        </graph>
-        <graph>
-            <name>Sensor - South Bridge temperature</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>1</ymin_type_1>
-            <ymax_type_1>1</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>DD0000</color>
-                    <yaxisside>0</yaxisside>
-                    <calc_fnc>2</calc_fnc>
-                    <type>0</type>
-                    <item>
-                        <host>Template App lm_sensors</host>
-                        <key>lm_sensors[&quot;SB Temperature&quot;]</key>
-                    </item>
-                </graph_item>
-            </graph_items>
-        </graph>
     </graphs>
 </zabbix_export>
diff --git a/templates/Template App vsftpd.xml b/templates/Template App vsftpd.xml
index a71afdedb47d8cec3a8a36033b0dc67bfa47c24d..03f54a5c4b56e059b599bfefdf6a1eeeb4f41b79 100644
--- a/templates/Template App vsftpd.xml	
+++ b/templates/Template App vsftpd.xml	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2015-08-12T07:34:37Z</date>
+    <version>3.0</version>
+    <date>2016-05-02T08:45:41Z</date>
     <groups>
         <group>
-            <name>Templates</name>
+            <name>Zabbix Templates</name>
         </group>
     </groups>
     <templates>
@@ -14,7 +14,7 @@
             <description/>
             <groups>
                 <group>
-                    <name>Templates</name>
+                    <name>Zabbix Templates</name>
                 </group>
             </groups>
             <applications>
@@ -67,12 +67,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>vsftpd is running</name>
+                    <name>vsftpd server is listening</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[vsftpd]</key>
+                    <key>net.tcp.service[ftp]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -112,12 +112,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>vsftpd server is listening</name>
+                    <name>vsftpd is running</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.service[ftp]</key>
+                    <key>proc.num[vsftpd]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -195,4 +195,19 @@
             <dependencies/>
         </trigger>
     </triggers>
+    <value_maps>
+        <value_map>
+            <name>Service state</name>
+            <mappings>
+                <mapping>
+                    <value>0</value>
+                    <newvalue>Down</newvalue>
+                </mapping>
+                <mapping>
+                    <value>1</value>
+                    <newvalue>Up</newvalue>
+                </mapping>
+            </mappings>
+        </value_map>
+    </value_maps>
 </zabbix_export>
diff --git a/templates/Template Device Back-UPS ES 700G.xml b/templates/Template Device Back-UPS ES 700G.xml
index 9efd69b412d5affb737d3948affb564013ea1831..4f8a93fd653662364dd7fc16e2cf44f03b237ba6 100644
--- a/templates/Template Device Back-UPS ES 700G.xml	
+++ b/templates/Template Device Back-UPS ES 700G.xml	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2015-10-01T11:02:21Z</date>
+    <version>3.0</version>
+    <date>2016-05-02T08:46:35Z</date>
     <groups>
         <group>
-            <name>Templates</name>
+            <name>Zabbix Templates</name>
         </group>
     </groups>
     <templates>
@@ -14,7 +14,7 @@
             <description/>
             <groups>
                 <group>
-                    <name>Templates</name>
+                    <name>Zabbix Templates</name>
                 </group>
             </groups>
             <applications>
@@ -24,19 +24,19 @@
             </applications>
             <items>
                 <item>
-                    <name>UPS battery charge in %</name>
+                    <name>UPS current battery voltage</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>ups.apcacces[BCHARGE]</key>
+                    <key>ups.apcacces[BATTV]</key>
                     <delay>30</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>%</units>
+                    <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -67,19 +67,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>UPS current battery voltage</name>
+                    <name>UPS battery charge in %</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>ups.apcacces[BATTV]</key>
+                    <key>ups.apcacces[BCHARGE]</key>
                     <delay>30</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units/>
+                    <units>%</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -282,17 +282,17 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>UPS remaining runtime left on battery</name>
+                    <name>UPS status</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>ups.apcacces[TIMELEFT]</key>
+                    <key>ups.apcacces[STATUS]</key>
                     <delay>30</delay>
                     <history>30</history>
-                    <trends>365</trends>
+                    <trends>0</trends>
                     <status>0</status>
-                    <value_type>0</value_type>
+                    <value_type>1</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -325,17 +325,17 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>UPS status</name>
+                    <name>UPS remaining runtime left on battery</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>ups.apcacces[STATUS]</key>
+                    <key>ups.apcacces[TIMELEFT]</key>
                     <delay>30</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>1</value_type>
+                    <value_type>0</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -368,15 +368,15 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>UPS time of last transfer to battery</name>
+                    <name>UPS version</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>ups.lastdate</key>
+                    <key>ups.apcacces[VERSION]</key>
                     <delay>3600</delay>
                     <history>30</history>
-                    <trends>365</trends>
+                    <trends>0</trends>
                     <status>0</status>
                     <value_type>1</value_type>
                     <allowed_hosts/>
@@ -411,15 +411,15 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>UPS version</name>
+                    <name>UPS time of last transfer to battery</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>ups.apcacces[VERSION]</key>
+                    <key>ups.lastdate</key>
                     <delay>3600</delay>
                     <history>30</history>
-                    <trends>365</trends>
+                    <trends>0</trends>
                     <status>0</status>
                     <value_type>1</value_type>
                     <allowed_hosts/>
diff --git a/templates/Template Security.xml b/templates/Template Security.xml
index 81752c0ff500b5a4d77e9440c47ebca160e3acdf..00343cee9282d63525e6698e51b77464f9787db2 100644
--- a/templates/Template Security.xml	
+++ b/templates/Template Security.xml	
@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2014-08-04T13:37:32Z</date>
+    <version>3.0</version>
+    <date>2016-05-02T08:53:53Z</date>
     <groups>
         <group>
-            <name>OS Linux</name>
-        </group>
-        <group>
-            <name>Templates</name>
+            <name>Zabbix Templates</name>
         </group>
     </groups>
     <templates>
         <template>
             <template>Template Security</template>
             <name>Template Security</name>
+            <description/>
             <groups>
                 <group>
-                    <name>OS Linux</name>
-                </group>
-                <group>
-                    <name>Templates</name>
+                    <name>Zabbix Templates</name>
                 </group>
             </groups>
             <applications>
@@ -29,13 +24,13 @@
             </applications>
             <items>
                 <item>
-                    <name>Checksum of iptables policy</name>
+                    <name>Fail2ban is enabled in autostart</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>firewall-md5</key>
-                    <delay>3600</delay>
+                    <key>chkconfig[fail2ban]</key>
+                    <delay>1800</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
@@ -54,7 +49,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>0</data_type>
+                    <data_type>3</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -69,15 +64,16 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
-                    <name>Fail2ban is enabled in autostart</name>
+                    <name>iptables is enabled in autostart</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>chkconfig[fail2ban]</key>
-                    <delay>3600</delay>
+                    <key>chkconfig[iptables]</key>
+                    <delay>1800</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
@@ -111,15 +107,16 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
-                    <name>Fail2Ban service is running</name>
+                    <name>Firewall enabled</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[fail2ban-server]</key>
-                    <delay>60</delay>
+                    <key>firewall-enabled</key>
+                    <delay>90</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
@@ -138,7 +135,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>0</data_type>
+                    <data_type>3</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -152,16 +149,19 @@
                             <name>Security</name>
                         </application>
                     </applications>
-                    <valuemap/>
+                    <valuemap>
+                        <name>Service state</name>
+                    </valuemap>
+                    <logtimefmt/>
                 </item>
                 <item>
-                    <name>Firewall enabled</name>
+                    <name>Checksum of iptables policy</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>firewall-enabled</key>
-                    <delay>90</delay>
+                    <key>firewall-md5</key>
+                    <delay>1800</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
@@ -180,7 +180,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>3</data_type>
+                    <data_type>0</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -194,18 +194,17 @@
                             <name>Security</name>
                         </application>
                     </applications>
-                    <valuemap>
-                        <name>Service state</name>
-                    </valuemap>
+                    <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
-                    <name>iptables is enabled in autostart</name>
+                    <name>Fail2Ban service is running</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>chkconfig[iptables]</key>
-                    <delay>3600</delay>
+                    <key>proc.num[fail2ban-server]</key>
+                    <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
@@ -224,7 +223,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>3</data_type>
+                    <data_type>0</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -239,16 +238,17 @@
                         </application>
                     </applications>
                     <valuemap/>
+                    <logtimefmt/>
                 </item>
                 <item>
-                    <name>SELinux enabled</name>
+                    <name>Users with UID 0</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>selinux-enabled</key>
-                    <delay>90</delay>
-                    <history>30</history>
+                    <key>root_users</key>
+                    <delay>30</delay>
+                    <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
@@ -266,7 +266,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>3</data_type>
+                    <data_type>0</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -280,9 +280,8 @@
                             <name>Security</name>
                         </application>
                     </applications>
-                    <valuemap>
-                        <name>Service state</name>
-                    </valuemap>
+                    <valuemap/>
+                    <logtimefmt/>
                 </item>
             </items>
             <discovery_rules/>
@@ -323,7 +322,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{Template Security:firewall-md5.diff(0)}#0</expression>
+            <expression>{Template Security:firewall-md5.diff(0)}&lt;&gt;0</expression>
             <name>iptables has been changed</name>
             <url/>
             <status>0</status>
@@ -343,14 +342,29 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{Template Security:selinux-enabled.last(0)}=0</expression>
-            <name>SELinux is disabled</name>
+            <expression>{Template Security:root_users.change()}&gt;1</expression>
+            <name>Users with UID 0</name>
             <url/>
             <status>0</status>
-            <priority>3</priority>
-            <description/>
+            <priority>4</priority>
+            <description>trigger checks the system, if there are more users with the UID 0 than 1</description>
             <type>0</type>
             <dependencies/>
         </trigger>
     </triggers>
+    <value_maps>
+        <value_map>
+            <name>Service state</name>
+            <mappings>
+                <mapping>
+                    <value>0</value>
+                    <newvalue>Down</newvalue>
+                </mapping>
+                <mapping>
+                    <value>1</value>
+                    <newvalue>Up</newvalue>
+                </mapping>
+            </mappings>
+        </value_map>
+    </value_maps>
 </zabbix_export>