Revert "Update Heka to version 0.10"

This reverts commit 2f32d2af5f.

The Process Input plugin has some issues with Heka 0.10.0b0. See issue

[1] https://github.com/mozilla-services/heka/issues/1620

Change-Id: Id25e91e780952fdfd85e38947b04e935a785f65d
This commit is contained in:
Simon Pasquier 2015-07-30 11:47:29 +02:00
parent 1e251aa9b8
commit b7e3ffb7fc
3 changed files with 8 additions and 25 deletions

View File

@ -98,30 +98,17 @@ class heka (
alias => 'heka',
}
if $::osfamily == 'Debian' {
# Starting from Heka 0.10.0, the Debian package provides an init script so
# stop the service and disable it.
service { '_hekad_from_package':
ensure => stopped,
name => 'heka',
enable => false,
require => Package['heka'],
before => User['heka'],
}
}
file { $heka::params::lua_modules_dir:
ensure => directory,
require => Package['heka'],
}
user { $heka_user:
shell => '/sbin/nologin',
home => $base_dir,
system => true,
groups => $additional_groups,
alias => 'heka',
require => Package['heka'],
shell => '/sbin/nologin',
home => $base_dir,
system => true,
groups => $additional_groups,
alias => 'heka',
}
file { $base_dir:

View File

@ -10,9 +10,5 @@ flush_count = <%= @flush_count %>
server = "http://<%= @server %>:<%= @port %>"
use_buffering = <%= @use_buffering %>
<% if @use_buffering -%>
[<%= @title %>_output.buffering]
max_buffer_size = <%= @queue_max_buffer_size %>
full_action = "<%= @queue_full_action %>"
<% end -%>
queue_max_buffer_size = <%= @queue_max_buffer_size %>
queue_full_action = "<%= @queue_full_action %>"

View File

@ -5,7 +5,7 @@ ROOT="$(dirname "$(readlink -f "$0")")"
MODULES_DIR="${ROOT}"/deployment_scripts/puppet/modules
RPM_REPO="${ROOT}"/repositories/centos/
DEB_REPO="${ROOT}"/repositories/ubuntu/
HEKA_VERSION="0.10.0b0"
HEKA_VERSION="0.9.2"
# This is the commit id for the current stable/6.1 branch
FUEL_LIB_COMMIT="be44e9ea792fe4314ac8c1b7596742ceb5163f61"
FUEL_LIB_TARBALL_URL="https://github.com/stackforge/fuel-library/archive/${FUEL_LIB_COMMIT}.tar.gz"