Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[logging] Upgrade ECS to 8.0 #113662

Merged
merged 9 commits into from
Oct 6, 2021
Merged

[logging] Upgrade ECS to 8.0 #113662

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dbddc7f
Version bump to ECS 8.0.0.
lukeelmers Oct 1, 2021
b799b1c
Remove host.user.* fields per https://github.com/elastic/ecs/pull/1439.
lukeelmers Oct 1, 2021
a4ab2f3
Remove log.original field per https://github.com/elastic/ecs/pull/1580.
lukeelmers Oct 1, 2021
9aa8e46
Remove process.ppid field per https://github.com/elastic/ecs/pull/1596.
lukeelmers Oct 1, 2021
03fb865
Merge branch 'master' into feat/upgrade-ecs-8.0
kibanamachine Oct 4, 2021
d74d75f
Merge branch 'master' into feat/upgrade-ecs-8.0
kibanamachine Oct 5, 2021
54e7a9d
Remove ecs version from json layout snapshots.
lukeelmers Oct 5, 2021
1a4306d
Merge branch 'master' into feat/upgrade-ecs-8.0
kibanamachine Oct 5, 2021
2a023ff
Merge branch 'master' into feat/upgrade-ecs-8.0
kibanamachine Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/agent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-agent.html
* https://www.elastic.co/guide/en/ecs/master/ecs-agent.html
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are you going to upgrade it to 8.0 in the next PR? master might be out of sync with the definitions in the Kibana repo, so we should prefer a pinned version in the link

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah we will need to update this in a follow-up as the 8.0 docs aren't available until FF, so all we have is master.

As an alternative we could just link now to the 8.0 URLs, which will return a 404 until they are available.

*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/autonomous_system.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-as.html
* https://www.elastic.co/guide/en/ecs/master/ecs-as.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-base.html
* https://www.elastic.co/guide/en/ecs/master/ecs-base.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ interface NestedFields {
}

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-client.html
* https://www.elastic.co/guide/en/ecs/master/ecs-client.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/cloud.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-cloud.html
* https://www.elastic.co/guide/en/ecs/master/ecs-cloud.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/code_signature.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-code_signature.html
* https://www.elastic.co/guide/en/ecs/master/ecs-code_signature.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/container.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-container.html
* https://www.elastic.co/guide/en/ecs/master/ecs-container.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/data_stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-data_stream.html
* https://www.elastic.co/guide/en/ecs/master/ecs-data_stream.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/destination.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ interface NestedFields {
}

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-destination.html
* https://www.elastic.co/guide/en/ecs/master/ecs-destination.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/dll.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ interface NestedFields {
}

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-dll.html
* https://www.elastic.co/guide/en/ecs/master/ecs-dll.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/dns.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-dns.html
* https://www.elastic.co/guide/en/ecs/master/ecs-dns.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/elf.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-elf.html
* https://www.elastic.co/guide/en/ecs/master/ecs-elf.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/error.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-error.html
* https://www.elastic.co/guide/en/ecs/master/ecs-error.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/event.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-event.html
* https://www.elastic.co/guide/en/ecs/master/ecs-event.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/file.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ interface NestedFields {
}

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-file.html
* https://www.elastic.co/guide/en/ecs/master/ecs-file.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/geo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-geo.html
* https://www.elastic.co/guide/en/ecs/master/ecs-geo.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/group.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-group.html
* https://www.elastic.co/guide/en/ecs/master/ecs-group.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/hash.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-hash.html
* https://www.elastic.co/guide/en/ecs/master/ecs-hash.html
*
* @internal
*/
Expand Down
5 changes: 1 addition & 4 deletions packages/kbn-logging/src/ecs/host.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,14 @@

import { EcsGeo } from './geo';
import { EcsOs } from './os';
import { EcsNestedUser } from './user';

interface NestedFields {
geo?: EcsGeo;
os?: EcsOs;
/** @deprecated */
user?: EcsNestedUser;
}

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-host.html
* https://www.elastic.co/guide/en/ecs/master/ecs-host.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/http.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-http.html
* https://www.elastic.co/guide/en/ecs/master/ecs-http.html
*
* @internal
*/
Expand Down
6 changes: 3 additions & 3 deletions packages/kbn-logging/src/ecs/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ export { EcsEventCategory, EcsEventKind, EcsEventOutcome, EcsEventType } from '.

interface EcsField {
/**
* These typings were written as of ECS 1.12.0.
* These typings were written as of ECS 8.0.0.
* Don't change this value without checking the rest
* of the types to conform to that ECS version.
*
* https://www.elastic.co/guide/en/ecs/1.12/index.html
* https://www.elastic.co/guide/en/ecs/master/index.html
*/
version: '1.12.0';
version: '8.0.0';
}

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-interface.html
* https://www.elastic.co/guide/en/ecs/master/ecs-interface.html
*
* @internal
*/
Expand Down
4 changes: 1 addition & 3 deletions packages/kbn-logging/src/ecs/log.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-log.html
* https://www.elastic.co/guide/en/ecs/master/ecs-log.html
*
* @internal
*/
Expand All @@ -16,8 +16,6 @@ export interface EcsLog {
level?: string;
logger?: string;
origin?: Origin;
/** @deprecated - use `event.original` instead */
original?: string;
syslog?: Syslog;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/network.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ interface NestedFields {
}

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-network.html
* https://www.elastic.co/guide/en/ecs/master/ecs-network.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/observer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ interface NestedIngressFields {
}

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-observer.html
* https://www.elastic.co/guide/en/ecs/master/ecs-observer.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/orchestrator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-orchestrator.html
* https://www.elastic.co/guide/en/ecs/master/ecs-orchestrator.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/organization.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-organization.html
* https://www.elastic.co/guide/en/ecs/master/ecs-organization.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/os.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-os.html
* https://www.elastic.co/guide/en/ecs/master/ecs-os.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/package.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-package.html
* https://www.elastic.co/guide/en/ecs/master/ecs-package.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/pe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-pe.html
* https://www.elastic.co/guide/en/ecs/master/ecs-pe.html
*
* @internal
*/
Expand Down
3 changes: 1 addition & 2 deletions packages/kbn-logging/src/ecs/process.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ interface NestedFields {
}

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-process.html
* https://www.elastic.co/guide/en/ecs/master/ecs-process.html
*
* @internal
*/
Expand All @@ -36,7 +36,6 @@ export interface EcsProcess extends NestedFields {
name?: string;
pgid?: number;
pid?: number;
ppid?: number;
start?: string;
title?: string;
uptime?: number;
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/registry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-registry.html
* https://www.elastic.co/guide/en/ecs/master/ecs-registry.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/related.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-related.html
* https://www.elastic.co/guide/en/ecs/master/ecs-related.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/rule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-rule.html
* https://www.elastic.co/guide/en/ecs/master/ecs-rule.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ interface NestedFields {
}

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-server.html
* https://www.elastic.co/guide/en/ecs/master/ecs-server.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-service.html
* https://www.elastic.co/guide/en/ecs/master/ecs-service.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/source.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ interface NestedFields {
}

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-source.html
* https://www.elastic.co/guide/en/ecs/master/ecs-source.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/threat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ interface IndicatorNestedFields {
}

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-threat.html
* https://www.elastic.co/guide/en/ecs/master/ecs-threat.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/tls.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ interface NestedServerFields {
}

/**
* https://www.elastic.co/guide/en/ecs/1.12/ecs-tls.html
* https://www.elastic.co/guide/en/ecs/master/ecs-tls.html
*
* @internal
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-logging/src/ecs/tracing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* the base fields, we will need to do an intersection with these types at
* the root level.
*
* https://www.elastic.co/guide/en/ecs/1.12/ecs-tracing.html
* https://www.elastic.co/guide/en/ecs/master/ecs-tracing.html
*
* @internal
*/
Expand Down
Loading