Skip to content

Commit

Permalink
Backport: doc changes in #2965 and 2962 (#2976)
Browse files Browse the repository at this point in the history
* Remove dashboards.asciidoc from libbeat TOC

* Remove note describing workaround for client_ip field
  • Loading branch information
dedemorton authored and ruflin committed Nov 10, 2016
1 parent ecabe9a commit a8ce806
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 30 deletions.
4 changes: 0 additions & 4 deletions libbeat/docs/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ include::./upgrading.asciidoc[]

include::./config-file-format.asciidoc[]

// include::./visualizing-data.asciidoc[]

include::./dashboards.asciidoc[]

pass::[<?page_header Always refer to the documentation in master for the latest information about contributing to Beats.?>]

include::./newbeat.asciidoc[]
Expand Down
26 changes: 0 additions & 26 deletions packetbeat/docs/packetbeat-geoip.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -62,32 +62,6 @@ when it encounters an event that doesn't have a `client_ip` field.
See
{plugindoc}/using-ingest-geoip.html[Using the Geoip Processor in a Pipeline]
for more options.
+
[NOTE]
===============================
The index template that ships with Packetbeat 5.0 does not specify a
mapping for the `client_geoip.location` field. To make sure the geoIP data gets
indexed correctly, you need to add the following lines to the Packetbeat index
template, `packetbeat.template.json`. Add these lines immediately before the
entry for `client_ip`:
[source,json]
"client_geoip": {
"properties": {
"location": {
"type": "geo_point"
}
}
},
If you've already loaded the index template, make sure you load it again (see
<<packetbeat-template,Loading the Index Template in Elasticsearch>>).
You must update the mappings before you send the geoIP data to ingest node
for the first time, or the location data will be incorrectly indexed as separate
float values instead of a `geo point`.
===============================

3. In the Packetbeat config file, configure the Elasticsearch output to use the
pipeline. Specify the pipeline ID in the `pipeline` option under
Expand Down

0 comments on commit a8ce806

Please sign in to comment.