diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-04 10:51:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-04 10:51:19 +0000 |
| commit | dc9990e74467dd5c87cc437ef996961db1cad8f8 (patch) | |
| tree | fc9f482fcf5e9c04c29a49b68bde452411158d8c | |
| parent | ac228c370bca9179e1116ad31e5863cc3675f2f1 (diff) | |
| parent | 86bafeee7a8926d212e8d089fade667772dbcc83 (diff) | |
| download | kolla-dc9990e74467dd5c87cc437ef996961db1cad8f8.tar.gz kolla-dc9990e74467dd5c87cc437ef996961db1cad8f8.zip | |
Merge "Add general_log to mariadb container and make heka collect it"
| -rw-r--r-- | ansible/roles/common/templates/heka-mariadb.toml.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/mariadb/templates/galera.cnf.j2 | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ansible/roles/common/templates/heka-mariadb.toml.j2 b/ansible/roles/common/templates/heka-mariadb.toml.j2 index 07d710541..04abd33b4 100644 --- a/ansible/roles/common/templates/heka-mariadb.toml.j2 +++ b/ansible/roles/common/templates/heka-mariadb.toml.j2 @@ -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'] diff --git a/ansible/roles/mariadb/templates/galera.cnf.j2 b/ansible/roles/mariadb/templates/galera.cnf.j2 index 7c426dbf8..51359cb4e 100644 --- a/ansible/roles/mariadb/templates/galera.cnf.j2 +++ b/ansible/roles/mariadb/templates/galera.cnf.j2 @@ -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 |