From e1052043cce956747a5a5a5bf747a1a5e72b0c2a Mon Sep 17 00:00:00 2001
From: Julia Bardi <julia.bardi@elastic.co>
Date: Wed, 29 Nov 2023 13:21:31 +0100
Subject: [PATCH 1/2] added output_health data stream to fleet_server

---
 packages/fleet_server/changelog.yml                |  5 +++++
 .../elasticsearch/ilm/default_policy.json          | 12 ++++++++++++
 .../output_health_logs/fields/base-fields.yml      | 14 ++++++++++++++
 .../output_health_logs/fields/fields.yml           |  6 ++++++
 .../data_stream/output_health_logs/lifecycle.yml   |  1 +
 .../data_stream/output_health_logs/manifest.yml    |  8 ++++++++
 packages/fleet_server/manifest.yml                 |  2 +-
 7 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 packages/fleet_server/data_stream/output_health_logs/elasticsearch/ilm/default_policy.json
 create mode 100644 packages/fleet_server/data_stream/output_health_logs/fields/base-fields.yml
 create mode 100644 packages/fleet_server/data_stream/output_health_logs/fields/fields.yml
 create mode 100644 packages/fleet_server/data_stream/output_health_logs/lifecycle.yml
 create mode 100644 packages/fleet_server/data_stream/output_health_logs/manifest.yml

diff --git a/packages/fleet_server/changelog.yml b/packages/fleet_server/changelog.yml
index 10192436373..29ad00324b6 100644
--- a/packages/fleet_server/changelog.yml
+++ b/packages/fleet_server/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "1.5.0"
+  changes:
+    - description: Added new output health data stream
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/9000
 - version: "1.4.0"
   changes:
     - description: Added new metrics data streams
diff --git a/packages/fleet_server/data_stream/output_health_logs/elasticsearch/ilm/default_policy.json b/packages/fleet_server/data_stream/output_health_logs/elasticsearch/ilm/default_policy.json
new file mode 100644
index 00000000000..5f0142687ff
--- /dev/null
+++ b/packages/fleet_server/data_stream/output_health_logs/elasticsearch/ilm/default_policy.json
@@ -0,0 +1,12 @@
+{	
+    "policy": {	
+        "phases": {	
+            "delete": {	
+                "min_age": "7d",	
+                "actions": {	
+                    "delete": {}	
+                }	
+            }	
+        }	
+    }	
+}
\ No newline at end of file
diff --git a/packages/fleet_server/data_stream/output_health_logs/fields/base-fields.yml b/packages/fleet_server/data_stream/output_health_logs/fields/base-fields.yml
new file mode 100644
index 00000000000..de4c1cbfa57
--- /dev/null
+++ b/packages/fleet_server/data_stream/output_health_logs/fields/base-fields.yml
@@ -0,0 +1,14 @@
+- name: data_stream.type
+  external: ecs
+- name: data_stream.dataset
+  external: ecs
+- name: data_stream.namespace
+  external: ecs
+- name: "@timestamp"
+  external: ecs
+- name: agent.id
+  external: ecs
+- name: agent.version
+  external: ecs
+- name: agent.type
+  external: ecs
diff --git a/packages/fleet_server/data_stream/output_health_logs/fields/fields.yml b/packages/fleet_server/data_stream/output_health_logs/fields/fields.yml
new file mode 100644
index 00000000000..94ad0ae5288
--- /dev/null
+++ b/packages/fleet_server/data_stream/output_health_logs/fields/fields.yml
@@ -0,0 +1,6 @@
+- name: output
+  type: keyword
+- name: state
+  type: keyword
+- name: message
+  type: text
\ No newline at end of file
diff --git a/packages/fleet_server/data_stream/output_health_logs/lifecycle.yml b/packages/fleet_server/data_stream/output_health_logs/lifecycle.yml
new file mode 100644
index 00000000000..9a2cb186ccb
--- /dev/null
+++ b/packages/fleet_server/data_stream/output_health_logs/lifecycle.yml
@@ -0,0 +1 @@
+data_retention: "7d"
\ No newline at end of file
diff --git a/packages/fleet_server/data_stream/output_health_logs/manifest.yml b/packages/fleet_server/data_stream/output_health_logs/manifest.yml
new file mode 100644
index 00000000000..9c2fb80ac4f
--- /dev/null
+++ b/packages/fleet_server/data_stream/output_health_logs/manifest.yml
@@ -0,0 +1,8 @@
+title: Output Health
+dataset: fleet_server.output_health
+ilm_policy: logs-fleet_server.output_health_logs-default_policy
+type: logs
+elasticsearch:
+  index_template:
+    mappings:
+      dynamic: false
diff --git a/packages/fleet_server/manifest.yml b/packages/fleet_server/manifest.yml
index bf9550acd6e..315a74a15a6 100644
--- a/packages/fleet_server/manifest.yml
+++ b/packages/fleet_server/manifest.yml
@@ -1,6 +1,6 @@
 name: fleet_server
 title: Fleet Server
-version: 1.4.0
+version: 1.5.0
 description: Centrally manage Elastic Agents with the Fleet Server integration.
 type: integration
 format_version: 3.0.0

From ebc6f6ea2c20e19ea00ca67d5f2754d89452a390 Mon Sep 17 00:00:00 2001
From: Julia Bardi <julia.bardi@elastic.co>
Date: Wed, 29 Nov 2023 13:27:03 +0100
Subject: [PATCH 2/2] updated pull request link

---
 packages/fleet_server/changelog.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/fleet_server/changelog.yml b/packages/fleet_server/changelog.yml
index 29ad00324b6..d48bb5373ec 100644
--- a/packages/fleet_server/changelog.yml
+++ b/packages/fleet_server/changelog.yml
@@ -3,7 +3,7 @@
   changes:
     - description: Added new output health data stream
       type: enhancement
-      link: https://github.com/elastic/integrations/pull/9000
+      link: https://github.com/elastic/integrations/pull/8605
 - version: "1.4.0"
   changes:
     - description: Added new metrics data streams