Use client_geoip.location for the GeoIP location of the client_ip (el…

…astic#2795)

This information is available if you use the GeoIP processor from the Ingest GeoIP Processor Plugin.
(cherry picked from commit 17758fc)

CHANGELOG.asciidoc

@@ -60,6 +60,8 @@ https://github.com/elastic/beats/compare/v5.0.0...5.0[Check the HEAD diff]
 - Add system core metricset for Windows. {pull}2883}[2883]
 
 *Packetbeat*
+- Define `client_geoip.location` as geo_point in the mappings to be used by the GeoIP processor in the Ingest Node pipeline.
+  {pull}2795[2795]
 
 *Topbeat*
 

packetbeat/docs/fields.asciidoc

@@ -1069,7 +1069,23 @@ type: geo_point
 
 example: 40.715, -74.011
 
-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]
+== client_geoip Fields
+
+The GeoIP information of the client.
+
+
+[float]
+=== client_geoip.location
+
+type: geo_point
+
+example: {'lat': 51, 'lon': 9}
+
+The GeoIP location of the `client_ip` address. This field is available only if you define a https://www.elastic.co/guide/en/elasticsearch/plugins/master/using-ingest-geoip.html[GeoIP Processor] as a pipeline in the https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest-geoip.html[Ingest GeoIP processor plugin] or using Logstash.
 
 
 [float]

packetbeat/docs/reference/configuration/packetbeat-options.asciidoc

@@ -468,8 +468,7 @@ The default is false.
 The header field to extract the real IP from. This setting is useful when
 you want to capture traffic behind a reverse proxy, but you want to get the geo-location
 information. If this header is present and contains a valid IP addresses, the
-information is used for the `real_ip` and `client_location` indexed
-fields.
+information is used for the `real_ip` field.
 
 ===== max_message_size
 

packetbeat/etc/fields.yml

@@ -43,11 +43,24 @@
 
     - name: client_location
       type: geo_point
-      example: "40.715, -74.011"
+      example: 40.715, -74.011
       description: >
-        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. 
+
+    - name: client_geoip
+      description: The GeoIP information of the client.
+      type: group
+      fields:
+        - name: location
+          type: geo_point
+          example: {lat: 51, lon: 9}
+          description: >
+            The GeoIP location of the `client_ip` address. This field is available
+            only if you define a
+            https://www.elastic.co/guide/en/elasticsearch/plugins/master/using-ingest-geoip.html[GeoIP Processor] as a pipeline in the
+            https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest-geoip.html[Ingest GeoIP processor plugin] or using Logstash.
 
     - name: client_port
       description: >

packetbeat/etc/kibana/visualization/Client-locations.json

@@ -1,11 +1,10 @@
 {
-  "visState": "{\"title\":\"New Visualization\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Scaled Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":16,\"heatMinOpacity\":0.1,\"heatRadius\":25,\"heatBlur\":15,\"heatNormalizeData\":true,\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"client_location\",\"autoPrecision\":true,\"precision\":2}}],\"listeners\":{}}", 
+  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"autoPrecision\":true,\"field\":\"client_geoip.location\"},\"schema\":\"segment\",\"type\":\"geohash_grid\"}],\"listeners\":{},\"params\":{\"addTooltip\":true,\"heatBlur\":15,\"heatMaxZoom\":16,\"heatMinOpacity\":0.1,\"heatNormalizeData\":true,\"heatRadius\":25,\"isDesaturated\":true,\"mapCenter\":[15,5],\"mapType\":\"Scaled Circle Markers\",\"mapZoom\":2,\"wms\":{\"enabled\":false,\"options\":{\"attribution\":\"Maps provided by USGS\",\"format\":\"image/png\",\"layers\":\"0\",\"styles\":\"\",\"transparent\":true,\"version\":\"1.3.0\"},\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\"}},\"title\":\"Client locations\",\"type\":\"tile_map\"}", 
   "description": "", 
   "title": "Client locations", 
-  "uiStateJSON": "{}", 
+  "uiStateJSON": "{\"mapCenter\":[0,-0.17578125]}", 
   "version": 1, 
-  "savedSearchId": "Packetbeat-Search", 
   "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
+    "searchSourceJSON": "{\"index\":\"packetbeat-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"
   }
 }

packetbeat/packetbeat.template-es2x.json

@@ -573,6 +573,13 @@
             }
           }
         },
+        "client_geoip": {
+          "properties": {
+            "location": {
+              "type": "geo_point"
+            }
+          }
+        },
         "client_ip": {
           "ignore_above": 1024,
           "index": "not_analyzed",

packetbeat/packetbeat.template.json

@@ -499,6 +499,13 @@
             }
           }
         },
+        "client_geoip": {
+          "properties": {
+            "location": {
+              "type": "geo_point"
+            }
+          }
+        },
         "client_ip": {
           "ignore_above": 1024,
           "type": "keyword"