openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add general_log to mariadb container and make heka collect it"

Browse Source
This commit is contained in:
Jenkins 2016-04-04 10:51:19 +00:00 committed by Gerrit Code Review
commit dc9990e744
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/common/templates/heka-mariadb.toml.j2
View File

@ -6,6 +6,6 @@ filename = "lua_decoders/os_mysql_log.lua"
type = "LogstreamerInput"
decoder = "mariadb_log_decoder"
log_directory = "/var/log/kolla"
file_match = 'mariadb/mariadb\.log\.?(?P<Seq>\d*)$'
file_match = 'mariadb/(mariadb|mariadb-error)\.log\.?(?P<Seq>\d*)$'
priority = ["^Seq"]
differentiator = ['mariadb']

4
ansible/roles/mariadb/templates/galera.cnf.j2
View File

@ -3,7 +3,9 @@
bind-address={{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
port={{ mariadb_port }}
log-error=/var/log/kolla/mariadb/mariadb.log
log-error=/var/log/kolla/mariadb/mariadb-error.log
general_log=1
general_log_file=/var/log/kolla/mariadb/mariadb.log
binlog_format=ROW
default-storage-engine=innodb