diff options
| author | Éric Lemoine <elemoine@mirantis.com> | 2016-02-03 16:55:45 +0100 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-02-19 21:49:21 +0000 |
| commit | 4445c819917d2ae9ebe6ad250b17cac6dfbb1b56 (patch) | |
| tree | 14141f9547e50f68ad4a55b8973c115b2985ba96 /ansible | |
| parent | 7fb0971fb69956bcc70b0575b7162f8fa3a7d187 (diff) | |
| download | kolla-4445c819917d2ae9ebe6ad250b17cac6dfbb1b56.tar.gz kolla-4445c819917d2ae9ebe6ad250b17cac6dfbb1b56.zip | |
Make Heka collect MariaDB logs
Partially implements: blueprint heka
Change-Id: Ib5e740683cee296bcac69228f525594850d62a27
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/common/tasks/config.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/common/templates/heka-mariadb.toml.j2 | 10 | ||||
| -rw-r--r-- | ansible/roles/common/templates/heka.json.j2 | 6 | ||||
| -rw-r--r-- | ansible/roles/mariadb/tasks/bootstrap.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/mariadb/tasks/start.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/mariadb/templates/galera.cnf.j2 | 2 |
6 files changed, 21 insertions, 0 deletions
diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml index 849315432..50b46bf04 100644 --- a/ansible/roles/common/tasks/config.yml +++ b/ansible/roles/common/tasks/config.yml @@ -32,3 +32,4 @@ - "haproxy" - "rabbitmq" - "openstack" + - "mariadb" diff --git a/ansible/roles/common/templates/heka-mariadb.toml.j2 b/ansible/roles/common/templates/heka-mariadb.toml.j2 new file mode 100644 index 000000000..85fad0d04 --- /dev/null +++ b/ansible/roles/common/templates/heka-mariadb.toml.j2 @@ -0,0 +1,10 @@ +[mariadb_log_decoder] +type = "SandboxDecoder" +filename = "lua_decoders/os_mysql_log.lua" + +[mariadb_logstreamer_input] +type = "LogstreamerInput" +decoder = "mariadb_log_decoder" +log_directory = "/var/log/kolla" +file_match = 'mariadb/mariadb\.log' +differentiator = ['mariadb'] diff --git a/ansible/roles/common/templates/heka.json.j2 b/ansible/roles/common/templates/heka.json.j2 index 11f9a1704..e33982cc0 100644 --- a/ansible/roles/common/templates/heka.json.j2 +++ b/ansible/roles/common/templates/heka.json.j2 @@ -24,6 +24,12 @@ "dest": "/etc/heka/heka-openstack.toml", "owner": "heka", "perm": "0600" + }, + { + "source": "{{ container_config_directory }}/heka-mariadb.toml", + "dest": "/etc/heka/heka-mariadb.toml", + "owner": "heka", + "perm": "0600" } ] } diff --git a/ansible/roles/mariadb/tasks/bootstrap.yml b/ansible/roles/mariadb/tasks/bootstrap.yml index aef939226..3180a33f9 100644 --- a/ansible/roles/mariadb/tasks/bootstrap.yml +++ b/ansible/roles/mariadb/tasks/bootstrap.yml @@ -51,6 +51,7 @@ volumes: - "{{ node_config_directory }}/mariadb/:{{ container_config_directory }}/:ro" - "mariadb:/var/lib/mysql" + - "kolla_logs:/var/log/kolla/" when: - delegate_host == 'None' - inventory_hostname == groups['mariadb'][0] diff --git a/ansible/roles/mariadb/tasks/start.yml b/ansible/roles/mariadb/tasks/start.yml index 8216b5eb8..57313a918 100644 --- a/ansible/roles/mariadb/tasks/start.yml +++ b/ansible/roles/mariadb/tasks/start.yml @@ -8,6 +8,7 @@ volumes: - "{{ node_config_directory }}/mariadb/:{{ container_config_directory }}/:ro" - "mariadb:/var/lib/mysql" + - "kolla_logs:/var/log/kolla/" when: delegate_host != 'None' or ( groups['mariadb'] | length ) == 1 or ( delegate_host == 'None' and inventory_hostname != groups['mariadb'][0] ) diff --git a/ansible/roles/mariadb/templates/galera.cnf.j2 b/ansible/roles/mariadb/templates/galera.cnf.j2 index 9f9ed3ecd..095652d84 100644 --- a/ansible/roles/mariadb/templates/galera.cnf.j2 +++ b/ansible/roles/mariadb/templates/galera.cnf.j2 @@ -3,6 +3,8 @@ bind-address={{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} port={{ mariadb_port }} +log-error=/var/log/kolla/mariadb/mariadb.log + binlog_format=ROW default-storage-engine=innodb innodb_autoinc_lock_mode=2 |