Skip to content

Commit

Permalink
Introduce process.* field set reuse filtering (elastic#1847)
Browse files Browse the repository at this point in the history
* add location for subset filters

* add --subset arg to make

* artifact changes with new filterings

* also need to account for experimental fields

* correct experimental artifacts

* experimental subset def

* ignore subset artifacts

* add env_vars

* add interactive and parent.interactive

* changelog
  • Loading branch information
ebeahan authored Mar 22, 2022
1 parent e012aca commit 40eab34
Show file tree
Hide file tree
Showing 19 changed files with 14,341 additions and 127,497 deletions.
4 changes: 4 additions & 0 deletions .gitignore
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
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
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

0 comments on commit 40eab34

Please sign in to comment.