Merge pull request #18 from elemoine/stacklight-elasticsearch

Configure Elasticsearch output through Pillar
diff --git a/heka/meta/heka.yml b/heka/meta/heka.yml
index 0a53d00..ba8176d 100644
--- a/heka/meta/heka.yml
+++ b/heka/meta/heka.yml
@@ -1,4 +1,29 @@
 log_collector:
+  filter:
+    aggregated_http_metrics:
+      engine: sandbox
+      module_file: /usr/share/lma_collector/filters/http_metrics_aggregator.lua
+      module_dir: /usr/share/lma_collector/common;/usr/share/heka/lua_modules
+      message_matcher: "Type == 'log' && Fields[http_response_time] != NIL"
+      ticker_interval: 10
+      config:
+        hostname: '{{ grains.host }}'
+        interval: 10
+        max_timer_inject: 10
+        bulk_size: 523
+        percentile: 90
+        grace_time: 5
+    log_counter:
+      engine: sandbox
+      module_file: /usr/share/lma_collector/filters/logs_counter.lua
+      module_dir: /usr/share/lma_collector/common;/usr/share/heka/lua_modules
+      preserve_data: true
+      message_matcher: "Type == 'log' && Logger =~ /^openstack\\\\./"
+      ticker_interval: 1
+      config:
+        hostname: '{{ grains.host }}'
+        interval: 60
+        grace_interval: 30
   encoder:
     elasticsearch:
       engine: elasticsearch