From 96e11f469614b50a880081f9a7dfaba40c269edc Mon Sep 17 00:00:00 2001 From: ruflin Date: Mon, 30 Jul 2018 08:29:00 +0200 Subject: [PATCH 1/4] Rename geoip.* to geo.* fields Renaming the `geoip` prefix to `geo` based on the discussion in https://github.com/elastic/ecs/issues/50 --- CHANGELOG.md | 1 + README.md | 16 ++++++++-------- schema.csv | 10 +++++----- schemas/geoip.yml | 9 ++++----- template.json | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index feb2fb75f0..c73de83cea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/README.md b/README.md index 46e633b248..90e744a66e 100644 --- a/README.md +++ b/README.md @@ -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) @@ -202,18 +202,18 @@ File fields provide details about each file. | file.ctime | Last time file metadata changed. | date | | | -## Geoip fields +## 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 | |---|---|---|---|---| -| geoip.continent_name | Name of the continent. | keyword | | | -| geoip.country_iso_code | Country ISO code. | keyword | | | -| geoip.location | Longitude and latitude. | geo_point | | | -| geoip.region_name | Region name. | keyword | | | -| geoip.city_name | City name. | keyword | | | +| geo.continent_name | Name of the continent. | keyword | | | +| geo.country_iso_code | Country ISO code. | keyword | | | +| geo.location | Longitude and latitude. | geo_point | | | +| geo.region_name | Region name. | keyword | | | +| geo.city_name | City name. | keyword | | | ## Host fields diff --git a/schema.csv b/schema.csv index 3a028d6323..9f4b03821c 100644 --- a/schema.csv +++ b/schema.csv @@ -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, diff --git a/schemas/geoip.yml b/schemas/geoip.yml index 96d29f330b..fd3cca3566 100644 --- a/schemas/geoip.yml +++ b/schemas/geoip.yml @@ -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 diff --git a/template.json b/template.json index dd6d6339c3..6fd3539b67 100644 --- a/template.json +++ b/template.json @@ -325,7 +325,7 @@ } } }, - "geoip": { + "geo": { "properties": { "city_name": { "ignore_above": 1024, From 67bf020bb551e7beb98d2b316a8f69ae4f659149 Mon Sep 17 00:00:00 2001 From: ruflin Date: Thu, 2 Aug 2018 09:57:00 +0200 Subject: [PATCH 2/4] fix IP and rename geoip.yml to geo.yml --- README.md | 2 +- schemas/{geoip.yml => geo.yml} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename schemas/{geoip.yml => geo.yml} (93%) diff --git a/README.md b/README.md index 90e744a66e..c8080a8d54 100644 --- a/README.md +++ b/README.md @@ -204,7 +204,7 @@ File fields provide details about each file. ## Geo fields -Geo fields can carry data about a specific location related to an event or geo information for a ip field. +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 | diff --git a/schemas/geoip.yml b/schemas/geo.yml similarity index 93% rename from schemas/geoip.yml rename to schemas/geo.yml index fd3cca3566..13af2d1f1f 100644 --- a/schemas/geoip.yml +++ b/schemas/geo.yml @@ -4,7 +4,7 @@ group: 2 description: > Geo fields can carry data about a specific location related to an event - or geo information for a ip field. + or geo information for a IP field. fields: - name: continent_name type: keyword From 9479bf7aea5694caee0b4ddcef5758a77c5a6902 Mon Sep 17 00:00:00 2001 From: Andrew Kroh Date: Thu, 2 Aug 2018 21:02:24 -0400 Subject: [PATCH 3/4] a to an --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c8080a8d54..aeed62c5de 100644 --- a/README.md +++ b/README.md @@ -204,7 +204,7 @@ File fields provide details about each file. ## Geo fields -Geo fields can carry data about a specific location related to an event or geo information for a IP field. +Geo fields can carry data about a specific location related to an event or geo information for an IP field. | Field | Description | Type | Multi Field | Example | From 88ee8a828e555ba807531269375522dfd09a24eb Mon Sep 17 00:00:00 2001 From: Andrew Kroh Date: Thu, 2 Aug 2018 21:02:45 -0400 Subject: [PATCH 4/4] a to an --- schemas/geo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/geo.yml b/schemas/geo.yml index 13af2d1f1f..ffc82a966e 100644 --- a/schemas/geo.yml +++ b/schemas/geo.yml @@ -4,7 +4,7 @@ group: 2 description: > Geo fields can carry data about a specific location related to an event - or geo information for a IP field. + or geo information for an IP field. fields: - name: continent_name type: keyword