From 1d18f55bd4e33f6d4b2c93bd2ad45e82bb1d4fd0 Mon Sep 17 00:00:00 2001
From: Josh Dover <1813008+joshdover@users.noreply.github.com>
Date: Fri, 18 Mar 2022 16:18:24 +0100
Subject: [PATCH] Add ecs.version to elastic_agent fields (#2844)

---
 packages/elastic_agent/changelog.yml                        | 6 ++++++
 .../data_stream/apm_server_logs/fields/ecs.yml              | 2 ++
 .../data_stream/apm_server_metrics/fields/ecs.yml           | 2 ++
 .../elastic_agent/data_stream/auditbeat_logs/fields/ecs.yml | 2 ++
 .../data_stream/auditbeat_metrics/fields/ecs.yml            | 2 ++
 .../data_stream/elastic_agent_logs/fields/ecs.yml           | 2 ++
 .../data_stream/elastic_agent_metrics/fields/ecs.yml        | 2 ++
 .../data_stream/endpoint_security_metrics/fields/ecs.yml    | 2 ++
 .../data_stream/endpoint_sercurity_logs/fields/ecs.yml      | 2 ++
 .../elastic_agent/data_stream/filebeat_logs/fields/ecs.yml  | 2 ++
 .../data_stream/filebeat_metrics/fields/ecs.yml             | 2 ++
 .../data_stream/fleet_server_logs/fields/ecs.yml            | 2 ++
 .../data_stream/fleet_server_metrics/fields/ecs.yml         | 2 ++
 .../elastic_agent/data_stream/heartbeat_logs/fields/ecs.yml | 2 ++
 .../data_stream/heartbeat_metrics/fields/ecs.yml            | 2 ++
 .../data_stream/metricbeat_logs/fields/ecs.yml              | 2 ++
 .../data_stream/metricbeat_metrics/fields/ecs.yml           | 2 ++
 .../data_stream/osquerybeat_logs/fields/ecs.yml             | 2 ++
 .../data_stream/osquerybeat_metrics/fields/ecs.yml          | 2 ++
 .../data_stream/packetbeat_logs/fields/ecs.yml              | 2 ++
 .../data_stream/packetbeat_metrics/fields/ecs.yml           | 2 ++
 packages/elastic_agent/manifest.yml                         | 2 +-
 22 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 packages/elastic_agent/data_stream/apm_server_metrics/fields/ecs.yml
 create mode 100644 packages/elastic_agent/data_stream/auditbeat_metrics/fields/ecs.yml
 create mode 100644 packages/elastic_agent/data_stream/elastic_agent_metrics/fields/ecs.yml
 create mode 100644 packages/elastic_agent/data_stream/endpoint_security_metrics/fields/ecs.yml
 create mode 100644 packages/elastic_agent/data_stream/filebeat_metrics/fields/ecs.yml
 create mode 100644 packages/elastic_agent/data_stream/fleet_server_metrics/fields/ecs.yml
 create mode 100644 packages/elastic_agent/data_stream/heartbeat_metrics/fields/ecs.yml
 create mode 100644 packages/elastic_agent/data_stream/metricbeat_metrics/fields/ecs.yml
 create mode 100644 packages/elastic_agent/data_stream/osquerybeat_metrics/fields/ecs.yml
 create mode 100644 packages/elastic_agent/data_stream/packetbeat_metrics/fields/ecs.yml

diff --git a/packages/elastic_agent/changelog.yml b/packages/elastic_agent/changelog.yml
index ad527d11d9c..b859ec2b3af 100644
--- a/packages/elastic_agent/changelog.yml
+++ b/packages/elastic_agent/changelog.yml
@@ -1,4 +1,10 @@
 # newer versions go on top
+- version: "1.3.1"
+  changes:
+    - description: Fix missing ecs.version mapping
+      type: bugfix
+      link: |
+        https://github.com/elastic/integrations/pull/2844
 - version: "1.3.0"
   changes:
     - description: Update compatibility of package to be compatible with 8.0.x
diff --git a/packages/elastic_agent/data_stream/apm_server_logs/fields/ecs.yml b/packages/elastic_agent/data_stream/apm_server_logs/fields/ecs.yml
index 0c274af0712..fcdde864586 100644
--- a/packages/elastic_agent/data_stream/apm_server_logs/fields/ecs.yml
+++ b/packages/elastic_agent/data_stream/apm_server_logs/fields/ecs.yml
@@ -1,3 +1,5 @@
+- external: ecs
+  name: ecs.version
 - name: log
   title: Log
   group: 2
diff --git a/packages/elastic_agent/data_stream/apm_server_metrics/fields/ecs.yml b/packages/elastic_agent/data_stream/apm_server_metrics/fields/ecs.yml
new file mode 100644
index 00000000000..32b642ce16c
--- /dev/null
+++ b/packages/elastic_agent/data_stream/apm_server_metrics/fields/ecs.yml
@@ -0,0 +1,2 @@
+- external: ecs
+  name: ecs.version
diff --git a/packages/elastic_agent/data_stream/auditbeat_logs/fields/ecs.yml b/packages/elastic_agent/data_stream/auditbeat_logs/fields/ecs.yml
index 0c274af0712..fcdde864586 100644
--- a/packages/elastic_agent/data_stream/auditbeat_logs/fields/ecs.yml
+++ b/packages/elastic_agent/data_stream/auditbeat_logs/fields/ecs.yml
@@ -1,3 +1,5 @@
+- external: ecs
+  name: ecs.version
 - name: log
   title: Log
   group: 2
diff --git a/packages/elastic_agent/data_stream/auditbeat_metrics/fields/ecs.yml b/packages/elastic_agent/data_stream/auditbeat_metrics/fields/ecs.yml
new file mode 100644
index 00000000000..32b642ce16c
--- /dev/null
+++ b/packages/elastic_agent/data_stream/auditbeat_metrics/fields/ecs.yml
@@ -0,0 +1,2 @@
+- external: ecs
+  name: ecs.version
diff --git a/packages/elastic_agent/data_stream/elastic_agent_logs/fields/ecs.yml b/packages/elastic_agent/data_stream/elastic_agent_logs/fields/ecs.yml
index 0c274af0712..fcdde864586 100644
--- a/packages/elastic_agent/data_stream/elastic_agent_logs/fields/ecs.yml
+++ b/packages/elastic_agent/data_stream/elastic_agent_logs/fields/ecs.yml
@@ -1,3 +1,5 @@
+- external: ecs
+  name: ecs.version
 - name: log
   title: Log
   group: 2
diff --git a/packages/elastic_agent/data_stream/elastic_agent_metrics/fields/ecs.yml b/packages/elastic_agent/data_stream/elastic_agent_metrics/fields/ecs.yml
new file mode 100644
index 00000000000..32b642ce16c
--- /dev/null
+++ b/packages/elastic_agent/data_stream/elastic_agent_metrics/fields/ecs.yml
@@ -0,0 +1,2 @@
+- external: ecs
+  name: ecs.version
diff --git a/packages/elastic_agent/data_stream/endpoint_security_metrics/fields/ecs.yml b/packages/elastic_agent/data_stream/endpoint_security_metrics/fields/ecs.yml
new file mode 100644
index 00000000000..32b642ce16c
--- /dev/null
+++ b/packages/elastic_agent/data_stream/endpoint_security_metrics/fields/ecs.yml
@@ -0,0 +1,2 @@
+- external: ecs
+  name: ecs.version
diff --git a/packages/elastic_agent/data_stream/endpoint_sercurity_logs/fields/ecs.yml b/packages/elastic_agent/data_stream/endpoint_sercurity_logs/fields/ecs.yml
index 0c274af0712..fcdde864586 100644
--- a/packages/elastic_agent/data_stream/endpoint_sercurity_logs/fields/ecs.yml
+++ b/packages/elastic_agent/data_stream/endpoint_sercurity_logs/fields/ecs.yml
@@ -1,3 +1,5 @@
+- external: ecs
+  name: ecs.version
 - name: log
   title: Log
   group: 2
diff --git a/packages/elastic_agent/data_stream/filebeat_logs/fields/ecs.yml b/packages/elastic_agent/data_stream/filebeat_logs/fields/ecs.yml
index 0c274af0712..fcdde864586 100644
--- a/packages/elastic_agent/data_stream/filebeat_logs/fields/ecs.yml
+++ b/packages/elastic_agent/data_stream/filebeat_logs/fields/ecs.yml
@@ -1,3 +1,5 @@
+- external: ecs
+  name: ecs.version
 - name: log
   title: Log
   group: 2
diff --git a/packages/elastic_agent/data_stream/filebeat_metrics/fields/ecs.yml b/packages/elastic_agent/data_stream/filebeat_metrics/fields/ecs.yml
new file mode 100644
index 00000000000..32b642ce16c
--- /dev/null
+++ b/packages/elastic_agent/data_stream/filebeat_metrics/fields/ecs.yml
@@ -0,0 +1,2 @@
+- external: ecs
+  name: ecs.version
diff --git a/packages/elastic_agent/data_stream/fleet_server_logs/fields/ecs.yml b/packages/elastic_agent/data_stream/fleet_server_logs/fields/ecs.yml
index 0c274af0712..fcdde864586 100644
--- a/packages/elastic_agent/data_stream/fleet_server_logs/fields/ecs.yml
+++ b/packages/elastic_agent/data_stream/fleet_server_logs/fields/ecs.yml
@@ -1,3 +1,5 @@
+- external: ecs
+  name: ecs.version
 - name: log
   title: Log
   group: 2
diff --git a/packages/elastic_agent/data_stream/fleet_server_metrics/fields/ecs.yml b/packages/elastic_agent/data_stream/fleet_server_metrics/fields/ecs.yml
new file mode 100644
index 00000000000..32b642ce16c
--- /dev/null
+++ b/packages/elastic_agent/data_stream/fleet_server_metrics/fields/ecs.yml
@@ -0,0 +1,2 @@
+- external: ecs
+  name: ecs.version
diff --git a/packages/elastic_agent/data_stream/heartbeat_logs/fields/ecs.yml b/packages/elastic_agent/data_stream/heartbeat_logs/fields/ecs.yml
index 0c274af0712..fcdde864586 100644
--- a/packages/elastic_agent/data_stream/heartbeat_logs/fields/ecs.yml
+++ b/packages/elastic_agent/data_stream/heartbeat_logs/fields/ecs.yml
@@ -1,3 +1,5 @@
+- external: ecs
+  name: ecs.version
 - name: log
   title: Log
   group: 2
diff --git a/packages/elastic_agent/data_stream/heartbeat_metrics/fields/ecs.yml b/packages/elastic_agent/data_stream/heartbeat_metrics/fields/ecs.yml
new file mode 100644
index 00000000000..32b642ce16c
--- /dev/null
+++ b/packages/elastic_agent/data_stream/heartbeat_metrics/fields/ecs.yml
@@ -0,0 +1,2 @@
+- external: ecs
+  name: ecs.version
diff --git a/packages/elastic_agent/data_stream/metricbeat_logs/fields/ecs.yml b/packages/elastic_agent/data_stream/metricbeat_logs/fields/ecs.yml
index 0c274af0712..fcdde864586 100644
--- a/packages/elastic_agent/data_stream/metricbeat_logs/fields/ecs.yml
+++ b/packages/elastic_agent/data_stream/metricbeat_logs/fields/ecs.yml
@@ -1,3 +1,5 @@
+- external: ecs
+  name: ecs.version
 - name: log
   title: Log
   group: 2
diff --git a/packages/elastic_agent/data_stream/metricbeat_metrics/fields/ecs.yml b/packages/elastic_agent/data_stream/metricbeat_metrics/fields/ecs.yml
new file mode 100644
index 00000000000..32b642ce16c
--- /dev/null
+++ b/packages/elastic_agent/data_stream/metricbeat_metrics/fields/ecs.yml
@@ -0,0 +1,2 @@
+- external: ecs
+  name: ecs.version
diff --git a/packages/elastic_agent/data_stream/osquerybeat_logs/fields/ecs.yml b/packages/elastic_agent/data_stream/osquerybeat_logs/fields/ecs.yml
index 0c274af0712..fcdde864586 100644
--- a/packages/elastic_agent/data_stream/osquerybeat_logs/fields/ecs.yml
+++ b/packages/elastic_agent/data_stream/osquerybeat_logs/fields/ecs.yml
@@ -1,3 +1,5 @@
+- external: ecs
+  name: ecs.version
 - name: log
   title: Log
   group: 2
diff --git a/packages/elastic_agent/data_stream/osquerybeat_metrics/fields/ecs.yml b/packages/elastic_agent/data_stream/osquerybeat_metrics/fields/ecs.yml
new file mode 100644
index 00000000000..32b642ce16c
--- /dev/null
+++ b/packages/elastic_agent/data_stream/osquerybeat_metrics/fields/ecs.yml
@@ -0,0 +1,2 @@
+- external: ecs
+  name: ecs.version
diff --git a/packages/elastic_agent/data_stream/packetbeat_logs/fields/ecs.yml b/packages/elastic_agent/data_stream/packetbeat_logs/fields/ecs.yml
index 0c274af0712..fcdde864586 100644
--- a/packages/elastic_agent/data_stream/packetbeat_logs/fields/ecs.yml
+++ b/packages/elastic_agent/data_stream/packetbeat_logs/fields/ecs.yml
@@ -1,3 +1,5 @@
+- external: ecs
+  name: ecs.version
 - name: log
   title: Log
   group: 2
diff --git a/packages/elastic_agent/data_stream/packetbeat_metrics/fields/ecs.yml b/packages/elastic_agent/data_stream/packetbeat_metrics/fields/ecs.yml
new file mode 100644
index 00000000000..32b642ce16c
--- /dev/null
+++ b/packages/elastic_agent/data_stream/packetbeat_metrics/fields/ecs.yml
@@ -0,0 +1,2 @@
+- external: ecs
+  name: ecs.version
diff --git a/packages/elastic_agent/manifest.yml b/packages/elastic_agent/manifest.yml
index 12ce101d029..fbbcc00ea96 100644
--- a/packages/elastic_agent/manifest.yml
+++ b/packages/elastic_agent/manifest.yml
@@ -1,6 +1,6 @@
 name: elastic_agent
 title: Elastic Agent
-version: 1.3.0
+version: 1.3.1
 release: ga
 description: Collect logs and metrics from Elastic Agents.
 type: integration