From 450ebc3ee45ca9e65b57961f6fb2e66eb3f767a3 Mon Sep 17 00:00:00 2001
From: Bharat Pasupula <123897612+bhapas@users.noreply.github.com>
Date: Mon, 9 Dec 2024 11:23:05 +0100
Subject: [PATCH] [Automatic Import] Add datastream name as dataset value in
manifest (#203106)
## Release note
Use Data stream name for data_stream.dataset value in input manifests
## Summary
Closes https://github.com/elastic/kibana/issues/201478
This PR uses the user-supplied data stream name as the
`data_stream.dataset` value instead of a generic placeholder.
Custom Fleet integrations default to a generic dataset
(data_stream.dataset) value - something like `http_endpoint.generic.`
Since users configure their own options for a custom integration, this
workflow makes sense.
Elastic integrations, on the other hand, default to a predetermined
naming convention based on the integration package + datastream name for
dataset - something like github.issues for the issues data stream from
the Github package.
Hence defaulting it to `package_name.datastream_name`
### Checklist
Check the PR satisfies following conditions.
- [x] The PR description includes the appropriate Release Notes section,
and the correct `release_note:*` label is applied per the
[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
---
.../server/templates/manifest/cel_manifest.yml.njk | 3 ++-
.../server/templates/manifest/http_endpoint_manifest.yml.njk | 3 ++-
.../server/templates/manifest/kafka_manifest.yml.njk | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
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 eae1ebaa3be38..7023cda923fdf 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
@@ -10,7 +10,8 @@
title: Dataset name
description: |
Dataset to write data to. Changing the dataset will send the data to a different index. You can't use `-` in the name of a dataset and only valid characters for [Elasticsearch index names](https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-index_.html).
- default: cel.cel
+ default: |
+ {{ package_name }}.{{ data_stream_name }}
required: true
show_user: true
- name: pipeline
diff --git a/x-pack/plugins/integration_assistant/server/templates/manifest/http_endpoint_manifest.yml.njk b/x-pack/plugins/integration_assistant/server/templates/manifest/http_endpoint_manifest.yml.njk
index b35471ad4a631..6846b07328f3f 100644
--- a/x-pack/plugins/integration_assistant/server/templates/manifest/http_endpoint_manifest.yml.njk
+++ b/x-pack/plugins/integration_assistant/server/templates/manifest/http_endpoint_manifest.yml.njk
@@ -32,7 +32,8 @@
title: Dataset name
description: |
Dataset to write data to. Changing the dataset will send the data to a different index. You can't use `-` in the name of a dataset and only valid characters for [Elasticsearch index names](https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-index_.html).
- default: http_endpoint.generic
+ default: |
+ {{ package_name }}.{{ data_stream_name }}
required: true
show_user: true
- name: pipeline
diff --git a/x-pack/plugins/integration_assistant/server/templates/manifest/kafka_manifest.yml.njk b/x-pack/plugins/integration_assistant/server/templates/manifest/kafka_manifest.yml.njk
index a5e7f058c9471..2492058788eba 100644
--- a/x-pack/plugins/integration_assistant/server/templates/manifest/kafka_manifest.yml.njk
+++ b/x-pack/plugins/integration_assistant/server/templates/manifest/kafka_manifest.yml.njk
@@ -26,7 +26,8 @@
title: Dataset name
description: |
Dataset to write data to. Changing the dataset will send the data to a different index. You can't use `-` in the name of a dataset and only valid characters for [Elasticsearch index names](https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-index_.html).
- default: kafka_log.generic
+ default: |
+ {{ package_name }}.{{ data_stream_name }}
required: true
show_user: true
- name: pipeline