diff --git a/README.md b/README.md
index a80c52b16c7ed1820d59d4ba5da6a7028c508b22..5fc843fa609e7632ba4c7ca6f6b66eda45fff4d2 100644
--- a/README.md
+++ b/README.md
@@ -202,7 +202,11 @@ You need also add SUDO for zabbix user: ```zabbix ALL=(ALL) NOPASSWD: /opt/dell
Template App PowerPath
======
+<<<<<<< HEAD
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.
+=======
+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.
+>>>>>>> 3ed283df96fdc7b7052da5e6dc946265e1761962
Template Security
======
diff --git a/templates/Template App RabbitMQ.xml b/templates/Template App RabbitMQ.xml
index afb0fa7a84c2e723ec07e22aeb0bc5b128291c02..95355b68bb288d406eaa801ca83ffb219591809b 100644
--- a/templates/Template App RabbitMQ.xml
+++ b/templates/Template App RabbitMQ.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<zabbix_export>
<version>2.0</version>
- <date>2014-08-04T13:35:21Z</date>
+ <date>2014-12-08T14:38:46Z</date>
<groups>
<group>
<name>Templates</name>
@@ -11,6 +11,7 @@
<template>
<template>Template App RabbitMQ</template>
<name>Template App RabbitMQ</name>
+ <description/>
<groups>
<group>
<name>Templates</name>
@@ -66,6 +67,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] AMQP Client</name>
@@ -108,6 +110,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] AMQP RMQ main port</name>
@@ -152,6 +155,7 @@
<valuemap>
<name>Service state</name>
</valuemap>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] AMQP RMQ SSL main port</name>
@@ -196,6 +200,7 @@
<valuemap>
<name>Service state</name>
</valuemap>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] bindings_count</name>
@@ -238,6 +243,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] channels_confirm_count</name>
@@ -280,6 +286,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] channels_count</name>
@@ -322,6 +329,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] channels_transactional_count</name>
@@ -364,6 +372,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] connections_blocked</name>
@@ -406,6 +415,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] connections_blocking</name>
@@ -448,6 +458,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] connections_closed</name>
@@ -490,6 +501,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] connections_closing</name>
@@ -532,6 +544,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] connections_count</name>
@@ -574,6 +587,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] connections_opening</name>
@@ -616,6 +630,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] connections_running</name>
@@ -658,6 +673,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] connections_starting</name>
@@ -700,6 +716,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] connections_tuning</name>
@@ -742,6 +759,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] disk_free</name>
@@ -784,6 +802,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] disk_free_limit</name>
@@ -826,6 +845,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] Embedded Rabbit Stomp Adapter</name>
@@ -868,6 +888,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] Erlang/OTP SSL application</name>
@@ -910,6 +931,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] exchanges_auto_delete_count</name>
@@ -952,6 +974,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] exchanges_count</name>
@@ -994,6 +1017,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] exchanges_direct_count</name>
@@ -1036,6 +1060,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] exchanges_durable_count</name>
@@ -1078,6 +1103,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] exchanges_fanout_count</name>
@@ -1120,6 +1146,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] exchanges_headers_count</name>
@@ -1162,6 +1189,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] exchanges_topic_count</name>
@@ -1204,6 +1232,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] file_descriptors.total_limit</name>
@@ -1246,6 +1275,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] file_descriptors.total_used</name>
@@ -1288,6 +1318,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] flashpolicyd.py</name>
@@ -1332,6 +1363,7 @@
<valuemap>
<name>Service state</name>
</valuemap>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] Management Agent</name>
@@ -1374,6 +1406,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] Management Console</name>
@@ -1416,6 +1449,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] Management Plugin</name>
@@ -1460,6 +1494,7 @@
<valuemap>
<name>Service state</name>
</valuemap>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] memory.atom</name>
@@ -1502,6 +1537,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] memory.binary</name>
@@ -1544,6 +1580,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] memory.code</name>
@@ -1586,14 +1623,101 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
+ </item>
+ <item>
+ <name>[RabbitMQ] memory.connection_channels</name>
+ <type>0</type>
+ <snmp_community/>
+ <multiplier>0</multiplier>
+ <snmp_oid/>
+ <key>memory.connection_channels</key>
+ <delay>60</delay>
+ <history>7</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>RabbitMQ</name>
+ </application>
+ </applications>
+ <valuemap/>
+ <logtimefmt/>
+ </item>
+ <item>
+ <name>[RabbitMQ] memory.connection_other</name>
+ <type>0</type>
+ <snmp_community/>
+ <multiplier>0</multiplier>
+ <snmp_oid/>
+ <key>memory.connection_other</key>
+ <delay>60</delay>
+ <history>7</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>RabbitMQ</name>
+ </application>
+ </applications>
+ <valuemap/>
+ <logtimefmt/>
</item>
<item>
- <name>[RabbitMQ] memory.connection_procs</name>
+ <name>[RabbitMQ] memory.connection_readers</name>
<type>0</type>
<snmp_community/>
<multiplier>0</multiplier>
<snmp_oid/>
- <key>memory.connection_procs</key>
+ <key>memory.connection_readers</key>
<delay>60</delay>
<history>7</history>
<trends>365</trends>
@@ -1628,6 +1752,50 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
+ </item>
+ <item>
+ <name>[RabbitMQ] memory.connection_writers</name>
+ <type>0</type>
+ <snmp_community/>
+ <multiplier>0</multiplier>
+ <snmp_oid/>
+ <key>memory.connection_writers</key>
+ <delay>60</delay>
+ <history>7</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>RabbitMQ</name>
+ </application>
+ </applications>
+ <valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] memory.mgmt_db</name>
@@ -1670,6 +1838,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] memory.mnesia</name>
@@ -1712,6 +1881,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] memory.msg_index</name>
@@ -1754,6 +1924,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] memory.other_ets</name>
@@ -1796,6 +1967,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] memory.other_proc</name>
@@ -1838,6 +2010,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] memory.other_system</name>
@@ -1880,6 +2053,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] memory.plugins</name>
@@ -1922,6 +2096,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] memory.queue_procs</name>
@@ -1964,6 +2139,50 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
+ </item>
+ <item>
+ <name>[RabbitMQ] memory.queue_slave_procs</name>
+ <type>0</type>
+ <snmp_community/>
+ <multiplier>0</multiplier>
+ <snmp_oid/>
+ <key>memory.queue_slave_procs</key>
+ <delay>60</delay>
+ <history>7</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>RabbitMQ</name>
+ </application>
+ </applications>
+ <valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] memory.total</name>
@@ -2006,6 +2225,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] messages_count</name>
@@ -2048,6 +2268,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] messages_ready_count</name>
@@ -2090,6 +2311,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] messages_unacknowledged_count</name>
@@ -2132,6 +2354,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] MochiMedia Web Server</name>
@@ -2174,6 +2397,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] Port Mapper Daemon (epmd)</name>
@@ -2218,6 +2442,7 @@
<valuemap>
<name>Service state</name>
</valuemap>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] processes.limit</name>
@@ -2260,6 +2485,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] processes.used</name>
@@ -2302,6 +2528,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] queues_auto_delete_count</name>
@@ -2344,6 +2571,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] queues_durable_count</name>
@@ -2386,6 +2614,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] queues_memory_allocated</name>
@@ -2428,6 +2657,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] queue_consumers_count</name>
@@ -2470,6 +2700,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] Rabbit WEB-STOMP - WebSockets to Stomp adapter</name>
@@ -2512,6 +2743,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] run_queue</name>
@@ -2554,6 +2786,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] sockets_limit</name>
@@ -2596,6 +2829,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] sockets_used</name>
@@ -2638,6 +2872,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] Status</name>
@@ -2680,6 +2915,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] uptime</name>
@@ -2722,6 +2958,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] Version</name>
@@ -2764,6 +3001,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] vm_memory_high_watermark</name>
@@ -2806,6 +3044,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] vm_memory_limit</name>
@@ -2848,6 +3087,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] Web Dispatcher</name>
@@ -2890,6 +3130,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
<item>
<name>[RabbitMQ] Webmachine</name>
@@ -2932,6 +3173,7 @@
</application>
</applications>
<valuemap/>
+ <logtimefmt/>
</item>
</items>
<discovery_rules/>
@@ -3032,7 +3274,7 @@
<dependencies/>
</trigger>
<trigger>
- <expression>{Template App RabbitMQ:rabbitmq_status.last()}#0</expression>
+ <expression>{Template App RabbitMQ:rabbitmq_status.last()}<>0</expression>
<name>RabbitMQ is down</name>
<url/>
<status>0</status>
@@ -3542,7 +3784,7 @@
<type>0</type>
<item>
<host>Template App RabbitMQ</host>
- <key>memory.connection_procs</key>
+ <key>memory.connection_other</key>
</item>
</graph_item>
<graph_item>
diff --git a/zabbix_agentd.conf.d/rabbit.conf b/zabbix_agentd.conf.d/rabbit.conf
index 79386485726bc349515b01fbaa72cfe6a31a087a..e516cceeb944dcb9677cde420ea0e0de219cc608 100644
--- a/zabbix_agentd.conf.d/rabbit.conf
+++ b/zabbix_agentd.conf.d/rabbit.conf
@@ -14,7 +14,11 @@ UserParameter=erlang-ssl,/etc/zabbix/bin/rabbitmqctl.sh | grep -o '"Erlang/OTP S
# Memory
UserParameter=memory.total,/etc/zabbix/bin/rabbitmqctl.sh | grep -o 'total,[0-9]*' | cut -d',' -f2 | tr -d \"
-UserParameter=memory.connection_procs,/etc/zabbix/bin/rabbitmqctl.sh | grep -o 'connection_procs,[0-9]*' | cut -d',' -f2 | tr -d \"
+UserParameter=memory.connection_other,/etc/zabbix/bin/rabbitmqctl.sh | grep -o 'connection_other,[0-9]*' | cut -d',' -f2 | tr -d \"
+UserParameter=memory.connection_readers,/etc/zabbix/bin/rabbitmqctl.sh | grep -o 'connection_readers,[0-9]*' | cut -d',' -f2 | tr -d \"
+UserParameter=memory.connection_writers,/etc/zabbix/bin/rabbitmqctl.sh | grep -o 'connection_writers,[0-9]*' | cut -d',' -f2 | tr -d \"
+UserParameter=memory.connection_channels,/etc/zabbix/bin/rabbitmqctl.sh | grep -o 'connection_channels,[0-9]*' | cut -d',' -f2 | tr -d \"
+UserParameter=memory.queue_slave_procs,/etc/zabbix/bin/rabbitmqctl.sh | grep -o 'queue_slave_procs,[0-9]*' | cut -d',' -f2 | tr -d \"
UserParameter=memory.queue_procs,/etc/zabbix/bin/rabbitmqctl.sh | grep -o 'queue_procs,[0-9]*' | cut -d',' -f2 | tr -d \"
UserParameter=memory.plugins,/etc/zabbix/bin/rabbitmqctl.sh | grep -o 'plugins,[0-9]*' | cut -d',' -f2 | tr -d \"
UserParameter=memory.other_proc,/etc/zabbix/bin/rabbitmqctl.sh | grep -o 'other_proc,[0-9]*' | cut -d',' -f2 | tr -d \"
@@ -47,4 +51,4 @@ UserParameter=uptime,/etc/zabbix/bin/rabbitmqctl.sh | grep -o 'uptime,[0-9]*' |
UserParameter=rabbitmq[*], /etc/zabbix/bin/rabbitmq.sh | grep $1 | cut -d ':' -f2
#RabbitMQ Status
-UserParameter=rabbitmq_status, sudo /usr/sbin/rabbitmqctl status >/dev/null 2>&1; echo $?
+UserParameter=rabbitmq_status, sudo /usr/sbin/rabbitmqctl status >/dev/null 2>&1; echo $?
\ No newline at end of file