Use policy template name to generate input name

elastic · Jun 12, 2023 · fc37e66 · fc37e66
1 parent 94f8fd4
commit fc37e66
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 3 deletions.
diff --git a/internal/benchrunner/runners/system/runner.go b/internal/benchrunner/runners/system/runner.go
@@ -364,13 +364,14 @@ func (r *runner) createPackagePolicy(pkgManifest *packages.PackageManifest, p *k
 		r.scenario.Package = pkgManifest.Name
 	}
 
+	// TODO: add ability to define which policy template to use
 	pp := kibana.PackagePolicy{
 		Namespace: "ep",
 		PolicyID:  p.ID,
 		Vars:      r.scenario.Vars,
 		Force:     true,
 		Inputs: map[string]kibana.PackagePolicyInput{
-			fmt.Sprintf("%s-%s", r.scenario.DataStream.Name, r.scenario.Input): {
+			fmt.Sprintf("%s-%s", pkgManifest.PolicyTemplates[0].Name, r.scenario.Input): {
 				Enabled: true,
 				Streams: map[string]kibana.PackagePolicyStream{
 					fmt.Sprintf("%s.%s", pkgManifest.Name, r.scenario.DataStream.Name): {

diff --git a/test/packages/benchmarks/system_benchmark/_dev/benchmark/system/20mb-logs-benchmark.yml b/test/packages/benchmarks/system_benchmark/_dev/benchmark/system/20mb-logs-benchmark.yml
@@ -2,7 +2,7 @@
 description: Benchmark 100MiB of data ingested
 input: filestream
 vars: ~
-data_stream.name: test
+data_stream.name: testds
 data_stream.vars.paths:
   - "{{SERVICE_LOGS_DIR}}/corpus-*"
 warmup_time_period: 10s

diff --git a/...st/_dev/benchmark/pipeline/access-raw.log → ...ds/_dev/benchmark/pipeline/access-raw.log b/...st/_dev/benchmark/pipeline/access-raw.log → ...ds/_dev/benchmark/pipeline/access-raw.log
diff --git a/...m/test/_dev/benchmark/pipeline/config.yml → ...testds/_dev/benchmark/pipeline/config.yml b/...m/test/_dev/benchmark/pipeline/config.yml → ...testds/_dev/benchmark/pipeline/config.yml
diff --git a/...ream/test/agent/stream/filestream.yml.hbs → ...am/testds/agent/stream/filestream.yml.hbs b/...ream/test/agent/stream/filestream.yml.hbs → ...am/testds/agent/stream/filestream.yml.hbs
diff --git a/...data_stream/test/agent/stream/udp.yml.hbs → ...ta_stream/testds/agent/stream/udp.yml.hbs b/...data_stream/test/agent/stream/udp.yml.hbs → ...ta_stream/testds/agent/stream/udp.yml.hbs
diff --git a/...elasticsearch/ingest_pipeline/default.yml → ...elasticsearch/ingest_pipeline/default.yml b/...elasticsearch/ingest_pipeline/default.yml → ...elasticsearch/ingest_pipeline/default.yml
diff --git a/...k/data_stream/test/fields/base-fields.yml → ...data_stream/testds/fields/base-fields.yml b/...k/data_stream/test/fields/base-fields.yml → ...data_stream/testds/fields/base-fields.yml
diff --git a/...m_benchmark/data_stream/test/manifest.yml → ...benchmark/data_stream/testds/manifest.yml b/...m_benchmark/data_stream/test/manifest.yml → ...benchmark/data_stream/testds/manifest.yml
diff --git a/test/packages/benchmarks/system_benchmark/manifest.yml b/test/packages/benchmarks/system_benchmark/manifest.yml
@@ -9,7 +9,7 @@ type: integration
 conditions:
   kibana.version: '^8.0.0'
 policy_templates:
-  - name: test
+  - name: testpo
     title: Test
     description: Description
     inputs: