From 734ea7ea3f6825af4c087e19e013d580d50f3f50 Mon Sep 17 00:00:00 2001
From: Baohua Yang <yangbaohua@gmail.com>
Date: Thu, 13 Aug 2015 10:24:34 +0800
Subject: [PATCH] User image netflow conf by default

---
 elk_netflow/docker-compose.yml    |  4 +---
 elk_netflow/logstash_netflow.conf | 12 ------------
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 elk_netflow/logstash_netflow.conf

diff --git a/elk_netflow/docker-compose.yml b/elk_netflow/docker-compose.yml
index e465e3c4..732f0646 100644
--- a/elk_netflow/docker-compose.yml
+++ b/elk_netflow/docker-compose.yml
@@ -42,6 +42,4 @@ logstash:
     - "2055/udp:2055/udp"
   links:
     - elasticsearch:elasticsearch
-  volumes:
-    - $PWD:/config-dir
-  command: logstash agent -f /config-dir/logstash_netflow.conf
+  command: logstash agent -f /etc/logstash/conf.d/
diff --git a/elk_netflow/logstash_netflow.conf b/elk_netflow/logstash_netflow.conf
deleted file mode 100644
index 8aa45583..00000000
--- a/elk_netflow/logstash_netflow.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-input {
-    udp {
-        port => 2055
-        codec => netflow {
-            definitions => "/opt/logstash/vendor/bundle/jruby/1.9/gems/logstash-codec-netflow-1.0.0/lib/logstash/codecs/netflow/netflow.yaml"}}
-        }
-    
-output {
-    #stdout { codec => rubydebug} 
-    elasticsearch {
-        index => "logstash_netflow-%{+YYYY.MM.dd}"
-        host => elasticsearch}}