x/browbeat
Code Issues Proposed changes

Merge "Bug fixes in rabbitmq collectd plugin"

Browse Source
This commit is contained in:
Zuul 2022-01-04 07:39:41 +00:00 committed by Gerrit Code Review
commit 8347c5bfb9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/install/roles/collectd/tasks/main.yml
View File

@ -31,8 +31,8 @@
when: "('Undercloud' in group_names and rabbitmq_undercloud_collectd_plugin)" when: "('Undercloud' in group_names and rabbitmq_undercloud_collectd_plugin)"
- name: (Undercloud) Get Rabbitmq password - name: (Undercloud) Get Rabbitmq password
shell: | command: hiera -c /etc/puppet/hiera.yaml rabbitmq::default_pass
grep undercloud_rabbit_password /home/stack/undercloud-passwords.conf | sed 's/undercloud_rabbit_password: //g' become: true
register: undercloud_rabbitmq_password register: undercloud_rabbitmq_password
when: "('Undercloud' in group_names and rabbitmq_undercloud_collectd_plugin)" when: "('Undercloud' in group_names and rabbitmq_undercloud_collectd_plugin)"

2
ansible/install/roles/collectd/templates/controller.collectd.conf.j2
View File

@ -767,7 +767,7 @@ LoadPlugin python
Import "collectd_rabbitmq_monitoring" Import "collectd_rabbitmq_monitoring"
<Module collectd_rabbitmq_monitoring> <Module collectd_rabbitmq_monitoring>
interval {{rabbitmq_controller_collectd_interval}} interval {{rabbitmq_controller_collectd_interval}}
host "{{inventory_hostname}}.internalapi.localdomain" host 127.0.0.1
port 15672 port 15672
username {{controller0_rabbitmq_username.stdout}} username {{controller0_rabbitmq_username.stdout}}
password {{controller0_rabbitmq_password.stdout}} password {{controller0_rabbitmq_password.stdout}}

2
ansible/install/roles/collectd/templates/undercloud.collectd.conf.j2
View File

@ -356,7 +356,7 @@ PreCacheChain "PreCache"
Import "collectd_rabbitmq_monitoring" Import "collectd_rabbitmq_monitoring"
<Module collectd_rabbitmq_monitoring> <Module collectd_rabbitmq_monitoring>
interval {{rabbitmq_undercloud_collectd_interval}} interval {{rabbitmq_undercloud_collectd_interval}}
host "{{undercloud_ctlplane_ip_address.stdout}}" host 127.0.0.1
port 15672 port 15672
username {{undercloud_rabbitmq_username.stdout}} username {{undercloud_rabbitmq_username.stdout}}
password {{undercloud_rabbitmq_password.stdout}} password {{undercloud_rabbitmq_password.stdout}}