Move fields under each protocol in packetbeat (elastic#2898)

This should simplify the extension of packetbeat with further protocols and make it more modular. This change requires elastic#2897
ruflin · Nov 3, 2016 · f9bd1d3 · f9bd1d3
1 parent 5547060
commit f9bd1d3
Show file tree

Hide file tree

Showing 17 changed files with 2,307 additions and 508 deletions.
diff --git a/packetbeat/Makefile b/packetbeat/Makefile
@@ -28,7 +28,12 @@ before-build:
 
 # Collects all dependencies and then calls update
 .PHONY: collect
-collect: update
+collect: fields update
+
+.PHONY: fields
+fields:
+	cat etc/fields_base.yml > etc/fields.yml
+	cat protos/*/_meta/fields.yml >> etc/fields.yml
 
 .PHONY: benchmark
 benchmark:

diff --git a/packetbeat/docs/fields.asciidoc b/packetbeat/docs/fields.asciidoc
@@ -1121,7 +1121,7 @@ type: geo_point
 
 example: 40.715, -74.011
 
-DEPRECATED. Please use `client_geoip` instead.  The GeoIP location of the `real_ip` IP address or of the `client_ip` address if the `real_ip` is disabled. The field is a string containing the latitude and longitude separated by a comma. 
+DEPRECATED. Please use `client_geoip` instead. The GeoIP location of the `real_ip` IP address or of the `client_ip` address if the `real_ip` is disabled. The field is a string containing the latitude and longitude separated by a comma.
 
 
 [float]
-Original file line number
+Diff line change
@@ Expand Up / @@ -1121,7 +1121,7 @@ type: geo_point @@
     example: 40.715, -74.011
-    DEPRECATED. Please use `client_geoip` instead.  The GeoIP location of the `real_ip` IP address or of the `client_ip` address if the `real_ip` is disabled. The field is a string containing the latitude and longitude separated by a comma.
+    DEPRECATED. Please use `client_geoip` instead. The GeoIP location of the `real_ip` IP address or of the `client_ip` address if the `real_ip` is disabled. The field is a string containing the latitude and longitude separated by a comma.
     [float]
@@ Expand Down @@