Skip to content

Commit

Permalink
Rename geoip.* to geo.* fields
Browse files Browse the repository at this point in the history
Renaming the `geoip` prefix to `geo` based on the discussion in elastic#50
  • Loading branch information
ruflin committed Aug 2, 2018
1 parent 16a4312 commit 96e11f4
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file based on the
### Breaking changes
* Change structure of URL. #7
* Rename `url.href` `multi_field`. #18
* Rename `geoip.*` to `geo`.

### Bugfixes

Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ECS defines these fields.
* [Error fields](#error)
* [Event fields](#event)
* [File fields](#file)
* [Geoip fields](#geoip)
* [Geo fields](#geo)
* [Host fields](#host)
* [HTTP fields](#http)
* [Kubernetes fields](#kubernetes)
Expand Down Expand Up @@ -202,18 +202,18 @@ File fields provide details about each file.
| <a name="file.ctime"></a>file.ctime | Last time file metadata changed. | date | | |


## <a name="geoip"></a> Geoip fields
## <a name="geo"></a> Geo fields

Geoip fields carry geo information for an ip address. The Elasticsearch geoip plugin can do the conversion to geoip.
Geo fields can carry data about a specific location related to an event or geo information for a ip field.


| Field | Description | Type | Multi Field | Example |
|---|---|---|---|---|
| <a name="geoip.continent_name"></a>geoip.continent_name | Name of the continent. | keyword | | |
| <a name="geoip.country_iso_code"></a>geoip.country_iso_code | Country ISO code. | keyword | | |
| <a name="geoip.location"></a>geoip.location | Longitude and latitude. | geo_point | | |
| <a name="geoip.region_name"></a>geoip.region_name | Region name. | keyword | | |
| <a name="geoip.city_name"></a>geoip.city_name | City name. | keyword | | |
| <a name="geo.continent_name"></a>geo.continent_name | Name of the continent. | keyword | | |
| <a name="geo.country_iso_code"></a>geo.country_iso_code | Country ISO code. | keyword | | |
| <a name="geo.location"></a>geo.location | Longitude and latitude. | geo_point | | |
| <a name="geo.region_name"></a>geo.region_name | Region name. | keyword | | |
| <a name="geo.city_name"></a>geo.city_name | City name. | keyword | | |


## <a name="host"></a> Host fields
Expand Down
10 changes: 5 additions & 5 deletions schema.csv
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ file.size,long,0,
file.target_path,text,0,
file.type,keyword,0,
file.uid,keyword,0,
geoip.city_name,keyword,0,
geoip.continent_name,keyword,0,
geoip.country_iso_code,keyword,0,
geoip.location,geo_point,0,
geoip.region_name,keyword,0,
geo.city_name,keyword,0,
geo.continent_name,keyword,0,
geo.country_iso_code,keyword,0,
geo.location,geo_point,0,
geo.region_name,keyword,0,
host.architecture,keyword,0,x86_64
host.id,keyword,1,
host.ip,ip,0,
Expand Down
9 changes: 4 additions & 5 deletions schemas/geoip.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
---
- name: geoip
title: Geoip
- name: geo
title: Geo
group: 2
description: >
Geoip fields carry geo information for an ip address.
The Elasticsearch geoip plugin can do the conversion
to geoip.
Geo fields can carry data about a specific location related to an event
or geo information for a ip field.
fields:
- name: continent_name
type: keyword
Expand Down
2 changes: 1 addition & 1 deletion template.json
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@
}
}
},
"geoip": {
"geo": {
"properties": {
"city_name": {
"ignore_above": 1024,
Expand Down

0 comments on commit 96e11f4

Please sign in to comment.