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

Backport #629 to 1.3: Remove the *legacy* Elasticsearch template #644

Merged
merged 1 commit into from
Nov 26, 2019
Merged

Backport #629 to 1.3: Remove the *legacy* Elasticsearch template #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CHANGELOG.next.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ Thanks, you're awesome :-) -->

* Changed the order and column names in the csv. #621
* Removed the file `schema.json` and the code generating it. #627
* Removed the legacy Elasticsearch template. #629
* Note: The *good* Elasticsearch templates are available in directory
`generated/elasticsearch`, this PR only removes an obsolete file.

#### Bugfixes

Expand Down
13 changes: 2 additions & 11 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ check-license-headers:
# Clean deletes all temporary and generated content.
.PHONY: clean
clean:
rm -rf build generated/legacy/template.json
rm -rf build
# Clean all markdown files for use-cases
find ./use-cases -type f -name '*.md' -not -name 'README.md' -print0 | xargs -0 rm --

Expand All @@ -55,7 +55,7 @@ fmt: ve

# Alias to generate everything.
.PHONY: generate
generate: template legacy_use_cases codegen generator
generate: legacy_use_cases codegen generator

# Run the new generator
.PHONY: generator
Expand Down Expand Up @@ -98,15 +98,6 @@ reload_docs: generator docs
setup: ve
cd scripts && $(FORCE_GO_MODULES) go mod download

# Build an Elasticsearch index template.
.PHONY: template
template:
cd scripts \
&& $(FORCE_GO_MODULES) go run cmd/template/template.go \
-version=$(VERSION) \
-schema=../schemas \
> ../generated/legacy/template.json

# Run the ECS tests
.PHONY: test
test:
Expand Down
Loading