diff --git a/heka/files/80-output-elasticsearch.toml b/heka/files/80-output-elasticsearch.toml
new file mode 100644
index 0000000..ed318f1
--- /dev/null
+++ b/heka/files/80-output-elasticsearch.toml
@@ -0,0 +1,23 @@
+[ESJsonEncoder]
+#index = "%{Type}-%{%Y.%m.%d}"
+index = "logfile-%{%Y.%m.%d}"
+# es_index_from_timestamp = true
+#type_name = "%{Type}"
+type_name = "%{Type}-%{Hostname}"
+    [ESJsonEncoder.field_mappings]
+    timestamp = "@timestamp"
+    Severity = "level"
+
+[ElasticSearchOutput]
+# message_matcher = "TRUE"
+# message_matcher = "Type != 'heka.*'"
+message_matcher = "Type != 'heka.memstat' && Type != 'heka.all-report'"
+server = "http://10.0.151.204:9200"
+flush_interval = 2500
+# flush_interval = 5000
+flush_count = 10
+encoder = "ESJsonEncoder"
+
+[ElasticSearchOutput.buffering]
+max_file_size = 268435456
+
diff --git a/heka/files/85-output-slack.toml b/heka/files/85-output-slack.toml
new file mode 100644
index 0000000..fc06f14
--- /dev/null
+++ b/heka/files/85-output-slack.toml
@@ -0,0 +1,22 @@
+#[LogAggregator]
+#type = "SandboxFilter"
+#message_matcher = "TRUE"
+#filename = "lua_decoders/log_aggregator.lua"
+#ticker_interval = 15
+#can_exit = false
+
+#[SlackEncoder]
+#type = "SandboxEncoder"
+#script_type = "lua"
+#filename = "lua_encoders/slack_encoder.lua"
+
+#  [SlackEncoder.config]
+#  username = "heka"
+#  channel = "monitoring"
+#  icon_emoji = ""
+
+#[HttpOutput]
+#  address = "https://hooks.slack.com/services/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"
+#  message_matcher = "TRUE"
+#  encoder = "SlackEncoder"
+
diff --git a/heka/files/98-output-heka-dashboard.toml b/heka/files/98-output-heka-dashboard.toml
new file mode 100644
index 0000000..5698238
--- /dev/null
+++ b/heka/files/98-output-heka-dashboard.toml
@@ -0,0 +1,24 @@
+[DashboardOutput]
+ticker_interval = 30
+
+#[stat_graph]
+#type = "SandboxFilter"
+#filename = "lua_filters/stat_graph.lua"
+#ticker_interval = 1
+#preserve_data = true
+#message_matcher = "Type == 'heka.statmetric'"
+
+#        [stat_graph.config]
+#        num_rows = 300
+#        secs_per_row = 1
+#        stats = "stats.counters.000000.count stats.counters.000001.count stats.counters.000002.count"
+#        stat_labels = "counter_0 counter_1 counter_2"
+#        preservation_version = 0
+
+#[HekaMemstat]
+#type = "SandboxFilter"
+#filename = "lua_filters/heka_memstat.lua"
+#ticker_interval = 60
+#preserve_data = true
+#message_matcher = "Type == 'heka.memstat'"
+
diff --git a/heka/files/99-output-heka-logfile.toml b/heka/files/99-output-heka-logfile.toml
new file mode 100644
index 0000000..e103731
--- /dev/null
+++ b/heka/files/99-output-heka-logfile.toml
@@ -0,0 +1,5 @@
+[RstEncoder]
+[LogOutput]
+encoder = "RstEncoder"
+message_matcher = "TRUE"
+
diff --git a/heka/files/encoder/es_json.toml b/heka/files/encoder/es_json.toml
new file mode 100644
index 0000000..ca909bd
--- /dev/null
+++ b/heka/files/encoder/es_json.toml
@@ -0,0 +1,5 @@
+[<%= @title %>_encoder]
+type = "ESJsonEncoder"
+index = "<%= @index %>"
+es_index_from_timestamp = <%= @es_index_from_timestamp %>
+
diff --git a/heka/files/input/amqp.toml b/heka/files/input/amqp.toml
new file mode 100644
index 0000000..947fd45
--- /dev/null
+++ b/heka/files/input/amqp.toml
@@ -0,0 +1,13 @@
+[<%= @title %>_amqp]
+type = "AMQPInput"
+url = "amqp://<%= @user %>:<%= @password %>@<%= @host %>:<%= @port %>/"
+exchange = "<%= @exchange %>"
+exchange_type = "<%= @exchange_type %>"
+exchange_durability = <%= @exchange_durability %>
+exchange_auto_delete = <%= @exchange_auto_delete %>
+queue_auto_delete = <%= @queue_auto_delete %>
+queue = "<%= @queue %>"
+routing_key = "<%= @routing_key %>"
+decoder = "<%= @decoder %>_decoder"
+splitter = "NullSplitter"
+
diff --git a/heka/files/input/logstreamer-rsyslog.toml b/heka/files/input/logstreamer-rsyslog.toml
new file mode 100644
index 0000000..7dbf4ae
--- /dev/null
+++ b/heka/files/input/logstreamer-rsyslog.toml
@@ -0,0 +1,38 @@
+[LogstreamerInputSyslog]
+type = "LogstreamerInput"
+log_directory = "/var/log"
+file_match = 'syslog\.?(?P<Index>\d+)?(.gz)?'
+priority = ["^Index"]
+decoder = "RsyslogDecoder"
+
+[LogstreamerInputAuthlog]
+type = "LogstreamerInput"
+log_directory = "/var/log"
+file_match = 'auth\.log\.?(?P<Index>\d+)?(.gz)?'
+priority = ["^Index"]
+decoder = "RsyslogDecoder"
+
+[LogstreamerInputAuthKernlog]
+type = "LogstreamerInput"
+log_directory = "/var/log"
+file_match = 'kern\.log\.?(?P<Index>\d+)?(.gz)?'
+priority = ["^Index"]
+decoder = "RsyslogDecoder"
+
+[LogstreamerInputAuthMaillog]
+type = "LogstreamerInput"
+log_directory = "/var/log"
+file_match = 'mail\.log?(?P<Index>\d+)?(.gz)?|mail\.err?(?P<Index>\d+)?(.gz)?'
+priority = ["^Index"]
+decoder = "RsyslogDecoder"
+
+[RsyslogDecoder]
+type = "SandboxDecoder"
+filename = "lua_decoders/rsyslog.lua"
+
+[RsyslogDecoder.config]
+type = "RSYSLOG_TraditionalFileFormat"
+template = '%TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n'
+tz = "Europe/Prague"
+# hostname_keep = 'TRUE'
+
diff --git a/heka/files/input/logstreamer.toml b/heka/files/input/logstreamer.toml
new file mode 100644
index 0000000..109477d
--- /dev/null
+++ b/heka/files/input/logstreamer.toml
@@ -0,0 +1,10 @@
+[<%= @title %>_logstreamer]
+type = "LogstreamerInput"
+log_directory = "<%= @log_directory %>"
+file_match = '<%= @file_match %>'
+<% if @differentiator -%>
+differentiator = <%= @differentiator %>
+<% end -%>
+decoder = "<%= @decoder %>_decoder"
+splitter = "<%= @splitter ? "#{ @splitter }_splitter" : "TokenSplitter" %>"
+
diff --git a/heka/files/input/process.toml b/heka/files/input/process.toml
new file mode 100644
index 0000000..a7b4379
--- /dev/null
+++ b/heka/files/input/process.toml
@@ -0,0 +1,29 @@
+[<%= @title %>_process]
+type="ProcessInput"
+ticker_interval = <%= @ticker_interval %>
+decoder = "<%= @decoder %>_decoder"
+<% if @stdout -%>
+stdout = true
+<% else %>
+stdout = false
+<% end %>
+<% if @stderr -%>
+stderr = true
+<% else %>
+stderr = false
+<% end %>
+
+<% if @splitter -%>
+splitter = "<%= @splitter %>_splitter"
+<% else -%>
+splitter = "NullSplitter"
+<% end -%>
+
+<% @commands.each_with_index do |command, i| -%>
+ <% command.each do |cmd, args| -%>
+  [<%= @title %>_process.command.<%= i %>]
+   bin = "<%= cmd %>"
+   args = [ <%= args.collect{ |x| '"%s"' % x }.join(", ") %> ]
+ <%end%>
+<% end %>
+
diff --git a/heka/files/output/95-output-amqp.toml b/heka/files/output/95-output-amqp.toml
new file mode 100644
index 0000000..8812ae2
--- /dev/null
+++ b/heka/files/output/95-output-amqp.toml
@@ -0,0 +1,14 @@
+[AMQPOutput]
+type = "AMQPOutput"
+url = "amqp://guest:guest@10.0.102.11/"
+exchange = "logs"
+exchange_type = "fanout"
+message_matcher = "TRUE"
+use_framing = true
+encoder = "ProtobufEncoder"
+
+[AMQPOutput.retries]
+max_delay = "30s"
+delay = "250ms"
+max_retries = 5
+
diff --git a/heka/files/output/dashboard.toml b/heka/files/output/dashboard.toml
new file mode 100644
index 0000000..154a6f1
--- /dev/null
+++ b/heka/files/output/dashboard.toml
@@ -0,0 +1,4 @@
+[DashboardOutput]
+address = "<%= @dashboard_address %>:<%= @dashboard_port %>"
+ticker_interval = <%= @ticker_interval %>
+
diff --git a/heka/files/output/elasticsearch.toml b/heka/files/output/elasticsearch.toml
new file mode 100644
index 0000000..2339da3
--- /dev/null
+++ b/heka/files/output/elasticsearch.toml
@@ -0,0 +1,22 @@
+[<%= @title %>_output]
+type = "ElasticSearchOutput"
+message_matcher = "<%= @message_matcher %>"
+encoder = "<%= @encoder %>_encoder"
+
+<% # Heka expects milliseconds here -%>
+flush_interval = <%= @flush_interval.to_i() * 1000 %>
+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 %>
+<% if @max_file_size != :undef -%>
+max_file_size = <%= @max_file_size %>
+<% end -%>
+full_action = "<%= @queue_full_action %>"
+<% end -%>
+