diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-19 21:19:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-19 21:19:06 +0000 |
| commit | e80a6d907569a9c5c3e1c22922f9eb778eb7313f (patch) | |
| tree | 4618583da2b1e919bf9e83a2e7307069b33cc1b3 | |
| parent | 487b4bb05314676c03ae8e253b3952475c274d84 (diff) | |
| parent | 1ded68d2d35d67bbbcdc364d09633f9b32f10643 (diff) | |
| download | kolla-e80a6d907569a9c5c3e1c22922f9eb778eb7313f.tar.gz kolla-e80a6d907569a9c5c3e1c22922f9eb778eb7313f.zip | |
Merge "Make Heka collect RabbitMQ logs"
| -rw-r--r-- | ansible/roles/common/tasks/config.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/common/templates/heka-rabbitmq.toml.j2 | 16 | ||||
| -rw-r--r-- | ansible/roles/common/templates/heka.json.j2 | 6 | ||||
| -rw-r--r-- | ansible/roles/rabbitmq/tasks/start.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 | 2 | ||||
| -rw-r--r-- | docker/rabbitmq/extend_start.sh | 7 |
6 files changed, 33 insertions, 0 deletions
diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml index 01d340431..b50a57852 100644 --- a/ansible/roles/common/tasks/config.yml +++ b/ansible/roles/common/tasks/config.yml @@ -30,3 +30,4 @@ with_items: - "global" - "haproxy" + - "rabbitmq" diff --git a/ansible/roles/common/templates/heka-rabbitmq.toml.j2 b/ansible/roles/common/templates/heka-rabbitmq.toml.j2 new file mode 100644 index 000000000..014c75113 --- /dev/null +++ b/ansible/roles/common/templates/heka-rabbitmq.toml.j2 @@ -0,0 +1,16 @@ +[rabbitmq_log_decoder] +type = "SandboxDecoder" +filename = "lua_decoders/os_rabbitmq_log.lua" + +[rabbitmq_log_splitter] +type = "RegexSplitter" +delimiter = '\n(=[^=]+====)' +delimiter_eol = false + +[rabbitmq_logstreamer_input] +type = "LogstreamerInput" +decoder = "rabbitmq_log_decoder" +splitter = "rabbitmq_log_splitter" +log_directory = "/var/log/kolla" +file_match = 'rabbitmq/rabbit*\.log' +differentiator = ['rabbitmq'] diff --git a/ansible/roles/common/templates/heka.json.j2 b/ansible/roles/common/templates/heka.json.j2 index bda52ca56..c65d0fab2 100644 --- a/ansible/roles/common/templates/heka.json.j2 +++ b/ansible/roles/common/templates/heka.json.j2 @@ -12,6 +12,12 @@ "dest": "/etc/heka/heka-haproxy.toml", "owner": "heka", "perm": "0600" + }, + { + "source": "{{ container_config_directory }}/heka-rabbitmq.toml", + "dest": "/etc/heka/heka-rabbitmq.toml", + "owner": "heka", + "perm": "0600" } ] } diff --git a/ansible/roles/rabbitmq/tasks/start.yml b/ansible/roles/rabbitmq/tasks/start.yml index 9ed544290..2f5585fce 100644 --- a/ansible/roles/rabbitmq/tasks/start.yml +++ b/ansible/roles/rabbitmq/tasks/start.yml @@ -8,3 +8,4 @@ volumes: - "{{ node_config_directory }}/rabbitmq/:{{ container_config_directory }}/:ro" - "rabbitmq:/var/lib/rabbitmq/" + - "kolla_logs:/var/log/kolla/" diff --git a/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 b/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 index 549b7f0c9..837b9a0ca 100644 --- a/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 +++ b/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 @@ -1,6 +1,8 @@ RABBITMQ_NODENAME=rabbit RABBITMQ_BOOT_MODULE=rabbit_clusterer +RABBITMQ_LOG_BASE=/var/log/kolla/rabbitmq + {% if not kolla_base_distro in ['ubuntu', 'debian'] %} RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-pa /usr/lib/rabbitmq/lib/rabbitmq_server-3.5.5/plugins/rabbitmq_clusterer-3.5.x-189b3a81.ez/rabbitmq_clusterer-3.5.x-189b3a81/ebin" # See bug https://bugs.launchpad.net/ubuntu/+source/erlang/+bug/1374109 diff --git a/docker/rabbitmq/extend_start.sh b/docker/rabbitmq/extend_start.sh index 06e71e810..f0b9fd9c4 100644 --- a/docker/rabbitmq/extend_start.sh +++ b/docker/rabbitmq/extend_start.sh @@ -8,3 +8,10 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then chmod 400 /var/lib/rabbitmq/.erlang.cookie exit 0 fi + +if [[ ! -d "/var/log/kolla/rabbitmq" ]]; then + mkdir -p /var/log/kolla/rabbitmq +fi +if [[ $(stat -c %a /var/log/kolla/rabbitmq) != "755" ]]; then + chmod 755 /var/log/kolla/rabbitmq +fi |