From b71995b5532c5ed15454ef18613637140c2a691d Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Thu, 24 Oct 2024 01:30:14 +1100
Subject: [PATCH] [8.x] [Automatic Import] Cel template fixes (#196945)
 (#197327)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Automatic Import] Cel template fixes
(#196945)](https://github.com/elastic/kibana/pull/196945)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Kylie
Meli","email":"kylie.geller@elastic.co"},"sourceCommit":{"committedDate":"2024-10-19T13:56:55Z","message":"[Automatic
Import] Cel template fixes (#196945)\n\n## Summary\r\n\r\nThis PR
corrects the CEL template so that it can successfully
complete\r\npackage policy installation. The fixes are 1) adding a
template path,\r\nand 2) removing the common template values from the
cel templates.\r\n\r\nTested and verified with and without the CEL
generation FF
enabled.","sha":"15390e4cdb9aecca5ba5782b0081cb244dbd1a08","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","backport:prev-minor","v8.16.0","Team:Security-Scalability","backport:version","v8.17.0"],"title":"[Automatic
Import] Cel template
fixes","number":196945,"url":"https://github.com/elastic/kibana/pull/196945","mergeCommit":{"message":"[Automatic
Import] Cel template fixes (#196945)\n\n## Summary\r\n\r\nThis PR
corrects the CEL template so that it can successfully
complete\r\npackage policy installation. The fixes are 1) adding a
template path,\r\nand 2) removing the common template values from the
cel templates.\r\n\r\nTested and verified with and without the CEL
generation FF
enabled.","sha":"15390e4cdb9aecca5ba5782b0081cb244dbd1a08"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/196945","number":196945,"mergeCommit":{"message":"[Automatic
Import] Cel template fixes (#196945)\n\n## Summary\r\n\r\nThis PR
corrects the CEL template so that it can successfully
complete\r\npackage policy installation. The fixes are 1) adding a
template path,\r\nand 2) removing the common template values from the
cel templates.\r\n\r\nTested and verified with and without the CEL
generation FF
enabled.","sha":"15390e4cdb9aecca5ba5782b0081cb244dbd1a08"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/196978","number":196978,"state":"MERGED","mergeCommit":{"sha":"b2c151a12f4db817e7aeb2ed7f76fe2217f82c2c","message":"[8.16]
[Automatic Import] Cel template fixes (#196945) (#196978)\n\n#
Backport\n\nThis will backport the following commits from `main` to
`8.16`:\n- [[Automatic Import] Cel template
fixes\n(#196945)](https://github.com/elastic/kibana/pull/196945)\n\n<!---
Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Kylie\nMeli\",\"email\":\"kylie.geller@elastic.co\"},\"sourceCommit\":{\"committedDate\":\"2024-10-19T13:56:55Z\",\"message\":\"[Automatic\nImport]
Cel template fixes (#196945)\\n\\n## Summary\\r\\n\\r\\nThis
PR\ncorrects the CEL template so that it can
successfully\ncomplete\\r\\npackage policy installation. The fixes are
1) adding a\ntemplate path,\\r\\nand 2) removing the common template
values from the\ncel templates.\\r\\n\\r\\nTested and verified with and
without the CEL\ngeneration
FF\nenabled.\",\"sha\":\"15390e4cdb9aecca5ba5782b0081cb244dbd1a08\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.17.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"release_note:skip\",\"v9.0.0\",\"v8.16.0\",\"Team:Security-Scalability\",\"backport:version\"],\"title\":\"[Automatic\nImport]
Cel
template\nfixes\",\"number\":196945,\"url\":\"https://github.com/elastic/kibana/pull/196945\",\"mergeCommit\":{\"message\":\"[Automatic\nImport]
Cel template fixes (#196945)\\n\\n## Summary\\r\\n\\r\\nThis
PR\ncorrects the CEL template so that it can
successfully\ncomplete\\r\\npackage policy installation. The fixes are
1) adding a\ntemplate path,\\r\\nand 2) removing the common template
values from the\ncel templates.\\r\\n\\r\\nTested and verified with and
without the CEL\ngeneration
FF\nenabled.\",\"sha\":\"15390e4cdb9aecca5ba5782b0081cb244dbd1a08\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[\"8.16\"],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v9.0.0\",\"branchLabelMappingKey\":\"^v9.0.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/196945\",\"number\":196945,\"mergeCommit\":{\"message\":\"[Automatic\nImport]
Cel template fixes (#196945)\\n\\n## Summary\\r\\n\\r\\nThis
PR\ncorrects the CEL template so that it can
successfully\ncomplete\\r\\npackage policy installation. The fixes are
1) adding a\ntemplate path,\\r\\nand 2) removing the common template
values from the\ncel templates.\\r\\n\\r\\nTested and verified with and
without the CEL\ngeneration
FF\nenabled.\",\"sha\":\"15390e4cdb9aecca5ba5782b0081cb244dbd1a08\"}},{\"branch\":\"8.16\",\"label\":\"v8.16.0\",\"branchLabelMappingKey\":\"^v(\\\\d+).(\\\\d+).\\\\d+$\",\"isSourceBranch\":false,\"state\":\"NOT_CREATED\"}]}]\nBACKPORT-->\n\nCo-authored-by:
Kylie Meli
<kylie.geller@elastic.co>"}},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Kylie Meli <kylie.geller@elastic.co>
---
 .../server/templates/agent/cel.yml.hbs           | 14 --------------
 .../templates/manifest/cel_manifest.yml.njk      | 16 +---------------
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/x-pack/plugins/integration_assistant/server/templates/agent/cel.yml.hbs b/x-pack/plugins/integration_assistant/server/templates/agent/cel.yml.hbs
index 2947f6343a763..6a0f1f1d52bea 100644
--- a/x-pack/plugins/integration_assistant/server/templates/agent/cel.yml.hbs
+++ b/x-pack/plugins/integration_assistant/server/templates/agent/cel.yml.hbs
@@ -146,18 +146,4 @@ resource.rate_limit.burst: {{resource_rate_limit_burst}}
 {{#if enable_request_tracer}}
 resource.tracer.filename: "../../logs/cel/http-request-trace-*.ndjson"
 resource.tracer.maxbackups: 5
-{{/if}}
-
-{{#if tags}}
-tags:
-{{#each tags as |tag|}}
-  - {{tag}}
-{{/each}}
-{{/if}}
-{{#contains "forwarded" tags}}
-publisher_pipeline.disable_host: true
-{{/contains}}
-{{#if processors}}
-processors:
-{{processors}}
 {{/if}}
\ No newline at end of file
diff --git a/x-pack/plugins/integration_assistant/server/templates/manifest/cel_manifest.yml.njk b/x-pack/plugins/integration_assistant/server/templates/manifest/cel_manifest.yml.njk
index 025732305a59d..eae1ebaa3be38 100644
--- a/x-pack/plugins/integration_assistant/server/templates/manifest/cel_manifest.yml.njk
+++ b/x-pack/plugins/integration_assistant/server/templates/manifest/cel_manifest.yml.njk
@@ -1,4 +1,5 @@
 - input: cel
+  template_path: cel.yml.hbs
   title: |
     {{ data_stream_title }}
   description: |
@@ -308,21 +309,6 @@
       show_user: false
       multi: false
       required: false
-    - name: processors
-      type: yaml
-      title: Processors
-      multi: false
-      required: false
-      show_user: false
-      description: >
-        Processors are used to reduce the number of fields in the exported event or to enhance the event with metadata. This executes in the agent before the logs are parsed. See [Processors](https://www.elastic.co/guide/en/beats/filebeat/current/filtering-and-enhancing-data.html) for details.
-    - name: tags
-      type: text
-      title: Tags
-      multi: true
-      show_user: false
-      default:
-        - forwarded
     - name: enable_request_tracer
       type: bool
       title: Enable request tracing