elastic · jalvz · Nov 18, 2020 · Nov 3, 2020 · Nov 4, 2020 · Nov 5, 2020
diff --git a/code/go/internal/spec/statik.go b/code/go/internal/spec/statik.go
diff --git a/code/go/internal/validator/test/packages/input_template/agent/input/example.yml.hbs b/code/go/internal/validator/test/packages/input_template/agent/input/example.yml.hbs
@@ -0,0 +1,3 @@
+group:
+    field1: {{var1}}
+    field2: {{var2}}
diff --git a/code/go/internal/validator/test/packages/input_template/agent/input/template.yml.hbs b/code/go/internal/validator/test/packages/input_template/agent/input/template.yml.hbs
@@ -0,0 +1 @@
+{}
diff --git a/...go/internal/validator/test/packages/input_template/data_stream/nothing/fields/nothing.yml b/...go/internal/validator/test/packages/input_template/data_stream/nothing/fields/nothing.yml
@@ -0,0 +1,2 @@
+- name: nothing
+  type: keyword
diff --git a/code/go/internal/validator/test/packages/input_template/data_stream/nothing/manifest.yml b/code/go/internal/validator/test/packages/input_template/data_stream/nothing/manifest.yml
@@ -0,0 +1 @@
+title: nothing, really
diff --git a/code/go/internal/validator/test/packages/input_template/docs/.empty b/code/go/internal/validator/test/packages/input_template/docs/.empty
diff --git a/code/go/internal/validator/test/packages/input_template/manifest.yml b/code/go/internal/validator/test/packages/input_template/manifest.yml
@@ -0,0 +1,19 @@
+format_version: 1.0.4
+name: integration
+title: integration
+description: integration, really
+version: 0.1.2
+release: beta
+conditions:
+  kibana.version: '^7.9.0'
+policy_templates:
+  - name: apm
+    title: APM
+    description: APM stuff
+    inputs:
+      - type: apm
+        title: Collect traces
+        description: Collect traces
+        template_path: ./agent/input/template.yml.hbs
+owner:
+  github: elastic/foobar
diff --git a/code/go/pkg/validator/validator_test.go b/code/go/pkg/validator/validator_test.go
@@ -30,6 +30,7 @@ func TestValidateFile(t *testing.T) {
 				"document dashes are required (start the document with '---')",
 			},
 		},
+		"input_template": {},
 	}
 
 	for pkgName, test := range tests {

diff --git a/versions/1/agent/spec.yml b/versions/1/agent/spec.yml
@@ -0,0 +1,13 @@
+spec:
+  additionalContents: false
+  contents:
+  - description: Folder containing input definitions
+    type: folder
+    name: input
+    required: true
+    additionalContents: false
+    contents:
+    - description: Config template file for inputs defined in the policy_templates section of the top level manifest
+      type: file
+      pattern: '^.+.yml.hbs$'
+      required: true
diff --git a/versions/1/changelog.yml b/versions/1/changelog.yml
@@ -14,4 +14,7 @@
     link: https://github.com/elastic/package-spec/pull/73
   - description: Adding "traces" as a valid data stream type.
     type: enhancement
-    link: https://github.com/elastic/package-spec/pull/78
+    link: https://github.com/elastic/package-spec/pull/78
+  - description: Add "agent/input" folder for top level configuration.
+    type: enhancement
+    link: https://github.com/elastic/package-spec/pull/79
diff --git a/versions/1/manifest.spec.yml b/versions/1/manifest.spec.yml
@@ -205,6 +205,11 @@ spec:
                   type: string
                   examples:
                   - Collecting Apache access and error logs
+                template_path:
+                  description: Path of the config template for the input.
+                  type: string
+                  examples:
+                  - ./agent/input/template.yml.hbs
                 vars:
                   $ref: "./data_stream/manifest.spec.yml#/definitions/vars"
               required:

diff --git a/versions/1/spec.yml b/versions/1/spec.yml
@@ -28,6 +28,11 @@ spec:
     type: folder
     name: docs
     required: true
+  - description: Folder containing agent-related definitions
+    type: folder
+    name: agent
+    required: false
+    $ref: "./agent/spec.yml"
   - description: Folder containing Kibana assets used by the package
     type: folder
     name: kibana
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{}
Copy link Contributor mtojek Nov 18, 2020 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. nit: It would be nice to put a real content in at least one file, so this `template.yml.hbs` won't be so mysterious. Copy link Contributor ruflin Nov 19, 2020 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. @jalvz Can you open a PR with this? Because it is exactly what I'm looking for to have an example. @mtojek These test packages are great. Example and testing in one go. Copy link Contributor ruflin Nov 19, 2020 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. BTW, you could even put a short APM Example in here to make it more concrete. Copy link Contributor Author jalvz Nov 19, 2020 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. @ruflin I added `7673874`, is not that what you were looking for? I don't think I can use this file as a real hbs example because it is referenced in the test (correct me if Im wrong) Also didn't want to add an APM-like config because this can be anything, it has exactly the same structure as the stream templates. Copy link Contributor ruflin Nov 19, 2020 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Got it. I missed that you added two template files. The part I stumble over is that you used `group`. This is just an example I assume. It can all be on the top level like `foo: bar`? If we could use apm example here, @mtojek will know best. My preference is always to have a real example if possible. jalvz reacted with thumbs up emoji
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ func TestValidateFile(t *testing.T) { @@
     				"document dashes are required (start the document with '---')",
     			},
     		},
+    		"input_template": {},
     	}
     	for pkgName, test := range tests {
@@ Expand Down @@