Skip to content

Commit 40eab34

Browse files
authored
Introduce process.* field set reuse filtering (#1847)
* 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
1 parent e012aca commit 40eab34

File tree

19 files changed

+14341
-127497
lines changed

19 files changed

+14341
-127497
lines changed

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ build
1212
experimental/generated/elasticsearch/6
1313
experimental/generated/docs
1414

15+
# subset exclusions
16+
generated/ecs/subset
17+
experimental/generated/ecs/subset
18+
1519
# patches are vital to cross-branch testing but don't want in GitHub
1620
*.patch
1721

CHANGELOG.next.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Thanks, you're awesome :-) -->
4747
* Add beta `container.*` metric fields. #1789
4848
* Add six new syslog fields to `log.syslog.*`. #1793
4949
* Added `faas.id`, `faas.name` and `faas.version` fields as beta. #1796
50-
* Added linux event model beta fields and reuses to support RFC 0030. #1842
50+
* Added linux event model beta fields and reuses to support RFC 0030. #1842, #1847
5151

5252
#### Improvements
5353

Makefile

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
FIND := find . -type f -not -path './build/*' -not -path './.git/*'
66
OPEN_DOCS ?= "--open"
77
PYTHON := build/ve/bin/python
8+
SUBSETS_DIR := schemas/subsets/
9+
EXP_SUBSETS_DIR := experimental/schemas/subsets/
810
VERSION := $(shell cat version)
911

1012
#
@@ -49,7 +51,7 @@ docs:
4951
# Alias to generate experimental artifacts
5052
.PHONY: experimental
5153
experimental: ve
52-
$(PYTHON) scripts/generator.py --include experimental/schemas --out experimental
54+
$(PYTHON) scripts/generator.py --include experimental/schemas --subset "${SUBSETS_DIR}" "${EXP_SUBSETS_DIR}" --out experimental
5355

5456
# Format code and files in the repo.
5557
.PHONY: fmt
@@ -64,7 +66,7 @@ generate: generator
6466
# Run the new generator
6567
.PHONY: generator
6668
generator: ve
67-
$(PYTHON) scripts/generator.py --strict --include "${INCLUDE}"
69+
$(PYTHON) scripts/generator.py --strict --include "${INCLUDE}" --subset "${SUBSETS_DIR}"
6870

6971
# Check Makefile format.
7072
.PHONY: makelint

0 commit comments

Comments
 (0)