diff options
| author | Vikram Hosakote <vhosakot@cisco.com> | 2016-04-06 17:33:59 +0000 |
|---|---|---|
| committer | Vikram Hosakote <vhosakot@cisco.com> | 2016-04-11 02:49:56 +0000 |
| commit | df53d92db6464f5347d21972664caa69eb6d99a2 (patch) | |
| tree | f2781bac447bfc21ff769831bdbac8a79a7abcac | |
| parent | 12735f01dae0b7ee94df980f79d48b83611cf8ac (diff) | |
| download | kolla-df53d92db6464f5347d21972664caa69eb6d99a2.tar.gz kolla-df53d92db6464f5347d21972664caa69eb6d99a2.zip | |
Revert "Add general_log to mariadb container and make heka collect it"
This reverts commit 86bafeee7a8926d212e8d089fade667772dbcc83.
Closes-Bug: #1568670
Change-Id: I88563292e29d691c27a3640e5232b9f22c7a288a
| -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, 2 insertions, 4 deletions
diff --git a/ansible/roles/common/templates/heka-mariadb.toml.j2 b/ansible/roles/common/templates/heka-mariadb.toml.j2 index 04abd33b4..07d710541 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|mariadb-error)\.log\.?(?P<Seq>\d*)$' +file_match = 'mariadb/mariadb\.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 51359cb4e..7c426dbf8 100644 --- a/ansible/roles/mariadb/templates/galera.cnf.j2 +++ b/ansible/roles/mariadb/templates/galera.cnf.j2 @@ -3,9 +3,7 @@ bind-address={{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} port={{ mariadb_port }} -log-error=/var/log/kolla/mariadb/mariadb-error.log -general_log=1 -general_log_file=/var/log/kolla/mariadb/mariadb.log +log-error=/var/log/kolla/mariadb/mariadb.log binlog_format=ROW default-storage-engine=innodb |