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

Introduce process.* field set reuse filtering #1847

Merged
merged 10 commits into from
Mar 22, 2022
Merged

Introduce process.* field set reuse filtering #1847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7661dcf
add location for subset filters
ebeahan Mar 22, 2022
6267401
add --subset arg to make
ebeahan Mar 22, 2022
13c3127
artifact changes with new filterings
ebeahan Mar 22, 2022
3ebeaa0
also need to account for experimental fields
ebeahan Mar 22, 2022
bd59ae1
correct experimental artifacts
ebeahan Mar 22, 2022
63b734c
experimental subset def
ebeahan Mar 22, 2022
5e58ba6
ignore subset artifacts
ebeahan Mar 22, 2022
574862a
add env_vars
ebeahan Mar 22, 2022
fec3da5
add interactive and parent.interactive
ebeahan Mar 22, 2022
59335c4
changelog
ebeahan Mar 22, 2022
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ build
experimental/generated/elasticsearch/6
experimental/generated/docs

# subset exclusions
generated/ecs/subset
experimental/generated/ecs/subset

# patches are vital to cross-branch testing but don't want in GitHub
*.patch

2 changes: 1 addition & 1 deletion CHANGELOG.next.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Thanks, you're awesome :-) -->
* Add beta `container.*` metric fields. #1789
* Add six new syslog fields to `log.syslog.*`. #1793
* Added `faas.id`, `faas.name` and `faas.version` fields as beta. #1796
* Added linux event model beta fields and reuses to support RFC 0030. #1842
* Added linux event model beta fields and reuses to support RFC 0030. #1842, #1847

#### Improvements

Expand Down
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
FIND := find . -type f -not -path './build/*' -not -path './.git/*'
OPEN_DOCS ?= "--open"
PYTHON := build/ve/bin/python
SUBSETS_DIR := schemas/subsets/
EXP_SUBSETS_DIR := experimental/schemas/subsets/
VERSION := $(shell cat version)

#
Expand Down Expand Up @@ -49,7 +51,7 @@ docs:
# Alias to generate experimental artifacts
.PHONY: experimental
experimental: ve
$(PYTHON) scripts/generator.py --include experimental/schemas --out experimental
$(PYTHON) scripts/generator.py --include experimental/schemas --subset "${SUBSETS_DIR}" "${EXP_SUBSETS_DIR}" --out experimental

# Format code and files in the repo.
.PHONY: fmt
Expand All @@ -64,7 +66,7 @@ generate: generator
# Run the new generator
.PHONY: generator
generator: ve
$(PYTHON) scripts/generator.py --strict --include "${INCLUDE}"
$(PYTHON) scripts/generator.py --strict --include "${INCLUDE}" --subset "${SUBSETS_DIR}"

# Check Makefile format.
.PHONY: makelint
Expand Down
Loading