Merge pull request #2 from gxglls/master

adapt filebeat 7.x version
chennqqi · Jan 20, 2020 · 900046a · 900046a
2 parents 45f1626 + e30a9dd
commit 900046a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/filebeat.yml b/filebeat.yml
@@ -12,25 +12,25 @@
 
 #=========================== Filebeat prospectors =============================
 
-filebeat.prospectors:
+filebeat.inputs:
 
-- type: log
+    - type: log
 
-  enabled: true
+      enabled: true
 
-  paths:
-    - /var/log/elasticsearch/*
+      paths:
+        - /var/log/elasticsearch/*
 
-  fields:
-    myfield: myvalue
+      fields:
+        myfield: myvalue
 
 
 #================================ Outputs =====================================
 
 #---------------------------- nsq output ---------------------------------
 output.nsq:
 
-  nsqd: ["127.0.0.1:4150"]
+  nsqd: "127.0.0.1:4150"
 
   # The mongodb database to push to
   topic: "nsqbeat"

diff --git a/nsqout/nsq.go b/nsqout/nsq.go
@@ -16,6 +16,7 @@ func init() {
 }
 
 func makeNsq(
+	_ outputs.IndexManager,
 	beat beat.Info,
 	observer outputs.Observer,
 	cfg *common.Config,