Skip to content

Commit 08b1a08

Browse files
ebeahanwebmat
andauthored
Introduce experimental artifacts (#993)
Co-authored-by: Mathieu Martin <webmat@gmail.com>
1 parent 76ec52d commit 08b1a08

32 files changed

+29955
-1
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ build
77
.idea
88
*.iml
99
.vscode/*
10+
11+
# experimental exclusions
12+
experimental/generated/elasticsearch/6
13+
experimental/generated/docs

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ VERSION := $(shell cat version)
1515
# Check verifies that all of the committed files that are generated are
1616
# up-to-date.
1717
.PHONY: check
18-
check: generate test fmt misspell makelint check-license-headers
18+
check: generate experimental test fmt misspell makelint check-license-headers
1919
# Check if diff is empty.
2020
git diff | cat
2121
git update-index --refresh
@@ -46,6 +46,11 @@ docs:
4646
fi
4747
./build/docs/build_docs --asciidoctor --doc ./docs/index.asciidoc --chunk=1 $(OPEN_DOCS) --out ./build/html_docs
4848

49+
# Alias to generate experimental artifacts
50+
.PHONY: experimental
51+
experimental: ve
52+
$(PYTHON) scripts/generator.py --include experimental/schemas --out experimental
53+
4954
# Format code and files in the repo.
5055
.PHONY: fmt
5156
fmt: ve

experimental/README.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# ECS Experimental Definitions
2+
3+
ECS experimental definitions are changes and features which have reached [stage two](https://elastic.github.io/ecs/stages.html) in the ECS [RFC process](../rfcs)
4+
5+
Stage two changes only appear in the experimental artifacts in this directory, but aren't yet reflected in the official ECS documentation.
6+
Note that stage three and four proposals do appear in the official ECS documentation.
7+
8+
These experimental changes to ECS are comprehensive but not necessarily final. They are also still subject to breaking changes.
9+
10+
## Schema Files
11+
12+
The [experimental/schemas](./schemas) directory contains the YAML files for the experimental field definitions. These are not always complete schemas. They can also be supplemental changes to be merged with the official schema spec, using the `--include` generator flag.
13+
14+
If you use the ECS generator script as described in [USAGE.md](../USAGE.md) to maintain your custom index templates, here's how you can try these experimental changes in your project:
15+
16+
```sh
17+
$ python scripts/generator.py --include experimental/schemas \
18+
--include ../myproject/fields/custom/ \
19+
--out ../myproject/fields/generated
20+
```
21+
22+
The above would include all experimental changes to ECS along with your custom fields, and output the artifacts in `myproject/fields/generated`.
23+
24+
## Generated Artifacts
25+
26+
Various files generated based on the experimental ECS spec. The artifacts are generated using `make experimental` and published [here](./generated).

0 commit comments

Comments
 (0)