From e0c19bd5761f312374cf79c0651e84a5aaaec95c Mon Sep 17 00:00:00 2001
From: Chris Jansen <janstenpickle@users.noreply.github.com>
Date: Thu, 26 Jun 2014 21:06:38 +0100
Subject: [PATCH 1/2] Add Flume and Heka to logging

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 68fdf05..b322824 100644
--- a/README.md
+++ b/README.md
@@ -185,8 +185,10 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 *Log management tools: collect, parse, visualize ...*
 
 * [Elasticsearch](http://www.elasticsearch.org/) - A Lucene Based Document store mainly used for log indexing, storage and analysis.
-* [Fluentd](http://www.fluentd.org/) - Log Collector and Shipper
+* [Fluentd](http://www.fluentd.org/) - Log Collector and Shipper.
+* [Flume](https://flume.apache.org/) - Distributed log collection and aggregation system.
 * [Graylog2](http://graylog2.org/) - Pluggable Log and Event Analysis Server with Alerting options.
+* [Heka](http://hekad.readthedocs.org/en/latest/) - Stream processing system which may be used for log aggregation.
 * [Kibana](http://www.elasticsearch.org/overview/kibana/) - Visualize logs and time-stamped data.
 * [Logstash](http://logstash.net/) - Tool for managing events and logs.
 

From 0319f0b67d63fadbb4df5d5a42267aea60b06f4e Mon Sep 17 00:00:00 2001
From: Francisco Augusto <fran@kahun.es>
Date: Fri, 27 Jun 2014 16:43:04 +0200
Subject: [PATCH 2/2] Merge branch 'master' of
 https://github.com/janstenpickle/awesome-sysadmin

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 137e4b8..e5d4710 100644
--- a/README.md
+++ b/README.md
@@ -205,7 +205,6 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
 * [Heka](http://hekad.readthedocs.org/en/latest/) - Stream processing system which may be used for log aggregation.
 * [Kibana](http://www.elasticsearch.org/overview/kibana/) - Visualize logs and time-stamped data.
 * [Logstash](http://logstash.net/) - Tool for managing events and logs.
-* [Heka] (https://github.com/mozilla-services/heka) - Data collection and processing made easy
 
 ## Monitoring
 *Monitoring software.*