From 6fe3df80d5354f93571816039d2ebe3bc71a3b10 Mon Sep 17 00:00:00 2001 From: Guillaume Thouvenin Date: Thu, 3 Mar 2016 13:39:50 +0100 Subject: [PATCH] Update RabbitMQ log delimiter This patch modifies the regex used by the rabbitmq splitter. It adds a newline constant at the beginning of the regex to avoid to match the first pattern of the log file. We observed that sometimes, the log stream starts with a new line, so Heka finds a delimiter match on the first two lines. But it does not have content for this log entry so it may stop there. Known issue: you miss the first log entry. Change-Id: Ib2208db842de9f30a95a514f0e51d00d693374e1 Closes-Bug: #1550222 --- .../puppet/modules/lma_collector/manifests/logs/rabbitmq.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment_scripts/puppet/modules/lma_collector/manifests/logs/rabbitmq.pp b/deployment_scripts/puppet/modules/lma_collector/manifests/logs/rabbitmq.pp index ac2548a62..58e88b9c0 100644 --- a/deployment_scripts/puppet/modules/lma_collector/manifests/logs/rabbitmq.pp +++ b/deployment_scripts/puppet/modules/lma_collector/manifests/logs/rabbitmq.pp @@ -24,7 +24,7 @@ class lma_collector::logs::rabbitmq { heka::splitter::regex { 'rabbitmq': config_dir => $lma_collector::params::config_dir, - delimiter => '\n(=[^=]+====)', + delimiter => '\n\n(=[^=]+====)', delimiter_eol => false, notify => Class['lma_collector::service'], }