Merge "Make Heka collect RabbitMQ logs"

This commit is contained in:
Jenkins 2016-02-19 21:19:06 +00:00 committed by Gerrit Code Review
commit e80a6d9075
6 changed files with 33 additions and 0 deletions
ansible/roles
docker/rabbitmq

@ -30,3 +30,4 @@
with_items:
- "global"
- "haproxy"
- "rabbitmq"

@ -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']

@ -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"
}
]
}

@ -8,3 +8,4 @@
volumes:
- "{{ node_config_directory }}/rabbitmq/:{{ container_config_directory }}/:ro"
- "rabbitmq:/var/lib/rabbitmq/"
- "kolla_logs:/var/log/kolla/"

@ -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

@ -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