diff --git a/deployment/puppet/zabbix/files/scripts/monitoring.conf b/deployment/puppet/zabbix/files/scripts/monitoring.conf index 4440679c42..03824c0da2 100644 --- a/deployment/puppet/zabbix/files/scripts/monitoring.conf +++ b/deployment/puppet/zabbix/files/scripts/monitoring.conf @@ -19,7 +19,7 @@ cinder_timeout=1 log_level=DEBUG user=guest password=guest -host=http://127.0.0.1:55672 +host=http://127.0.0.1:15672 [query_db] log_level=DEBUG diff --git a/deployment/puppet/zabbix/manifests/monitoring/rabbitmq_mon.pp b/deployment/puppet/zabbix/manifests/monitoring/rabbitmq_mon.pp index 571400605b..28b86266a3 100644 --- a/deployment/puppet/zabbix/manifests/monitoring/rabbitmq_mon.pp +++ b/deployment/puppet/zabbix/manifests/monitoring/rabbitmq_mon.pp @@ -35,8 +35,6 @@ class zabbix::monitoring::rabbitmq_mon { action => 'accept', } - sysctl::value { 'net.ipv4.ip_local_reserved_ports': value => '55672' } - zabbix::agent::userparameter { 'rabbitmq.queue.items': command => "/etc/zabbix/scripts/check_rabbit.py queues-items"; diff --git a/deployment/puppet/zabbix/templates/check_rabbit.conf.erb b/deployment/puppet/zabbix/templates/check_rabbit.conf.erb index a9efc16927..41cbe4629e 100644 --- a/deployment/puppet/zabbix/templates/check_rabbit.conf.erb +++ b/deployment/puppet/zabbix/templates/check_rabbit.conf.erb @@ -2,6 +2,6 @@ log_level=DEBUG user=<%= scope.lookupvar('zabbix::params::openstack::rabbit_user') %> password=<%= scope.lookupvar('zabbix::params::openstack::rabbit_password') %> -host=http://<%= scope.lookupvar('zabbix::params::openstack::rabbit_vip') %>:55672 +host=http://<%= scope.lookupvar('zabbix::params::openstack::rabbit_vip') %>:15672 #OpenStack queues, Y - number of service types, N - count of *this* service, max_queues=Y*(2*N+1) max_queues=128