Skip to content

Commit

Permalink
Prepare 1.0.0-beta2 release (elastic#271)
Browse files Browse the repository at this point in the history
  • Loading branch information
ruflin authored Dec 11, 2018
1 parent e50891b commit 13b6d29
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 12 deletions.
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -180,7 +180,7 @@ Meta-information specific to ECS.

| Field | Description | Level | Type | Example |
|---|---|---|---|---|
| <a name="ecs.version"></a>ecs.version | ECS version this event conforms to. `ecs.version` is a required field and must exist in all events.<br/>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.<br/>The current version is 1.0.0-beta1 . | core | keyword | `1.0.0-beta1` |
| <a name="ecs.version"></a>ecs.version | ECS version this event conforms to. `ecs.version` is a required field and must exist in all events.<br/>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.<br/>The current version is 1.0.0-beta2 . | core | keyword | `1.0.0-beta2` |


## <a name="error"></a> Error fields
Expand Down
4 changes: 2 additions & 2 deletions docs/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion schema.csv
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions schemas/ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 13b6d29

Please sign in to comment.