From 7e5cf69cbffa1fc154fc050cce660dd88401bfce Mon Sep 17 00:00:00 2001
From: Andrew Cholakian <andrewvc@elastic.co>
Date: Wed, 17 Aug 2022 16:18:03 -0500
Subject: [PATCH 1/5] Support new heartbeat 'state' fields

This is the mapping counterpart to https://github.com/elastic/beats/pull/30632

It adds supports for the new `state.*` fields
---
 packages/synthetics/changelog.yml             |  5 ++
 .../data_stream/browser/fields/common.yml     | 67 +++++++++++++++++++
 .../data_stream/http/fields/common.yml        | 67 +++++++++++++++++++
 .../data_stream/icmp/fields/common.yml        | 67 +++++++++++++++++++
 .../data_stream/tcp/fields/common.yml         | 67 +++++++++++++++++++
 packages/synthetics/manifest.yml              |  2 +-
 6 files changed, 274 insertions(+), 1 deletion(-)

diff --git a/packages/synthetics/changelog.yml b/packages/synthetics/changelog.yml
index 4a9ae9976f3..0e83f1be1c5 100644
--- a/packages/synthetics/changelog.yml
+++ b/packages/synthetics/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "0.11.0"
+  changes:
+    - description: Add support for new data used in future synthetics UI
+      type: enhancement
+      link: 
 - version: "0.10.2"
   changes:
     - description: Adjusts ids for project monitors and add playwright_options
diff --git a/packages/synthetics/data_stream/browser/fields/common.yml b/packages/synthetics/data_stream/browser/fields/common.yml
index 8c48667ce61..71c89b373be 100644
--- a/packages/synthetics/data_stream/browser/fields/common.yml
+++ b/packages/synthetics/data_stream/browser/fields/common.yml
@@ -90,3 +90,70 @@
         - name: name
           type: text
           description: Project name
+
+- key: state
+  title: "Monitor state"
+  description: state related fields
+  fields:
+    - name: state
+      type: group
+      description: "Present in the last event emitted during a check. If a monitor checks multiple endpoints, as is the case with `mode: all`."
+      fields:
+        - name: id
+          type: keyword
+          description: >
+            ID of this state
+        - name: started_at
+          type: date
+          description: >
+            First time state with this ID was seen
+        - name: duration_ms
+          type: date
+          description: >
+            Length of time this state has existed in millis
+        - name: status
+          type: keyword
+          description: >
+            The current status, "up", "down", or "flapping"
+            any state can change into flapping.
+        - name: checks
+          type: integer
+          description: total checks run
+        - name: up
+          type: integer
+          description: total up checks run
+        - name: down
+          type: integer
+          description: total down checks run
+        - name: flap_history
+          enabled: false
+    - name: ends
+      type: group
+      description: the state that was ended by this state
+      fields:
+         - name: id
+           type: integer
+           description: >
+              ID of this state
+         - name: started_at
+           type: date
+           description: >
+              First time state with this ID was seen
+         - name: duration_ms
+           type: date
+           description: >
+             Length of time this state has existed in millis
+         - name: status
+           type: keyword
+           description: >
+             The current status, "up", "down", or "flapping"
+             any state can change into flapping.
+         - name: checks
+           type: integer
+           description: total checks run
+         - name: up
+           type: integer
+           description: total up checks run
+         - name: down
+           type: integer
+           description: total down checks run
\ No newline at end of file
diff --git a/packages/synthetics/data_stream/http/fields/common.yml b/packages/synthetics/data_stream/http/fields/common.yml
index 133670b9eaf..2e2f565eb12 100644
--- a/packages/synthetics/data_stream/http/fields/common.yml
+++ b/packages/synthetics/data_stream/http/fields/common.yml
@@ -90,3 +90,70 @@
         - name: name
           type: text
           description: Project name
+
+- key: state
+  title: "Monitor state"
+  description: state related fields
+  fields:
+    - name: state
+      type: group
+      description: "Present in the last event emitted during a check. If a monitor checks multiple endpoints, as is the case with `mode: all`."
+      fields:
+        - name: id
+          type: keyword
+          description: >
+            ID of this state
+        - name: started_at
+          type: date
+          description: >
+            First time state with this ID was seen
+        - name: duration_ms
+          type: date
+          description: >
+            Length of time this state has existed in millis
+        - name: status
+          type: keyword
+          description: >
+            The current status, "up", "down", or "flapping"
+            any state can change into flapping.
+        - name: checks
+          type: integer
+          description: total checks run
+        - name: up
+          type: integer
+          description: total up checks run
+        - name: down
+          type: integer
+          description: total down checks run
+        - name: flap_history
+          enabled: false
+    - name: ends
+      type: group
+      description: the state that was ended by this state
+      fields:
+         - name: id
+           type: integer
+           description: >
+              ID of this state
+         - name: started_at
+           type: date
+           description: >
+              First time state with this ID was seen
+         - name: duration_ms
+           type: date
+           description: >
+             Length of time this state has existed in millis
+         - name: status
+           type: keyword
+           description: >
+             The current status, "up", "down", or "flapping"
+             any state can change into flapping.
+         - name: checks
+           type: integer
+           description: total checks run
+         - name: up
+           type: integer
+           description: total up checks run
+         - name: down
+           type: integer
+           description: total down checks run
\ No newline at end of file
diff --git a/packages/synthetics/data_stream/icmp/fields/common.yml b/packages/synthetics/data_stream/icmp/fields/common.yml
index c6437774edb..548a05cca07 100644
--- a/packages/synthetics/data_stream/icmp/fields/common.yml
+++ b/packages/synthetics/data_stream/icmp/fields/common.yml
@@ -90,3 +90,70 @@
         - name: name
           type: text
           description: Project name
+
+- key: state
+  title: "Monitor state"
+  description: state related fields
+  fields:
+    - name: state
+      type: group
+      description: "Present in the last event emitted during a check. If a monitor checks multiple endpoints, as is the case with `mode: all`."
+      fields:
+        - name: id
+          type: keyword
+          description: >
+            ID of this state
+        - name: started_at
+          type: date
+          description: >
+            First time state with this ID was seen
+        - name: duration_ms
+          type: date
+          description: >
+            Length of time this state has existed in millis
+        - name: status
+          type: keyword
+          description: >
+            The current status, "up", "down", or "flapping"
+            any state can change into flapping.
+        - name: checks
+          type: integer
+          description: total checks run
+        - name: up
+          type: integer
+          description: total up checks run
+        - name: down
+          type: integer
+          description: total down checks run
+        - name: flap_history
+          enabled: false
+    - name: ends
+      type: group
+      description: the state that was ended by this state
+      fields:
+         - name: id
+           type: integer
+           description: >
+              ID of this state
+         - name: started_at
+           type: date
+           description: >
+              First time state with this ID was seen
+         - name: duration_ms
+           type: date
+           description: >
+             Length of time this state has existed in millis
+         - name: status
+           type: keyword
+           description: >
+             The current status, "up", "down", or "flapping"
+             any state can change into flapping.
+         - name: checks
+           type: integer
+           description: total checks run
+         - name: up
+           type: integer
+           description: total up checks run
+         - name: down
+           type: integer
+           description: total down checks run
\ No newline at end of file
diff --git a/packages/synthetics/data_stream/tcp/fields/common.yml b/packages/synthetics/data_stream/tcp/fields/common.yml
index a628334f0f9..ab12abd791f 100644
--- a/packages/synthetics/data_stream/tcp/fields/common.yml
+++ b/packages/synthetics/data_stream/tcp/fields/common.yml
@@ -90,3 +90,70 @@
         - name: name
           type: text
           description: Project name
+
+- key: state
+  title: "Monitor state"
+  description: state related fields
+  fields:
+    - name: state
+      type: group
+      description: "Present in the last event emitted during a check. If a monitor checks multiple endpoints, as is the case with `mode: all`."
+      fields:
+        - name: id
+          type: keyword
+          description: >
+            ID of this state
+        - name: started_at
+          type: date
+          description: >
+            First time state with this ID was seen
+        - name: duration_ms
+          type: date
+          description: >
+            Length of time this state has existed in millis
+        - name: status
+          type: keyword
+          description: >
+            The current status, "up", "down", or "flapping"
+            any state can change into flapping.
+        - name: checks
+          type: integer
+          description: total checks run
+        - name: up
+          type: integer
+          description: total up checks run
+        - name: down
+          type: integer
+          description: total down checks run
+        - name: flap_history
+          enabled: false
+    - name: ends
+      type: group
+      description: the state that was ended by this state
+      fields:
+         - name: id
+           type: integer
+           description: >
+              ID of this state
+         - name: started_at
+           type: date
+           description: >
+              First time state with this ID was seen
+         - name: duration_ms
+           type: date
+           description: >
+             Length of time this state has existed in millis
+         - name: status
+           type: keyword
+           description: >
+             The current status, "up", "down", or "flapping"
+             any state can change into flapping.
+         - name: checks
+           type: integer
+           description: total checks run
+         - name: up
+           type: integer
+           description: total up checks run
+         - name: down
+           type: integer
+           description: total down checks run
\ No newline at end of file
diff --git a/packages/synthetics/manifest.yml b/packages/synthetics/manifest.yml
index a7973f479fa..2d826e36a53 100644
--- a/packages/synthetics/manifest.yml
+++ b/packages/synthetics/manifest.yml
@@ -2,7 +2,7 @@ format_version: 1.0.0
 name: synthetics
 title: Elastic Synthetics
 description: Monitor the availability of your services with Elastic Synthetics.
-version: 0.10.2
+version: 0.11.0
 categories: ["elastic_stack", "monitoring", "web"]
 release: beta
 type: integration

From cc21e6dc12dca447402ee77452129d6ec4c9c708 Mon Sep 17 00:00:00 2001
From: Andrew Cholakian <andrewvc@elastic.co>
Date: Wed, 17 Aug 2022 16:20:13 -0500
Subject: [PATCH 2/5] Add changelog link

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

diff --git a/packages/synthetics/changelog.yml b/packages/synthetics/changelog.yml
index 0e83f1be1c5..0fb4409fcd9 100644
--- a/packages/synthetics/changelog.yml
+++ b/packages/synthetics/changelog.yml
@@ -3,7 +3,7 @@
   changes:
     - description: Add support for new data used in future synthetics UI
       type: enhancement
-      link: 
+      link: https://github.com/elastic/integrations/pull/4023
 - version: "0.10.2"
   changes:
     - description: Adjusts ids for project monitors and add playwright_options

From dd34263d87310cdb244e1c162bd18472ad09ed32 Mon Sep 17 00:00:00 2001
From: Andrew Cholakian <andrewvc@elastic.co>
Date: Wed, 17 Aug 2022 17:52:31 -0500
Subject: [PATCH 3/5] Fix nesting of state.ends

---
 .../data_stream/browser/fields/common.yml     | 60 +++++++++----------
 .../data_stream/http/fields/common.yml        | 60 +++++++++----------
 .../data_stream/icmp/fields/common.yml        | 60 +++++++++----------
 .../data_stream/tcp/fields/common.yml         | 60 +++++++++----------
 4 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/packages/synthetics/data_stream/browser/fields/common.yml b/packages/synthetics/data_stream/browser/fields/common.yml
index 71c89b373be..59b1b3d507f 100644
--- a/packages/synthetics/data_stream/browser/fields/common.yml
+++ b/packages/synthetics/data_stream/browser/fields/common.yml
@@ -127,33 +127,33 @@
           description: total down checks run
         - name: flap_history
           enabled: false
-    - name: ends
-      type: group
-      description: the state that was ended by this state
-      fields:
-         - name: id
-           type: integer
-           description: >
-              ID of this state
-         - name: started_at
-           type: date
-           description: >
-              First time state with this ID was seen
-         - name: duration_ms
-           type: date
-           description: >
-             Length of time this state has existed in millis
-         - name: status
-           type: keyword
-           description: >
-             The current status, "up", "down", or "flapping"
-             any state can change into flapping.
-         - name: checks
-           type: integer
-           description: total checks run
-         - name: up
-           type: integer
-           description: total up checks run
-         - name: down
-           type: integer
-           description: total down checks run
\ No newline at end of file
+        - name: ends
+          type: object
+          description: the state that was ended by this state
+          fields:
+            - name: id
+              type: integer
+              description: >
+                  ID of this state
+            - name: started_at
+              type: date
+              description: >
+                  First time state with this ID was seen
+            - name: duration_ms
+              type: date
+              description: >
+                Length of time this state has existed in millis
+            - name: status
+              type: keyword
+              description: >
+                The current status, "up", "down", or "flapping"
+                any state can change into flapping.
+            - name: checks
+              type: integer
+              description: total checks run
+            - name: up
+              type: integer
+              description: total up checks run
+            - name: down
+              type: integer
+              description: total down checks run
\ No newline at end of file
diff --git a/packages/synthetics/data_stream/http/fields/common.yml b/packages/synthetics/data_stream/http/fields/common.yml
index 2e2f565eb12..80ad8b74203 100644
--- a/packages/synthetics/data_stream/http/fields/common.yml
+++ b/packages/synthetics/data_stream/http/fields/common.yml
@@ -127,33 +127,33 @@
           description: total down checks run
         - name: flap_history
           enabled: false
-    - name: ends
-      type: group
-      description: the state that was ended by this state
-      fields:
-         - name: id
-           type: integer
-           description: >
-              ID of this state
-         - name: started_at
-           type: date
-           description: >
-              First time state with this ID was seen
-         - name: duration_ms
-           type: date
-           description: >
-             Length of time this state has existed in millis
-         - name: status
-           type: keyword
-           description: >
-             The current status, "up", "down", or "flapping"
-             any state can change into flapping.
-         - name: checks
-           type: integer
-           description: total checks run
-         - name: up
-           type: integer
-           description: total up checks run
-         - name: down
-           type: integer
-           description: total down checks run
\ No newline at end of file
+        - name: ends
+          type: object
+          description: the state that was ended by this state
+          fields:
+            - name: id
+              type: integer
+              description: >
+                  ID of this state
+            - name: started_at
+              type: date
+              description: >
+                  First time state with this ID was seen
+            - name: duration_ms
+              type: date
+              description: >
+                Length of time this state has existed in millis
+            - name: status
+              type: keyword
+              description: >
+                The current status, "up", "down", or "flapping"
+                any state can change into flapping.
+            - name: checks
+              type: integer
+              description: total checks run
+            - name: up
+              type: integer
+              description: total up checks run
+            - name: down
+              type: integer
+              description: total down checks run
\ No newline at end of file
diff --git a/packages/synthetics/data_stream/icmp/fields/common.yml b/packages/synthetics/data_stream/icmp/fields/common.yml
index 548a05cca07..07bc033d55c 100644
--- a/packages/synthetics/data_stream/icmp/fields/common.yml
+++ b/packages/synthetics/data_stream/icmp/fields/common.yml
@@ -127,33 +127,33 @@
           description: total down checks run
         - name: flap_history
           enabled: false
-    - name: ends
-      type: group
-      description: the state that was ended by this state
-      fields:
-         - name: id
-           type: integer
-           description: >
-              ID of this state
-         - name: started_at
-           type: date
-           description: >
-              First time state with this ID was seen
-         - name: duration_ms
-           type: date
-           description: >
-             Length of time this state has existed in millis
-         - name: status
-           type: keyword
-           description: >
-             The current status, "up", "down", or "flapping"
-             any state can change into flapping.
-         - name: checks
-           type: integer
-           description: total checks run
-         - name: up
-           type: integer
-           description: total up checks run
-         - name: down
-           type: integer
-           description: total down checks run
\ No newline at end of file
+        - name: ends
+          type: object
+          description: the state that was ended by this state
+          fields:
+            - name: id
+              type: integer
+              description: >
+                  ID of this state
+            - name: started_at
+              type: date
+              description: >
+                  First time state with this ID was seen
+            - name: duration_ms
+              type: date
+              description: >
+                Length of time this state has existed in millis
+            - name: status
+              type: keyword
+              description: >
+                The current status, "up", "down", or "flapping"
+                any state can change into flapping.
+            - name: checks
+              type: integer
+              description: total checks run
+            - name: up
+              type: integer
+              description: total up checks run
+            - name: down
+              type: integer
+              description: total down checks run
\ No newline at end of file
diff --git a/packages/synthetics/data_stream/tcp/fields/common.yml b/packages/synthetics/data_stream/tcp/fields/common.yml
index ab12abd791f..6c34c3dd924 100644
--- a/packages/synthetics/data_stream/tcp/fields/common.yml
+++ b/packages/synthetics/data_stream/tcp/fields/common.yml
@@ -127,33 +127,33 @@
           description: total down checks run
         - name: flap_history
           enabled: false
-    - name: ends
-      type: group
-      description: the state that was ended by this state
-      fields:
-         - name: id
-           type: integer
-           description: >
-              ID of this state
-         - name: started_at
-           type: date
-           description: >
-              First time state with this ID was seen
-         - name: duration_ms
-           type: date
-           description: >
-             Length of time this state has existed in millis
-         - name: status
-           type: keyword
-           description: >
-             The current status, "up", "down", or "flapping"
-             any state can change into flapping.
-         - name: checks
-           type: integer
-           description: total checks run
-         - name: up
-           type: integer
-           description: total up checks run
-         - name: down
-           type: integer
-           description: total down checks run
\ No newline at end of file
+        - name: ends
+          type: object
+          description: the state that was ended by this state
+          fields:
+            - name: id
+              type: integer
+              description: >
+                  ID of this state
+            - name: started_at
+              type: date
+              description: >
+                  First time state with this ID was seen
+            - name: duration_ms
+              type: date
+              description: >
+                Length of time this state has existed in millis
+            - name: status
+              type: keyword
+              description: >
+                The current status, "up", "down", or "flapping"
+                any state can change into flapping.
+            - name: checks
+              type: integer
+              description: total checks run
+            - name: up
+              type: integer
+              description: total up checks run
+            - name: down
+              type: integer
+              description: total down checks run
\ No newline at end of file

From ebecb8e578a1abbae29880edf23f00744e69697b Mon Sep 17 00:00:00 2001
From: Andrew Cholakian <andrewvc@elastic.co>
Date: Wed, 17 Aug 2022 18:23:43 -0500
Subject: [PATCH 4/5] Format

---
 .../data_stream/browser/fields/common.yml     | 21 ++++++++++++-------
 .../data_stream/http/fields/common.yml        | 21 ++++++++++++-------
 .../data_stream/icmp/fields/common.yml        | 21 ++++++++++++-------
 .../data_stream/tcp/fields/common.yml         | 21 ++++++++++++-------
 4 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/packages/synthetics/data_stream/browser/fields/common.yml b/packages/synthetics/data_stream/browser/fields/common.yml
index 59b1b3d507f..85e60fa38f7 100644
--- a/packages/synthetics/data_stream/browser/fields/common.yml
+++ b/packages/synthetics/data_stream/browser/fields/common.yml
@@ -90,7 +90,6 @@
         - name: name
           type: text
           description: Project name
-
 - key: state
   title: "Monitor state"
   description: state related fields
@@ -103,19 +102,22 @@
           type: keyword
           description: >
             ID of this state
+
         - name: started_at
           type: date
           description: >
             First time state with this ID was seen
+
         - name: duration_ms
           type: date
           description: >
             Length of time this state has existed in millis
+
         - name: status
           type: keyword
           description: >
-            The current status, "up", "down", or "flapping"
-            any state can change into flapping.
+            The current status, "up", "down", or "flapping" any state can change into flapping.
+
         - name: checks
           type: integer
           description: total checks run
@@ -134,20 +136,23 @@
             - name: id
               type: integer
               description: >
-                  ID of this state
+                ID of this state
+
             - name: started_at
               type: date
               description: >
-                  First time state with this ID was seen
+                First time state with this ID was seen
+
             - name: duration_ms
               type: date
               description: >
                 Length of time this state has existed in millis
+
             - name: status
               type: keyword
               description: >
-                The current status, "up", "down", or "flapping"
-                any state can change into flapping.
+                The current status, "up", "down", or "flapping" any state can change into flapping.
+
             - name: checks
               type: integer
               description: total checks run
@@ -156,4 +161,4 @@
               description: total up checks run
             - name: down
               type: integer
-              description: total down checks run
\ No newline at end of file
+              description: total down checks run
diff --git a/packages/synthetics/data_stream/http/fields/common.yml b/packages/synthetics/data_stream/http/fields/common.yml
index 80ad8b74203..566877e03e1 100644
--- a/packages/synthetics/data_stream/http/fields/common.yml
+++ b/packages/synthetics/data_stream/http/fields/common.yml
@@ -90,7 +90,6 @@
         - name: name
           type: text
           description: Project name
-
 - key: state
   title: "Monitor state"
   description: state related fields
@@ -103,19 +102,22 @@
           type: keyword
           description: >
             ID of this state
+
         - name: started_at
           type: date
           description: >
             First time state with this ID was seen
+
         - name: duration_ms
           type: date
           description: >
             Length of time this state has existed in millis
+
         - name: status
           type: keyword
           description: >
-            The current status, "up", "down", or "flapping"
-            any state can change into flapping.
+            The current status, "up", "down", or "flapping" any state can change into flapping.
+
         - name: checks
           type: integer
           description: total checks run
@@ -134,20 +136,23 @@
             - name: id
               type: integer
               description: >
-                  ID of this state
+                ID of this state
+
             - name: started_at
               type: date
               description: >
-                  First time state with this ID was seen
+                First time state with this ID was seen
+
             - name: duration_ms
               type: date
               description: >
                 Length of time this state has existed in millis
+
             - name: status
               type: keyword
               description: >
-                The current status, "up", "down", or "flapping"
-                any state can change into flapping.
+                The current status, "up", "down", or "flapping" any state can change into flapping.
+
             - name: checks
               type: integer
               description: total checks run
@@ -156,4 +161,4 @@
               description: total up checks run
             - name: down
               type: integer
-              description: total down checks run
\ No newline at end of file
+              description: total down checks run
diff --git a/packages/synthetics/data_stream/icmp/fields/common.yml b/packages/synthetics/data_stream/icmp/fields/common.yml
index 07bc033d55c..df671bdd43f 100644
--- a/packages/synthetics/data_stream/icmp/fields/common.yml
+++ b/packages/synthetics/data_stream/icmp/fields/common.yml
@@ -90,7 +90,6 @@
         - name: name
           type: text
           description: Project name
-
 - key: state
   title: "Monitor state"
   description: state related fields
@@ -103,19 +102,22 @@
           type: keyword
           description: >
             ID of this state
+
         - name: started_at
           type: date
           description: >
             First time state with this ID was seen
+
         - name: duration_ms
           type: date
           description: >
             Length of time this state has existed in millis
+
         - name: status
           type: keyword
           description: >
-            The current status, "up", "down", or "flapping"
-            any state can change into flapping.
+            The current status, "up", "down", or "flapping" any state can change into flapping.
+
         - name: checks
           type: integer
           description: total checks run
@@ -134,20 +136,23 @@
             - name: id
               type: integer
               description: >
-                  ID of this state
+                ID of this state
+
             - name: started_at
               type: date
               description: >
-                  First time state with this ID was seen
+                First time state with this ID was seen
+
             - name: duration_ms
               type: date
               description: >
                 Length of time this state has existed in millis
+
             - name: status
               type: keyword
               description: >
-                The current status, "up", "down", or "flapping"
-                any state can change into flapping.
+                The current status, "up", "down", or "flapping" any state can change into flapping.
+
             - name: checks
               type: integer
               description: total checks run
@@ -156,4 +161,4 @@
               description: total up checks run
             - name: down
               type: integer
-              description: total down checks run
\ No newline at end of file
+              description: total down checks run
diff --git a/packages/synthetics/data_stream/tcp/fields/common.yml b/packages/synthetics/data_stream/tcp/fields/common.yml
index 6c34c3dd924..fc6652a9cbd 100644
--- a/packages/synthetics/data_stream/tcp/fields/common.yml
+++ b/packages/synthetics/data_stream/tcp/fields/common.yml
@@ -90,7 +90,6 @@
         - name: name
           type: text
           description: Project name
-
 - key: state
   title: "Monitor state"
   description: state related fields
@@ -103,19 +102,22 @@
           type: keyword
           description: >
             ID of this state
+
         - name: started_at
           type: date
           description: >
             First time state with this ID was seen
+
         - name: duration_ms
           type: date
           description: >
             Length of time this state has existed in millis
+
         - name: status
           type: keyword
           description: >
-            The current status, "up", "down", or "flapping"
-            any state can change into flapping.
+            The current status, "up", "down", or "flapping" any state can change into flapping.
+
         - name: checks
           type: integer
           description: total checks run
@@ -134,20 +136,23 @@
             - name: id
               type: integer
               description: >
-                  ID of this state
+                ID of this state
+
             - name: started_at
               type: date
               description: >
-                  First time state with this ID was seen
+                First time state with this ID was seen
+
             - name: duration_ms
               type: date
               description: >
                 Length of time this state has existed in millis
+
             - name: status
               type: keyword
               description: >
-                The current status, "up", "down", or "flapping"
-                any state can change into flapping.
+                The current status, "up", "down", or "flapping" any state can change into flapping.
+
             - name: checks
               type: integer
               description: total checks run
@@ -156,4 +161,4 @@
               description: total up checks run
             - name: down
               type: integer
-              description: total down checks run
\ No newline at end of file
+              description: total down checks run

From 53552c460556ca9aa4992f8ebcb3a865d2517ada Mon Sep 17 00:00:00 2001
From: Andrew Cholakian <andrewvc@elastic.co>
Date: Thu, 18 Aug 2022 07:09:38 -0500
Subject: [PATCH 5/5] Omit top-level key

---
 .../data_stream/browser/fields/common.yml     | 80 +++++++++----------
 .../data_stream/http/fields/common.yml        | 80 +++++++++----------
 .../data_stream/icmp/fields/common.yml        | 80 +++++++++----------
 .../data_stream/tcp/fields/common.yml         | 80 +++++++++----------
 4 files changed, 152 insertions(+), 168 deletions(-)

diff --git a/packages/synthetics/data_stream/browser/fields/common.yml b/packages/synthetics/data_stream/browser/fields/common.yml
index 85e60fa38f7..4b1a93ef8db 100644
--- a/packages/synthetics/data_stream/browser/fields/common.yml
+++ b/packages/synthetics/data_stream/browser/fields/common.yml
@@ -90,16 +90,47 @@
         - name: name
           type: text
           description: Project name
-- key: state
-  title: "Monitor state"
-  description: state related fields
+- name: state
+  type: group
+  description: "Present in the last event emitted during a check. If a monitor checks multiple endpoints, as is the case with `mode: all`."
   fields:
-    - name: state
-      type: group
-      description: "Present in the last event emitted during a check. If a monitor checks multiple endpoints, as is the case with `mode: all`."
+    - name: id
+      type: keyword
+      description: >
+        ID of this state
+
+    - name: started_at
+      type: date
+      description: >
+        First time state with this ID was seen
+
+    - name: duration_ms
+      type: date
+      description: >
+        Length of time this state has existed in millis
+
+    - name: status
+      type: keyword
+      description: >
+        The current status, "up", "down", or "flapping" any state can change into flapping.
+
+    - name: checks
+      type: integer
+      description: total checks run
+    - name: up
+      type: integer
+      description: total up checks run
+    - name: down
+      type: integer
+      description: total down checks run
+    - name: flap_history
+      enabled: false
+    - name: ends
+      type: object
+      description: the state that was ended by this state
       fields:
         - name: id
-          type: keyword
+          type: integer
           description: >
             ID of this state
 
@@ -127,38 +158,3 @@
         - name: down
           type: integer
           description: total down checks run
-        - name: flap_history
-          enabled: false
-        - name: ends
-          type: object
-          description: the state that was ended by this state
-          fields:
-            - name: id
-              type: integer
-              description: >
-                ID of this state
-
-            - name: started_at
-              type: date
-              description: >
-                First time state with this ID was seen
-
-            - name: duration_ms
-              type: date
-              description: >
-                Length of time this state has existed in millis
-
-            - name: status
-              type: keyword
-              description: >
-                The current status, "up", "down", or "flapping" any state can change into flapping.
-
-            - name: checks
-              type: integer
-              description: total checks run
-            - name: up
-              type: integer
-              description: total up checks run
-            - name: down
-              type: integer
-              description: total down checks run
diff --git a/packages/synthetics/data_stream/http/fields/common.yml b/packages/synthetics/data_stream/http/fields/common.yml
index 566877e03e1..56eb6e9cc01 100644
--- a/packages/synthetics/data_stream/http/fields/common.yml
+++ b/packages/synthetics/data_stream/http/fields/common.yml
@@ -90,16 +90,47 @@
         - name: name
           type: text
           description: Project name
-- key: state
-  title: "Monitor state"
-  description: state related fields
+- name: state
+  type: group
+  description: "Present in the last event emitted during a check. If a monitor checks multiple endpoints, as is the case with `mode: all`."
   fields:
-    - name: state
-      type: group
-      description: "Present in the last event emitted during a check. If a monitor checks multiple endpoints, as is the case with `mode: all`."
+    - name: id
+      type: keyword
+      description: >
+        ID of this state
+
+    - name: started_at
+      type: date
+      description: >
+        First time state with this ID was seen
+
+    - name: duration_ms
+      type: date
+      description: >
+        Length of time this state has existed in millis
+
+    - name: status
+      type: keyword
+      description: >
+        The current status, "up", "down", or "flapping" any state can change into flapping.
+
+    - name: checks
+      type: integer
+      description: total checks run
+    - name: up
+      type: integer
+      description: total up checks run
+    - name: down
+      type: integer
+      description: total down checks run
+    - name: flap_history
+      enabled: false
+    - name: ends
+      type: object
+      description: the state that was ended by this state
       fields:
         - name: id
-          type: keyword
+          type: integer
           description: >
             ID of this state
 
@@ -127,38 +158,3 @@
         - name: down
           type: integer
           description: total down checks run
-        - name: flap_history
-          enabled: false
-        - name: ends
-          type: object
-          description: the state that was ended by this state
-          fields:
-            - name: id
-              type: integer
-              description: >
-                ID of this state
-
-            - name: started_at
-              type: date
-              description: >
-                First time state with this ID was seen
-
-            - name: duration_ms
-              type: date
-              description: >
-                Length of time this state has existed in millis
-
-            - name: status
-              type: keyword
-              description: >
-                The current status, "up", "down", or "flapping" any state can change into flapping.
-
-            - name: checks
-              type: integer
-              description: total checks run
-            - name: up
-              type: integer
-              description: total up checks run
-            - name: down
-              type: integer
-              description: total down checks run
diff --git a/packages/synthetics/data_stream/icmp/fields/common.yml b/packages/synthetics/data_stream/icmp/fields/common.yml
index df671bdd43f..06973bb91d1 100644
--- a/packages/synthetics/data_stream/icmp/fields/common.yml
+++ b/packages/synthetics/data_stream/icmp/fields/common.yml
@@ -90,16 +90,47 @@
         - name: name
           type: text
           description: Project name
-- key: state
-  title: "Monitor state"
-  description: state related fields
+- name: state
+  type: group
+  description: "Present in the last event emitted during a check. If a monitor checks multiple endpoints, as is the case with `mode: all`."
   fields:
-    - name: state
-      type: group
-      description: "Present in the last event emitted during a check. If a monitor checks multiple endpoints, as is the case with `mode: all`."
+    - name: id
+      type: keyword
+      description: >
+        ID of this state
+
+    - name: started_at
+      type: date
+      description: >
+        First time state with this ID was seen
+
+    - name: duration_ms
+      type: date
+      description: >
+        Length of time this state has existed in millis
+
+    - name: status
+      type: keyword
+      description: >
+        The current status, "up", "down", or "flapping" any state can change into flapping.
+
+    - name: checks
+      type: integer
+      description: total checks run
+    - name: up
+      type: integer
+      description: total up checks run
+    - name: down
+      type: integer
+      description: total down checks run
+    - name: flap_history
+      enabled: false
+    - name: ends
+      type: object
+      description: the state that was ended by this state
       fields:
         - name: id
-          type: keyword
+          type: integer
           description: >
             ID of this state
 
@@ -127,38 +158,3 @@
         - name: down
           type: integer
           description: total down checks run
-        - name: flap_history
-          enabled: false
-        - name: ends
-          type: object
-          description: the state that was ended by this state
-          fields:
-            - name: id
-              type: integer
-              description: >
-                ID of this state
-
-            - name: started_at
-              type: date
-              description: >
-                First time state with this ID was seen
-
-            - name: duration_ms
-              type: date
-              description: >
-                Length of time this state has existed in millis
-
-            - name: status
-              type: keyword
-              description: >
-                The current status, "up", "down", or "flapping" any state can change into flapping.
-
-            - name: checks
-              type: integer
-              description: total checks run
-            - name: up
-              type: integer
-              description: total up checks run
-            - name: down
-              type: integer
-              description: total down checks run
diff --git a/packages/synthetics/data_stream/tcp/fields/common.yml b/packages/synthetics/data_stream/tcp/fields/common.yml
index fc6652a9cbd..e6d338cd3e7 100644
--- a/packages/synthetics/data_stream/tcp/fields/common.yml
+++ b/packages/synthetics/data_stream/tcp/fields/common.yml
@@ -90,16 +90,47 @@
         - name: name
           type: text
           description: Project name
-- key: state
-  title: "Monitor state"
-  description: state related fields
+- name: state
+  type: group
+  description: "Present in the last event emitted during a check. If a monitor checks multiple endpoints, as is the case with `mode: all`."
   fields:
-    - name: state
-      type: group
-      description: "Present in the last event emitted during a check. If a monitor checks multiple endpoints, as is the case with `mode: all`."
+    - name: id
+      type: keyword
+      description: >
+        ID of this state
+
+    - name: started_at
+      type: date
+      description: >
+        First time state with this ID was seen
+
+    - name: duration_ms
+      type: date
+      description: >
+        Length of time this state has existed in millis
+
+    - name: status
+      type: keyword
+      description: >
+        The current status, "up", "down", or "flapping" any state can change into flapping.
+
+    - name: checks
+      type: integer
+      description: total checks run
+    - name: up
+      type: integer
+      description: total up checks run
+    - name: down
+      type: integer
+      description: total down checks run
+    - name: flap_history
+      enabled: false
+    - name: ends
+      type: object
+      description: the state that was ended by this state
       fields:
         - name: id
-          type: keyword
+          type: integer
           description: >
             ID of this state
 
@@ -127,38 +158,3 @@
         - name: down
           type: integer
           description: total down checks run
-        - name: flap_history
-          enabled: false
-        - name: ends
-          type: object
-          description: the state that was ended by this state
-          fields:
-            - name: id
-              type: integer
-              description: >
-                ID of this state
-
-            - name: started_at
-              type: date
-              description: >
-                First time state with this ID was seen
-
-            - name: duration_ms
-              type: date
-              description: >
-                Length of time this state has existed in millis
-
-            - name: status
-              type: keyword
-              description: >
-                The current status, "up", "down", or "flapping" any state can change into flapping.
-
-            - name: checks
-              type: integer
-              description: total checks run
-            - name: up
-              type: integer
-              description: total up checks run
-            - name: down
-              type: integer
-              description: total down checks run