Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into add-email-return-path
Browse files Browse the repository at this point in the history
  • Loading branch information
mjwolf committed Dec 8, 2024
2 parents f9a88c8 + a735abd commit 01a1e8f
Show file tree
Hide file tree
Showing 200 changed files with 37,350 additions and 7,228 deletions.
9 changes: 9 additions & 0 deletions .backportrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
"upstream": "elastic/ecs",
"branches": [
{ "name": "main", "checked": true },
"8.x",
"8.16",
"8.11",
"8.10",
"8.9",
"8.8",
"8.7",
"8.6",
"8.5",
"8.4",
"8.3",
"8.2",
Expand Down
50 changes: 0 additions & 50 deletions .github/workflows/add-to-ecs-project.yml

This file was deleted.

20 changes: 20 additions & 0 deletions .github/workflows/build_ecs_typescript.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Build ecs-typescript and create updated definitions PR
on:
release:
types: [published]

jobs:
notify:
runs-on: ubuntu-latest

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Trigger workflow on ecs-typescript
run: |
curl -L \
-X POST \
-H "Accept: application/vnd.github+json" \
-H "Authorization: Bearer ${{ secrets.ECS_TYPESCRIPT_REPO_TRIGGER_KEY }}" \
-H "X-GitHub-Api-Version: 2022-11-28" \
https://api.github.com/repos/elastic/ecs-typescript/actions/workflows/generate.yml/dispatches \
-d '{"ref":"main","inputs":{"ecsRef":"${{ env.RELEASE_VERSION }}"}}'
25 changes: 25 additions & 0 deletions .github/workflows/docs-preview-comment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Docs Preview Comment

on:
pull_request_target:
types: [opened]
paths:
- docs/**

jobs:
doc-preview:
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
name: Add doc preview links
with:
script: |
const pr = context.payload.pull_request;
const comment = `Documentation changes preview: https://${context.repo.repo}_bk_${pr.number}.docs-preview.app.elstc.co/diff`;
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: comment,
});
15 changes: 13 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,21 @@ jobs:

steps:
- name: "Check PRs"
uses: actions/stale@v4
uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-pr-message: 'This PR is stale because it has been open for 60 days with no activity.'
stale-pr-message: |
Hi!
We just realized that we haven't looked into this PR in a while. We're
sorry!
We're labeling this PR as `Stale` to make it hit our filters and
make sure we get back to it as soon as possible. In the meantime, it'd
be extremely helpful if you could take a look at it as well and confirm its
relevance. A simple comment with a nice emoji will be enough `:+1`.
Thank you for your contribution!
stale-pr-label: 'stale'
ascending: true
days-before-pr-stale: 60
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ on: [push, pull_request]

jobs:
tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
name: Unit Tests
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
with:
python-version: '3.x'
- run: git fetch --prune --unshallow --tags
- run: make check
- run: make check yamllint
226 changes: 226 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,232 @@
# 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/).

## [8.16.0](https://github.com/elastic/ecs/compare/v8.11.0...v8.16.0)

### Schema Changes

#### Bugfixes
* Fix broken link in docs for vulnerability.id. #2328

#### Added

* Added `volume.*` as beta field set. #2269
* Advanced `process.env_vars` to GA. #2315
* Advanced `process.io` and `process.tty` fields to GA. #2317
* Added `threat.indicator.id`. #2324
* Added `process.group` to generated schemas. #2335

#### Improvements

* Define base encoding of `x509.serial_number`. #2383

### Tooling and Artifact Changes

#### Bugfixes

* Fix broken link for vulnerabilty.id #2328

#### Added

* Documentation in README.md providing instruction on contributions to ECS during the OTel donation #2325

## [8.11.0](https://github.com/elastic/ecs/compare/v8.10.0...v8.11.0)

### Schema Changes

#### Bugfixes

* Remove `expected_values` from `threat.*.indicator.name` fields. #2281

### Tooling and Artifact Changes

#### Bugfixes

* Respect reusable.top_level in Beats generator #2278

## [8.10.0](https://github.com/elastic/ecs/compare/v8.9.0...v8.10.0)

### Schema Changes

#### Added

* Added `container.security_context.privileged` to indicated whether a container was started in privileged mode. #2219, #2225, #2246
* Added `process.thread.capabilities.permitted` to contain the current thread's possible capabilities. #2245
* Added `process.thread.capabilities.effective` to contain the current thread's effective capabilities. #2245

#### Improvements

* Permit `ignore_above` if explicitly set on a `flattened` field. #2248

### Tooling and Artifact Changes

#### Improvements

* Improved documentation formatting to better follow the contributing guide. #2226
* Bump `gitpython` dependency from 3.1.30 to 3.1.35 for security fixes. #2251, #2264, #2265

## [8.9.0](https://github.com/elastic/ecs/compare/v8.8.0...v8.9.0)

### Schema Changes

### Bugfixes

#### Added
* Added `process.vpid` for namespaced process ids. #2211

### Improvements

#### Deprecated
* Removed `faas.trigger: nested` since we only have one trigger. #2194

## [8.8.0](https://github.com/elastic/ecs/compare/v8.7.0...v8.8.0)

### Schema Changes

#### Added

* Add `event.type: access` as an allowed value for `event.category: file`. #2174
* Add `orchestrator.resource.annotation` and `orchestrator.resource.label`. #2181
* Add `event.kind: asset` as a beta category. #2191

### Tooling and Artifact Changes

#### Added

* Add `parameters` property for field definitions, to provide any mapping parameter. #2084

## [8.7.0](https://github.com/elastic/ecs/compare/v8.6.1...v8.7.0)

### Schema Changes

#### Bugfixes

* remove duplicated `client.domain` definition #2120

#### Added

* adding `name` field to `threat.indicator` #2121
* adding `api` option to `event.category` #2147
* adding `library` option to `event.category` #2154

#### Improvements

* description for `host.name` definition updated to encourage use of FDQN #2122

### Tooling and Artifact Changes

#### Improvements

* Updated usage docs to include `threat.indicator.url.domain` and changed `indicator.marking.tlp` and `indicator.enrichments.marking.tlp` from "WHITE" to "CLEAR" to align with TLP 2.0. #2124
* Bump `gitpython` from `3.1.27` to `3.1.30` in `/scripts`. #2139

## [8.6.1](https://github.com/elastic/ecs/compare/v8.6.0...v8.6.1)

### Schema Changes

#### Bugfixes

* Fixing `tlp_version` and `tlp` field for threat. #2156

## [8.6.0](https://github.com/elastic/ecs/compare/v8.5.2...v8.6.0)

### Schema Changes

#### Added

* Adding `vulnerability` option for `event.category`. #2029
* Added `device.*` field set as beta. #2030
* Added `tlp.version` to threat #2074
* Added fields for executable object format metadata for ELF, Mach-O and PE #2083

#### Improvements

* Added `CLEAR` and `AMBER+STRICT` as valid values for `threat.indicator.marking.tlp` and `enrichments.indicator.marking.tlp` to accept new [TLP 2.0](https://www.first.org/tlp/) markings #2022, #2074

## [8.5.2](https://github.com/elastic/ecs/compare/v8.5.1...v8.5.2)

### Schema Changes

#### Bugfixes

* Fixes invalid `number` type on 4 `process.io` subfields. #2105

## [8.5.1](https://github.com/elastic/ecs/compare/v8.5.0...v8.5.1)

### Tooling and Artifact Changes

#### Bugfixes

* Fix type of `normalize` in `process.io.bytes_skipped`. #2094

## [8.5.0](https://github.com/elastic/ecs/compare/v8.4.0...v8.5.0)

### Schema Changes

#### Added

* Adding `risk.*` fields as experimental. #1994, #2010
* Adding `process.io.*` as beta fields. #1956, #2031
* Adding `process.tty.rows` and `process.tty.columns` as beta fields. #2031
* Changed `process.env_vars` field type to be an array of keywords. #2038
* `process.attested_user` and `process.attested_groups` as beta fields. #2050
* Added `risk.*` fieldset to beta. #2051, #2058
* Moved Linux event model fields to GA. #2082

#### Improvements

* Advances `threat.enrichments.indicator` to GA. #1928
* Added `ios` and `android` as valid values for `os.type` #1999

### Tooling and Artifact Changes

#### Bugfixes

* Added Deprecation Warning for `misspell` task #1993
* Fix typo in client schema #2014

## [8.4.0](https://github.com/elastic/ecs/compare/v8.3.1...v8.4.0)

### Schema Changes

#### Added

* Initial set of `expected_values`. #1962
* Adding `service.node.roles`. #1981

### Tooling and Artifact Changes

#### Added

* Introduce `expected_values` attribute. #1952

#### Improvements

* Additional type annotations. #1950

## [8.3.1](https://github.com/elastic/ecs/compare/v8.3.0...v8.3.1)

### Schema Changes

#### Deprecated

* Deprecate `service.node.role` in favor of upcoming `service.node.roles`. #1976

## [8.3.0](https://github.com/elastic/ecs/compare/v8.2.1...v8.3.0)

### Schema Changes

#### Added

* Added `pattern` attribute to `.mac` fields. #1871
* Add `orchestrator.cluster.id` #1875
* Add `orchestrator.resource.id` #1878
* Add `orchestrator.resource.parent.type` #1889
* Add `orchestrator.resource.ip` #1889
* Add `container.image.hash.all` #1889
* Add `service.node.role` #1916
* Advanced `container.*` metric fields to GA. #1927

## [8.2.1](https://github.com/elastic/ecs/compare/v8.2.0...v8.2.1)

### Schema Changes
Expand Down
Loading

0 comments on commit 01a1e8f

Please sign in to comment.