diff --git a/templates/Template_App_Redis.xml b/templates/Template App Redis.xml
similarity index 98%
rename from templates/Template_App_Redis.xml
rename to templates/Template App Redis.xml
index 3b7fc786066eee06eb0a5ba75e447bd0d7948454..9e6f2aebfeedb264e9becc81dc5468b75597900a 100644
--- a/templates/Template_App_Redis.xml
+++ b/templates/Template App Redis.xml	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2016-01-28T14:13:31Z</date>
+    <version>3.0</version>
+    <date>2016-05-02T07:20:15Z</date>
     <groups>
         <group>
             <name>Zabbix Templates</name>
@@ -67,13 +67,13 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>[Redis] $1</name>
+                    <name>[Redis] server is running</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[repl_backlog_active]</key>
-                    <delay>60</delay>
+                    <key>net.tcp.port[,6379]</key>
+                    <delay>30</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
@@ -106,16 +106,18 @@
                             <name>Redis</name>
                         </application>
                     </applications>
-                    <valuemap/>
+                    <valuemap>
+                        <name>Service state</name>
+                    </valuemap>
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>[Redis] $1</name>
+                    <name>[Redis] ping test</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[rejected_connections]</key>
+                    <key>redis-ping</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -135,7 +137,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>0</data_type>
+                    <data_type>3</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -153,17 +155,17 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>[Redis] $1</name>
+                    <name>Redis version</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[repl_backlog_first_byte_offset]</key>
-                    <delay>60</delay>
-                    <history>30</history>
-                    <trends>365</trends>
+                    <key>redis.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/>
                     <delta>0</delta>
@@ -201,12 +203,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[repl_backlog_size]</key>
+                    <key>redis[aof_current_rewrite_time_sec]</key>
                     <delay>60</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>
@@ -244,12 +246,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[role]</key>
-                    <delay>3600</delay>
+                    <key>redis[aof_enabled]</key>
+                    <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>4</value_type>
+                    <value_type>3</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -264,7 +266,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>0</data_type>
+                    <data_type>3</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -287,10 +289,10 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[redis_mode]</key>
-                    <delay>3600</delay>
+                    <key>redis[aof_last_bgrewrite_status]</key>
+                    <delay>30</delay>
                     <history>30</history>
-                    <trends>365</trends>
+                    <trends>0</trends>
                     <status>0</status>
                     <value_type>4</value_type>
                     <allowed_hosts/>
@@ -330,12 +332,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[repl_backlog_histlen]</key>
+                    <key>redis[aof_last_rewrite_time_sec]</key>
                     <delay>60</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>
@@ -373,10 +375,10 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[redis_git_sha1]</key>
-                    <delay>3600</delay>
+                    <key>redis[aof_last_write_status]</key>
+                    <delay>30</delay>
                     <history>30</history>
-                    <trends>365</trends>
+                    <trends>0</trends>
                     <status>0</status>
                     <value_type>4</value_type>
                     <allowed_hosts/>
@@ -416,7 +418,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[rdb_current_bgsave_time_sec]</key>
+                    <key>redis[aof_rewrite_in_progress]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -436,7 +438,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>0</data_type>
+                    <data_type>3</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -459,7 +461,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[rdb_changes_since_last_save]</key>
+                    <key>redis[aof_rewrite_scheduled]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -479,7 +481,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>0</data_type>
+                    <data_type>3</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -502,12 +504,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[rdb_bgsave_in_progress]</key>
-                    <delay>60</delay>
+                    <key>redis[arch_bits]</key>
+                    <delay>3600</delay>
                     <history>30</history>
-                    <trends>365</trends>
+                    <trends>0</trends>
                     <status>0</status>
-                    <value_type>3</value_type>
+                    <value_type>4</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -522,7 +524,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>3</data_type>
+                    <data_type>0</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -545,12 +547,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[rdb_last_bgsave_status]</key>
-                    <delay>30</delay>
+                    <key>redis[client_biggest_input_buf]</key>
+                    <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>4</value_type>
+                    <value_type>3</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -588,12 +590,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[rdb_last_bgsave_time_sec]</key>
+                    <key>redis[client_longest_output_list]</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/>
                     <delta>0</delta>
@@ -631,7 +633,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[redis_git_dirty]</key>
+                    <key>redis[cluster_enabled]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -674,7 +676,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[rdb_last_save_time]</key>
+                    <key>redis[connected_clients]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -717,7 +719,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[sync_full]</key>
+                    <key>redis[connected_slaves]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -760,7 +762,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[sync_partial_err]</key>
+                    <key>redis[evicted_keys]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -803,12 +805,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[used_cpu_user_children]</key>
+                    <key>redis[expired_keys]</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/>
                     <delta>0</delta>
@@ -841,17 +843,17 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>[Redis] $1</name>
+                    <name>[Redis] GCC version</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[used_cpu_user]</key>
-                    <delay>60</delay>
+                    <key>redis[gcc_version]</key>
+                    <delay>3600</delay>
                     <history>30</history>
-                    <trends>365</trends>
+                    <trends>0</trends>
                     <status>0</status>
-                    <value_type>0</value_type>
+                    <value_type>4</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -889,14 +891,14 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[used_memory]</key>
+                    <key>redis[hz]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>3</value_type>
                     <allowed_hosts/>
-                    <units>B</units>
+                    <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -932,12 +934,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[used_memory_lua]</key>
+                    <key>redis[instantaneous_input_kbps]</key>
                     <delay>60</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>
@@ -975,7 +977,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[used_memory_rss]</key>
+                    <key>redis[instantaneous_ops_per_sec]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -1018,14 +1020,14 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[used_memory_peak]</key>
+                    <key>redis[instantaneous_output_kbps]</key>
                     <delay>60</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/>
@@ -1061,12 +1063,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[used_cpu_sys_children]</key>
+                    <key>redis[keyspace_hits]</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/>
                     <delta>0</delta>
@@ -1104,12 +1106,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[used_cpu_sys]</key>
+                    <key>redis[keyspace_misses]</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/>
                     <delta>0</delta>
@@ -1147,7 +1149,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[total_commands_processed]</key>
+                    <key>redis[latest_fork_usec]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -1190,7 +1192,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[tcp_port]</key>
+                    <key>redis[loading]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -1210,7 +1212,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>0</data_type>
+                    <data_type>3</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -1233,7 +1235,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[total_connections_received]</key>
+                    <key>redis[lru_clock]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -1276,7 +1278,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[total_net_input_bytes]</key>
+                    <key>redis[master_repl_offset]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -1319,14 +1321,14 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[uptime_in_seconds]</key>
+                    <key>redis[mem_fragmentation_ratio]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>3</value_type>
+                    <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>s</units>
+                    <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -1362,7 +1364,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[total_net_output_bytes]</key>
+                    <key>redis[migrate_cached_sockets]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -1405,12 +1407,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[sync_partial_ok]</key>
-                    <delay>60</delay>
+                    <key>redis[multiplexing_api]</key>
+                    <delay>3600</delay>
                     <history>30</history>
-                    <trends>365</trends>
+                    <trends>0</trends>
                     <status>0</status>
-                    <value_type>3</value_type>
+                    <value_type>4</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -1448,7 +1450,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[pubsub_patterns]</key>
+                    <key>redis[pubsub_channels]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -1491,7 +1493,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[client_longest_output_list]</key>
+                    <key>redis[pubsub_patterns]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -1534,7 +1536,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[client_biggest_input_buf]</key>
+                    <key>redis[rdb_bgsave_in_progress]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -1554,7 +1556,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>0</data_type>
+                    <data_type>3</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -1577,7 +1579,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[cluster_enabled]</key>
+                    <key>redis[rdb_changes_since_last_save]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -1620,12 +1622,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[connected_clients]</key>
+                    <key>redis[rdb_current_bgsave_time_sec]</key>
                     <delay>60</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>
@@ -1663,12 +1665,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[evicted_keys]</key>
-                    <delay>60</delay>
+                    <key>redis[rdb_last_bgsave_status]</key>
+                    <delay>30</delay>
                     <history>30</history>
-                    <trends>365</trends>
+                    <trends>0</trends>
                     <status>0</status>
-                    <value_type>3</value_type>
+                    <value_type>4</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -1706,12 +1708,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[connected_slaves]</key>
+                    <key>redis[rdb_last_bgsave_time_sec]</key>
                     <delay>60</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>
@@ -1749,12 +1751,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[arch_bits]</key>
-                    <delay>3600</delay>
+                    <key>redis[rdb_last_save_time]</key>
+                    <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>4</value_type>
+                    <value_type>3</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -1792,7 +1794,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[aof_rewrite_scheduled]</key>
+                    <key>redis[redis_git_dirty]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -1812,7 +1814,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>3</data_type>
+                    <data_type>0</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -1835,12 +1837,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[aof_enabled]</key>
-                    <delay>60</delay>
+                    <key>redis[redis_git_sha1]</key>
+                    <delay>3600</delay>
                     <history>30</history>
-                    <trends>365</trends>
+                    <trends>0</trends>
                     <status>0</status>
-                    <value_type>3</value_type>
+                    <value_type>4</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -1855,7 +1857,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>3</data_type>
+                    <data_type>0</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -1878,12 +1880,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[aof_current_rewrite_time_sec]</key>
-                    <delay>60</delay>
+                    <key>redis[redis_mode]</key>
+                    <delay>3600</delay>
                     <history>30</history>
-                    <trends>365</trends>
+                    <trends>0</trends>
                     <status>0</status>
-                    <value_type>0</value_type>
+                    <value_type>4</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -1921,12 +1923,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[aof_last_bgrewrite_status]</key>
-                    <delay>30</delay>
+                    <key>redis[rejected_connections]</key>
+                    <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>4</value_type>
+                    <value_type>3</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -1964,12 +1966,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[aof_last_rewrite_time_sec]</key>
+                    <key>redis[repl_backlog_active]</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/>
                     <delta>0</delta>
@@ -2007,7 +2009,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[aof_rewrite_in_progress]</key>
+                    <key>redis[repl_backlog_first_byte_offset]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2027,7 +2029,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>3</data_type>
+                    <data_type>0</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -2050,12 +2052,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[aof_last_write_status]</key>
-                    <delay>30</delay>
+                    <key>redis[repl_backlog_histlen]</key>
+                    <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>4</value_type>
+                    <value_type>3</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -2093,7 +2095,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[pubsub_channels]</key>
+                    <key>redis[repl_backlog_size]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2136,12 +2138,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[expired_keys]</key>
-                    <delay>60</delay>
+                    <key>redis[role]</key>
+                    <delay>3600</delay>
                     <history>30</history>
-                    <trends>365</trends>
+                    <trends>0</trends>
                     <status>0</status>
-                    <value_type>3</value_type>
+                    <value_type>4</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -2179,7 +2181,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[lru_clock]</key>
+                    <key>redis[sync_full]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2222,7 +2224,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[loading]</key>
+                    <key>redis[sync_partial_err]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2242,7 +2244,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>3</data_type>
+                    <data_type>0</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -2265,7 +2267,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[master_repl_offset]</key>
+                    <key>redis[sync_partial_ok]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2308,12 +2310,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[mem_fragmentation_ratio]</key>
+                    <key>redis[tcp_port]</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/>
                     <delta>0</delta>
@@ -2351,12 +2353,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[multiplexing_api]</key>
-                    <delay>3600</delay>
+                    <key>redis[total_commands_processed]</key>
+                    <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>4</value_type>
+                    <value_type>3</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -2394,7 +2396,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[migrate_cached_sockets]</key>
+                    <key>redis[total_connections_received]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2437,7 +2439,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[keyspace_misses]</key>
+                    <key>redis[total_net_input_bytes]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2480,7 +2482,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[latest_fork_usec]</key>
+                    <key>redis[total_net_output_bytes]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2523,14 +2525,14 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[instantaneous_input_kbps]</key>
+                    <key>redis[uptime_in_seconds]</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>s</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -2566,12 +2568,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[hz]</key>
+                    <key>redis[used_cpu_sys]</key>
                     <delay>60</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>
@@ -2609,7 +2611,7 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[instantaneous_output_kbps]</key>
+                    <key>redis[used_cpu_sys_children]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2652,12 +2654,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[instantaneous_ops_per_sec]</key>
+                    <key>redis[used_cpu_user]</key>
                     <delay>60</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>
@@ -2695,12 +2697,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[keyspace_hits]</key>
+                    <key>redis[used_cpu_user_children]</key>
                     <delay>60</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>
@@ -2733,19 +2735,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>[Redis] GCC version</name>
+                    <name>[Redis] $1</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[gcc_version]</key>
-                    <delay>3600</delay>
+                    <key>redis[used_memory]</key>
+                    <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>4</value_type>
+                    <value_type>3</value_type>
                     <allowed_hosts/>
-                    <units/>
+                    <units>B</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -2776,12 +2778,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>[Redis] ping test</name>
+                    <name>[Redis] $1</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis-ping</key>
+                    <key>redis[used_memory_lua]</key>
                     <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
@@ -2801,7 +2803,7 @@
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
-                    <data_type>3</data_type>
+                    <data_type>0</data_type>
                     <authtype>0</authtype>
                     <username/>
                     <password/>
@@ -2819,19 +2821,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>[Redis] Redis version</name>
+                    <name>[Redis] $1</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>redis[redis_version]</key>
-                    <delay>3600</delay>
+                    <key>redis[used_memory_peak]</key>
+                    <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>4</value_type>
+                    <value_type>3</value_type>
                     <allowed_hosts/>
-                    <units/>
+                    <units>B</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -2862,13 +2864,13 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>[Redis] server is running</name>
+                    <name>[Redis] $1</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.port[127.0.0.1,6379]</key>
-                    <delay>30</delay>
+                    <key>redis[used_memory_rss]</key>
+                    <delay>60</delay>
                     <history>30</history>
                     <trends>365</trends>
                     <status>0</status>
@@ -2901,9 +2903,7 @@
                             <name>Redis</name>
                         </application>
                     </applications>
-                    <valuemap>
-                        <name>Service state</name>
-                    </valuemap>
+                    <valuemap/>
                     <logtimefmt/>
                 </item>
             </items>
@@ -2955,7 +2955,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{Template App Redis:net.tcp.port[127.0.0.1,6379].last(0)}=0</expression>
+            <expression>{Template App Redis:net.tcp.port[,6379].last(0)}=0</expression>
             <name>Redis is down</name>
             <url/>
             <status>0</status>
@@ -2995,7 +2995,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{Template App Redis:redis[redis_version].diff(0)}&gt;0</expression>
+            <expression>{Template App Redis:redis.version.diff(0)}&gt;0</expression>
             <name>Redis version has changed</name>
             <url/>
             <status>0</status>
@@ -3113,27 +3113,27 @@
             <ymax_item_1>0</ymax_item_1>
             <graph_items>
                 <graph_item>
-                    <sortorder>1</sortorder>
+                    <sortorder>0</sortorder>
                     <drawtype>0</drawtype>
-                    <color>C80000</color>
+                    <color>00C800</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>Template App Redis</host>
-                        <key>redis[rejected_connections]</key>
+                        <key>redis[connected_clients]</key>
                     </item>
                 </graph_item>
                 <graph_item>
-                    <sortorder>0</sortorder>
+                    <sortorder>1</sortorder>
                     <drawtype>0</drawtype>
-                    <color>00C800</color>
+                    <color>C80000</color>
                     <yaxisside>0</yaxisside>
                     <calc_fnc>2</calc_fnc>
                     <type>0</type>
                     <item>
                         <host>Template App Redis</host>
-                        <key>redis[connected_clients]</key>
+                        <key>redis[rejected_connections]</key>
                     </item>
                 </graph_item>
                 <graph_item>
@@ -3321,7 +3321,7 @@
                     <type>0</type>
                     <item>
                         <host>Template App Redis</host>
-                        <key>net.tcp.port[127.0.0.1,6379]</key>
+                        <key>net.tcp.port[,6379]</key>
                     </item>
                 </graph_item>
             </graph_items>
@@ -3371,4 +3371,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>