Merge branch 'master' of github.com:thecamels/zabbix

Conflicts:
	README.md

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
 ======

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