metricbeat: fix username/password replacement

This commit is contained in:
Jérémy Lecour 2019-01-08 10:02:04 +01:00 committed by Jérémy Lecour
parent 1118486993
commit ebd65b2395
2 changed files with 4 additions and 3 deletions

View File

@ -22,10 +22,11 @@ The **patch** part changes incrementally at each release.
* redis: distinction between main and master password
### Fixed
* metricbeat: fix username/password replacement
* nagios-nrpe: check_process now return the error code (making the check more usefull than /bin/true)
* nginx: Munin url config is now a template to insert the server-status prefix
* redis: In instance mode, ensure to replace the nrpe check_redis with the instance check script
* redis: Don't set the owner of /var/{lib,log}/redis to a redis instance account
* nagios-nrpe: check_process now return the error code (making the check more usefull than /bin/true)
### Security

View File

@ -57,8 +57,8 @@
line: '{{ item.line }}'
insertafter: "output.elasticsearch:"
with_items:
- { regexp: '^ #username: .*', line: ' username: "{{ metricbeat_elasticsearch_auth_username }}"' }
- { regexp: '^ #password: .*', line: ' password: "{{ metricbeat_elasticsearch_auth_password }}"' }
- { regexp: '^ #?username: .*', line: ' username: "{{ metricbeat_elasticsearch_auth_username }}"' }
- { regexp: '^ #?password: .*', line: ' password: "{{ metricbeat_elasticsearch_auth_password }}"' }
notify: restart metricbeat
when:
- metricbeat_elasticsearch_auth_username != ""