Skip to content

Commit

Permalink
Remove full kibana directory when collecting kibana files (#5695)
Browse files Browse the repository at this point in the history
Previously the index pattern directory was not removed because it was created manually. Now that this is generated out of the fields.yml the complete fields.yml directory can be removed for cleanup.

This PR comes out of #5328 to make sure this change has not side effects. Needs to be merged before #5328.
  • Loading branch information
ruflin authored and ph committed Nov 28, 2017
1 parent d0da16c commit d61c015
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion auditbeat/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ collect-docs: python-env
# Collects all module dashboards
.PHONY: kibana
kibana:
@-rm -rf _meta/kibana/dashboard _meta/kibana/search _meta/kibana/visualization # Skip index-pattern
@-rm -rf _meta/kibana
@mkdir -p _meta/kibana
@-cp -pr module/*/_meta/kibana _meta/

2 changes: 1 addition & 1 deletion filebeat/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ before-build:
# Collects all module dashboards
.PHONY: kibana
kibana:
@rm -rf _meta/kibana/dashboard _meta/kibana/search _meta/kibana/visualization # Skip index-pattern
@rm -rf _meta/kibana
@mkdir -p _meta/kibana
@-cp -r module/*/_meta/kibana _meta/

Expand Down
3 changes: 1 addition & 2 deletions metricbeat/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ include ${ES_BEATS}/libbeat/scripts/Makefile
# Collects all module dashboards
.PHONY: kibana
kibana:
@# To not remove index-pattern as generated by update
@rm -rf _meta/kibana/dashboard _meta/kibana/search _meta/kibana/visualization
@rm -rf _meta/kibana
@mkdir -p _meta/kibana
@-cp -r module/*/_meta/kibana _meta/

Expand Down

0 comments on commit d61c015

Please sign in to comment.