ES artifacts folder restructuring (#1700) (#1708)

Author: kgeller

CHANGELOG.next.md

@@ -36,7 +36,7 @@ check_license_headers:
 # Clean deletes all temporary and generated content.
 .PHONY: clean
 clean:
-	rm -rf build generated/elasticsearch/component experimental/generated/elasticsearch/component
+	rm -rf build generated/elasticsearch/composable/component experimental/generated/elasticsearch/composable/component
 
 # Build the asciidoc book.
 .PHONY: docs

Makefile

@@ -55,13 +55,13 @@ def save_composable_template(ecs_version, component_names, out_dir, mapping_sett
             "mappings": mapping_settings(mapping_settings_file)
         }
     }
-    filename = join(out_dir, "elasticsearch/template.json")
+    filename = join(out_dir, "elasticsearch/composable/template.json")
     save_json(filename, template)
 
 
 def all_component_templates(ecs_nested, ecs_version, out_dir):
     """Generate one component template per field set"""
-    component_dir = join(out_dir, 'elasticsearch/component')
+    component_dir = join(out_dir, 'elasticsearch/composable/component')
     ecs_helpers.make_dirs(component_dir)
 
     for (fieldset_name, fieldset) in candidate_components(ecs_nested).items():
@@ -124,10 +124,10 @@ def generate_legacy(ecs_flat, ecs_version, out_dir, template_settings_file, mapp
 
 
 def generate_legacy_template_version(es_version, ecs_version, mappings_section, out_dir, template_settings_file):
-    ecs_helpers.make_dirs(join(out_dir, 'elasticsearch', str(es_version)))
+    ecs_helpers.make_dirs(join(out_dir, 'elasticsearch', "legacy"))
     template = template_settings(es_version, ecs_version, mappings_section, template_settings_file)
 
-    filename = join(out_dir, "elasticsearch/{}/template.json".format(es_version))
+    filename = join(out_dir, "elasticsearch/legacy/template.json")
     save_json(filename, template)