diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f18779737..bebbf219a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,23 @@
# CHANGELOG
All notable changes to this project will be documented in this file based on the [Keep a Changelog](http://keepachangelog.com/) Standard. This project adheres to [Semantic Versioning](http://semver.org/).
+
## Unreleased
### Breaking changes
+### Bugfixes
+
+### Added
+
+### Improvements
+
+### Deprecated
+
+## [1.0.0-beta2](https://github.com/elastic/ecs/compare/v1.0.0-beta1...v1.0.0-beta2)
+
+### Breaking changes
+
* Changed `device.*` fields to `observer.*` fields to eliminate user confusion. #238
* Rename `network.total.bytes` to `network.bytes` and `network.total.packets`
to `network.packets`. #179
@@ -62,8 +75,6 @@ All notable changes to this project will be documented in this file based on the
* Clarify that source/destination should be filled, even if client/server is
being used. #265
-### Deprecated
-
## [1.0.0-beta1](https://github.com/elastic/ecs/compare/v0.1.0...v1.0.0-beta1)
### Breaking changes
diff --git a/README.md b/README.md
index 87871b50aa..db2ef4bfe7 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,8 @@ See CONTRIBUTING.md for more details on setting up.
-->
-WARNING: This is the master branch. The current release v1.0.0-beta1
-can be found [here](https://github.com/elastic/ecs/tree/v1.0.0-beta1).
+WARNING: This is the master branch. The current release v1.0.0-beta2
+can be found [here](https://github.com/elastic/ecs/tree/v1.0.0-beta2).
# Elastic Common Schema (ECS)
@@ -180,7 +180,7 @@ Meta-information specific to ECS.
| Field | Description | Level | Type | Example |
|---|---|---|---|---|
-| ecs.version | ECS version this event conforms to. `ecs.version` is a required field and must exist in all events.
When querying across multiple indices -- which may conform to slightly different ECS versions -- this field lets integrations adjust to the schema version of the events.
The current version is 1.0.0-beta1 . | core | keyword | `1.0.0-beta1` |
+| ecs.version | ECS version this event conforms to. `ecs.version` is a required field and must exist in all events.
When querying across multiple indices -- which may conform to slightly different ECS versions -- this field lets integrations adjust to the schema version of the events.
The current version is 1.0.0-beta2 . | core | keyword | `1.0.0-beta2` |
## Error fields
diff --git a/docs/intro.md b/docs/intro.md
index 0a025bdb43..69f1977e2d 100644
--- a/docs/intro.md
+++ b/docs/intro.md
@@ -10,8 +10,8 @@ See CONTRIBUTING.md for more details on setting up.
-->
-WARNING: This is the master branch. The current release v1.0.0-beta1
-can be found [here](https://github.com/elastic/ecs/tree/v1.0.0-beta1).
+WARNING: This is the master branch. The current release v1.0.0-beta2
+can be found [here](https://github.com/elastic/ecs/tree/v1.0.0-beta2).
# Elastic Common Schema (ECS)
diff --git a/fields.yml b/fields.yml
index e31248154e..68c9184f5b 100644
--- a/fields.yml
+++ b/fields.yml
@@ -376,8 +376,8 @@
different ECS versions -- this field lets integrations adjust to the
schema version of the events.
- The current version is 1.0.0-beta1 .
- example: 1.0.0-beta1
+ The current version is 1.0.0-beta2 .
+ example: 1.0.0-beta2
- name: error
title: Error
diff --git a/schema.csv b/schema.csv
index 53e1c31cbd..35a6c9c1c2 100644
--- a/schema.csv
+++ b/schema.csv
@@ -35,7 +35,7 @@ destination.ip,ip,core,
destination.mac,keyword,core,
destination.packets,long,core,12
destination.port,long,core,
-ecs.version,keyword,core,1.0.0-beta1
+ecs.version,keyword,core,1.0.0-beta2
error.code,keyword,core,
error.id,keyword,core,
error.message,text,core,
diff --git a/schemas/ecs.yml b/schemas/ecs.yml
index ddfa1ad7b3..53cb402a6e 100644
--- a/schemas/ecs.yml
+++ b/schemas/ecs.yml
@@ -18,5 +18,5 @@
different ECS versions -- this field lets integrations adjust to the
schema version of the events.
- The current version is 1.0.0-beta1 .
- example: 1.0.0-beta1
+ The current version is 1.0.0-beta2 .
+ example: 1.0.0-beta2