diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/apm_8.0.0/data.json.gz b/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/apm_8.0.0/data.json.gz
index 5b2f72512ab6c..f237a83a76a3f 100644
Binary files a/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/apm_8.0.0/data.json.gz and b/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/apm_8.0.0/data.json.gz differ
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/apm_8.0.0/mappings.json b/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/apm_8.0.0/mappings.json
index 9f84f4885c4ce..c7cbb55c32f9b 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/apm_8.0.0/mappings.json
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/apm_8.0.0/mappings.json
@@ -3,88 +3,101 @@
   "value": {
     "aliases": {
       ".kibana": {
+      },
+      ".kibana_8.0.0": {
       }
     },
     "index": ".kibana_1",
     "mappings": {
       "_meta": {
         "migrationMappingPropertyHashes": {
-          "action": "6e96ac5e648f57523879661ea72525b7",
-          "action_task_params": "a9d49f184ee89641044be0ca2950fa3a",
-          "alert": "0359d7fcc04da9878ee9aadbda38ba55",
+          "action": "38c91d092e0790ecd9ebe58e82145280",
+          "action_task_params": "0b7bac797714726291526b250c582806",
+          "alert": "d75d3b0e95fe394753d73d8f7952cd7d",
           "api_key_pending_invalidation": "16f515278a295f6245149ad7c5ddedb7",
           "apm-indices": "9bb9b2bf1fa636ed8619cbab5ce6a1dd",
+          "apm-server-schema": "b1d71908f324c17bf744ac72af5038fb",
           "apm-telemetry": "3d1b76c39bfb2cc8296b024d73854724",
           "app_search_telemetry": "3d1b76c39bfb2cc8296b024d73854724",
           "application_usage_daily": "43b8830d5d0df85a6823d290885fc9fd",
           "application_usage_totals": "3d1b76c39bfb2cc8296b024d73854724",
           "application_usage_transactional": "3d1b76c39bfb2cc8296b024d73854724",
-          "search-session": "404e2e2355a045f400c393e751445b42",
           "canvas-element": "7390014e1091044523666d97247392fc",
           "canvas-workpad": "b0a1706d356228dbdcb4a17e6b9eb231",
           "canvas-workpad-template": "ae2673f678281e2c055d764b153e9715",
-          "cases": "477f214ff61acc3af26a7b7818e380c1",
-          "cases-comments": "8a50736330e953bca91747723a319593",
-          "cases-configure": "387c5f3a3bda7e0ae0dd4e106f914a69",
-          "cases-user-actions": "32277330ec6b721abe3b846cfd939a71",
+          "cases": "d5d6a377dfebfacb1b806d8888292b05",
+          "cases-comments": "fce468d3d08e577b67af2e958e1f9e97",
+          "cases-configure": "c250ef0bf1ac86c1a1627c0b6398c98f",
+          "cases-connector-mappings": "17d2e9e0e170a21a471285a5d845353c",
+          "cases-user-actions": "25035423b7ceb4d4f1124c441d3f6529",
           "config": "c63748b75f39d0c54de12d12c1ccbc20",
           "core-usage-stats": "3d1b76c39bfb2cc8296b024d73854724",
+          "coreMigrationVersion": "2f4316de49999235636386fe51dc06c1",
           "dashboard": "40554caf09725935e2c02e02563a2d07",
           "endpoint:user-artifact": "4a11183eee21e6fbad864f7a30b39ad0",
           "endpoint:user-artifact-manifest": "a0d7b04ad405eed54d76e279c3727862",
           "enterprise_search_telemetry": "3d1b76c39bfb2cc8296b024d73854724",
-          "epm-packages": "2b83397e3eaaaa8ef15e38813f3721c3",
-          "exception-list": "67f055ab8c10abd7b2ebfd969b836788",
-          "exception-list-agnostic": "67f055ab8c10abd7b2ebfd969b836788",
-          "file-upload-telemetry": "0ed4d3e1983d1217a30982630897092e",
+          "epm-packages": "0cbbb16506734d341a96aaed65ec6413",
+          "epm-packages-assets": "44621b2f6052ef966da47b7c3a00f33b",
+          "event_loop_delays_daily": "5df7e292ddd5028e07c1482e130e6654",
+          "exception-list": "baf108c9934dda844921f692a513adae",
+          "exception-list-agnostic": "baf108c9934dda844921f692a513adae",
+          "file-upload-usage-collection-telemetry": "a34fbb8e3263d105044869264860c697",
           "fleet-agent-actions": "9511b565b1cc6441a42033db3d5de8e9",
-          "fleet-agent-events": "e20a508b6e805189356be381dbfac8db",
-          "fleet-agents": "cb661e8ede2b640c42c8e5ef99db0683",
+          "fleet-agents": "59fd74f819f028f8555776db198d2562",
           "fleet-enrollment-api-keys": "a69ef7ae661dab31561d6c6f052ef2a7",
-          "graph-workspace": "cd7ba1330e6682e9cc00b78850874be1",
+          "fleet-preconfiguration-deletion-record": "4c36f199189a367e43541f236141204c",
+          "graph-workspace": "27a94b2edcb0610c6aea54a7c56d7752",
           "index-pattern": "45915a1ad866812242df474eb0479052",
           "infrastructure-ui-source": "3d1b76c39bfb2cc8296b024d73854724",
-          "ingest-agent-policies": "8b0733cce189659593659dad8db426f0",
-          "ingest-outputs": "8854f34453a47e26f86a29f8f3b80b4e",
-          "ingest-package-policies": "c91ca97b1ff700f0fc64dc6b13d65a85",
-          "ingest_manager_settings": "02a03095f0e05b7a538fa801b88a217f",
+          "ingest-agent-policies": "5e91121a6b10c13d8b5339c2ff721e9b",
+          "ingest-outputs": "1acb789ca37cbee70259ca79e124d9ad",
+          "ingest-package-policies": "2bdb4dbeca0d8e7b9cf620548137c695",
+          "ingest_manager_settings": "f159646d76ab261bfbf8ef504d9631e4",
           "inventory-view": "3d1b76c39bfb2cc8296b024d73854724",
           "kql-telemetry": "d12a98a6f19a2d273696597547e064ee",
+          "legacy-url-alias": "e8dd3b6056ad7e1de32523f457310ecb",
           "lens": "52346cfec69ff7b47d5f0c12361a2797",
           "lens-ui-telemetry": "509bfa5978586998e05f9e303c07a327",
-          "map": "4a05b35c3a3a58fbc72dd0202dc3487f",
+          "map": "9134b47593116d7953f6adba096fc463",
           "maps-telemetry": "5ef305b18111b77789afefbd36b66171",
           "metrics-explorer-view": "3d1b76c39bfb2cc8296b024d73854724",
           "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
           "ml-job": "3bb64c31915acf93fc724af137a0891b",
-          "ml-telemetry": "257fd1d4b4fdbb9cb4b8a3b27da201e9",
+          "ml-module": "46ef4f0d6682636f0fff9799d6a2d7ac",
           "monitoring-telemetry": "2669d5ec15e82391cf58df4294ee9c68",
           "namespace": "2f4316de49999235636386fe51dc06c1",
           "namespaces": "2f4316de49999235636386fe51dc06c1",
           "originId": "2f4316de49999235636386fe51dc06c1",
+          "osquery-saved-query": "6bb1cf319f0fd2984010592ca1ee588e",
+          "osquery-usage-metric": "4dc4f647d27247c002f56f22742175fe",
           "query": "11aaeb7f5f7fa5bb43f25e18ce26e7d9",
           "references": "7997cf5a56cc02bdc9c93361bde732b0",
           "sample-data-telemetry": "7d3cfeb915303c9641c59681967ffeb4",
-          "search": "43012c7ebc4cb57054e0a490e4b43023",
+          "search": "db2c00e39b36f40930a3b9fc71c823e1",
+          "search-session": "c768de003a1212f3d9e51176d118f255",
           "search-telemetry": "3d1b76c39bfb2cc8296b024d73854724",
+          "security-rule": "8ae39a88fc70af3375b7050e8d8d5cc7",
+          "security-solution-signals-migration": "72761fd374ca11122ac8025a92b84fca",
           "siem-detection-engine-rule-actions": "6569b288c169539db10cb262bf79de18",
           "siem-detection-engine-rule-status": "ae783f41c6937db6b7a2ef5c93a9e9b0",
-          "siem-ui-timeline": "d12c5474364d737d17252acf1dc4585c",
+          "siem-ui-timeline": "3e97beae13cdfc6d62bc1846119f7276",
           "siem-ui-timeline-note": "8874706eedc49059d4cf0f5094559084",
           "siem-ui-timeline-pinned-event": "20638091112f0e14f0e443d512301c29",
           "space": "c5ca8acafa0beaa4d08d014a97b6bc6b",
           "spaces-usage-stats": "3d1b76c39bfb2cc8296b024d73854724",
           "tag": "83d55da58f6530f7055415717ec06474",
-          "telemetry": "36a616f7026dfa617d6655df850fe16d",
           "timelion-sheet": "9a2a2748877c7a7b582fef201ab1d4cf",
-          "tsvb-validation-telemetry": "3a37ef6c8700ae6fc97d5c7da00e9215",
           "type": "2f4316de49999235636386fe51dc06c1",
+          "ui-counter": "0d409297dc5ebe1e3a1da691c6ee32e3",
           "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3",
           "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
+          "upgrade-assistant-ml-upgrade-operation": "ece1011519ca8fd057364605744d75ac",
           "upgrade-assistant-reindex-operation": "215107c281839ea9b3ad5f6419819763",
-          "upgrade-assistant-telemetry": "56702cec857e0a9dacfb696655b4ff7b",
+          "upgrade-assistant-telemetry": "8169c8bdd753da18d887e038aeb5cbc4",
           "uptime-dynamic-settings": "3d1b76c39bfb2cc8296b024d73854724",
           "url": "c7f66a0df8b1b52f17c28c4adb111105",
+          "usage-counters": "8cc260bdceffec4ffc3ad165c97dc1b4",
           "visualization": "f819cf6636b75c9e76ba733a0c6ef355",
           "workplace_search_telemetry": "3d1b76c39bfb2cc8296b024d73854724"
         }
@@ -100,6 +113,9 @@
               "enabled": false,
               "type": "object"
             },
+            "isMissingSecrets": {
+              "type": "boolean"
+            },
             "name": {
               "fields": {
                 "keyword": {
@@ -124,6 +140,10 @@
             "params": {
               "enabled": false,
               "type": "object"
+            },
+            "relatedSavedObjects": {
+              "enabled": false,
+              "type": "object"
             }
           }
         },
@@ -209,9 +229,12 @@
               },
               "type": "text"
             },
+            "notifyWhen": {
+              "type": "keyword"
+            },
             "params": {
-              "enabled": false,
-              "type": "object"
+              "ignore_above": 4096,
+              "type": "flattened"
             },
             "schedule": {
               "properties": {
@@ -273,6 +296,14 @@
             }
           }
         },
+        "apm-server-schema": {
+          "properties": {
+            "schemaJson": {
+              "index": false,
+              "type": "text"
+            }
+          }
+        },
         "apm-telemetry": {
           "dynamic": "false",
           "type": "object"
@@ -297,40 +328,6 @@
           "dynamic": "false",
           "type": "object"
         },
-        "search-session": {
-          "properties": {
-            "appId": {
-              "type": "keyword"
-            },
-            "created": {
-              "type": "date"
-            },
-            "expires": {
-              "type": "date"
-            },
-            "idMapping": {
-              "enabled": false,
-              "type": "object"
-            },
-            "initialState": {
-              "enabled": false,
-              "type": "object"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "restoreState": {
-              "enabled": false,
-              "type": "object"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "urlGeneratorId": {
-              "type": "keyword"
-            }
-          }
-        },
         "canvas-element": {
           "dynamic": "false",
           "properties": {
@@ -505,6 +502,16 @@
                 }
               }
             },
+            "owner": {
+              "type": "keyword"
+            },
+            "settings": {
+              "properties": {
+                "syncAlerts": {
+                  "type": "boolean"
+                }
+              }
+            },
             "status": {
               "type": "keyword"
             },
@@ -514,6 +521,9 @@
             "title": {
               "type": "keyword"
             },
+            "type": {
+              "type": "keyword"
+            },
             "updated_at": {
               "type": "date"
             },
@@ -534,9 +544,30 @@
         },
         "cases-comments": {
           "properties": {
+            "actions": {
+              "properties": {
+                "targets": {
+                  "properties": {
+                    "endpointId": {
+                      "type": "keyword"
+                    },
+                    "hostname": {
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "nested"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
             "alertId": {
               "type": "keyword"
             },
+            "associationType": {
+              "type": "keyword"
+            },
             "comment": {
               "type": "text"
             },
@@ -559,6 +590,9 @@
             "index": {
               "type": "keyword"
             },
+            "owner": {
+              "type": "keyword"
+            },
             "pushed_at": {
               "type": "date"
             },
@@ -575,6 +609,16 @@
                 }
               }
             },
+            "rule": {
+              "properties": {
+                "id": {
+                  "type": "keyword"
+                },
+                "name": {
+                  "type": "keyword"
+                }
+              }
+            },
             "type": {
               "type": "keyword"
             },
@@ -640,6 +684,9 @@
                 }
               }
             },
+            "owner": {
+              "type": "keyword"
+            },
             "updated_at": {
               "type": "date"
             },
@@ -658,6 +705,26 @@
             }
           }
         },
+        "cases-connector-mappings": {
+          "properties": {
+            "mappings": {
+              "properties": {
+                "action_type": {
+                  "type": "keyword"
+                },
+                "source": {
+                  "type": "keyword"
+                },
+                "target": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "owner": {
+              "type": "keyword"
+            }
+          }
+        },
         "cases-user-actions": {
           "properties": {
             "action": {
@@ -687,6 +754,9 @@
             },
             "old_value": {
               "type": "text"
+            },
+            "owner": {
+              "type": "keyword"
             }
           }
         },
@@ -702,6 +772,9 @@
           "dynamic": "false",
           "type": "object"
         },
+        "coreMigrationVersion": {
+          "type": "keyword"
+        },
         "dashboard": {
           "properties": {
             "description": {
@@ -814,6 +887,19 @@
         },
         "endpoint:user-artifact-manifest": {
           "properties": {
+            "artifacts": {
+              "properties": {
+                "artifactId": {
+                  "index": false,
+                  "type": "keyword"
+                },
+                "policyId": {
+                  "index": false,
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
             "created": {
               "index": false,
               "type": "date"
@@ -824,19 +910,6 @@
             "semanticVersion": {
               "index": false,
               "type": "keyword"
-            },
-            "artifacts": {
-              "type": "nested",
-              "properties": {
-                "policyId": {
-                  "type": "keyword",
-                  "index": false
-                },
-                "artifactId": {
-                  "type": "keyword",
-                  "index": false
-                }
-              }
             }
           }
         },
@@ -890,6 +963,17 @@
             "name": {
               "type": "keyword"
             },
+            "package_assets": {
+              "properties": {
+                "id": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
             "removable": {
               "type": "boolean"
             },
@@ -898,6 +982,40 @@
             }
           }
         },
+        "epm-packages-assets": {
+          "properties": {
+            "asset_path": {
+              "type": "keyword"
+            },
+            "data_base64": {
+              "type": "binary"
+            },
+            "data_utf8": {
+              "index": false,
+              "type": "text"
+            },
+            "install_source": {
+              "type": "keyword"
+            },
+            "media_type": {
+              "type": "keyword"
+            },
+            "package_name": {
+              "type": "keyword"
+            },
+            "package_version": {
+              "type": "keyword"
+            }
+          }
+        },
+        "event_loop_delays_daily": {
+          "dynamic": "false",
+          "properties": {
+            "lastUpdatedAt": {
+              "type": "date"
+            }
+          }
+        },
         "exception-list": {
           "properties": {
             "_tags": {
@@ -1002,12 +1120,22 @@
               "type": "keyword"
             },
             "name": {
+              "fields": {
+                "text": {
+                  "type": "text"
+                }
+              },
               "type": "keyword"
             },
             "os_types": {
               "type": "keyword"
             },
             "tags": {
+              "fields": {
+                "text": {
+                  "type": "text"
+                }
+              },
               "type": "keyword"
             },
             "tie_breaker_id": {
@@ -1128,12 +1256,22 @@
               "type": "keyword"
             },
             "name": {
+              "fields": {
+                "text": {
+                  "type": "text"
+                }
+              },
               "type": "keyword"
             },
             "os_types": {
               "type": "keyword"
             },
             "tags": {
+              "fields": {
+                "text": {
+                  "type": "text"
+                }
+              },
               "type": "keyword"
             },
             "tie_breaker_id": {
@@ -1150,10 +1288,14 @@
             }
           }
         },
-        "file-upload-telemetry": {
+        "file-upload-usage-collection-telemetry": {
           "properties": {
-            "filesUploadedTotalCount": {
-              "type": "long"
+            "file_upload": {
+              "properties": {
+                "index_creation_count": {
+                  "type": "long"
+                }
+              }
             }
           }
         },
@@ -1185,40 +1327,6 @@
             }
           }
         },
-        "fleet-agent-events": {
-          "properties": {
-            "action_id": {
-              "type": "keyword"
-            },
-            "agent_id": {
-              "type": "keyword"
-            },
-            "data": {
-              "type": "text"
-            },
-            "message": {
-              "type": "text"
-            },
-            "payload": {
-              "type": "text"
-            },
-            "policy_id": {
-              "type": "keyword"
-            },
-            "stream_id": {
-              "type": "keyword"
-            },
-            "subtype": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          }
-        },
         "fleet-agents": {
           "properties": {
             "access_api_key_id": {
@@ -1261,9 +1369,6 @@
             "policy_revision": {
               "type": "integer"
             },
-            "shared_id": {
-              "type": "keyword"
-            },
             "type": {
               "type": "keyword"
             },
@@ -1321,6 +1426,13 @@
             }
           }
         },
+        "fleet-preconfiguration-deletion-record": {
+          "properties": {
+            "id": {
+              "type": "keyword"
+            }
+          }
+        },
         "graph-workspace": {
           "properties": {
             "description": {
@@ -1333,6 +1445,10 @@
                 }
               }
             },
+            "legacyIndexPatternRef": {
+              "index": false,
+              "type": "text"
+            },
             "numLinks": {
               "type": "integer"
             },
@@ -1373,6 +1489,15 @@
             "is_default": {
               "type": "boolean"
             },
+            "is_default_fleet_server": {
+              "type": "boolean"
+            },
+            "is_managed": {
+              "type": "boolean"
+            },
+            "is_preconfigured": {
+              "type": "keyword"
+            },
             "monitoring_enabled": {
               "index": false,
               "type": "keyword"
@@ -1392,6 +1517,9 @@
             "status": {
               "type": "keyword"
             },
+            "unenroll_timeout": {
+              "type": "integer"
+            },
             "updated_at": {
               "type": "date"
             },
@@ -1412,12 +1540,6 @@
             "config_yaml": {
               "type": "text"
             },
-            "fleet_enroll_password": {
-              "type": "binary"
-            },
-            "fleet_enroll_username": {
-              "type": "binary"
-            },
             "hosts": {
               "type": "keyword"
             },
@@ -1458,6 +1580,9 @@
                 "enabled": {
                   "type": "boolean"
                 },
+                "policy_template": {
+                  "type": "keyword"
+                },
                 "streams": {
                   "properties": {
                     "compiled_stream": {
@@ -1530,26 +1655,24 @@
             },
             "updated_by": {
               "type": "keyword"
+            },
+            "vars": {
+              "type": "flattened"
             }
           }
         },
         "ingest_manager_settings": {
           "properties": {
-            "agent_auto_upgrade": {
+            "fleet_server_hosts": {
               "type": "keyword"
             },
             "has_seen_add_data_notice": {
               "index": false,
               "type": "boolean"
             },
-            "kibana_ca_sha256": {
-              "type": "keyword"
-            },
-            "kibana_urls": {
-              "type": "keyword"
-            },
-            "package_auto_upgrade": {
-              "type": "keyword"
+            "has_seen_fleet_migration_notice": {
+              "index": false,
+              "type": "boolean"
             }
           }
         },
@@ -1567,6 +1690,23 @@
             }
           }
         },
+        "legacy-url-alias": {
+          "dynamic": "false",
+          "properties": {
+            "disabled": {
+              "type": "boolean"
+            },
+            "resolveCounter": {
+              "type": "long"
+            },
+            "sourceId": {
+              "type": "keyword"
+            },
+            "targetType": {
+              "type": "keyword"
+            }
+          }
+        },
         "lens": {
           "properties": {
             "description": {
@@ -1606,6 +1746,10 @@
         },
         "map": {
           "properties": {
+            "bounds": {
+              "dynamic": "false",
+              "type": "object"
+            },
             "description": {
               "type": "text"
             },
@@ -1664,7 +1808,7 @@
               },
               "type": "text"
             },
-            "config": {
+            "cases": {
               "fields": {
                 "keyword": {
                   "ignore_above": 256,
@@ -1673,7 +1817,7 @@
               },
               "type": "text"
             },
-            "dashboard": {
+            "cases-user-actions": {
               "fields": {
                 "keyword": {
                   "ignore_above": 256,
@@ -1682,7 +1826,7 @@
               },
               "type": "text"
             },
-            "exception-list-agnostic": {
+            "config": {
               "fields": {
                 "keyword": {
                   "ignore_above": 256,
@@ -1691,7 +1835,16 @@
               },
               "type": "text"
             },
-            "fleet-agent-actions": {
+            "core-usage-stats": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "dashboard": {
               "fields": {
                 "keyword": {
                   "ignore_above": 256,
@@ -1700,7 +1853,7 @@
               },
               "type": "text"
             },
-            "fleet-agent-events": {
+            "endpoint:user-artifact-manifest": {
               "fields": {
                 "keyword": {
                   "ignore_above": 256,
@@ -1709,7 +1862,7 @@
               },
               "type": "text"
             },
-            "fleet-agents": {
+            "exception-list-agnostic": {
               "fields": {
                 "keyword": {
                   "ignore_above": 256,
@@ -1718,7 +1871,7 @@
               },
               "type": "text"
             },
-            "fleet-enrollment-api-keys": {
+            "fleet-agent-actions": {
               "fields": {
                 "keyword": {
                   "ignore_above": 256,
@@ -1763,6 +1916,15 @@
               },
               "type": "text"
             },
+            "ingest-outputs": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
             "ingest-package-policies": {
               "fields": {
                 "keyword": {
@@ -1808,6 +1970,15 @@
               },
               "type": "text"
             },
+            "ml-module": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
             "search": {
               "fields": {
                 "keyword": {
@@ -1817,6 +1988,33 @@
               },
               "type": "text"
             },
+            "search-session": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "search-telemetry": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "siem-detection-engine-rule-actions": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
             "space": {
               "fields": {
                 "keyword": {
@@ -1826,7 +2024,7 @@
               },
               "type": "text"
             },
-            "tsvb-validation-telemetry": {
+            "spaces-usage-stats": {
               "fields": {
                 "keyword": {
                   "ignore_above": 256,
@@ -1869,14 +2067,60 @@
             }
           }
         },
-        "ml-telemetry": {
+        "ml-module": {
+          "dynamic": "false",
           "properties": {
-            "file_data_visualizer": {
-              "properties": {
-                "index_creation_count": {
-                  "type": "long"
+            "datafeeds": {
+              "type": "object"
+            },
+            "defaultIndexPattern": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
                 }
-              }
+              },
+              "type": "text"
+            },
+            "description": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "id": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "jobs": {
+              "type": "object"
+            },
+            "logo": {
+              "type": "object"
+            },
+            "query": {
+              "type": "object"
+            },
+            "title": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "type": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
             }
           }
         },
@@ -1896,6 +2140,50 @@
         "originId": {
           "type": "keyword"
         },
+        "osquery-saved-query": {
+          "properties": {
+            "created_at": {
+              "type": "date"
+            },
+            "created_by": {
+              "type": "text"
+            },
+            "description": {
+              "type": "text"
+            },
+            "id": {
+              "type": "keyword"
+            },
+            "interval": {
+              "type": "keyword"
+            },
+            "platform": {
+              "type": "keyword"
+            },
+            "query": {
+              "type": "text"
+            },
+            "updated_at": {
+              "type": "date"
+            },
+            "updated_by": {
+              "type": "text"
+            },
+            "version": {
+              "type": "keyword"
+            }
+          }
+        },
+        "osquery-usage-metric": {
+          "properties": {
+            "count": {
+              "type": "long"
+            },
+            "errors": {
+              "type": "long"
+            }
+          }
+        },
         "query": {
           "properties": {
             "description": {
@@ -1959,6 +2247,15 @@
             "description": {
               "type": "text"
             },
+            "grid": {
+              "enabled": false,
+              "type": "object"
+            },
+            "hideChart": {
+              "doc_values": false,
+              "index": false,
+              "type": "boolean"
+            },
             "hits": {
               "doc_values": false,
               "index": false,
@@ -1985,73 +2282,187 @@
             }
           }
         },
-        "search-telemetry": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "siem-detection-engine-rule-actions": {
+        "search-session": {
           "properties": {
-            "actions": {
-              "properties": {
-                "action_type_id": {
-                  "type": "keyword"
-                },
-                "group": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "params": {
-                  "enabled": false,
-                  "type": "object"
-                }
-              }
-            },
-            "alertThrottle": {
+            "appId": {
               "type": "keyword"
             },
-            "ruleAlertId": {
-              "type": "keyword"
+            "completed": {
+              "type": "date"
             },
-            "ruleThrottle": {
-              "type": "keyword"
-            }
-          }
-        },
-        "siem-detection-engine-rule-status": {
-          "properties": {
-            "alertId": {
-              "type": "keyword"
+            "created": {
+              "type": "date"
             },
-            "bulkCreateTimeDurations": {
-              "type": "float"
+            "expires": {
+              "type": "date"
             },
-            "gap": {
-              "type": "text"
+            "idMapping": {
+              "enabled": false,
+              "type": "object"
             },
-            "lastFailureAt": {
-              "type": "date"
+            "initialState": {
+              "enabled": false,
+              "type": "object"
             },
-            "lastFailureMessage": {
-              "type": "text"
+            "name": {
+              "type": "keyword"
             },
-            "lastLookBackDate": {
-              "type": "date"
+            "persisted": {
+              "type": "boolean"
             },
-            "lastSuccessAt": {
-              "type": "date"
+            "realmName": {
+              "type": "keyword"
             },
-            "lastSuccessMessage": {
-              "type": "text"
+            "realmType": {
+              "type": "keyword"
             },
-            "searchAfterTimeDurations": {
-              "type": "float"
+            "restoreState": {
+              "enabled": false,
+              "type": "object"
+            },
+            "sessionId": {
+              "type": "keyword"
             },
             "status": {
               "type": "keyword"
             },
-            "statusDate": {
+            "touched": {
+              "type": "date"
+            },
+            "urlGeneratorId": {
+              "type": "keyword"
+            },
+            "username": {
+              "type": "keyword"
+            },
+            "version": {
+              "type": "keyword"
+            }
+          }
+        },
+        "search-telemetry": {
+          "dynamic": "false",
+          "type": "object"
+        },
+        "security-rule": {
+          "dynamic": "false",
+          "properties": {
+            "name": {
+              "type": "keyword"
+            },
+            "rule_id": {
+              "type": "keyword"
+            },
+            "version": {
+              "type": "long"
+            }
+          }
+        },
+        "security-solution-signals-migration": {
+          "properties": {
+            "created": {
+              "index": false,
+              "type": "date"
+            },
+            "createdBy": {
+              "index": false,
+              "type": "text"
+            },
+            "destinationIndex": {
+              "index": false,
+              "type": "keyword"
+            },
+            "error": {
+              "index": false,
+              "type": "text"
+            },
+            "sourceIndex": {
+              "type": "keyword"
+            },
+            "status": {
+              "index": false,
+              "type": "keyword"
+            },
+            "taskId": {
+              "index": false,
+              "type": "keyword"
+            },
+            "updated": {
+              "index": false,
+              "type": "date"
+            },
+            "updatedBy": {
+              "index": false,
+              "type": "text"
+            },
+            "version": {
+              "type": "long"
+            }
+          }
+        },
+        "siem-detection-engine-rule-actions": {
+          "properties": {
+            "actions": {
+              "properties": {
+                "action_type_id": {
+                  "type": "keyword"
+                },
+                "group": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "params": {
+                  "enabled": false,
+                  "type": "object"
+                }
+              }
+            },
+            "alertThrottle": {
+              "type": "keyword"
+            },
+            "ruleAlertId": {
+              "type": "keyword"
+            },
+            "ruleThrottle": {
+              "type": "keyword"
+            }
+          }
+        },
+        "siem-detection-engine-rule-status": {
+          "properties": {
+            "alertId": {
+              "type": "keyword"
+            },
+            "bulkCreateTimeDurations": {
+              "type": "float"
+            },
+            "gap": {
+              "type": "text"
+            },
+            "lastFailureAt": {
+              "type": "date"
+            },
+            "lastFailureMessage": {
+              "type": "text"
+            },
+            "lastLookBackDate": {
+              "type": "date"
+            },
+            "lastSuccessAt": {
+              "type": "date"
+            },
+            "lastSuccessMessage": {
+              "type": "text"
+            },
+            "searchAfterTimeDurations": {
+              "type": "float"
+            },
+            "status": {
+              "type": "keyword"
+            },
+            "statusDate": {
               "type": "date"
             }
           }
@@ -2196,6 +2607,25 @@
             "description": {
               "type": "text"
             },
+            "eqlOptions": {
+              "properties": {
+                "eventCategoryField": {
+                  "type": "text"
+                },
+                "query": {
+                  "type": "text"
+                },
+                "size": {
+                  "type": "text"
+                },
+                "tiebreakerField": {
+                  "type": "text"
+                },
+                "timestampField": {
+                  "type": "text"
+                }
+              }
+            },
             "eventType": {
               "type": "keyword"
             },
@@ -2308,10 +2738,14 @@
               "type": "keyword"
             },
             "sort": {
+              "dynamic": "false",
               "properties": {
                 "columnId": {
                   "type": "keyword"
                 },
+                "columnType": {
+                  "type": "keyword"
+                },
                 "sortDirection": {
                   "type": "keyword"
                 }
@@ -2436,34 +2870,6 @@
             }
           }
         },
-        "telemetry": {
-          "properties": {
-            "allowChangingOptInStatus": {
-              "type": "boolean"
-            },
-            "enabled": {
-              "type": "boolean"
-            },
-            "lastReported": {
-              "type": "date"
-            },
-            "lastVersionChecked": {
-              "type": "keyword"
-            },
-            "reportFailureCount": {
-              "type": "integer"
-            },
-            "reportFailureVersion": {
-              "type": "keyword"
-            },
-            "sendUsageFrom": {
-              "type": "keyword"
-            },
-            "userHasSeenNotice": {
-              "type": "boolean"
-            }
-          }
-        },
         "timelion-sheet": {
           "properties": {
             "description": {
@@ -2505,16 +2911,16 @@
             }
           }
         },
-        "tsvb-validation-telemetry": {
+        "type": {
+          "type": "keyword"
+        },
+        "ui-counter": {
           "properties": {
-            "failedRequests": {
-              "type": "long"
+            "count": {
+              "type": "integer"
             }
           }
         },
-        "type": {
-          "type": "keyword"
-        },
         "ui-metric": {
           "properties": {
             "count": {
@@ -2525,6 +2931,46 @@
         "updated_at": {
           "type": "date"
         },
+        "upgrade-assistant-ml-upgrade-operation": {
+          "properties": {
+            "jobId": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "nodeId": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "snapshotId": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "status": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
         "upgrade-assistant-reindex-operation": {
           "properties": {
             "errorMessage": {
@@ -2615,6 +3061,10 @@
                   "null_value": 0,
                   "type": "long"
                 },
+                "kibana": {
+                  "null_value": 0,
+                  "type": "long"
+                },
                 "overview": {
                   "null_value": 0,
                   "type": "long"
@@ -2669,6 +3119,14 @@
             }
           }
         },
+        "usage-counters": {
+          "dynamic": "false",
+          "properties": {
+            "domainId": {
+              "type": "keyword"
+            }
+          }
+        },
         "visualization": {
           "properties": {
             "description": {
@@ -2713,7 +3171,9 @@
       "index": {
         "auto_expand_replicas": "0-1",
         "number_of_replicas": "1",
-        "number_of_shards": "1"
+        "number_of_shards": "1",
+        "priority": "10",
+        "refresh_interval": "1s"
       }
     }
   }
@@ -2723,179 +3183,67 @@
   "type": "index",
   "value": {
     "aliases": {
-      ".ml-anomalies-.write-apm-environment_not_defined-5626-high_mean_transaction_duration": {
-        "is_hidden": true
-      },
-      ".ml-anomalies-.write-apm-production-1369-high_mean_transaction_duration": {
-        "is_hidden": true
-      },
-      ".ml-anomalies-.write-apm-production-d92e-high_mean_transaction_duration": {
-        "is_hidden": true
-      },
-      ".ml-anomalies-.write-apm-testing-384f-high_mean_transaction_duration": {
-        "is_hidden": true
-      },
-      ".ml-anomalies-.write-kibana-logs-ui-default-default-log-entry-rate": {
-        "is_hidden": true
-      },
-      ".ml-anomalies-.write-kibana-metrics-ui-default-default-hosts_memory_usage": {
-        "is_hidden": true
-      },
-      ".ml-anomalies-.write-kibana-metrics-ui-default-default-hosts_network_in": {
-        "is_hidden": true
-      },
-      ".ml-anomalies-.write-kibana-metrics-ui-default-default-hosts_network_out": {
-        "is_hidden": true
-      },
-      ".ml-anomalies-.write-kibana-metrics-ui-kate-demo-default-hosts_memory_usage": {
+      ".ml-anomalies-.write-apm-production-802c-high_mean_transaction_duration": {
         "is_hidden": true
       },
-      ".ml-anomalies-.write-kibana-metrics-ui-kate-demo-default-hosts_network_in": {
+      ".ml-anomalies-.write-apm-production-d08f-high_mean_transaction_duration": {
         "is_hidden": true
       },
-      ".ml-anomalies-.write-kibana-metrics-ui-kate-demo-default-hosts_network_out": {
+      ".ml-anomalies-.write-high_sum_total_sales": {
         "is_hidden": true
       },
-      ".ml-anomalies-apm-environment_not_defined-5626-high_mean_transaction_duration": {
+      ".ml-anomalies-apm-production-802c-high_mean_transaction_duration": {
         "filter": {
           "term": {
             "job_id": {
               "boost": 1,
-              "value": "apm-environment_not_defined-5626-high_mean_transaction_duration"
+              "value": "apm-production-802c-high_mean_transaction_duration"
             }
           }
         },
         "is_hidden": true
       },
-      ".ml-anomalies-apm-production-1369-high_mean_transaction_duration": {
+      ".ml-anomalies-apm-production-d08f-high_mean_transaction_duration": {
         "filter": {
           "term": {
             "job_id": {
               "boost": 1,
-              "value": "apm-production-1369-high_mean_transaction_duration"
+              "value": "apm-production-d08f-high_mean_transaction_duration"
             }
           }
         },
         "is_hidden": true
       },
-      ".ml-anomalies-apm-production-d92e-high_mean_transaction_duration": {
+      ".ml-anomalies-high_sum_total_sales": {
         "filter": {
           "term": {
             "job_id": {
               "boost": 1,
-              "value": "apm-production-d92e-high_mean_transaction_duration"
+              "value": "high_sum_total_sales"
             }
           }
         },
         "is_hidden": true
+      }
+    },
+    "index": ".ml-anomalies-shared",
+    "mappings": {
+      "_meta": {
+        "version": "8.0.0"
       },
-      ".ml-anomalies-apm-testing-384f-high_mean_transaction_duration": {
-        "filter": {
-          "term": {
-            "job_id": {
-              "boost": 1,
-              "value": "apm-testing-384f-high_mean_transaction_duration"
-            }
+      "dynamic_templates": [
+        {
+          "strings_as_keywords": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match": "*"
           }
-        },
-        "is_hidden": true
-      },
-      ".ml-anomalies-kibana-logs-ui-default-default-log-entry-rate": {
-        "filter": {
-          "term": {
-            "job_id": {
-              "boost": 1,
-              "value": "kibana-logs-ui-default-default-log-entry-rate"
-            }
-          }
-        },
-        "is_hidden": true
-      },
-      ".ml-anomalies-kibana-metrics-ui-default-default-hosts_memory_usage": {
-        "filter": {
-          "term": {
-            "job_id": {
-              "boost": 1,
-              "value": "kibana-metrics-ui-default-default-hosts_memory_usage"
-            }
-          }
-        },
-        "is_hidden": true
-      },
-      ".ml-anomalies-kibana-metrics-ui-default-default-hosts_network_in": {
-        "filter": {
-          "term": {
-            "job_id": {
-              "boost": 1,
-              "value": "kibana-metrics-ui-default-default-hosts_network_in"
-            }
-          }
-        },
-        "is_hidden": true
-      },
-      ".ml-anomalies-kibana-metrics-ui-default-default-hosts_network_out": {
-        "filter": {
-          "term": {
-            "job_id": {
-              "boost": 1,
-              "value": "kibana-metrics-ui-default-default-hosts_network_out"
-            }
-          }
-        },
-        "is_hidden": true
-      },
-      ".ml-anomalies-kibana-metrics-ui-kate-demo-default-hosts_memory_usage": {
-        "filter": {
-          "term": {
-            "job_id": {
-              "boost": 1,
-              "value": "kibana-metrics-ui-kate-demo-default-hosts_memory_usage"
-            }
-          }
-        },
-        "is_hidden": true
-      },
-      ".ml-anomalies-kibana-metrics-ui-kate-demo-default-hosts_network_in": {
-        "filter": {
-          "term": {
-            "job_id": {
-              "boost": 1,
-              "value": "kibana-metrics-ui-kate-demo-default-hosts_network_in"
-            }
-          }
-        },
-        "is_hidden": true
-      },
-      ".ml-anomalies-kibana-metrics-ui-kate-demo-default-hosts_network_out": {
-        "filter": {
-          "term": {
-            "job_id": {
-              "boost": 1,
-              "value": "kibana-metrics-ui-kate-demo-default-hosts_network_out"
-            }
-          }
-        },
-        "is_hidden": true
-      }
-    },
-    "index": ".ml-anomalies-shared",
-    "mappings": {
-      "_meta": {
-        "version": "8.0.0"
-      },
-      "dynamic_templates": [
-        {
-          "strings_as_keywords": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match": "*"
-          }
-        }
-      ],
-      "properties": {
-        "actual": {
-          "type": "double"
+        }
+      ],
+      "properties": {
+        "actual": {
+          "type": "double"
         },
         "all_field_values": {
           "analyzer": "whitespace",
@@ -2904,6 +3252,9 @@
         "anomaly_score": {
           "type": "double"
         },
+        "assignment_memory_basis": {
+          "type": "keyword"
+        },
         "average_bucket_processing_time_ms": {
           "type": "double"
         },
@@ -2966,6 +3317,13 @@
         "categorized_doc_count": {
           "type": "keyword"
         },
+        "category": {
+          "properties": {
+            "keyword": {
+              "type": "keyword"
+            }
+          }
+        },
         "category_id": {
           "type": "long"
         },
@@ -3035,6 +3393,13 @@
           },
           "type": "nested"
         },
+        "customer_full_name": {
+          "properties": {
+            "keyword": {
+              "type": "keyword"
+            }
+          }
+        },
         "dead_category_count": {
           "type": "keyword"
         },
@@ -3050,13 +3415,6 @@
         "empty_bucket_count": {
           "type": "long"
         },
-        "event": {
-          "properties": {
-            "dataset": {
-              "type": "keyword"
-            }
-          }
-        },
         "event_count": {
           "type": "long"
         },
@@ -3140,13 +3498,6 @@
             }
           }
         },
-        "host": {
-          "properties": {
-            "name": {
-              "type": "keyword"
-            }
-          }
-        },
         "influencer_field_name": {
           "type": "keyword"
         },
@@ -3265,6 +3616,9 @@
         },
         "model_size_stats": {
           "properties": {
+            "assignment_memory_basis": {
+              "type": "keyword"
+            },
             "bucket_allocation_failures_count": {
               "type": "long"
             },
@@ -3455,6 +3809,9 @@
     "settings": {
       "index": {
         "auto_expand_replicas": "0-1",
+        "blocks": {
+          "read_only_allow_delete": "false"
+        },
         "hidden": "true",
         "number_of_replicas": "1",
         "number_of_shards": "1",
@@ -3494,19 +3851,34 @@
         "allow_lazy_open": {
           "type": "keyword"
         },
+        "allow_lazy_start": {
+          "type": "keyword"
+        },
         "analysis": {
           "properties": {
             "classification": {
               "properties": {
+                "alpha": {
+                  "type": "double"
+                },
                 "class_assignment_objective": {
                   "type": "keyword"
                 },
                 "dependent_variable": {
                   "type": "keyword"
                 },
+                "downsample_factor": {
+                  "type": "double"
+                },
+                "early_stopping_enabled": {
+                  "type": "boolean"
+                },
                 "eta": {
                   "type": "double"
                 },
+                "eta_growth_rate_per_tree": {
+                  "type": "double"
+                },
                 "feature_bag_fraction": {
                   "type": "double"
                 },
@@ -3520,6 +3892,9 @@
                 "lambda": {
                   "type": "double"
                 },
+                "max_optimization_rounds_per_hyperparameter": {
+                  "type": "integer"
+                },
                 "max_trees": {
                   "type": "integer"
                 },
@@ -3532,6 +3907,15 @@
                 "prediction_field_name": {
                   "type": "keyword"
                 },
+                "randomize_seed": {
+                  "type": "keyword"
+                },
+                "soft_tree_depth_limit": {
+                  "type": "double"
+                },
+                "soft_tree_depth_tolerance": {
+                  "type": "double"
+                },
                 "training_percent": {
                   "type": "double"
                 }
@@ -3539,6 +3923,9 @@
             },
             "outlier_detection": {
               "properties": {
+                "compute_feature_influence": {
+                  "type": "keyword"
+                },
                 "feature_influence_threshold": {
                   "type": "double"
                 },
@@ -3547,17 +3934,35 @@
                 },
                 "n_neighbors": {
                   "type": "integer"
+                },
+                "outlier_fraction": {
+                  "type": "keyword"
+                },
+                "standardization_enabled": {
+                  "type": "keyword"
                 }
               }
             },
             "regression": {
               "properties": {
+                "alpha": {
+                  "type": "double"
+                },
                 "dependent_variable": {
                   "type": "keyword"
                 },
+                "downsample_factor": {
+                  "type": "double"
+                },
+                "early_stopping_enabled": {
+                  "type": "boolean"
+                },
                 "eta": {
                   "type": "double"
                 },
+                "eta_growth_rate_per_tree": {
+                  "type": "double"
+                },
                 "feature_bag_fraction": {
                   "type": "double"
                 },
@@ -3577,6 +3982,9 @@
                 "loss_function_parameter": {
                   "type": "double"
                 },
+                "max_optimization_rounds_per_hyperparameter": {
+                  "type": "integer"
+                },
                 "max_trees": {
                   "type": "integer"
                 },
@@ -3586,6 +3994,15 @@
                 "prediction_field_name": {
                   "type": "keyword"
                 },
+                "randomize_seed": {
+                  "type": "keyword"
+                },
+                "soft_tree_depth_limit": {
+                  "type": "double"
+                },
+                "soft_tree_depth_tolerance": {
+                  "type": "double"
+                },
                 "training_percent": {
                   "type": "double"
                 }
@@ -3706,6 +4123,16 @@
         "background_persist_interval": {
           "type": "keyword"
         },
+        "blocked": {
+          "properties": {
+            "reason": {
+              "type": "keyword"
+            },
+            "task_id": {
+              "type": "keyword"
+            }
+          }
+        },
         "chunking_config": {
           "properties": {
             "mode": {
@@ -3809,6 +4236,9 @@
         "job_version": {
           "type": "keyword"
         },
+        "max_empty_searches": {
+          "type": "keyword"
+        },
         "max_num_threads": {
           "type": "integer"
         },
@@ -3853,6 +4283,10 @@
         "results_retention_days": {
           "type": "long"
         },
+        "runtime_mappings": {
+          "enabled": false,
+          "type": "object"
+        },
         "script_fields": {
           "enabled": false,
           "type": "object"
@@ -3872,6 +4306,10 @@
             "query": {
               "enabled": false,
               "type": "object"
+            },
+            "runtime_mappings": {
+              "enabled": false,
+              "type": "object"
             }
           }
         },
@@ -3899,7 +4337,7 @@
         "is_write_index": true
       }
     },
-    "index": "apm-8.0.0-error-2020.12.03-000001",
+    "index": "apm-8.0.0-error-000002",
     "mappings": {
       "_meta": {
         "beat": "apm",
@@ -3960,30 +4398,11 @@
           }
         },
         {
-          "labels_string": {
+          "kubernetes.selectors.*": {
             "mapping": {
               "type": "keyword"
             },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
+            "path_match": "kubernetes.selectors.*"
           }
         },
         {
@@ -4014,139 +4433,65 @@
           }
         },
         {
-          "labels_string": {
+          "histogram": {
             "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
+              "type": "histogram"
+            }
           }
         },
         {
-          "labels_boolean": {
+          "transaction.marks": {
             "mapping": {
-              "type": "boolean"
+              "type": "keyword"
             },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
+            "match_mapping_type": "string",
+            "path_match": "transaction.marks.*"
           }
         },
         {
-          "labels_*": {
+          "transaction.marks.*.*": {
             "mapping": {
               "scaling_factor": 1000000,
               "type": "scaled_float"
             },
-            "path_match": "labels.*"
+            "path_match": "transaction.marks.*.*"
           }
         },
         {
-          "labels_string": {
+          "strings_as_keyword": {
             "mapping": {
+              "ignore_above": 1024,
               "type": "keyword"
             },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
+            "match_mapping_type": "string"
           }
+        }
+      ],
+      "properties": {
+        "@timestamp": {
+          "type": "date"
         },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
+        "agent": {
+          "dynamic": "false",
+          "properties": {
+            "build": {
+              "properties": {
+                "original": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
             },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
+            "ephemeral_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
             },
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_string": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "transaction.marks": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "transaction.marks.*"
-          }
-        },
-        {
-          "transaction.marks.*.*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "transaction.marks.*.*"
-          }
-        },
-        {
-          "strings_as_keyword": {
-            "mapping": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "match_mapping_type": "string"
-          }
-        }
-      ],
-      "properties": {
-        "@timestamp": {
-          "type": "date"
-        },
-        "agent": {
-          "dynamic": "false",
-          "properties": {
-            "build": {
-              "properties": {
-                "original": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "ephemeral_id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "hostname": {
-              "path": "agent.name",
-              "type": "alias"
-            },
-            "id": {
-              "ignore_above": 1024,
+            "hostname": {
+              "path": "agent.name",
+              "type": "alias"
+            },
+            "id": {
+              "ignore_above": 1024,
               "type": "keyword"
             },
             "name": {
@@ -4234,6 +4579,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -4253,6 +4602,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -4260,6 +4613,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -4290,6 +4647,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -4425,6 +4786,15 @@
             "region": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "service": {
+              "dynamic": "false",
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -4433,6 +4803,10 @@
             "exists": {
               "type": "boolean"
             },
+            "signing_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "status": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -4441,6 +4815,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "team_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "trusted": {
               "type": "boolean"
             },
@@ -4481,6 +4859,19 @@
             }
           }
         },
+        "data_stream": {
+          "properties": {
+            "dataset": {
+              "type": "constant_keyword"
+            },
+            "namespace": {
+              "type": "constant_keyword"
+            },
+            "type": {
+              "type": "constant_keyword"
+            }
+          }
+        },
         "destination": {
           "properties": {
             "address": {
@@ -4521,6 +4912,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -4540,6 +4935,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -4547,6 +4946,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -4577,6 +4980,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -4650,6 +5057,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -4658,6 +5069,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -4683,6 +5098,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -4863,6 +5282,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "grouping_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "id": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -5025,6 +5448,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -5033,6 +5460,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -5088,6 +5519,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -5290,6 +5725,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "continent_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "continent_name": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -5309,6 +5748,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "postal_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "region_iso_code": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -5316,6 +5759,10 @@
             "region_name": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "timezone": {
+              "ignore_above": 1024,
+              "type": "keyword"
             }
           }
         },
@@ -5352,6 +5799,10 @@
             "sha512": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "ssdeep": {
+              "ignore_above": 1024,
+              "type": "keyword"
             }
           }
         },
@@ -5365,6 +5816,32 @@
             "containerized": {
               "type": "boolean"
             },
+            "cpu": {
+              "properties": {
+                "usage": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                }
+              }
+            },
+            "disk": {
+              "properties": {
+                "read": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "write": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -5375,6 +5852,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -5394,6 +5875,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -5401,6 +5886,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -5423,6 +5912,30 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "network": {
+              "properties": {
+                "egress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "ingress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "os": {
               "properties": {
                 "build": {
@@ -5465,6 +5978,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -5569,10 +6086,18 @@
                   "enabled": false,
                   "type": "object"
                 },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "method": {
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "mime_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "referrer": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -5608,6 +6133,10 @@
                   "enabled": false,
                   "type": "object"
                 },
+                "mime_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status_code": {
                   "type": "long"
                 }
@@ -5648,8 +6177,8 @@
             "container": {
               "properties": {
                 "image": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
+                  "path": "container.image.name",
+                  "type": "alias"
                 },
                 "name": {
                   "ignore_above": 1024,
@@ -5690,6 +6219,9 @@
             },
             "pod": {
               "properties": {
+                "ip": {
+                  "type": "ip"
+                },
                 "name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -5708,6 +6240,13 @@
                 }
               }
             },
+            "selectors": {
+              "properties": {
+                "*": {
+                  "type": "object"
+                }
+              }
+            },
             "statefulset": {
               "properties": {
                 "name": {
@@ -5730,9 +6269,15 @@
             "country_code": {
               "type": "keyword"
             },
+            "customerId": {
+              "type": "keyword"
+            },
             "customer_tier": {
               "type": "keyword"
             },
+            "foo": {
+              "type": "keyword"
+            },
             "git_rev": {
               "type": "keyword"
             },
@@ -5745,10 +6290,29 @@
             "lang": {
               "type": "keyword"
             },
+            "lorem": {
+              "type": "keyword"
+            },
+            "multi-line": {
+              "type": "keyword"
+            },
+            "orderPrice": {
+              "scaling_factor": 1000000,
+              "type": "scaled_float"
+            },
+            "orderPriceRange": {
+              "type": "keyword"
+            },
+            "plugin": {
+              "type": "keyword"
+            },
             "request_id": {
               "type": "keyword"
             },
-            "u": {
+            "shippingCountry": {
+              "type": "keyword"
+            },
+            "this-is-a-very-long-tag-name-without-any-spaces": {
               "type": "keyword"
             }
           }
@@ -5832,12 +6396,20 @@
         },
         "metricset": {
           "properties": {
-            "period": {
-              "type": "long"
-            }
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "period": {
+              "meta": {
+                "unit": "ms"
+              },
+              "type": "long"
+            }
           }
         },
         "network": {
+          "dynamic": "false",
           "properties": {
             "application": {
               "ignore_above": 1024,
@@ -5846,10 +6418,34 @@
             "bytes": {
               "type": "long"
             },
+            "carrier": {
+              "properties": {
+                "icc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mcc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mnc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "community_id": {
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "connection_type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "direction": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -5955,6 +6551,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -5974,6 +6574,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -5981,6 +6585,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -6073,6 +6681,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -6104,6 +6716,54 @@
             }
           }
         },
+        "orchestrator": {
+          "properties": {
+            "api_version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "cluster": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "url": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "namespace": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "organization": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "resource": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
         "organization": {
           "properties": {
             "id": {
@@ -6156,6 +6816,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "version": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -6272,6 +6936,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -6280,6 +6948,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -6332,6 +7004,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -6359,6 +7035,10 @@
                     "exists": {
                       "type": "boolean"
                     },
+                    "signing_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
                     "status": {
                       "ignore_above": 1024,
                       "type": "keyword"
@@ -6367,6 +7047,10 @@
                       "ignore_above": 1024,
                       "type": "keyword"
                     },
+                    "team_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
                     "trusted": {
                       "type": "boolean"
                     },
@@ -6419,6 +7103,10 @@
                     "sha512": {
                       "ignore_above": 1024,
                       "type": "keyword"
+                    },
+                    "ssdeep": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
                     }
                   }
                 },
@@ -6618,11 +7306,17 @@
             "cpu": {
               "properties": {
                 "ns": {
+                  "meta": {
+                    "unit": "nanos"
+                  },
                   "type": "long"
                 }
               }
             },
             "duration": {
+              "meta": {
+                "unit": "nanos"
+              },
               "type": "long"
             },
             "id": {
@@ -6689,6 +7383,16 @@
                   "type": "long"
                 }
               }
+            },
+            "wall": {
+              "properties": {
+                "us": {
+                  "meta": {
+                    "unit": "micros"
+                  },
+                  "type": "long"
+                }
+              }
             }
           }
         },
@@ -6831,6 +7535,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -6850,6 +7558,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -6857,6 +7569,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -6887,6 +7603,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -7030,6 +7750,18 @@
             }
           }
         },
+        "session": {
+          "dynamic": "false",
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sequence": {
+              "type": "long"
+            }
+          }
+        },
         "source": {
           "dynamic": "false",
           "properties": {
@@ -7071,6 +7803,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -7090,6 +7826,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -7097,6 +7837,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -7127,6 +7871,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -7255,6 +8003,9 @@
                         "sum": {
                           "properties": {
                             "us": {
+                              "meta": {
+                                "unit": "micros"
+                              },
                               "type": "long"
                             }
                           }
@@ -7312,6 +8063,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -7347,6 +8101,10 @@
                     "norm": {
                       "properties": {
                         "pct": {
+                          "meta": {
+                            "metric_type": "gauge",
+                            "unit": "percent"
+                          },
                           "scaling_factor": 1000,
                           "type": "scaled_float"
                         }
@@ -7361,11 +8119,19 @@
                 "actual": {
                   "properties": {
                     "free": {
+                      "meta": {
+                        "metric_type": "gauge",
+                        "unit": "byte"
+                      },
                       "type": "long"
                     }
                   }
                 },
                 "total": {
+                  "meta": {
+                    "metric_type": "gauge",
+                    "unit": "byte"
+                  },
                   "type": "long"
                 }
               }
@@ -7374,6 +8140,86 @@
               "properties": {
                 "cgroup": {
                   "properties": {
+                    "cpu": {
+                      "properties": {
+                        "cfs": {
+                          "properties": {
+                            "period": {
+                              "properties": {
+                                "us": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "micros"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "quota": {
+                              "properties": {
+                                "us": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "micros"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "stats": {
+                          "properties": {
+                            "periods": {
+                              "meta": {
+                                "metric_type": "counter"
+                              },
+                              "type": "long"
+                            },
+                            "throttled": {
+                              "properties": {
+                                "ns": {
+                                  "meta": {
+                                    "metric_type": "counter",
+                                    "unit": "nanos"
+                                  },
+                                  "type": "long"
+                                },
+                                "periods": {
+                                  "meta": {
+                                    "metric_type": "counter"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "cpuacct": {
+                      "properties": {
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "total": {
+                          "properties": {
+                            "ns": {
+                              "meta": {
+                                "metric_type": "counter",
+                                "unit": "nanos"
+                              },
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
                     "memory": {
                       "properties": {
                         "mem": {
@@ -7381,6 +8227,10 @@
                             "limit": {
                               "properties": {
                                 "bytes": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "byte"
+                                  },
                                   "type": "long"
                                 }
                               }
@@ -7388,6 +8238,10 @@
                             "usage": {
                               "properties": {
                                 "bytes": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "byte"
+                                  },
                                   "type": "long"
                                 }
                               }
@@ -7405,6 +8259,10 @@
                         "norm": {
                           "properties": {
                             "pct": {
+                              "meta": {
+                                "metric_type": "gauge",
+                                "unit": "percent"
+                              },
                               "scaling_factor": 1000,
                               "type": "scaled_float"
                             }
@@ -7419,11 +8277,19 @@
                     "rss": {
                       "properties": {
                         "bytes": {
+                          "meta": {
+                            "metric_type": "gauge",
+                            "unit": "byte"
+                          },
                           "type": "long"
                         }
                       }
                     },
                     "size": {
+                      "meta": {
+                        "metric_type": "gauge",
+                        "unit": "byte"
+                      },
                       "type": "long"
                     }
                   }
@@ -7477,6 +8343,28 @@
                 "reference": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "subtechnique": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "reference": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
                 }
               }
             }
@@ -7846,34 +8734,6 @@
             }
           }
         },
-        "tracing": {
-          "properties": {
-            "span": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "trace": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "transaction": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
         "transaction": {
           "dynamic": "false",
           "properties": {
@@ -7895,6 +8755,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -8000,6 +8863,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -8071,6 +8937,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -8084,17 +8954,137 @@
         "user": {
           "dynamic": "false",
           "properties": {
-            "domain": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "email": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "full_name": {
-              "fields": {
-                "text": {
+            "changes": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "effective": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "email": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full_name": {
+              "fields": {
+                "text": {
                   "norms": false,
                   "type": "text"
                 }
@@ -8133,6 +9123,66 @@
             "roles": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "target": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -8183,6 +9233,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -8195,10 +9249,6 @@
             }
           }
         },
-        "view spans": {
-          "ignore_above": 1024,
-          "type": "keyword"
-        },
         "vlan": {
           "properties": {
             "id": {
@@ -8387,6 +9437,9 @@
     },
     "settings": {
       "index": {
+        "blocks": {
+          "read_only_allow_delete": "false"
+        },
         "codec": "best_compression",
         "lifecycle": {
           "name": "apm-rollover-30-days",
@@ -8400,7 +9453,6 @@
         "max_docvalue_fields_search": "200",
         "number_of_replicas": "1",
         "number_of_shards": "1",
-        "priority": "100",
         "refresh_interval": "5s"
       }
     }
@@ -8415,7 +9467,7 @@
         "is_write_index": true
       }
     },
-    "index": "apm-8.0.0-metric-2020.12.03-000001",
+    "index": "apm-8.0.0-metric-000002",
     "mappings": {
       "_meta": {
         "beat": "apm",
@@ -8476,30 +9528,11 @@
           }
         },
         {
-          "labels_string": {
+          "kubernetes.selectors.*": {
             "mapping": {
               "type": "keyword"
             },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
+            "path_match": "kubernetes.selectors.*"
           }
         },
         {
@@ -8530,117 +9563,43 @@
           }
         },
         {
-          "labels_string": {
+          "histogram": {
             "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
+              "type": "histogram"
+            }
           }
         },
         {
-          "labels_boolean": {
+          "transaction.marks": {
             "mapping": {
-              "type": "boolean"
+              "type": "keyword"
             },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
+            "match_mapping_type": "string",
+            "path_match": "transaction.marks.*"
           }
         },
         {
-          "labels_*": {
+          "transaction.marks.*.*": {
             "mapping": {
               "scaling_factor": 1000000,
               "type": "scaled_float"
             },
-            "path_match": "labels.*"
+            "path_match": "transaction.marks.*.*"
           }
         },
         {
-          "labels_string": {
+          "strings_as_keyword": {
             "mapping": {
+              "ignore_above": 1024,
               "type": "keyword"
             },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
+            "match_mapping_type": "string"
           }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_string": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "transaction.marks": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "transaction.marks.*"
-          }
-        },
-        {
-          "transaction.marks.*.*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "transaction.marks.*.*"
-          }
-        },
-        {
-          "strings_as_keyword": {
-            "mapping": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "match_mapping_type": "string"
-          }
-        }
-      ],
-      "properties": {
-        "@timestamp": {
-          "type": "date"
+        }
+      ],
+      "properties": {
+        "@timestamp": {
+          "type": "date"
         },
         "agent": {
           "dynamic": "false",
@@ -8679,6 +9638,12 @@
             }
           }
         },
+        "agent_config_applied": {
+          "type": "long"
+        },
+        "antifraud_order_check": {
+          "type": "long"
+        },
         "as": {
           "properties": {
             "number": {
@@ -8700,6 +9665,18 @@
             }
           }
         },
+        "cache_evictions": {
+          "type": "long"
+        },
+        "cache_gets": {
+          "type": "long"
+        },
+        "cache_puts": {
+          "type": "long"
+        },
+        "cache_size": {
+          "type": "long"
+        },
         "child": {
           "dynamic": "false",
           "properties": {
@@ -8750,6 +9727,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -8769,6 +9750,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -8776,6 +9761,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -8806,6 +9795,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -8941,6 +9934,15 @@
             "region": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "service": {
+              "dynamic": "false",
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -8952,7 +9954,7 @@
                   "type": "long"
                 },
                 "gen0size": {
-                  "type": "float"
+                  "type": "long"
                 },
                 "gen1size": {
                   "type": "float"
@@ -8962,6 +9964,9 @@
                 },
                 "gen3size": {
                   "type": "float"
+                },
+                "time": {
+                  "type": "long"
                 }
               }
             }
@@ -8972,6 +9977,10 @@
             "exists": {
               "type": "boolean"
             },
+            "signing_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "status": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -8980,6 +9989,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "team_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "trusted": {
               "type": "boolean"
             },
@@ -9020,6 +10033,19 @@
             }
           }
         },
+        "data_stream": {
+          "properties": {
+            "dataset": {
+              "type": "constant_keyword"
+            },
+            "namespace": {
+              "type": "constant_keyword"
+            },
+            "type": {
+              "type": "constant_keyword"
+            }
+          }
+        },
         "destination": {
           "properties": {
             "address": {
@@ -9060,6 +10086,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -9079,6 +10109,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -9086,6 +10120,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -9116,6 +10154,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -9189,6 +10231,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -9197,6 +10243,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -9222,6 +10272,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -9402,6 +10456,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "grouping_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "id": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -9564,6 +10622,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -9572,6 +10634,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -9627,6 +10693,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -9829,6 +10899,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "continent_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "continent_name": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -9848,6 +10922,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "postal_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "region_iso_code": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -9855,6 +10933,10 @@
             "region_name": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "timezone": {
+              "ignore_above": 1024,
+              "type": "keyword"
             }
           }
         },
@@ -9919,7 +11001,7 @@
                       "type": "float"
                     },
                     "stack": {
-                      "type": "long"
+                      "type": "float"
                     },
                     "total": {
                       "type": "float"
@@ -9963,6 +11045,70 @@
             "sha512": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "ssdeep": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "hikaricp_connections_acquire": {
+          "properties": {
+            "count": {
+              "type": "long"
+            },
+            "sum": {
+              "properties": {
+                "us": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "hikaricp_connections_active": {
+          "type": "long"
+        },
+        "hikaricp_connections_creation": {
+          "properties": {
+            "count": {
+              "type": "long"
+            },
+            "sum": {
+              "properties": {
+                "us": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "hikaricp_connections_idle": {
+          "type": "long"
+        },
+        "hikaricp_connections_max": {
+          "type": "long"
+        },
+        "hikaricp_connections_min": {
+          "type": "long"
+        },
+        "hikaricp_connections_pending": {
+          "type": "long"
+        },
+        "hikaricp_connections_timeout": {
+          "type": "long"
+        },
+        "hikaricp_connections_usage": {
+          "properties": {
+            "count": {
+              "type": "long"
+            },
+            "sum": {
+              "properties": {
+                "us": {
+                  "type": "float"
+                }
+              }
             }
           }
         },
@@ -9976,6 +11122,32 @@
             "containerized": {
               "type": "boolean"
             },
+            "cpu": {
+              "properties": {
+                "usage": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                }
+              }
+            },
+            "disk": {
+              "properties": {
+                "read": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "write": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -9986,6 +11158,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -10005,6 +11181,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -10012,6 +11192,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -10034,6 +11218,30 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "network": {
+              "properties": {
+                "egress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "ingress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "os": {
               "properties": {
                 "build": {
@@ -10076,6 +11284,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -10180,10 +11392,18 @@
                   "enabled": false,
                   "type": "object"
                 },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "method": {
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "mime_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "referrer": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -10219,6 +11439,10 @@
                   "enabled": false,
                   "type": "object"
                 },
+                "mime_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status_code": {
                   "type": "long"
                 }
@@ -10230,6 +11454,20 @@
             }
           }
         },
+        "http_server_requests": {
+          "properties": {
+            "count": {
+              "type": "long"
+            },
+            "sum": {
+              "properties": {
+                "us": {
+                  "type": "float"
+                }
+              }
+            }
+          }
+        },
         "interface": {
           "properties": {
             "alias": {
@@ -10246,6 +11484,18 @@
             }
           }
         },
+        "jdbc_connections_active": {
+          "type": "long"
+        },
+        "jdbc_connections_idle": {
+          "type": "long"
+        },
+        "jdbc_connections_max": {
+          "type": "long"
+        },
+        "jdbc_connections_min": {
+          "type": "long"
+        },
         "jvm": {
           "properties": {
             "gc": {
@@ -10313,6 +11563,68 @@
             }
           }
         },
+        "jvm_buffer_count": {
+          "type": "long"
+        },
+        "jvm_buffer_memory_used": {
+          "type": "long"
+        },
+        "jvm_buffer_total_capacity": {
+          "type": "long"
+        },
+        "jvm_classes_loaded": {
+          "type": "long"
+        },
+        "jvm_classes_unloaded": {
+          "type": "long"
+        },
+        "jvm_gc_live_data_size": {
+          "type": "long"
+        },
+        "jvm_gc_max_data_size": {
+          "type": "float"
+        },
+        "jvm_gc_memory_allocated": {
+          "type": "float"
+        },
+        "jvm_gc_memory_promoted": {
+          "type": "float"
+        },
+        "jvm_gc_pause": {
+          "properties": {
+            "count": {
+              "type": "long"
+            },
+            "sum": {
+              "properties": {
+                "us": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "jvm_memory_committed": {
+          "type": "float"
+        },
+        "jvm_memory_max": {
+          "type": "float"
+        },
+        "jvm_memory_used": {
+          "type": "float"
+        },
+        "jvm_threads_daemon": {
+          "type": "long"
+        },
+        "jvm_threads_live": {
+          "type": "long"
+        },
+        "jvm_threads_peak": {
+          "type": "long"
+        },
+        "jvm_threads_states": {
+          "type": "long"
+        },
         "kubernetes": {
           "dynamic": "false",
           "properties": {
@@ -10326,8 +11638,8 @@
             "container": {
               "properties": {
                 "image": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
+                  "path": "container.image.name",
+                  "type": "alias"
                 },
                 "name": {
                   "ignore_above": 1024,
@@ -10368,6 +11680,9 @@
             },
             "pod": {
               "properties": {
+                "ip": {
+                  "type": "ip"
+                },
                 "name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -10386,48 +11701,148 @@
                 }
               }
             },
-            "statefulset": {
-              "properties": {
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "labels": {
-          "dynamic": "true",
-          "properties": {
-            "city": {
+            "selectors": {
+              "properties": {
+                "*": {
+                  "type": "object"
+                }
+              }
+            },
+            "statefulset": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "labels": {
+          "dynamic": "true",
+          "properties": {
+            "a": {
+              "type": "keyword"
+            },
+            "action": {
+              "type": "keyword"
+            },
+            "antifraud_order_check_price_range": {
+              "type": "keyword"
+            },
+            "antifraud_order_check_shipping_country": {
+              "type": "keyword"
+            },
+            "antifraud_order_check_success": {
+              "type": "keyword"
+            },
+            "area": {
+              "type": "keyword"
+            },
+            "cache": {
+              "type": "keyword"
+            },
+            "cause": {
+              "type": "keyword"
+            },
+            "charset": {
+              "type": "keyword"
+            },
+            "city": {
+              "type": "keyword"
+            },
+            "connection": {
+              "type": "keyword"
+            },
+            "country_code": {
+              "type": "keyword"
+            },
+            "env": {
+              "type": "keyword"
+            },
+            "etag": {
+              "type": "keyword"
+            },
+            "exception": {
+              "type": "keyword"
+            },
+            "generation": {
+              "type": "keyword"
+            },
+            "git_rev": {
+              "type": "keyword"
+            },
+            "hostname": {
+              "type": "keyword"
+            },
+            "id": {
+              "type": "keyword"
+            },
+            "implementation": {
+              "type": "keyword"
+            },
+            "in_eu": {
+              "type": "boolean"
+            },
+            "ip": {
+              "type": "keyword"
+            },
+            "lang": {
+              "type": "keyword"
+            },
+            "level": {
+              "type": "keyword"
+            },
+            "major": {
+              "type": "keyword"
+            },
+            "method": {
+              "type": "keyword"
+            },
+            "minor": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "outcome": {
               "type": "keyword"
             },
-            "country_code": {
+            "patchlevel": {
               "type": "keyword"
             },
-            "env": {
+            "pool": {
               "type": "keyword"
             },
-            "git_rev": {
+            "result": {
               "type": "keyword"
             },
-            "hostname": {
+            "shipping_country": {
               "type": "keyword"
             },
-            "in_eu": {
-              "type": "boolean"
+            "state": {
+              "type": "keyword"
             },
-            "ip": {
+            "status": {
               "type": "keyword"
             },
-            "lang": {
+            "transport": {
               "type": "keyword"
             },
-            "name": {
+            "type": {
               "type": "keyword"
             },
             "u": {
               "type": "keyword"
+            },
+            "uri": {
+              "type": "keyword"
+            },
+            "version": {
+              "type": "keyword"
+            },
+            "view": {
+              "type": "keyword"
             }
           }
         },
@@ -10504,18 +11919,29 @@
             }
           }
         },
+        "logback_events": {
+          "type": "long"
+        },
         "message": {
           "norms": false,
           "type": "text"
         },
         "metricset": {
           "properties": {
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "period": {
+              "meta": {
+                "unit": "ms"
+              },
               "type": "long"
             }
           }
         },
         "network": {
+          "dynamic": "false",
           "properties": {
             "application": {
               "ignore_above": 1024,
@@ -10524,10 +11950,34 @@
             "bytes": {
               "type": "long"
             },
+            "carrier": {
+              "properties": {
+                "icc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mcc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mnc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "community_id": {
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "connection_type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "direction": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -10600,9 +12050,6 @@
                           "type": "float"
                         }
                       }
-                    },
-                    "ns": {
-                      "type": "long"
                     }
                   }
                 }
@@ -10705,6 +12152,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -10724,6 +12175,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -10731,6 +12186,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -10823,6 +12282,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -10854,6 +12317,80 @@
             }
           }
         },
+        "orchestrator": {
+          "properties": {
+            "api_version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "cluster": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "url": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "namespace": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "organization": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "resource": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "order": {
+          "properties": {
+            "count": {
+              "type": "long"
+            },
+            "sum": {
+              "type": "long"
+            }
+          }
+        },
+        "order_count_counter": {
+          "type": "long"
+        },
+        "order_per_country": {
+          "properties": {
+            "count": {
+              "type": "long"
+            },
+            "sum": {
+              "type": "long"
+            }
+          }
+        },
+        "order_value_counter": {
+          "type": "long"
+        },
         "organization": {
           "properties": {
             "id": {
@@ -10906,6 +12443,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "version": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -11022,6 +12563,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -11030,6 +12575,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -11082,6 +12631,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -11109,6 +12662,10 @@
                     "exists": {
                       "type": "boolean"
                     },
+                    "signing_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
                     "status": {
                       "ignore_above": 1024,
                       "type": "keyword"
@@ -11117,6 +12674,10 @@
                       "ignore_above": 1024,
                       "type": "keyword"
                     },
+                    "team_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
                     "trusted": {
                       "type": "boolean"
                     },
@@ -11169,6 +12730,10 @@
                     "sha512": {
                       "ignore_above": 1024,
                       "type": "keyword"
+                    },
+                    "ssdeep": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
                     }
                   }
                 },
@@ -11336,6 +12901,21 @@
             }
           }
         },
+        "process_cpu_usage": {
+          "type": "float"
+        },
+        "process_files_max": {
+          "type": "long"
+        },
+        "process_files_open": {
+          "type": "long"
+        },
+        "process_start_time": {
+          "type": "float"
+        },
+        "process_uptime": {
+          "type": "float"
+        },
         "processor": {
           "properties": {
             "event": {
@@ -11368,11 +12948,17 @@
             "cpu": {
               "properties": {
                 "ns": {
+                  "meta": {
+                    "unit": "nanos"
+                  },
                   "type": "long"
                 }
               }
             },
             "duration": {
+              "meta": {
+                "unit": "nanos"
+              },
               "type": "long"
             },
             "id": {
@@ -11439,6 +13025,131 @@
                   "type": "long"
                 }
               }
+            },
+            "wall": {
+              "properties": {
+                "us": {
+                  "meta": {
+                    "unit": "micros"
+                  },
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "prometheus": {
+          "properties": {
+            "metrics": {
+              "properties": {
+                "django_http_ajax_requests": {
+                  "type": "long"
+                },
+                "django_http_exceptions_total_by_type": {
+                  "type": "long"
+                },
+                "django_http_exceptions_total_by_view": {
+                  "type": "long"
+                },
+                "django_http_requests_before_middlewares": {
+                  "type": "long"
+                },
+                "django_http_requests_total_by_method": {
+                  "type": "long"
+                },
+                "django_http_requests_total_by_transport": {
+                  "type": "long"
+                },
+                "django_http_requests_total_by_view_transport_method": {
+                  "type": "long"
+                },
+                "django_http_requests_unknown_latency": {
+                  "type": "long"
+                },
+                "django_http_requests_unknown_latency_including_middlewares": {
+                  "type": "long"
+                },
+                "django_http_responses_before_middlewares": {
+                  "type": "long"
+                },
+                "django_http_responses_streaming": {
+                  "type": "long"
+                },
+                "django_http_responses_total_by_charset": {
+                  "type": "long"
+                },
+                "django_http_responses_total_by_status": {
+                  "type": "long"
+                },
+                "django_http_responses_total_by_status_view_method": {
+                  "type": "long"
+                },
+                "django_migrations_applied_total": {
+                  "type": "long"
+                },
+                "django_migrations_unapplied_total": {
+                  "type": "long"
+                },
+                "opbeans_python_line_items": {
+                  "type": "long"
+                },
+                "opbeans_python_orders": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    },
+                    "sum": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "process_cpu_seconds": {
+                  "type": "float"
+                },
+                "process_max_fds": {
+                  "type": "float"
+                },
+                "process_open_fds": {
+                  "type": "long"
+                },
+                "process_resident_memory_bytes": {
+                  "type": "float"
+                },
+                "process_start_time_seconds": {
+                  "type": "float"
+                },
+                "process_virtual_memory_bytes": {
+                  "type": "float"
+                },
+                "python_gc_collections": {
+                  "type": "long"
+                },
+                "python_gc_objects_collected": {
+                  "type": "long"
+                },
+                "python_gc_objects_uncollectable": {
+                  "type": "long"
+                },
+                "python_info": {
+                  "type": "long"
+                },
+                "random_counter": {
+                  "type": "long"
+                },
+                "random_gauge": {
+                  "type": "float"
+                },
+                "random_summary": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    },
+                    "sum": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
             }
           }
         },
@@ -11616,6 +13327,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -11635,6 +13350,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -11642,6 +13361,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -11672,6 +13395,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -11815,6 +13542,18 @@
             }
           }
         },
+        "session": {
+          "dynamic": "false",
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sequence": {
+              "type": "long"
+            }
+          }
+        },
         "source": {
           "dynamic": "false",
           "properties": {
@@ -11856,6 +13595,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -11875,6 +13618,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -11882,6 +13629,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -11912,6 +13663,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -12040,6 +13795,9 @@
                         "sum": {
                           "properties": {
                             "us": {
+                              "meta": {
+                                "unit": "micros"
+                              },
                               "type": "long"
                             }
                           }
@@ -12097,6 +13855,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -12132,6 +13893,10 @@
                     "norm": {
                       "properties": {
                         "pct": {
+                          "meta": {
+                            "metric_type": "gauge",
+                            "unit": "percent"
+                          },
                           "scaling_factor": 1000,
                           "type": "scaled_float"
                         }
@@ -12146,11 +13911,19 @@
                 "actual": {
                   "properties": {
                     "free": {
+                      "meta": {
+                        "metric_type": "gauge",
+                        "unit": "byte"
+                      },
                       "type": "long"
                     }
                   }
                 },
                 "total": {
+                  "meta": {
+                    "metric_type": "gauge",
+                    "unit": "byte"
+                  },
                   "type": "long"
                 }
               }
@@ -12159,6 +13932,86 @@
               "properties": {
                 "cgroup": {
                   "properties": {
+                    "cpu": {
+                      "properties": {
+                        "cfs": {
+                          "properties": {
+                            "period": {
+                              "properties": {
+                                "us": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "micros"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "quota": {
+                              "properties": {
+                                "us": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "micros"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "stats": {
+                          "properties": {
+                            "periods": {
+                              "meta": {
+                                "metric_type": "counter"
+                              },
+                              "type": "long"
+                            },
+                            "throttled": {
+                              "properties": {
+                                "ns": {
+                                  "meta": {
+                                    "metric_type": "counter",
+                                    "unit": "nanos"
+                                  },
+                                  "type": "long"
+                                },
+                                "periods": {
+                                  "meta": {
+                                    "metric_type": "counter"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "cpuacct": {
+                      "properties": {
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "total": {
+                          "properties": {
+                            "ns": {
+                              "meta": {
+                                "metric_type": "counter",
+                                "unit": "nanos"
+                              },
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
                     "memory": {
                       "properties": {
                         "mem": {
@@ -12166,6 +14019,10 @@
                             "limit": {
                               "properties": {
                                 "bytes": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "byte"
+                                  },
                                   "type": "long"
                                 }
                               }
@@ -12173,6 +14030,10 @@
                             "usage": {
                               "properties": {
                                 "bytes": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "byte"
+                                  },
                                   "type": "long"
                                 }
                               }
@@ -12212,6 +14073,10 @@
                         "norm": {
                           "properties": {
                             "pct": {
+                              "meta": {
+                                "metric_type": "gauge",
+                                "unit": "percent"
+                              },
                               "scaling_factor": 1000,
                               "type": "scaled_float"
                             }
@@ -12237,11 +14102,19 @@
                     "rss": {
                       "properties": {
                         "bytes": {
+                          "meta": {
+                            "metric_type": "gauge",
+                            "unit": "byte"
+                          },
                           "type": "long"
                         }
                       }
                     },
                     "size": {
+                      "meta": {
+                        "metric_type": "gauge",
+                        "unit": "byte"
+                      },
                       "type": "long"
                     }
                   }
@@ -12250,6 +14123,15 @@
             }
           }
         },
+        "system_cpu_count": {
+          "type": "long"
+        },
+        "system_cpu_usage": {
+          "type": "float"
+        },
+        "system_load_average_1m": {
+          "type": "float"
+        },
         "tags": {
           "ignore_above": 1024,
           "type": "keyword"
@@ -12295,6 +14177,28 @@
                 "reference": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "subtechnique": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "reference": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
                 }
               }
             }
@@ -12655,6 +14559,24 @@
             }
           }
         },
+        "tomcat_sessions_active_current": {
+          "type": "long"
+        },
+        "tomcat_sessions_active_max": {
+          "type": "long"
+        },
+        "tomcat_sessions_alive_max": {
+          "type": "long"
+        },
+        "tomcat_sessions_created": {
+          "type": "long"
+        },
+        "tomcat_sessions_expired": {
+          "type": "long"
+        },
+        "tomcat_sessions_rejected": {
+          "type": "long"
+        },
         "trace": {
           "dynamic": "false",
           "properties": {
@@ -12664,34 +14586,6 @@
             }
           }
         },
-        "tracing": {
-          "properties": {
-            "span": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "trace": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "transaction": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
         "transaction": {
           "dynamic": "false",
           "properties": {
@@ -12713,6 +14607,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -12818,6 +14715,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -12889,6 +14789,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -12902,10 +14806,130 @@
         "user": {
           "dynamic": "false",
           "properties": {
+            "changes": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "domain": {
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "effective": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "email": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -12951,6 +14975,66 @@
             "roles": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "target": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -13001,6 +15085,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -13013,10 +15101,6 @@
             }
           }
         },
-        "view spans": {
-          "ignore_above": 1024,
-          "type": "keyword"
-        },
         "vlan": {
           "properties": {
             "id": {
@@ -13205,6 +15289,9 @@
     },
     "settings": {
       "index": {
+        "blocks": {
+          "read_only_allow_delete": "false"
+        },
         "codec": "best_compression",
         "lifecycle": {
           "name": "apm-rollover-30-days",
@@ -13218,7 +15305,6 @@
         "max_docvalue_fields_search": "200",
         "number_of_replicas": "1",
         "number_of_shards": "1",
-        "priority": "100",
         "refresh_interval": "5s"
       }
     }
@@ -13233,7 +15319,7 @@
         "is_write_index": true
       }
     },
-    "index": "apm-8.0.0-span-2020.12.03-000001",
+    "index": "apm-8.0.0-span-000008",
     "mappings": {
       "_meta": {
         "beat": "apm",
@@ -13294,84 +15380,11 @@
           }
         },
         {
-          "labels_string": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_string": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_string": {
+          "kubernetes.selectors.*": {
             "mapping": {
               "type": "keyword"
             },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
+            "path_match": "kubernetes.selectors.*"
           }
         },
         {
@@ -13402,30 +15415,10 @@
           }
         },
         {
-          "labels_string": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
+          "histogram": {
             "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
+              "type": "histogram"
+            }
           }
         },
         {
@@ -13568,6 +15561,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -13587,6 +15584,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -13594,6 +15595,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -13624,6 +15629,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -13759,6 +15768,15 @@
             "region": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "service": {
+              "dynamic": "false",
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -13767,6 +15785,10 @@
             "exists": {
               "type": "boolean"
             },
+            "signing_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "status": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -13775,6 +15797,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "team_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "trusted": {
               "type": "boolean"
             },
@@ -13815,6 +15841,19 @@
             }
           }
         },
+        "data_stream": {
+          "properties": {
+            "dataset": {
+              "type": "constant_keyword"
+            },
+            "namespace": {
+              "type": "constant_keyword"
+            },
+            "type": {
+              "type": "constant_keyword"
+            }
+          }
+        },
         "destination": {
           "properties": {
             "address": {
@@ -13855,6 +15894,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -13874,6 +15917,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -13881,6 +15928,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -13911,6 +15962,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -13984,6 +16039,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -13992,6 +16051,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -14017,6 +16080,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -14197,6 +16264,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "grouping_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "id": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -14359,6 +16430,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -14367,6 +16442,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -14422,6 +16501,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -14624,6 +16707,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "continent_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "continent_name": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -14639,7 +16726,11 @@
             "location": {
               "type": "geo_point"
             },
-            "name": {
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "postal_code": {
               "ignore_above": 1024,
               "type": "keyword"
             },
@@ -14650,6 +16741,10 @@
             "region_name": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "timezone": {
+              "ignore_above": 1024,
+              "type": "keyword"
             }
           }
         },
@@ -14686,6 +16781,10 @@
             "sha512": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "ssdeep": {
+              "ignore_above": 1024,
+              "type": "keyword"
             }
           }
         },
@@ -14699,6 +16798,32 @@
             "containerized": {
               "type": "boolean"
             },
+            "cpu": {
+              "properties": {
+                "usage": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                }
+              }
+            },
+            "disk": {
+              "properties": {
+                "read": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "write": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -14709,6 +16834,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -14728,6 +16857,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -14735,6 +16868,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -14757,6 +16894,30 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "network": {
+              "properties": {
+                "egress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "ingress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "os": {
               "properties": {
                 "build": {
@@ -14799,6 +16960,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -14903,10 +17068,18 @@
                   "enabled": false,
                   "type": "object"
                 },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "method": {
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "mime_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "referrer": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -14942,6 +17115,10 @@
                   "enabled": false,
                   "type": "object"
                 },
+                "mime_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status_code": {
                   "type": "long"
                 }
@@ -14982,8 +17159,8 @@
             "container": {
               "properties": {
                 "image": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
+                  "path": "container.image.name",
+                  "type": "alias"
                 },
                 "name": {
                   "ignore_above": 1024,
@@ -15024,6 +17201,9 @@
             },
             "pod": {
               "properties": {
+                "ip": {
+                  "type": "ip"
+                },
                 "name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -15042,6 +17222,13 @@
                 }
               }
             },
+            "selectors": {
+              "properties": {
+                "*": {
+                  "type": "object"
+                }
+              }
+            },
             "statefulset": {
               "properties": {
                 "name": {
@@ -15061,6 +17248,22 @@
             "country_code": {
               "type": "keyword"
             },
+            "events_encoded": {
+              "scaling_factor": 1000000,
+              "type": "scaled_float"
+            },
+            "events_failed": {
+              "scaling_factor": 1000000,
+              "type": "scaled_float"
+            },
+            "events_original": {
+              "scaling_factor": 1000000,
+              "type": "scaled_float"
+            },
+            "events_published": {
+              "scaling_factor": 1000000,
+              "type": "scaled_float"
+            },
             "foo": {
               "type": "keyword"
             },
@@ -15076,10 +17279,10 @@
             "lang": {
               "type": "keyword"
             },
-            "productId": {
+            "plugin": {
               "type": "keyword"
             },
-            "u": {
+            "productId": {
               "type": "keyword"
             }
           }
@@ -15163,12 +17366,20 @@
         },
         "metricset": {
           "properties": {
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "period": {
+              "meta": {
+                "unit": "ms"
+              },
               "type": "long"
             }
           }
         },
         "network": {
+          "dynamic": "false",
           "properties": {
             "application": {
               "ignore_above": 1024,
@@ -15177,10 +17388,34 @@
             "bytes": {
               "type": "long"
             },
+            "carrier": {
+              "properties": {
+                "icc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mcc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mnc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "community_id": {
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "connection_type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "direction": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -15286,6 +17521,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -15305,6 +17544,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -15312,6 +17555,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -15404,6 +17651,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -15435,6 +17686,54 @@
             }
           }
         },
+        "orchestrator": {
+          "properties": {
+            "api_version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "cluster": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "url": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "namespace": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "organization": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "resource": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
         "organization": {
           "properties": {
             "id": {
@@ -15487,6 +17786,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "version": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -15603,6 +17906,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -15611,6 +17918,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -15663,6 +17974,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -15690,6 +18005,10 @@
                     "exists": {
                       "type": "boolean"
                     },
+                    "signing_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
                     "status": {
                       "ignore_above": 1024,
                       "type": "keyword"
@@ -15698,6 +18017,10 @@
                       "ignore_above": 1024,
                       "type": "keyword"
                     },
+                    "team_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
                     "trusted": {
                       "type": "boolean"
                     },
@@ -15750,6 +18073,10 @@
                     "sha512": {
                       "ignore_above": 1024,
                       "type": "keyword"
+                    },
+                    "ssdeep": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
                     }
                   }
                 },
@@ -15949,11 +18276,17 @@
             "cpu": {
               "properties": {
                 "ns": {
+                  "meta": {
+                    "unit": "nanos"
+                  },
                   "type": "long"
                 }
               }
             },
             "duration": {
+              "meta": {
+                "unit": "nanos"
+              },
               "type": "long"
             },
             "id": {
@@ -16020,6 +18353,16 @@
                   "type": "long"
                 }
               }
+            },
+            "wall": {
+              "properties": {
+                "us": {
+                  "meta": {
+                    "unit": "micros"
+                  },
+                  "type": "long"
+                }
+              }
             }
           }
         },
@@ -16162,6 +18505,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -16181,6 +18528,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -16188,6 +18539,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -16218,6 +18573,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -16361,6 +18720,18 @@
             }
           }
         },
+        "session": {
+          "dynamic": "false",
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sequence": {
+              "type": "long"
+            }
+          }
+        },
         "source": {
           "dynamic": "false",
           "properties": {
@@ -16402,6 +18773,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -16421,6 +18796,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -16428,6 +18807,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -16458,6 +18841,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -16552,6 +18939,25 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "composite": {
+              "dynamic": "false",
+              "properties": {
+                "compression_strategy": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "count": {
+                  "type": "long"
+                },
+                "sum": {
+                  "properties": {
+                    "us": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "db": {
               "dynamic": "false",
               "properties": {
@@ -16586,6 +18992,9 @@
                         "sum": {
                           "properties": {
                             "us": {
+                              "meta": {
+                                "unit": "micros"
+                              },
                               "type": "long"
                             }
                           }
@@ -16643,6 +19052,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -16678,6 +19090,10 @@
                     "norm": {
                       "properties": {
                         "pct": {
+                          "meta": {
+                            "metric_type": "gauge",
+                            "unit": "percent"
+                          },
                           "scaling_factor": 1000,
                           "type": "scaled_float"
                         }
@@ -16692,11 +19108,19 @@
                 "actual": {
                   "properties": {
                     "free": {
+                      "meta": {
+                        "metric_type": "gauge",
+                        "unit": "byte"
+                      },
                       "type": "long"
                     }
                   }
                 },
                 "total": {
+                  "meta": {
+                    "metric_type": "gauge",
+                    "unit": "byte"
+                  },
                   "type": "long"
                 }
               }
@@ -16705,6 +19129,86 @@
               "properties": {
                 "cgroup": {
                   "properties": {
+                    "cpu": {
+                      "properties": {
+                        "cfs": {
+                          "properties": {
+                            "period": {
+                              "properties": {
+                                "us": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "micros"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "quota": {
+                              "properties": {
+                                "us": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "micros"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "stats": {
+                          "properties": {
+                            "periods": {
+                              "meta": {
+                                "metric_type": "counter"
+                              },
+                              "type": "long"
+                            },
+                            "throttled": {
+                              "properties": {
+                                "ns": {
+                                  "meta": {
+                                    "metric_type": "counter",
+                                    "unit": "nanos"
+                                  },
+                                  "type": "long"
+                                },
+                                "periods": {
+                                  "meta": {
+                                    "metric_type": "counter"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "cpuacct": {
+                      "properties": {
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "total": {
+                          "properties": {
+                            "ns": {
+                              "meta": {
+                                "metric_type": "counter",
+                                "unit": "nanos"
+                              },
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
                     "memory": {
                       "properties": {
                         "mem": {
@@ -16712,6 +19216,10 @@
                             "limit": {
                               "properties": {
                                 "bytes": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "byte"
+                                  },
                                   "type": "long"
                                 }
                               }
@@ -16719,6 +19227,10 @@
                             "usage": {
                               "properties": {
                                 "bytes": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "byte"
+                                  },
                                   "type": "long"
                                 }
                               }
@@ -16736,6 +19248,10 @@
                         "norm": {
                           "properties": {
                             "pct": {
+                              "meta": {
+                                "metric_type": "gauge",
+                                "unit": "percent"
+                              },
                               "scaling_factor": 1000,
                               "type": "scaled_float"
                             }
@@ -16750,11 +19266,19 @@
                     "rss": {
                       "properties": {
                         "bytes": {
+                          "meta": {
+                            "metric_type": "gauge",
+                            "unit": "byte"
+                          },
                           "type": "long"
                         }
                       }
                     },
                     "size": {
+                      "meta": {
+                        "metric_type": "gauge",
+                        "unit": "byte"
+                      },
                       "type": "long"
                     }
                   }
@@ -16808,6 +19332,28 @@
                 "reference": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "subtechnique": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "reference": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
                 }
               }
             }
@@ -17177,34 +19723,6 @@
             }
           }
         },
-        "tracing": {
-          "properties": {
-            "span": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "trace": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "transaction": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
         "transaction": {
           "dynamic": "false",
           "properties": {
@@ -17226,6 +19744,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -17331,6 +19852,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -17402,6 +19926,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -17415,10 +19943,130 @@
         "user": {
           "dynamic": "false",
           "properties": {
+            "changes": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "domain": {
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "effective": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "email": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -17448,22 +20096,82 @@
                   "type": "keyword"
                 }
               }
-            },
-            "hash": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "roles": {
-              "ignore_above": 1024,
-              "type": "keyword"
+            },
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "roles": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "target": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -17514,6 +20222,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -17526,10 +20238,6 @@
             }
           }
         },
-        "view spans": {
-          "ignore_above": 1024,
-          "type": "keyword"
-        },
         "vlan": {
           "properties": {
             "id": {
@@ -17731,7 +20439,6 @@
         "max_docvalue_fields_search": "200",
         "number_of_replicas": "1",
         "number_of_shards": "1",
-        "priority": "100",
         "refresh_interval": "5s"
       }
     }
@@ -17746,7 +20453,7 @@
         "is_write_index": true
       }
     },
-    "index": "apm-8.0.0-transaction-2020.12.03-000001",
+    "index": "apm-8.0.0-transaction-000002",
     "mappings": {
       "_meta": {
         "beat": "apm",
@@ -17807,84 +20514,11 @@
           }
         },
         {
-          "labels_string": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_string": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_string": {
+          "kubernetes.selectors.*": {
             "mapping": {
               "type": "keyword"
             },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
+            "path_match": "kubernetes.selectors.*"
           }
         },
         {
@@ -17915,30 +20549,10 @@
           }
         },
         {
-          "labels_string": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
+          "histogram": {
             "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
+              "type": "histogram"
+            }
           }
         },
         {
@@ -18081,6 +20695,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -18100,6 +20718,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -18107,6 +20729,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -18137,6 +20763,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -18272,6 +20902,15 @@
             "region": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "service": {
+              "dynamic": "false",
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -18280,6 +20919,10 @@
             "exists": {
               "type": "boolean"
             },
+            "signing_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "status": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -18288,6 +20931,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "team_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "trusted": {
               "type": "boolean"
             },
@@ -18328,6 +20975,19 @@
             }
           }
         },
+        "data_stream": {
+          "properties": {
+            "dataset": {
+              "type": "constant_keyword"
+            },
+            "namespace": {
+              "type": "constant_keyword"
+            },
+            "type": {
+              "type": "constant_keyword"
+            }
+          }
+        },
         "destination": {
           "properties": {
             "address": {
@@ -18368,6 +21028,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -18387,6 +21051,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -18394,6 +21062,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -18424,6 +21096,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -18497,6 +21173,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -18505,6 +21185,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -18530,6 +21214,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -18710,6 +21398,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "grouping_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "id": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -18872,6 +21564,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -18880,6 +21576,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -18935,6 +21635,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -19137,6 +21841,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "continent_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "continent_name": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -19156,6 +21864,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "postal_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "region_iso_code": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -19163,6 +21875,10 @@
             "region_name": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "timezone": {
+              "ignore_above": 1024,
+              "type": "keyword"
             }
           }
         },
@@ -19199,6 +21915,10 @@
             "sha512": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "ssdeep": {
+              "ignore_above": 1024,
+              "type": "keyword"
             }
           }
         },
@@ -19212,6 +21932,32 @@
             "containerized": {
               "type": "boolean"
             },
+            "cpu": {
+              "properties": {
+                "usage": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                }
+              }
+            },
+            "disk": {
+              "properties": {
+                "read": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "write": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -19222,6 +21968,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -19241,6 +21991,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -19248,6 +22002,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -19270,6 +22028,30 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "network": {
+              "properties": {
+                "egress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "ingress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "os": {
               "properties": {
                 "build": {
@@ -19312,6 +22094,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -19416,10 +22202,18 @@
                   "enabled": false,
                   "type": "object"
                 },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "method": {
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "mime_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "referrer": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -19455,6 +22249,10 @@
                   "enabled": false,
                   "type": "object"
                 },
+                "mime_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status_code": {
                   "type": "long"
                 }
@@ -19495,8 +22293,8 @@
             "container": {
               "properties": {
                 "image": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
+                  "path": "container.image.name",
+                  "type": "alias"
                 },
                 "name": {
                   "ignore_above": 1024,
@@ -19537,6 +22335,9 @@
             },
             "pod": {
               "properties": {
+                "ip": {
+                  "type": "ip"
+                },
                 "name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -19555,6 +22356,13 @@
                 }
               }
             },
+            "selectors": {
+              "properties": {
+                "*": {
+                  "type": "object"
+                }
+              }
+            },
             "statefulset": {
               "properties": {
                 "name": {
@@ -19607,16 +22415,26 @@
             "multi-line": {
               "type": "keyword"
             },
+            "plugin": {
+              "type": "keyword"
+            },
             "request_id": {
               "type": "keyword"
             },
             "served_from_cache": {
               "type": "keyword"
             },
+            "session_id": {
+              "type": "keyword"
+            },
+            "session_seq": {
+              "scaling_factor": 1000000,
+              "type": "scaled_float"
+            },
             "this-is-a-very-long-tag-name-without-any-spaces": {
               "type": "keyword"
             },
-            "u": {
+            "worker": {
               "type": "keyword"
             }
           }
@@ -19700,12 +22518,20 @@
         },
         "metricset": {
           "properties": {
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "period": {
+              "meta": {
+                "unit": "ms"
+              },
               "type": "long"
             }
           }
         },
         "network": {
+          "dynamic": "false",
           "properties": {
             "application": {
               "ignore_above": 1024,
@@ -19714,10 +22540,34 @@
             "bytes": {
               "type": "long"
             },
+            "carrier": {
+              "properties": {
+                "icc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mcc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mnc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "community_id": {
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "connection_type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "direction": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -19823,6 +22673,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -19842,6 +22696,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -19849,6 +22707,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -19941,6 +22803,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -19972,6 +22838,54 @@
             }
           }
         },
+        "orchestrator": {
+          "properties": {
+            "api_version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "cluster": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "url": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "namespace": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "organization": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "resource": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
         "organization": {
           "properties": {
             "id": {
@@ -20024,6 +22938,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "version": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -20140,6 +23058,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -20148,6 +23070,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -20200,6 +23126,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -20227,6 +23157,10 @@
                     "exists": {
                       "type": "boolean"
                     },
+                    "signing_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
                     "status": {
                       "ignore_above": 1024,
                       "type": "keyword"
@@ -20235,6 +23169,10 @@
                       "ignore_above": 1024,
                       "type": "keyword"
                     },
+                    "team_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
                     "trusted": {
                       "type": "boolean"
                     },
@@ -20287,6 +23225,10 @@
                     "sha512": {
                       "ignore_above": 1024,
                       "type": "keyword"
+                    },
+                    "ssdeep": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
                     }
                   }
                 },
@@ -20486,11 +23428,17 @@
             "cpu": {
               "properties": {
                 "ns": {
+                  "meta": {
+                    "unit": "nanos"
+                  },
                   "type": "long"
                 }
               }
             },
             "duration": {
+              "meta": {
+                "unit": "nanos"
+              },
               "type": "long"
             },
             "id": {
@@ -20557,6 +23505,16 @@
                   "type": "long"
                 }
               }
+            },
+            "wall": {
+              "properties": {
+                "us": {
+                  "meta": {
+                    "unit": "micros"
+                  },
+                  "type": "long"
+                }
+              }
             }
           }
         },
@@ -20699,6 +23657,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -20718,6 +23680,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -20725,6 +23691,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -20755,6 +23725,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -20898,6 +23872,18 @@
             }
           }
         },
+        "session": {
+          "dynamic": "false",
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sequence": {
+              "type": "long"
+            }
+          }
+        },
         "source": {
           "dynamic": "false",
           "properties": {
@@ -20939,6 +23925,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -20958,6 +23948,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -20965,6 +23959,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -20995,6 +23993,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -21089,6 +24091,25 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "composite": {
+              "dynamic": "false",
+              "properties": {
+                "compression_strategy": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "count": {
+                  "type": "long"
+                },
+                "sum": {
+                  "properties": {
+                    "us": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "db": {
               "dynamic": "false",
               "properties": {
@@ -21123,6 +24144,9 @@
                         "sum": {
                           "properties": {
                             "us": {
+                              "meta": {
+                                "unit": "micros"
+                              },
                               "type": "long"
                             }
                           }
@@ -21180,6 +24204,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -21215,6 +24242,10 @@
                     "norm": {
                       "properties": {
                         "pct": {
+                          "meta": {
+                            "metric_type": "gauge",
+                            "unit": "percent"
+                          },
                           "scaling_factor": 1000,
                           "type": "scaled_float"
                         }
@@ -21229,11 +24260,19 @@
                 "actual": {
                   "properties": {
                     "free": {
+                      "meta": {
+                        "metric_type": "gauge",
+                        "unit": "byte"
+                      },
                       "type": "long"
                     }
                   }
                 },
                 "total": {
+                  "meta": {
+                    "metric_type": "gauge",
+                    "unit": "byte"
+                  },
                   "type": "long"
                 }
               }
@@ -21242,6 +24281,86 @@
               "properties": {
                 "cgroup": {
                   "properties": {
+                    "cpu": {
+                      "properties": {
+                        "cfs": {
+                          "properties": {
+                            "period": {
+                              "properties": {
+                                "us": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "micros"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "quota": {
+                              "properties": {
+                                "us": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "micros"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "stats": {
+                          "properties": {
+                            "periods": {
+                              "meta": {
+                                "metric_type": "counter"
+                              },
+                              "type": "long"
+                            },
+                            "throttled": {
+                              "properties": {
+                                "ns": {
+                                  "meta": {
+                                    "metric_type": "counter",
+                                    "unit": "nanos"
+                                  },
+                                  "type": "long"
+                                },
+                                "periods": {
+                                  "meta": {
+                                    "metric_type": "counter"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "cpuacct": {
+                      "properties": {
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "total": {
+                          "properties": {
+                            "ns": {
+                              "meta": {
+                                "metric_type": "counter",
+                                "unit": "nanos"
+                              },
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
                     "memory": {
                       "properties": {
                         "mem": {
@@ -21249,6 +24368,10 @@
                             "limit": {
                               "properties": {
                                 "bytes": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "byte"
+                                  },
                                   "type": "long"
                                 }
                               }
@@ -21256,6 +24379,10 @@
                             "usage": {
                               "properties": {
                                 "bytes": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "byte"
+                                  },
                                   "type": "long"
                                 }
                               }
@@ -21273,6 +24400,10 @@
                         "norm": {
                           "properties": {
                             "pct": {
+                              "meta": {
+                                "metric_type": "gauge",
+                                "unit": "percent"
+                              },
                               "scaling_factor": 1000,
                               "type": "scaled_float"
                             }
@@ -21287,11 +24418,19 @@
                     "rss": {
                       "properties": {
                         "bytes": {
+                          "meta": {
+                            "metric_type": "gauge",
+                            "unit": "byte"
+                          },
                           "type": "long"
                         }
                       }
                     },
                     "size": {
+                      "meta": {
+                        "metric_type": "gauge",
+                        "unit": "byte"
+                      },
                       "type": "long"
                     }
                   }
@@ -21345,6 +24484,28 @@
                 "reference": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "subtechnique": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "reference": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
                 }
               }
             }
@@ -21714,34 +24875,6 @@
             }
           }
         },
-        "tracing": {
-          "properties": {
-            "span": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "trace": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "transaction": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
         "transaction": {
           "dynamic": "false",
           "properties": {
@@ -21763,6 +24896,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -21956,6 +25092,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -22027,6 +25166,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -22040,10 +25183,130 @@
         "user": {
           "dynamic": "false",
           "properties": {
+            "changes": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "domain": {
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "effective": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "email": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -22089,6 +25352,66 @@
             "roles": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "target": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -22139,6 +25462,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -22151,10 +25478,6 @@
             }
           }
         },
-        "view spans": {
-          "ignore_above": 1024,
-          "type": "keyword"
-        },
         "vlan": {
           "properties": {
             "id": {
@@ -22356,9 +25679,8 @@
         "max_docvalue_fields_search": "200",
         "number_of_replicas": "1",
         "number_of_shards": "1",
-        "priority": "100",
         "refresh_interval": "5s"
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/archives_metadata.ts b/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/archives_metadata.ts
index 1697cba46873b..efb0af05668eb 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/archives_metadata.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/archives_metadata.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-/* eslint-disable import/no-default-export*/
-export default {
+/* eslint-disable-next-line*/
+    export default {
   'apm_8.0.0': {
-    start: '2020-12-08T13:57:56.135Z',
-    end: '2020-12-08T14:27:56.135Z',
+    start: '2021-07-27T08:08:11.069Z',
+    end: '2021-07-27T08:38:11.069Z',
   },
 };
diff --git a/x-pack/plugins/apm/scripts/create-functional-tests-archive/index.ts b/x-pack/plugins/apm/scripts/create-functional-tests-archive/index.ts
index 18cb641bd4e65..72c270f5e1221 100644
--- a/x-pack/plugins/apm/scripts/create-functional-tests-archive/index.ts
+++ b/x-pack/plugins/apm/scripts/create-functional-tests-archive/index.ts
@@ -37,8 +37,14 @@ async function run() {
       bool: {
         must_not: [
           {
-            term: {
-              'service.name': 'elastic-co-frontend',
+            terms: {
+              'service.name': [
+                'elastic-co-frontend',
+                'filebeat',
+                'metricbeat',
+                'heartbeat',
+                'apm-server',
+              ],
             },
           },
         ],
@@ -153,15 +159,18 @@ async function run() {
       (bucket) => bucket.key as string
     ) ?? [];
 
+  const indicesToArchive = indicesWithDocs
+    .filter((index) => !index.startsWith('.kibana'))
+    .concat('.kibana')
+    .join(',');
+
   // create the archive
   const tmpDir = path.join(__dirname, 'tmp/');
   execSync(
-    `node scripts/es_archiver save ${archiveName} ${indicesWithDocs
-      .filter((index) => !index.startsWith('.kibana'))
-      .concat('.kibana')
-      .join(
-        ','
-      )} --dir=${tmpDir} --kibana-url=${kibanaUrl} --es-url=${esUrl} --query='${JSON.stringify(
+    `node scripts/es_archiver save ${path.join(
+      tmpDir,
+      archiveName
+    )} ${indicesToArchive} --kibana-url=${kibanaUrl} --es-url=${esUrl} --query='${JSON.stringify(
       query
     )}'`,
     {
@@ -192,17 +201,11 @@ async function run() {
   fs.writeFileSync(
     configFilePath,
     `
-    /* eslint-disable import/no-default-export*/
+    /* eslint-disable-next-line*/
     export default ${JSON.stringify(newConfig, null, 2)}`,
     { encoding: 'utf-8' }
   );
 
-  // run ESLint on the generated metadata files
-  execSync('node scripts/eslint **/*/archives_metadata.ts --fix', {
-    cwd: root,
-    stdio: 'inherit',
-  });
-
   const esArchiverDir = 'fixtures/es_archiver/';
 
   const apiIntegrationDir = path.join(
@@ -220,6 +223,12 @@ async function run() {
 
   // Delete tmp folder
   execSync(`rm -rf ${tmpDir}`);
+
+  // run ESLint on the generated metadata files
+  execSync('node scripts/eslint x-pack/**/*/archives_metadata.ts --fix', {
+    cwd: root,
+    stdio: 'inherit',
+  });
 }
 
 run()
diff --git a/x-pack/plugins/apm/scripts/shared/get_es_client.ts b/x-pack/plugins/apm/scripts/shared/get_es_client.ts
index 3accb832fb0ed..522fc3608b410 100644
--- a/x-pack/plugins/apm/scripts/shared/get_es_client.ts
+++ b/x-pack/plugins/apm/scripts/shared/get_es_client.ts
@@ -30,11 +30,13 @@ export function getEsClient({
     auth,
   });
 
+  const originalSearch = client.search.bind(client);
+
   async function search<
     TDocument = unknown,
     TSearchRequest extends ESSearchRequest = ESSearchRequest
   >(request: TSearchRequest) {
-    const response = await client.search<TDocument>(request);
+    const response = await originalSearch<TDocument>(request);
 
     return {
       ...response,
diff --git a/x-pack/test/apm_api_integration/common/apm_api_supertest.ts b/x-pack/test/apm_api_integration/common/apm_api_supertest.ts
index ed104a6fdf064..5034d4fae8fbc 100644
--- a/x-pack/test/apm_api_integration/common/apm_api_supertest.ts
+++ b/x-pack/test/apm_api_integration/common/apm_api_supertest.ts
@@ -44,6 +44,8 @@ export function createApmApiSupertest(st: supertest.SuperTest<supertest.Test>) {
   };
 }
 
+export type ApmApiSupertest = ReturnType<typeof createApmApiSupertest>;
+
 export class ApmApiError extends Error {
   res: request.Response;
 
diff --git a/x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_8.0.0/data.json.gz b/x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_8.0.0/data.json.gz
index 5b2f72512ab6c..f237a83a76a3f 100644
Binary files a/x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_8.0.0/data.json.gz and b/x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_8.0.0/data.json.gz differ
diff --git a/x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_8.0.0/mappings.json b/x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_8.0.0/mappings.json
index 9f84f4885c4ce..c7cbb55c32f9b 100644
--- a/x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_8.0.0/mappings.json
+++ b/x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_8.0.0/mappings.json
@@ -3,88 +3,101 @@
   "value": {
     "aliases": {
       ".kibana": {
+      },
+      ".kibana_8.0.0": {
       }
     },
     "index": ".kibana_1",
     "mappings": {
       "_meta": {
         "migrationMappingPropertyHashes": {
-          "action": "6e96ac5e648f57523879661ea72525b7",
-          "action_task_params": "a9d49f184ee89641044be0ca2950fa3a",
-          "alert": "0359d7fcc04da9878ee9aadbda38ba55",
+          "action": "38c91d092e0790ecd9ebe58e82145280",
+          "action_task_params": "0b7bac797714726291526b250c582806",
+          "alert": "d75d3b0e95fe394753d73d8f7952cd7d",
           "api_key_pending_invalidation": "16f515278a295f6245149ad7c5ddedb7",
           "apm-indices": "9bb9b2bf1fa636ed8619cbab5ce6a1dd",
+          "apm-server-schema": "b1d71908f324c17bf744ac72af5038fb",
           "apm-telemetry": "3d1b76c39bfb2cc8296b024d73854724",
           "app_search_telemetry": "3d1b76c39bfb2cc8296b024d73854724",
           "application_usage_daily": "43b8830d5d0df85a6823d290885fc9fd",
           "application_usage_totals": "3d1b76c39bfb2cc8296b024d73854724",
           "application_usage_transactional": "3d1b76c39bfb2cc8296b024d73854724",
-          "search-session": "404e2e2355a045f400c393e751445b42",
           "canvas-element": "7390014e1091044523666d97247392fc",
           "canvas-workpad": "b0a1706d356228dbdcb4a17e6b9eb231",
           "canvas-workpad-template": "ae2673f678281e2c055d764b153e9715",
-          "cases": "477f214ff61acc3af26a7b7818e380c1",
-          "cases-comments": "8a50736330e953bca91747723a319593",
-          "cases-configure": "387c5f3a3bda7e0ae0dd4e106f914a69",
-          "cases-user-actions": "32277330ec6b721abe3b846cfd939a71",
+          "cases": "d5d6a377dfebfacb1b806d8888292b05",
+          "cases-comments": "fce468d3d08e577b67af2e958e1f9e97",
+          "cases-configure": "c250ef0bf1ac86c1a1627c0b6398c98f",
+          "cases-connector-mappings": "17d2e9e0e170a21a471285a5d845353c",
+          "cases-user-actions": "25035423b7ceb4d4f1124c441d3f6529",
           "config": "c63748b75f39d0c54de12d12c1ccbc20",
           "core-usage-stats": "3d1b76c39bfb2cc8296b024d73854724",
+          "coreMigrationVersion": "2f4316de49999235636386fe51dc06c1",
           "dashboard": "40554caf09725935e2c02e02563a2d07",
           "endpoint:user-artifact": "4a11183eee21e6fbad864f7a30b39ad0",
           "endpoint:user-artifact-manifest": "a0d7b04ad405eed54d76e279c3727862",
           "enterprise_search_telemetry": "3d1b76c39bfb2cc8296b024d73854724",
-          "epm-packages": "2b83397e3eaaaa8ef15e38813f3721c3",
-          "exception-list": "67f055ab8c10abd7b2ebfd969b836788",
-          "exception-list-agnostic": "67f055ab8c10abd7b2ebfd969b836788",
-          "file-upload-telemetry": "0ed4d3e1983d1217a30982630897092e",
+          "epm-packages": "0cbbb16506734d341a96aaed65ec6413",
+          "epm-packages-assets": "44621b2f6052ef966da47b7c3a00f33b",
+          "event_loop_delays_daily": "5df7e292ddd5028e07c1482e130e6654",
+          "exception-list": "baf108c9934dda844921f692a513adae",
+          "exception-list-agnostic": "baf108c9934dda844921f692a513adae",
+          "file-upload-usage-collection-telemetry": "a34fbb8e3263d105044869264860c697",
           "fleet-agent-actions": "9511b565b1cc6441a42033db3d5de8e9",
-          "fleet-agent-events": "e20a508b6e805189356be381dbfac8db",
-          "fleet-agents": "cb661e8ede2b640c42c8e5ef99db0683",
+          "fleet-agents": "59fd74f819f028f8555776db198d2562",
           "fleet-enrollment-api-keys": "a69ef7ae661dab31561d6c6f052ef2a7",
-          "graph-workspace": "cd7ba1330e6682e9cc00b78850874be1",
+          "fleet-preconfiguration-deletion-record": "4c36f199189a367e43541f236141204c",
+          "graph-workspace": "27a94b2edcb0610c6aea54a7c56d7752",
           "index-pattern": "45915a1ad866812242df474eb0479052",
           "infrastructure-ui-source": "3d1b76c39bfb2cc8296b024d73854724",
-          "ingest-agent-policies": "8b0733cce189659593659dad8db426f0",
-          "ingest-outputs": "8854f34453a47e26f86a29f8f3b80b4e",
-          "ingest-package-policies": "c91ca97b1ff700f0fc64dc6b13d65a85",
-          "ingest_manager_settings": "02a03095f0e05b7a538fa801b88a217f",
+          "ingest-agent-policies": "5e91121a6b10c13d8b5339c2ff721e9b",
+          "ingest-outputs": "1acb789ca37cbee70259ca79e124d9ad",
+          "ingest-package-policies": "2bdb4dbeca0d8e7b9cf620548137c695",
+          "ingest_manager_settings": "f159646d76ab261bfbf8ef504d9631e4",
           "inventory-view": "3d1b76c39bfb2cc8296b024d73854724",
           "kql-telemetry": "d12a98a6f19a2d273696597547e064ee",
+          "legacy-url-alias": "e8dd3b6056ad7e1de32523f457310ecb",
           "lens": "52346cfec69ff7b47d5f0c12361a2797",
           "lens-ui-telemetry": "509bfa5978586998e05f9e303c07a327",
-          "map": "4a05b35c3a3a58fbc72dd0202dc3487f",
+          "map": "9134b47593116d7953f6adba096fc463",
           "maps-telemetry": "5ef305b18111b77789afefbd36b66171",
           "metrics-explorer-view": "3d1b76c39bfb2cc8296b024d73854724",
           "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
           "ml-job": "3bb64c31915acf93fc724af137a0891b",
-          "ml-telemetry": "257fd1d4b4fdbb9cb4b8a3b27da201e9",
+          "ml-module": "46ef4f0d6682636f0fff9799d6a2d7ac",
           "monitoring-telemetry": "2669d5ec15e82391cf58df4294ee9c68",
           "namespace": "2f4316de49999235636386fe51dc06c1",
           "namespaces": "2f4316de49999235636386fe51dc06c1",
           "originId": "2f4316de49999235636386fe51dc06c1",
+          "osquery-saved-query": "6bb1cf319f0fd2984010592ca1ee588e",
+          "osquery-usage-metric": "4dc4f647d27247c002f56f22742175fe",
           "query": "11aaeb7f5f7fa5bb43f25e18ce26e7d9",
           "references": "7997cf5a56cc02bdc9c93361bde732b0",
           "sample-data-telemetry": "7d3cfeb915303c9641c59681967ffeb4",
-          "search": "43012c7ebc4cb57054e0a490e4b43023",
+          "search": "db2c00e39b36f40930a3b9fc71c823e1",
+          "search-session": "c768de003a1212f3d9e51176d118f255",
           "search-telemetry": "3d1b76c39bfb2cc8296b024d73854724",
+          "security-rule": "8ae39a88fc70af3375b7050e8d8d5cc7",
+          "security-solution-signals-migration": "72761fd374ca11122ac8025a92b84fca",
           "siem-detection-engine-rule-actions": "6569b288c169539db10cb262bf79de18",
           "siem-detection-engine-rule-status": "ae783f41c6937db6b7a2ef5c93a9e9b0",
-          "siem-ui-timeline": "d12c5474364d737d17252acf1dc4585c",
+          "siem-ui-timeline": "3e97beae13cdfc6d62bc1846119f7276",
           "siem-ui-timeline-note": "8874706eedc49059d4cf0f5094559084",
           "siem-ui-timeline-pinned-event": "20638091112f0e14f0e443d512301c29",
           "space": "c5ca8acafa0beaa4d08d014a97b6bc6b",
           "spaces-usage-stats": "3d1b76c39bfb2cc8296b024d73854724",
           "tag": "83d55da58f6530f7055415717ec06474",
-          "telemetry": "36a616f7026dfa617d6655df850fe16d",
           "timelion-sheet": "9a2a2748877c7a7b582fef201ab1d4cf",
-          "tsvb-validation-telemetry": "3a37ef6c8700ae6fc97d5c7da00e9215",
           "type": "2f4316de49999235636386fe51dc06c1",
+          "ui-counter": "0d409297dc5ebe1e3a1da691c6ee32e3",
           "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3",
           "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
+          "upgrade-assistant-ml-upgrade-operation": "ece1011519ca8fd057364605744d75ac",
           "upgrade-assistant-reindex-operation": "215107c281839ea9b3ad5f6419819763",
-          "upgrade-assistant-telemetry": "56702cec857e0a9dacfb696655b4ff7b",
+          "upgrade-assistant-telemetry": "8169c8bdd753da18d887e038aeb5cbc4",
           "uptime-dynamic-settings": "3d1b76c39bfb2cc8296b024d73854724",
           "url": "c7f66a0df8b1b52f17c28c4adb111105",
+          "usage-counters": "8cc260bdceffec4ffc3ad165c97dc1b4",
           "visualization": "f819cf6636b75c9e76ba733a0c6ef355",
           "workplace_search_telemetry": "3d1b76c39bfb2cc8296b024d73854724"
         }
@@ -100,6 +113,9 @@
               "enabled": false,
               "type": "object"
             },
+            "isMissingSecrets": {
+              "type": "boolean"
+            },
             "name": {
               "fields": {
                 "keyword": {
@@ -124,6 +140,10 @@
             "params": {
               "enabled": false,
               "type": "object"
+            },
+            "relatedSavedObjects": {
+              "enabled": false,
+              "type": "object"
             }
           }
         },
@@ -209,9 +229,12 @@
               },
               "type": "text"
             },
+            "notifyWhen": {
+              "type": "keyword"
+            },
             "params": {
-              "enabled": false,
-              "type": "object"
+              "ignore_above": 4096,
+              "type": "flattened"
             },
             "schedule": {
               "properties": {
@@ -273,6 +296,14 @@
             }
           }
         },
+        "apm-server-schema": {
+          "properties": {
+            "schemaJson": {
+              "index": false,
+              "type": "text"
+            }
+          }
+        },
         "apm-telemetry": {
           "dynamic": "false",
           "type": "object"
@@ -297,40 +328,6 @@
           "dynamic": "false",
           "type": "object"
         },
-        "search-session": {
-          "properties": {
-            "appId": {
-              "type": "keyword"
-            },
-            "created": {
-              "type": "date"
-            },
-            "expires": {
-              "type": "date"
-            },
-            "idMapping": {
-              "enabled": false,
-              "type": "object"
-            },
-            "initialState": {
-              "enabled": false,
-              "type": "object"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "restoreState": {
-              "enabled": false,
-              "type": "object"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "urlGeneratorId": {
-              "type": "keyword"
-            }
-          }
-        },
         "canvas-element": {
           "dynamic": "false",
           "properties": {
@@ -505,6 +502,16 @@
                 }
               }
             },
+            "owner": {
+              "type": "keyword"
+            },
+            "settings": {
+              "properties": {
+                "syncAlerts": {
+                  "type": "boolean"
+                }
+              }
+            },
             "status": {
               "type": "keyword"
             },
@@ -514,6 +521,9 @@
             "title": {
               "type": "keyword"
             },
+            "type": {
+              "type": "keyword"
+            },
             "updated_at": {
               "type": "date"
             },
@@ -534,9 +544,30 @@
         },
         "cases-comments": {
           "properties": {
+            "actions": {
+              "properties": {
+                "targets": {
+                  "properties": {
+                    "endpointId": {
+                      "type": "keyword"
+                    },
+                    "hostname": {
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "nested"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
             "alertId": {
               "type": "keyword"
             },
+            "associationType": {
+              "type": "keyword"
+            },
             "comment": {
               "type": "text"
             },
@@ -559,6 +590,9 @@
             "index": {
               "type": "keyword"
             },
+            "owner": {
+              "type": "keyword"
+            },
             "pushed_at": {
               "type": "date"
             },
@@ -575,6 +609,16 @@
                 }
               }
             },
+            "rule": {
+              "properties": {
+                "id": {
+                  "type": "keyword"
+                },
+                "name": {
+                  "type": "keyword"
+                }
+              }
+            },
             "type": {
               "type": "keyword"
             },
@@ -640,6 +684,9 @@
                 }
               }
             },
+            "owner": {
+              "type": "keyword"
+            },
             "updated_at": {
               "type": "date"
             },
@@ -658,6 +705,26 @@
             }
           }
         },
+        "cases-connector-mappings": {
+          "properties": {
+            "mappings": {
+              "properties": {
+                "action_type": {
+                  "type": "keyword"
+                },
+                "source": {
+                  "type": "keyword"
+                },
+                "target": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "owner": {
+              "type": "keyword"
+            }
+          }
+        },
         "cases-user-actions": {
           "properties": {
             "action": {
@@ -687,6 +754,9 @@
             },
             "old_value": {
               "type": "text"
+            },
+            "owner": {
+              "type": "keyword"
             }
           }
         },
@@ -702,6 +772,9 @@
           "dynamic": "false",
           "type": "object"
         },
+        "coreMigrationVersion": {
+          "type": "keyword"
+        },
         "dashboard": {
           "properties": {
             "description": {
@@ -814,6 +887,19 @@
         },
         "endpoint:user-artifact-manifest": {
           "properties": {
+            "artifacts": {
+              "properties": {
+                "artifactId": {
+                  "index": false,
+                  "type": "keyword"
+                },
+                "policyId": {
+                  "index": false,
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
             "created": {
               "index": false,
               "type": "date"
@@ -824,19 +910,6 @@
             "semanticVersion": {
               "index": false,
               "type": "keyword"
-            },
-            "artifacts": {
-              "type": "nested",
-              "properties": {
-                "policyId": {
-                  "type": "keyword",
-                  "index": false
-                },
-                "artifactId": {
-                  "type": "keyword",
-                  "index": false
-                }
-              }
             }
           }
         },
@@ -890,6 +963,17 @@
             "name": {
               "type": "keyword"
             },
+            "package_assets": {
+              "properties": {
+                "id": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
             "removable": {
               "type": "boolean"
             },
@@ -898,6 +982,40 @@
             }
           }
         },
+        "epm-packages-assets": {
+          "properties": {
+            "asset_path": {
+              "type": "keyword"
+            },
+            "data_base64": {
+              "type": "binary"
+            },
+            "data_utf8": {
+              "index": false,
+              "type": "text"
+            },
+            "install_source": {
+              "type": "keyword"
+            },
+            "media_type": {
+              "type": "keyword"
+            },
+            "package_name": {
+              "type": "keyword"
+            },
+            "package_version": {
+              "type": "keyword"
+            }
+          }
+        },
+        "event_loop_delays_daily": {
+          "dynamic": "false",
+          "properties": {
+            "lastUpdatedAt": {
+              "type": "date"
+            }
+          }
+        },
         "exception-list": {
           "properties": {
             "_tags": {
@@ -1002,12 +1120,22 @@
               "type": "keyword"
             },
             "name": {
+              "fields": {
+                "text": {
+                  "type": "text"
+                }
+              },
               "type": "keyword"
             },
             "os_types": {
               "type": "keyword"
             },
             "tags": {
+              "fields": {
+                "text": {
+                  "type": "text"
+                }
+              },
               "type": "keyword"
             },
             "tie_breaker_id": {
@@ -1128,12 +1256,22 @@
               "type": "keyword"
             },
             "name": {
+              "fields": {
+                "text": {
+                  "type": "text"
+                }
+              },
               "type": "keyword"
             },
             "os_types": {
               "type": "keyword"
             },
             "tags": {
+              "fields": {
+                "text": {
+                  "type": "text"
+                }
+              },
               "type": "keyword"
             },
             "tie_breaker_id": {
@@ -1150,10 +1288,14 @@
             }
           }
         },
-        "file-upload-telemetry": {
+        "file-upload-usage-collection-telemetry": {
           "properties": {
-            "filesUploadedTotalCount": {
-              "type": "long"
+            "file_upload": {
+              "properties": {
+                "index_creation_count": {
+                  "type": "long"
+                }
+              }
             }
           }
         },
@@ -1185,40 +1327,6 @@
             }
           }
         },
-        "fleet-agent-events": {
-          "properties": {
-            "action_id": {
-              "type": "keyword"
-            },
-            "agent_id": {
-              "type": "keyword"
-            },
-            "data": {
-              "type": "text"
-            },
-            "message": {
-              "type": "text"
-            },
-            "payload": {
-              "type": "text"
-            },
-            "policy_id": {
-              "type": "keyword"
-            },
-            "stream_id": {
-              "type": "keyword"
-            },
-            "subtype": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          }
-        },
         "fleet-agents": {
           "properties": {
             "access_api_key_id": {
@@ -1261,9 +1369,6 @@
             "policy_revision": {
               "type": "integer"
             },
-            "shared_id": {
-              "type": "keyword"
-            },
             "type": {
               "type": "keyword"
             },
@@ -1321,6 +1426,13 @@
             }
           }
         },
+        "fleet-preconfiguration-deletion-record": {
+          "properties": {
+            "id": {
+              "type": "keyword"
+            }
+          }
+        },
         "graph-workspace": {
           "properties": {
             "description": {
@@ -1333,6 +1445,10 @@
                 }
               }
             },
+            "legacyIndexPatternRef": {
+              "index": false,
+              "type": "text"
+            },
             "numLinks": {
               "type": "integer"
             },
@@ -1373,6 +1489,15 @@
             "is_default": {
               "type": "boolean"
             },
+            "is_default_fleet_server": {
+              "type": "boolean"
+            },
+            "is_managed": {
+              "type": "boolean"
+            },
+            "is_preconfigured": {
+              "type": "keyword"
+            },
             "monitoring_enabled": {
               "index": false,
               "type": "keyword"
@@ -1392,6 +1517,9 @@
             "status": {
               "type": "keyword"
             },
+            "unenroll_timeout": {
+              "type": "integer"
+            },
             "updated_at": {
               "type": "date"
             },
@@ -1412,12 +1540,6 @@
             "config_yaml": {
               "type": "text"
             },
-            "fleet_enroll_password": {
-              "type": "binary"
-            },
-            "fleet_enroll_username": {
-              "type": "binary"
-            },
             "hosts": {
               "type": "keyword"
             },
@@ -1458,6 +1580,9 @@
                 "enabled": {
                   "type": "boolean"
                 },
+                "policy_template": {
+                  "type": "keyword"
+                },
                 "streams": {
                   "properties": {
                     "compiled_stream": {
@@ -1530,26 +1655,24 @@
             },
             "updated_by": {
               "type": "keyword"
+            },
+            "vars": {
+              "type": "flattened"
             }
           }
         },
         "ingest_manager_settings": {
           "properties": {
-            "agent_auto_upgrade": {
+            "fleet_server_hosts": {
               "type": "keyword"
             },
             "has_seen_add_data_notice": {
               "index": false,
               "type": "boolean"
             },
-            "kibana_ca_sha256": {
-              "type": "keyword"
-            },
-            "kibana_urls": {
-              "type": "keyword"
-            },
-            "package_auto_upgrade": {
-              "type": "keyword"
+            "has_seen_fleet_migration_notice": {
+              "index": false,
+              "type": "boolean"
             }
           }
         },
@@ -1567,6 +1690,23 @@
             }
           }
         },
+        "legacy-url-alias": {
+          "dynamic": "false",
+          "properties": {
+            "disabled": {
+              "type": "boolean"
+            },
+            "resolveCounter": {
+              "type": "long"
+            },
+            "sourceId": {
+              "type": "keyword"
+            },
+            "targetType": {
+              "type": "keyword"
+            }
+          }
+        },
         "lens": {
           "properties": {
             "description": {
@@ -1606,6 +1746,10 @@
         },
         "map": {
           "properties": {
+            "bounds": {
+              "dynamic": "false",
+              "type": "object"
+            },
             "description": {
               "type": "text"
             },
@@ -1664,7 +1808,7 @@
               },
               "type": "text"
             },
-            "config": {
+            "cases": {
               "fields": {
                 "keyword": {
                   "ignore_above": 256,
@@ -1673,7 +1817,7 @@
               },
               "type": "text"
             },
-            "dashboard": {
+            "cases-user-actions": {
               "fields": {
                 "keyword": {
                   "ignore_above": 256,
@@ -1682,7 +1826,7 @@
               },
               "type": "text"
             },
-            "exception-list-agnostic": {
+            "config": {
               "fields": {
                 "keyword": {
                   "ignore_above": 256,
@@ -1691,7 +1835,16 @@
               },
               "type": "text"
             },
-            "fleet-agent-actions": {
+            "core-usage-stats": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "dashboard": {
               "fields": {
                 "keyword": {
                   "ignore_above": 256,
@@ -1700,7 +1853,7 @@
               },
               "type": "text"
             },
-            "fleet-agent-events": {
+            "endpoint:user-artifact-manifest": {
               "fields": {
                 "keyword": {
                   "ignore_above": 256,
@@ -1709,7 +1862,7 @@
               },
               "type": "text"
             },
-            "fleet-agents": {
+            "exception-list-agnostic": {
               "fields": {
                 "keyword": {
                   "ignore_above": 256,
@@ -1718,7 +1871,7 @@
               },
               "type": "text"
             },
-            "fleet-enrollment-api-keys": {
+            "fleet-agent-actions": {
               "fields": {
                 "keyword": {
                   "ignore_above": 256,
@@ -1763,6 +1916,15 @@
               },
               "type": "text"
             },
+            "ingest-outputs": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
             "ingest-package-policies": {
               "fields": {
                 "keyword": {
@@ -1808,6 +1970,15 @@
               },
               "type": "text"
             },
+            "ml-module": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
             "search": {
               "fields": {
                 "keyword": {
@@ -1817,6 +1988,33 @@
               },
               "type": "text"
             },
+            "search-session": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "search-telemetry": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "siem-detection-engine-rule-actions": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
             "space": {
               "fields": {
                 "keyword": {
@@ -1826,7 +2024,7 @@
               },
               "type": "text"
             },
-            "tsvb-validation-telemetry": {
+            "spaces-usage-stats": {
               "fields": {
                 "keyword": {
                   "ignore_above": 256,
@@ -1869,14 +2067,60 @@
             }
           }
         },
-        "ml-telemetry": {
+        "ml-module": {
+          "dynamic": "false",
           "properties": {
-            "file_data_visualizer": {
-              "properties": {
-                "index_creation_count": {
-                  "type": "long"
+            "datafeeds": {
+              "type": "object"
+            },
+            "defaultIndexPattern": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
                 }
-              }
+              },
+              "type": "text"
+            },
+            "description": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "id": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "jobs": {
+              "type": "object"
+            },
+            "logo": {
+              "type": "object"
+            },
+            "query": {
+              "type": "object"
+            },
+            "title": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "type": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
             }
           }
         },
@@ -1896,6 +2140,50 @@
         "originId": {
           "type": "keyword"
         },
+        "osquery-saved-query": {
+          "properties": {
+            "created_at": {
+              "type": "date"
+            },
+            "created_by": {
+              "type": "text"
+            },
+            "description": {
+              "type": "text"
+            },
+            "id": {
+              "type": "keyword"
+            },
+            "interval": {
+              "type": "keyword"
+            },
+            "platform": {
+              "type": "keyword"
+            },
+            "query": {
+              "type": "text"
+            },
+            "updated_at": {
+              "type": "date"
+            },
+            "updated_by": {
+              "type": "text"
+            },
+            "version": {
+              "type": "keyword"
+            }
+          }
+        },
+        "osquery-usage-metric": {
+          "properties": {
+            "count": {
+              "type": "long"
+            },
+            "errors": {
+              "type": "long"
+            }
+          }
+        },
         "query": {
           "properties": {
             "description": {
@@ -1959,6 +2247,15 @@
             "description": {
               "type": "text"
             },
+            "grid": {
+              "enabled": false,
+              "type": "object"
+            },
+            "hideChart": {
+              "doc_values": false,
+              "index": false,
+              "type": "boolean"
+            },
             "hits": {
               "doc_values": false,
               "index": false,
@@ -1985,73 +2282,187 @@
             }
           }
         },
-        "search-telemetry": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "siem-detection-engine-rule-actions": {
+        "search-session": {
           "properties": {
-            "actions": {
-              "properties": {
-                "action_type_id": {
-                  "type": "keyword"
-                },
-                "group": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "params": {
-                  "enabled": false,
-                  "type": "object"
-                }
-              }
-            },
-            "alertThrottle": {
+            "appId": {
               "type": "keyword"
             },
-            "ruleAlertId": {
-              "type": "keyword"
+            "completed": {
+              "type": "date"
             },
-            "ruleThrottle": {
-              "type": "keyword"
-            }
-          }
-        },
-        "siem-detection-engine-rule-status": {
-          "properties": {
-            "alertId": {
-              "type": "keyword"
+            "created": {
+              "type": "date"
             },
-            "bulkCreateTimeDurations": {
-              "type": "float"
+            "expires": {
+              "type": "date"
             },
-            "gap": {
-              "type": "text"
+            "idMapping": {
+              "enabled": false,
+              "type": "object"
             },
-            "lastFailureAt": {
-              "type": "date"
+            "initialState": {
+              "enabled": false,
+              "type": "object"
             },
-            "lastFailureMessage": {
-              "type": "text"
+            "name": {
+              "type": "keyword"
             },
-            "lastLookBackDate": {
-              "type": "date"
+            "persisted": {
+              "type": "boolean"
             },
-            "lastSuccessAt": {
-              "type": "date"
+            "realmName": {
+              "type": "keyword"
             },
-            "lastSuccessMessage": {
-              "type": "text"
+            "realmType": {
+              "type": "keyword"
             },
-            "searchAfterTimeDurations": {
-              "type": "float"
+            "restoreState": {
+              "enabled": false,
+              "type": "object"
+            },
+            "sessionId": {
+              "type": "keyword"
             },
             "status": {
               "type": "keyword"
             },
-            "statusDate": {
+            "touched": {
+              "type": "date"
+            },
+            "urlGeneratorId": {
+              "type": "keyword"
+            },
+            "username": {
+              "type": "keyword"
+            },
+            "version": {
+              "type": "keyword"
+            }
+          }
+        },
+        "search-telemetry": {
+          "dynamic": "false",
+          "type": "object"
+        },
+        "security-rule": {
+          "dynamic": "false",
+          "properties": {
+            "name": {
+              "type": "keyword"
+            },
+            "rule_id": {
+              "type": "keyword"
+            },
+            "version": {
+              "type": "long"
+            }
+          }
+        },
+        "security-solution-signals-migration": {
+          "properties": {
+            "created": {
+              "index": false,
+              "type": "date"
+            },
+            "createdBy": {
+              "index": false,
+              "type": "text"
+            },
+            "destinationIndex": {
+              "index": false,
+              "type": "keyword"
+            },
+            "error": {
+              "index": false,
+              "type": "text"
+            },
+            "sourceIndex": {
+              "type": "keyword"
+            },
+            "status": {
+              "index": false,
+              "type": "keyword"
+            },
+            "taskId": {
+              "index": false,
+              "type": "keyword"
+            },
+            "updated": {
+              "index": false,
+              "type": "date"
+            },
+            "updatedBy": {
+              "index": false,
+              "type": "text"
+            },
+            "version": {
+              "type": "long"
+            }
+          }
+        },
+        "siem-detection-engine-rule-actions": {
+          "properties": {
+            "actions": {
+              "properties": {
+                "action_type_id": {
+                  "type": "keyword"
+                },
+                "group": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "params": {
+                  "enabled": false,
+                  "type": "object"
+                }
+              }
+            },
+            "alertThrottle": {
+              "type": "keyword"
+            },
+            "ruleAlertId": {
+              "type": "keyword"
+            },
+            "ruleThrottle": {
+              "type": "keyword"
+            }
+          }
+        },
+        "siem-detection-engine-rule-status": {
+          "properties": {
+            "alertId": {
+              "type": "keyword"
+            },
+            "bulkCreateTimeDurations": {
+              "type": "float"
+            },
+            "gap": {
+              "type": "text"
+            },
+            "lastFailureAt": {
+              "type": "date"
+            },
+            "lastFailureMessage": {
+              "type": "text"
+            },
+            "lastLookBackDate": {
+              "type": "date"
+            },
+            "lastSuccessAt": {
+              "type": "date"
+            },
+            "lastSuccessMessage": {
+              "type": "text"
+            },
+            "searchAfterTimeDurations": {
+              "type": "float"
+            },
+            "status": {
+              "type": "keyword"
+            },
+            "statusDate": {
               "type": "date"
             }
           }
@@ -2196,6 +2607,25 @@
             "description": {
               "type": "text"
             },
+            "eqlOptions": {
+              "properties": {
+                "eventCategoryField": {
+                  "type": "text"
+                },
+                "query": {
+                  "type": "text"
+                },
+                "size": {
+                  "type": "text"
+                },
+                "tiebreakerField": {
+                  "type": "text"
+                },
+                "timestampField": {
+                  "type": "text"
+                }
+              }
+            },
             "eventType": {
               "type": "keyword"
             },
@@ -2308,10 +2738,14 @@
               "type": "keyword"
             },
             "sort": {
+              "dynamic": "false",
               "properties": {
                 "columnId": {
                   "type": "keyword"
                 },
+                "columnType": {
+                  "type": "keyword"
+                },
                 "sortDirection": {
                   "type": "keyword"
                 }
@@ -2436,34 +2870,6 @@
             }
           }
         },
-        "telemetry": {
-          "properties": {
-            "allowChangingOptInStatus": {
-              "type": "boolean"
-            },
-            "enabled": {
-              "type": "boolean"
-            },
-            "lastReported": {
-              "type": "date"
-            },
-            "lastVersionChecked": {
-              "type": "keyword"
-            },
-            "reportFailureCount": {
-              "type": "integer"
-            },
-            "reportFailureVersion": {
-              "type": "keyword"
-            },
-            "sendUsageFrom": {
-              "type": "keyword"
-            },
-            "userHasSeenNotice": {
-              "type": "boolean"
-            }
-          }
-        },
         "timelion-sheet": {
           "properties": {
             "description": {
@@ -2505,16 +2911,16 @@
             }
           }
         },
-        "tsvb-validation-telemetry": {
+        "type": {
+          "type": "keyword"
+        },
+        "ui-counter": {
           "properties": {
-            "failedRequests": {
-              "type": "long"
+            "count": {
+              "type": "integer"
             }
           }
         },
-        "type": {
-          "type": "keyword"
-        },
         "ui-metric": {
           "properties": {
             "count": {
@@ -2525,6 +2931,46 @@
         "updated_at": {
           "type": "date"
         },
+        "upgrade-assistant-ml-upgrade-operation": {
+          "properties": {
+            "jobId": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "nodeId": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "snapshotId": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "status": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
         "upgrade-assistant-reindex-operation": {
           "properties": {
             "errorMessage": {
@@ -2615,6 +3061,10 @@
                   "null_value": 0,
                   "type": "long"
                 },
+                "kibana": {
+                  "null_value": 0,
+                  "type": "long"
+                },
                 "overview": {
                   "null_value": 0,
                   "type": "long"
@@ -2669,6 +3119,14 @@
             }
           }
         },
+        "usage-counters": {
+          "dynamic": "false",
+          "properties": {
+            "domainId": {
+              "type": "keyword"
+            }
+          }
+        },
         "visualization": {
           "properties": {
             "description": {
@@ -2713,7 +3171,9 @@
       "index": {
         "auto_expand_replicas": "0-1",
         "number_of_replicas": "1",
-        "number_of_shards": "1"
+        "number_of_shards": "1",
+        "priority": "10",
+        "refresh_interval": "1s"
       }
     }
   }
@@ -2723,179 +3183,67 @@
   "type": "index",
   "value": {
     "aliases": {
-      ".ml-anomalies-.write-apm-environment_not_defined-5626-high_mean_transaction_duration": {
-        "is_hidden": true
-      },
-      ".ml-anomalies-.write-apm-production-1369-high_mean_transaction_duration": {
-        "is_hidden": true
-      },
-      ".ml-anomalies-.write-apm-production-d92e-high_mean_transaction_duration": {
-        "is_hidden": true
-      },
-      ".ml-anomalies-.write-apm-testing-384f-high_mean_transaction_duration": {
-        "is_hidden": true
-      },
-      ".ml-anomalies-.write-kibana-logs-ui-default-default-log-entry-rate": {
-        "is_hidden": true
-      },
-      ".ml-anomalies-.write-kibana-metrics-ui-default-default-hosts_memory_usage": {
-        "is_hidden": true
-      },
-      ".ml-anomalies-.write-kibana-metrics-ui-default-default-hosts_network_in": {
-        "is_hidden": true
-      },
-      ".ml-anomalies-.write-kibana-metrics-ui-default-default-hosts_network_out": {
-        "is_hidden": true
-      },
-      ".ml-anomalies-.write-kibana-metrics-ui-kate-demo-default-hosts_memory_usage": {
+      ".ml-anomalies-.write-apm-production-802c-high_mean_transaction_duration": {
         "is_hidden": true
       },
-      ".ml-anomalies-.write-kibana-metrics-ui-kate-demo-default-hosts_network_in": {
+      ".ml-anomalies-.write-apm-production-d08f-high_mean_transaction_duration": {
         "is_hidden": true
       },
-      ".ml-anomalies-.write-kibana-metrics-ui-kate-demo-default-hosts_network_out": {
+      ".ml-anomalies-.write-high_sum_total_sales": {
         "is_hidden": true
       },
-      ".ml-anomalies-apm-environment_not_defined-5626-high_mean_transaction_duration": {
+      ".ml-anomalies-apm-production-802c-high_mean_transaction_duration": {
         "filter": {
           "term": {
             "job_id": {
               "boost": 1,
-              "value": "apm-environment_not_defined-5626-high_mean_transaction_duration"
+              "value": "apm-production-802c-high_mean_transaction_duration"
             }
           }
         },
         "is_hidden": true
       },
-      ".ml-anomalies-apm-production-1369-high_mean_transaction_duration": {
+      ".ml-anomalies-apm-production-d08f-high_mean_transaction_duration": {
         "filter": {
           "term": {
             "job_id": {
               "boost": 1,
-              "value": "apm-production-1369-high_mean_transaction_duration"
+              "value": "apm-production-d08f-high_mean_transaction_duration"
             }
           }
         },
         "is_hidden": true
       },
-      ".ml-anomalies-apm-production-d92e-high_mean_transaction_duration": {
+      ".ml-anomalies-high_sum_total_sales": {
         "filter": {
           "term": {
             "job_id": {
               "boost": 1,
-              "value": "apm-production-d92e-high_mean_transaction_duration"
+              "value": "high_sum_total_sales"
             }
           }
         },
         "is_hidden": true
+      }
+    },
+    "index": ".ml-anomalies-shared",
+    "mappings": {
+      "_meta": {
+        "version": "8.0.0"
       },
-      ".ml-anomalies-apm-testing-384f-high_mean_transaction_duration": {
-        "filter": {
-          "term": {
-            "job_id": {
-              "boost": 1,
-              "value": "apm-testing-384f-high_mean_transaction_duration"
-            }
+      "dynamic_templates": [
+        {
+          "strings_as_keywords": {
+            "mapping": {
+              "type": "keyword"
+            },
+            "match": "*"
           }
-        },
-        "is_hidden": true
-      },
-      ".ml-anomalies-kibana-logs-ui-default-default-log-entry-rate": {
-        "filter": {
-          "term": {
-            "job_id": {
-              "boost": 1,
-              "value": "kibana-logs-ui-default-default-log-entry-rate"
-            }
-          }
-        },
-        "is_hidden": true
-      },
-      ".ml-anomalies-kibana-metrics-ui-default-default-hosts_memory_usage": {
-        "filter": {
-          "term": {
-            "job_id": {
-              "boost": 1,
-              "value": "kibana-metrics-ui-default-default-hosts_memory_usage"
-            }
-          }
-        },
-        "is_hidden": true
-      },
-      ".ml-anomalies-kibana-metrics-ui-default-default-hosts_network_in": {
-        "filter": {
-          "term": {
-            "job_id": {
-              "boost": 1,
-              "value": "kibana-metrics-ui-default-default-hosts_network_in"
-            }
-          }
-        },
-        "is_hidden": true
-      },
-      ".ml-anomalies-kibana-metrics-ui-default-default-hosts_network_out": {
-        "filter": {
-          "term": {
-            "job_id": {
-              "boost": 1,
-              "value": "kibana-metrics-ui-default-default-hosts_network_out"
-            }
-          }
-        },
-        "is_hidden": true
-      },
-      ".ml-anomalies-kibana-metrics-ui-kate-demo-default-hosts_memory_usage": {
-        "filter": {
-          "term": {
-            "job_id": {
-              "boost": 1,
-              "value": "kibana-metrics-ui-kate-demo-default-hosts_memory_usage"
-            }
-          }
-        },
-        "is_hidden": true
-      },
-      ".ml-anomalies-kibana-metrics-ui-kate-demo-default-hosts_network_in": {
-        "filter": {
-          "term": {
-            "job_id": {
-              "boost": 1,
-              "value": "kibana-metrics-ui-kate-demo-default-hosts_network_in"
-            }
-          }
-        },
-        "is_hidden": true
-      },
-      ".ml-anomalies-kibana-metrics-ui-kate-demo-default-hosts_network_out": {
-        "filter": {
-          "term": {
-            "job_id": {
-              "boost": 1,
-              "value": "kibana-metrics-ui-kate-demo-default-hosts_network_out"
-            }
-          }
-        },
-        "is_hidden": true
-      }
-    },
-    "index": ".ml-anomalies-shared",
-    "mappings": {
-      "_meta": {
-        "version": "8.0.0"
-      },
-      "dynamic_templates": [
-        {
-          "strings_as_keywords": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match": "*"
-          }
-        }
-      ],
-      "properties": {
-        "actual": {
-          "type": "double"
+        }
+      ],
+      "properties": {
+        "actual": {
+          "type": "double"
         },
         "all_field_values": {
           "analyzer": "whitespace",
@@ -2904,6 +3252,9 @@
         "anomaly_score": {
           "type": "double"
         },
+        "assignment_memory_basis": {
+          "type": "keyword"
+        },
         "average_bucket_processing_time_ms": {
           "type": "double"
         },
@@ -2966,6 +3317,13 @@
         "categorized_doc_count": {
           "type": "keyword"
         },
+        "category": {
+          "properties": {
+            "keyword": {
+              "type": "keyword"
+            }
+          }
+        },
         "category_id": {
           "type": "long"
         },
@@ -3035,6 +3393,13 @@
           },
           "type": "nested"
         },
+        "customer_full_name": {
+          "properties": {
+            "keyword": {
+              "type": "keyword"
+            }
+          }
+        },
         "dead_category_count": {
           "type": "keyword"
         },
@@ -3050,13 +3415,6 @@
         "empty_bucket_count": {
           "type": "long"
         },
-        "event": {
-          "properties": {
-            "dataset": {
-              "type": "keyword"
-            }
-          }
-        },
         "event_count": {
           "type": "long"
         },
@@ -3140,13 +3498,6 @@
             }
           }
         },
-        "host": {
-          "properties": {
-            "name": {
-              "type": "keyword"
-            }
-          }
-        },
         "influencer_field_name": {
           "type": "keyword"
         },
@@ -3265,6 +3616,9 @@
         },
         "model_size_stats": {
           "properties": {
+            "assignment_memory_basis": {
+              "type": "keyword"
+            },
             "bucket_allocation_failures_count": {
               "type": "long"
             },
@@ -3455,6 +3809,9 @@
     "settings": {
       "index": {
         "auto_expand_replicas": "0-1",
+        "blocks": {
+          "read_only_allow_delete": "false"
+        },
         "hidden": "true",
         "number_of_replicas": "1",
         "number_of_shards": "1",
@@ -3494,19 +3851,34 @@
         "allow_lazy_open": {
           "type": "keyword"
         },
+        "allow_lazy_start": {
+          "type": "keyword"
+        },
         "analysis": {
           "properties": {
             "classification": {
               "properties": {
+                "alpha": {
+                  "type": "double"
+                },
                 "class_assignment_objective": {
                   "type": "keyword"
                 },
                 "dependent_variable": {
                   "type": "keyword"
                 },
+                "downsample_factor": {
+                  "type": "double"
+                },
+                "early_stopping_enabled": {
+                  "type": "boolean"
+                },
                 "eta": {
                   "type": "double"
                 },
+                "eta_growth_rate_per_tree": {
+                  "type": "double"
+                },
                 "feature_bag_fraction": {
                   "type": "double"
                 },
@@ -3520,6 +3892,9 @@
                 "lambda": {
                   "type": "double"
                 },
+                "max_optimization_rounds_per_hyperparameter": {
+                  "type": "integer"
+                },
                 "max_trees": {
                   "type": "integer"
                 },
@@ -3532,6 +3907,15 @@
                 "prediction_field_name": {
                   "type": "keyword"
                 },
+                "randomize_seed": {
+                  "type": "keyword"
+                },
+                "soft_tree_depth_limit": {
+                  "type": "double"
+                },
+                "soft_tree_depth_tolerance": {
+                  "type": "double"
+                },
                 "training_percent": {
                   "type": "double"
                 }
@@ -3539,6 +3923,9 @@
             },
             "outlier_detection": {
               "properties": {
+                "compute_feature_influence": {
+                  "type": "keyword"
+                },
                 "feature_influence_threshold": {
                   "type": "double"
                 },
@@ -3547,17 +3934,35 @@
                 },
                 "n_neighbors": {
                   "type": "integer"
+                },
+                "outlier_fraction": {
+                  "type": "keyword"
+                },
+                "standardization_enabled": {
+                  "type": "keyword"
                 }
               }
             },
             "regression": {
               "properties": {
+                "alpha": {
+                  "type": "double"
+                },
                 "dependent_variable": {
                   "type": "keyword"
                 },
+                "downsample_factor": {
+                  "type": "double"
+                },
+                "early_stopping_enabled": {
+                  "type": "boolean"
+                },
                 "eta": {
                   "type": "double"
                 },
+                "eta_growth_rate_per_tree": {
+                  "type": "double"
+                },
                 "feature_bag_fraction": {
                   "type": "double"
                 },
@@ -3577,6 +3982,9 @@
                 "loss_function_parameter": {
                   "type": "double"
                 },
+                "max_optimization_rounds_per_hyperparameter": {
+                  "type": "integer"
+                },
                 "max_trees": {
                   "type": "integer"
                 },
@@ -3586,6 +3994,15 @@
                 "prediction_field_name": {
                   "type": "keyword"
                 },
+                "randomize_seed": {
+                  "type": "keyword"
+                },
+                "soft_tree_depth_limit": {
+                  "type": "double"
+                },
+                "soft_tree_depth_tolerance": {
+                  "type": "double"
+                },
                 "training_percent": {
                   "type": "double"
                 }
@@ -3706,6 +4123,16 @@
         "background_persist_interval": {
           "type": "keyword"
         },
+        "blocked": {
+          "properties": {
+            "reason": {
+              "type": "keyword"
+            },
+            "task_id": {
+              "type": "keyword"
+            }
+          }
+        },
         "chunking_config": {
           "properties": {
             "mode": {
@@ -3809,6 +4236,9 @@
         "job_version": {
           "type": "keyword"
         },
+        "max_empty_searches": {
+          "type": "keyword"
+        },
         "max_num_threads": {
           "type": "integer"
         },
@@ -3853,6 +4283,10 @@
         "results_retention_days": {
           "type": "long"
         },
+        "runtime_mappings": {
+          "enabled": false,
+          "type": "object"
+        },
         "script_fields": {
           "enabled": false,
           "type": "object"
@@ -3872,6 +4306,10 @@
             "query": {
               "enabled": false,
               "type": "object"
+            },
+            "runtime_mappings": {
+              "enabled": false,
+              "type": "object"
             }
           }
         },
@@ -3899,7 +4337,7 @@
         "is_write_index": true
       }
     },
-    "index": "apm-8.0.0-error-2020.12.03-000001",
+    "index": "apm-8.0.0-error-000002",
     "mappings": {
       "_meta": {
         "beat": "apm",
@@ -3960,30 +4398,11 @@
           }
         },
         {
-          "labels_string": {
+          "kubernetes.selectors.*": {
             "mapping": {
               "type": "keyword"
             },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
+            "path_match": "kubernetes.selectors.*"
           }
         },
         {
@@ -4014,139 +4433,65 @@
           }
         },
         {
-          "labels_string": {
+          "histogram": {
             "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
+              "type": "histogram"
+            }
           }
         },
         {
-          "labels_boolean": {
+          "transaction.marks": {
             "mapping": {
-              "type": "boolean"
+              "type": "keyword"
             },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
+            "match_mapping_type": "string",
+            "path_match": "transaction.marks.*"
           }
         },
         {
-          "labels_*": {
+          "transaction.marks.*.*": {
             "mapping": {
               "scaling_factor": 1000000,
               "type": "scaled_float"
             },
-            "path_match": "labels.*"
+            "path_match": "transaction.marks.*.*"
           }
         },
         {
-          "labels_string": {
+          "strings_as_keyword": {
             "mapping": {
+              "ignore_above": 1024,
               "type": "keyword"
             },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
+            "match_mapping_type": "string"
           }
+        }
+      ],
+      "properties": {
+        "@timestamp": {
+          "type": "date"
         },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
+        "agent": {
+          "dynamic": "false",
+          "properties": {
+            "build": {
+              "properties": {
+                "original": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
             },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
+            "ephemeral_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
             },
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_string": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "transaction.marks": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "transaction.marks.*"
-          }
-        },
-        {
-          "transaction.marks.*.*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "transaction.marks.*.*"
-          }
-        },
-        {
-          "strings_as_keyword": {
-            "mapping": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "match_mapping_type": "string"
-          }
-        }
-      ],
-      "properties": {
-        "@timestamp": {
-          "type": "date"
-        },
-        "agent": {
-          "dynamic": "false",
-          "properties": {
-            "build": {
-              "properties": {
-                "original": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "ephemeral_id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "hostname": {
-              "path": "agent.name",
-              "type": "alias"
-            },
-            "id": {
-              "ignore_above": 1024,
+            "hostname": {
+              "path": "agent.name",
+              "type": "alias"
+            },
+            "id": {
+              "ignore_above": 1024,
               "type": "keyword"
             },
             "name": {
@@ -4234,6 +4579,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -4253,6 +4602,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -4260,6 +4613,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -4290,6 +4647,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -4425,6 +4786,15 @@
             "region": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "service": {
+              "dynamic": "false",
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -4433,6 +4803,10 @@
             "exists": {
               "type": "boolean"
             },
+            "signing_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "status": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -4441,6 +4815,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "team_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "trusted": {
               "type": "boolean"
             },
@@ -4481,6 +4859,19 @@
             }
           }
         },
+        "data_stream": {
+          "properties": {
+            "dataset": {
+              "type": "constant_keyword"
+            },
+            "namespace": {
+              "type": "constant_keyword"
+            },
+            "type": {
+              "type": "constant_keyword"
+            }
+          }
+        },
         "destination": {
           "properties": {
             "address": {
@@ -4521,6 +4912,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -4540,6 +4935,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -4547,6 +4946,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -4577,6 +4980,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -4650,6 +5057,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -4658,6 +5069,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -4683,6 +5098,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -4863,6 +5282,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "grouping_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "id": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -5025,6 +5448,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -5033,6 +5460,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -5088,6 +5519,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -5290,6 +5725,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "continent_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "continent_name": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -5309,6 +5748,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "postal_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "region_iso_code": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -5316,6 +5759,10 @@
             "region_name": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "timezone": {
+              "ignore_above": 1024,
+              "type": "keyword"
             }
           }
         },
@@ -5352,6 +5799,10 @@
             "sha512": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "ssdeep": {
+              "ignore_above": 1024,
+              "type": "keyword"
             }
           }
         },
@@ -5365,6 +5816,32 @@
             "containerized": {
               "type": "boolean"
             },
+            "cpu": {
+              "properties": {
+                "usage": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                }
+              }
+            },
+            "disk": {
+              "properties": {
+                "read": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "write": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -5375,6 +5852,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -5394,6 +5875,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -5401,6 +5886,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -5423,6 +5912,30 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "network": {
+              "properties": {
+                "egress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "ingress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "os": {
               "properties": {
                 "build": {
@@ -5465,6 +5978,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -5569,10 +6086,18 @@
                   "enabled": false,
                   "type": "object"
                 },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "method": {
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "mime_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "referrer": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -5608,6 +6133,10 @@
                   "enabled": false,
                   "type": "object"
                 },
+                "mime_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status_code": {
                   "type": "long"
                 }
@@ -5648,8 +6177,8 @@
             "container": {
               "properties": {
                 "image": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
+                  "path": "container.image.name",
+                  "type": "alias"
                 },
                 "name": {
                   "ignore_above": 1024,
@@ -5690,6 +6219,9 @@
             },
             "pod": {
               "properties": {
+                "ip": {
+                  "type": "ip"
+                },
                 "name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -5708,6 +6240,13 @@
                 }
               }
             },
+            "selectors": {
+              "properties": {
+                "*": {
+                  "type": "object"
+                }
+              }
+            },
             "statefulset": {
               "properties": {
                 "name": {
@@ -5730,9 +6269,15 @@
             "country_code": {
               "type": "keyword"
             },
+            "customerId": {
+              "type": "keyword"
+            },
             "customer_tier": {
               "type": "keyword"
             },
+            "foo": {
+              "type": "keyword"
+            },
             "git_rev": {
               "type": "keyword"
             },
@@ -5745,10 +6290,29 @@
             "lang": {
               "type": "keyword"
             },
+            "lorem": {
+              "type": "keyword"
+            },
+            "multi-line": {
+              "type": "keyword"
+            },
+            "orderPrice": {
+              "scaling_factor": 1000000,
+              "type": "scaled_float"
+            },
+            "orderPriceRange": {
+              "type": "keyword"
+            },
+            "plugin": {
+              "type": "keyword"
+            },
             "request_id": {
               "type": "keyword"
             },
-            "u": {
+            "shippingCountry": {
+              "type": "keyword"
+            },
+            "this-is-a-very-long-tag-name-without-any-spaces": {
               "type": "keyword"
             }
           }
@@ -5832,12 +6396,20 @@
         },
         "metricset": {
           "properties": {
-            "period": {
-              "type": "long"
-            }
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "period": {
+              "meta": {
+                "unit": "ms"
+              },
+              "type": "long"
+            }
           }
         },
         "network": {
+          "dynamic": "false",
           "properties": {
             "application": {
               "ignore_above": 1024,
@@ -5846,10 +6418,34 @@
             "bytes": {
               "type": "long"
             },
+            "carrier": {
+              "properties": {
+                "icc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mcc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mnc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "community_id": {
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "connection_type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "direction": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -5955,6 +6551,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -5974,6 +6574,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -5981,6 +6585,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -6073,6 +6681,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -6104,6 +6716,54 @@
             }
           }
         },
+        "orchestrator": {
+          "properties": {
+            "api_version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "cluster": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "url": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "namespace": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "organization": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "resource": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
         "organization": {
           "properties": {
             "id": {
@@ -6156,6 +6816,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "version": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -6272,6 +6936,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -6280,6 +6948,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -6332,6 +7004,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -6359,6 +7035,10 @@
                     "exists": {
                       "type": "boolean"
                     },
+                    "signing_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
                     "status": {
                       "ignore_above": 1024,
                       "type": "keyword"
@@ -6367,6 +7047,10 @@
                       "ignore_above": 1024,
                       "type": "keyword"
                     },
+                    "team_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
                     "trusted": {
                       "type": "boolean"
                     },
@@ -6419,6 +7103,10 @@
                     "sha512": {
                       "ignore_above": 1024,
                       "type": "keyword"
+                    },
+                    "ssdeep": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
                     }
                   }
                 },
@@ -6618,11 +7306,17 @@
             "cpu": {
               "properties": {
                 "ns": {
+                  "meta": {
+                    "unit": "nanos"
+                  },
                   "type": "long"
                 }
               }
             },
             "duration": {
+              "meta": {
+                "unit": "nanos"
+              },
               "type": "long"
             },
             "id": {
@@ -6689,6 +7383,16 @@
                   "type": "long"
                 }
               }
+            },
+            "wall": {
+              "properties": {
+                "us": {
+                  "meta": {
+                    "unit": "micros"
+                  },
+                  "type": "long"
+                }
+              }
             }
           }
         },
@@ -6831,6 +7535,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -6850,6 +7558,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -6857,6 +7569,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -6887,6 +7603,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -7030,6 +7750,18 @@
             }
           }
         },
+        "session": {
+          "dynamic": "false",
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sequence": {
+              "type": "long"
+            }
+          }
+        },
         "source": {
           "dynamic": "false",
           "properties": {
@@ -7071,6 +7803,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -7090,6 +7826,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -7097,6 +7837,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -7127,6 +7871,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -7255,6 +8003,9 @@
                         "sum": {
                           "properties": {
                             "us": {
+                              "meta": {
+                                "unit": "micros"
+                              },
                               "type": "long"
                             }
                           }
@@ -7312,6 +8063,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -7347,6 +8101,10 @@
                     "norm": {
                       "properties": {
                         "pct": {
+                          "meta": {
+                            "metric_type": "gauge",
+                            "unit": "percent"
+                          },
                           "scaling_factor": 1000,
                           "type": "scaled_float"
                         }
@@ -7361,11 +8119,19 @@
                 "actual": {
                   "properties": {
                     "free": {
+                      "meta": {
+                        "metric_type": "gauge",
+                        "unit": "byte"
+                      },
                       "type": "long"
                     }
                   }
                 },
                 "total": {
+                  "meta": {
+                    "metric_type": "gauge",
+                    "unit": "byte"
+                  },
                   "type": "long"
                 }
               }
@@ -7374,6 +8140,86 @@
               "properties": {
                 "cgroup": {
                   "properties": {
+                    "cpu": {
+                      "properties": {
+                        "cfs": {
+                          "properties": {
+                            "period": {
+                              "properties": {
+                                "us": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "micros"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "quota": {
+                              "properties": {
+                                "us": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "micros"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "stats": {
+                          "properties": {
+                            "periods": {
+                              "meta": {
+                                "metric_type": "counter"
+                              },
+                              "type": "long"
+                            },
+                            "throttled": {
+                              "properties": {
+                                "ns": {
+                                  "meta": {
+                                    "metric_type": "counter",
+                                    "unit": "nanos"
+                                  },
+                                  "type": "long"
+                                },
+                                "periods": {
+                                  "meta": {
+                                    "metric_type": "counter"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "cpuacct": {
+                      "properties": {
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "total": {
+                          "properties": {
+                            "ns": {
+                              "meta": {
+                                "metric_type": "counter",
+                                "unit": "nanos"
+                              },
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
                     "memory": {
                       "properties": {
                         "mem": {
@@ -7381,6 +8227,10 @@
                             "limit": {
                               "properties": {
                                 "bytes": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "byte"
+                                  },
                                   "type": "long"
                                 }
                               }
@@ -7388,6 +8238,10 @@
                             "usage": {
                               "properties": {
                                 "bytes": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "byte"
+                                  },
                                   "type": "long"
                                 }
                               }
@@ -7405,6 +8259,10 @@
                         "norm": {
                           "properties": {
                             "pct": {
+                              "meta": {
+                                "metric_type": "gauge",
+                                "unit": "percent"
+                              },
                               "scaling_factor": 1000,
                               "type": "scaled_float"
                             }
@@ -7419,11 +8277,19 @@
                     "rss": {
                       "properties": {
                         "bytes": {
+                          "meta": {
+                            "metric_type": "gauge",
+                            "unit": "byte"
+                          },
                           "type": "long"
                         }
                       }
                     },
                     "size": {
+                      "meta": {
+                        "metric_type": "gauge",
+                        "unit": "byte"
+                      },
                       "type": "long"
                     }
                   }
@@ -7477,6 +8343,28 @@
                 "reference": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "subtechnique": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "reference": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
                 }
               }
             }
@@ -7846,34 +8734,6 @@
             }
           }
         },
-        "tracing": {
-          "properties": {
-            "span": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "trace": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "transaction": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
         "transaction": {
           "dynamic": "false",
           "properties": {
@@ -7895,6 +8755,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -8000,6 +8863,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -8071,6 +8937,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -8084,17 +8954,137 @@
         "user": {
           "dynamic": "false",
           "properties": {
-            "domain": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "email": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "full_name": {
-              "fields": {
-                "text": {
+            "changes": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "effective": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "email": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full_name": {
+              "fields": {
+                "text": {
                   "norms": false,
                   "type": "text"
                 }
@@ -8133,6 +9123,66 @@
             "roles": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "target": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -8183,6 +9233,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -8195,10 +9249,6 @@
             }
           }
         },
-        "view spans": {
-          "ignore_above": 1024,
-          "type": "keyword"
-        },
         "vlan": {
           "properties": {
             "id": {
@@ -8387,6 +9437,9 @@
     },
     "settings": {
       "index": {
+        "blocks": {
+          "read_only_allow_delete": "false"
+        },
         "codec": "best_compression",
         "lifecycle": {
           "name": "apm-rollover-30-days",
@@ -8400,7 +9453,6 @@
         "max_docvalue_fields_search": "200",
         "number_of_replicas": "1",
         "number_of_shards": "1",
-        "priority": "100",
         "refresh_interval": "5s"
       }
     }
@@ -8415,7 +9467,7 @@
         "is_write_index": true
       }
     },
-    "index": "apm-8.0.0-metric-2020.12.03-000001",
+    "index": "apm-8.0.0-metric-000002",
     "mappings": {
       "_meta": {
         "beat": "apm",
@@ -8476,30 +9528,11 @@
           }
         },
         {
-          "labels_string": {
+          "kubernetes.selectors.*": {
             "mapping": {
               "type": "keyword"
             },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
+            "path_match": "kubernetes.selectors.*"
           }
         },
         {
@@ -8530,117 +9563,43 @@
           }
         },
         {
-          "labels_string": {
+          "histogram": {
             "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
+              "type": "histogram"
+            }
           }
         },
         {
-          "labels_boolean": {
+          "transaction.marks": {
             "mapping": {
-              "type": "boolean"
+              "type": "keyword"
             },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
+            "match_mapping_type": "string",
+            "path_match": "transaction.marks.*"
           }
         },
         {
-          "labels_*": {
+          "transaction.marks.*.*": {
             "mapping": {
               "scaling_factor": 1000000,
               "type": "scaled_float"
             },
-            "path_match": "labels.*"
+            "path_match": "transaction.marks.*.*"
           }
         },
         {
-          "labels_string": {
+          "strings_as_keyword": {
             "mapping": {
+              "ignore_above": 1024,
               "type": "keyword"
             },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
+            "match_mapping_type": "string"
           }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_string": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "transaction.marks": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "transaction.marks.*"
-          }
-        },
-        {
-          "transaction.marks.*.*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "transaction.marks.*.*"
-          }
-        },
-        {
-          "strings_as_keyword": {
-            "mapping": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "match_mapping_type": "string"
-          }
-        }
-      ],
-      "properties": {
-        "@timestamp": {
-          "type": "date"
+        }
+      ],
+      "properties": {
+        "@timestamp": {
+          "type": "date"
         },
         "agent": {
           "dynamic": "false",
@@ -8679,6 +9638,12 @@
             }
           }
         },
+        "agent_config_applied": {
+          "type": "long"
+        },
+        "antifraud_order_check": {
+          "type": "long"
+        },
         "as": {
           "properties": {
             "number": {
@@ -8700,6 +9665,18 @@
             }
           }
         },
+        "cache_evictions": {
+          "type": "long"
+        },
+        "cache_gets": {
+          "type": "long"
+        },
+        "cache_puts": {
+          "type": "long"
+        },
+        "cache_size": {
+          "type": "long"
+        },
         "child": {
           "dynamic": "false",
           "properties": {
@@ -8750,6 +9727,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -8769,6 +9750,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -8776,6 +9761,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -8806,6 +9795,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -8941,6 +9934,15 @@
             "region": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "service": {
+              "dynamic": "false",
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -8952,7 +9954,7 @@
                   "type": "long"
                 },
                 "gen0size": {
-                  "type": "float"
+                  "type": "long"
                 },
                 "gen1size": {
                   "type": "float"
@@ -8962,6 +9964,9 @@
                 },
                 "gen3size": {
                   "type": "float"
+                },
+                "time": {
+                  "type": "long"
                 }
               }
             }
@@ -8972,6 +9977,10 @@
             "exists": {
               "type": "boolean"
             },
+            "signing_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "status": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -8980,6 +9989,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "team_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "trusted": {
               "type": "boolean"
             },
@@ -9020,6 +10033,19 @@
             }
           }
         },
+        "data_stream": {
+          "properties": {
+            "dataset": {
+              "type": "constant_keyword"
+            },
+            "namespace": {
+              "type": "constant_keyword"
+            },
+            "type": {
+              "type": "constant_keyword"
+            }
+          }
+        },
         "destination": {
           "properties": {
             "address": {
@@ -9060,6 +10086,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -9079,6 +10109,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -9086,6 +10120,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -9116,6 +10154,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -9189,6 +10231,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -9197,6 +10243,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -9222,6 +10272,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -9402,6 +10456,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "grouping_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "id": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -9564,6 +10622,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -9572,6 +10634,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -9627,6 +10693,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -9829,6 +10899,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "continent_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "continent_name": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -9848,6 +10922,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "postal_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "region_iso_code": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -9855,6 +10933,10 @@
             "region_name": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "timezone": {
+              "ignore_above": 1024,
+              "type": "keyword"
             }
           }
         },
@@ -9919,7 +11001,7 @@
                       "type": "float"
                     },
                     "stack": {
-                      "type": "long"
+                      "type": "float"
                     },
                     "total": {
                       "type": "float"
@@ -9963,6 +11045,70 @@
             "sha512": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "ssdeep": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "hikaricp_connections_acquire": {
+          "properties": {
+            "count": {
+              "type": "long"
+            },
+            "sum": {
+              "properties": {
+                "us": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "hikaricp_connections_active": {
+          "type": "long"
+        },
+        "hikaricp_connections_creation": {
+          "properties": {
+            "count": {
+              "type": "long"
+            },
+            "sum": {
+              "properties": {
+                "us": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "hikaricp_connections_idle": {
+          "type": "long"
+        },
+        "hikaricp_connections_max": {
+          "type": "long"
+        },
+        "hikaricp_connections_min": {
+          "type": "long"
+        },
+        "hikaricp_connections_pending": {
+          "type": "long"
+        },
+        "hikaricp_connections_timeout": {
+          "type": "long"
+        },
+        "hikaricp_connections_usage": {
+          "properties": {
+            "count": {
+              "type": "long"
+            },
+            "sum": {
+              "properties": {
+                "us": {
+                  "type": "float"
+                }
+              }
             }
           }
         },
@@ -9976,6 +11122,32 @@
             "containerized": {
               "type": "boolean"
             },
+            "cpu": {
+              "properties": {
+                "usage": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                }
+              }
+            },
+            "disk": {
+              "properties": {
+                "read": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "write": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -9986,6 +11158,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -10005,6 +11181,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -10012,6 +11192,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -10034,6 +11218,30 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "network": {
+              "properties": {
+                "egress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "ingress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "os": {
               "properties": {
                 "build": {
@@ -10076,6 +11284,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -10180,10 +11392,18 @@
                   "enabled": false,
                   "type": "object"
                 },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "method": {
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "mime_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "referrer": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -10219,6 +11439,10 @@
                   "enabled": false,
                   "type": "object"
                 },
+                "mime_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status_code": {
                   "type": "long"
                 }
@@ -10230,6 +11454,20 @@
             }
           }
         },
+        "http_server_requests": {
+          "properties": {
+            "count": {
+              "type": "long"
+            },
+            "sum": {
+              "properties": {
+                "us": {
+                  "type": "float"
+                }
+              }
+            }
+          }
+        },
         "interface": {
           "properties": {
             "alias": {
@@ -10246,6 +11484,18 @@
             }
           }
         },
+        "jdbc_connections_active": {
+          "type": "long"
+        },
+        "jdbc_connections_idle": {
+          "type": "long"
+        },
+        "jdbc_connections_max": {
+          "type": "long"
+        },
+        "jdbc_connections_min": {
+          "type": "long"
+        },
         "jvm": {
           "properties": {
             "gc": {
@@ -10313,6 +11563,68 @@
             }
           }
         },
+        "jvm_buffer_count": {
+          "type": "long"
+        },
+        "jvm_buffer_memory_used": {
+          "type": "long"
+        },
+        "jvm_buffer_total_capacity": {
+          "type": "long"
+        },
+        "jvm_classes_loaded": {
+          "type": "long"
+        },
+        "jvm_classes_unloaded": {
+          "type": "long"
+        },
+        "jvm_gc_live_data_size": {
+          "type": "long"
+        },
+        "jvm_gc_max_data_size": {
+          "type": "float"
+        },
+        "jvm_gc_memory_allocated": {
+          "type": "float"
+        },
+        "jvm_gc_memory_promoted": {
+          "type": "float"
+        },
+        "jvm_gc_pause": {
+          "properties": {
+            "count": {
+              "type": "long"
+            },
+            "sum": {
+              "properties": {
+                "us": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "jvm_memory_committed": {
+          "type": "float"
+        },
+        "jvm_memory_max": {
+          "type": "float"
+        },
+        "jvm_memory_used": {
+          "type": "float"
+        },
+        "jvm_threads_daemon": {
+          "type": "long"
+        },
+        "jvm_threads_live": {
+          "type": "long"
+        },
+        "jvm_threads_peak": {
+          "type": "long"
+        },
+        "jvm_threads_states": {
+          "type": "long"
+        },
         "kubernetes": {
           "dynamic": "false",
           "properties": {
@@ -10326,8 +11638,8 @@
             "container": {
               "properties": {
                 "image": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
+                  "path": "container.image.name",
+                  "type": "alias"
                 },
                 "name": {
                   "ignore_above": 1024,
@@ -10368,6 +11680,9 @@
             },
             "pod": {
               "properties": {
+                "ip": {
+                  "type": "ip"
+                },
                 "name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -10386,48 +11701,148 @@
                 }
               }
             },
-            "statefulset": {
-              "properties": {
-                "name": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "labels": {
-          "dynamic": "true",
-          "properties": {
-            "city": {
+            "selectors": {
+              "properties": {
+                "*": {
+                  "type": "object"
+                }
+              }
+            },
+            "statefulset": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "labels": {
+          "dynamic": "true",
+          "properties": {
+            "a": {
+              "type": "keyword"
+            },
+            "action": {
+              "type": "keyword"
+            },
+            "antifraud_order_check_price_range": {
+              "type": "keyword"
+            },
+            "antifraud_order_check_shipping_country": {
+              "type": "keyword"
+            },
+            "antifraud_order_check_success": {
+              "type": "keyword"
+            },
+            "area": {
+              "type": "keyword"
+            },
+            "cache": {
+              "type": "keyword"
+            },
+            "cause": {
+              "type": "keyword"
+            },
+            "charset": {
+              "type": "keyword"
+            },
+            "city": {
+              "type": "keyword"
+            },
+            "connection": {
+              "type": "keyword"
+            },
+            "country_code": {
+              "type": "keyword"
+            },
+            "env": {
+              "type": "keyword"
+            },
+            "etag": {
+              "type": "keyword"
+            },
+            "exception": {
+              "type": "keyword"
+            },
+            "generation": {
+              "type": "keyword"
+            },
+            "git_rev": {
+              "type": "keyword"
+            },
+            "hostname": {
+              "type": "keyword"
+            },
+            "id": {
+              "type": "keyword"
+            },
+            "implementation": {
+              "type": "keyword"
+            },
+            "in_eu": {
+              "type": "boolean"
+            },
+            "ip": {
+              "type": "keyword"
+            },
+            "lang": {
+              "type": "keyword"
+            },
+            "level": {
+              "type": "keyword"
+            },
+            "major": {
+              "type": "keyword"
+            },
+            "method": {
+              "type": "keyword"
+            },
+            "minor": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "outcome": {
               "type": "keyword"
             },
-            "country_code": {
+            "patchlevel": {
               "type": "keyword"
             },
-            "env": {
+            "pool": {
               "type": "keyword"
             },
-            "git_rev": {
+            "result": {
               "type": "keyword"
             },
-            "hostname": {
+            "shipping_country": {
               "type": "keyword"
             },
-            "in_eu": {
-              "type": "boolean"
+            "state": {
+              "type": "keyword"
             },
-            "ip": {
+            "status": {
               "type": "keyword"
             },
-            "lang": {
+            "transport": {
               "type": "keyword"
             },
-            "name": {
+            "type": {
               "type": "keyword"
             },
             "u": {
               "type": "keyword"
+            },
+            "uri": {
+              "type": "keyword"
+            },
+            "version": {
+              "type": "keyword"
+            },
+            "view": {
+              "type": "keyword"
             }
           }
         },
@@ -10504,18 +11919,29 @@
             }
           }
         },
+        "logback_events": {
+          "type": "long"
+        },
         "message": {
           "norms": false,
           "type": "text"
         },
         "metricset": {
           "properties": {
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "period": {
+              "meta": {
+                "unit": "ms"
+              },
               "type": "long"
             }
           }
         },
         "network": {
+          "dynamic": "false",
           "properties": {
             "application": {
               "ignore_above": 1024,
@@ -10524,10 +11950,34 @@
             "bytes": {
               "type": "long"
             },
+            "carrier": {
+              "properties": {
+                "icc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mcc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mnc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "community_id": {
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "connection_type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "direction": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -10600,9 +12050,6 @@
                           "type": "float"
                         }
                       }
-                    },
-                    "ns": {
-                      "type": "long"
                     }
                   }
                 }
@@ -10705,6 +12152,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -10724,6 +12175,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -10731,6 +12186,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -10823,6 +12282,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -10854,6 +12317,80 @@
             }
           }
         },
+        "orchestrator": {
+          "properties": {
+            "api_version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "cluster": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "url": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "namespace": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "organization": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "resource": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "order": {
+          "properties": {
+            "count": {
+              "type": "long"
+            },
+            "sum": {
+              "type": "long"
+            }
+          }
+        },
+        "order_count_counter": {
+          "type": "long"
+        },
+        "order_per_country": {
+          "properties": {
+            "count": {
+              "type": "long"
+            },
+            "sum": {
+              "type": "long"
+            }
+          }
+        },
+        "order_value_counter": {
+          "type": "long"
+        },
         "organization": {
           "properties": {
             "id": {
@@ -10906,6 +12443,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "version": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -11022,6 +12563,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -11030,6 +12575,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -11082,6 +12631,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -11109,6 +12662,10 @@
                     "exists": {
                       "type": "boolean"
                     },
+                    "signing_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
                     "status": {
                       "ignore_above": 1024,
                       "type": "keyword"
@@ -11117,6 +12674,10 @@
                       "ignore_above": 1024,
                       "type": "keyword"
                     },
+                    "team_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
                     "trusted": {
                       "type": "boolean"
                     },
@@ -11169,6 +12730,10 @@
                     "sha512": {
                       "ignore_above": 1024,
                       "type": "keyword"
+                    },
+                    "ssdeep": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
                     }
                   }
                 },
@@ -11336,6 +12901,21 @@
             }
           }
         },
+        "process_cpu_usage": {
+          "type": "float"
+        },
+        "process_files_max": {
+          "type": "long"
+        },
+        "process_files_open": {
+          "type": "long"
+        },
+        "process_start_time": {
+          "type": "float"
+        },
+        "process_uptime": {
+          "type": "float"
+        },
         "processor": {
           "properties": {
             "event": {
@@ -11368,11 +12948,17 @@
             "cpu": {
               "properties": {
                 "ns": {
+                  "meta": {
+                    "unit": "nanos"
+                  },
                   "type": "long"
                 }
               }
             },
             "duration": {
+              "meta": {
+                "unit": "nanos"
+              },
               "type": "long"
             },
             "id": {
@@ -11439,6 +13025,131 @@
                   "type": "long"
                 }
               }
+            },
+            "wall": {
+              "properties": {
+                "us": {
+                  "meta": {
+                    "unit": "micros"
+                  },
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "prometheus": {
+          "properties": {
+            "metrics": {
+              "properties": {
+                "django_http_ajax_requests": {
+                  "type": "long"
+                },
+                "django_http_exceptions_total_by_type": {
+                  "type": "long"
+                },
+                "django_http_exceptions_total_by_view": {
+                  "type": "long"
+                },
+                "django_http_requests_before_middlewares": {
+                  "type": "long"
+                },
+                "django_http_requests_total_by_method": {
+                  "type": "long"
+                },
+                "django_http_requests_total_by_transport": {
+                  "type": "long"
+                },
+                "django_http_requests_total_by_view_transport_method": {
+                  "type": "long"
+                },
+                "django_http_requests_unknown_latency": {
+                  "type": "long"
+                },
+                "django_http_requests_unknown_latency_including_middlewares": {
+                  "type": "long"
+                },
+                "django_http_responses_before_middlewares": {
+                  "type": "long"
+                },
+                "django_http_responses_streaming": {
+                  "type": "long"
+                },
+                "django_http_responses_total_by_charset": {
+                  "type": "long"
+                },
+                "django_http_responses_total_by_status": {
+                  "type": "long"
+                },
+                "django_http_responses_total_by_status_view_method": {
+                  "type": "long"
+                },
+                "django_migrations_applied_total": {
+                  "type": "long"
+                },
+                "django_migrations_unapplied_total": {
+                  "type": "long"
+                },
+                "opbeans_python_line_items": {
+                  "type": "long"
+                },
+                "opbeans_python_orders": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    },
+                    "sum": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "process_cpu_seconds": {
+                  "type": "float"
+                },
+                "process_max_fds": {
+                  "type": "float"
+                },
+                "process_open_fds": {
+                  "type": "long"
+                },
+                "process_resident_memory_bytes": {
+                  "type": "float"
+                },
+                "process_start_time_seconds": {
+                  "type": "float"
+                },
+                "process_virtual_memory_bytes": {
+                  "type": "float"
+                },
+                "python_gc_collections": {
+                  "type": "long"
+                },
+                "python_gc_objects_collected": {
+                  "type": "long"
+                },
+                "python_gc_objects_uncollectable": {
+                  "type": "long"
+                },
+                "python_info": {
+                  "type": "long"
+                },
+                "random_counter": {
+                  "type": "long"
+                },
+                "random_gauge": {
+                  "type": "float"
+                },
+                "random_summary": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    },
+                    "sum": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
             }
           }
         },
@@ -11616,6 +13327,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -11635,6 +13350,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -11642,6 +13361,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -11672,6 +13395,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -11815,6 +13542,18 @@
             }
           }
         },
+        "session": {
+          "dynamic": "false",
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sequence": {
+              "type": "long"
+            }
+          }
+        },
         "source": {
           "dynamic": "false",
           "properties": {
@@ -11856,6 +13595,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -11875,6 +13618,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -11882,6 +13629,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -11912,6 +13663,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -12040,6 +13795,9 @@
                         "sum": {
                           "properties": {
                             "us": {
+                              "meta": {
+                                "unit": "micros"
+                              },
                               "type": "long"
                             }
                           }
@@ -12097,6 +13855,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -12132,6 +13893,10 @@
                     "norm": {
                       "properties": {
                         "pct": {
+                          "meta": {
+                            "metric_type": "gauge",
+                            "unit": "percent"
+                          },
                           "scaling_factor": 1000,
                           "type": "scaled_float"
                         }
@@ -12146,11 +13911,19 @@
                 "actual": {
                   "properties": {
                     "free": {
+                      "meta": {
+                        "metric_type": "gauge",
+                        "unit": "byte"
+                      },
                       "type": "long"
                     }
                   }
                 },
                 "total": {
+                  "meta": {
+                    "metric_type": "gauge",
+                    "unit": "byte"
+                  },
                   "type": "long"
                 }
               }
@@ -12159,6 +13932,86 @@
               "properties": {
                 "cgroup": {
                   "properties": {
+                    "cpu": {
+                      "properties": {
+                        "cfs": {
+                          "properties": {
+                            "period": {
+                              "properties": {
+                                "us": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "micros"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "quota": {
+                              "properties": {
+                                "us": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "micros"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "stats": {
+                          "properties": {
+                            "periods": {
+                              "meta": {
+                                "metric_type": "counter"
+                              },
+                              "type": "long"
+                            },
+                            "throttled": {
+                              "properties": {
+                                "ns": {
+                                  "meta": {
+                                    "metric_type": "counter",
+                                    "unit": "nanos"
+                                  },
+                                  "type": "long"
+                                },
+                                "periods": {
+                                  "meta": {
+                                    "metric_type": "counter"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "cpuacct": {
+                      "properties": {
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "total": {
+                          "properties": {
+                            "ns": {
+                              "meta": {
+                                "metric_type": "counter",
+                                "unit": "nanos"
+                              },
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
                     "memory": {
                       "properties": {
                         "mem": {
@@ -12166,6 +14019,10 @@
                             "limit": {
                               "properties": {
                                 "bytes": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "byte"
+                                  },
                                   "type": "long"
                                 }
                               }
@@ -12173,6 +14030,10 @@
                             "usage": {
                               "properties": {
                                 "bytes": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "byte"
+                                  },
                                   "type": "long"
                                 }
                               }
@@ -12212,6 +14073,10 @@
                         "norm": {
                           "properties": {
                             "pct": {
+                              "meta": {
+                                "metric_type": "gauge",
+                                "unit": "percent"
+                              },
                               "scaling_factor": 1000,
                               "type": "scaled_float"
                             }
@@ -12237,11 +14102,19 @@
                     "rss": {
                       "properties": {
                         "bytes": {
+                          "meta": {
+                            "metric_type": "gauge",
+                            "unit": "byte"
+                          },
                           "type": "long"
                         }
                       }
                     },
                     "size": {
+                      "meta": {
+                        "metric_type": "gauge",
+                        "unit": "byte"
+                      },
                       "type": "long"
                     }
                   }
@@ -12250,6 +14123,15 @@
             }
           }
         },
+        "system_cpu_count": {
+          "type": "long"
+        },
+        "system_cpu_usage": {
+          "type": "float"
+        },
+        "system_load_average_1m": {
+          "type": "float"
+        },
         "tags": {
           "ignore_above": 1024,
           "type": "keyword"
@@ -12295,6 +14177,28 @@
                 "reference": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "subtechnique": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "reference": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
                 }
               }
             }
@@ -12655,6 +14559,24 @@
             }
           }
         },
+        "tomcat_sessions_active_current": {
+          "type": "long"
+        },
+        "tomcat_sessions_active_max": {
+          "type": "long"
+        },
+        "tomcat_sessions_alive_max": {
+          "type": "long"
+        },
+        "tomcat_sessions_created": {
+          "type": "long"
+        },
+        "tomcat_sessions_expired": {
+          "type": "long"
+        },
+        "tomcat_sessions_rejected": {
+          "type": "long"
+        },
         "trace": {
           "dynamic": "false",
           "properties": {
@@ -12664,34 +14586,6 @@
             }
           }
         },
-        "tracing": {
-          "properties": {
-            "span": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "trace": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "transaction": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
         "transaction": {
           "dynamic": "false",
           "properties": {
@@ -12713,6 +14607,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -12818,6 +14715,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -12889,6 +14789,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -12902,10 +14806,130 @@
         "user": {
           "dynamic": "false",
           "properties": {
+            "changes": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "domain": {
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "effective": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "email": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -12951,6 +14975,66 @@
             "roles": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "target": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -13001,6 +15085,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -13013,10 +15101,6 @@
             }
           }
         },
-        "view spans": {
-          "ignore_above": 1024,
-          "type": "keyword"
-        },
         "vlan": {
           "properties": {
             "id": {
@@ -13205,6 +15289,9 @@
     },
     "settings": {
       "index": {
+        "blocks": {
+          "read_only_allow_delete": "false"
+        },
         "codec": "best_compression",
         "lifecycle": {
           "name": "apm-rollover-30-days",
@@ -13218,7 +15305,6 @@
         "max_docvalue_fields_search": "200",
         "number_of_replicas": "1",
         "number_of_shards": "1",
-        "priority": "100",
         "refresh_interval": "5s"
       }
     }
@@ -13233,7 +15319,7 @@
         "is_write_index": true
       }
     },
-    "index": "apm-8.0.0-span-2020.12.03-000001",
+    "index": "apm-8.0.0-span-000008",
     "mappings": {
       "_meta": {
         "beat": "apm",
@@ -13294,84 +15380,11 @@
           }
         },
         {
-          "labels_string": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_string": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_string": {
+          "kubernetes.selectors.*": {
             "mapping": {
               "type": "keyword"
             },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
+            "path_match": "kubernetes.selectors.*"
           }
         },
         {
@@ -13402,30 +15415,10 @@
           }
         },
         {
-          "labels_string": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
+          "histogram": {
             "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
+              "type": "histogram"
+            }
           }
         },
         {
@@ -13568,6 +15561,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -13587,6 +15584,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -13594,6 +15595,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -13624,6 +15629,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -13759,6 +15768,15 @@
             "region": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "service": {
+              "dynamic": "false",
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -13767,6 +15785,10 @@
             "exists": {
               "type": "boolean"
             },
+            "signing_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "status": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -13775,6 +15797,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "team_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "trusted": {
               "type": "boolean"
             },
@@ -13815,6 +15841,19 @@
             }
           }
         },
+        "data_stream": {
+          "properties": {
+            "dataset": {
+              "type": "constant_keyword"
+            },
+            "namespace": {
+              "type": "constant_keyword"
+            },
+            "type": {
+              "type": "constant_keyword"
+            }
+          }
+        },
         "destination": {
           "properties": {
             "address": {
@@ -13855,6 +15894,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -13874,6 +15917,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -13881,6 +15928,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -13911,6 +15962,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -13984,6 +16039,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -13992,6 +16051,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -14017,6 +16080,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -14197,6 +16264,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "grouping_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "id": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -14359,6 +16430,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -14367,6 +16442,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -14422,6 +16501,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -14624,6 +16707,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "continent_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "continent_name": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -14639,7 +16726,11 @@
             "location": {
               "type": "geo_point"
             },
-            "name": {
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "postal_code": {
               "ignore_above": 1024,
               "type": "keyword"
             },
@@ -14650,6 +16741,10 @@
             "region_name": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "timezone": {
+              "ignore_above": 1024,
+              "type": "keyword"
             }
           }
         },
@@ -14686,6 +16781,10 @@
             "sha512": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "ssdeep": {
+              "ignore_above": 1024,
+              "type": "keyword"
             }
           }
         },
@@ -14699,6 +16798,32 @@
             "containerized": {
               "type": "boolean"
             },
+            "cpu": {
+              "properties": {
+                "usage": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                }
+              }
+            },
+            "disk": {
+              "properties": {
+                "read": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "write": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -14709,6 +16834,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -14728,6 +16857,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -14735,6 +16868,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -14757,6 +16894,30 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "network": {
+              "properties": {
+                "egress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "ingress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "os": {
               "properties": {
                 "build": {
@@ -14799,6 +16960,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -14903,10 +17068,18 @@
                   "enabled": false,
                   "type": "object"
                 },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "method": {
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "mime_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "referrer": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -14942,6 +17115,10 @@
                   "enabled": false,
                   "type": "object"
                 },
+                "mime_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status_code": {
                   "type": "long"
                 }
@@ -14982,8 +17159,8 @@
             "container": {
               "properties": {
                 "image": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
+                  "path": "container.image.name",
+                  "type": "alias"
                 },
                 "name": {
                   "ignore_above": 1024,
@@ -15024,6 +17201,9 @@
             },
             "pod": {
               "properties": {
+                "ip": {
+                  "type": "ip"
+                },
                 "name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -15042,6 +17222,13 @@
                 }
               }
             },
+            "selectors": {
+              "properties": {
+                "*": {
+                  "type": "object"
+                }
+              }
+            },
             "statefulset": {
               "properties": {
                 "name": {
@@ -15061,6 +17248,22 @@
             "country_code": {
               "type": "keyword"
             },
+            "events_encoded": {
+              "scaling_factor": 1000000,
+              "type": "scaled_float"
+            },
+            "events_failed": {
+              "scaling_factor": 1000000,
+              "type": "scaled_float"
+            },
+            "events_original": {
+              "scaling_factor": 1000000,
+              "type": "scaled_float"
+            },
+            "events_published": {
+              "scaling_factor": 1000000,
+              "type": "scaled_float"
+            },
             "foo": {
               "type": "keyword"
             },
@@ -15076,10 +17279,10 @@
             "lang": {
               "type": "keyword"
             },
-            "productId": {
+            "plugin": {
               "type": "keyword"
             },
-            "u": {
+            "productId": {
               "type": "keyword"
             }
           }
@@ -15163,12 +17366,20 @@
         },
         "metricset": {
           "properties": {
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "period": {
+              "meta": {
+                "unit": "ms"
+              },
               "type": "long"
             }
           }
         },
         "network": {
+          "dynamic": "false",
           "properties": {
             "application": {
               "ignore_above": 1024,
@@ -15177,10 +17388,34 @@
             "bytes": {
               "type": "long"
             },
+            "carrier": {
+              "properties": {
+                "icc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mcc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mnc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "community_id": {
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "connection_type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "direction": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -15286,6 +17521,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -15305,6 +17544,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -15312,6 +17555,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -15404,6 +17651,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -15435,6 +17686,54 @@
             }
           }
         },
+        "orchestrator": {
+          "properties": {
+            "api_version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "cluster": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "url": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "namespace": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "organization": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "resource": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
         "organization": {
           "properties": {
             "id": {
@@ -15487,6 +17786,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "version": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -15603,6 +17906,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -15611,6 +17918,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -15663,6 +17974,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -15690,6 +18005,10 @@
                     "exists": {
                       "type": "boolean"
                     },
+                    "signing_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
                     "status": {
                       "ignore_above": 1024,
                       "type": "keyword"
@@ -15698,6 +18017,10 @@
                       "ignore_above": 1024,
                       "type": "keyword"
                     },
+                    "team_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
                     "trusted": {
                       "type": "boolean"
                     },
@@ -15750,6 +18073,10 @@
                     "sha512": {
                       "ignore_above": 1024,
                       "type": "keyword"
+                    },
+                    "ssdeep": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
                     }
                   }
                 },
@@ -15949,11 +18276,17 @@
             "cpu": {
               "properties": {
                 "ns": {
+                  "meta": {
+                    "unit": "nanos"
+                  },
                   "type": "long"
                 }
               }
             },
             "duration": {
+              "meta": {
+                "unit": "nanos"
+              },
               "type": "long"
             },
             "id": {
@@ -16020,6 +18353,16 @@
                   "type": "long"
                 }
               }
+            },
+            "wall": {
+              "properties": {
+                "us": {
+                  "meta": {
+                    "unit": "micros"
+                  },
+                  "type": "long"
+                }
+              }
             }
           }
         },
@@ -16162,6 +18505,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -16181,6 +18528,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -16188,6 +18539,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -16218,6 +18573,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -16361,6 +18720,18 @@
             }
           }
         },
+        "session": {
+          "dynamic": "false",
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sequence": {
+              "type": "long"
+            }
+          }
+        },
         "source": {
           "dynamic": "false",
           "properties": {
@@ -16402,6 +18773,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -16421,6 +18796,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -16428,6 +18807,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -16458,6 +18841,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -16552,6 +18939,25 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "composite": {
+              "dynamic": "false",
+              "properties": {
+                "compression_strategy": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "count": {
+                  "type": "long"
+                },
+                "sum": {
+                  "properties": {
+                    "us": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "db": {
               "dynamic": "false",
               "properties": {
@@ -16586,6 +18992,9 @@
                         "sum": {
                           "properties": {
                             "us": {
+                              "meta": {
+                                "unit": "micros"
+                              },
                               "type": "long"
                             }
                           }
@@ -16643,6 +19052,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -16678,6 +19090,10 @@
                     "norm": {
                       "properties": {
                         "pct": {
+                          "meta": {
+                            "metric_type": "gauge",
+                            "unit": "percent"
+                          },
                           "scaling_factor": 1000,
                           "type": "scaled_float"
                         }
@@ -16692,11 +19108,19 @@
                 "actual": {
                   "properties": {
                     "free": {
+                      "meta": {
+                        "metric_type": "gauge",
+                        "unit": "byte"
+                      },
                       "type": "long"
                     }
                   }
                 },
                 "total": {
+                  "meta": {
+                    "metric_type": "gauge",
+                    "unit": "byte"
+                  },
                   "type": "long"
                 }
               }
@@ -16705,6 +19129,86 @@
               "properties": {
                 "cgroup": {
                   "properties": {
+                    "cpu": {
+                      "properties": {
+                        "cfs": {
+                          "properties": {
+                            "period": {
+                              "properties": {
+                                "us": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "micros"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "quota": {
+                              "properties": {
+                                "us": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "micros"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "stats": {
+                          "properties": {
+                            "periods": {
+                              "meta": {
+                                "metric_type": "counter"
+                              },
+                              "type": "long"
+                            },
+                            "throttled": {
+                              "properties": {
+                                "ns": {
+                                  "meta": {
+                                    "metric_type": "counter",
+                                    "unit": "nanos"
+                                  },
+                                  "type": "long"
+                                },
+                                "periods": {
+                                  "meta": {
+                                    "metric_type": "counter"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "cpuacct": {
+                      "properties": {
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "total": {
+                          "properties": {
+                            "ns": {
+                              "meta": {
+                                "metric_type": "counter",
+                                "unit": "nanos"
+                              },
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
                     "memory": {
                       "properties": {
                         "mem": {
@@ -16712,6 +19216,10 @@
                             "limit": {
                               "properties": {
                                 "bytes": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "byte"
+                                  },
                                   "type": "long"
                                 }
                               }
@@ -16719,6 +19227,10 @@
                             "usage": {
                               "properties": {
                                 "bytes": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "byte"
+                                  },
                                   "type": "long"
                                 }
                               }
@@ -16736,6 +19248,10 @@
                         "norm": {
                           "properties": {
                             "pct": {
+                              "meta": {
+                                "metric_type": "gauge",
+                                "unit": "percent"
+                              },
                               "scaling_factor": 1000,
                               "type": "scaled_float"
                             }
@@ -16750,11 +19266,19 @@
                     "rss": {
                       "properties": {
                         "bytes": {
+                          "meta": {
+                            "metric_type": "gauge",
+                            "unit": "byte"
+                          },
                           "type": "long"
                         }
                       }
                     },
                     "size": {
+                      "meta": {
+                        "metric_type": "gauge",
+                        "unit": "byte"
+                      },
                       "type": "long"
                     }
                   }
@@ -16808,6 +19332,28 @@
                 "reference": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "subtechnique": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "reference": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
                 }
               }
             }
@@ -17177,34 +19723,6 @@
             }
           }
         },
-        "tracing": {
-          "properties": {
-            "span": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "trace": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "transaction": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
         "transaction": {
           "dynamic": "false",
           "properties": {
@@ -17226,6 +19744,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -17331,6 +19852,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -17402,6 +19926,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -17415,10 +19943,130 @@
         "user": {
           "dynamic": "false",
           "properties": {
+            "changes": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "domain": {
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "effective": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "email": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -17448,22 +20096,82 @@
                   "type": "keyword"
                 }
               }
-            },
-            "hash": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "id": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "name": {
-              "ignore_above": 1024,
-              "type": "keyword"
-            },
-            "roles": {
-              "ignore_above": 1024,
-              "type": "keyword"
+            },
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "roles": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "target": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -17514,6 +20222,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -17526,10 +20238,6 @@
             }
           }
         },
-        "view spans": {
-          "ignore_above": 1024,
-          "type": "keyword"
-        },
         "vlan": {
           "properties": {
             "id": {
@@ -17731,7 +20439,6 @@
         "max_docvalue_fields_search": "200",
         "number_of_replicas": "1",
         "number_of_shards": "1",
-        "priority": "100",
         "refresh_interval": "5s"
       }
     }
@@ -17746,7 +20453,7 @@
         "is_write_index": true
       }
     },
-    "index": "apm-8.0.0-transaction-2020.12.03-000001",
+    "index": "apm-8.0.0-transaction-000002",
     "mappings": {
       "_meta": {
         "beat": "apm",
@@ -17807,84 +20514,11 @@
           }
         },
         {
-          "labels_string": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_string": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_string": {
+          "kubernetes.selectors.*": {
             "mapping": {
               "type": "keyword"
             },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
-            "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
+            "path_match": "kubernetes.selectors.*"
           }
         },
         {
@@ -17915,30 +20549,10 @@
           }
         },
         {
-          "labels_string": {
-            "mapping": {
-              "type": "keyword"
-            },
-            "match_mapping_type": "string",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_boolean": {
-            "mapping": {
-              "type": "boolean"
-            },
-            "match_mapping_type": "boolean",
-            "path_match": "labels.*"
-          }
-        },
-        {
-          "labels_*": {
+          "histogram": {
             "mapping": {
-              "scaling_factor": 1000000,
-              "type": "scaled_float"
-            },
-            "path_match": "labels.*"
+              "type": "histogram"
+            }
           }
         },
         {
@@ -18081,6 +20695,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -18100,6 +20718,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -18107,6 +20729,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -18137,6 +20763,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -18272,6 +20902,15 @@
             "region": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "service": {
+              "dynamic": "false",
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -18280,6 +20919,10 @@
             "exists": {
               "type": "boolean"
             },
+            "signing_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "status": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -18288,6 +20931,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "team_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "trusted": {
               "type": "boolean"
             },
@@ -18328,6 +20975,19 @@
             }
           }
         },
+        "data_stream": {
+          "properties": {
+            "dataset": {
+              "type": "constant_keyword"
+            },
+            "namespace": {
+              "type": "constant_keyword"
+            },
+            "type": {
+              "type": "constant_keyword"
+            }
+          }
+        },
         "destination": {
           "properties": {
             "address": {
@@ -18368,6 +21028,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -18387,6 +21051,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -18394,6 +21062,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -18424,6 +21096,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -18497,6 +21173,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -18505,6 +21185,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -18530,6 +21214,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -18710,6 +21398,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "grouping_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "id": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -18872,6 +21564,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -18880,6 +21576,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -18935,6 +21635,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -19137,6 +21841,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "continent_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "continent_name": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -19156,6 +21864,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "postal_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "region_iso_code": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -19163,6 +21875,10 @@
             "region_name": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "timezone": {
+              "ignore_above": 1024,
+              "type": "keyword"
             }
           }
         },
@@ -19199,6 +21915,10 @@
             "sha512": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "ssdeep": {
+              "ignore_above": 1024,
+              "type": "keyword"
             }
           }
         },
@@ -19212,6 +21932,32 @@
             "containerized": {
               "type": "boolean"
             },
+            "cpu": {
+              "properties": {
+                "usage": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                }
+              }
+            },
+            "disk": {
+              "properties": {
+                "read": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "write": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -19222,6 +21968,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -19241,6 +21991,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -19248,6 +22002,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -19270,6 +22028,30 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "network": {
+              "properties": {
+                "egress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "ingress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "os": {
               "properties": {
                 "build": {
@@ -19312,6 +22094,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -19416,10 +22202,18 @@
                   "enabled": false,
                   "type": "object"
                 },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "method": {
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "mime_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "referrer": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -19455,6 +22249,10 @@
                   "enabled": false,
                   "type": "object"
                 },
+                "mime_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status_code": {
                   "type": "long"
                 }
@@ -19495,8 +22293,8 @@
             "container": {
               "properties": {
                 "image": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
+                  "path": "container.image.name",
+                  "type": "alias"
                 },
                 "name": {
                   "ignore_above": 1024,
@@ -19537,6 +22335,9 @@
             },
             "pod": {
               "properties": {
+                "ip": {
+                  "type": "ip"
+                },
                 "name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -19555,6 +22356,13 @@
                 }
               }
             },
+            "selectors": {
+              "properties": {
+                "*": {
+                  "type": "object"
+                }
+              }
+            },
             "statefulset": {
               "properties": {
                 "name": {
@@ -19607,16 +22415,26 @@
             "multi-line": {
               "type": "keyword"
             },
+            "plugin": {
+              "type": "keyword"
+            },
             "request_id": {
               "type": "keyword"
             },
             "served_from_cache": {
               "type": "keyword"
             },
+            "session_id": {
+              "type": "keyword"
+            },
+            "session_seq": {
+              "scaling_factor": 1000000,
+              "type": "scaled_float"
+            },
             "this-is-a-very-long-tag-name-without-any-spaces": {
               "type": "keyword"
             },
-            "u": {
+            "worker": {
               "type": "keyword"
             }
           }
@@ -19700,12 +22518,20 @@
         },
         "metricset": {
           "properties": {
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "period": {
+              "meta": {
+                "unit": "ms"
+              },
               "type": "long"
             }
           }
         },
         "network": {
+          "dynamic": "false",
           "properties": {
             "application": {
               "ignore_above": 1024,
@@ -19714,10 +22540,34 @@
             "bytes": {
               "type": "long"
             },
+            "carrier": {
+              "properties": {
+                "icc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mcc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mnc": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "community_id": {
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "connection_type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "direction": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -19823,6 +22673,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -19842,6 +22696,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -19849,6 +22707,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -19941,6 +22803,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -19972,6 +22838,54 @@
             }
           }
         },
+        "orchestrator": {
+          "properties": {
+            "api_version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "cluster": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "url": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "namespace": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "organization": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "resource": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
         "organization": {
           "properties": {
             "id": {
@@ -20024,6 +22938,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "version": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -20140,6 +23058,10 @@
                 "exists": {
                   "type": "boolean"
                 },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "status": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -20148,6 +23070,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "trusted": {
                   "type": "boolean"
                 },
@@ -20200,6 +23126,10 @@
                 "sha512": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -20227,6 +23157,10 @@
                     "exists": {
                       "type": "boolean"
                     },
+                    "signing_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
                     "status": {
                       "ignore_above": 1024,
                       "type": "keyword"
@@ -20235,6 +23169,10 @@
                       "ignore_above": 1024,
                       "type": "keyword"
                     },
+                    "team_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
                     "trusted": {
                       "type": "boolean"
                     },
@@ -20287,6 +23225,10 @@
                     "sha512": {
                       "ignore_above": 1024,
                       "type": "keyword"
+                    },
+                    "ssdeep": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
                     }
                   }
                 },
@@ -20486,11 +23428,17 @@
             "cpu": {
               "properties": {
                 "ns": {
+                  "meta": {
+                    "unit": "nanos"
+                  },
                   "type": "long"
                 }
               }
             },
             "duration": {
+              "meta": {
+                "unit": "nanos"
+              },
               "type": "long"
             },
             "id": {
@@ -20557,6 +23505,16 @@
                   "type": "long"
                 }
               }
+            },
+            "wall": {
+              "properties": {
+                "us": {
+                  "meta": {
+                    "unit": "micros"
+                  },
+                  "type": "long"
+                }
+              }
             }
           }
         },
@@ -20699,6 +23657,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -20718,6 +23680,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -20725,6 +23691,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -20755,6 +23725,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -20898,6 +23872,18 @@
             }
           }
         },
+        "session": {
+          "dynamic": "false",
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "sequence": {
+              "type": "long"
+            }
+          }
+        },
         "source": {
           "dynamic": "false",
           "properties": {
@@ -20939,6 +23925,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "continent_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -20958,6 +23948,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "region_iso_code": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -20965,6 +23959,10 @@
                 "region_name": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
                 }
               }
             },
@@ -20995,6 +23993,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -21089,6 +24091,25 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "composite": {
+              "dynamic": "false",
+              "properties": {
+                "compression_strategy": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "count": {
+                  "type": "long"
+                },
+                "sum": {
+                  "properties": {
+                    "us": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
             "db": {
               "dynamic": "false",
               "properties": {
@@ -21123,6 +24144,9 @@
                         "sum": {
                           "properties": {
                             "us": {
+                              "meta": {
+                                "unit": "micros"
+                              },
                               "type": "long"
                             }
                           }
@@ -21180,6 +24204,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -21215,6 +24242,10 @@
                     "norm": {
                       "properties": {
                         "pct": {
+                          "meta": {
+                            "metric_type": "gauge",
+                            "unit": "percent"
+                          },
                           "scaling_factor": 1000,
                           "type": "scaled_float"
                         }
@@ -21229,11 +24260,19 @@
                 "actual": {
                   "properties": {
                     "free": {
+                      "meta": {
+                        "metric_type": "gauge",
+                        "unit": "byte"
+                      },
                       "type": "long"
                     }
                   }
                 },
                 "total": {
+                  "meta": {
+                    "metric_type": "gauge",
+                    "unit": "byte"
+                  },
                   "type": "long"
                 }
               }
@@ -21242,6 +24281,86 @@
               "properties": {
                 "cgroup": {
                   "properties": {
+                    "cpu": {
+                      "properties": {
+                        "cfs": {
+                          "properties": {
+                            "period": {
+                              "properties": {
+                                "us": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "micros"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            },
+                            "quota": {
+                              "properties": {
+                                "us": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "micros"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "stats": {
+                          "properties": {
+                            "periods": {
+                              "meta": {
+                                "metric_type": "counter"
+                              },
+                              "type": "long"
+                            },
+                            "throttled": {
+                              "properties": {
+                                "ns": {
+                                  "meta": {
+                                    "metric_type": "counter",
+                                    "unit": "nanos"
+                                  },
+                                  "type": "long"
+                                },
+                                "periods": {
+                                  "meta": {
+                                    "metric_type": "counter"
+                                  },
+                                  "type": "long"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "cpuacct": {
+                      "properties": {
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "total": {
+                          "properties": {
+                            "ns": {
+                              "meta": {
+                                "metric_type": "counter",
+                                "unit": "nanos"
+                              },
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
                     "memory": {
                       "properties": {
                         "mem": {
@@ -21249,6 +24368,10 @@
                             "limit": {
                               "properties": {
                                 "bytes": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "byte"
+                                  },
                                   "type": "long"
                                 }
                               }
@@ -21256,6 +24379,10 @@
                             "usage": {
                               "properties": {
                                 "bytes": {
+                                  "meta": {
+                                    "metric_type": "gauge",
+                                    "unit": "byte"
+                                  },
                                   "type": "long"
                                 }
                               }
@@ -21273,6 +24400,10 @@
                         "norm": {
                           "properties": {
                             "pct": {
+                              "meta": {
+                                "metric_type": "gauge",
+                                "unit": "percent"
+                              },
                               "scaling_factor": 1000,
                               "type": "scaled_float"
                             }
@@ -21287,11 +24418,19 @@
                     "rss": {
                       "properties": {
                         "bytes": {
+                          "meta": {
+                            "metric_type": "gauge",
+                            "unit": "byte"
+                          },
                           "type": "long"
                         }
                       }
                     },
                     "size": {
+                      "meta": {
+                        "metric_type": "gauge",
+                        "unit": "byte"
+                      },
                       "type": "long"
                     }
                   }
@@ -21345,6 +24484,28 @@
                 "reference": {
                   "ignore_above": 1024,
                   "type": "keyword"
+                },
+                "subtechnique": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "norms": false,
+                          "type": "text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "reference": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
                 }
               }
             }
@@ -21714,34 +24875,6 @@
             }
           }
         },
-        "tracing": {
-          "properties": {
-            "span": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "trace": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            },
-            "transaction": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
         "transaction": {
           "dynamic": "false",
           "properties": {
@@ -21763,6 +24896,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -21956,6 +25092,9 @@
                 "sum": {
                   "properties": {
                     "us": {
+                      "meta": {
+                        "unit": "micros"
+                      },
                       "type": "long"
                     }
                   }
@@ -22027,6 +25166,10 @@
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "top_level_domain": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -22040,10 +25183,130 @@
         "user": {
           "dynamic": "false",
           "properties": {
+            "changes": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "domain": {
               "ignore_above": 1024,
               "type": "keyword"
             },
+            "effective": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
             "email": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -22089,6 +25352,66 @@
             "roles": {
               "ignore_above": 1024,
               "type": "keyword"
+            },
+            "target": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "norms": false,
+                      "type": "text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -22139,6 +25462,10 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
                 "version": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -22151,10 +25478,6 @@
             }
           }
         },
-        "view spans": {
-          "ignore_above": 1024,
-          "type": "keyword"
-        },
         "vlan": {
           "properties": {
             "id": {
@@ -22356,9 +25679,8 @@
         "max_docvalue_fields_search": "200",
         "number_of_replicas": "1",
         "number_of_shards": "1",
-        "priority": "100",
         "refresh_interval": "5s"
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/x-pack/test/apm_api_integration/common/fixtures/es_archiver/archives_metadata.ts b/x-pack/test/apm_api_integration/common/fixtures/es_archiver/archives_metadata.ts
index 1f88b47dc9ed1..efb0af05668eb 100644
--- a/x-pack/test/apm_api_integration/common/fixtures/es_archiver/archives_metadata.ts
+++ b/x-pack/test/apm_api_integration/common/fixtures/es_archiver/archives_metadata.ts
@@ -5,9 +5,10 @@
  * 2.0.
  */
 
-export default {
+/* eslint-disable-next-line*/
+    export default {
   'apm_8.0.0': {
-    start: '2020-12-08T13:57:56.135Z',
-    end: '2020-12-08T14:27:56.135Z',
+    start: '2021-07-27T08:08:11.069Z',
+    end: '2021-07-27T08:38:11.069Z',
   },
 };
diff --git a/x-pack/test/apm_api_integration/common/registry.ts b/x-pack/test/apm_api_integration/common/registry.ts
index ae55328d63bd2..13cafcffe3af4 100644
--- a/x-pack/test/apm_api_integration/common/registry.ts
+++ b/x-pack/test/apm_api_integration/common/registry.ts
@@ -141,6 +141,7 @@ export const registry = {
             const log = logWithTimer();
             for (const archiveName of condition.archives) {
               log(`Loading ${archiveName}`);
+
               await esArchiver.load(
                 Path.join(
                   'x-pack/test/apm_api_integration/common/fixtures/es_archiver',
diff --git a/x-pack/test/apm_api_integration/configs/index.ts b/x-pack/test/apm_api_integration/configs/index.ts
index da1e06f7f2ea6..793197e9fc1b8 100644
--- a/x-pack/test/apm_api_integration/configs/index.ts
+++ b/x-pack/test/apm_api_integration/configs/index.ts
@@ -11,13 +11,22 @@ import { createTestConfig } from '../common/config';
 const apmFtrConfigs = {
   basic: {
     license: 'basic' as const,
+    kibanaConfig: {
+      // disable v2 migrations to prevent issue where kibana index is deleted
+      // during a migration
+      'migrations.enableV2': 'false',
+    },
   },
   trial: {
     license: 'trial' as const,
+    kibanaConfig: {
+      'migrations.enableV2': 'false',
+    },
   },
   rules: {
     license: 'trial' as const,
     kibanaConfig: {
+      'migrations.enableV2': 'false',
       'xpack.ruleRegistry.index': '.kibana-alerts',
       'xpack.ruleRegistry.write.enabled': 'true',
     },
diff --git a/x-pack/test/apm_api_integration/tests/correlations/errors_failed_transactions.ts b/x-pack/test/apm_api_integration/tests/correlations/errors_failed_transactions.ts
index 80c2b98266248..93196baadbd98 100644
--- a/x-pack/test/apm_api_integration/tests/correlations/errors_failed_transactions.ts
+++ b/x-pack/test/apm_api_integration/tests/correlations/errors_failed_transactions.ts
@@ -58,12 +58,12 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
       it('returns significant terms', () => {
         const { significantTerms } = response.body;
-        expect(significantTerms).to.have.length(2);
+        expect(significantTerms.length).to.be.greaterThan(0);
+
         const sortedFieldNames = significantTerms.map(({ fieldName }) => fieldName).sort();
         expectSnapshot(sortedFieldNames).toMatchInline(`
           Array [
             "user_agent.name",
-            "user_agent.name",
           ]
         `);
       });
@@ -73,7 +73,6 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         expectSnapshot(significantTerms.map((term) => term.timeseries.length)).toMatchInline(`
           Array [
             31,
-            31,
           ]
         `);
       });
diff --git a/x-pack/test/apm_api_integration/tests/correlations/latency_overall.ts b/x-pack/test/apm_api_integration/tests/correlations/latency_overall.ts
index 0d79333faa9ef..781fef7e6fb34 100644
--- a/x-pack/test/apm_api_integration/tests/correlations/latency_overall.ts
+++ b/x-pack/test/apm_api_integration/tests/correlations/latency_overall.ts
@@ -57,8 +57,11 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       });
 
       it('returns overall distribution', () => {
-        expectSnapshot(response.body?.distributionInterval).toMatchInline(`238776`);
-        expectSnapshot(response.body?.maxLatency).toMatchInline(`3581640.00000003`);
+        // less precision for distributionInterval as it is not exact
+        expectSnapshot(response.body?.distributionInterval?.toPrecision(2)).toMatchInline(
+          `"3.3e+5"`
+        );
+        expectSnapshot(response.body?.maxLatency?.toPrecision(2)).toMatchInline(`"5.0e+6"`);
         expectSnapshot(response.body?.overallDistribution?.length).toMatchInline(`15`);
       });
     }
diff --git a/x-pack/test/apm_api_integration/tests/correlations/latency_slow_transactions.ts b/x-pack/test/apm_api_integration/tests/correlations/latency_slow_transactions.ts
index d32beee0f31d5..e2251fb28d379 100644
--- a/x-pack/test/apm_api_integration/tests/correlations/latency_slow_transactions.ts
+++ b/x-pack/test/apm_api_integration/tests/correlations/latency_slow_transactions.ts
@@ -61,38 +61,41 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
       it('returns significant terms', () => {
         const { significantTerms } = response.body;
-        expect(significantTerms).to.have.length(9);
+        expect(significantTerms.length).to.be.greaterThan(0);
+
         const sortedFieldNames = significantTerms.map(({ fieldName }) => fieldName).sort();
         expectSnapshot(sortedFieldNames).toMatchInline(`
-        Array [
-          "url.original",
-          "url.original",
-          "url.original",
-          "url.original",
-          "user_agent.name",
-          "user_agent.name",
-          "user_agent.name",
-          "user_agent.os.name",
-          "user_agent.os.name",
-        ]
-      `);
+          Array [
+            "url.original",
+            "url.original",
+            "url.original",
+            "url.original",
+            "url.original",
+            "url.original",
+            "url.original",
+            "url.original",
+            "user_agent.name",
+            "user_agent.os.name",
+          ]
+        `);
       });
 
       it('returns a distribution per term', () => {
         const { significantTerms } = response.body;
         expectSnapshot(significantTerms.map((term) => term.distribution.length)).toMatchInline(`
-        Array [
-          15,
-          15,
-          15,
-          15,
-          15,
-          15,
-          15,
-          15,
-          15,
-        ]
-      `);
+          Array [
+            15,
+            15,
+            15,
+            15,
+            15,
+            15,
+            15,
+            15,
+            15,
+            15,
+          ]
+        `);
       });
     }
   );
diff --git a/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.ts b/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.ts
index 99b18aca98a01..f8012c42526cf 100644
--- a/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.ts
+++ b/x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.ts
@@ -52,10 +52,10 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         expect(response.body.serviceCount).to.be.greaterThan(0);
         expect(response.body.transactionPerMinute.timeseries.length).to.be.greaterThan(0);
 
-        expectSnapshot(response.body.serviceCount).toMatchInline(`9`);
+        expectSnapshot(response.body.serviceCount).toMatchInline(`10`);
 
-        expectSnapshot(response.body.transactionPerMinute.value).toMatchInline(`41.4333333333333`);
-        expectSnapshot(response.body.transactionPerMinute.timeseries.length).toMatchInline(`31`);
+        expectSnapshot(response.body.transactionPerMinute.value).toMatchInline(`132.833333333333`);
+        expectSnapshot(response.body.transactionPerMinute.timeseries.length).toMatchInline(`30`);
 
         expectSnapshot(
           response.body.transactionPerMinute.timeseries
@@ -67,24 +67,24 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         ).toMatchInline(`
           Array [
             Object {
-              "x": "2020-12-08T13:57:00.000Z",
-              "y": 10,
+              "x": "2021-07-27T08:08:00.000Z",
+              "y": 85,
             },
             Object {
-              "x": "2020-12-08T13:58:00.000Z",
-              "y": 43,
+              "x": "2021-07-27T08:09:00.000Z",
+              "y": 108,
             },
             Object {
-              "x": "2020-12-08T13:59:00.000Z",
-              "y": 18,
+              "x": "2021-07-27T08:10:00.000Z",
+              "y": 76,
             },
             Object {
-              "x": "2020-12-08T14:00:00.000Z",
-              "y": 57,
+              "x": "2021-07-27T08:11:00.000Z",
+              "y": 77,
             },
             Object {
-              "x": "2020-12-08T14:01:00.000Z",
-              "y": 15,
+              "x": "2021-07-27T08:12:00.000Z",
+              "y": 56,
             },
           ]
         `);
diff --git a/x-pack/test/apm_api_integration/tests/service_maps/__snapshots__/service_maps.snap b/x-pack/test/apm_api_integration/tests/service_maps/__snapshots__/service_maps.snap
index 69bc039b67ed2..9b913da4ca2e5 100644
--- a/x-pack/test/apm_api_integration/tests/service_maps/__snapshots__/service_maps.snap
+++ b/x-pack/test/apm_api_integration/tests/service_maps/__snapshots__/service_maps.snap
@@ -1,543 +1,30 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`APM API tests trial apm_8.0.0 Service Map with data /api/apm/service-map returns service map elements filtering by environment not defined 1`] = `
-Object {
-  "elements": Array [
-    Object {
-      "data": Object {
-        "agent.name": "python",
-        "id": "opbeans-python",
-        "service.environment": "ENVIRONMENT_NOT_DEFINED",
-        "service.name": "opbeans-python",
-        "serviceAnomalyStats": Object {
-          "actualValue": 24282.2352941176,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-          "serviceName": "opbeans-python",
-          "transactionType": "request",
-        },
-      },
-    },
-    Object {
-      "data": Object {
-        "id": ">redis",
-        "label": "redis",
-        "span.destination.service.resource": "redis",
-        "span.subtype": "redis",
-        "span.type": "db",
-      },
-    },
-    Object {
-      "data": Object {
-        "agent.name": "ruby",
-        "id": "opbeans-ruby",
-        "service.environment": "ENVIRONMENT_NOT_DEFINED",
-        "service.name": "opbeans-ruby",
-        "serviceAnomalyStats": Object {
-          "actualValue": 121348.868852459,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-          "serviceName": "opbeans-ruby",
-          "transactionType": "request",
-        },
-      },
-    },
-    Object {
-      "data": Object {
-        "id": ">postgresql",
-        "label": "postgresql",
-        "span.destination.service.resource": "postgresql",
-        "span.subtype": "postgresql",
-        "span.type": "db",
-      },
-    },
-    Object {
-      "data": Object {
-        "agent.name": "go",
-        "id": "opbeans-go",
-        "service.environment": "testing",
-        "service.name": "opbeans-go",
-      },
-    },
-    Object {
-      "data": Object {
-        "agent.name": "java",
-        "id": "opbeans-java",
-        "service.environment": "production",
-        "service.name": "opbeans-java",
-      },
-    },
-    Object {
-      "data": Object {
-        "agent.name": "nodejs",
-        "id": "opbeans-node",
-        "service.environment": "testing",
-        "service.name": "opbeans-node",
-      },
-    },
-    Object {
-      "data": Object {
-        "agent.name": "rum-js",
-        "id": "opbeans-rum",
-        "service.environment": "testing",
-        "service.name": "opbeans-rum",
-      },
-    },
-    Object {
-      "data": Object {
-        "id": ">elasticsearch",
-        "label": "elasticsearch",
-        "span.destination.service.resource": "elasticsearch",
-        "span.subtype": "elasticsearch",
-        "span.type": "db",
-      },
-    },
-    Object {
-      "data": Object {
-        "id": "opbeans-go~opbeans-python",
-        "source": "opbeans-go",
-        "sourceData": Object {
-          "agent.name": "go",
-          "id": "opbeans-go",
-          "service.environment": "testing",
-          "service.name": "opbeans-go",
-        },
-        "target": "opbeans-python",
-        "targetData": Object {
-          "agent.name": "python",
-          "id": "opbeans-python",
-          "service.environment": "ENVIRONMENT_NOT_DEFINED",
-          "service.name": "opbeans-python",
-          "serviceAnomalyStats": Object {
-            "actualValue": 24282.2352941176,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-            "serviceName": "opbeans-python",
-            "transactionType": "request",
-          },
-        },
-      },
-    },
-    Object {
-      "data": Object {
-        "id": "opbeans-go~opbeans-ruby",
-        "source": "opbeans-go",
-        "sourceData": Object {
-          "agent.name": "go",
-          "id": "opbeans-go",
-          "service.environment": "testing",
-          "service.name": "opbeans-go",
-        },
-        "target": "opbeans-ruby",
-        "targetData": Object {
-          "agent.name": "ruby",
-          "id": "opbeans-ruby",
-          "service.environment": "ENVIRONMENT_NOT_DEFINED",
-          "service.name": "opbeans-ruby",
-          "serviceAnomalyStats": Object {
-            "actualValue": 121348.868852459,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-            "serviceName": "opbeans-ruby",
-            "transactionType": "request",
-          },
-        },
-      },
-    },
-    Object {
-      "data": Object {
-        "id": "opbeans-java~>postgresql",
-        "source": "opbeans-java",
-        "sourceData": Object {
-          "agent.name": "java",
-          "id": "opbeans-java",
-          "service.environment": "production",
-          "service.name": "opbeans-java",
-        },
-        "target": ">postgresql",
-        "targetData": Object {
-          "id": ">postgresql",
-          "label": "postgresql",
-          "span.destination.service.resource": "postgresql",
-          "span.subtype": "postgresql",
-          "span.type": "db",
-        },
-      },
-    },
-    Object {
-      "data": Object {
-        "id": "opbeans-node~>postgresql",
-        "source": "opbeans-node",
-        "sourceData": Object {
-          "agent.name": "nodejs",
-          "id": "opbeans-node",
-          "service.environment": "testing",
-          "service.name": "opbeans-node",
-        },
-        "target": ">postgresql",
-        "targetData": Object {
-          "id": ">postgresql",
-          "label": "postgresql",
-          "span.destination.service.resource": "postgresql",
-          "span.subtype": "postgresql",
-          "span.type": "db",
-        },
-      },
-    },
-    Object {
-      "data": Object {
-        "id": "opbeans-node~opbeans-go",
-        "source": "opbeans-node",
-        "sourceData": Object {
-          "agent.name": "nodejs",
-          "id": "opbeans-node",
-          "service.environment": "testing",
-          "service.name": "opbeans-node",
-        },
-        "target": "opbeans-go",
-        "targetData": Object {
-          "agent.name": "go",
-          "id": "opbeans-go",
-          "service.environment": "testing",
-          "service.name": "opbeans-go",
-        },
-      },
-    },
-    Object {
-      "data": Object {
-        "bidirectional": true,
-        "id": "opbeans-node~opbeans-ruby",
-        "source": "opbeans-node",
-        "sourceData": Object {
-          "agent.name": "nodejs",
-          "id": "opbeans-node",
-          "service.environment": "testing",
-          "service.name": "opbeans-node",
-        },
-        "target": "opbeans-ruby",
-        "targetData": Object {
-          "agent.name": "ruby",
-          "id": "opbeans-ruby",
-          "service.environment": "ENVIRONMENT_NOT_DEFINED",
-          "service.name": "opbeans-ruby",
-          "serviceAnomalyStats": Object {
-            "actualValue": 121348.868852459,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-            "serviceName": "opbeans-ruby",
-            "transactionType": "request",
-          },
-        },
-      },
-    },
-    Object {
-      "data": Object {
-        "id": "opbeans-python~>elasticsearch",
-        "source": "opbeans-python",
-        "sourceData": Object {
-          "agent.name": "python",
-          "id": "opbeans-python",
-          "service.environment": "ENVIRONMENT_NOT_DEFINED",
-          "service.name": "opbeans-python",
-          "serviceAnomalyStats": Object {
-            "actualValue": 24282.2352941176,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-            "serviceName": "opbeans-python",
-            "transactionType": "request",
-          },
-        },
-        "target": ">elasticsearch",
-        "targetData": Object {
-          "id": ">elasticsearch",
-          "label": "elasticsearch",
-          "span.destination.service.resource": "elasticsearch",
-          "span.subtype": "elasticsearch",
-          "span.type": "db",
-        },
-      },
-    },
-    Object {
-      "data": Object {
-        "id": "opbeans-python~>postgresql",
-        "source": "opbeans-python",
-        "sourceData": Object {
-          "agent.name": "python",
-          "id": "opbeans-python",
-          "service.environment": "ENVIRONMENT_NOT_DEFINED",
-          "service.name": "opbeans-python",
-          "serviceAnomalyStats": Object {
-            "actualValue": 24282.2352941176,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-            "serviceName": "opbeans-python",
-            "transactionType": "request",
-          },
-        },
-        "target": ">postgresql",
-        "targetData": Object {
-          "id": ">postgresql",
-          "label": "postgresql",
-          "span.destination.service.resource": "postgresql",
-          "span.subtype": "postgresql",
-          "span.type": "db",
-        },
-      },
-    },
-    Object {
-      "data": Object {
-        "id": "opbeans-python~>redis",
-        "source": "opbeans-python",
-        "sourceData": Object {
-          "agent.name": "python",
-          "id": "opbeans-python",
-          "service.environment": "ENVIRONMENT_NOT_DEFINED",
-          "service.name": "opbeans-python",
-          "serviceAnomalyStats": Object {
-            "actualValue": 24282.2352941176,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-            "serviceName": "opbeans-python",
-            "transactionType": "request",
-          },
-        },
-        "target": ">redis",
-        "targetData": Object {
-          "id": ">redis",
-          "label": "redis",
-          "span.destination.service.resource": "redis",
-          "span.subtype": "redis",
-          "span.type": "db",
-        },
-      },
-    },
-    Object {
-      "data": Object {
-        "id": "opbeans-python~opbeans-java",
-        "source": "opbeans-python",
-        "sourceData": Object {
-          "agent.name": "python",
-          "id": "opbeans-python",
-          "service.environment": "ENVIRONMENT_NOT_DEFINED",
-          "service.name": "opbeans-python",
-          "serviceAnomalyStats": Object {
-            "actualValue": 24282.2352941176,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-            "serviceName": "opbeans-python",
-            "transactionType": "request",
-          },
-        },
-        "target": "opbeans-java",
-        "targetData": Object {
-          "agent.name": "java",
-          "id": "opbeans-java",
-          "service.environment": "production",
-          "service.name": "opbeans-java",
-        },
-      },
-    },
-    Object {
-      "data": Object {
-        "id": "opbeans-python~opbeans-node",
-        "source": "opbeans-python",
-        "sourceData": Object {
-          "agent.name": "python",
-          "id": "opbeans-python",
-          "service.environment": "ENVIRONMENT_NOT_DEFINED",
-          "service.name": "opbeans-python",
-          "serviceAnomalyStats": Object {
-            "actualValue": 24282.2352941176,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-            "serviceName": "opbeans-python",
-            "transactionType": "request",
-          },
-        },
-        "target": "opbeans-node",
-        "targetData": Object {
-          "agent.name": "nodejs",
-          "id": "opbeans-node",
-          "service.environment": "testing",
-          "service.name": "opbeans-node",
-        },
-      },
-    },
-    Object {
-      "data": Object {
-        "id": "opbeans-ruby~>postgresql",
-        "source": "opbeans-ruby",
-        "sourceData": Object {
-          "agent.name": "ruby",
-          "id": "opbeans-ruby",
-          "service.environment": "ENVIRONMENT_NOT_DEFINED",
-          "service.name": "opbeans-ruby",
-          "serviceAnomalyStats": Object {
-            "actualValue": 121348.868852459,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-            "serviceName": "opbeans-ruby",
-            "transactionType": "request",
-          },
-        },
-        "target": ">postgresql",
-        "targetData": Object {
-          "id": ">postgresql",
-          "label": "postgresql",
-          "span.destination.service.resource": "postgresql",
-          "span.subtype": "postgresql",
-          "span.type": "db",
-        },
-      },
-    },
-    Object {
-      "data": Object {
-        "id": "opbeans-ruby~opbeans-java",
-        "source": "opbeans-ruby",
-        "sourceData": Object {
-          "agent.name": "ruby",
-          "id": "opbeans-ruby",
-          "service.environment": "ENVIRONMENT_NOT_DEFINED",
-          "service.name": "opbeans-ruby",
-          "serviceAnomalyStats": Object {
-            "actualValue": 121348.868852459,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-            "serviceName": "opbeans-ruby",
-            "transactionType": "request",
-          },
-        },
-        "target": "opbeans-java",
-        "targetData": Object {
-          "agent.name": "java",
-          "id": "opbeans-java",
-          "service.environment": "production",
-          "service.name": "opbeans-java",
-        },
-      },
-    },
-    Object {
-      "data": Object {
-        "id": "opbeans-ruby~opbeans-node",
-        "isInverseEdge": true,
-        "source": "opbeans-ruby",
-        "sourceData": Object {
-          "agent.name": "ruby",
-          "id": "opbeans-ruby",
-          "service.environment": "ENVIRONMENT_NOT_DEFINED",
-          "service.name": "opbeans-ruby",
-          "serviceAnomalyStats": Object {
-            "actualValue": 121348.868852459,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-            "serviceName": "opbeans-ruby",
-            "transactionType": "request",
-          },
-        },
-        "target": "opbeans-node",
-        "targetData": Object {
-          "agent.name": "nodejs",
-          "id": "opbeans-node",
-          "service.environment": "testing",
-          "service.name": "opbeans-node",
-        },
-      },
-    },
-    Object {
-      "data": Object {
-        "id": "opbeans-ruby~opbeans-python",
-        "source": "opbeans-ruby",
-        "sourceData": Object {
-          "agent.name": "ruby",
-          "id": "opbeans-ruby",
-          "service.environment": "ENVIRONMENT_NOT_DEFINED",
-          "service.name": "opbeans-ruby",
-          "serviceAnomalyStats": Object {
-            "actualValue": 121348.868852459,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-            "serviceName": "opbeans-ruby",
-            "transactionType": "request",
-          },
-        },
-        "target": "opbeans-python",
-        "targetData": Object {
-          "agent.name": "python",
-          "id": "opbeans-python",
-          "service.environment": "ENVIRONMENT_NOT_DEFINED",
-          "service.name": "opbeans-python",
-          "serviceAnomalyStats": Object {
-            "actualValue": 24282.2352941176,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-            "serviceName": "opbeans-python",
-            "transactionType": "request",
-          },
-        },
-      },
-    },
-    Object {
-      "data": Object {
-        "id": "opbeans-rum~opbeans-node",
-        "source": "opbeans-rum",
-        "sourceData": Object {
-          "agent.name": "rum-js",
-          "id": "opbeans-rum",
-          "service.environment": "testing",
-          "service.name": "opbeans-rum",
-        },
-        "target": "opbeans-node",
-        "targetData": Object {
-          "agent.name": "nodejs",
-          "id": "opbeans-node",
-          "service.environment": "testing",
-          "service.name": "opbeans-node",
-        },
-      },
-    },
-  ],
-}
-`;
-
 exports[`APM API tests trial apm_8.0.0 Service Map with data /api/apm/service-map returns the correct data 3`] = `
 Array [
   Object {
     "data": Object {
-      "agent.name": "python",
-      "id": "opbeans-python",
-      "service.name": "opbeans-python",
+      "agent.name": "nodejs",
+      "id": "kibana",
+      "service.environment": "production",
+      "service.name": "kibana",
       "serviceAnomalyStats": Object {
-        "actualValue": 24282.2352941176,
+        "actualValue": 635652.26283725,
         "anomalyScore": 0,
         "healthStatus": "healthy",
-        "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-        "serviceName": "opbeans-python",
+        "jobId": "apm-production-802c-high_mean_transaction_duration",
+        "serviceName": "kibana",
         "transactionType": "request",
       },
     },
   },
   Object {
     "data": Object {
-      "id": ">redis",
-      "label": "redis",
-      "span.destination.service.resource": "redis",
-      "span.subtype": "redis",
-      "span.type": "cache",
+      "id": ">8b37cb7ca2ae49ada54db165f32d3a19.us-central1.gcp.foundit.no:9243",
+      "label": "8b37cb7ca2ae49ada54db165f32d3a19.us-central1.gcp.foundit.no:9243",
+      "span.destination.service.resource": "8b37cb7ca2ae49ada54db165f32d3a19.us-central1.gcp.foundit.no:9243",
+      "span.subtype": "https",
+      "span.type": "external",
     },
   },
   Object {
@@ -546,16 +33,48 @@ Array [
       "id": "opbeans-node",
       "service.environment": "testing",
       "service.name": "opbeans-node",
+    },
+  },
+  Object {
+    "data": Object {
+      "agent.name": "ruby",
+      "id": "opbeans-ruby",
+      "service.environment": "production",
+      "service.name": "opbeans-ruby",
+      "serviceAnomalyStats": Object {
+        "actualValue": 24400.8867924528,
+        "anomalyScore": 0,
+        "healthStatus": "healthy",
+        "jobId": "apm-production-802c-high_mean_transaction_duration",
+        "serviceName": "opbeans-ruby",
+        "transactionType": "request",
+      },
+    },
+  },
+  Object {
+    "data": Object {
+      "agent.name": "java",
+      "id": "opbeans-java",
+      "service.environment": "production",
+      "service.name": "opbeans-java",
       "serviceAnomalyStats": Object {
-        "actualValue": 29300.5555555556,
+        "actualValue": 19105.8492063492,
         "anomalyScore": 0,
         "healthStatus": "healthy",
-        "jobId": "apm-testing-384f-high_mean_transaction_duration",
-        "serviceName": "opbeans-node",
+        "jobId": "apm-production-802c-high_mean_transaction_duration",
+        "serviceName": "opbeans-java",
         "transactionType": "request",
       },
     },
   },
+  Object {
+    "data": Object {
+      "agent.name": "rum-js",
+      "id": "opbeans-rum",
+      "service.environment": "testing",
+      "service.name": "opbeans-rum",
+    },
+  },
   Object {
     "data": Object {
       "id": ">postgresql",
@@ -567,36 +86,54 @@ Array [
   },
   Object {
     "data": Object {
-      "agent.name": "rum-js",
-      "id": "opbeans-rum",
-      "service.environment": "testing",
-      "service.name": "opbeans-rum",
+      "agent.name": "python",
+      "id": "opbeans-python",
+      "service.environment": "production",
+      "service.name": "opbeans-python",
       "serviceAnomalyStats": Object {
-        "actualValue": 2386500,
+        "actualValue": 42906.4512195122,
         "anomalyScore": 0,
         "healthStatus": "healthy",
-        "jobId": "apm-testing-384f-high_mean_transaction_duration",
-        "serviceName": "opbeans-rum",
-        "transactionType": "page-load",
+        "jobId": "apm-production-802c-high_mean_transaction_duration",
+        "serviceName": "opbeans-python",
+        "transactionType": "request",
       },
     },
   },
   Object {
     "data": Object {
-      "agent.name": "java",
-      "id": "opbeans-java",
+      "id": ">elasticsearch",
+      "label": "elasticsearch",
+      "span.destination.service.resource": "elasticsearch",
+      "span.subtype": "elasticsearch",
+      "span.type": "db",
+    },
+  },
+  Object {
+    "data": Object {
+      "agent.name": "dotnet",
+      "id": "opbeans-dotnet",
       "service.environment": "production",
-      "service.name": "opbeans-java",
+      "service.name": "opbeans-dotnet",
       "serviceAnomalyStats": Object {
-        "actualValue": 23879.7906976744,
+        "actualValue": 653671.165289257,
         "anomalyScore": 0,
         "healthStatus": "healthy",
-        "jobId": "apm-production-1369-high_mean_transaction_duration",
-        "serviceName": "opbeans-java",
+        "jobId": "apm-production-802c-high_mean_transaction_duration",
+        "serviceName": "opbeans-dotnet",
         "transactionType": "request",
       },
     },
   },
+  Object {
+    "data": Object {
+      "id": ">sqlite",
+      "label": "sqlite",
+      "span.destination.service.resource": "sqlite",
+      "span.subtype": "sqlite",
+      "span.type": "db",
+    },
+  },
   Object {
     "data": Object {
       "agent.name": "rum-js",
@@ -604,10 +141,10 @@ Array [
       "service.environment": "production",
       "service.name": "kibana-frontend",
       "serviceAnomalyStats": Object {
-        "actualValue": 2081800,
+        "actualValue": 3580000,
         "anomalyScore": 0,
         "healthStatus": "healthy",
-        "jobId": "apm-production-1369-high_mean_transaction_duration",
+        "jobId": "apm-production-802c-high_mean_transaction_duration",
         "serviceName": "kibana-frontend",
         "transactionType": "page-load",
       },
@@ -615,27 +152,20 @@ Array [
   },
   Object {
     "data": Object {
-      "agent.name": "nodejs",
-      "id": "kibana",
-      "service.environment": "production",
-      "service.name": "kibana",
-      "serviceAnomalyStats": Object {
-        "actualValue": 431063.266917293,
-        "anomalyScore": 0,
-        "healthStatus": "healthy",
-        "jobId": "apm-production-1369-high_mean_transaction_duration",
-        "serviceName": "kibana",
-        "transactionType": "request",
-      },
+      "id": ">epr-snapshot.elastic.co:443",
+      "label": "epr-snapshot.elastic.co:443",
+      "span.destination.service.resource": "epr-snapshot.elastic.co:443",
+      "span.subtype": "https",
+      "span.type": "external",
     },
   },
   Object {
     "data": Object {
-      "id": ">feeds.elastic.co:443",
-      "label": "feeds.elastic.co:443",
-      "span.destination.service.resource": "feeds.elastic.co:443",
-      "span.subtype": "http",
-      "span.type": "external",
+      "id": ">redis",
+      "label": "redis",
+      "span.destination.service.resource": "redis",
+      "span.subtype": "redis",
+      "span.type": "cache",
     },
   },
   Object {
@@ -644,83 +174,23 @@ Array [
       "id": "opbeans-go",
       "service.environment": "testing",
       "service.name": "opbeans-go",
-      "serviceAnomalyStats": Object {
-        "actualValue": 34089.2957746479,
-        "anomalyScore": 0,
-        "healthStatus": "healthy",
-        "jobId": "apm-testing-384f-high_mean_transaction_duration",
-        "serviceName": "opbeans-go",
-        "transactionType": "request",
-      },
-    },
-  },
-  Object {
-    "data": Object {
-      "agent.name": "ruby",
-      "id": "opbeans-ruby",
-      "service.name": "opbeans-ruby",
-      "serviceAnomalyStats": Object {
-        "actualValue": 121348.868852459,
-        "anomalyScore": 0,
-        "healthStatus": "healthy",
-        "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-        "serviceName": "opbeans-ruby",
-        "transactionType": "request",
-      },
     },
   },
   Object {
     "data": Object {
-      "id": ">elasticsearch",
-      "label": "elasticsearch",
-      "span.destination.service.resource": "elasticsearch",
-      "span.subtype": "elasticsearch",
-      "span.type": "db",
+      "id": ">feeds.elastic.co:443",
+      "label": "feeds.elastic.co:443",
+      "span.destination.service.resource": "feeds.elastic.co:443",
+      "span.subtype": "http",
+      "span.type": "external",
     },
   },
   Object {
     "data": Object {
-      "agent.name": "dotnet",
-      "id": "opbeans-dotnet",
+      "agent.name": "go",
+      "id": "auditbeat",
       "service.environment": null,
-      "service.name": "opbeans-dotnet",
-    },
-  },
-  Object {
-    "data": Object {
-      "groupedConnections": Array [
-        Object {
-          "id": ">34.203.1.122:9243",
-          "label": "34.203.1.122:9243",
-          "span.destination.service.resource": "34.203.1.122:9243",
-          "span.subtype": "https",
-          "span.type": "external",
-        },
-        Object {
-          "id": ">35.174.40.8:9243",
-          "label": "35.174.40.8:9243",
-          "span.destination.service.resource": "35.174.40.8:9243",
-          "span.subtype": "https",
-          "span.type": "external",
-        },
-        Object {
-          "id": ">52.23.77.114:9243",
-          "label": "52.23.77.114:9243",
-          "span.destination.service.resource": "52.23.77.114:9243",
-          "span.subtype": "https",
-          "span.type": "external",
-        },
-        Object {
-          "id": ">54.158.196.136:9243",
-          "label": "54.158.196.136:9243",
-          "span.destination.service.resource": "54.158.196.136:9243",
-          "span.subtype": "https",
-          "span.type": "external",
-        },
-      ],
-      "id": "resourceGroup{kibana}",
-      "label": "4 resources",
-      "span.type": "external",
+      "service.name": "auditbeat",
     },
   },
   Object {
@@ -733,10 +203,10 @@ Array [
         "service.environment": "production",
         "service.name": "kibana-frontend",
         "serviceAnomalyStats": Object {
-          "actualValue": 2081800,
+          "actualValue": 3580000,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-production-1369-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "kibana-frontend",
           "transactionType": "page-load",
         },
@@ -761,10 +231,10 @@ Array [
         "service.environment": "production",
         "service.name": "kibana-frontend",
         "serviceAnomalyStats": Object {
-          "actualValue": 2081800,
+          "actualValue": 3580000,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-production-1369-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "kibana-frontend",
           "transactionType": "page-load",
         },
@@ -776,14 +246,42 @@ Array [
         "service.environment": "production",
         "service.name": "kibana",
         "serviceAnomalyStats": Object {
-          "actualValue": 431063.266917293,
+          "actualValue": 635652.26283725,
+          "anomalyScore": 0,
+          "healthStatus": "healthy",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
+          "serviceName": "kibana",
+          "transactionType": "request",
+        },
+      },
+    },
+  },
+  Object {
+    "data": Object {
+      "id": "kibana~>8b37cb7ca2ae49ada54db165f32d3a19.us-central1.gcp.foundit.no:9243",
+      "source": "kibana",
+      "sourceData": Object {
+        "agent.name": "nodejs",
+        "id": "kibana",
+        "service.environment": "production",
+        "service.name": "kibana",
+        "serviceAnomalyStats": Object {
+          "actualValue": 635652.26283725,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-production-1369-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "kibana",
           "transactionType": "request",
         },
       },
+      "target": ">8b37cb7ca2ae49ada54db165f32d3a19.us-central1.gcp.foundit.no:9243",
+      "targetData": Object {
+        "id": ">8b37cb7ca2ae49ada54db165f32d3a19.us-central1.gcp.foundit.no:9243",
+        "label": "8b37cb7ca2ae49ada54db165f32d3a19.us-central1.gcp.foundit.no:9243",
+        "span.destination.service.resource": "8b37cb7ca2ae49ada54db165f32d3a19.us-central1.gcp.foundit.no:9243",
+        "span.subtype": "https",
+        "span.type": "external",
+      },
     },
   },
   Object {
@@ -796,10 +294,10 @@ Array [
         "service.environment": "production",
         "service.name": "kibana",
         "serviceAnomalyStats": Object {
-          "actualValue": 431063.266917293,
+          "actualValue": 635652.26283725,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-production-1369-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "kibana",
           "transactionType": "request",
         },
@@ -816,132 +314,102 @@ Array [
   },
   Object {
     "data": Object {
-      "id": "opbeans-go~>postgresql",
-      "source": "opbeans-go",
+      "id": "kibana~>epr-snapshot.elastic.co:443",
+      "source": "kibana",
       "sourceData": Object {
-        "agent.name": "go",
-        "id": "opbeans-go",
-        "service.environment": "testing",
-        "service.name": "opbeans-go",
+        "agent.name": "nodejs",
+        "id": "kibana",
+        "service.environment": "production",
+        "service.name": "kibana",
         "serviceAnomalyStats": Object {
-          "actualValue": 34089.2957746479,
+          "actualValue": 635652.26283725,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-go",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
+          "serviceName": "kibana",
           "transactionType": "request",
         },
       },
-      "target": ">postgresql",
+      "target": ">epr-snapshot.elastic.co:443",
       "targetData": Object {
-        "id": ">postgresql",
-        "label": "postgresql",
-        "span.destination.service.resource": "postgresql",
-        "span.subtype": "postgresql",
-        "span.type": "db",
+        "id": ">epr-snapshot.elastic.co:443",
+        "label": "epr-snapshot.elastic.co:443",
+        "span.destination.service.resource": "epr-snapshot.elastic.co:443",
+        "span.subtype": "https",
+        "span.type": "external",
       },
     },
   },
   Object {
     "data": Object {
-      "bidirectional": true,
-      "id": "opbeans-go~opbeans-node",
-      "source": "opbeans-go",
+      "id": "opbeans-dotnet~>sqlite",
+      "source": "opbeans-dotnet",
       "sourceData": Object {
-        "agent.name": "go",
-        "id": "opbeans-go",
-        "service.environment": "testing",
-        "service.name": "opbeans-go",
+        "agent.name": "dotnet",
+        "id": "opbeans-dotnet",
+        "service.environment": "production",
+        "service.name": "opbeans-dotnet",
         "serviceAnomalyStats": Object {
-          "actualValue": 34089.2957746479,
+          "actualValue": 653671.165289257,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-go",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
+          "serviceName": "opbeans-dotnet",
           "transactionType": "request",
         },
       },
-      "target": "opbeans-node",
+      "target": ">sqlite",
       "targetData": Object {
-        "agent.name": "nodejs",
-        "id": "opbeans-node",
-        "service.environment": "testing",
-        "service.name": "opbeans-node",
-        "serviceAnomalyStats": Object {
-          "actualValue": 29300.5555555556,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-node",
-          "transactionType": "request",
-        },
+        "id": ">sqlite",
+        "label": "sqlite",
+        "span.destination.service.resource": "sqlite",
+        "span.subtype": "sqlite",
+        "span.type": "db",
       },
     },
   },
   Object {
     "data": Object {
-      "id": "opbeans-go~opbeans-python",
+      "id": "opbeans-go~>postgresql",
       "source": "opbeans-go",
       "sourceData": Object {
         "agent.name": "go",
         "id": "opbeans-go",
         "service.environment": "testing",
         "service.name": "opbeans-go",
-        "serviceAnomalyStats": Object {
-          "actualValue": 34089.2957746479,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-go",
-          "transactionType": "request",
-        },
       },
-      "target": "opbeans-python",
+      "target": ">postgresql",
       "targetData": Object {
-        "agent.name": "python",
-        "id": "opbeans-python",
-        "service.name": "opbeans-python",
-        "serviceAnomalyStats": Object {
-          "actualValue": 24282.2352941176,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-          "serviceName": "opbeans-python",
-          "transactionType": "request",
-        },
+        "id": ">postgresql",
+        "label": "postgresql",
+        "span.destination.service.resource": "postgresql",
+        "span.subtype": "postgresql",
+        "span.type": "db",
       },
     },
   },
   Object {
     "data": Object {
-      "bidirectional": true,
-      "id": "opbeans-go~opbeans-ruby",
+      "id": "opbeans-go~opbeans-dotnet",
       "source": "opbeans-go",
       "sourceData": Object {
         "agent.name": "go",
         "id": "opbeans-go",
         "service.environment": "testing",
         "service.name": "opbeans-go",
-        "serviceAnomalyStats": Object {
-          "actualValue": 34089.2957746479,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-go",
-          "transactionType": "request",
-        },
       },
-      "target": "opbeans-ruby",
+      "target": "opbeans-dotnet",
       "targetData": Object {
-        "agent.name": "ruby",
-        "id": "opbeans-ruby",
-        "service.name": "opbeans-ruby",
+        "agent.name": "dotnet",
+        "id": "opbeans-dotnet",
+        "service.environment": "production",
+        "service.name": "opbeans-dotnet",
         "serviceAnomalyStats": Object {
-          "actualValue": 121348.868852459,
+          "actualValue": 653671.165289257,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-          "serviceName": "opbeans-ruby",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
+          "serviceName": "opbeans-dotnet",
           "transactionType": "request",
         },
       },
@@ -949,62 +417,54 @@ Array [
   },
   Object {
     "data": Object {
-      "id": "opbeans-java~>postgresql",
-      "source": "opbeans-java",
+      "id": "opbeans-go~opbeans-java",
+      "source": "opbeans-go",
       "sourceData": Object {
+        "agent.name": "go",
+        "id": "opbeans-go",
+        "service.environment": "testing",
+        "service.name": "opbeans-go",
+      },
+      "target": "opbeans-java",
+      "targetData": Object {
         "agent.name": "java",
         "id": "opbeans-java",
         "service.environment": "production",
         "service.name": "opbeans-java",
         "serviceAnomalyStats": Object {
-          "actualValue": 23879.7906976744,
+          "actualValue": 19105.8492063492,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-production-1369-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-java",
           "transactionType": "request",
         },
       },
-      "target": ">postgresql",
-      "targetData": Object {
-        "id": ">postgresql",
-        "label": "postgresql",
-        "span.destination.service.resource": "postgresql",
-        "span.subtype": "postgresql",
-        "span.type": "db",
-      },
     },
   },
   Object {
     "data": Object {
-      "id": "opbeans-java~opbeans-go",
-      "source": "opbeans-java",
+      "bidirectional": true,
+      "id": "opbeans-go~opbeans-python",
+      "source": "opbeans-go",
       "sourceData": Object {
-        "agent.name": "java",
-        "id": "opbeans-java",
-        "service.environment": "production",
-        "service.name": "opbeans-java",
-        "serviceAnomalyStats": Object {
-          "actualValue": 23879.7906976744,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-production-1369-high_mean_transaction_duration",
-          "serviceName": "opbeans-java",
-          "transactionType": "request",
-        },
-      },
-      "target": "opbeans-go",
-      "targetData": Object {
         "agent.name": "go",
         "id": "opbeans-go",
         "service.environment": "testing",
         "service.name": "opbeans-go",
+      },
+      "target": "opbeans-python",
+      "targetData": Object {
+        "agent.name": "python",
+        "id": "opbeans-python",
+        "service.environment": "production",
+        "service.name": "opbeans-python",
         "serviceAnomalyStats": Object {
-          "actualValue": 34089.2957746479,
+          "actualValue": 42906.4512195122,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-go",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
+          "serviceName": "opbeans-python",
           "transactionType": "request",
         },
       },
@@ -1013,33 +473,26 @@ Array [
   Object {
     "data": Object {
       "bidirectional": true,
-      "id": "opbeans-java~opbeans-python",
-      "source": "opbeans-java",
+      "id": "opbeans-go~opbeans-ruby",
+      "source": "opbeans-go",
       "sourceData": Object {
-        "agent.name": "java",
-        "id": "opbeans-java",
-        "service.environment": "production",
-        "service.name": "opbeans-java",
-        "serviceAnomalyStats": Object {
-          "actualValue": 23879.7906976744,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-production-1369-high_mean_transaction_duration",
-          "serviceName": "opbeans-java",
-          "transactionType": "request",
-        },
+        "agent.name": "go",
+        "id": "opbeans-go",
+        "service.environment": "testing",
+        "service.name": "opbeans-go",
       },
-      "target": "opbeans-python",
+      "target": "opbeans-ruby",
       "targetData": Object {
-        "agent.name": "python",
-        "id": "opbeans-python",
-        "service.name": "opbeans-python",
+        "agent.name": "ruby",
+        "id": "opbeans-ruby",
+        "service.environment": "production",
+        "service.name": "opbeans-ruby",
         "serviceAnomalyStats": Object {
-          "actualValue": 24282.2352941176,
+          "actualValue": 24400.8867924528,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-          "serviceName": "opbeans-python",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
+          "serviceName": "opbeans-ruby",
           "transactionType": "request",
         },
       },
@@ -1047,8 +500,7 @@ Array [
   },
   Object {
     "data": Object {
-      "bidirectional": true,
-      "id": "opbeans-java~opbeans-ruby",
+      "id": "opbeans-java~>postgresql",
       "source": "opbeans-java",
       "sourceData": Object {
         "agent.name": "java",
@@ -1056,27 +508,21 @@ Array [
         "service.environment": "production",
         "service.name": "opbeans-java",
         "serviceAnomalyStats": Object {
-          "actualValue": 23879.7906976744,
+          "actualValue": 19105.8492063492,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-production-1369-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-java",
           "transactionType": "request",
         },
       },
-      "target": "opbeans-ruby",
+      "target": ">postgresql",
       "targetData": Object {
-        "agent.name": "ruby",
-        "id": "opbeans-ruby",
-        "service.name": "opbeans-ruby",
-        "serviceAnomalyStats": Object {
-          "actualValue": 121348.868852459,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-          "serviceName": "opbeans-ruby",
-          "transactionType": "request",
-        },
+        "id": ">postgresql",
+        "label": "postgresql",
+        "span.destination.service.resource": "postgresql",
+        "span.subtype": "postgresql",
+        "span.type": "db",
       },
     },
   },
@@ -1089,14 +535,6 @@ Array [
         "id": "opbeans-node",
         "service.environment": "testing",
         "service.name": "opbeans-node",
-        "serviceAnomalyStats": Object {
-          "actualValue": 29300.5555555556,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-node",
-          "transactionType": "request",
-        },
       },
       "target": ">postgresql",
       "targetData": Object {
@@ -1117,14 +555,6 @@ Array [
         "id": "opbeans-node",
         "service.environment": "testing",
         "service.name": "opbeans-node",
-        "serviceAnomalyStats": Object {
-          "actualValue": 29300.5555555556,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-node",
-          "transactionType": "request",
-        },
       },
       "target": ">redis",
       "targetData": Object {
@@ -1138,37 +568,47 @@ Array [
   },
   Object {
     "data": Object {
-      "id": "opbeans-node~opbeans-go",
-      "isInverseEdge": true,
+      "id": "opbeans-node~opbeans-dotnet",
       "source": "opbeans-node",
       "sourceData": Object {
         "agent.name": "nodejs",
         "id": "opbeans-node",
         "service.environment": "testing",
         "service.name": "opbeans-node",
+      },
+      "target": "opbeans-dotnet",
+      "targetData": Object {
+        "agent.name": "dotnet",
+        "id": "opbeans-dotnet",
+        "service.environment": "production",
+        "service.name": "opbeans-dotnet",
         "serviceAnomalyStats": Object {
-          "actualValue": 29300.5555555556,
+          "actualValue": 653671.165289257,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-node",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
+          "serviceName": "opbeans-dotnet",
           "transactionType": "request",
         },
       },
+    },
+  },
+  Object {
+    "data": Object {
+      "id": "opbeans-node~opbeans-go",
+      "source": "opbeans-node",
+      "sourceData": Object {
+        "agent.name": "nodejs",
+        "id": "opbeans-node",
+        "service.environment": "testing",
+        "service.name": "opbeans-node",
+      },
       "target": "opbeans-go",
       "targetData": Object {
         "agent.name": "go",
         "id": "opbeans-go",
         "service.environment": "testing",
         "service.name": "opbeans-go",
-        "serviceAnomalyStats": Object {
-          "actualValue": 34089.2957746479,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-go",
-          "transactionType": "request",
-        },
       },
     },
   },
@@ -1181,14 +621,6 @@ Array [
         "id": "opbeans-node",
         "service.environment": "testing",
         "service.name": "opbeans-node",
-        "serviceAnomalyStats": Object {
-          "actualValue": 29300.5555555556,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-node",
-          "transactionType": "request",
-        },
       },
       "target": "opbeans-java",
       "targetData": Object {
@@ -1197,10 +629,10 @@ Array [
         "service.environment": "production",
         "service.name": "opbeans-java",
         "serviceAnomalyStats": Object {
-          "actualValue": 23879.7906976744,
+          "actualValue": 19105.8492063492,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-production-1369-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-java",
           "transactionType": "request",
         },
@@ -1217,25 +649,18 @@ Array [
         "id": "opbeans-node",
         "service.environment": "testing",
         "service.name": "opbeans-node",
-        "serviceAnomalyStats": Object {
-          "actualValue": 29300.5555555556,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-node",
-          "transactionType": "request",
-        },
       },
       "target": "opbeans-python",
       "targetData": Object {
         "agent.name": "python",
         "id": "opbeans-python",
+        "service.environment": "production",
         "service.name": "opbeans-python",
         "serviceAnomalyStats": Object {
-          "actualValue": 24282.2352941176,
+          "actualValue": 42906.4512195122,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-python",
           "transactionType": "request",
         },
@@ -1252,25 +677,18 @@ Array [
         "id": "opbeans-node",
         "service.environment": "testing",
         "service.name": "opbeans-node",
-        "serviceAnomalyStats": Object {
-          "actualValue": 29300.5555555556,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-node",
-          "transactionType": "request",
-        },
       },
       "target": "opbeans-ruby",
       "targetData": Object {
         "agent.name": "ruby",
         "id": "opbeans-ruby",
+        "service.environment": "production",
         "service.name": "opbeans-ruby",
         "serviceAnomalyStats": Object {
-          "actualValue": 121348.868852459,
+          "actualValue": 24400.8867924528,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-ruby",
           "transactionType": "request",
         },
@@ -1284,12 +702,13 @@ Array [
       "sourceData": Object {
         "agent.name": "python",
         "id": "opbeans-python",
+        "service.environment": "production",
         "service.name": "opbeans-python",
         "serviceAnomalyStats": Object {
-          "actualValue": 24282.2352941176,
+          "actualValue": 42906.4512195122,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-python",
           "transactionType": "request",
         },
@@ -1311,12 +730,13 @@ Array [
       "sourceData": Object {
         "agent.name": "python",
         "id": "opbeans-python",
+        "service.environment": "production",
         "service.name": "opbeans-python",
         "serviceAnomalyStats": Object {
-          "actualValue": 24282.2352941176,
+          "actualValue": 42906.4512195122,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-python",
           "transactionType": "request",
         },
@@ -1338,12 +758,13 @@ Array [
       "sourceData": Object {
         "agent.name": "python",
         "id": "opbeans-python",
+        "service.environment": "production",
         "service.name": "opbeans-python",
         "serviceAnomalyStats": Object {
-          "actualValue": 24282.2352941176,
+          "actualValue": 42906.4512195122,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-python",
           "transactionType": "request",
         },
@@ -1360,18 +781,46 @@ Array [
   },
   Object {
     "data": Object {
-      "id": "opbeans-python~opbeans-java",
+      "id": "opbeans-python~opbeans-go",
       "isInverseEdge": true,
       "source": "opbeans-python",
       "sourceData": Object {
         "agent.name": "python",
         "id": "opbeans-python",
+        "service.environment": "production",
+        "service.name": "opbeans-python",
+        "serviceAnomalyStats": Object {
+          "actualValue": 42906.4512195122,
+          "anomalyScore": 0,
+          "healthStatus": "healthy",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
+          "serviceName": "opbeans-python",
+          "transactionType": "request",
+        },
+      },
+      "target": "opbeans-go",
+      "targetData": Object {
+        "agent.name": "go",
+        "id": "opbeans-go",
+        "service.environment": "testing",
+        "service.name": "opbeans-go",
+      },
+    },
+  },
+  Object {
+    "data": Object {
+      "id": "opbeans-python~opbeans-java",
+      "source": "opbeans-python",
+      "sourceData": Object {
+        "agent.name": "python",
+        "id": "opbeans-python",
+        "service.environment": "production",
         "service.name": "opbeans-python",
         "serviceAnomalyStats": Object {
-          "actualValue": 24282.2352941176,
+          "actualValue": 42906.4512195122,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-python",
           "transactionType": "request",
         },
@@ -1383,10 +832,10 @@ Array [
         "service.environment": "production",
         "service.name": "opbeans-java",
         "serviceAnomalyStats": Object {
-          "actualValue": 23879.7906976744,
+          "actualValue": 19105.8492063492,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-production-1369-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-java",
           "transactionType": "request",
         },
@@ -1401,12 +850,13 @@ Array [
       "sourceData": Object {
         "agent.name": "python",
         "id": "opbeans-python",
+        "service.environment": "production",
         "service.name": "opbeans-python",
         "serviceAnomalyStats": Object {
-          "actualValue": 24282.2352941176,
+          "actualValue": 42906.4512195122,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-python",
           "transactionType": "request",
         },
@@ -1417,14 +867,6 @@ Array [
         "id": "opbeans-node",
         "service.environment": "testing",
         "service.name": "opbeans-node",
-        "serviceAnomalyStats": Object {
-          "actualValue": 29300.5555555556,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-node",
-          "transactionType": "request",
-        },
       },
     },
   },
@@ -1435,12 +877,13 @@ Array [
       "sourceData": Object {
         "agent.name": "ruby",
         "id": "opbeans-ruby",
+        "service.environment": "production",
         "service.name": "opbeans-ruby",
         "serviceAnomalyStats": Object {
-          "actualValue": 121348.868852459,
+          "actualValue": 24400.8867924528,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-ruby",
           "transactionType": "request",
         },
@@ -1455,6 +898,41 @@ Array [
       },
     },
   },
+  Object {
+    "data": Object {
+      "id": "opbeans-ruby~opbeans-dotnet",
+      "source": "opbeans-ruby",
+      "sourceData": Object {
+        "agent.name": "ruby",
+        "id": "opbeans-ruby",
+        "service.environment": "production",
+        "service.name": "opbeans-ruby",
+        "serviceAnomalyStats": Object {
+          "actualValue": 24400.8867924528,
+          "anomalyScore": 0,
+          "healthStatus": "healthy",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
+          "serviceName": "opbeans-ruby",
+          "transactionType": "request",
+        },
+      },
+      "target": "opbeans-dotnet",
+      "targetData": Object {
+        "agent.name": "dotnet",
+        "id": "opbeans-dotnet",
+        "service.environment": "production",
+        "service.name": "opbeans-dotnet",
+        "serviceAnomalyStats": Object {
+          "actualValue": 653671.165289257,
+          "anomalyScore": 0,
+          "healthStatus": "healthy",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
+          "serviceName": "opbeans-dotnet",
+          "transactionType": "request",
+        },
+      },
+    },
+  },
   Object {
     "data": Object {
       "id": "opbeans-ruby~opbeans-go",
@@ -1463,12 +941,13 @@ Array [
       "sourceData": Object {
         "agent.name": "ruby",
         "id": "opbeans-ruby",
+        "service.environment": "production",
         "service.name": "opbeans-ruby",
         "serviceAnomalyStats": Object {
-          "actualValue": 121348.868852459,
+          "actualValue": 24400.8867924528,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-ruby",
           "transactionType": "request",
         },
@@ -1479,31 +958,23 @@ Array [
         "id": "opbeans-go",
         "service.environment": "testing",
         "service.name": "opbeans-go",
-        "serviceAnomalyStats": Object {
-          "actualValue": 34089.2957746479,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-go",
-          "transactionType": "request",
-        },
       },
     },
   },
   Object {
     "data": Object {
       "id": "opbeans-ruby~opbeans-java",
-      "isInverseEdge": true,
       "source": "opbeans-ruby",
       "sourceData": Object {
         "agent.name": "ruby",
         "id": "opbeans-ruby",
+        "service.environment": "production",
         "service.name": "opbeans-ruby",
         "serviceAnomalyStats": Object {
-          "actualValue": 121348.868852459,
+          "actualValue": 24400.8867924528,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-ruby",
           "transactionType": "request",
         },
@@ -1515,10 +986,10 @@ Array [
         "service.environment": "production",
         "service.name": "opbeans-java",
         "serviceAnomalyStats": Object {
-          "actualValue": 23879.7906976744,
+          "actualValue": 19105.8492063492,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-production-1369-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-java",
           "transactionType": "request",
         },
@@ -1533,12 +1004,13 @@ Array [
       "sourceData": Object {
         "agent.name": "ruby",
         "id": "opbeans-ruby",
+        "service.environment": "production",
         "service.name": "opbeans-ruby",
         "serviceAnomalyStats": Object {
-          "actualValue": 121348.868852459,
+          "actualValue": 24400.8867924528,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-ruby",
           "transactionType": "request",
         },
@@ -1549,14 +1021,6 @@ Array [
         "id": "opbeans-node",
         "service.environment": "testing",
         "service.name": "opbeans-node",
-        "serviceAnomalyStats": Object {
-          "actualValue": 29300.5555555556,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-node",
-          "transactionType": "request",
-        },
       },
     },
   },
@@ -1567,12 +1031,13 @@ Array [
       "sourceData": Object {
         "agent.name": "ruby",
         "id": "opbeans-ruby",
+        "service.environment": "production",
         "service.name": "opbeans-ruby",
         "serviceAnomalyStats": Object {
-          "actualValue": 121348.868852459,
+          "actualValue": 24400.8867924528,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-ruby",
           "transactionType": "request",
         },
@@ -1581,12 +1046,13 @@ Array [
       "targetData": Object {
         "agent.name": "python",
         "id": "opbeans-python",
+        "service.environment": "production",
         "service.name": "opbeans-python",
         "serviceAnomalyStats": Object {
-          "actualValue": 24282.2352941176,
+          "actualValue": 42906.4512195122,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-python",
           "transactionType": "request",
         },
@@ -1595,39 +1061,50 @@ Array [
   },
   Object {
     "data": Object {
-      "id": "opbeans-rum~opbeans-java",
+      "id": "opbeans-rum~opbeans-dotnet",
       "source": "opbeans-rum",
       "sourceData": Object {
         "agent.name": "rum-js",
         "id": "opbeans-rum",
         "service.environment": "testing",
         "service.name": "opbeans-rum",
-        "serviceAnomalyStats": Object {
-          "actualValue": 2386500,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-rum",
-          "transactionType": "page-load",
-        },
       },
-      "target": "opbeans-java",
+      "target": "opbeans-dotnet",
       "targetData": Object {
-        "agent.name": "java",
-        "id": "opbeans-java",
+        "agent.name": "dotnet",
+        "id": "opbeans-dotnet",
         "service.environment": "production",
-        "service.name": "opbeans-java",
+        "service.name": "opbeans-dotnet",
         "serviceAnomalyStats": Object {
-          "actualValue": 23879.7906976744,
+          "actualValue": 653671.165289257,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-production-1369-high_mean_transaction_duration",
-          "serviceName": "opbeans-java",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
+          "serviceName": "opbeans-dotnet",
           "transactionType": "request",
         },
       },
     },
   },
+  Object {
+    "data": Object {
+      "id": "opbeans-rum~opbeans-go",
+      "source": "opbeans-rum",
+      "sourceData": Object {
+        "agent.name": "rum-js",
+        "id": "opbeans-rum",
+        "service.environment": "testing",
+        "service.name": "opbeans-rum",
+      },
+      "target": "opbeans-go",
+      "targetData": Object {
+        "agent.name": "go",
+        "id": "opbeans-go",
+        "service.environment": "testing",
+        "service.name": "opbeans-go",
+      },
+    },
+  },
   Object {
     "data": Object {
       "id": "opbeans-rum~opbeans-node",
@@ -1637,14 +1114,6 @@ Array [
         "id": "opbeans-rum",
         "service.environment": "testing",
         "service.name": "opbeans-rum",
-        "serviceAnomalyStats": Object {
-          "actualValue": 2386500,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-rum",
-          "transactionType": "page-load",
-        },
       },
       "target": "opbeans-node",
       "targetData": Object {
@@ -1652,14 +1121,6 @@ Array [
         "id": "opbeans-node",
         "service.environment": "testing",
         "service.name": "opbeans-node",
-        "serviceAnomalyStats": Object {
-          "actualValue": 29300.5555555556,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-node",
-          "transactionType": "request",
-        },
       },
     },
   },
@@ -1672,25 +1133,18 @@ Array [
         "id": "opbeans-rum",
         "service.environment": "testing",
         "service.name": "opbeans-rum",
-        "serviceAnomalyStats": Object {
-          "actualValue": 2386500,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-rum",
-          "transactionType": "page-load",
-        },
       },
       "target": "opbeans-python",
       "targetData": Object {
         "agent.name": "python",
         "id": "opbeans-python",
+        "service.environment": "production",
         "service.name": "opbeans-python",
         "serviceAnomalyStats": Object {
-          "actualValue": 24282.2352941176,
+          "actualValue": 42906.4512195122,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-python",
           "transactionType": "request",
         },
@@ -1706,82 +1160,101 @@ Array [
         "id": "opbeans-rum",
         "service.environment": "testing",
         "service.name": "opbeans-rum",
+      },
+      "target": "opbeans-ruby",
+      "targetData": Object {
+        "agent.name": "ruby",
+        "id": "opbeans-ruby",
+        "service.environment": "production",
+        "service.name": "opbeans-ruby",
         "serviceAnomalyStats": Object {
-          "actualValue": 2386500,
+          "actualValue": 24400.8867924528,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-rum",
-          "transactionType": "page-load",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
+          "serviceName": "opbeans-ruby",
+          "transactionType": "request",
         },
       },
-      "target": "opbeans-ruby",
-      "targetData": Object {
+    },
+  },
+]
+`;
+
+exports[`APM API tests trial apm_8.0.0 Service Map with data /api/apm/service-map with ML data with the default apm user returns the correct anomaly stats 3`] = `
+Object {
+  "elements": Array [
+    Object {
+      "data": Object {
+        "agent.name": "nodejs",
+        "id": "kibana",
+        "service.environment": "production",
+        "service.name": "kibana",
+        "serviceAnomalyStats": Object {
+          "actualValue": 635652.26283725,
+          "anomalyScore": 0,
+          "healthStatus": "healthy",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
+          "serviceName": "kibana",
+          "transactionType": "request",
+        },
+      },
+    },
+    Object {
+      "data": Object {
+        "id": ">8b37cb7ca2ae49ada54db165f32d3a19.us-central1.gcp.foundit.no:9243",
+        "label": "8b37cb7ca2ae49ada54db165f32d3a19.us-central1.gcp.foundit.no:9243",
+        "span.destination.service.resource": "8b37cb7ca2ae49ada54db165f32d3a19.us-central1.gcp.foundit.no:9243",
+        "span.subtype": "https",
+        "span.type": "external",
+      },
+    },
+    Object {
+      "data": Object {
+        "agent.name": "nodejs",
+        "id": "opbeans-node",
+        "service.environment": "testing",
+        "service.name": "opbeans-node",
+      },
+    },
+    Object {
+      "data": Object {
         "agent.name": "ruby",
         "id": "opbeans-ruby",
+        "service.environment": "production",
         "service.name": "opbeans-ruby",
         "serviceAnomalyStats": Object {
-          "actualValue": 121348.868852459,
+          "actualValue": 24400.8867924528,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "opbeans-ruby",
           "transactionType": "request",
         },
       },
     },
-  },
-  Object {
-    "data": Object {
-      "id": "kibana~>resourceGroup{kibana}",
-      "source": "kibana",
-      "target": "resourceGroup{kibana}",
-    },
-  },
-]
-`;
-
-exports[`APM API tests trial apm_8.0.0 Service Map with data /api/apm/service-map with ML data with the default apm user returns the correct anomaly stats 3`] = `
-Object {
-  "elements": Array [
     Object {
       "data": Object {
-        "agent.name": "python",
-        "id": "opbeans-python",
-        "service.name": "opbeans-python",
+        "agent.name": "java",
+        "id": "opbeans-java",
+        "service.environment": "production",
+        "service.name": "opbeans-java",
         "serviceAnomalyStats": Object {
-          "actualValue": 24282.2352941176,
+          "actualValue": 19105.8492063492,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-          "serviceName": "opbeans-python",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
+          "serviceName": "opbeans-java",
           "transactionType": "request",
         },
       },
     },
     Object {
       "data": Object {
-        "id": ">redis",
-        "label": "redis",
-        "span.destination.service.resource": "redis",
-        "span.subtype": "redis",
-        "span.type": "cache",
-      },
-    },
-    Object {
-      "data": Object {
-        "agent.name": "nodejs",
-        "id": "opbeans-node",
+        "agent.name": "rum-js",
+        "id": "opbeans-rum",
         "service.environment": "testing",
-        "service.name": "opbeans-node",
-        "serviceAnomalyStats": Object {
-          "actualValue": 29300.5555555556,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-node",
-          "transactionType": "request",
-        },
+        "service.name": "opbeans-rum",
       },
     },
     Object {
@@ -1795,36 +1268,54 @@ Object {
     },
     Object {
       "data": Object {
-        "agent.name": "rum-js",
-        "id": "opbeans-rum",
-        "service.environment": "testing",
-        "service.name": "opbeans-rum",
+        "agent.name": "python",
+        "id": "opbeans-python",
+        "service.environment": "production",
+        "service.name": "opbeans-python",
         "serviceAnomalyStats": Object {
-          "actualValue": 2386500,
+          "actualValue": 42906.4512195122,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-rum",
-          "transactionType": "page-load",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
+          "serviceName": "opbeans-python",
+          "transactionType": "request",
         },
       },
     },
     Object {
       "data": Object {
-        "agent.name": "java",
-        "id": "opbeans-java",
+        "id": ">elasticsearch",
+        "label": "elasticsearch",
+        "span.destination.service.resource": "elasticsearch",
+        "span.subtype": "elasticsearch",
+        "span.type": "db",
+      },
+    },
+    Object {
+      "data": Object {
+        "agent.name": "dotnet",
+        "id": "opbeans-dotnet",
         "service.environment": "production",
-        "service.name": "opbeans-java",
+        "service.name": "opbeans-dotnet",
         "serviceAnomalyStats": Object {
-          "actualValue": 23879.7906976744,
+          "actualValue": 653671.165289257,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-production-1369-high_mean_transaction_duration",
-          "serviceName": "opbeans-java",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
+          "serviceName": "opbeans-dotnet",
           "transactionType": "request",
         },
       },
     },
+    Object {
+      "data": Object {
+        "id": ">sqlite",
+        "label": "sqlite",
+        "span.destination.service.resource": "sqlite",
+        "span.subtype": "sqlite",
+        "span.type": "db",
+      },
+    },
     Object {
       "data": Object {
         "agent.name": "rum-js",
@@ -1832,10 +1323,10 @@ Object {
         "service.environment": "production",
         "service.name": "kibana-frontend",
         "serviceAnomalyStats": Object {
-          "actualValue": 2081800,
+          "actualValue": 3580000,
           "anomalyScore": 0,
           "healthStatus": "healthy",
-          "jobId": "apm-production-1369-high_mean_transaction_duration",
+          "jobId": "apm-production-802c-high_mean_transaction_duration",
           "serviceName": "kibana-frontend",
           "transactionType": "page-load",
         },
@@ -1843,27 +1334,20 @@ Object {
     },
     Object {
       "data": Object {
-        "agent.name": "nodejs",
-        "id": "kibana",
-        "service.environment": "production",
-        "service.name": "kibana",
-        "serviceAnomalyStats": Object {
-          "actualValue": 431063.266917293,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-production-1369-high_mean_transaction_duration",
-          "serviceName": "kibana",
-          "transactionType": "request",
-        },
+        "id": ">epr-snapshot.elastic.co:443",
+        "label": "epr-snapshot.elastic.co:443",
+        "span.destination.service.resource": "epr-snapshot.elastic.co:443",
+        "span.subtype": "https",
+        "span.type": "external",
       },
     },
     Object {
       "data": Object {
-        "id": ">feeds.elastic.co:443",
-        "label": "feeds.elastic.co:443",
-        "span.destination.service.resource": "feeds.elastic.co:443",
-        "span.subtype": "http",
-        "span.type": "external",
+        "id": ">redis",
+        "label": "redis",
+        "span.destination.service.resource": "redis",
+        "span.subtype": "redis",
+        "span.type": "cache",
       },
     },
     Object {
@@ -1872,83 +1356,23 @@ Object {
         "id": "opbeans-go",
         "service.environment": "testing",
         "service.name": "opbeans-go",
-        "serviceAnomalyStats": Object {
-          "actualValue": 34089.2957746479,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-testing-384f-high_mean_transaction_duration",
-          "serviceName": "opbeans-go",
-          "transactionType": "request",
-        },
-      },
-    },
-    Object {
-      "data": Object {
-        "agent.name": "ruby",
-        "id": "opbeans-ruby",
-        "service.name": "opbeans-ruby",
-        "serviceAnomalyStats": Object {
-          "actualValue": 121348.868852459,
-          "anomalyScore": 0,
-          "healthStatus": "healthy",
-          "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-          "serviceName": "opbeans-ruby",
-          "transactionType": "request",
-        },
       },
     },
     Object {
       "data": Object {
-        "id": ">elasticsearch",
-        "label": "elasticsearch",
-        "span.destination.service.resource": "elasticsearch",
-        "span.subtype": "elasticsearch",
-        "span.type": "db",
+        "id": ">feeds.elastic.co:443",
+        "label": "feeds.elastic.co:443",
+        "span.destination.service.resource": "feeds.elastic.co:443",
+        "span.subtype": "http",
+        "span.type": "external",
       },
     },
     Object {
       "data": Object {
-        "agent.name": "dotnet",
-        "id": "opbeans-dotnet",
+        "agent.name": "go",
+        "id": "auditbeat",
         "service.environment": null,
-        "service.name": "opbeans-dotnet",
-      },
-    },
-    Object {
-      "data": Object {
-        "groupedConnections": Array [
-          Object {
-            "id": ">34.203.1.122:9243",
-            "label": "34.203.1.122:9243",
-            "span.destination.service.resource": "34.203.1.122:9243",
-            "span.subtype": "https",
-            "span.type": "external",
-          },
-          Object {
-            "id": ">35.174.40.8:9243",
-            "label": "35.174.40.8:9243",
-            "span.destination.service.resource": "35.174.40.8:9243",
-            "span.subtype": "https",
-            "span.type": "external",
-          },
-          Object {
-            "id": ">52.23.77.114:9243",
-            "label": "52.23.77.114:9243",
-            "span.destination.service.resource": "52.23.77.114:9243",
-            "span.subtype": "https",
-            "span.type": "external",
-          },
-          Object {
-            "id": ">54.158.196.136:9243",
-            "label": "54.158.196.136:9243",
-            "span.destination.service.resource": "54.158.196.136:9243",
-            "span.subtype": "https",
-            "span.type": "external",
-          },
-        ],
-        "id": "resourceGroup{kibana}",
-        "label": "4 resources",
-        "span.type": "external",
+        "service.name": "auditbeat",
       },
     },
     Object {
@@ -1961,10 +1385,10 @@ Object {
           "service.environment": "production",
           "service.name": "kibana-frontend",
           "serviceAnomalyStats": Object {
-            "actualValue": 2081800,
+            "actualValue": 3580000,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-production-1369-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "kibana-frontend",
             "transactionType": "page-load",
           },
@@ -1989,10 +1413,10 @@ Object {
           "service.environment": "production",
           "service.name": "kibana-frontend",
           "serviceAnomalyStats": Object {
-            "actualValue": 2081800,
+            "actualValue": 3580000,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-production-1369-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "kibana-frontend",
             "transactionType": "page-load",
           },
@@ -2004,10 +1428,10 @@ Object {
           "service.environment": "production",
           "service.name": "kibana",
           "serviceAnomalyStats": Object {
-            "actualValue": 431063.266917293,
+            "actualValue": 635652.26283725,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-production-1369-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "kibana",
             "transactionType": "request",
           },
@@ -2016,7 +1440,7 @@ Object {
     },
     Object {
       "data": Object {
-        "id": "kibana~>elasticsearch",
+        "id": "kibana~>8b37cb7ca2ae49ada54db165f32d3a19.us-central1.gcp.foundit.no:9243",
         "source": "kibana",
         "sourceData": Object {
           "agent.name": "nodejs",
@@ -2024,215 +1448,205 @@ Object {
           "service.environment": "production",
           "service.name": "kibana",
           "serviceAnomalyStats": Object {
-            "actualValue": 431063.266917293,
+            "actualValue": 635652.26283725,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-production-1369-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "kibana",
             "transactionType": "request",
           },
         },
-        "target": ">elasticsearch",
+        "target": ">8b37cb7ca2ae49ada54db165f32d3a19.us-central1.gcp.foundit.no:9243",
         "targetData": Object {
-          "id": ">elasticsearch",
-          "label": "elasticsearch",
-          "span.destination.service.resource": "elasticsearch",
-          "span.subtype": "elasticsearch",
-          "span.type": "db",
+          "id": ">8b37cb7ca2ae49ada54db165f32d3a19.us-central1.gcp.foundit.no:9243",
+          "label": "8b37cb7ca2ae49ada54db165f32d3a19.us-central1.gcp.foundit.no:9243",
+          "span.destination.service.resource": "8b37cb7ca2ae49ada54db165f32d3a19.us-central1.gcp.foundit.no:9243",
+          "span.subtype": "https",
+          "span.type": "external",
         },
       },
     },
     Object {
       "data": Object {
-        "id": "opbeans-go~>postgresql",
-        "source": "opbeans-go",
+        "id": "kibana~>elasticsearch",
+        "source": "kibana",
         "sourceData": Object {
-          "agent.name": "go",
-          "id": "opbeans-go",
-          "service.environment": "testing",
-          "service.name": "opbeans-go",
+          "agent.name": "nodejs",
+          "id": "kibana",
+          "service.environment": "production",
+          "service.name": "kibana",
           "serviceAnomalyStats": Object {
-            "actualValue": 34089.2957746479,
+            "actualValue": 635652.26283725,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-go",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
+            "serviceName": "kibana",
             "transactionType": "request",
           },
         },
-        "target": ">postgresql",
+        "target": ">elasticsearch",
         "targetData": Object {
-          "id": ">postgresql",
-          "label": "postgresql",
-          "span.destination.service.resource": "postgresql",
-          "span.subtype": "postgresql",
+          "id": ">elasticsearch",
+          "label": "elasticsearch",
+          "span.destination.service.resource": "elasticsearch",
+          "span.subtype": "elasticsearch",
           "span.type": "db",
         },
       },
     },
     Object {
       "data": Object {
-        "bidirectional": true,
-        "id": "opbeans-go~opbeans-node",
-        "source": "opbeans-go",
+        "id": "kibana~>epr-snapshot.elastic.co:443",
+        "source": "kibana",
         "sourceData": Object {
-          "agent.name": "go",
-          "id": "opbeans-go",
-          "service.environment": "testing",
-          "service.name": "opbeans-go",
+          "agent.name": "nodejs",
+          "id": "kibana",
+          "service.environment": "production",
+          "service.name": "kibana",
           "serviceAnomalyStats": Object {
-            "actualValue": 34089.2957746479,
+            "actualValue": 635652.26283725,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-go",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
+            "serviceName": "kibana",
             "transactionType": "request",
           },
         },
-        "target": "opbeans-node",
+        "target": ">epr-snapshot.elastic.co:443",
         "targetData": Object {
-          "agent.name": "nodejs",
-          "id": "opbeans-node",
-          "service.environment": "testing",
-          "service.name": "opbeans-node",
-          "serviceAnomalyStats": Object {
-            "actualValue": 29300.5555555556,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-node",
-            "transactionType": "request",
-          },
+          "id": ">epr-snapshot.elastic.co:443",
+          "label": "epr-snapshot.elastic.co:443",
+          "span.destination.service.resource": "epr-snapshot.elastic.co:443",
+          "span.subtype": "https",
+          "span.type": "external",
         },
       },
     },
     Object {
       "data": Object {
-        "id": "opbeans-go~opbeans-python",
-        "source": "opbeans-go",
+        "id": "opbeans-dotnet~>sqlite",
+        "source": "opbeans-dotnet",
         "sourceData": Object {
-          "agent.name": "go",
-          "id": "opbeans-go",
-          "service.environment": "testing",
-          "service.name": "opbeans-go",
+          "agent.name": "dotnet",
+          "id": "opbeans-dotnet",
+          "service.environment": "production",
+          "service.name": "opbeans-dotnet",
           "serviceAnomalyStats": Object {
-            "actualValue": 34089.2957746479,
+            "actualValue": 653671.165289257,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-go",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
+            "serviceName": "opbeans-dotnet",
             "transactionType": "request",
           },
         },
-        "target": "opbeans-python",
+        "target": ">sqlite",
         "targetData": Object {
-          "agent.name": "python",
-          "id": "opbeans-python",
-          "service.name": "opbeans-python",
-          "serviceAnomalyStats": Object {
-            "actualValue": 24282.2352941176,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-            "serviceName": "opbeans-python",
-            "transactionType": "request",
-          },
+          "id": ">sqlite",
+          "label": "sqlite",
+          "span.destination.service.resource": "sqlite",
+          "span.subtype": "sqlite",
+          "span.type": "db",
         },
       },
     },
     Object {
       "data": Object {
-        "bidirectional": true,
-        "id": "opbeans-go~opbeans-ruby",
+        "id": "opbeans-go~>postgresql",
         "source": "opbeans-go",
         "sourceData": Object {
           "agent.name": "go",
           "id": "opbeans-go",
           "service.environment": "testing",
           "service.name": "opbeans-go",
-          "serviceAnomalyStats": Object {
-            "actualValue": 34089.2957746479,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-go",
-            "transactionType": "request",
-          },
         },
-        "target": "opbeans-ruby",
+        "target": ">postgresql",
         "targetData": Object {
-          "agent.name": "ruby",
-          "id": "opbeans-ruby",
-          "service.name": "opbeans-ruby",
-          "serviceAnomalyStats": Object {
-            "actualValue": 121348.868852459,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-            "serviceName": "opbeans-ruby",
-            "transactionType": "request",
-          },
+          "id": ">postgresql",
+          "label": "postgresql",
+          "span.destination.service.resource": "postgresql",
+          "span.subtype": "postgresql",
+          "span.type": "db",
         },
       },
     },
     Object {
       "data": Object {
-        "id": "opbeans-java~>postgresql",
-        "source": "opbeans-java",
+        "id": "opbeans-go~opbeans-dotnet",
+        "source": "opbeans-go",
         "sourceData": Object {
-          "agent.name": "java",
-          "id": "opbeans-java",
+          "agent.name": "go",
+          "id": "opbeans-go",
+          "service.environment": "testing",
+          "service.name": "opbeans-go",
+        },
+        "target": "opbeans-dotnet",
+        "targetData": Object {
+          "agent.name": "dotnet",
+          "id": "opbeans-dotnet",
           "service.environment": "production",
-          "service.name": "opbeans-java",
+          "service.name": "opbeans-dotnet",
           "serviceAnomalyStats": Object {
-            "actualValue": 23879.7906976744,
+            "actualValue": 653671.165289257,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-production-1369-high_mean_transaction_duration",
-            "serviceName": "opbeans-java",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
+            "serviceName": "opbeans-dotnet",
             "transactionType": "request",
-          },
-        },
-        "target": ">postgresql",
-        "targetData": Object {
-          "id": ">postgresql",
-          "label": "postgresql",
-          "span.destination.service.resource": "postgresql",
-          "span.subtype": "postgresql",
-          "span.type": "db",
+          },
         },
       },
     },
     Object {
       "data": Object {
-        "id": "opbeans-java~opbeans-go",
-        "source": "opbeans-java",
+        "id": "opbeans-go~opbeans-java",
+        "source": "opbeans-go",
         "sourceData": Object {
+          "agent.name": "go",
+          "id": "opbeans-go",
+          "service.environment": "testing",
+          "service.name": "opbeans-go",
+        },
+        "target": "opbeans-java",
+        "targetData": Object {
           "agent.name": "java",
           "id": "opbeans-java",
           "service.environment": "production",
           "service.name": "opbeans-java",
           "serviceAnomalyStats": Object {
-            "actualValue": 23879.7906976744,
+            "actualValue": 19105.8492063492,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-production-1369-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-java",
             "transactionType": "request",
           },
         },
-        "target": "opbeans-go",
-        "targetData": Object {
+      },
+    },
+    Object {
+      "data": Object {
+        "bidirectional": true,
+        "id": "opbeans-go~opbeans-python",
+        "source": "opbeans-go",
+        "sourceData": Object {
           "agent.name": "go",
           "id": "opbeans-go",
           "service.environment": "testing",
           "service.name": "opbeans-go",
+        },
+        "target": "opbeans-python",
+        "targetData": Object {
+          "agent.name": "python",
+          "id": "opbeans-python",
+          "service.environment": "production",
+          "service.name": "opbeans-python",
           "serviceAnomalyStats": Object {
-            "actualValue": 34089.2957746479,
+            "actualValue": 42906.4512195122,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-go",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
+            "serviceName": "opbeans-python",
             "transactionType": "request",
           },
         },
@@ -2241,33 +1655,26 @@ Object {
     Object {
       "data": Object {
         "bidirectional": true,
-        "id": "opbeans-java~opbeans-python",
-        "source": "opbeans-java",
+        "id": "opbeans-go~opbeans-ruby",
+        "source": "opbeans-go",
         "sourceData": Object {
-          "agent.name": "java",
-          "id": "opbeans-java",
-          "service.environment": "production",
-          "service.name": "opbeans-java",
-          "serviceAnomalyStats": Object {
-            "actualValue": 23879.7906976744,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-production-1369-high_mean_transaction_duration",
-            "serviceName": "opbeans-java",
-            "transactionType": "request",
-          },
+          "agent.name": "go",
+          "id": "opbeans-go",
+          "service.environment": "testing",
+          "service.name": "opbeans-go",
         },
-        "target": "opbeans-python",
+        "target": "opbeans-ruby",
         "targetData": Object {
-          "agent.name": "python",
-          "id": "opbeans-python",
-          "service.name": "opbeans-python",
+          "agent.name": "ruby",
+          "id": "opbeans-ruby",
+          "service.environment": "production",
+          "service.name": "opbeans-ruby",
           "serviceAnomalyStats": Object {
-            "actualValue": 24282.2352941176,
+            "actualValue": 24400.8867924528,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-            "serviceName": "opbeans-python",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
+            "serviceName": "opbeans-ruby",
             "transactionType": "request",
           },
         },
@@ -2275,8 +1682,7 @@ Object {
     },
     Object {
       "data": Object {
-        "bidirectional": true,
-        "id": "opbeans-java~opbeans-ruby",
+        "id": "opbeans-java~>postgresql",
         "source": "opbeans-java",
         "sourceData": Object {
           "agent.name": "java",
@@ -2284,27 +1690,21 @@ Object {
           "service.environment": "production",
           "service.name": "opbeans-java",
           "serviceAnomalyStats": Object {
-            "actualValue": 23879.7906976744,
+            "actualValue": 19105.8492063492,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-production-1369-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-java",
             "transactionType": "request",
           },
         },
-        "target": "opbeans-ruby",
+        "target": ">postgresql",
         "targetData": Object {
-          "agent.name": "ruby",
-          "id": "opbeans-ruby",
-          "service.name": "opbeans-ruby",
-          "serviceAnomalyStats": Object {
-            "actualValue": 121348.868852459,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-            "serviceName": "opbeans-ruby",
-            "transactionType": "request",
-          },
+          "id": ">postgresql",
+          "label": "postgresql",
+          "span.destination.service.resource": "postgresql",
+          "span.subtype": "postgresql",
+          "span.type": "db",
         },
       },
     },
@@ -2317,14 +1717,6 @@ Object {
           "id": "opbeans-node",
           "service.environment": "testing",
           "service.name": "opbeans-node",
-          "serviceAnomalyStats": Object {
-            "actualValue": 29300.5555555556,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-node",
-            "transactionType": "request",
-          },
         },
         "target": ">postgresql",
         "targetData": Object {
@@ -2345,14 +1737,6 @@ Object {
           "id": "opbeans-node",
           "service.environment": "testing",
           "service.name": "opbeans-node",
-          "serviceAnomalyStats": Object {
-            "actualValue": 29300.5555555556,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-node",
-            "transactionType": "request",
-          },
         },
         "target": ">redis",
         "targetData": Object {
@@ -2366,37 +1750,47 @@ Object {
     },
     Object {
       "data": Object {
-        "id": "opbeans-node~opbeans-go",
-        "isInverseEdge": true,
+        "id": "opbeans-node~opbeans-dotnet",
         "source": "opbeans-node",
         "sourceData": Object {
           "agent.name": "nodejs",
           "id": "opbeans-node",
           "service.environment": "testing",
           "service.name": "opbeans-node",
+        },
+        "target": "opbeans-dotnet",
+        "targetData": Object {
+          "agent.name": "dotnet",
+          "id": "opbeans-dotnet",
+          "service.environment": "production",
+          "service.name": "opbeans-dotnet",
           "serviceAnomalyStats": Object {
-            "actualValue": 29300.5555555556,
+            "actualValue": 653671.165289257,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-node",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
+            "serviceName": "opbeans-dotnet",
             "transactionType": "request",
           },
         },
+      },
+    },
+    Object {
+      "data": Object {
+        "id": "opbeans-node~opbeans-go",
+        "source": "opbeans-node",
+        "sourceData": Object {
+          "agent.name": "nodejs",
+          "id": "opbeans-node",
+          "service.environment": "testing",
+          "service.name": "opbeans-node",
+        },
         "target": "opbeans-go",
         "targetData": Object {
           "agent.name": "go",
           "id": "opbeans-go",
           "service.environment": "testing",
           "service.name": "opbeans-go",
-          "serviceAnomalyStats": Object {
-            "actualValue": 34089.2957746479,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-go",
-            "transactionType": "request",
-          },
         },
       },
     },
@@ -2409,14 +1803,6 @@ Object {
           "id": "opbeans-node",
           "service.environment": "testing",
           "service.name": "opbeans-node",
-          "serviceAnomalyStats": Object {
-            "actualValue": 29300.5555555556,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-node",
-            "transactionType": "request",
-          },
         },
         "target": "opbeans-java",
         "targetData": Object {
@@ -2425,10 +1811,10 @@ Object {
           "service.environment": "production",
           "service.name": "opbeans-java",
           "serviceAnomalyStats": Object {
-            "actualValue": 23879.7906976744,
+            "actualValue": 19105.8492063492,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-production-1369-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-java",
             "transactionType": "request",
           },
@@ -2445,25 +1831,18 @@ Object {
           "id": "opbeans-node",
           "service.environment": "testing",
           "service.name": "opbeans-node",
-          "serviceAnomalyStats": Object {
-            "actualValue": 29300.5555555556,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-node",
-            "transactionType": "request",
-          },
         },
         "target": "opbeans-python",
         "targetData": Object {
           "agent.name": "python",
           "id": "opbeans-python",
+          "service.environment": "production",
           "service.name": "opbeans-python",
           "serviceAnomalyStats": Object {
-            "actualValue": 24282.2352941176,
+            "actualValue": 42906.4512195122,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-python",
             "transactionType": "request",
           },
@@ -2480,25 +1859,18 @@ Object {
           "id": "opbeans-node",
           "service.environment": "testing",
           "service.name": "opbeans-node",
-          "serviceAnomalyStats": Object {
-            "actualValue": 29300.5555555556,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-node",
-            "transactionType": "request",
-          },
         },
         "target": "opbeans-ruby",
         "targetData": Object {
           "agent.name": "ruby",
           "id": "opbeans-ruby",
+          "service.environment": "production",
           "service.name": "opbeans-ruby",
           "serviceAnomalyStats": Object {
-            "actualValue": 121348.868852459,
+            "actualValue": 24400.8867924528,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-ruby",
             "transactionType": "request",
           },
@@ -2512,12 +1884,13 @@ Object {
         "sourceData": Object {
           "agent.name": "python",
           "id": "opbeans-python",
+          "service.environment": "production",
           "service.name": "opbeans-python",
           "serviceAnomalyStats": Object {
-            "actualValue": 24282.2352941176,
+            "actualValue": 42906.4512195122,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-python",
             "transactionType": "request",
           },
@@ -2539,12 +1912,13 @@ Object {
         "sourceData": Object {
           "agent.name": "python",
           "id": "opbeans-python",
+          "service.environment": "production",
           "service.name": "opbeans-python",
           "serviceAnomalyStats": Object {
-            "actualValue": 24282.2352941176,
+            "actualValue": 42906.4512195122,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-python",
             "transactionType": "request",
           },
@@ -2566,12 +1940,13 @@ Object {
         "sourceData": Object {
           "agent.name": "python",
           "id": "opbeans-python",
+          "service.environment": "production",
           "service.name": "opbeans-python",
           "serviceAnomalyStats": Object {
-            "actualValue": 24282.2352941176,
+            "actualValue": 42906.4512195122,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-python",
             "transactionType": "request",
           },
@@ -2588,18 +1963,46 @@ Object {
     },
     Object {
       "data": Object {
-        "id": "opbeans-python~opbeans-java",
+        "id": "opbeans-python~opbeans-go",
         "isInverseEdge": true,
         "source": "opbeans-python",
         "sourceData": Object {
           "agent.name": "python",
           "id": "opbeans-python",
+          "service.environment": "production",
+          "service.name": "opbeans-python",
+          "serviceAnomalyStats": Object {
+            "actualValue": 42906.4512195122,
+            "anomalyScore": 0,
+            "healthStatus": "healthy",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
+            "serviceName": "opbeans-python",
+            "transactionType": "request",
+          },
+        },
+        "target": "opbeans-go",
+        "targetData": Object {
+          "agent.name": "go",
+          "id": "opbeans-go",
+          "service.environment": "testing",
+          "service.name": "opbeans-go",
+        },
+      },
+    },
+    Object {
+      "data": Object {
+        "id": "opbeans-python~opbeans-java",
+        "source": "opbeans-python",
+        "sourceData": Object {
+          "agent.name": "python",
+          "id": "opbeans-python",
+          "service.environment": "production",
           "service.name": "opbeans-python",
           "serviceAnomalyStats": Object {
-            "actualValue": 24282.2352941176,
+            "actualValue": 42906.4512195122,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-python",
             "transactionType": "request",
           },
@@ -2611,10 +2014,10 @@ Object {
           "service.environment": "production",
           "service.name": "opbeans-java",
           "serviceAnomalyStats": Object {
-            "actualValue": 23879.7906976744,
+            "actualValue": 19105.8492063492,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-production-1369-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-java",
             "transactionType": "request",
           },
@@ -2629,12 +2032,13 @@ Object {
         "sourceData": Object {
           "agent.name": "python",
           "id": "opbeans-python",
+          "service.environment": "production",
           "service.name": "opbeans-python",
           "serviceAnomalyStats": Object {
-            "actualValue": 24282.2352941176,
+            "actualValue": 42906.4512195122,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-python",
             "transactionType": "request",
           },
@@ -2645,14 +2049,6 @@ Object {
           "id": "opbeans-node",
           "service.environment": "testing",
           "service.name": "opbeans-node",
-          "serviceAnomalyStats": Object {
-            "actualValue": 29300.5555555556,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-node",
-            "transactionType": "request",
-          },
         },
       },
     },
@@ -2663,12 +2059,13 @@ Object {
         "sourceData": Object {
           "agent.name": "ruby",
           "id": "opbeans-ruby",
+          "service.environment": "production",
           "service.name": "opbeans-ruby",
           "serviceAnomalyStats": Object {
-            "actualValue": 121348.868852459,
+            "actualValue": 24400.8867924528,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-ruby",
             "transactionType": "request",
           },
@@ -2683,6 +2080,41 @@ Object {
         },
       },
     },
+    Object {
+      "data": Object {
+        "id": "opbeans-ruby~opbeans-dotnet",
+        "source": "opbeans-ruby",
+        "sourceData": Object {
+          "agent.name": "ruby",
+          "id": "opbeans-ruby",
+          "service.environment": "production",
+          "service.name": "opbeans-ruby",
+          "serviceAnomalyStats": Object {
+            "actualValue": 24400.8867924528,
+            "anomalyScore": 0,
+            "healthStatus": "healthy",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
+            "serviceName": "opbeans-ruby",
+            "transactionType": "request",
+          },
+        },
+        "target": "opbeans-dotnet",
+        "targetData": Object {
+          "agent.name": "dotnet",
+          "id": "opbeans-dotnet",
+          "service.environment": "production",
+          "service.name": "opbeans-dotnet",
+          "serviceAnomalyStats": Object {
+            "actualValue": 653671.165289257,
+            "anomalyScore": 0,
+            "healthStatus": "healthy",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
+            "serviceName": "opbeans-dotnet",
+            "transactionType": "request",
+          },
+        },
+      },
+    },
     Object {
       "data": Object {
         "id": "opbeans-ruby~opbeans-go",
@@ -2691,12 +2123,13 @@ Object {
         "sourceData": Object {
           "agent.name": "ruby",
           "id": "opbeans-ruby",
+          "service.environment": "production",
           "service.name": "opbeans-ruby",
           "serviceAnomalyStats": Object {
-            "actualValue": 121348.868852459,
+            "actualValue": 24400.8867924528,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-ruby",
             "transactionType": "request",
           },
@@ -2707,31 +2140,23 @@ Object {
           "id": "opbeans-go",
           "service.environment": "testing",
           "service.name": "opbeans-go",
-          "serviceAnomalyStats": Object {
-            "actualValue": 34089.2957746479,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-go",
-            "transactionType": "request",
-          },
         },
       },
     },
     Object {
       "data": Object {
         "id": "opbeans-ruby~opbeans-java",
-        "isInverseEdge": true,
         "source": "opbeans-ruby",
         "sourceData": Object {
           "agent.name": "ruby",
           "id": "opbeans-ruby",
+          "service.environment": "production",
           "service.name": "opbeans-ruby",
           "serviceAnomalyStats": Object {
-            "actualValue": 121348.868852459,
+            "actualValue": 24400.8867924528,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-ruby",
             "transactionType": "request",
           },
@@ -2743,10 +2168,10 @@ Object {
           "service.environment": "production",
           "service.name": "opbeans-java",
           "serviceAnomalyStats": Object {
-            "actualValue": 23879.7906976744,
+            "actualValue": 19105.8492063492,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-production-1369-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-java",
             "transactionType": "request",
           },
@@ -2761,12 +2186,13 @@ Object {
         "sourceData": Object {
           "agent.name": "ruby",
           "id": "opbeans-ruby",
+          "service.environment": "production",
           "service.name": "opbeans-ruby",
           "serviceAnomalyStats": Object {
-            "actualValue": 121348.868852459,
+            "actualValue": 24400.8867924528,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-ruby",
             "transactionType": "request",
           },
@@ -2777,14 +2203,6 @@ Object {
           "id": "opbeans-node",
           "service.environment": "testing",
           "service.name": "opbeans-node",
-          "serviceAnomalyStats": Object {
-            "actualValue": 29300.5555555556,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-node",
-            "transactionType": "request",
-          },
         },
       },
     },
@@ -2795,12 +2213,13 @@ Object {
         "sourceData": Object {
           "agent.name": "ruby",
           "id": "opbeans-ruby",
+          "service.environment": "production",
           "service.name": "opbeans-ruby",
           "serviceAnomalyStats": Object {
-            "actualValue": 121348.868852459,
+            "actualValue": 24400.8867924528,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-ruby",
             "transactionType": "request",
           },
@@ -2809,12 +2228,13 @@ Object {
         "targetData": Object {
           "agent.name": "python",
           "id": "opbeans-python",
+          "service.environment": "production",
           "service.name": "opbeans-python",
           "serviceAnomalyStats": Object {
-            "actualValue": 24282.2352941176,
+            "actualValue": 42906.4512195122,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-python",
             "transactionType": "request",
           },
@@ -2823,39 +2243,50 @@ Object {
     },
     Object {
       "data": Object {
-        "id": "opbeans-rum~opbeans-java",
+        "id": "opbeans-rum~opbeans-dotnet",
         "source": "opbeans-rum",
         "sourceData": Object {
           "agent.name": "rum-js",
           "id": "opbeans-rum",
           "service.environment": "testing",
           "service.name": "opbeans-rum",
-          "serviceAnomalyStats": Object {
-            "actualValue": 2386500,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-rum",
-            "transactionType": "page-load",
-          },
         },
-        "target": "opbeans-java",
+        "target": "opbeans-dotnet",
         "targetData": Object {
-          "agent.name": "java",
-          "id": "opbeans-java",
+          "agent.name": "dotnet",
+          "id": "opbeans-dotnet",
           "service.environment": "production",
-          "service.name": "opbeans-java",
+          "service.name": "opbeans-dotnet",
           "serviceAnomalyStats": Object {
-            "actualValue": 23879.7906976744,
+            "actualValue": 653671.165289257,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-production-1369-high_mean_transaction_duration",
-            "serviceName": "opbeans-java",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
+            "serviceName": "opbeans-dotnet",
             "transactionType": "request",
           },
         },
       },
     },
+    Object {
+      "data": Object {
+        "id": "opbeans-rum~opbeans-go",
+        "source": "opbeans-rum",
+        "sourceData": Object {
+          "agent.name": "rum-js",
+          "id": "opbeans-rum",
+          "service.environment": "testing",
+          "service.name": "opbeans-rum",
+        },
+        "target": "opbeans-go",
+        "targetData": Object {
+          "agent.name": "go",
+          "id": "opbeans-go",
+          "service.environment": "testing",
+          "service.name": "opbeans-go",
+        },
+      },
+    },
     Object {
       "data": Object {
         "id": "opbeans-rum~opbeans-node",
@@ -2865,14 +2296,6 @@ Object {
           "id": "opbeans-rum",
           "service.environment": "testing",
           "service.name": "opbeans-rum",
-          "serviceAnomalyStats": Object {
-            "actualValue": 2386500,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-rum",
-            "transactionType": "page-load",
-          },
         },
         "target": "opbeans-node",
         "targetData": Object {
@@ -2880,14 +2303,6 @@ Object {
           "id": "opbeans-node",
           "service.environment": "testing",
           "service.name": "opbeans-node",
-          "serviceAnomalyStats": Object {
-            "actualValue": 29300.5555555556,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-node",
-            "transactionType": "request",
-          },
         },
       },
     },
@@ -2900,25 +2315,18 @@ Object {
           "id": "opbeans-rum",
           "service.environment": "testing",
           "service.name": "opbeans-rum",
-          "serviceAnomalyStats": Object {
-            "actualValue": 2386500,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-rum",
-            "transactionType": "page-load",
-          },
         },
         "target": "opbeans-python",
         "targetData": Object {
           "agent.name": "python",
           "id": "opbeans-python",
+          "service.environment": "production",
           "service.name": "opbeans-python",
           "serviceAnomalyStats": Object {
-            "actualValue": 24282.2352941176,
+            "actualValue": 42906.4512195122,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-python",
             "transactionType": "request",
           },
@@ -2934,38 +2342,24 @@ Object {
           "id": "opbeans-rum",
           "service.environment": "testing",
           "service.name": "opbeans-rum",
-          "serviceAnomalyStats": Object {
-            "actualValue": 2386500,
-            "anomalyScore": 0,
-            "healthStatus": "healthy",
-            "jobId": "apm-testing-384f-high_mean_transaction_duration",
-            "serviceName": "opbeans-rum",
-            "transactionType": "page-load",
-          },
         },
         "target": "opbeans-ruby",
         "targetData": Object {
           "agent.name": "ruby",
           "id": "opbeans-ruby",
+          "service.environment": "production",
           "service.name": "opbeans-ruby",
           "serviceAnomalyStats": Object {
-            "actualValue": 121348.868852459,
+            "actualValue": 24400.8867924528,
             "anomalyScore": 0,
             "healthStatus": "healthy",
-            "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
+            "jobId": "apm-production-802c-high_mean_transaction_duration",
             "serviceName": "opbeans-ruby",
             "transactionType": "request",
           },
         },
       },
     },
-    Object {
-      "data": Object {
-        "id": "kibana~>resourceGroup{kibana}",
-        "source": "kibana",
-        "target": "resourceGroup{kibana}",
-      },
-    },
   ],
 }
 `;
diff --git a/x-pack/test/apm_api_integration/tests/service_maps/service_maps.ts b/x-pack/test/apm_api_integration/tests/service_maps/service_maps.ts
index a48811ad70249..2453cb85d93bc 100644
--- a/x-pack/test/apm_api_integration/tests/service_maps/service_maps.ts
+++ b/x-pack/test/apm_api_integration/tests/service_maps/service_maps.ts
@@ -87,18 +87,19 @@ export default function serviceMapsApiTests({ getService }: FtrProviderContext)
         ).sort();
 
         expectSnapshot(serviceNames).toMatchInline(`
-            Array [
-              "kibana",
-              "kibana-frontend",
-              "opbeans-dotnet",
-              "opbeans-go",
-              "opbeans-java",
-              "opbeans-node",
-              "opbeans-python",
-              "opbeans-ruby",
-              "opbeans-rum",
-            ]
-          `);
+          Array [
+            "auditbeat",
+            "kibana",
+            "kibana-frontend",
+            "opbeans-dotnet",
+            "opbeans-go",
+            "opbeans-java",
+            "opbeans-node",
+            "opbeans-python",
+            "opbeans-ruby",
+            "opbeans-rum",
+          ]
+        `);
 
         const externalDestinations = uniq(
           elements
@@ -107,32 +108,20 @@ export default function serviceMapsApiTests({ getService }: FtrProviderContext)
         ).sort();
 
         expectSnapshot(externalDestinations).toMatchInline(`
-            Array [
-              ">elasticsearch",
-              ">feeds.elastic.co:443",
-              ">postgresql",
-              ">redis",
-            ]
-          `);
+          Array [
+            ">8b37cb7ca2ae49ada54db165f32d3a19.us-central1.gcp.foundit.no:9243",
+            ">elasticsearch",
+            ">epr-snapshot.elastic.co:443",
+            ">feeds.elastic.co:443",
+            ">postgresql",
+            ">redis",
+            ">sqlite",
+          ]
+        `);
 
         expectSnapshot(elements).toMatch();
       });
 
-      it('returns service map elements filtering by environment not defined', async () => {
-        const ENVIRONMENT_NOT_DEFINED = 'ENVIRONMENT_NOT_DEFINED';
-        const { body, status } = await supertest.get(
-          `/api/apm/service-map?start=${start}&end=${end}&environment=${ENVIRONMENT_NOT_DEFINED}`
-        );
-        expect(status).to.be(200);
-        const environments = new Set();
-        body.elements.forEach((element: { data: Record<string, any> }) => {
-          environments.add(element.data['service.environment']);
-        });
-
-        expect(environments.has(ENVIRONMENT_NOT_DEFINED)).to.eql(true);
-        expectSnapshot(body).toMatch();
-      });
-
       describe('with ML data', () => {
         describe('with the default apm user', () => {
           before(async () => {
@@ -145,7 +134,7 @@ export default function serviceMapsApiTests({ getService }: FtrProviderContext)
               (el: { data: { serviceAnomalyStats?: {} } }) => !isEmpty(el.data.serviceAnomalyStats)
             );
 
-            expect(dataWithAnomalies).to.not.empty();
+            expect(dataWithAnomalies).not.to.be.empty();
 
             dataWithAnomalies.forEach(({ data }: any) => {
               expect(
@@ -159,53 +148,56 @@ export default function serviceMapsApiTests({ getService }: FtrProviderContext)
               (el: { data: { serviceAnomalyStats?: {} } }) => !isEmpty(el.data.serviceAnomalyStats)
             );
 
-            expectSnapshot(dataWithAnomalies.length).toMatchInline(`8`);
+            expect(dataWithAnomalies).not.to.be.empty();
+
+            expectSnapshot(dataWithAnomalies.length).toMatchInline(`6`);
             expectSnapshot(dataWithAnomalies.slice(0, 3)).toMatchInline(`
               Array [
                 Object {
                   "data": Object {
-                    "agent.name": "python",
-                    "id": "opbeans-python",
-                    "service.name": "opbeans-python",
+                    "agent.name": "nodejs",
+                    "id": "kibana",
+                    "service.environment": "production",
+                    "service.name": "kibana",
                     "serviceAnomalyStats": Object {
-                      "actualValue": 24282.2352941176,
+                      "actualValue": 635652.26283725,
                       "anomalyScore": 0,
                       "healthStatus": "healthy",
-                      "jobId": "apm-environment_not_defined-5626-high_mean_transaction_duration",
-                      "serviceName": "opbeans-python",
+                      "jobId": "apm-production-802c-high_mean_transaction_duration",
+                      "serviceName": "kibana",
                       "transactionType": "request",
                     },
                   },
                 },
                 Object {
                   "data": Object {
-                    "agent.name": "nodejs",
-                    "id": "opbeans-node",
-                    "service.environment": "testing",
-                    "service.name": "opbeans-node",
+                    "agent.name": "ruby",
+                    "id": "opbeans-ruby",
+                    "service.environment": "production",
+                    "service.name": "opbeans-ruby",
                     "serviceAnomalyStats": Object {
-                      "actualValue": 29300.5555555556,
+                      "actualValue": 24400.8867924528,
                       "anomalyScore": 0,
                       "healthStatus": "healthy",
-                      "jobId": "apm-testing-384f-high_mean_transaction_duration",
-                      "serviceName": "opbeans-node",
+                      "jobId": "apm-production-802c-high_mean_transaction_duration",
+                      "serviceName": "opbeans-ruby",
                       "transactionType": "request",
                     },
                   },
                 },
                 Object {
                   "data": Object {
-                    "agent.name": "rum-js",
-                    "id": "opbeans-rum",
-                    "service.environment": "testing",
-                    "service.name": "opbeans-rum",
+                    "agent.name": "java",
+                    "id": "opbeans-java",
+                    "service.environment": "production",
+                    "service.name": "opbeans-java",
                     "serviceAnomalyStats": Object {
-                      "actualValue": 2386500,
+                      "actualValue": 19105.8492063492,
                       "anomalyScore": 0,
                       "healthStatus": "healthy",
-                      "jobId": "apm-testing-384f-high_mean_transaction_duration",
-                      "serviceName": "opbeans-rum",
-                      "transactionType": "page-load",
+                      "jobId": "apm-production-802c-high_mean_transaction_duration",
+                      "serviceName": "opbeans-java",
+                      "transactionType": "request",
                     },
                   },
                 },
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instance_details.snap b/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instance_details.snap
index b4197c7dfbf67..aaeeb9a512522 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instance_details.snap
+++ b/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instance_details.snap
@@ -2,26 +2,42 @@
 
 exports[`APM API tests basic apm_8.0.0 Instance details when data is loaded fetch instance details return the correct data 1`] = `
 Object {
-  "@timestamp": "2020-12-08T13:59:01.971Z",
+  "@timestamp": "2021-07-27T08:08:17.707Z",
   "agent": Object {
-    "ephemeral_id": "d27b2271-06b4-48c8-a02a-cfd963c0b4d0",
+    "ephemeral_id": "1f810e6f-e78a-4f49-9773-2142b9af9943",
     "name": "java",
-    "version": "1.19.1-SNAPSHOT.null",
+    "version": "1.25.1-SNAPSHOT.UNKNOWN",
+  },
+  "cloud": Object {
+    "availability_zone": "europe-west1-c",
+    "instance": Object {
+      "id": "4295368814211072338",
+      "name": "gke-edge-oblt-gcp-edge-oblt-gcp-pool-b6b9e929-92m2",
+    },
+    "machine": Object {
+      "type": "n1-standard-4",
+    },
+    "project": Object {
+      "id": "8560181848",
+      "name": "elastic-observability",
+    },
+    "provider": "gcp",
+    "region": "europe-west1",
   },
   "container": Object {
-    "id": "02950c4c5fbb0fda1cc98c47bf4024b473a8a17629db6530d95dcee68bd54c6c",
+    "id": "6dc7ea7824d0887cdfa0cb876bca5b27346c8b7cd196a9b1a6fe91968b99fbc2",
   },
   "host": Object {
     "architecture": "amd64",
-    "ip": "10.8.4.45",
+    "ip": "10.40.0.248",
     "os": Object {
       "platform": "Linux",
     },
   },
   "kubernetes": Object {
     "pod": Object {
-      "name": "opbeans-java-6bdd78cb5c-k2qz6",
-      "uid": "805e875d-1fda-42c0-bb54-23eb6faf54ab",
+      "name": "opbeans-java-59f5cddddf-s9bvt",
+      "uid": "9aa1e495-4eca-49ca-bd26-2914e05a0226",
     },
   },
   "service": Object {
@@ -31,17 +47,17 @@ Object {
     },
     "language": Object {
       "name": "Java",
-      "version": "11.0.9.1",
+      "version": "11.0.11",
     },
     "name": "opbeans-java",
     "node": Object {
-      "name": "02950c4c5fbb0fda1cc98c47bf4024b473a8a17629db6530d95dcee68bd54c6c",
+      "name": "6dc7ea7824d0887cdfa0cb876bca5b27346c8b7cd196a9b1a6fe91968b99fbc2",
     },
     "runtime": Object {
       "name": "Java",
-      "version": "11.0.9.1",
+      "version": "11.0.11",
     },
-    "version": "2020-12-08 03:35:36",
+    "version": "2021-07-27 03:47:01",
   },
 }
 `;
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instances_detailed_statistics.snap b/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instances_detailed_statistics.snap
index c3c9b95657c97..42570f591367f 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instances_detailed_statistics.snap
+++ b/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instances_detailed_statistics.snap
@@ -3,671 +3,671 @@
 exports[`APM API tests basic apm_8.0.0 Service overview instances detailed statistics when data is loaded fetching data with comparison returns the right data for current and previous periods 5`] = `
 Object {
   "currentPeriod": Object {
-    "02950c4c5fbb0fda1cc98c47bf4024b473a8a17629db6530d95dcee68bd54c6c": Object {
+    "6dc7ea7824d0887cdfa0cb876bca5b27346c8b7cd196a9b1a6fe91968b99fbc2": Object {
       "cpuUsage": Array [
         Object {
-          "x": 1607436720000,
-          "y": null,
+          "x": 1627374180000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607436780000,
-          "y": 0.011,
+          "x": 1627374240000,
+          "y": 0.0015,
         },
         Object {
-          "x": 1607436840000,
-          "y": 0.013,
+          "x": 1627374300000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607436900000,
-          "y": 0.011,
+          "x": 1627374360000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607436960000,
-          "y": 0.0115,
+          "x": 1627374420000,
+          "y": 0.0025,
         },
         Object {
-          "x": 1607437020000,
-          "y": 0.0115,
+          "x": 1627374480000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607437080000,
-          "y": 0.011,
+          "x": 1627374540000,
+          "y": 0.007,
         },
         Object {
-          "x": 1607437140000,
-          "y": 0.0105,
+          "x": 1627374600000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607437200000,
-          "y": 0.014,
+          "x": 1627374660000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607437260000,
-          "y": 0.013,
+          "x": 1627374720000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607437320000,
-          "y": 0.012,
+          "x": 1627374780000,
+          "y": 0.0035,
         },
         Object {
-          "x": 1607437380000,
-          "y": 0.0115,
+          "x": 1627374840000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607437440000,
-          "y": 0.013,
+          "x": 1627374900000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607437500000,
-          "y": 0.0125,
+          "x": 1627374960000,
+          "y": 0.0015,
         },
         Object {
-          "x": 1607437560000,
-          "y": 0.013,
+          "x": 1627375020000,
+          "y": 0.0015,
         },
         Object {
-          "x": 1607437620000,
-          "y": 0.011,
+          "x": 1627375080000,
+          "y": null,
         },
       ],
       "errorRate": Array [
         Object {
-          "x": 1607436720000,
-          "y": null,
+          "x": 1627374180000,
+          "y": 0,
         },
         Object {
-          "x": 1607436780000,
+          "x": 1627374240000,
           "y": 0,
         },
         Object {
-          "x": 1607436840000,
-          "y": 0.0833333333333333,
+          "x": 1627374300000,
+          "y": 0.0714285714285714,
         },
         Object {
-          "x": 1607436900000,
+          "x": 1627374360000,
           "y": 0,
         },
         Object {
-          "x": 1607436960000,
-          "y": 0,
+          "x": 1627374420000,
+          "y": 0.0263157894736842,
         },
         Object {
-          "x": 1607437020000,
-          "y": 0,
+          "x": 1627374480000,
+          "y": 0.0294117647058824,
         },
         Object {
-          "x": 1607437080000,
+          "x": 1627374540000,
           "y": 0,
         },
         Object {
-          "x": 1607437140000,
-          "y": 0,
+          "x": 1627374600000,
+          "y": 0.0465116279069767,
         },
         Object {
-          "x": 1607437200000,
-          "y": 0.125,
+          "x": 1627374660000,
+          "y": 0,
         },
         Object {
-          "x": 1607437260000,
+          "x": 1627374720000,
           "y": 0,
         },
         Object {
-          "x": 1607437320000,
-          "y": 0.166666666666667,
+          "x": 1627374780000,
+          "y": 0.125,
         },
         Object {
-          "x": 1607437380000,
+          "x": 1627374840000,
           "y": 0,
         },
         Object {
-          "x": 1607437440000,
-          "y": 0.2,
+          "x": 1627374900000,
+          "y": 0,
         },
         Object {
-          "x": 1607437500000,
+          "x": 1627374960000,
           "y": 0,
         },
         Object {
-          "x": 1607437560000,
+          "x": 1627375020000,
           "y": 0,
         },
         Object {
-          "x": 1607437620000,
+          "x": 1627375080000,
           "y": null,
         },
       ],
       "latency": Array [
         Object {
-          "x": 1607436720000,
-          "y": null,
+          "x": 1627374180000,
+          "y": 9821.54545454545,
         },
         Object {
-          "x": 1607436780000,
-          "y": 23071,
+          "x": 1627374240000,
+          "y": 15175,
         },
         Object {
-          "x": 1607436840000,
-          "y": 48287,
+          "x": 1627374300000,
+          "y": 11944.1428571429,
         },
         Object {
-          "x": 1607436900000,
-          "y": null,
+          "x": 1627374360000,
+          "y": 10557.2222222222,
         },
         Object {
-          "x": 1607436960000,
-          "y": 22015,
+          "x": 1627374420000,
+          "y": 25429.1538461538,
         },
         Object {
-          "x": 1607437020000,
-          "y": null,
+          "x": 1627374480000,
+          "y": 21736.1428571429,
         },
         Object {
-          "x": 1607437080000,
-          "y": 10159,
+          "x": 1627374540000,
+          "y": 28604.3333333333,
         },
         Object {
-          "x": 1607437140000,
-          "y": null,
+          "x": 1627374600000,
+          "y": 20103.5333333333,
         },
         Object {
-          "x": 1607437200000,
-          "y": 28258.5555555556,
+          "x": 1627374660000,
+          "y": 3311,
         },
         Object {
-          "x": 1607437260000,
-          "y": 15999,
+          "x": 1627374720000,
+          "y": 7521,
         },
         Object {
-          "x": 1607437320000,
-          "y": 17407,
+          "x": 1627374780000,
+          "y": 8063,
         },
         Object {
-          "x": 1607437380000,
-          "y": null,
+          "x": 1627374840000,
+          "y": 8101.4,
         },
         Object {
-          "x": 1607437440000,
-          "y": 11425,
+          "x": 1627374900000,
+          "y": 24196.3333333333,
         },
         Object {
-          "x": 1607437500000,
-          "y": null,
+          "x": 1627374960000,
+          "y": 14157,
         },
         Object {
-          "x": 1607437560000,
-          "y": 18175,
+          "x": 1627375020000,
+          "y": 15103,
         },
         Object {
-          "x": 1607437620000,
+          "x": 1627375080000,
           "y": null,
         },
       ],
       "memoryUsage": Array [
         Object {
-          "x": 1607436720000,
-          "y": null,
+          "x": 1627374180000,
+          "y": 0.824100494384766,
         },
         Object {
-          "x": 1607436780000,
-          "y": 0.941593170166016,
+          "x": 1627374240000,
+          "y": 0.824317932128906,
         },
         Object {
-          "x": 1607436840000,
-          "y": 0.941810607910156,
+          "x": 1627374300000,
+          "y": 0.824752807617188,
         },
         Object {
-          "x": 1607436900000,
-          "y": 0.941947937011719,
+          "x": 1627374360000,
+          "y": 0.825035095214844,
         },
         Object {
-          "x": 1607436960000,
-          "y": 0.942043304443359,
+          "x": 1627374420000,
+          "y": 0.825420379638672,
         },
         Object {
-          "x": 1607437020000,
-          "y": 0.942302703857422,
+          "x": 1627374480000,
+          "y": 0.825778961181641,
         },
         Object {
-          "x": 1607437080000,
-          "y": 0.942356109619141,
+          "x": 1627374540000,
+          "y": 0.823772430419922,
         },
         Object {
-          "x": 1607437140000,
-          "y": 0.942440032958984,
+          "x": 1627374600000,
+          "y": 0.824184417724609,
         },
         Object {
-          "x": 1607437200000,
-          "y": 0.942562103271484,
+          "x": 1627374660000,
+          "y": 0.824348449707031,
         },
         Object {
-          "x": 1607437260000,
-          "y": 0.943096160888672,
+          "x": 1627374720000,
+          "y": 0.824550628662109,
         },
         Object {
-          "x": 1607437320000,
-          "y": 0.943271636962891,
+          "x": 1627374780000,
+          "y": 0.826988220214844,
         },
         Object {
-          "x": 1607437380000,
-          "y": 0.943504333496094,
+          "x": 1627374840000,
+          "y": 0.82958984375,
         },
         Object {
-          "x": 1607437440000,
-          "y": 0.943470001220703,
+          "x": 1627374900000,
+          "y": 0.829998016357422,
         },
         Object {
-          "x": 1607437500000,
-          "y": 0.943660736083984,
+          "x": 1627374960000,
+          "y": 0.830215454101563,
         },
         Object {
-          "x": 1607437560000,
-          "y": 0.943748474121094,
+          "x": 1627375020000,
+          "y": 0.830368041992188,
         },
         Object {
-          "x": 1607437620000,
-          "y": 0.943737030029297,
+          "x": 1627375080000,
+          "y": null,
         },
       ],
-      "serviceNodeName": "02950c4c5fbb0fda1cc98c47bf4024b473a8a17629db6530d95dcee68bd54c6c",
+      "serviceNodeName": "6dc7ea7824d0887cdfa0cb876bca5b27346c8b7cd196a9b1a6fe91968b99fbc2",
       "throughput": Array [
         Object {
-          "x": 1607436720000,
-          "y": 0,
+          "x": 1627374180000,
+          "y": 39,
         },
         Object {
-          "x": 1607436780000,
-          "y": 5,
+          "x": 1627374240000,
+          "y": 30,
         },
         Object {
-          "x": 1607436840000,
-          "y": 12,
+          "x": 1627374300000,
+          "y": 28,
         },
         Object {
-          "x": 1607436900000,
-          "y": 3,
+          "x": 1627374360000,
+          "y": 37,
         },
         Object {
-          "x": 1607436960000,
-          "y": 13,
+          "x": 1627374420000,
+          "y": 38,
         },
         Object {
-          "x": 1607437020000,
-          "y": 9,
+          "x": 1627374480000,
+          "y": 34,
         },
         Object {
-          "x": 1607437080000,
-          "y": 5,
+          "x": 1627374540000,
+          "y": 51,
         },
         Object {
-          "x": 1607437140000,
-          "y": 2,
+          "x": 1627374600000,
+          "y": 43,
         },
         Object {
-          "x": 1607437200000,
-          "y": 16,
+          "x": 1627374660000,
+          "y": 9,
         },
         Object {
-          "x": 1607437260000,
-          "y": 19,
+          "x": 1627374720000,
+          "y": 23,
         },
         Object {
-          "x": 1607437320000,
-          "y": 6,
+          "x": 1627374780000,
+          "y": 8,
         },
         Object {
-          "x": 1607437380000,
-          "y": 6,
+          "x": 1627374840000,
+          "y": 28,
         },
         Object {
-          "x": 1607437440000,
-          "y": 10,
+          "x": 1627374900000,
+          "y": 32,
         },
         Object {
-          "x": 1607437500000,
-          "y": 5,
+          "x": 1627374960000,
+          "y": 25,
         },
         Object {
-          "x": 1607437560000,
-          "y": 4,
+          "x": 1627375020000,
+          "y": 8,
         },
         Object {
-          "x": 1607437620000,
+          "x": 1627375080000,
           "y": 0,
         },
       ],
     },
   },
   "previousPeriod": Object {
-    "02950c4c5fbb0fda1cc98c47bf4024b473a8a17629db6530d95dcee68bd54c6c": Object {
+    "6dc7ea7824d0887cdfa0cb876bca5b27346c8b7cd196a9b1a6fe91968b99fbc2": Object {
       "cpuUsage": Array [
         Object {
-          "x": 1607436720000,
-          "y": null,
+          "x": 1627374180000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607436780000,
-          "y": 0.012,
+          "x": 1627374240000,
+          "y": 0.0015,
         },
         Object {
-          "x": 1607436840000,
-          "y": 0.0185,
+          "x": 1627374300000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607436900000,
-          "y": 0.013,
+          "x": 1627374360000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607436960000,
-          "y": 0.011,
+          "x": 1627374420000,
+          "y": 0.0015,
         },
         Object {
-          "x": 1607437020000,
-          "y": 0.012,
+          "x": 1627374480000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607437080000,
-          "y": 0.0105,
+          "x": 1627374540000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607437140000,
-          "y": 0.013,
+          "x": 1627374600000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607437200000,
-          "y": 0.011,
+          "x": 1627374660000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607437260000,
-          "y": 0.0125,
+          "x": 1627374720000,
+          "y": 0.0015,
         },
         Object {
-          "x": 1607437320000,
-          "y": 0.0105,
+          "x": 1627374780000,
+          "y": 0.0015,
         },
         Object {
-          "x": 1607437380000,
-          "y": 0.0115,
+          "x": 1627374840000,
+          "y": 0.0035,
         },
         Object {
-          "x": 1607437440000,
-          "y": 0.0115,
+          "x": 1627374900000,
+          "y": 0.003,
         },
         Object {
-          "x": 1607437500000,
-          "y": 0.012,
+          "x": 1627374960000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607437560000,
-          "y": 0.0105,
+          "x": 1627375020000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607437620000,
-          "y": 0.0115,
+          "x": 1627375080000,
+          "y": null,
         },
       ],
       "errorRate": Array [
         Object {
-          "x": 1607436720000,
-          "y": null,
+          "x": 1627374180000,
+          "y": 0.121212121212121,
         },
         Object {
-          "x": 1607436780000,
-          "y": 0,
+          "x": 1627374240000,
+          "y": 0.0714285714285714,
         },
         Object {
-          "x": 1607436840000,
+          "x": 1627374300000,
           "y": 0,
         },
         Object {
-          "x": 1607436900000,
+          "x": 1627374360000,
           "y": 0,
         },
         Object {
-          "x": 1607436960000,
+          "x": 1627374420000,
           "y": 0,
         },
         Object {
-          "x": 1607437020000,
+          "x": 1627374480000,
           "y": 0,
         },
         Object {
-          "x": 1607437080000,
-          "y": null,
+          "x": 1627374540000,
+          "y": 0,
         },
         Object {
-          "x": 1607437140000,
+          "x": 1627374600000,
           "y": 0,
         },
         Object {
-          "x": 1607437200000,
-          "y": 1,
+          "x": 1627374660000,
+          "y": 0.0303030303030303,
         },
         Object {
-          "x": 1607437260000,
-          "y": 0,
+          "x": 1627374720000,
+          "y": null,
         },
         Object {
-          "x": 1607437320000,
-          "y": null,
+          "x": 1627374780000,
+          "y": 0,
         },
         Object {
-          "x": 1607437380000,
-          "y": 0.0769230769230769,
+          "x": 1627374840000,
+          "y": 0.0625,
         },
         Object {
-          "x": 1607437440000,
-          "y": 0,
+          "x": 1627374900000,
+          "y": 0.0476190476190476,
         },
         Object {
-          "x": 1607437500000,
-          "y": 0.117647058823529,
+          "x": 1627374960000,
+          "y": 0,
         },
         Object {
-          "x": 1607437560000,
+          "x": 1627375020000,
           "y": 0,
         },
         Object {
-          "x": 1607437620000,
-          "y": 0.25,
+          "x": 1627375080000,
+          "y": null,
         },
       ],
       "latency": Array [
         Object {
-          "x": 1607436720000,
-          "y": null,
+          "x": 1627374180000,
+          "y": 12008.6,
         },
         Object {
-          "x": 1607436780000,
-          "y": 23491,
+          "x": 1627374240000,
+          "y": 10207,
         },
         Object {
-          "x": 1607436840000,
-          "y": 8093695,
+          "x": 1627374300000,
+          "y": 17692.1428571429,
         },
         Object {
-          "x": 1607436900000,
-          "y": 18463,
+          "x": 1627374360000,
+          "y": 13574.3846153846,
         },
         Object {
-          "x": 1607436960000,
-          "y": null,
+          "x": 1627374420000,
+          "y": 13247,
         },
         Object {
-          "x": 1607437020000,
-          "y": 23727,
+          "x": 1627374480000,
+          "y": 10495,
         },
         Object {
-          "x": 1607437080000,
-          "y": null,
+          "x": 1627374540000,
+          "y": 25359,
         },
         Object {
-          "x": 1607437140000,
-          "y": 26591,
+          "x": 1627374600000,
+          "y": 15160.6,
         },
         Object {
-          "x": 1607437200000,
-          "y": 22271,
+          "x": 1627374660000,
+          "y": 17819,
         },
         Object {
-          "x": 1607437260000,
-          "y": 11404.3333333333,
+          "x": 1627374720000,
+          "y": null,
         },
         Object {
-          "x": 1607437320000,
-          "y": null,
+          "x": 1627374780000,
+          "y": 12047,
         },
         Object {
-          "x": 1607437380000,
-          "y": 32483.5714285714,
+          "x": 1627374840000,
+          "y": 15913.6666666667,
         },
         Object {
-          "x": 1607437440000,
-          "y": null,
+          "x": 1627374900000,
+          "y": 13746.2,
         },
         Object {
-          "x": 1607437500000,
-          "y": 15083.4444444444,
+          "x": 1627374960000,
+          "y": 9519,
         },
         Object {
-          "x": 1607437560000,
-          "y": null,
+          "x": 1627375020000,
+          "y": 34824.6,
         },
         Object {
-          "x": 1607437620000,
-          "y": 56319,
+          "x": 1627375080000,
+          "y": null,
         },
       ],
       "memoryUsage": Array [
         Object {
-          "x": 1607436720000,
-          "y": null,
+          "x": 1627374180000,
+          "y": 0.825572967529297,
         },
         Object {
-          "x": 1607436780000,
-          "y": 0.937744140625,
+          "x": 1627374240000,
+          "y": 0.825843811035156,
         },
         Object {
-          "x": 1607436840000,
-          "y": 0.938282012939453,
+          "x": 1627374300000,
+          "y": 0.826179504394531,
         },
         Object {
-          "x": 1607436900000,
-          "y": 0.939090728759766,
+          "x": 1627374360000,
+          "y": 0.82659912109375,
         },
         Object {
-          "x": 1607436960000,
-          "y": 0.939121246337891,
+          "x": 1627374420000,
+          "y": 0.826702117919922,
         },
         Object {
-          "x": 1607437020000,
-          "y": 0.939357757568359,
+          "x": 1627374480000,
+          "y": 0.826923370361328,
         },
         Object {
-          "x": 1607437080000,
-          "y": 0.939540863037109,
+          "x": 1627374540000,
+          "y": 0.827106475830078,
         },
         Object {
-          "x": 1607437140000,
-          "y": 0.939723968505859,
+          "x": 1627374600000,
+          "y": 0.827262878417969,
         },
         Object {
-          "x": 1607437200000,
-          "y": 0.939834594726563,
+          "x": 1627374660000,
+          "y": 0.827518463134766,
         },
         Object {
-          "x": 1607437260000,
-          "y": 0.940227508544922,
+          "x": 1627374720000,
+          "y": 0.827735900878906,
         },
         Object {
-          "x": 1607437320000,
-          "y": 0.940330505371094,
+          "x": 1627374780000,
+          "y": 0.827884674072266,
         },
         Object {
-          "x": 1607437380000,
-          "y": 0.940418243408203,
+          "x": 1627374840000,
+          "y": 0.828010559082031,
         },
         Object {
-          "x": 1607437440000,
-          "y": 0.940711975097656,
+          "x": 1627374900000,
+          "y": 0.823200225830078,
         },
         Object {
-          "x": 1607437500000,
-          "y": 0.941020965576172,
+          "x": 1627374960000,
+          "y": 0.823371887207031,
         },
         Object {
-          "x": 1607437560000,
-          "y": 0.941341400146484,
+          "x": 1627375020000,
+          "y": 0.823692321777344,
         },
         Object {
-          "x": 1607437620000,
-          "y": 0.941448211669922,
+          "x": 1627375080000,
+          "y": null,
         },
       ],
-      "serviceNodeName": "02950c4c5fbb0fda1cc98c47bf4024b473a8a17629db6530d95dcee68bd54c6c",
+      "serviceNodeName": "6dc7ea7824d0887cdfa0cb876bca5b27346c8b7cd196a9b1a6fe91968b99fbc2",
       "throughput": Array [
         Object {
-          "x": 1607436720000,
-          "y": 0,
+          "x": 1627374180000,
+          "y": 33,
         },
         Object {
-          "x": 1607436780000,
-          "y": 12,
+          "x": 1627374240000,
+          "y": 14,
         },
         Object {
-          "x": 1607436840000,
-          "y": 4,
+          "x": 1627374300000,
+          "y": 42,
         },
         Object {
-          "x": 1607436900000,
-          "y": 13,
+          "x": 1627374360000,
+          "y": 43,
         },
         Object {
-          "x": 1607436960000,
-          "y": 3,
+          "x": 1627374420000,
+          "y": 4,
         },
         Object {
-          "x": 1607437020000,
-          "y": 16,
+          "x": 1627374480000,
+          "y": 19,
         },
         Object {
-          "x": 1607437080000,
-          "y": 0,
+          "x": 1627374540000,
+          "y": 22,
         },
         Object {
-          "x": 1607437140000,
-          "y": 11,
+          "x": 1627374600000,
+          "y": 20,
         },
         Object {
-          "x": 1607437200000,
-          "y": 1,
+          "x": 1627374660000,
+          "y": 33,
         },
         Object {
-          "x": 1607437260000,
-          "y": 27,
+          "x": 1627374720000,
+          "y": 0,
         },
         Object {
-          "x": 1607437320000,
-          "y": 0,
+          "x": 1627374780000,
+          "y": 23,
         },
         Object {
-          "x": 1607437380000,
-          "y": 13,
+          "x": 1627374840000,
+          "y": 16,
         },
         Object {
-          "x": 1607437440000,
-          "y": 12,
+          "x": 1627374900000,
+          "y": 21,
         },
         Object {
-          "x": 1607437500000,
-          "y": 17,
+          "x": 1627374960000,
+          "y": 19,
         },
         Object {
-          "x": 1607437560000,
-          "y": 17,
+          "x": 1627375020000,
+          "y": 30,
         },
         Object {
-          "x": 1607437620000,
-          "y": 4,
+          "x": 1627375080000,
+          "y": 0,
         },
       ],
     },
@@ -678,635 +678,635 @@ Object {
 exports[`APM API tests basic apm_8.0.0 Service overview instances detailed statistics when data is loaded fetching data without comparison returns the right data 3`] = `
 Object {
   "currentPeriod": Object {
-    "02950c4c5fbb0fda1cc98c47bf4024b473a8a17629db6530d95dcee68bd54c6c": Object {
+    "6dc7ea7824d0887cdfa0cb876bca5b27346c8b7cd196a9b1a6fe91968b99fbc2": Object {
       "cpuUsage": Array [
         Object {
-          "x": 1607435820000,
-          "y": null,
+          "x": 1627373280000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607435880000,
-          "y": 0.012,
+          "x": 1627373340000,
+          "y": 0.0015,
         },
         Object {
-          "x": 1607435940000,
-          "y": 0.0185,
+          "x": 1627373400000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607436000000,
-          "y": 0.013,
+          "x": 1627373460000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607436060000,
-          "y": 0.011,
+          "x": 1627373520000,
+          "y": 0.0015,
         },
         Object {
-          "x": 1607436120000,
-          "y": 0.012,
+          "x": 1627373580000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607436180000,
-          "y": 0.0105,
+          "x": 1627373640000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607436240000,
-          "y": 0.013,
+          "x": 1627373700000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607436300000,
-          "y": 0.011,
+          "x": 1627373760000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607436360000,
-          "y": 0.0125,
+          "x": 1627373820000,
+          "y": 0.0015,
         },
         Object {
-          "x": 1607436420000,
-          "y": 0.0105,
+          "x": 1627373880000,
+          "y": 0.0015,
         },
         Object {
-          "x": 1607436480000,
-          "y": 0.0115,
+          "x": 1627373940000,
+          "y": 0.0035,
         },
         Object {
-          "x": 1607436540000,
-          "y": 0.0115,
+          "x": 1627374000000,
+          "y": 0.003,
         },
         Object {
-          "x": 1607436600000,
-          "y": 0.012,
+          "x": 1627374060000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607436660000,
-          "y": 0.0105,
+          "x": 1627374120000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607436720000,
-          "y": 0.0115,
+          "x": 1627374180000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607436780000,
-          "y": 0.011,
+          "x": 1627374240000,
+          "y": 0.0015,
         },
         Object {
-          "x": 1607436840000,
-          "y": 0.013,
+          "x": 1627374300000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607436900000,
-          "y": 0.011,
+          "x": 1627374360000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607436960000,
-          "y": 0.0115,
+          "x": 1627374420000,
+          "y": 0.0025,
         },
         Object {
-          "x": 1607437020000,
-          "y": 0.0115,
+          "x": 1627374480000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607437080000,
-          "y": 0.011,
+          "x": 1627374540000,
+          "y": 0.007,
         },
         Object {
-          "x": 1607437140000,
-          "y": 0.0105,
+          "x": 1627374600000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607437200000,
-          "y": 0.014,
+          "x": 1627374660000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607437260000,
-          "y": 0.013,
+          "x": 1627374720000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607437320000,
-          "y": 0.012,
+          "x": 1627374780000,
+          "y": 0.0035,
         },
         Object {
-          "x": 1607437380000,
-          "y": 0.0115,
+          "x": 1627374840000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607437440000,
-          "y": 0.013,
+          "x": 1627374900000,
+          "y": 0.002,
         },
         Object {
-          "x": 1607437500000,
-          "y": 0.0125,
+          "x": 1627374960000,
+          "y": 0.0015,
         },
         Object {
-          "x": 1607437560000,
-          "y": 0.013,
+          "x": 1627375020000,
+          "y": 0.0015,
         },
         Object {
-          "x": 1607437620000,
-          "y": 0.011,
+          "x": 1627375080000,
+          "y": null,
         },
       ],
       "errorRate": Array [
         Object {
-          "x": 1607435820000,
-          "y": null,
+          "x": 1627373280000,
+          "y": 0.121212121212121,
         },
         Object {
-          "x": 1607435880000,
-          "y": 0,
+          "x": 1627373340000,
+          "y": 0.0714285714285714,
         },
         Object {
-          "x": 1607435940000,
+          "x": 1627373400000,
           "y": 0,
         },
         Object {
-          "x": 1607436000000,
+          "x": 1627373460000,
           "y": 0,
         },
         Object {
-          "x": 1607436060000,
+          "x": 1627373520000,
           "y": 0,
         },
         Object {
-          "x": 1607436120000,
+          "x": 1627373580000,
           "y": 0,
         },
         Object {
-          "x": 1607436180000,
-          "y": null,
+          "x": 1627373640000,
+          "y": 0,
         },
         Object {
-          "x": 1607436240000,
+          "x": 1627373700000,
           "y": 0,
         },
         Object {
-          "x": 1607436300000,
-          "y": 1,
+          "x": 1627373760000,
+          "y": 0.0303030303030303,
         },
         Object {
-          "x": 1607436360000,
-          "y": 0,
+          "x": 1627373820000,
+          "y": null,
         },
         Object {
-          "x": 1607436420000,
-          "y": null,
+          "x": 1627373880000,
+          "y": 0,
         },
         Object {
-          "x": 1607436480000,
-          "y": 0.0769230769230769,
+          "x": 1627373940000,
+          "y": 0.0625,
         },
         Object {
-          "x": 1607436540000,
-          "y": 0,
+          "x": 1627374000000,
+          "y": 0.0476190476190476,
         },
         Object {
-          "x": 1607436600000,
-          "y": 0.117647058823529,
+          "x": 1627374060000,
+          "y": 0,
         },
         Object {
-          "x": 1607436660000,
+          "x": 1627374120000,
           "y": 0,
         },
         Object {
-          "x": 1607436720000,
-          "y": 0.25,
+          "x": 1627374180000,
+          "y": 0,
         },
         Object {
-          "x": 1607436780000,
+          "x": 1627374240000,
           "y": 0,
         },
         Object {
-          "x": 1607436840000,
-          "y": 0.0833333333333333,
+          "x": 1627374300000,
+          "y": 0.0714285714285714,
         },
         Object {
-          "x": 1607436900000,
+          "x": 1627374360000,
           "y": 0,
         },
         Object {
-          "x": 1607436960000,
-          "y": 0,
+          "x": 1627374420000,
+          "y": 0.0263157894736842,
         },
         Object {
-          "x": 1607437020000,
-          "y": 0,
+          "x": 1627374480000,
+          "y": 0.0294117647058824,
         },
         Object {
-          "x": 1607437080000,
+          "x": 1627374540000,
           "y": 0,
         },
         Object {
-          "x": 1607437140000,
-          "y": 0,
+          "x": 1627374600000,
+          "y": 0.0465116279069767,
         },
         Object {
-          "x": 1607437200000,
-          "y": 0.125,
+          "x": 1627374660000,
+          "y": 0,
         },
         Object {
-          "x": 1607437260000,
+          "x": 1627374720000,
           "y": 0,
         },
         Object {
-          "x": 1607437320000,
-          "y": 0.166666666666667,
+          "x": 1627374780000,
+          "y": 0.125,
         },
         Object {
-          "x": 1607437380000,
+          "x": 1627374840000,
           "y": 0,
         },
         Object {
-          "x": 1607437440000,
-          "y": 0.2,
+          "x": 1627374900000,
+          "y": 0,
         },
         Object {
-          "x": 1607437500000,
+          "x": 1627374960000,
           "y": 0,
         },
         Object {
-          "x": 1607437560000,
+          "x": 1627375020000,
           "y": 0,
         },
         Object {
-          "x": 1607437620000,
+          "x": 1627375080000,
           "y": null,
         },
       ],
       "latency": Array [
         Object {
-          "x": 1607435820000,
-          "y": null,
+          "x": 1627373280000,
+          "y": 12008.6,
         },
         Object {
-          "x": 1607435880000,
-          "y": 23491,
+          "x": 1627373340000,
+          "y": 10207,
         },
         Object {
-          "x": 1607435940000,
-          "y": 8093695,
+          "x": 1627373400000,
+          "y": 17692.1428571429,
         },
         Object {
-          "x": 1607436000000,
-          "y": 18463,
+          "x": 1627373460000,
+          "y": 13574.3846153846,
         },
         Object {
-          "x": 1607436060000,
-          "y": null,
+          "x": 1627373520000,
+          "y": 13247,
         },
         Object {
-          "x": 1607436120000,
-          "y": 23727,
+          "x": 1627373580000,
+          "y": 10495,
         },
         Object {
-          "x": 1607436180000,
-          "y": null,
+          "x": 1627373640000,
+          "y": 25359,
         },
         Object {
-          "x": 1607436240000,
-          "y": 26591,
+          "x": 1627373700000,
+          "y": 15160.6,
         },
         Object {
-          "x": 1607436300000,
-          "y": 22271,
+          "x": 1627373760000,
+          "y": 17819,
         },
         Object {
-          "x": 1607436360000,
-          "y": 11404.3333333333,
+          "x": 1627373820000,
+          "y": null,
         },
         Object {
-          "x": 1607436420000,
-          "y": null,
+          "x": 1627373880000,
+          "y": 12047,
         },
         Object {
-          "x": 1607436480000,
-          "y": 32483.5714285714,
+          "x": 1627373940000,
+          "y": 15913.6666666667,
         },
         Object {
-          "x": 1607436540000,
-          "y": null,
+          "x": 1627374000000,
+          "y": 13746.2,
         },
         Object {
-          "x": 1607436600000,
-          "y": 15083.4444444444,
+          "x": 1627374060000,
+          "y": 9519,
         },
         Object {
-          "x": 1607436660000,
-          "y": null,
+          "x": 1627374120000,
+          "y": 34824.6,
         },
         Object {
-          "x": 1607436720000,
-          "y": 56319,
+          "x": 1627374180000,
+          "y": 9821.54545454545,
         },
         Object {
-          "x": 1607436780000,
-          "y": 23071,
+          "x": 1627374240000,
+          "y": 15175,
         },
         Object {
-          "x": 1607436840000,
-          "y": 48287,
+          "x": 1627374300000,
+          "y": 11944.1428571429,
         },
         Object {
-          "x": 1607436900000,
-          "y": null,
+          "x": 1627374360000,
+          "y": 10557.2222222222,
         },
         Object {
-          "x": 1607436960000,
-          "y": 22015,
+          "x": 1627374420000,
+          "y": 25429.1538461538,
         },
         Object {
-          "x": 1607437020000,
-          "y": null,
+          "x": 1627374480000,
+          "y": 21736.1428571429,
         },
         Object {
-          "x": 1607437080000,
-          "y": 10159,
+          "x": 1627374540000,
+          "y": 28604.3333333333,
         },
         Object {
-          "x": 1607437140000,
-          "y": null,
+          "x": 1627374600000,
+          "y": 20103.5333333333,
         },
         Object {
-          "x": 1607437200000,
-          "y": 28258.5555555556,
+          "x": 1627374660000,
+          "y": 3311,
         },
         Object {
-          "x": 1607437260000,
-          "y": 15999,
+          "x": 1627374720000,
+          "y": 7521,
         },
         Object {
-          "x": 1607437320000,
-          "y": 17407,
+          "x": 1627374780000,
+          "y": 8063,
         },
         Object {
-          "x": 1607437380000,
-          "y": null,
+          "x": 1627374840000,
+          "y": 8101.4,
         },
         Object {
-          "x": 1607437440000,
-          "y": 11425,
+          "x": 1627374900000,
+          "y": 24196.3333333333,
         },
         Object {
-          "x": 1607437500000,
-          "y": null,
+          "x": 1627374960000,
+          "y": 14157,
         },
         Object {
-          "x": 1607437560000,
-          "y": 18175,
+          "x": 1627375020000,
+          "y": 15103,
         },
         Object {
-          "x": 1607437620000,
+          "x": 1627375080000,
           "y": null,
         },
       ],
       "memoryUsage": Array [
         Object {
-          "x": 1607435820000,
-          "y": null,
+          "x": 1627373280000,
+          "y": 0.825572967529297,
         },
         Object {
-          "x": 1607435880000,
-          "y": 0.937744140625,
+          "x": 1627373340000,
+          "y": 0.825843811035156,
         },
         Object {
-          "x": 1607435940000,
-          "y": 0.938282012939453,
+          "x": 1627373400000,
+          "y": 0.826179504394531,
         },
         Object {
-          "x": 1607436000000,
-          "y": 0.939090728759766,
+          "x": 1627373460000,
+          "y": 0.82659912109375,
         },
         Object {
-          "x": 1607436060000,
-          "y": 0.939121246337891,
+          "x": 1627373520000,
+          "y": 0.826702117919922,
         },
         Object {
-          "x": 1607436120000,
-          "y": 0.939357757568359,
+          "x": 1627373580000,
+          "y": 0.826923370361328,
         },
         Object {
-          "x": 1607436180000,
-          "y": 0.939540863037109,
+          "x": 1627373640000,
+          "y": 0.827106475830078,
         },
         Object {
-          "x": 1607436240000,
-          "y": 0.939723968505859,
+          "x": 1627373700000,
+          "y": 0.827262878417969,
         },
         Object {
-          "x": 1607436300000,
-          "y": 0.939834594726563,
+          "x": 1627373760000,
+          "y": 0.827518463134766,
         },
         Object {
-          "x": 1607436360000,
-          "y": 0.940227508544922,
+          "x": 1627373820000,
+          "y": 0.827735900878906,
         },
         Object {
-          "x": 1607436420000,
-          "y": 0.940330505371094,
+          "x": 1627373880000,
+          "y": 0.827884674072266,
         },
         Object {
-          "x": 1607436480000,
-          "y": 0.940418243408203,
+          "x": 1627373940000,
+          "y": 0.828010559082031,
         },
         Object {
-          "x": 1607436540000,
-          "y": 0.940711975097656,
+          "x": 1627374000000,
+          "y": 0.823200225830078,
         },
         Object {
-          "x": 1607436600000,
-          "y": 0.941020965576172,
+          "x": 1627374060000,
+          "y": 0.823371887207031,
         },
         Object {
-          "x": 1607436660000,
-          "y": 0.941341400146484,
+          "x": 1627374120000,
+          "y": 0.823692321777344,
         },
         Object {
-          "x": 1607436720000,
-          "y": 0.941448211669922,
+          "x": 1627374180000,
+          "y": 0.824100494384766,
         },
         Object {
-          "x": 1607436780000,
-          "y": 0.941593170166016,
+          "x": 1627374240000,
+          "y": 0.824317932128906,
         },
         Object {
-          "x": 1607436840000,
-          "y": 0.941810607910156,
+          "x": 1627374300000,
+          "y": 0.824752807617188,
         },
         Object {
-          "x": 1607436900000,
-          "y": 0.941947937011719,
+          "x": 1627374360000,
+          "y": 0.825035095214844,
         },
         Object {
-          "x": 1607436960000,
-          "y": 0.942043304443359,
+          "x": 1627374420000,
+          "y": 0.825420379638672,
         },
         Object {
-          "x": 1607437020000,
-          "y": 0.942302703857422,
+          "x": 1627374480000,
+          "y": 0.825778961181641,
         },
         Object {
-          "x": 1607437080000,
-          "y": 0.942356109619141,
+          "x": 1627374540000,
+          "y": 0.823772430419922,
         },
         Object {
-          "x": 1607437140000,
-          "y": 0.942440032958984,
+          "x": 1627374600000,
+          "y": 0.824184417724609,
         },
         Object {
-          "x": 1607437200000,
-          "y": 0.942562103271484,
+          "x": 1627374660000,
+          "y": 0.824348449707031,
         },
         Object {
-          "x": 1607437260000,
-          "y": 0.943096160888672,
+          "x": 1627374720000,
+          "y": 0.824550628662109,
         },
         Object {
-          "x": 1607437320000,
-          "y": 0.943271636962891,
+          "x": 1627374780000,
+          "y": 0.826988220214844,
         },
         Object {
-          "x": 1607437380000,
-          "y": 0.943504333496094,
+          "x": 1627374840000,
+          "y": 0.82958984375,
         },
         Object {
-          "x": 1607437440000,
-          "y": 0.943470001220703,
+          "x": 1627374900000,
+          "y": 0.829998016357422,
         },
         Object {
-          "x": 1607437500000,
-          "y": 0.943660736083984,
+          "x": 1627374960000,
+          "y": 0.830215454101563,
         },
         Object {
-          "x": 1607437560000,
-          "y": 0.943748474121094,
+          "x": 1627375020000,
+          "y": 0.830368041992188,
         },
         Object {
-          "x": 1607437620000,
-          "y": 0.943737030029297,
+          "x": 1627375080000,
+          "y": null,
         },
       ],
-      "serviceNodeName": "02950c4c5fbb0fda1cc98c47bf4024b473a8a17629db6530d95dcee68bd54c6c",
+      "serviceNodeName": "6dc7ea7824d0887cdfa0cb876bca5b27346c8b7cd196a9b1a6fe91968b99fbc2",
       "throughput": Array [
         Object {
-          "x": 1607435820000,
-          "y": 0,
+          "x": 1627373280000,
+          "y": 33,
         },
         Object {
-          "x": 1607435880000,
-          "y": 12,
+          "x": 1627373340000,
+          "y": 14,
         },
         Object {
-          "x": 1607435940000,
-          "y": 4,
+          "x": 1627373400000,
+          "y": 42,
         },
         Object {
-          "x": 1607436000000,
-          "y": 13,
+          "x": 1627373460000,
+          "y": 43,
         },
         Object {
-          "x": 1607436060000,
-          "y": 3,
+          "x": 1627373520000,
+          "y": 4,
         },
         Object {
-          "x": 1607436120000,
-          "y": 16,
+          "x": 1627373580000,
+          "y": 19,
         },
         Object {
-          "x": 1607436180000,
-          "y": 0,
+          "x": 1627373640000,
+          "y": 22,
         },
         Object {
-          "x": 1607436240000,
-          "y": 11,
+          "x": 1627373700000,
+          "y": 20,
         },
         Object {
-          "x": 1607436300000,
-          "y": 1,
+          "x": 1627373760000,
+          "y": 33,
         },
         Object {
-          "x": 1607436360000,
-          "y": 27,
+          "x": 1627373820000,
+          "y": 0,
         },
         Object {
-          "x": 1607436420000,
-          "y": 0,
+          "x": 1627373880000,
+          "y": 23,
         },
         Object {
-          "x": 1607436480000,
-          "y": 13,
+          "x": 1627373940000,
+          "y": 16,
         },
         Object {
-          "x": 1607436540000,
-          "y": 12,
+          "x": 1627374000000,
+          "y": 21,
         },
         Object {
-          "x": 1607436600000,
-          "y": 17,
+          "x": 1627374060000,
+          "y": 19,
         },
         Object {
-          "x": 1607436660000,
-          "y": 17,
+          "x": 1627374120000,
+          "y": 30,
         },
         Object {
-          "x": 1607436720000,
-          "y": 4,
+          "x": 1627374180000,
+          "y": 39,
         },
         Object {
-          "x": 1607436780000,
-          "y": 5,
+          "x": 1627374240000,
+          "y": 30,
         },
         Object {
-          "x": 1607436840000,
-          "y": 12,
+          "x": 1627374300000,
+          "y": 28,
         },
         Object {
-          "x": 1607436900000,
-          "y": 3,
+          "x": 1627374360000,
+          "y": 37,
         },
         Object {
-          "x": 1607436960000,
-          "y": 13,
+          "x": 1627374420000,
+          "y": 38,
         },
         Object {
-          "x": 1607437020000,
-          "y": 9,
+          "x": 1627374480000,
+          "y": 34,
         },
         Object {
-          "x": 1607437080000,
-          "y": 5,
+          "x": 1627374540000,
+          "y": 51,
         },
         Object {
-          "x": 1607437140000,
-          "y": 2,
+          "x": 1627374600000,
+          "y": 43,
         },
         Object {
-          "x": 1607437200000,
-          "y": 16,
+          "x": 1627374660000,
+          "y": 9,
         },
         Object {
-          "x": 1607437260000,
-          "y": 19,
+          "x": 1627374720000,
+          "y": 23,
         },
         Object {
-          "x": 1607437320000,
-          "y": 6,
+          "x": 1627374780000,
+          "y": 8,
         },
         Object {
-          "x": 1607437380000,
-          "y": 6,
+          "x": 1627374840000,
+          "y": 28,
         },
         Object {
-          "x": 1607437440000,
-          "y": 10,
+          "x": 1627374900000,
+          "y": 32,
         },
         Object {
-          "x": 1607437500000,
-          "y": 5,
+          "x": 1627374960000,
+          "y": 25,
         },
         Object {
-          "x": 1607437560000,
-          "y": 4,
+          "x": 1627375020000,
+          "y": 8,
         },
         Object {
-          "x": 1607437620000,
+          "x": 1627375080000,
           "y": 0,
         },
       ],
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.ts b/x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.ts
index 142802840974d..9319babc3896a 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.ts
+++ b/x-pack/test/apm_api_integration/tests/service_overview/dependencies/index.ts
@@ -334,17 +334,17 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         ).toMatchInline(`
           Object {
             "errorRate": Object {
-              "value": 0,
+              "value": 0.00308832612723904,
             },
-            "impact": 1.97910470896139,
+            "impact": 100,
             "latency": Object {
-              "value": 1043.99015586546,
+              "value": 30177.8418777023,
             },
-            "name": "redis",
-            "spanSubtype": "redis",
+            "name": "postgresql",
+            "spanSubtype": "postgresql",
             "spanType": "db",
             "throughput": Object {
-              "value": 40.6333333333333,
+              "value": 53.9666666666667,
             },
             "type": "external",
           }
@@ -356,7 +356,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         expectSnapshot(names.sort()).toMatchInline(`
           Array [
             "elasticsearch",
-            "opbeans-java",
+            "opbeans-python",
             "postgresql",
             "redis",
           ]
@@ -370,7 +370,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
         expectSnapshot(serviceNames.sort()).toMatchInline(`
           Array [
-            "opbeans-java",
+            "opbeans-python",
           ]
         `);
       });
@@ -387,19 +387,19 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         expectSnapshot(latencyValues).toMatchInline(`
           Array [
             Object {
-              "latency": 2568.40816326531,
+              "latency": 10125.412371134,
               "name": "elasticsearch",
             },
             Object {
-              "latency": 25593.875,
-              "name": "opbeans-java",
+              "latency": 42984.2941176471,
+              "name": "opbeans-python",
             },
             Object {
-              "latency": 28885.3293963255,
+              "latency": 30177.8418777023,
               "name": "postgresql",
             },
             Object {
-              "latency": 1043.99015586546,
+              "latency": 1341.11624072547,
               "name": "redis",
             },
           ]
@@ -419,19 +419,19 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           Array [
             Object {
               "name": "elasticsearch",
-              "throughput": 13.0666666666667,
+              "throughput": 3.23333333333333,
             },
             Object {
-              "name": "opbeans-java",
-              "throughput": 0.533333333333333,
+              "name": "opbeans-python",
+              "throughput": 1.7,
             },
             Object {
               "name": "postgresql",
-              "throughput": 50.8,
+              "throughput": 53.9666666666667,
             },
             Object {
               "name": "redis",
-              "throughput": 40.6333333333333,
+              "throughput": 40.4333333333333,
             },
           ]
         `);
@@ -451,28 +451,28 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         expectSnapshot(impactValues).toMatchInline(`
           Array [
             Object {
-              "impact": 1.36961744704522,
-              "latency": 2568.40816326531,
+              "impact": 0,
+              "latency": 10125.412371134,
               "name": "elasticsearch",
-              "throughput": 13.0666666666667,
+              "throughput": 3.23333333333333,
             },
             Object {
-              "impact": 0,
-              "latency": 25593.875,
-              "name": "opbeans-java",
-              "throughput": 0.533333333333333,
+              "impact": 2.52744598670713,
+              "latency": 42984.2941176471,
+              "name": "opbeans-python",
+              "throughput": 1.7,
             },
             Object {
               "impact": 100,
-              "latency": 28885.3293963255,
+              "latency": 30177.8418777023,
               "name": "postgresql",
-              "throughput": 50.8,
+              "throughput": 53.9666666666667,
             },
             Object {
-              "impact": 1.97910470896139,
-              "latency": 1043.99015586546,
+              "impact": 1.34642037334926,
+              "latency": 1341.11624072547,
               "name": "redis",
-              "throughput": 40.6333333333333,
+              "throughput": 40.4333333333333,
             },
           ]
         `);
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/get_service_node_ids.ts b/x-pack/test/apm_api_integration/tests/service_overview/get_service_node_ids.ts
new file mode 100644
index 0000000000000..1f24fec7d77f7
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/service_overview/get_service_node_ids.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { take } from 'lodash';
+import { LatencyAggregationType } from '../../../../plugins/apm/common/latency_aggregation_types';
+import { ApmApiSupertest } from '../../common/apm_api_supertest';
+
+export async function getServiceNodeIds({
+  apmApiSupertest,
+  start,
+  end,
+  serviceName = 'opbeans-java',
+  count = 1,
+}: {
+  apmApiSupertest: ApmApiSupertest;
+  start: string;
+  end: string;
+  serviceName?: string;
+  count?: number;
+}) {
+  const { body } = await apmApiSupertest({
+    endpoint: `GET /api/apm/services/{serviceName}/service_overview_instances/main_statistics`,
+    params: {
+      path: { serviceName },
+      query: {
+        latencyAggregationType: LatencyAggregationType.avg,
+        start,
+        end,
+        transactionType: 'request',
+      },
+    },
+  });
+
+  return take(body.currentPeriod.map((item) => item.serviceNodeName).sort(), count);
+}
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instance_details.ts b/x-pack/test/apm_api_integration/tests/service_overview/instance_details.ts
index 1149971f99e1d..52525abe50373 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/instance_details.ts
+++ b/x-pack/test/apm_api_integration/tests/service_overview/instance_details.ts
@@ -10,11 +10,14 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import archives from '../../common/fixtures/es_archiver/archives_metadata';
 import { registry } from '../../common/registry';
 import { APIReturnType } from '../../../../plugins/apm/public/services/rest/createCallApmApi';
+import { getServiceNodeIds } from './get_service_node_ids';
+import { createApmApiSupertest } from '../../common/apm_api_supertest';
 
 type ServiceOverviewInstanceDetails = APIReturnType<'GET /api/apm/services/{serviceName}/service_overview_instances/details/{serviceNodeName}'>;
 
 export default function ApiTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
+  const apmApiSupertest = createApmApiSupertest(supertest);
 
   const archiveName = 'apm_8.0.0';
   const { start, end } = archives[archiveName];
@@ -52,11 +55,13 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           body: ServiceOverviewInstanceDetails;
         };
 
+        let serviceNodeIds: string[];
+
         before(async () => {
+          serviceNodeIds = await getServiceNodeIds({ apmApiSupertest, start, end });
           response = await supertest.get(
             url.format({
-              pathname:
-                '/api/apm/services/opbeans-java/service_overview_instances/details/02950c4c5fbb0fda1cc98c47bf4024b473a8a17629db6530d95dcee68bd54c6c',
+              pathname: `/api/apm/services/opbeans-java/service_overview_instances/details/${serviceNodeIds[0]}`,
               query: {
                 start,
                 end,
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.ts b/x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.ts
index b5cfd722c41dd..a7de1676ea39b 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.ts
+++ b/x-pack/test/apm_api_integration/tests/service_overview/instances_detailed_statistics.ts
@@ -14,13 +14,15 @@ import { APIReturnType } from '../../../../plugins/apm/public/services/rest/crea
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import archives from '../../common/fixtures/es_archiver/archives_metadata';
 import { registry } from '../../common/registry';
+import { createApmApiSupertest } from '../../common/apm_api_supertest';
+import { getServiceNodeIds } from './get_service_node_ids';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
+  const apmApiSupertest = createApmApiSupertest(supertest);
 
   const archiveName = 'apm_8.0.0';
   const { start, end } = archives[archiveName];
-  const serviceNodeIds = ['02950c4c5fbb0fda1cc98c47bf4024b473a8a17629db6530d95dcee68bd54c6c'];
 
   interface Response {
     status: number;
@@ -42,7 +44,9 @@ export default function ApiTest({ getService }: FtrProviderContext) {
                 end,
                 numBuckets: 20,
                 transactionType: 'request',
-                serviceNodeIds: JSON.stringify(serviceNodeIds),
+                serviceNodeIds: JSON.stringify(
+                  await getServiceNodeIds({ apmApiSupertest, start, end })
+                ),
               },
             })
           );
@@ -60,6 +64,11 @@ export default function ApiTest({ getService }: FtrProviderContext) {
     () => {
       describe('fetching data without comparison', () => {
         let response: Response;
+        let serviceNodeIds: string[];
+
+        beforeEach(async () => {
+          serviceNodeIds = await getServiceNodeIds({ apmApiSupertest, start, end });
+        });
 
         beforeEach(async () => {
           response = await supertest.get(
@@ -82,7 +91,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           expect(Object.values(response.body.previousPeriod)).to.eql(0);
         });
 
-        it('returns statistics for each service node', () => {
+        it('returns statistics for each service node', async () => {
           const item = response.body.currentPeriod[serviceNodeIds[0]];
 
           expect(item?.cpuUsage?.some((point) => isFiniteNumber(point.y))).to.be(true);
@@ -96,9 +105,9 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           expectSnapshot(Object.values(response.body.currentPeriod).length).toMatchInline(`1`);
 
           expectSnapshot(Object.keys(response.body.currentPeriod)).toMatchInline(`
-          Array [
-            "02950c4c5fbb0fda1cc98c47bf4024b473a8a17629db6530d95dcee68bd54c6c",
-          ]
+            Array [
+              "6dc7ea7824d0887cdfa0cb876bca5b27346c8b7cd196a9b1a6fe91968b99fbc2",
+            ]
           `);
 
           expectSnapshot(response.body).toMatch();
@@ -107,6 +116,11 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
       describe('fetching data with comparison', () => {
         let response: Response;
+        let serviceNodeIds: string[];
+
+        beforeEach(async () => {
+          serviceNodeIds = await getServiceNodeIds({ apmApiSupertest, start, end });
+        });
 
         beforeEach(async () => {
           response = await supertest.get(
@@ -158,14 +172,14 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           expectSnapshot(Object.values(response.body.previousPeriod).length).toMatchInline(`1`);
 
           expectSnapshot(Object.keys(response.body.currentPeriod)).toMatchInline(`
-          Array [
-            "02950c4c5fbb0fda1cc98c47bf4024b473a8a17629db6530d95dcee68bd54c6c",
-          ]
+            Array [
+              "6dc7ea7824d0887cdfa0cb876bca5b27346c8b7cd196a9b1a6fe91968b99fbc2",
+            ]
           `);
           expectSnapshot(Object.keys(response.body.previousPeriod)).toMatchInline(`
-          Array [
-            "02950c4c5fbb0fda1cc98c47bf4024b473a8a17629db6530d95dcee68bd54c6c",
-          ]
+            Array [
+              "6dc7ea7824d0887cdfa0cb876bca5b27346c8b7cd196a9b1a6fe91968b99fbc2",
+            ]
           `);
 
           expectSnapshot(response.body).toMatch();
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.ts b/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.ts
index 53a1b43c72d17..bfe2842d1ad93 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.ts
+++ b/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.ts
@@ -97,7 +97,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
           expectSnapshot(serviceNodeNames).toMatchInline(`
             Array [
-              "02950c4c5fbb0fda1cc98c47bf4024b473a8a17629db6530d95dcee68bd54c6c",
+              "6dc7ea7824d0887cdfa0cb876bca5b27346c8b7cd196a9b1a6fe91968b99fbc2",
             ]
           `);
 
@@ -113,11 +113,11 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
           expectSnapshot(values).toMatchInline(`
             Object {
-              "cpuUsage": 0.0120166666666667,
-              "errorRate": 0.0415094339622641,
-              "latency": 237995.266666667,
-              "memoryUsage": 0.941324615478516,
-              "throughput": 8.83333333333333,
+              "cpuUsage": 0.0022,
+              "errorRate": 0.0194300518134715,
+              "latency": 17660.3103448276,
+              "memoryUsage": 0.826234181722005,
+              "throughput": 25.7333333333333,
             }
           `);
         });
@@ -162,7 +162,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
           expectSnapshot(serviceNodeNames).toMatchInline(`
             Array [
-              "_service_node_name_missing_",
+              "399a87146c0036592f6ee78553324b10c00757e024143913c97993384751e15e",
             ]
           `);
 
@@ -172,10 +172,10 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
           expectSnapshot(values).toMatchInline(`
             Object {
-              "cpuUsage": 0.00111666666666667,
-              "errorRate": 0.00963391136801541,
-              "latency": 71576.4545454545,
-              "throughput": 17.3,
+              "cpuUsage": 0.00108333333333333,
+              "errorRate": 0.000779423226812159,
+              "latency": 44571.2584615385,
+              "throughput": 42.7666666666667,
             }
           `);
 
@@ -243,7 +243,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
           expectSnapshot(serviceNodeNames).toMatchInline(`
             Array [
-              "02950c4c5fbb0fda1cc98c47bf4024b473a8a17629db6530d95dcee68bd54c6c",
+              "6dc7ea7824d0887cdfa0cb876bca5b27346c8b7cd196a9b1a6fe91968b99fbc2",
             ]
           `);
 
@@ -259,11 +259,11 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
           expectSnapshot(values).toMatchInline(`
             Object {
-              "cpuUsage": 0.0120666666666667,
-              "errorRate": 0.0333333333333333,
-              "latency": 389086.636363636,
-              "memoryUsage": 0.939879608154297,
-              "throughput": 10,
+              "cpuUsage": 0.00203333333333333,
+              "errorRate": 0.023598820058997,
+              "latency": 16843.0833333333,
+              "memoryUsage": 0.82624028523763,
+              "throughput": 22.6,
             }
           `);
         });
diff --git a/x-pack/test/apm_api_integration/tests/services/__snapshots__/error_groups_detailed_statistics.snap b/x-pack/test/apm_api_integration/tests/services/__snapshots__/error_groups_detailed_statistics.snap
index 36529a41e080f..f406927fa7128 100644
--- a/x-pack/test/apm_api_integration/tests/services/__snapshots__/error_groups_detailed_statistics.snap
+++ b/x-pack/test/apm_api_integration/tests/services/__snapshots__/error_groups_detailed_statistics.snap
@@ -2,130 +2,130 @@
 
 exports[`APM API tests basic apm_8.0.0 Error groups detailed statistics when data is loaded returns the correct data 1`] = `
 Object {
-  "groupId": "051f95eabf120ebe2f8b0399fe3e54c5",
+  "groupId": "237562dfa8b8ab4eb94f22c87e42112b",
   "timeseries": Array [
     Object {
-      "x": 1607435820000,
+      "x": 1627373280000,
       "y": 0,
     },
     Object {
-      "x": 1607435880000,
+      "x": 1627373340000,
       "y": 0,
     },
     Object {
-      "x": 1607435940000,
+      "x": 1627373400000,
       "y": 0,
     },
     Object {
-      "x": 1607436000000,
+      "x": 1627373460000,
       "y": 0,
     },
     Object {
-      "x": 1607436060000,
+      "x": 1627373520000,
       "y": 0,
     },
     Object {
-      "x": 1607436120000,
+      "x": 1627373580000,
       "y": 0,
     },
     Object {
-      "x": 1607436180000,
+      "x": 1627373640000,
       "y": 0,
     },
     Object {
-      "x": 1607436240000,
+      "x": 1627373700000,
       "y": 0,
     },
     Object {
-      "x": 1607436300000,
-      "y": 1,
+      "x": 1627373760000,
+      "y": 0,
     },
     Object {
-      "x": 1607436360000,
+      "x": 1627373820000,
       "y": 0,
     },
     Object {
-      "x": 1607436420000,
+      "x": 1627373880000,
       "y": 0,
     },
     Object {
-      "x": 1607436480000,
+      "x": 1627373940000,
       "y": 0,
     },
     Object {
-      "x": 1607436540000,
+      "x": 1627374000000,
       "y": 0,
     },
     Object {
-      "x": 1607436600000,
-      "y": 1,
+      "x": 1627374060000,
+      "y": 0,
     },
     Object {
-      "x": 1607436660000,
+      "x": 1627374120000,
       "y": 0,
     },
     Object {
-      "x": 1607436720000,
+      "x": 1627374180000,
       "y": 0,
     },
     Object {
-      "x": 1607436780000,
+      "x": 1627374240000,
       "y": 0,
     },
     Object {
-      "x": 1607436840000,
-      "y": 0,
+      "x": 1627374300000,
+      "y": 1,
     },
     Object {
-      "x": 1607436900000,
+      "x": 1627374360000,
       "y": 0,
     },
     Object {
-      "x": 1607436960000,
+      "x": 1627374420000,
       "y": 0,
     },
     Object {
-      "x": 1607437020000,
+      "x": 1627374480000,
       "y": 0,
     },
     Object {
-      "x": 1607437080000,
+      "x": 1627374540000,
       "y": 0,
     },
     Object {
-      "x": 1607437140000,
+      "x": 1627374600000,
       "y": 0,
     },
     Object {
-      "x": 1607437200000,
-      "y": 2,
+      "x": 1627374660000,
+      "y": 0,
     },
     Object {
-      "x": 1607437260000,
+      "x": 1627374720000,
       "y": 0,
     },
     Object {
-      "x": 1607437320000,
-      "y": 1,
+      "x": 1627374780000,
+      "y": 0,
     },
     Object {
-      "x": 1607437380000,
-      "y": 0,
+      "x": 1627374840000,
+      "y": 1,
     },
     Object {
-      "x": 1607437440000,
+      "x": 1627374900000,
       "y": 0,
     },
     Object {
-      "x": 1607437500000,
-      "y": 0,
+      "x": 1627374960000,
+      "y": 1,
     },
     Object {
-      "x": 1607437560000,
+      "x": 1627375020000,
       "y": 0,
     },
     Object {
-      "x": 1607437620000,
+      "x": 1627375080000,
       "y": 0,
     },
   ],
@@ -134,70 +134,70 @@ Object {
 
 exports[`APM API tests basic apm_8.0.0 Error groups detailed statistics when data is loaded with previous data returns the correct data returns correct timeseries 1`] = `
 Object {
-  "groupId": "051f95eabf120ebe2f8b0399fe3e54c5",
+  "groupId": "237562dfa8b8ab4eb94f22c87e42112b",
   "timeseries": Array [
     Object {
-      "x": 1607436720000,
+      "x": 1627374180000,
       "y": 0,
     },
     Object {
-      "x": 1607436780000,
+      "x": 1627374240000,
       "y": 0,
     },
     Object {
-      "x": 1607436840000,
-      "y": 0,
+      "x": 1627374300000,
+      "y": 1,
     },
     Object {
-      "x": 1607436900000,
+      "x": 1627374360000,
       "y": 0,
     },
     Object {
-      "x": 1607436960000,
+      "x": 1627374420000,
       "y": 0,
     },
     Object {
-      "x": 1607437020000,
+      "x": 1627374480000,
       "y": 0,
     },
     Object {
-      "x": 1607437080000,
+      "x": 1627374540000,
       "y": 0,
     },
     Object {
-      "x": 1607437140000,
+      "x": 1627374600000,
       "y": 0,
     },
     Object {
-      "x": 1607437200000,
-      "y": 2,
+      "x": 1627374660000,
+      "y": 0,
     },
     Object {
-      "x": 1607437260000,
+      "x": 1627374720000,
       "y": 0,
     },
     Object {
-      "x": 1607437320000,
-      "y": 1,
+      "x": 1627374780000,
+      "y": 0,
     },
     Object {
-      "x": 1607437380000,
-      "y": 0,
+      "x": 1627374840000,
+      "y": 1,
     },
     Object {
-      "x": 1607437440000,
+      "x": 1627374900000,
       "y": 0,
     },
     Object {
-      "x": 1607437500000,
-      "y": 0,
+      "x": 1627374960000,
+      "y": 1,
     },
     Object {
-      "x": 1607437560000,
+      "x": 1627375020000,
       "y": 0,
     },
     Object {
-      "x": 1607437620000,
+      "x": 1627375080000,
       "y": 0,
     },
   ],
diff --git a/x-pack/test/apm_api_integration/tests/services/__snapshots__/throughput.snap b/x-pack/test/apm_api_integration/tests/services/__snapshots__/throughput.snap
index 256a1450716f8..1ceafc24afbd7 100644
--- a/x-pack/test/apm_api_integration/tests/services/__snapshots__/throughput.snap
+++ b/x-pack/test/apm_api_integration/tests/services/__snapshots__/throughput.snap
@@ -3,127 +3,127 @@
 exports[`APM API tests basic apm_8.0.0 Throughput when data is loaded has the correct throughput 1`] = `
 Array [
   Object {
-    "x": 1607435820000,
-    "y": 0,
+    "x": 1627373280000,
+    "y": 10,
   },
   Object {
-    "x": 1607435880000,
+    "x": 1627373340000,
     "y": 4,
   },
   Object {
-    "x": 1607435940000,
-    "y": 1,
-  },
-  Object {
-    "x": 1607436000000,
-    "y": 4,
+    "x": 1627373400000,
+    "y": 11,
   },
   Object {
-    "x": 1607436060000,
-    "y": 0,
+    "x": 1627373460000,
+    "y": 13,
   },
   Object {
-    "x": 1607436120000,
-    "y": 4,
+    "x": 1627373520000,
+    "y": 1,
   },
   Object {
-    "x": 1607436180000,
-    "y": 0,
+    "x": 1627373580000,
+    "y": 5,
   },
   Object {
-    "x": 1607436240000,
-    "y": 3,
+    "x": 1627373640000,
+    "y": 4,
   },
   Object {
-    "x": 1607436300000,
-    "y": 1,
+    "x": 1627373700000,
+    "y": 5,
   },
   Object {
-    "x": 1607436360000,
-    "y": 6,
+    "x": 1627373760000,
+    "y": 10,
   },
   Object {
-    "x": 1607436420000,
+    "x": 1627373820000,
     "y": 0,
   },
   Object {
-    "x": 1607436480000,
-    "y": 7,
+    "x": 1627373880000,
+    "y": 5,
   },
   Object {
-    "x": 1607436540000,
-    "y": 0,
+    "x": 1627373940000,
+    "y": 3,
   },
   Object {
-    "x": 1607436600000,
-    "y": 9,
+    "x": 1627374000000,
+    "y": 4,
   },
   Object {
-    "x": 1607436660000,
-    "y": 0,
+    "x": 1627374060000,
+    "y": 4,
   },
   Object {
-    "x": 1607436720000,
-    "y": 1,
+    "x": 1627374120000,
+    "y": 8,
   },
   Object {
-    "x": 1607436780000,
-    "y": 2,
+    "x": 1627374180000,
+    "y": 10,
   },
   Object {
-    "x": 1607436840000,
-    "y": 3,
+    "x": 1627374240000,
+    "y": 11,
   },
   Object {
-    "x": 1607436900000,
-    "y": 0,
+    "x": 1627374300000,
+    "y": 7,
   },
   Object {
-    "x": 1607436960000,
-    "y": 6,
+    "x": 1627374360000,
+    "y": 9,
   },
   Object {
-    "x": 1607437020000,
-    "y": 0,
+    "x": 1627374420000,
+    "y": 11,
   },
   Object {
-    "x": 1607437080000,
-    "y": 2,
+    "x": 1627374480000,
+    "y": 5,
   },
   Object {
-    "x": 1607437140000,
-    "y": 0,
+    "x": 1627374540000,
+    "y": 17,
   },
   Object {
-    "x": 1607437200000,
-    "y": 7,
+    "x": 1627374600000,
+    "y": 14,
   },
   Object {
-    "x": 1607437260000,
+    "x": 1627374660000,
     "y": 1,
   },
   Object {
-    "x": 1607437320000,
-    "y": 3,
+    "x": 1627374720000,
+    "y": 5,
   },
   Object {
-    "x": 1607437380000,
-    "y": 0,
+    "x": 1627374780000,
+    "y": 2,
   },
   Object {
-    "x": 1607437440000,
+    "x": 1627374840000,
     "y": 4,
   },
   Object {
-    "x": 1607437500000,
-    "y": 0,
+    "x": 1627374900000,
+    "y": 10,
   },
   Object {
-    "x": 1607437560000,
-    "y": 1,
+    "x": 1627374960000,
+    "y": 8,
   },
   Object {
-    "x": 1607437620000,
+    "x": 1627375020000,
+    "y": 2,
+  },
+  Object {
+    "x": 1627375080000,
     "y": 0,
   },
 ]
@@ -133,134 +133,134 @@ exports[`APM API tests basic apm_8.0.0 Throughput when data is loaded with time
 Object {
   "currentPeriod": Array [
     Object {
-      "x": 1607436720000,
-      "y": 0,
-    },
-    Object {
-      "x": 1607436780000,
-      "y": 2,
+      "x": 1627374180000,
+      "y": 10,
     },
     Object {
-      "x": 1607436840000,
-      "y": 3,
+      "x": 1627374240000,
+      "y": 11,
     },
     Object {
-      "x": 1607436900000,
-      "y": 0,
+      "x": 1627374300000,
+      "y": 7,
     },
     Object {
-      "x": 1607436960000,
-      "y": 6,
+      "x": 1627374360000,
+      "y": 9,
     },
     Object {
-      "x": 1607437020000,
-      "y": 0,
+      "x": 1627374420000,
+      "y": 11,
     },
     Object {
-      "x": 1607437080000,
-      "y": 2,
+      "x": 1627374480000,
+      "y": 5,
     },
     Object {
-      "x": 1607437140000,
-      "y": 0,
+      "x": 1627374540000,
+      "y": 17,
     },
     Object {
-      "x": 1607437200000,
-      "y": 7,
+      "x": 1627374600000,
+      "y": 14,
     },
     Object {
-      "x": 1607437260000,
+      "x": 1627374660000,
       "y": 1,
     },
     Object {
-      "x": 1607437320000,
-      "y": 3,
+      "x": 1627374720000,
+      "y": 5,
     },
     Object {
-      "x": 1607437380000,
-      "y": 0,
+      "x": 1627374780000,
+      "y": 2,
     },
     Object {
-      "x": 1607437440000,
+      "x": 1627374840000,
       "y": 4,
     },
     Object {
-      "x": 1607437500000,
-      "y": 0,
+      "x": 1627374900000,
+      "y": 10,
     },
     Object {
-      "x": 1607437560000,
-      "y": 1,
+      "x": 1627374960000,
+      "y": 8,
     },
     Object {
-      "x": 1607437620000,
+      "x": 1627375020000,
+      "y": 2,
+    },
+    Object {
+      "x": 1627375080000,
       "y": 0,
     },
   ],
   "previousPeriod": Array [
     Object {
-      "x": 1607436720000,
-      "y": 0,
+      "x": 1627374180000,
+      "y": 10,
     },
     Object {
-      "x": 1607436780000,
+      "x": 1627374240000,
       "y": 4,
     },
     Object {
-      "x": 1607436840000,
-      "y": 1,
+      "x": 1627374300000,
+      "y": 11,
     },
     Object {
-      "x": 1607436900000,
-      "y": 4,
+      "x": 1627374360000,
+      "y": 13,
     },
     Object {
-      "x": 1607436960000,
-      "y": 0,
+      "x": 1627374420000,
+      "y": 1,
     },
     Object {
-      "x": 1607437020000,
-      "y": 4,
+      "x": 1627374480000,
+      "y": 5,
     },
     Object {
-      "x": 1607437080000,
-      "y": 0,
+      "x": 1627374540000,
+      "y": 4,
     },
     Object {
-      "x": 1607437140000,
-      "y": 3,
+      "x": 1627374600000,
+      "y": 5,
     },
     Object {
-      "x": 1607437200000,
-      "y": 1,
+      "x": 1627374660000,
+      "y": 10,
     },
     Object {
-      "x": 1607437260000,
-      "y": 6,
+      "x": 1627374720000,
+      "y": 0,
     },
     Object {
-      "x": 1607437320000,
-      "y": 0,
+      "x": 1627374780000,
+      "y": 5,
     },
     Object {
-      "x": 1607437380000,
-      "y": 7,
+      "x": 1627374840000,
+      "y": 3,
     },
     Object {
-      "x": 1607437440000,
-      "y": 0,
+      "x": 1627374900000,
+      "y": 4,
     },
     Object {
-      "x": 1607437500000,
-      "y": 9,
+      "x": 1627374960000,
+      "y": 4,
     },
     Object {
-      "x": 1607437560000,
-      "y": 0,
+      "x": 1627375020000,
+      "y": 8,
     },
     Object {
-      "x": 1607437620000,
-      "y": 1,
+      "x": 1627375080000,
+      "y": 0,
     },
   ],
 }
diff --git a/x-pack/test/apm_api_integration/tests/services/error_groups_detailed_statistics.ts b/x-pack/test/apm_api_integration/tests/services/error_groups_detailed_statistics.ts
index fdbc98af03bf2..d8a4e3891b32b 100644
--- a/x-pack/test/apm_api_integration/tests/services/error_groups_detailed_statistics.ts
+++ b/x-pack/test/apm_api_integration/tests/services/error_groups_detailed_statistics.ts
@@ -12,28 +12,26 @@ import archives_metadata from '../../common/fixtures/es_archiver/archives_metada
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { registry } from '../../common/registry';
 import { APIReturnType } from '../../../../plugins/apm/public/services/rest/createCallApmApi';
+import { createApmApiSupertest } from '../../common/apm_api_supertest';
+import { getErrorGroupIds } from './get_error_group_ids';
 
 type ErrorGroupsDetailedStatistics = APIReturnType<'GET /api/apm/services/{serviceName}/error_groups/detailed_statistics'>;
 
 export default function ApiTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
+  const apmApiSupertest = createApmApiSupertest(supertest);
 
   const archiveName = 'apm_8.0.0';
   const metadata = archives_metadata[archiveName];
   const { start, end } = metadata;
-  const groupIds = [
-    '051f95eabf120ebe2f8b0399fe3e54c5',
-    '3bb34b98031a19c277bf59c3db82d3f3',
-    'b1c3ff13ec52de11187facf9c6a82538',
-    '9581687a53eac06aba50ba17cbd959c5',
-    '97c2eef51fec10d177ade955670a2f15',
-  ];
 
   registry.when(
     'Error groups detailed statistics when data is not loaded',
     { config: 'basic', archives: [] },
     () => {
       it('handles empty state', async () => {
+        const groupIds = await getErrorGroupIds({ apmApiSupertest, start, end });
+
         const response = await supertest.get(
           url.format({
             pathname: `/api/apm/services/opbeans-java/error_groups/detailed_statistics`,
@@ -58,6 +56,8 @@ export default function ApiTest({ getService }: FtrProviderContext) {
     { config: 'basic', archives: [archiveName] },
     () => {
       it('returns the correct data', async () => {
+        const groupIds = await getErrorGroupIds({ apmApiSupertest, start, end });
+
         const response = await supertest.get(
           url.format({
             pathname: `/api/apm/services/opbeans-java/error_groups/detailed_statistics`,
@@ -119,7 +119,11 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           status: number;
           body: ErrorGroupsDetailedStatistics;
         };
+        let groupIds: string[];
+
         before(async () => {
+          groupIds = await getErrorGroupIds({ apmApiSupertest, start, end });
+
           response = await supertest.get(
             url.format({
               pathname: `/api/apm/services/opbeans-java/error_groups/detailed_statistics`,
diff --git a/x-pack/test/apm_api_integration/tests/services/error_groups_main_statistics.ts b/x-pack/test/apm_api_integration/tests/services/error_groups_main_statistics.ts
index c95ba52e6052e..c07aa997d71a6 100644
--- a/x-pack/test/apm_api_integration/tests/services/error_groups_main_statistics.ts
+++ b/x-pack/test/apm_api_integration/tests/services/error_groups_main_statistics.ts
@@ -73,11 +73,12 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         expectSnapshot(errorGroupMainStatistics.error_groups.map(({ name }) => name))
           .toMatchInline(`
           Array [
-            "Could not write JSON: Null return value from advice does not match primitive return type for: public abstract double co.elastic.apm.opbeans.repositories.Numbers.getRevenue(); nested exception is com.fasterxml.jackson.databind.JsonMappingException: Null return value from advice does not match primitive return type for: public abstract double co.elastic.apm.opbeans.repositories.Numbers.getRevenue() (through reference chain: co.elastic.apm.opbeans.repositories.Stats[\\"numbers\\"]->com.sun.proxy.$Proxy132[\\"revenue\\"])",
-            "java.io.IOException: Connection reset by peer",
-            "java.io.IOException: Connection reset by peer",
-            "Could not write JSON: Unable to find co.elastic.apm.opbeans.model.Customer with id 7173; nested exception is com.fasterxml.jackson.databind.JsonMappingException: Unable to find co.elastic.apm.opbeans.model.Customer with id 7173 (through reference chain: co.elastic.apm.opbeans.model.Customer_$$_jvst101_3[\\"email\\"])",
+            "Response status 404",
+            "No converter found for return value of type: class com.sun.proxy.$Proxy162",
+            "Response status 404",
+            "Connection reset by peer",
             "Request method 'POST' not supported",
+            "java.io.IOException: Broken pipe",
           ]
         `);
 
@@ -89,10 +90,11 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
         expectSnapshot(occurences).toMatchInline(`
           Array [
-            5,
+            12,
+            11,
             3,
             2,
-            1,
+            2,
             1,
           ]
         `);
@@ -101,10 +103,10 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
         expectSnapshot(firstItem).toMatchInline(`
           Object {
-            "group_id": "051f95eabf120ebe2f8b0399fe3e54c5",
-            "last_seen": 1607437366098,
-            "name": "Could not write JSON: Null return value from advice does not match primitive return type for: public abstract double co.elastic.apm.opbeans.repositories.Numbers.getRevenue(); nested exception is com.fasterxml.jackson.databind.JsonMappingException: Null return value from advice does not match primitive return type for: public abstract double co.elastic.apm.opbeans.repositories.Numbers.getRevenue() (through reference chain: co.elastic.apm.opbeans.repositories.Stats[\\"numbers\\"]->com.sun.proxy.$Proxy132[\\"revenue\\"])",
-            "occurrences": 5,
+            "group_id": "d16d39e7fa133b8943cea035430a7b4e",
+            "last_seen": 1627374613628,
+            "name": "Response status 404",
+            "occurrences": 12,
           }
         `);
       });
diff --git a/x-pack/test/apm_api_integration/tests/services/get_error_group_ids.ts b/x-pack/test/apm_api_integration/tests/services/get_error_group_ids.ts
new file mode 100644
index 0000000000000..cdac09f9ef7dd
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/services/get_error_group_ids.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { take } from 'lodash';
+import { ApmApiSupertest } from '../../common/apm_api_supertest';
+
+export async function getErrorGroupIds({
+  apmApiSupertest,
+  start,
+  end,
+  serviceName = 'opbeans-java',
+  count = 5,
+}: {
+  apmApiSupertest: ApmApiSupertest;
+  start: string;
+  end: string;
+  serviceName?: string;
+  count?: number;
+}) {
+  const { body } = await apmApiSupertest({
+    endpoint: `GET /api/apm/services/{serviceName}/error_groups/main_statistics`,
+    params: {
+      path: { serviceName },
+      query: {
+        start,
+        end,
+        transactionType: 'request',
+      },
+    },
+  });
+
+  return take(body.error_groups.map((group) => group.group_id).sort(), count);
+}
diff --git a/x-pack/test/apm_api_integration/tests/services/service_details.ts b/x-pack/test/apm_api_integration/tests/services/service_details.ts
index 4c69df5a13419..1e2ee3cc757b6 100644
--- a/x-pack/test/apm_api_integration/tests/services/service_details.ts
+++ b/x-pack/test/apm_api_integration/tests/services/service_details.ts
@@ -51,6 +51,16 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
         expectSnapshot(response.body).toMatchInline(`
           Object {
+            "cloud": Object {
+              "availabilityZones": Array [
+                "europe-west1-c",
+              ],
+              "machineTypes": Array [
+                "n1-standard-4",
+              ],
+              "projectName": "elastic-observability",
+              "provider": "gcp",
+            },
             "container": Object {
               "isContainerized": true,
               "os": "Linux",
@@ -59,16 +69,16 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             },
             "service": Object {
               "agent": Object {
-                "ephemeral_id": "d27b2271-06b4-48c8-a02a-cfd963c0b4d0",
+                "ephemeral_id": "1f810e6f-e78a-4f49-9773-2142b9af9943",
                 "name": "java",
-                "version": "1.19.1-SNAPSHOT.null",
+                "version": "1.25.1-SNAPSHOT.UNKNOWN",
               },
               "runtime": Object {
                 "name": "Java",
-                "version": "11.0.9.1",
+                "version": "11.0.11",
               },
               "versions": Array [
-                "2020-12-08 03:35:36",
+                "2021-07-27 03:47:01",
               ],
             },
           }
@@ -106,15 +116,15 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             "service": Object {
               "agent": Object {
                 "name": "python",
-                "version": "5.10.0",
+                "version": "6.3.3",
               },
               "framework": "django",
               "runtime": Object {
                 "name": "CPython",
-                "version": "3.8.6",
+                "version": "3.9.6",
               },
               "versions": Array [
-                "2020-12-08 03:35:35",
+                "2021-07-27 03:46:59",
               ],
             },
           }
diff --git a/x-pack/test/apm_api_integration/tests/services/service_icons.ts b/x-pack/test/apm_api_integration/tests/services/service_icons.ts
index 94188b6321775..5f16ad1d57f2b 100644
--- a/x-pack/test/apm_api_integration/tests/services/service_icons.ts
+++ b/x-pack/test/apm_api_integration/tests/services/service_icons.ts
@@ -48,6 +48,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         expectSnapshot(response.body).toMatchInline(`
           Object {
             "agentName": "java",
+            "cloudProvider": "gcp",
             "containerType": "Kubernetes",
           }
         `);
diff --git a/x-pack/test/apm_api_integration/tests/services/throughput.ts b/x-pack/test/apm_api_integration/tests/services/throughput.ts
index e2cf9270d606d..b7432d19b9b46 100644
--- a/x-pack/test/apm_api_integration/tests/services/throughput.ts
+++ b/x-pack/test/apm_api_integration/tests/services/throughput.ts
@@ -68,13 +68,13 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       it('has the correct start date', () => {
         expectSnapshot(
           new Date(first(throughputResponse.currentPeriod)?.x ?? NaN).toISOString()
-        ).toMatchInline(`"2020-12-08T13:57:00.000Z"`);
+        ).toMatchInline(`"2021-07-27T08:08:00.000Z"`);
       });
 
       it('has the correct end date', () => {
         expectSnapshot(
           new Date(last(throughputResponse.currentPeriod)?.x ?? NaN).toISOString()
-        ).toMatchInline(`"2020-12-08T14:27:00.000Z"`);
+        ).toMatchInline(`"2021-07-27T08:38:00.000Z"`);
       });
 
       it('has the correct number of buckets', () => {
@@ -122,21 +122,21 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       it('has the correct start date', () => {
         expectSnapshot(
           new Date(first(throughputResponse.currentPeriod)?.x ?? NaN).toISOString()
-        ).toMatchInline(`"2020-12-08T14:12:00.000Z"`);
+        ).toMatchInline(`"2021-07-27T08:23:00.000Z"`);
 
         expectSnapshot(
           new Date(first(throughputResponse.previousPeriod)?.x ?? NaN).toISOString()
-        ).toMatchInline(`"2020-12-08T14:12:00.000Z"`);
+        ).toMatchInline(`"2021-07-27T08:23:00.000Z"`);
       });
 
       it('has the correct end date', () => {
         expectSnapshot(
           new Date(last(throughputResponse.currentPeriod)?.x ?? NaN).toISOString()
-        ).toMatchInline(`"2020-12-08T14:27:00.000Z"`);
+        ).toMatchInline(`"2021-07-27T08:38:00.000Z"`);
 
         expectSnapshot(
           new Date(last(throughputResponse.previousPeriod)?.x ?? NaN).toISOString()
-        ).toMatchInline(`"2020-12-08T14:27:00.000Z"`);
+        ).toMatchInline(`"2021-07-27T08:38:00.000Z"`);
       });
 
       it('has the correct number of buckets', () => {
diff --git a/x-pack/test/apm_api_integration/tests/services/top_services.ts b/x-pack/test/apm_api_integration/tests/services/top_services.ts
index 3dc469790fe0c..f9bd58f838aff 100644
--- a/x-pack/test/apm_api_integration/tests/services/top_services.ts
+++ b/x-pack/test/apm_api_integration/tests/services/top_services.ts
@@ -71,6 +71,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       it('returns the correct service names', () => {
         expectSnapshot(sortedItems.map((item) => item.serviceName)).toMatchInline(`
           Array [
+            "auditbeat",
             "kibana",
             "kibana-frontend",
             "opbeans-dotnet",
@@ -96,103 +97,104 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           )
         ).toMatchInline(`
           Array [
+            Object {},
             Object {
               "avgResponseTime": Object {
-                "value": 421616.337243402,
+                "value": 658101.291021672,
               },
               "transactionErrorRate": Object {
                 "value": 0,
               },
               "transactionsPerMinute": Object {
-                "value": 25.2,
+                "value": 75.3666666666667,
               },
             },
             Object {
               "avgResponseTime": Object {
-                "value": 2387606.33333333,
+                "value": 3588095,
               },
               "transactionErrorRate": Object {
                 "value": null,
               },
               "transactionsPerMinute": Object {
-                "value": 0.2,
+                "value": 0.133333333333333,
               },
             },
             Object {
               "avgResponseTime": Object {
-                "value": 633386.908045977,
+                "value": 586249.027027027,
               },
               "transactionErrorRate": Object {
-                "value": 0.027027027027027,
+                "value": 0.00337837837837838,
               },
               "transactionsPerMinute": Object {
-                "value": 2.46666666666667,
+                "value": 9.86666666666667,
               },
             },
             Object {
               "avgResponseTime": Object {
-                "value": 27891.1507936508,
+                "value": 218838.954459203,
               },
               "transactionErrorRate": Object {
-                "value": 0.0186915887850467,
+                "value": 0.0113851992409867,
               },
               "transactionsPerMinute": Object {
-                "value": 3.56666666666667,
+                "value": 17.5666666666667,
               },
             },
             Object {
               "avgResponseTime": Object {
-                "value": 237995.266666667,
+                "value": 17660.3103448276,
               },
               "transactionErrorRate": Object {
-                "value": 0.159420289855072,
+                "value": 0.0646551724137931,
               },
               "transactionsPerMinute": Object {
-                "value": 2.3,
+                "value": 7.73333333333333,
               },
             },
             Object {
               "avgResponseTime": Object {
-                "value": 24989.3157894737,
+                "value": 22281.4255319149,
               },
               "transactionErrorRate": Object {
-                "value": 0.0263157894736842,
+                "value": 0.00531914893617021,
               },
               "transactionsPerMinute": Object {
-                "value": 2.53333333333333,
+                "value": 6.26666666666667,
               },
             },
             Object {
               "avgResponseTime": Object {
-                "value": 29161.3703703704,
+                "value": 243948.538461538,
               },
               "transactionErrorRate": Object {
-                "value": 0.0392156862745098,
+                "value": 0.032051282051282,
               },
               "transactionsPerMinute": Object {
-                "value": 1.7,
+                "value": 5.2,
               },
             },
             Object {
               "avgResponseTime": Object {
-                "value": 71576.4545454545,
+                "value": 44571.2584615385,
               },
               "transactionErrorRate": Object {
-                "value": 0.0454545454545455,
+                "value": 0.00307692307692308,
               },
               "transactionsPerMinute": Object {
-                "value": 3.66666666666667,
+                "value": 10.8333333333333,
               },
             },
             Object {
               "avgResponseTime": Object {
-                "value": 2324991,
+                "value": 1381526.7037037,
               },
               "transactionErrorRate": Object {
                 "value": null,
               },
               "transactionsPerMinute": Object {
-                "value": 0.5,
+                "value": 1.8,
               },
             },
           ]
@@ -211,6 +213,9 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             Array [
               "production",
             ],
+            Array [
+              "production",
+            ],
             Array [
               "testing",
             ],
@@ -220,8 +225,12 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             Array [
               "testing",
             ],
-            Array [],
-            Array [],
+            Array [
+              "production",
+            ],
+            Array [
+              "production",
+            ],
             Array [
               "testing",
             ],
@@ -241,7 +250,9 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       });
 
       it('non-RUM services all report transaction error rates', () => {
-        const nonRumServices = sortedItems.filter((item) => item.agentName !== 'rum-js');
+        const nonRumServices = sortedItems.filter(
+          (item) => item.agentName !== 'rum-js' && item.serviceName !== 'auditbeat'
+        );
 
         expect(
           nonRumServices.every((item) => {
@@ -329,18 +340,19 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             expect(healthStatuses.filter(Boolean).length).to.be.greaterThan(0);
 
             expectSnapshot(healthStatuses).toMatchInline(`
-                          Array [
-                            "healthy",
-                            "healthy",
-                            "healthy",
-                            "healthy",
-                            "healthy",
-                            "healthy",
-                            "healthy",
-                            "healthy",
-                            "healthy",
-                          ]
-                      `);
+              Array [
+                undefined,
+                "healthy",
+                "healthy",
+                "healthy",
+                undefined,
+                "healthy",
+                undefined,
+                "healthy",
+                "healthy",
+                undefined,
+              ]
+            `);
           });
         });
       });
diff --git a/x-pack/test/apm_api_integration/tests/services/transaction_types.ts b/x-pack/test/apm_api_integration/tests/services/transaction_types.ts
index 1800e45960f6a..568d75c3e9cc7 100644
--- a/x-pack/test/apm_api_integration/tests/services/transaction_types.ts
+++ b/x-pack/test/apm_api_integration/tests/services/transaction_types.ts
@@ -51,8 +51,8 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         expectSnapshot(response.body).toMatchInline(`
           Object {
             "transactionTypes": Array [
-              "Worker",
               "request",
+              "Worker",
             ],
           }
         `);
diff --git a/x-pack/test/apm_api_integration/tests/settings/agent_configuration.ts b/x-pack/test/apm_api_integration/tests/settings/agent_configuration.ts
index 16c1cd92f2eae..34a789ad78ef0 100644
--- a/x-pack/test/apm_api_integration/tests/settings/agent_configuration.ts
+++ b/x-pack/test/apm_api_integration/tests/settings/agent_configuration.ts
@@ -391,6 +391,7 @@ export default function agentConfigurationTests({ getService }: FtrProviderConte
           Object {
             "serviceNames": Array [
               "ALL_OPTION_VALUE",
+              "auditbeat",
               "kibana",
               "kibana-frontend",
               "opbeans-dotnet",
diff --git a/x-pack/test/apm_api_integration/tests/traces/__snapshots__/top_traces.snap b/x-pack/test/apm_api_integration/tests/traces/__snapshots__/top_traces.snap
index e77f50e8969b6..9f35d078fe19d 100644
--- a/x-pack/test/apm_api_integration/tests/traces/__snapshots__/top_traces.snap
+++ b/x-pack/test/apm_api_integration/tests/traces/__snapshots__/top_traces.snap
@@ -3,7 +3,7 @@
 exports[`APM API tests basic apm_8.0.0 Top traces when data is loaded returns the correct buckets 1`] = `
 Array [
   Object {
-    "averageResponseTime": 1735,
+    "averageResponseTime": 1663,
     "impact": 0,
     "key": Object {
       "service.name": "opbeans-java",
@@ -15,44 +15,56 @@ Array [
     "transactionsPerMinute": 0.0333333333333333,
   },
   Object {
-    "averageResponseTime": 8383,
-    "impact": 0.0030743028761574,
+    "averageResponseTime": 1841.66666666667,
+    "impact": 0.00245766214004374,
     "key": Object {
-      "service.name": "opbeans-java",
-      "transaction.name": "APIRestController#product",
+      "service.name": "opbeans-node",
+      "transaction.name": "POST /api/orders",
     },
-    "serviceName": "opbeans-java",
-    "transactionName": "APIRestController#product",
+    "serviceName": "opbeans-node",
+    "transactionName": "POST /api/orders",
     "transactionType": "request",
-    "transactionsPerMinute": 0.0333333333333333,
+    "transactionsPerMinute": 0.1,
   },
   Object {
-    "averageResponseTime": 6495,
-    "impact": 0.00820831468889798,
+    "averageResponseTime": 3023,
+    "impact": 0.00278921107193467,
     "key": Object {
-      "service.name": "opbeans-python",
-      "transaction.name": "GET opbeans.views.stats",
+      "service.name": "kibana",
+      "transaction.name": "GET /translations/?.json",
     },
-    "serviceName": "opbeans-python",
-    "transactionName": "GET opbeans.views.stats",
+    "serviceName": "kibana",
+    "transactionName": "GET /translations/?.json",
     "transactionType": "request",
-    "transactionsPerMinute": 0.1,
+    "transactionsPerMinute": 0.0666666666666667,
   },
   Object {
-    "averageResponseTime": 19583,
-    "impact": 0.00825363383478598,
+    "averageResponseTime": 4447,
+    "impact": 0.00460159371689701,
     "key": Object {
-      "service.name": "opbeans-python",
-      "transaction.name": "GET opbeans.views.orders",
+      "service.name": "kibana",
+      "transaction.name": "GET /ui/#",
     },
-    "serviceName": "opbeans-python",
-    "transactionName": "GET opbeans.views.orders",
+    "serviceName": "kibana",
+    "transactionName": "GET /ui/#",
+    "transactionType": "request",
+    "transactionsPerMinute": 0.0666666666666667,
+  },
+  Object {
+    "averageResponseTime": 11007,
+    "impact": 0.00594624418347195,
+    "key": Object {
+      "service.name": "opbeans-node",
+      "transaction.name": "GET /api/orders/:id",
+    },
+    "serviceName": "opbeans-node",
+    "transactionName": "GET /api/orders/:id",
     "transactionType": "request",
     "transactionsPerMinute": 0.0333333333333333,
   },
   Object {
-    "averageResponseTime": 11151,
-    "impact": 0.00951100891304591,
+    "averageResponseTime": 4292.33333333333,
+    "impact": 0.00713625666453922,
     "key": Object {
       "service.name": "opbeans-node",
       "transaction.name": "GET /api/products/:id",
@@ -60,83 +72,83 @@ Array [
     "serviceName": "opbeans-node",
     "transactionName": "GET /api/products/:id",
     "transactionType": "request",
-    "transactionsPerMinute": 0.0666666666666667,
+    "transactionsPerMinute": 0.1,
   },
   Object {
-    "averageResponseTime": 3772.33333333333,
-    "impact": 0.00966453908074811,
+    "averageResponseTime": 15807,
+    "impact": 0.00900082167498151,
     "key": Object {
-      "service.name": "opbeans-java",
-      "transaction.name": "ResourceHttpRequestHandler",
+      "service.name": "opbeans-node",
+      "transaction.name": "POST /api",
     },
-    "serviceName": "opbeans-java",
-    "transactionName": "ResourceHttpRequestHandler",
+    "serviceName": "opbeans-node",
+    "transactionName": "POST /api",
     "transactionType": "request",
-    "transactionsPerMinute": 0.2,
+    "transactionsPerMinute": 0.0333333333333333,
   },
   Object {
-    "averageResponseTime": 5873,
-    "impact": 0.0100613128274002,
+    "averageResponseTime": 7135,
+    "impact": 0.0125632226744545,
     "key": Object {
-      "service.name": "opbeans-go",
-      "transaction.name": "GET /api/types/:id",
+      "service.name": "opbeans-node",
+      "transaction.name": "GET /api/products",
     },
-    "serviceName": "opbeans-go",
-    "transactionName": "GET /api/types/:id",
+    "serviceName": "opbeans-node",
+    "transactionName": "GET /api/products",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.1,
   },
   Object {
-    "averageResponseTime": 12847,
-    "impact": 0.0110796062890877,
+    "averageResponseTime": 2803,
+    "impact": 0.0132116840210896,
     "key": Object {
-      "service.name": "opbeans-python",
-      "transaction.name": "GET opbeans.views.customer",
+      "service.name": "kibana",
+      "transaction.name": "GET /#",
     },
-    "serviceName": "opbeans-python",
-    "transactionName": "GET opbeans.views.customer",
+    "serviceName": "kibana",
+    "transactionName": "GET /#",
     "transactionType": "request",
-    "transactionsPerMinute": 0.0666666666666667,
+    "transactionsPerMinute": 0.266666666666667,
   },
   Object {
-    "averageResponseTime": 12887,
-    "impact": 0.0111166015102208,
+    "averageResponseTime": 5675.8,
+    "impact": 0.0170012692214936,
     "key": Object {
       "service.name": "opbeans-node",
-      "transaction.name": "GET /api/orders/:id",
+      "transaction.name": "GET /api/customers/:id",
     },
     "serviceName": "opbeans-node",
-    "transactionName": "GET /api/orders/:id",
+    "transactionName": "GET /api/customers/:id",
     "transactionType": "request",
-    "transactionsPerMinute": 0.0333333333333333,
+    "transactionsPerMinute": 0.166666666666667,
   },
   Object {
-    "averageResponseTime": 12911,
-    "impact": 0.0111387986429006,
+    "averageResponseTime": 3316.33333333333,
+    "impact": 0.017935460837647,
     "key": Object {
-      "service.name": "opbeans-node",
-      "transaction.name": "GET /api/types",
+      "service.name": "opbeans-dotnet",
+      "transaction.name": "GET Products/Get",
     },
-    "serviceName": "opbeans-node",
-    "transactionName": "GET /api/types",
+    "serviceName": "opbeans-dotnet",
+    "transactionName": "GET Products/Get",
     "transactionType": "request",
-    "transactionsPerMinute": 0.0666666666666667,
+    "transactionsPerMinute": 0.3,
   },
   Object {
-    "averageResponseTime": 13071,
-    "impact": 0.0112867795274328,
+    "averageResponseTime": 11391,
+    "impact": 0.02068839880187,
     "key": Object {
       "service.name": "opbeans-go",
-      "transaction.name": "GET /api/types",
+      "transaction.name": "POST /api/orders",
     },
     "serviceName": "opbeans-go",
-    "transactionName": "GET /api/types",
+    "transactionName": "POST /api/orders",
     "transactionType": "request",
-    "transactionsPerMinute": 0.0333333333333333,
+    "transactionsPerMinute": 0.1,
   },
   Object {
-    "averageResponseTime": 9263,
-    "impact": 0.0120484186425097,
+    "averageResponseTime": 8389.4,
+    "impact": 0.025635541597494,
     "key": Object {
       "service.name": "opbeans-node",
       "transaction.name": "GET /api/products/top",
@@ -144,107 +156,95 @@ Array [
     "serviceName": "opbeans-node",
     "transactionName": "GET /api/products/top",
     "transactionType": "request",
-    "transactionsPerMinute": 0.1,
+    "transactionsPerMinute": 0.166666666666667,
   },
   Object {
-    "averageResponseTime": 29183,
-    "impact": 0.0126930603707533,
+    "averageResponseTime": 7017.66666666667,
+    "impact": 0.0257367244769003,
     "key": Object {
-      "service.name": "opbeans-python",
-      "transaction.name": "GET opbeans.views.product_type",
+      "service.name": "opbeans-node",
+      "transaction.name": "GET /api/orders",
     },
-    "serviceName": "opbeans-python",
-    "transactionName": "GET opbeans.views.product_type",
+    "serviceName": "opbeans-node",
+    "transactionName": "GET /api/orders",
     "transactionType": "request",
-    "transactionsPerMinute": 0.0333333333333333,
+    "transactionsPerMinute": 0.2,
   },
   Object {
-    "averageResponseTime": 15551,
-    "impact": 0.0135804832376827,
+    "averageResponseTime": 9023,
+    "impact": 0.0276515627418903,
     "key": Object {
-      "service.name": "opbeans-python",
-      "transaction.name": "GET opbeans.views.product",
+      "service.name": "opbeans-node",
+      "transaction.name": "GET /api/types/:id",
     },
-    "serviceName": "opbeans-python",
-    "transactionName": "GET opbeans.views.product",
+    "serviceName": "opbeans-node",
+    "transactionName": "GET /api/types/:id",
     "transactionType": "request",
-    "transactionsPerMinute": 0.0666666666666667,
+    "transactionsPerMinute": 0.166666666666667,
   },
   Object {
-    "averageResponseTime": 11977.6666666667,
-    "impact": 0.0158145321538554,
+    "averageResponseTime": 8169.66666666667,
+    "impact": 0.030135316064674,
     "key": Object {
-      "service.name": "opbeans-ruby",
-      "transaction.name": "Api::TypesController#index",
+      "service.name": "opbeans-python",
+      "transaction.name": "GET opbeans.views.order",
     },
-    "serviceName": "opbeans-ruby",
-    "transactionName": "Api::TypesController#index",
+    "serviceName": "opbeans-python",
+    "transactionName": "GET opbeans.views.order",
     "transactionType": "request",
-    "transactionsPerMinute": 0.1,
+    "transactionsPerMinute": 0.2,
   },
   Object {
-    "averageResponseTime": 18175,
-    "impact": 0.0160073697440115,
+    "averageResponseTime": 12351,
+    "impact": 0.0303809550046163,
     "key": Object {
-      "service.name": "opbeans-ruby",
-      "transaction.name": "Api::StatsController#index",
+      "service.name": "opbeans-java",
+      "transaction.name": "APIRestController#products",
     },
-    "serviceName": "opbeans-ruby",
-    "transactionName": "Api::StatsController#index",
+    "serviceName": "opbeans-java",
+    "transactionName": "APIRestController#products",
     "transactionType": "request",
-    "transactionsPerMinute": 0.0666666666666667,
+    "transactionsPerMinute": 0.133333333333333,
   },
   Object {
-    "averageResponseTime": 18431,
-    "impact": 0.0162441391592631,
+    "averageResponseTime": 4125.66666666667,
+    "impact": 0.0304471375169323,
     "key": Object {
-      "service.name": "opbeans-python",
-      "transaction.name": "GET opbeans.views.product_types",
+      "service.name": "opbeans-dotnet",
+      "transaction.name": "GET Products/Get {id}",
     },
-    "serviceName": "opbeans-python",
-    "transactionName": "GET opbeans.views.product_types",
+    "serviceName": "opbeans-dotnet",
+    "transactionName": "GET Products/Get {id}",
     "transactionType": "request",
-    "transactionsPerMinute": 0.0666666666666667,
+    "transactionsPerMinute": 0.4,
   },
   Object {
-    "averageResponseTime": 36863,
-    "impact": 0.0162446015995272,
+    "averageResponseTime": 17385.6666666667,
+    "impact": 0.0321328824700591,
     "key": Object {
       "service.name": "opbeans-python",
-      "transaction.name": "GET opbeans.views.product_customers",
+      "transaction.name": "GET opbeans.views.products",
     },
     "serviceName": "opbeans-python",
-    "transactionName": "GET opbeans.views.product_customers",
+    "transactionName": "GET opbeans.views.products",
     "transactionType": "request",
-    "transactionsPerMinute": 0.0333333333333333,
+    "transactionsPerMinute": 0.1,
   },
   Object {
-    "averageResponseTime": 6471,
-    "impact": 0.0171523718380797,
+    "averageResponseTime": 10161.6666666667,
+    "impact": 0.0377412140185328,
     "key": Object {
-      "service.name": "opbeans-go",
-      "transaction.name": "GET /api/orders/:id",
+      "service.name": "opbeans-node",
+      "transaction.name": "GET /api/types",
     },
-    "serviceName": "opbeans-go",
-    "transactionName": "GET /api/orders/:id",
+    "serviceName": "opbeans-node",
+    "transactionName": "GET /api/types",
     "transactionType": "request",
     "transactionsPerMinute": 0.2,
   },
   Object {
-    "averageResponseTime": 12969.6666666667,
-    "impact": 0.0171907543800053,
-    "key": Object {
-      "service.name": "opbeans-java",
-      "transaction.name": "APIRestController#topProducts",
-    },
-    "serviceName": "opbeans-java",
-    "transactionName": "APIRestController#topProducts",
-    "transactionType": "request",
-    "transactionsPerMinute": 0.1,
-  },
-  Object {
-    "averageResponseTime": 10015,
-    "impact": 0.0177230231240572,
+    "averageResponseTime": 8691,
+    "impact": 0.0431872711377701,
     "key": Object {
       "service.name": "opbeans-ruby",
       "transaction.name": "Api::TypesController#show",
@@ -252,143 +252,131 @@ Array [
     "serviceName": "opbeans-ruby",
     "transactionName": "Api::TypesController#show",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
-  },
-  Object {
-    "averageResponseTime": 8055,
-    "impact": 0.0178224477808523,
-    "key": Object {
-      "service.name": "opbeans-go",
-      "transaction.name": "GET /api/products",
-    },
-    "serviceName": "opbeans-go",
-    "transactionName": "GET /api/products",
-    "transactionType": "request",
-    "transactionsPerMinute": 0.166666666666667,
+    "transactionsPerMinute": 0.266666666666667,
   },
   Object {
-    "averageResponseTime": 14943,
-    "impact": 0.0199284007438518,
+    "averageResponseTime": 8269.22222222222,
+    "impact": 0.0463023038087991,
     "key": Object {
-      "service.name": "opbeans-node",
-      "transaction.name": "GET /api/products/:id/customers",
+      "service.name": "opbeans-java",
+      "transaction.name": "APIRestController#topProducts",
     },
-    "serviceName": "opbeans-node",
-    "transactionName": "GET /api/products/:id/customers",
+    "serviceName": "opbeans-java",
+    "transactionName": "APIRestController#topProducts",
     "transactionType": "request",
-    "transactionsPerMinute": 0.1,
+    "transactionsPerMinute": 0.3,
   },
   Object {
-    "averageResponseTime": 15145.6666666667,
-    "impact": 0.0202095644244631,
+    "averageResponseTime": 4663,
+    "impact": 0.0464200323162844,
     "key": Object {
-      "service.name": "opbeans-ruby",
-      "transaction.name": "Api::OrdersController#show",
+      "service.name": "opbeans-dotnet",
+      "transaction.name": "GET Types/Get {id}",
     },
-    "serviceName": "opbeans-ruby",
-    "transactionName": "Api::OrdersController#show",
+    "serviceName": "opbeans-dotnet",
+    "transactionName": "GET Types/Get {id}",
     "transactionType": "request",
-    "transactionsPerMinute": 0.1,
+    "transactionsPerMinute": 0.533333333333333,
   },
   Object {
-    "averageResponseTime": 11655,
-    "impact": 0.0207566312569682,
+    "averageResponseTime": 19159,
+    "impact": 0.0477105913064472,
     "key": Object {
-      "service.name": "opbeans-node",
-      "transaction.name": "GET /api/products",
+      "service.name": "opbeans-python",
+      "transaction.name": "GET opbeans.views.product_type",
     },
-    "serviceName": "opbeans-node",
-    "transactionName": "GET /api/products",
+    "serviceName": "opbeans-python",
+    "transactionName": "GET opbeans.views.product_type",
     "transactionType": "request",
-    "transactionsPerMinute": 0.1,
+    "transactionsPerMinute": 0.133333333333333,
   },
   Object {
-    "averageResponseTime": 24703,
-    "impact": 0.0220449898329271,
+    "averageResponseTime": 11066.4285714286,
+    "impact": 0.0482381422940433,
     "key": Object {
       "service.name": "opbeans-python",
-      "transaction.name": "GET opbeans.views.customers",
+      "transaction.name": "GET opbeans.views.product_types",
     },
     "serviceName": "opbeans-python",
-    "transactionName": "GET opbeans.views.customers",
+    "transactionName": "GET opbeans.views.product_types",
     "transactionType": "request",
-    "transactionsPerMinute": 0.0666666666666667,
+    "transactionsPerMinute": 0.233333333333333,
   },
   Object {
-    "averageResponseTime": 12367,
-    "impact": 0.0220736611293052,
+    "averageResponseTime": 4344.77777777778,
+    "impact": 0.0487096926942951,
     "key": Object {
-      "service.name": "opbeans-ruby",
-      "transaction.name": "Api::ProductsController#show",
+      "service.name": "opbeans-dotnet",
+      "transaction.name": "GET Customers/Get {id}",
     },
-    "serviceName": "opbeans-ruby",
-    "transactionName": "Api::ProductsController#show",
+    "serviceName": "opbeans-dotnet",
+    "transactionName": "GET Customers/Get {id}",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.6,
   },
   Object {
-    "averageResponseTime": 5019.8,
-    "impact": 0.0224112425221444,
+    "averageResponseTime": 8807.88888888889,
+    "impact": 0.0493874270752238,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "GET /translations/?.json",
+      "service.name": "opbeans-java",
+      "transaction.name": "APIRestController#orders",
     },
-    "serviceName": "kibana",
-    "transactionName": "GET /translations/?.json",
+    "serviceName": "opbeans-java",
+    "transactionName": "APIRestController#orders",
     "transactionType": "request",
     "transactionsPerMinute": 0.3,
   },
   Object {
-    "averageResponseTime": 8964.33333333333,
-    "impact": 0.0240704781899622,
+    "averageResponseTime": 27092.3333333333,
+    "impact": 0.0506639859185505,
     "key": Object {
       "service.name": "opbeans-python",
-      "transaction.name": "GET opbeans.views.order",
+      "transaction.name": "GET opbeans.views.product",
     },
     "serviceName": "opbeans-python",
-    "transactionName": "GET opbeans.views.order",
+    "transactionName": "GET opbeans.views.product",
     "transactionType": "request",
-    "transactionsPerMinute": 0.2,
+    "transactionsPerMinute": 0.1,
   },
   Object {
-    "averageResponseTime": 14959,
-    "impact": 0.02686824178815,
+    "averageResponseTime": 13780.3333333333,
+    "impact": 0.0515580862051278,
     "key": Object {
-      "service.name": "opbeans-node",
-      "transaction.name": "GET /api/types/:id",
+      "service.name": "opbeans-java",
+      "transaction.name": "APIRestController#customer",
     },
-    "serviceName": "opbeans-node",
-    "transactionName": "GET /api/types/:id",
+    "serviceName": "opbeans-java",
+    "transactionName": "APIRestController#customer",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.2,
   },
   Object {
-    "averageResponseTime": 15279,
-    "impact": 0.0274601653262789,
+    "averageResponseTime": 4711.88888888889,
+    "impact": 0.0529148277076066,
     "key": Object {
-      "service.name": "opbeans-ruby",
-      "transaction.name": "Api::ProductsController#index",
+      "service.name": "opbeans-dotnet",
+      "transaction.name": "GET Types/Get",
     },
-    "serviceName": "opbeans-ruby",
-    "transactionName": "Api::ProductsController#index",
+    "serviceName": "opbeans-dotnet",
+    "transactionName": "GET Types/Get",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.6,
   },
   Object {
-    "averageResponseTime": 20639,
-    "impact": 0.0278305799778737,
+    "averageResponseTime": 8536.6,
+    "impact": 0.0532661041191302,
     "key": Object {
       "service.name": "opbeans-java",
-      "transaction.name": "APIRestController#orders",
+      "transaction.name": "APIRestController#order",
     },
     "serviceName": "opbeans-java",
-    "transactionName": "APIRestController#orders",
+    "transactionName": "APIRestController#order",
     "transactionType": "request",
-    "transactionsPerMinute": 0.1,
+    "transactionsPerMinute": 0.333333333333333,
   },
   Object {
-    "averageResponseTime": 21247,
-    "impact": 0.0286740710197075,
+    "averageResponseTime": 11539,
+    "impact": 0.0576863322974688,
     "key": Object {
       "service.name": "opbeans-node",
       "transaction.name": "GET /api/stats",
@@ -396,143 +384,155 @@ Array [
     "serviceName": "opbeans-node",
     "transactionName": "GET /api/stats",
     "transactionType": "request",
-    "transactionsPerMinute": 0.1,
-  },
-  Object {
-    "averageResponseTime": 7703,
-    "impact": 0.0312572623353235,
-    "key": Object {
-      "service.name": "opbeans-go",
-      "transaction.name": "GET /api/customers/:id",
-    },
-    "serviceName": "opbeans-go",
-    "transactionName": "GET /api/customers/:id",
-    "transactionType": "request",
-    "transactionsPerMinute": 0.233333333333333,
+    "transactionsPerMinute": 0.266666666666667,
   },
   Object {
-    "averageResponseTime": 17391,
-    "impact": 0.0313668606779302,
+    "averageResponseTime": 6705.28571428571,
+    "impact": 0.0586803427228309,
     "key": Object {
-      "service.name": "opbeans-node",
-      "transaction.name": "GET /api/orders",
+      "service.name": "opbeans-dotnet",
+      "transaction.name": "GET Orders/Get {id}",
     },
-    "serviceName": "opbeans-node",
-    "transactionName": "GET /api/orders",
+    "serviceName": "opbeans-dotnet",
+    "transactionName": "GET Orders/Get {id}",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.466666666666667,
   },
   Object {
-    "averageResponseTime": 13380.3333333333,
-    "impact": 0.0363232954292321,
+    "averageResponseTime": 14147.5714285714,
+    "impact": 0.061963377155893,
     "key": Object {
       "service.name": "opbeans-java",
-      "transaction.name": "APIRestController#customerWhoBought",
+      "transaction.name": "APIRestController#product",
     },
     "serviceName": "opbeans-java",
-    "transactionName": "APIRestController#customerWhoBought",
+    "transactionName": "APIRestController#product",
     "transactionType": "request",
-    "transactionsPerMinute": 0.2,
+    "transactionsPerMinute": 0.233333333333333,
   },
   Object {
-    "averageResponseTime": 14516.3333333333,
-    "impact": 0.0394752882697689,
+    "averageResponseTime": 23499.8,
+    "impact": 0.0737145913138545,
     "key": Object {
       "service.name": "opbeans-java",
-      "transaction.name": "APIRestController#customer",
+      "transaction.name": "APIRestController#stats",
     },
     "serviceName": "opbeans-java",
-    "transactionName": "APIRestController#customer",
+    "transactionName": "APIRestController#stats",
     "transactionType": "request",
     "transactionsPerMinute": 0.166666666666667,
   },
   Object {
-    "averageResponseTime": 24439,
-    "impact": 0.044403976605221,
+    "averageResponseTime": 7849.66666666667,
+    "impact": 0.0738711384102944,
     "key": Object {
       "service.name": "opbeans-node",
-      "transaction.name": "GET /api/customers/:id",
+      "transaction.name": "GET /api/products/:id/customers",
     },
     "serviceName": "opbeans-node",
-    "transactionName": "GET /api/customers/:id",
+    "transactionName": "GET /api/products/:id/customers",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.5,
+  },
+  Object {
+    "averageResponseTime": 24527,
+    "impact": 0.0769829892297698,
+    "key": Object {
+      "service.name": "opbeans-python",
+      "transaction.name": "GET opbeans.views.stats",
+    },
+    "serviceName": "opbeans-python",
+    "transactionName": "GET opbeans.views.stats",
+    "transactionType": "request",
+    "transactionsPerMinute": 0.166666666666667,
   },
   Object {
-    "averageResponseTime": 12435,
-    "impact": 0.0452012236206385,
+    "averageResponseTime": 6202.27272727273,
+    "impact": 0.0857744450725207,
     "key": Object {
       "service.name": "opbeans-go",
-      "transaction.name": "GET /api/orders",
+      "transaction.name": "GET /api/types",
     },
     "serviceName": "opbeans-go",
-    "transactionName": "GET /api/orders",
+    "transactionName": "GET /api/types",
     "transactionType": "request",
-    "transactionsPerMinute": 0.266666666666667,
+    "transactionsPerMinute": 0.733333333333333,
   },
   Object {
-    "averageResponseTime": 21362.2,
-    "impact": 0.0485913731972194,
+    "averageResponseTime": 28056.6,
+    "impact": 0.0882136524735533,
     "key": Object {
-      "service.name": "opbeans-ruby",
-      "transaction.name": "Api::ProductsController#top",
+      "service.name": "opbeans-python",
+      "transaction.name": "POST opbeans.views.post_order",
     },
-    "serviceName": "opbeans-ruby",
-    "transactionName": "Api::ProductsController#top",
+    "serviceName": "opbeans-python",
+    "transactionName": "POST opbeans.views.post_order",
     "transactionType": "request",
     "transactionsPerMinute": 0.166666666666667,
   },
   Object {
-    "averageResponseTime": 18473.6666666667,
-    "impact": 0.0504554699020615,
+    "averageResponseTime": 16429.2222222222,
+    "impact": 0.0930373394288954,
     "key": Object {
-      "service.name": "opbeans-ruby",
-      "transaction.name": "Api::CustomersController#show",
+      "service.name": "opbeans-python",
+      "transaction.name": "GET opbeans.views.customer",
     },
-    "serviceName": "opbeans-ruby",
-    "transactionName": "Api::CustomersController#show",
+    "serviceName": "opbeans-python",
+    "transactionName": "GET opbeans.views.customer",
     "transactionType": "request",
-    "transactionsPerMinute": 0.2,
+    "transactionsPerMinute": 0.3,
   },
   Object {
-    "averageResponseTime": 17531,
-    "impact": 0.0640539883100466,
+    "averageResponseTime": 21415,
+    "impact": 0.107964677807716,
     "key": Object {
-      "service.name": "opbeans-java",
-      "transaction.name": "APIRestController#order",
+      "service.name": "opbeans-python",
+      "transaction.name": "GET opbeans.views.orders",
     },
-    "serviceName": "opbeans-java",
-    "transactionName": "APIRestController#order",
+    "serviceName": "opbeans-python",
+    "transactionName": "GET opbeans.views.orders",
     "transactionType": "request",
     "transactionsPerMinute": 0.266666666666667,
   },
   Object {
-    "averageResponseTime": 143359,
-    "impact": 0.0654926399718585,
+    "averageResponseTime": 12255,
+    "impact": 0.108123770385399,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager markTaskAsRunning apm-telemetry-task",
+      "service.name": "opbeans-ruby",
+      "transaction.name": "Api::TypesController#index",
     },
-    "serviceName": "kibana",
-    "transactionName": "taskManager markTaskAsRunning apm-telemetry-task",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 0.0333333333333333,
+    "serviceName": "opbeans-ruby",
+    "transactionName": "Api::TypesController#index",
+    "transactionType": "request",
+    "transactionsPerMinute": 0.466666666666667,
   },
   Object {
-    "averageResponseTime": 15001.1818181818,
-    "impact": 0.0755063214520499,
+    "averageResponseTime": 6930.84615384615,
+    "impact": 0.11361691890763,
     "key": Object {
-      "service.name": "opbeans-ruby",
-      "transaction.name": "Api::CustomersController#index",
+      "service.name": "opbeans-go",
+      "transaction.name": "GET /api/types/:id",
     },
-    "serviceName": "opbeans-ruby",
-    "transactionName": "Api::CustomersController#index",
+    "serviceName": "opbeans-go",
+    "transactionName": "GET /api/types/:id",
     "transactionType": "request",
-    "transactionsPerMinute": 0.3,
+    "transactionsPerMinute": 0.866666666666667,
+  },
+  Object {
+    "averageResponseTime": 9878.57894736842,
+    "impact": 0.118383968905318,
+    "key": Object {
+      "service.name": "opbeans-java",
+      "transaction.name": "APIRestController#customerWhoBought",
+    },
+    "serviceName": "opbeans-java",
+    "transactionName": "APIRestController#customerWhoBought",
+    "transactionType": "request",
+    "transactionsPerMinute": 0.633333333333333,
   },
   Object {
-    "averageResponseTime": 33330.2,
-    "impact": 0.0762637986047493,
+    "averageResponseTime": 26915.5714285714,
+    "impact": 0.118839610047801,
     "key": Object {
       "service.name": "opbeans-node",
       "transaction.name": "GET /api/customers",
@@ -540,359 +540,299 @@ Array [
     "serviceName": "opbeans-node",
     "transactionName": "GET /api/customers",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.233333333333333,
   },
   Object {
-    "averageResponseTime": 34226.2,
-    "impact": 0.0783355309882007,
+    "averageResponseTime": 23791,
+    "impact": 0.120060804674094,
     "key": Object {
       "service.name": "opbeans-ruby",
-      "transaction.name": "Api::OrdersController#index",
+      "transaction.name": "Api::ProductsController#index",
     },
     "serviceName": "opbeans-ruby",
-    "transactionName": "Api::OrdersController#index",
+    "transactionName": "Api::ProductsController#index",
     "transactionType": "request",
-    "transactionsPerMinute": 0.166666666666667,
+    "transactionsPerMinute": 0.266666666666667,
   },
   Object {
-    "averageResponseTime": 21549.2222222222,
-    "impact": 0.0888847182942931,
+    "averageResponseTime": 19154.2,
+    "impact": 0.120833358231322,
     "key": Object {
-      "service.name": "opbeans-go",
-      "transaction.name": "GET /api/customers",
+      "service.name": "opbeans-ruby",
+      "transaction.name": "Api::StatsController#index",
     },
-    "serviceName": "opbeans-go",
-    "transactionName": "GET /api/customers",
+    "serviceName": "opbeans-ruby",
+    "transactionName": "Api::StatsController#index",
     "transactionType": "request",
-    "transactionsPerMinute": 0.266666666666667,
+    "transactionsPerMinute": 0.333333333333333,
   },
   Object {
-    "averageResponseTime": 48267.8,
-    "impact": 0.110802537054575,
+    "averageResponseTime": 22043.4444444444,
+    "impact": 0.125191858489519,
     "key": Object {
-      "service.name": "opbeans-java",
-      "transaction.name": "APIRestController#customers",
+      "service.name": "opbeans-ruby",
+      "transaction.name": "Api::ProductsController#show",
     },
-    "serviceName": "opbeans-java",
-    "transactionName": "APIRestController#customers",
+    "serviceName": "opbeans-ruby",
+    "transactionName": "Api::ProductsController#show",
     "transactionType": "request",
-    "transactionsPerMinute": 0.166666666666667,
+    "transactionsPerMinute": 0.3,
   },
   Object {
-    "averageResponseTime": 43113,
-    "impact": 0.118820788794902,
+    "averageResponseTime": 11293.4,
+    "impact": 0.14267740551748,
     "key": Object {
       "service.name": "opbeans-go",
-      "transaction.name": "GET /api/stats",
+      "transaction.name": "GET /api/orders/:id",
     },
     "serviceName": "opbeans-go",
-    "transactionName": "GET /api/stats",
+    "transactionName": "GET /api/orders/:id",
     "transactionType": "request",
-    "transactionsPerMinute": 0.166666666666667,
+    "transactionsPerMinute": 0.666666666666667,
   },
   Object {
-    "averageResponseTime": 28824.6,
-    "impact": 0.132494222525682,
+    "averageResponseTime": 27255.8888888889,
+    "impact": 0.15504526250654,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "GET /node_modules/@kbn/ui-framework/dist/#",
+      "service.name": "opbeans-python",
+      "transaction.name": "GET opbeans.views.customers",
     },
-    "serviceName": "kibana",
-    "transactionName": "GET /node_modules/@kbn/ui-framework/dist/#",
+    "serviceName": "opbeans-python",
+    "transactionName": "GET opbeans.views.customers",
     "transactionType": "request",
-    "transactionsPerMinute": 0.333333333333333,
+    "transactionsPerMinute": 0.3,
   },
   Object {
-    "averageResponseTime": 93055,
-    "impact": 0.171327181268528,
+    "averageResponseTime": 14720.4117647059,
+    "impact": 0.158191477322794,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "GET /internal/security/session",
+      "service.name": "opbeans-java",
+      "transaction.name": "ResourceHttpRequestHandler",
     },
-    "serviceName": "kibana",
-    "transactionName": "GET /internal/security/session",
+    "serviceName": "opbeans-java",
+    "transactionName": "ResourceHttpRequestHandler",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.566666666666667,
   },
   Object {
-    "averageResponseTime": 93439,
-    "impact": 0.172037489514283,
+    "averageResponseTime": 31295,
+    "impact": 0.158263387167907,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "GET /api/licensing/info",
+      "service.name": "opbeans-ruby",
+      "transaction.name": "Api::ProductsController#top",
     },
-    "serviceName": "kibana",
-    "transactionName": "GET /api/licensing/info",
+    "serviceName": "opbeans-ruby",
+    "transactionName": "Api::ProductsController#top",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.266666666666667,
   },
   Object {
-    "averageResponseTime": 95871,
-    "impact": 0.176536108404063,
+    "averageResponseTime": 18362.7333333333,
+    "impact": 0.174224190931355,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "POST /internal/licensing/feature_usage/register",
+      "service.name": "opbeans-ruby",
+      "transaction.name": "Api::CustomersController#show",
     },
-    "serviceName": "kibana",
-    "transactionName": "POST /internal/licensing/feature_usage/register",
+    "serviceName": "opbeans-ruby",
+    "transactionName": "Api::CustomersController#show",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.5,
   },
   Object {
-    "averageResponseTime": 96767,
-    "impact": 0.178193494310824,
+    "averageResponseTime": 28754.2,
+    "impact": 0.181924908061513,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "GET /internal/security_oss/display_insecure_cluster_alert",
+      "service.name": "opbeans-ruby",
+      "transaction.name": "Api::OrdersController#index",
     },
-    "serviceName": "kibana",
-    "transactionName": "GET /internal/security_oss/display_insecure_cluster_alert",
+    "serviceName": "opbeans-ruby",
+    "transactionName": "Api::OrdersController#index",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
-  },
-  Object {
-    "averageResponseTime": 89087,
-    "impact": 0.205184745209241,
-    "key": Object {
-      "service.name": "kibana-frontend",
-      "transaction.name": "POST /internal/licensing/feature_usage/register",
-    },
-    "serviceName": "kibana-frontend",
-    "transactionName": "POST /internal/licensing/feature_usage/register",
-    "transactionType": "http-request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.333333333333333,
   },
   Object {
-    "averageResponseTime": 37503,
-    "impact": 0.207312432864657,
+    "averageResponseTime": 20176.0666666667,
+    "impact": 0.191533463383243,
     "key": Object {
-      "service.name": "opbeans-java",
-      "transaction.name": "DispatcherServlet#doGet",
+      "service.name": "opbeans-ruby",
+      "transaction.name": "Api::OrdersController#show",
     },
-    "serviceName": "opbeans-java",
-    "transactionName": "DispatcherServlet#doGet",
+    "serviceName": "opbeans-ruby",
+    "transactionName": "Api::OrdersController#show",
     "transactionType": "request",
-    "transactionsPerMinute": 0.3,
+    "transactionsPerMinute": 0.5,
   },
   Object {
-    "averageResponseTime": 43191,
-    "impact": 0.218903498085909,
+    "averageResponseTime": 10190.8709677419,
+    "impact": 0.19998191562851,
     "key": Object {
       "service.name": "opbeans-go",
-      "transaction.name": "GET /api/products/:id",
+      "transaction.name": "GET /api/customers/:id",
     },
     "serviceName": "opbeans-go",
-    "transactionName": "GET /api/products/:id",
+    "transactionName": "GET /api/customers/:id",
     "transactionType": "request",
-    "transactionsPerMinute": 0.266666666666667,
+    "transactionsPerMinute": 1.03333333333333,
   },
   Object {
-    "averageResponseTime": 43542.2727272727,
-    "impact": 0.220690367266636,
+    "averageResponseTime": 10022.7714285714,
+    "impact": 0.222178512066812,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "GET /38640/bundles/plugin/ml/#",
+      "service.name": "opbeans-go",
+      "transaction.name": "GET /api/products",
     },
-    "serviceName": "kibana",
-    "transactionName": "GET /38640/bundles/plugin/ml/#",
+    "serviceName": "opbeans-go",
+    "transactionName": "GET /api/products",
     "transactionType": "request",
-    "transactionsPerMinute": 0.0666666666666667,
+    "transactionsPerMinute": 1.16666666666667,
   },
   Object {
-    "averageResponseTime": 43953.2857142857,
-    "impact": 0.283758432933486,
+    "averageResponseTime": 17653.1538461538,
+    "impact": 0.291024234133263,
     "key": Object {
       "service.name": "opbeans-go",
-      "transaction.name": "GET /api/products/:id/customers",
+      "transaction.name": "GET /api/customers",
     },
     "serviceName": "opbeans-go",
-    "transactionName": "GET /api/products/:id/customers",
+    "transactionName": "GET /api/customers",
     "transactionType": "request",
-    "transactionsPerMinute": 0.433333333333333,
+    "transactionsPerMinute": 0.866666666666667,
   },
   Object {
-    "averageResponseTime": 102740.333333333,
-    "impact": 0.284265267463009,
+    "averageResponseTime": 17307.6896551724,
+    "impact": 0.31835061164637,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager run alerts_invalidate_api_keys",
-    },
-    "serviceName": "kibana",
-    "transactionName": "taskManager run alerts_invalidate_api_keys",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 0.2,
-  },
-  Object {
-    "averageResponseTime": 91135,
-    "impact": 0.336353613937831,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "GET /internal/security/me",
+      "service.name": "opbeans-ruby",
+      "transaction.name": "Api::CustomersController#index",
     },
-    "serviceName": "kibana",
-    "transactionName": "GET /internal/security/me",
+    "serviceName": "opbeans-ruby",
+    "transactionName": "Api::CustomersController#index",
     "transactionType": "request",
-    "transactionsPerMinute": 0.2,
+    "transactionsPerMinute": 0.966666666666667,
   },
   Object {
-    "averageResponseTime": 37317.9565217391,
-    "impact": 0.396116156596443,
+    "averageResponseTime": 67469.2222222222,
+    "impact": 0.385360405366361,
     "key": Object {
-      "service.name": "opbeans-node",
-      "transaction.name": "GET /api",
+      "service.name": "opbeans-python",
+      "transaction.name": "GET opbeans.views.top_products",
     },
-    "serviceName": "opbeans-node",
-    "transactionName": "GET /api",
+    "serviceName": "opbeans-python",
+    "transactionName": "GET opbeans.views.top_products",
     "transactionType": "request",
-    "transactionsPerMinute": 0.5,
+    "transactionsPerMinute": 0.3,
   },
   Object {
-    "averageResponseTime": 146772.333333333,
-    "impact": 0.406438285732831,
+    "averageResponseTime": 36009.6666666667,
+    "impact": 0.480166854259089,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager markTaskAsRunning alerts_invalidate_api_keys",
+      "service.name": "opbeans-java",
+      "transaction.name": "DispatcherServlet#doGet",
     },
-    "serviceName": "kibana",
-    "transactionName": "taskManager markTaskAsRunning alerts_invalidate_api_keys",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 0.2,
+    "serviceName": "opbeans-java",
+    "transactionName": "DispatcherServlet#doGet",
+    "transactionType": "request",
+    "transactionsPerMinute": 0.7,
   },
   Object {
-    "averageResponseTime": 269823,
-    "impact": 0.498305743730977,
+    "averageResponseTime": 46288.7777777778,
+    "impact": 0.529164186333834,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "GET /api/spaces/space",
+      "service.name": "opbeans-dotnet",
+      "transaction.name": "GET Customers/Get",
     },
-    "serviceName": "kibana",
-    "transactionName": "GET /api/spaces/space",
+    "serviceName": "opbeans-dotnet",
+    "transactionName": "GET Customers/Get",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.6,
   },
   Object {
-    "averageResponseTime": 269823,
-    "impact": 0.498305743730977,
+    "averageResponseTime": 26866.8918918919,
+    "impact": 0.631541532813331,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "GET /api/saved_objects_tagging/tags",
+      "service.name": "opbeans-go",
+      "transaction.name": "GET /api/products/:id/customers",
     },
-    "serviceName": "kibana",
-    "transactionName": "GET /api/saved_objects_tagging/tags",
+    "serviceName": "opbeans-go",
+    "transactionName": "GET /api/products/:id/customers",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 1.23333333333333,
   },
   Object {
-    "averageResponseTime": 270335,
-    "impact": 0.499252821391983,
+    "averageResponseTime": 323583,
+    "impact": 0.822616173202537,
     "key": Object {
       "service.name": "kibana",
-      "transaction.name": "GET /internal/spaces/_active_space",
+      "transaction.name": "GET /bootstrap.js",
     },
     "serviceName": "kibana",
-    "transactionName": "GET /internal/spaces/_active_space",
+    "transactionName": "GET /bootstrap.js",
     "transactionType": "request",
     "transactionsPerMinute": 0.133333333333333,
   },
   Object {
-    "averageResponseTime": 1097727,
-    "impact": 0.506830830000827,
+    "averageResponseTime": 108756.333333333,
+    "impact": 0.829453335821032,
     "key": Object {
-      "service.name": "kibana-frontend",
-      "transaction.name": "GET /internal/security/me",
-    },
-    "serviceName": "kibana-frontend",
-    "transactionName": "GET /internal/security/me",
-    "transactionType": "http-request",
-    "transactionsPerMinute": 0.0333333333333333,
-  },
-  Object {
-    "averageResponseTime": 269515.8,
-    "impact": 0.622372454882547,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "GET /spaces/enter",
+      "service.name": "opbeans-dotnet",
+      "transaction.name": "GET Stats/Get",
     },
-    "serviceName": "kibana",
-    "transactionName": "GET /spaces/enter",
+    "serviceName": "opbeans-dotnet",
+    "transactionName": "GET Stats/Get",
     "transactionType": "request",
-    "transactionsPerMinute": 0.166666666666667,
-  },
-  Object {
-    "averageResponseTime": 1441791,
-    "impact": 0.665939877049897,
-    "key": Object {
-      "service.name": "kibana-frontend",
-      "transaction.name": "GET /api/ml/ml_capabilities",
-    },
-    "serviceName": "kibana-frontend",
-    "transactionName": "GET /api/ml/ml_capabilities",
-    "transactionType": "http-request",
-    "transactionsPerMinute": 0.0333333333333333,
+    "transactionsPerMinute": 0.4,
   },
   Object {
-    "averageResponseTime": 27717.641509434,
-    "impact": 0.678538599606761,
+    "averageResponseTime": 25740.5384615385,
+    "impact": 0.850728468049396,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "GET /ui/#",
+      "service.name": "opbeans-node",
+      "transaction.name": "GET /api",
     },
-    "serviceName": "kibana",
-    "transactionName": "GET /ui/#",
+    "serviceName": "opbeans-node",
+    "transactionName": "GET /api",
     "transactionType": "request",
-    "transactionsPerMinute": 0.566666666666667,
+    "transactionsPerMinute": 1.73333333333333,
   },
   Object {
-    "averageResponseTime": 1482751,
-    "impact": 0.684881430270024,
+    "averageResponseTime": 41030.8888888889,
+    "impact": 0.938931938597978,
     "key": Object {
-      "service.name": "kibana-frontend",
-      "transaction.name": "POST /api/ml/jobs/jobs",
-    },
-    "serviceName": "kibana-frontend",
-    "transactionName": "POST /api/ml/jobs/jobs",
-    "transactionType": "http-request",
-    "transactionsPerMinute": 0.0333333333333333,
-  },
-  Object {
-    "averageResponseTime": 756175,
-    "impact": 0.698569199648993,
-    "key": Object {
-      "service.name": "kibana-frontend",
-      "transaction.name": "/app/ml",
+      "service.name": "opbeans-go",
+      "transaction.name": "GET /api/stats",
     },
-    "serviceName": "kibana-frontend",
-    "transactionName": "/app/ml",
-    "transactionType": "page-load",
-    "transactionsPerMinute": 0.0666666666666667,
+    "serviceName": "opbeans-go",
+    "transactionName": "GET /api/stats",
+    "transactionType": "request",
+    "transactionsPerMinute": 1.2,
   },
   Object {
-    "averageResponseTime": 1687551,
-    "impact": 0.779589196370662,
+    "averageResponseTime": 71788.7142857143,
+    "impact": 0.958310050930052,
     "key": Object {
-      "service.name": "kibana-frontend",
-      "transaction.name": "/app/ml/*?{query}",
+      "service.name": "opbeans-dotnet",
+      "transaction.name": "GET Products/Customerwhobought {id}",
     },
-    "serviceName": "kibana-frontend",
-    "transactionName": "/app/ml/*?{query}",
-    "transactionType": "route-change",
-    "transactionsPerMinute": 0.0333333333333333,
+    "serviceName": "opbeans-dotnet",
+    "transactionName": "GET Products/Customerwhobought {id}",
+    "transactionType": "request",
+    "transactionsPerMinute": 0.7,
   },
   Object {
-    "averageResponseTime": 960511,
-    "impact": 0.887555587285124,
+    "averageResponseTime": 109507.571428571,
+    "impact": 0.974564857777058,
     "key": Object {
-      "service.name": "opbeans-rum",
-      "transaction.name": "/customers",
+      "service.name": "opbeans-python",
+      "transaction.name": "GET opbeans.views.product_customers",
     },
-    "serviceName": "opbeans-rum",
-    "transactionName": "/customers",
-    "transactionType": "page-load",
-    "transactionsPerMinute": 0.0666666666666667,
+    "serviceName": "opbeans-python",
+    "transactionName": "GET opbeans.views.product_customers",
+    "transactionType": "request",
+    "transactionsPerMinute": 0.466666666666667,
   },
   Object {
-    "averageResponseTime": 32237.9333333333,
-    "impact": 0.893684770546344,
+    "averageResponseTime": 33396.3333333333,
+    "impact": 1.27408781741014,
     "key": Object {
       "service.name": "opbeans-python",
       "transaction.name": "opbeans.tasks.sync_orders",
@@ -900,419 +840,311 @@ Array [
     "serviceName": "opbeans-python",
     "transactionName": "opbeans.tasks.sync_orders",
     "transactionType": "celery",
-    "transactionsPerMinute": 1.53333333333333,
-  },
-  Object {
-    "averageResponseTime": 791892.333333333,
-    "impact": 1.09780636558827,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "POST /api/ui_counters/_report",
-    },
-    "serviceName": "kibana",
-    "transactionName": "POST /api/ui_counters/_report",
-    "transactionType": "request",
-    "transactionsPerMinute": 0.1,
-  },
-  Object {
-    "averageResponseTime": 93253.6206896552,
-    "impact": 1.24980030673293,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager run endpoint:user-artifact-packager",
-    },
-    "serviceName": "kibana",
-    "transactionName": "taskManager run endpoint:user-artifact-packager",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 0.966666666666667,
-  },
-  Object {
-    "averageResponseTime": 699391,
-    "impact": 1.29290390131532,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "POST /api/core/capabilities",
-    },
-    "serviceName": "kibana",
-    "transactionName": "POST /api/core/capabilities",
-    "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 2,
   },
   Object {
-    "averageResponseTime": 286719,
-    "impact": 1.32510176714795,
+    "averageResponseTime": 40130.6226415094,
+    "impact": 1.3524523665845,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "GET /bootstrap.js",
+      "service.name": "opbeans-go",
+      "transaction.name": "GET /api/products/:id",
     },
-    "serviceName": "kibana",
-    "transactionName": "GET /bootstrap.js",
+    "serviceName": "opbeans-go",
+    "transactionName": "GET /api/products/:id",
     "transactionType": "request",
-    "transactionsPerMinute": 0.333333333333333,
+    "transactionsPerMinute": 1.76666666666667,
   },
   Object {
-    "averageResponseTime": 1458175,
-    "impact": 1.34783533053422,
+    "averageResponseTime": 1105919,
+    "impact": 1.40648975152024,
     "key": Object {
       "service.name": "kibana-frontend",
-      "transaction.name": "GET /api/apm/services/kibana/transactions/groups/overview",
+      "transaction.name": "GET /api/ml/datafeeds/_stats",
     },
     "serviceName": "kibana-frontend",
-    "transactionName": "GET /api/apm/services/kibana/transactions/groups/overview",
+    "transactionName": "GET /api/ml/datafeeds/_stats",
     "transactionType": "http-request",
     "transactionsPerMinute": 0.0666666666666667,
   },
   Object {
-    "averageResponseTime": 81863,
-    "impact": 1.36204057056879,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "GET /plugins/kibanaOverview/assets/#",
-    },
-    "serviceName": "kibana",
-    "transactionName": "GET /plugins/kibanaOverview/assets/#",
-    "transactionType": "request",
-    "transactionsPerMinute": 0.266666666666667,
-  },
-  Object {
-    "averageResponseTime": 3129343,
-    "impact": 1.44633186971915,
+    "averageResponseTime": 1105919,
+    "impact": 1.40648975152024,
     "key": Object {
       "service.name": "kibana-frontend",
-      "transaction.name": "/services/:serviceName/transactions",
+      "transaction.name": "GET /api/ml/calendars",
     },
     "serviceName": "kibana-frontend",
-    "transactionName": "/services/:serviceName/transactions",
-    "transactionType": "route-change",
-    "transactionsPerMinute": 0.0333333333333333,
-  },
-  Object {
-    "averageResponseTime": 1609983,
-    "impact": 1.48823959377841,
-    "key": Object {
-      "service.name": "kibana-frontend",
-      "transaction.name": "/app/dev_tools",
-    },
-    "serviceName": "kibana-frontend",
-    "transactionName": "/app/dev_tools",
-    "transactionType": "route-change",
+    "transactionName": "GET /api/ml/calendars",
+    "transactionType": "http-request",
     "transactionsPerMinute": 0.0666666666666667,
   },
   Object {
-    "averageResponseTime": 1193300.33333333,
-    "impact": 1.65468803026002,
-    "key": Object {
-      "service.name": "kibana-frontend",
-      "transaction.name": "/app/kibanaOverview",
-    },
-    "serviceName": "kibana-frontend",
-    "transactionName": "/app/kibanaOverview",
-    "transactionType": "route-change",
-    "transactionsPerMinute": 0.1,
-  },
-  Object {
-    "averageResponseTime": 145265.75862069,
-    "impact": 1.94732300406412,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager markTaskAsRunning endpoint:user-artifact-packager",
-    },
-    "serviceName": "kibana",
-    "transactionName": "taskManager markTaskAsRunning endpoint:user-artifact-packager",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 0.966666666666667,
-  },
-  Object {
-    "averageResponseTime": 759124.333333333,
-    "impact": 2.10549560957826,
-    "key": Object {
-      "service.name": "opbeans-rum",
-      "transaction.name": "/dashboard",
-    },
-    "serviceName": "opbeans-rum",
-    "transactionName": "/dashboard",
-    "transactionType": "page-load",
-    "transactionsPerMinute": 0.166666666666667,
-  },
-  Object {
-    "averageResponseTime": 5144575,
-    "impact": 2.37825628814941,
+    "averageResponseTime": 1155071,
+    "impact": 1.46904749854636,
     "key": Object {
       "service.name": "kibana-frontend",
-      "transaction.name": "/app/observability-overview",
+      "transaction.name": "POST /api/ml/results/anomaly_search",
     },
     "serviceName": "kibana-frontend",
-    "transactionName": "/app/observability-overview",
-    "transactionType": "route-change",
-    "transactionsPerMinute": 0.0333333333333333,
+    "transactionName": "POST /api/ml/results/anomaly_search",
+    "transactionType": "http-request",
+    "transactionsPerMinute": 0.0666666666666667,
   },
   Object {
-    "averageResponseTime": 1501183,
-    "impact": 2.7760275184513,
+    "averageResponseTime": 1343487,
+    "impact": 1.7088521954798,
     "key": Object {
       "service.name": "kibana-frontend",
-      "transaction.name": "POST /api/ml/jobs/jobs_summary",
+      "transaction.name": "/app/space_selector",
     },
     "serviceName": "kibana-frontend",
-    "transactionName": "POST /api/ml/jobs/jobs_summary",
-    "transactionType": "http-request",
-    "transactionsPerMinute": 0.1,
+    "transactionName": "/app/space_selector",
+    "transactionType": "route-change",
+    "transactionsPerMinute": 0.0666666666666667,
   },
   Object {
-    "averageResponseTime": 6684671,
-    "impact": 3.0904586892262,
+    "averageResponseTime": 1474559,
+    "impact": 1.87567285421611,
     "key": Object {
       "service.name": "kibana-frontend",
-      "transaction.name": "/services/:serviceName/overview",
+      "transaction.name": "POST /api/core/capabilities",
     },
     "serviceName": "kibana-frontend",
-    "transactionName": "/services/:serviceName/overview",
-    "transactionType": "route-change",
-    "transactionsPerMinute": 0.0333333333333333,
+    "transactionName": "POST /api/core/capabilities",
+    "transactionType": "http-request",
+    "transactionsPerMinute": 0.0666666666666667,
   },
   Object {
-    "averageResponseTime": 214655,
-    "impact": 3.17568134306859,
+    "averageResponseTime": 240087.615384615,
+    "impact": 1.98514191143839,
     "key": Object {
-      "service.name": "opbeans-ruby",
-      "transaction.name": "Rack",
+      "service.name": "opbeans-dotnet",
+      "transaction.name": "GET Products/Top",
     },
-    "serviceName": "opbeans-ruby",
-    "transactionName": "Rack",
+    "serviceName": "opbeans-dotnet",
+    "transactionName": "GET Products/Top",
     "transactionType": "request",
-    "transactionsPerMinute": 0.633333333333333,
+    "transactionsPerMinute": 0.433333333333333,
   },
   Object {
-    "averageResponseTime": 6914047,
-    "impact": 3.19653138725892,
+    "averageResponseTime": 1949695,
+    "impact": 2.48039774213523,
     "key": Object {
       "service.name": "kibana-frontend",
-      "transaction.name": "POST /api/ml/jobs/force_start_datafeeds",
+      "transaction.name": "/app/ml",
     },
     "serviceName": "kibana-frontend",
-    "transactionName": "POST /api/ml/jobs/force_start_datafeeds",
-    "transactionType": "http-request",
-    "transactionsPerMinute": 0.0333333333333333,
+    "transactionName": "/app/ml",
+    "transactionType": "route-change",
+    "transactionsPerMinute": 0.0666666666666667,
   },
   Object {
-    "averageResponseTime": 1953791,
-    "impact": 3.61324417078093,
+    "averageResponseTime": 3309567,
+    "impact": 4.21116207652443,
     "key": Object {
-      "service.name": "opbeans-rum",
-      "transaction.name": "/products",
+      "service.name": "kibana-frontend",
+      "transaction.name": "/spaces/space_selector",
     },
-    "serviceName": "opbeans-rum",
-    "transactionName": "/products",
+    "serviceName": "kibana-frontend",
+    "transactionName": "/spaces/space_selector",
     "transactionType": "page-load",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.0666666666666667,
   },
   Object {
-    "averageResponseTime": 146412.037037037,
-    "impact": 3.6553660046825,
+    "averageResponseTime": 281667.266666667,
+    "impact": 5.37628229651714,
     "key": Object {
       "service.name": "kibana",
-      "transaction.name": "taskManager markTaskAsRunning alerting:monitoring_alert_elasticsearch_version_mismatch",
+      "transaction.name": "search_sessions_cleanup",
     },
     "serviceName": "kibana",
-    "transactionName": "taskManager markTaskAsRunning alerting:monitoring_alert_elasticsearch_version_mismatch",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.23333333333333,
+    "transactionName": "search_sessions_cleanup",
+    "transactionType": "taskManager run",
+    "transactionsPerMinute": 1,
   },
   Object {
-    "averageResponseTime": 146412.037037037,
-    "impact": 3.6553660046825,
+    "averageResponseTime": 1425407,
+    "impact": 5.44146188922347,
     "key": Object {
       "service.name": "kibana",
-      "transaction.name": "taskManager markTaskAsRunning alerting:monitoring_alert_cpu_usage",
+      "transaction.name": "GET /api/fleet/agent_policies",
     },
     "serviceName": "kibana",
-    "transactionName": "taskManager markTaskAsRunning alerting:monitoring_alert_cpu_usage",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.23333333333333,
+    "transactionName": "GET /api/fleet/agent_policies",
+    "transactionType": "request",
+    "transactionsPerMinute": 0.2,
   },
   Object {
-    "averageResponseTime": 149692.62962963,
-    "impact": 3.73728822235955,
+    "averageResponseTime": 883096.6,
+    "impact": 5.61870629364955,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager markTaskAsRunning alerting:monitoring_alert_license_expiration",
+      "service.name": "opbeans-rum",
+      "transaction.name": "/customers",
     },
-    "serviceName": "kibana",
-    "transactionName": "taskManager markTaskAsRunning alerting:monitoring_alert_license_expiration",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.16666666666667,
+    "serviceName": "opbeans-rum",
+    "transactionName": "/customers",
+    "transactionType": "page-load",
+    "transactionsPerMinute": 0.333333333333333,
   },
   Object {
-    "averageResponseTime": 149692.62962963,
-    "impact": 3.73728822235955,
+    "averageResponseTime": 389119,
+    "impact": 5.9419124107668,
     "key": Object {
       "service.name": "kibana",
-      "transaction.name": "taskManager markTaskAsRunning alerting:monitoring_alert_cluster_health",
+      "transaction.name": "endpoint:user-artifact-packager",
     },
     "serviceName": "kibana",
-    "transactionName": "taskManager markTaskAsRunning alerting:monitoring_alert_cluster_health",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.16666666666667,
+    "transactionName": "endpoint:user-artifact-packager",
+    "transactionType": "taskManager run",
+    "transactionsPerMinute": 0.8,
   },
   Object {
-    "averageResponseTime": 1802239,
-    "impact": 4.16633706236838,
+    "averageResponseTime": 90976.5384615385,
+    "impact": 6.01999759337476,
     "key": Object {
-      "service.name": "kibana-frontend",
-      "transaction.name": "GET /internal/spaces/_active_space",
+      "service.name": "opbeans-ruby",
+      "transaction.name": "Rack",
     },
-    "serviceName": "kibana-frontend",
-    "transactionName": "GET /internal/spaces/_active_space",
-    "transactionType": "http-request",
-    "transactionsPerMinute": 0.133333333333333,
+    "serviceName": "opbeans-ruby",
+    "transactionName": "Rack",
+    "transactionType": "request",
+    "transactionsPerMinute": 3.46666666666667,
   },
   Object {
-    "averageResponseTime": 169224.481481481,
-    "impact": 4.22503321777783,
+    "averageResponseTime": 2555903,
+    "impact": 6.50494486140806,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager markTaskAsRunning alerting:monitoring_alert_jvm_memory_usage",
+      "service.name": "kibana-frontend",
+      "transaction.name": "/app/ml/*?{query}",
     },
-    "serviceName": "kibana",
-    "transactionName": "taskManager markTaskAsRunning alerting:monitoring_alert_jvm_memory_usage",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.33333333333333,
+    "serviceName": "kibana-frontend",
+    "transactionName": "/app/ml/*?{query}",
+    "transactionType": "route-change",
+    "transactionsPerMinute": 0.133333333333333,
   },
   Object {
-    "averageResponseTime": 171304.890909091,
-    "impact": 4.35620301138695,
+    "averageResponseTime": 2801663,
+    "impact": 7.13052233166922,
     "key": Object {
       "service.name": "kibana",
-      "transaction.name": "taskManager markTaskAsRunning alerting:monitoring_alert_nodes_changed",
+      "transaction.name": "POST /api/fleet/setup",
     },
     "serviceName": "kibana",
-    "transactionName": "taskManager markTaskAsRunning alerting:monitoring_alert_nodes_changed",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.16666666666667,
+    "transactionName": "POST /api/fleet/setup",
+    "transactionType": "request",
+    "transactionsPerMinute": 0.133333333333333,
   },
   Object {
-    "averageResponseTime": 173706.636363636,
-    "impact": 4.41728952052186,
+    "averageResponseTime": 3022847,
+    "impact": 7.69354205490426,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager markTaskAsRunning alerting:monitoring_alert_missing_monitoring_data",
+      "service.name": "kibana-frontend",
+      "transaction.name": "/app/home",
     },
-    "serviceName": "kibana",
-    "transactionName": "taskManager markTaskAsRunning alerting:monitoring_alert_missing_monitoring_data",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.36666666666667,
+    "serviceName": "kibana-frontend",
+    "transactionName": "/app/home",
+    "transactionType": "route-change",
+    "transactionsPerMinute": 0.133333333333333,
   },
   Object {
-    "averageResponseTime": 173725.254545455,
-    "impact": 4.41776305935237,
+    "averageResponseTime": 758271,
+    "impact": 7.71960014638808,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager markTaskAsRunning alerting:monitoring_alert_kibana_version_mismatch",
+      "service.name": "kibana-frontend",
+      "transaction.name": "POST /internal/bsearch",
     },
-    "serviceName": "kibana",
-    "transactionName": "taskManager markTaskAsRunning alerting:monitoring_alert_kibana_version_mismatch",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.36666666666667,
+    "serviceName": "kibana-frontend",
+    "transactionName": "POST /internal/bsearch",
+    "transactionType": "http-request",
+    "transactionsPerMinute": 0.533333333333333,
   },
   Object {
-    "averageResponseTime": 194504.142857143,
-    "impact": 5.03620430954926,
+    "averageResponseTime": 700221.608695652,
+    "impact": 10.2477472984187,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager markTaskAsRunning alerting:monitoring_alert_disk_usage",
+      "service.name": "opbeans-go",
+      "transaction.name": "GET /api/orders",
     },
-    "serviceName": "kibana",
-    "transactionName": "taskManager markTaskAsRunning alerting:monitoring_alert_disk_usage",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 0.9,
+    "serviceName": "opbeans-go",
+    "transactionName": "GET /api/orders",
+    "transactionType": "request",
+    "transactionsPerMinute": 0.766666666666667,
   },
   Object {
-    "averageResponseTime": 194559,
-    "impact": 5.03762492604077,
+    "averageResponseTime": 1617099.8,
+    "impact": 10.2896847382662,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager markTaskAsRunning alerting:monitoring_alert_logstash_version_mismatch",
+      "service.name": "kibana-frontend",
+      "transaction.name": "POST /api/ui_counters/_report",
     },
-    "serviceName": "kibana",
-    "transactionName": "taskManager markTaskAsRunning alerting:monitoring_alert_logstash_version_mismatch",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 0.9,
+    "serviceName": "kibana-frontend",
+    "transactionName": "POST /api/ui_counters/_report",
+    "transactionType": "http-request",
+    "transactionsPerMinute": 0.333333333333333,
   },
   Object {
-    "averageResponseTime": 2806010,
-    "impact": 5.18964568872075,
+    "averageResponseTime": 1181285.4,
+    "impact": 11.274966072076,
     "key": Object {
-      "service.name": "kibana-frontend",
-      "transaction.name": "/app/kibana_overview",
+      "service.name": "opbeans-rum",
+      "transaction.name": "/products",
     },
-    "serviceName": "kibana-frontend",
-    "transactionName": "/app/kibana_overview",
+    "serviceName": "opbeans-rum",
+    "transactionName": "/products",
     "transactionType": "page-load",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.5,
   },
   Object {
-    "averageResponseTime": 164575.780487805,
-    "impact": 6.23992799324149,
+    "averageResponseTime": 110265.729411765,
+    "impact": 11.9278139192629,
     "key": Object {
       "service.name": "kibana",
-      "transaction.name": "taskManager markTaskAsRunning alerting:monitoring_alert_thread_pool_write_rejections",
+      "transaction.name": "GET /login",
     },
     "serviceName": "kibana",
-    "transactionName": "taskManager markTaskAsRunning alerting:monitoring_alert_thread_pool_write_rejections",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.46666666666667,
+    "transactionName": "GET /login",
+    "transactionType": "request",
+    "transactionsPerMinute": 5.66666666666667,
   },
   Object {
-    "averageResponseTime": 164588.268292683,
-    "impact": 6.24040153207199,
+    "averageResponseTime": 1282528.88235294,
+    "impact": 13.8737178737119,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager markTaskAsRunning alerting:monitoring_alert_thread_pool_search_rejections",
+      "service.name": "opbeans-rum",
+      "transaction.name": "/dashboard",
     },
-    "serviceName": "kibana",
-    "transactionName": "taskManager markTaskAsRunning alerting:monitoring_alert_thread_pool_search_rejections",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.46666666666667,
+    "serviceName": "opbeans-rum",
+    "transactionName": "/dashboard",
+    "transactionType": "page-load",
+    "transactionsPerMinute": 0.566666666666667,
   },
   Object {
-    "averageResponseTime": 1500252.09090909,
-    "impact": 7.6307443716881,
+    "averageResponseTime": 2090324.33333333,
+    "impact": 15.9615858625601,
     "key": Object {
       "service.name": "kibana-frontend",
-      "transaction.name": "POST /api/ui_counters/_report",
+      "transaction.name": "GET /api/saved_objects_tagging/tags",
     },
     "serviceName": "kibana-frontend",
-    "transactionName": "POST /api/ui_counters/_report",
+    "transactionName": "GET /api/saved_objects_tagging/tags",
     "transactionType": "http-request",
-    "transactionsPerMinute": 0.266666666666667,
+    "transactionsPerMinute": 0.4,
   },
   Object {
-    "averageResponseTime": 92454.8222222222,
-    "impact": 7.69506750023189,
+    "averageResponseTime": 3178495,
+    "impact": 16.1805405226327,
     "key": Object {
       "service.name": "kibana",
-      "transaction.name": "GET /login",
+      "transaction.name": "POST /api/fleet/agents/setup",
     },
     "serviceName": "kibana",
-    "transactionName": "GET /login",
+    "transactionName": "POST /api/fleet/agents/setup",
     "transactionType": "request",
-    "transactionsPerMinute": 3.33333333333333,
-  },
-  Object {
-    "averageResponseTime": 1048831,
-    "impact": 7.75954462138365,
-    "key": Object {
-      "service.name": "kibana-frontend",
-      "transaction.name": "GET /api/saved_objects_tagging/tags",
-    },
-    "serviceName": "kibana-frontend",
-    "transactionName": "GET /api/saved_objects_tagging/tags",
-    "transactionType": "http-request",
-    "transactionsPerMinute": 0.366666666666667,
+    "transactionsPerMinute": 0.266666666666667,
   },
   Object {
-    "averageResponseTime": 5727231,
-    "impact": 10.5932065323979,
+    "averageResponseTime": 2187433.66666667,
+    "impact": 16.7031558220988,
     "key": Object {
       "service.name": "opbeans-rum",
       "transaction.name": "/orders",
@@ -1320,59 +1152,83 @@ Array [
     "serviceName": "opbeans-rum",
     "transactionName": "/orders",
     "transactionType": "page-load",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.4,
   },
   Object {
-    "averageResponseTime": 6905855,
-    "impact": 12.7733793080345,
+    "averageResponseTime": 1838079,
+    "impact": 18.7141241862279,
     "key": Object {
       "service.name": "kibana-frontend",
-      "transaction.name": "/services",
+      "transaction.name": "GET /api/uptime/monitor/status",
     },
     "serviceName": "kibana-frontend",
-    "transactionName": "/services",
-    "transactionType": "route-change",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionName": "GET /api/uptime/monitor/status",
+    "transactionType": "http-request",
+    "transactionsPerMinute": 0.533333333333333,
   },
   Object {
-    "averageResponseTime": 2556275.36363636,
-    "impact": 13.0025688649162,
+    "averageResponseTime": 1981439,
+    "impact": 20.1738049501706,
     "key": Object {
       "service.name": "kibana-frontend",
-      "transaction.name": "POST /../api/console/proxy",
+      "transaction.name": "POST /api/ml/jobs/jobs_summary",
     },
     "serviceName": "kibana-frontend",
-    "transactionName": "POST /../api/console/proxy",
+    "transactionName": "POST /api/ml/jobs/jobs_summary",
     "transactionType": "http-request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.533333333333333,
+  },
+  Object {
+    "averageResponseTime": 4153343,
+    "impact": 21.1434551200379,
+    "key": Object {
+      "service.name": "kibana-frontend",
+      "transaction.name": "Click - div",
+    },
+    "serviceName": "kibana-frontend",
+    "transactionName": "Click - div",
+    "transactionType": "user-interaction",
+    "transactionsPerMinute": 0.266666666666667,
   },
   Object {
-    "averageResponseTime": 895713.232558139,
-    "impact": 17.8103938129266,
+    "averageResponseTime": 969496.6,
+    "impact": 24.6772958199653,
     "key": Object {
       "service.name": "opbeans-node",
-      "transaction.name": "Process completed order",
+      "transaction.name": "Update shipping status",
     },
     "serviceName": "opbeans-node",
-    "transactionName": "Process completed order",
+    "transactionName": "Update shipping status",
     "transactionType": "Worker",
-    "transactionsPerMinute": 1.06666666666667,
+    "transactionsPerMinute": 1.33333333333333,
   },
   Object {
-    "averageResponseTime": 1010587.09756098,
-    "impact": 19.1599804047412,
+    "averageResponseTime": 1012115.8372093,
+    "impact": 27.6944019184681,
     "key": Object {
       "service.name": "opbeans-node",
-      "transaction.name": "Update shipping status",
+      "transaction.name": "Process completed order",
     },
     "serviceName": "opbeans-node",
-    "transactionName": "Update shipping status",
+    "transactionName": "Process completed order",
     "transactionType": "Worker",
-    "transactionsPerMinute": 1.16666666666667,
+    "transactionsPerMinute": 1.43333333333333,
+  },
+  Object {
+    "averageResponseTime": 277193.418604651,
+    "impact": 30.339339568146,
+    "key": Object {
+      "service.name": "kibana",
+      "transaction.name": "search_sessions_monitor",
+    },
+    "serviceName": "kibana",
+    "transactionName": "search_sessions_monitor",
+    "transactionType": "taskManager run",
+    "transactionsPerMinute": 5.73333333333333,
   },
   Object {
-    "averageResponseTime": 120075.8,
-    "impact": 19.9892361479233,
+    "averageResponseTime": 133020.771587744,
+    "impact": 30.388460356061,
     "key": Object {
       "service.name": "opbeans-python",
       "transaction.name": "opbeans.tasks.update_stats",
@@ -1380,11 +1236,11 @@ Array [
     "serviceName": "opbeans-python",
     "transactionName": "opbeans.tasks.update_stats",
     "transactionType": "celery",
-    "transactionsPerMinute": 3.2,
+    "transactionsPerMinute": 11.9666666666667,
   },
   Object {
-    "averageResponseTime": 986611.622222222,
-    "impact": 20.5303999304564,
+    "averageResponseTime": 1084963.57142857,
+    "impact": 33.8304333651907,
     "key": Object {
       "service.name": "opbeans-node",
       "transaction.name": "Process payment",
@@ -1392,11 +1248,11 @@ Array [
     "serviceName": "opbeans-node",
     "transactionName": "Process payment",
     "transactionType": "Worker",
-    "transactionsPerMinute": 1.2,
+    "transactionsPerMinute": 1.63333333333333,
   },
   Object {
-    "averageResponseTime": 276820.333333333,
-    "impact": 23.8095911276137,
+    "averageResponseTime": 341426.2,
+    "impact": 34.7627012338947,
     "key": Object {
       "service.name": "kibana",
       "transaction.name": "GET /",
@@ -1404,35 +1260,11 @@ Array [
     "serviceName": "kibana",
     "transactionName": "GET /",
     "transactionType": "request",
-    "transactionsPerMinute": 3.23333333333333,
-  },
-  Object {
-    "averageResponseTime": 293182.311827957,
-    "impact": 25.2169485318692,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "GET /spaces/space_selector",
-    },
-    "serviceName": "kibana",
-    "transactionName": "GET /spaces/space_selector",
-    "transactionType": "request",
-    "transactionsPerMinute": 3.53333333333333,
-  },
-  Object {
-    "averageResponseTime": 58195967,
-    "impact": 26.9113560188584,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager run apm-telemetry-task",
-    },
-    "serviceName": "kibana",
-    "transactionName": "taskManager run apm-telemetry-task",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 0.0333333333333333,
+    "transactionsPerMinute": 5.33333333333333,
   },
   Object {
-    "averageResponseTime": 1750583.88888889,
-    "impact": 29.1426548027802,
+    "averageResponseTime": 2019880.51351351,
+    "impact": 47.5584453470763,
     "key": Object {
       "service.name": "opbeans-python",
       "transaction.name": "opbeans.tasks.sync_customers",
@@ -1440,187 +1272,67 @@ Array [
     "serviceName": "opbeans-python",
     "transactionName": "opbeans.tasks.sync_customers",
     "transactionType": "celery",
-    "transactionsPerMinute": 1.1,
-  },
-  Object {
-    "averageResponseTime": 116325.056951424,
-    "impact": 32.1138515351995,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager markAvailableTasksAsClaimed",
-    },
-    "serviceName": "kibana",
-    "transactionName": "taskManager markAvailableTasksAsClaimed",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 2,
-  },
-  Object {
-    "averageResponseTime": 1369390.40740741,
-    "impact": 34.1953058003244,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager run alerting:monitoring_alert_cpu_usage",
-    },
-    "serviceName": "kibana",
-    "transactionName": "taskManager run alerting:monitoring_alert_cpu_usage",
-    "transactionType": "taskManager",
     "transactionsPerMinute": 1.23333333333333,
   },
   Object {
-    "averageResponseTime": 1381261.22222222,
-    "impact": 34.4917411082194,
+    "averageResponseTime": 286405.072992701,
+    "impact": 49.9380954870978,
     "key": Object {
       "service.name": "kibana",
-      "transaction.name": "taskManager run alerting:monitoring_alert_elasticsearch_version_mismatch",
+      "transaction.name": "reports:monitor",
     },
     "serviceName": "kibana",
-    "transactionName": "taskManager run alerting:monitoring_alert_elasticsearch_version_mismatch",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.23333333333333,
-  },
-  Object {
-    "averageResponseTime": 1415622.11111111,
-    "impact": 35.3497934690912,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager run alerting:monitoring_alert_cluster_health",
-    },
-    "serviceName": "kibana",
-    "transactionName": "taskManager run alerting:monitoring_alert_cluster_health",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.13333333333333,
-  },
-  Object {
-    "averageResponseTime": 1469097.66666667,
-    "impact": 36.6851729711102,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager run alerting:monitoring_alert_license_expiration",
-    },
-    "serviceName": "kibana",
-    "transactionName": "taskManager run alerting:monitoring_alert_license_expiration",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.16666666666667,
-  },
-  Object {
-    "averageResponseTime": 1553520.77777778,
-    "impact": 38.7933678445103,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager run alerting:monitoring_alert_jvm_memory_usage",
-    },
-    "serviceName": "kibana",
-    "transactionName": "taskManager run alerting:monitoring_alert_jvm_memory_usage",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.23333333333333,
-  },
-  Object {
-    "averageResponseTime": 1604038.11111111,
-    "impact": 40.0548752889708,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager run alerting:monitoring_alert_nodes_changed",
-    },
-    "serviceName": "kibana",
-    "transactionName": "taskManager run alerting:monitoring_alert_nodes_changed",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.03333333333333,
-  },
-  Object {
-    "averageResponseTime": 1644922.25925926,
-    "impact": 41.0758250075357,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager run alerting:monitoring_alert_kibana_version_mismatch",
-    },
-    "serviceName": "kibana",
-    "transactionName": "taskManager run alerting:monitoring_alert_kibana_version_mismatch",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.26666666666667,
-  },
-  Object {
-    "averageResponseTime": 1677749.85714286,
-    "impact": 43.4473065458151,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager run alerting:monitoring_alert_logstash_version_mismatch",
-    },
-    "serviceName": "kibana",
-    "transactionName": "taskManager run alerting:monitoring_alert_logstash_version_mismatch",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 0.9,
+    "transactionName": "reports:monitor",
+    "transactionType": "taskManager run",
+    "transactionsPerMinute": 9.13333333333333,
   },
   Object {
-    "averageResponseTime": 1740724.52727273,
-    "impact": 44.2731587286529,
+    "averageResponseTime": 6253645.76923077,
+    "impact": 51.734190233957,
     "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager run alerting:monitoring_alert_disk_usage",
+      "service.name": "opbeans-dotnet",
+      "transaction.name": "GET Orders/Get",
     },
-    "serviceName": "kibana",
-    "transactionName": "taskManager run alerting:monitoring_alert_disk_usage",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 0.9,
+    "serviceName": "opbeans-dotnet",
+    "transactionName": "GET Orders/Get",
+    "transactionType": "request",
+    "transactionsPerMinute": 0.433333333333333,
   },
   Object {
-    "averageResponseTime": 5186451.21052632,
-    "impact": 45.5692511555897,
+    "averageResponseTime": 6548917.85714286,
+    "impact": 58.344458200013,
     "key": Object {
       "service.name": "kibana-frontend",
-      "transaction.name": "Click - div",
+      "transaction.name": "GET /api/uptime/filters",
     },
     "serviceName": "kibana-frontend",
-    "transactionName": "Click - div",
-    "transactionType": "user-interaction",
-    "transactionsPerMinute": 0.333333333333333,
-  },
-  Object {
-    "averageResponseTime": 1823761.61818182,
-    "impact": 46.3851419126971,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager run alerting:monitoring_alert_missing_monitoring_data",
-    },
-    "serviceName": "kibana",
-    "transactionName": "taskManager run alerting:monitoring_alert_missing_monitoring_data",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.3,
-  },
-  Object {
-    "averageResponseTime": 1371909.24390244,
-    "impact": 52.0221356651199,
-    "key": Object {
-      "service.name": "kibana",
-      "transaction.name": "taskManager run alerting:monitoring_alert_thread_pool_search_rejections",
-    },
-    "serviceName": "kibana",
-    "transactionName": "taskManager run alerting:monitoring_alert_thread_pool_search_rejections",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.43333333333333,
+    "transactionName": "GET /api/uptime/filters",
+    "transactionType": "http-request",
+    "transactionsPerMinute": 0.466666666666667,
   },
   Object {
-    "averageResponseTime": 1399682.12195122,
-    "impact": 53.075286024159,
+    "averageResponseTime": 172637.267148014,
+    "impact": 60.8620638778463,
     "key": Object {
       "service.name": "kibana",
-      "transaction.name": "taskManager run alerting:monitoring_alert_thread_pool_write_rejections",
+      "transaction.name": "taskManager",
     },
     "serviceName": "kibana",
-    "transactionName": "taskManager run alerting:monitoring_alert_thread_pool_write_rejections",
-    "transactionType": "taskManager",
-    "transactionsPerMinute": 1.43333333333333,
+    "transactionName": "taskManager",
+    "transactionType": "taskManager markTaskAsRunning",
+    "transactionsPerMinute": 18.4666666666667,
   },
   Object {
-    "averageResponseTime": 553058.519181586,
+    "averageResponseTime": 131831.268456376,
     "impact": 100,
     "key": Object {
       "service.name": "kibana",
-      "transaction.name": "POST /api/apm/settings/agent-configuration/search",
+      "transaction.name": "markAvailableTasksAsClaimed",
     },
     "serviceName": "kibana",
-    "transactionName": "POST /api/apm/settings/agent-configuration/search",
-    "transactionType": "request",
-    "transactionsPerMinute": 5.4,
+    "transactionName": "markAvailableTasksAsClaimed",
+    "transactionType": "taskManager markAvailableTasksAsClaimed",
+    "transactionsPerMinute": 39.7333333333333,
   },
 ]
 `;
diff --git a/x-pack/test/apm_api_integration/tests/traces/top_traces.ts b/x-pack/test/apm_api_integration/tests/traces/top_traces.ts
index 28b12d4865c1e..debdfe461e6fb 100644
--- a/x-pack/test/apm_api_integration/tests/traces/top_traces.ts
+++ b/x-pack/test/apm_api_integration/tests/traces/top_traces.ts
@@ -45,7 +45,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       });
 
       it('returns the correct number of buckets', async () => {
-        expectSnapshot(response.body.items.length).toMatchInline(`135`);
+        expectSnapshot(response.body.items.length).toMatchInline(`111`);
       });
 
       it('returns the correct buckets', async () => {
@@ -60,7 +60,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
         expectSnapshot(firstItem).toMatchInline(`
           Object {
-            "averageResponseTime": 1735,
+            "averageResponseTime": 1663,
             "impact": 0,
             "key": Object {
               "service.name": "opbeans-java",
@@ -75,16 +75,16 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
         expectSnapshot(lastItem).toMatchInline(`
           Object {
-            "averageResponseTime": 553058.519181586,
+            "averageResponseTime": 131831.268456376,
             "impact": 100,
             "key": Object {
               "service.name": "kibana",
-              "transaction.name": "POST /api/apm/settings/agent-configuration/search",
+              "transaction.name": "markAvailableTasksAsClaimed",
             },
             "serviceName": "kibana",
-            "transactionName": "POST /api/apm/settings/agent-configuration/search",
-            "transactionType": "request",
-            "transactionsPerMinute": 5.4,
+            "transactionName": "markAvailableTasksAsClaimed",
+            "transactionType": "taskManager markAvailableTasksAsClaimed",
+            "transactionsPerMinute": 39.7333333333333,
           }
         `);
 
@@ -95,20 +95,20 @@ export default function ApiTest({ getService }: FtrProviderContext) {
               "transaction.name": "DispatcherServlet#doPost",
             },
             Object {
-              "service.name": "opbeans-java",
-              "transaction.name": "APIRestController#product",
+              "service.name": "opbeans-node",
+              "transaction.name": "POST /api/orders",
             },
             Object {
-              "service.name": "opbeans-python",
-              "transaction.name": "GET opbeans.views.stats",
+              "service.name": "kibana",
+              "transaction.name": "GET /translations/?.json",
             },
             Object {
-              "service.name": "opbeans-python",
-              "transaction.name": "GET opbeans.views.orders",
+              "service.name": "kibana",
+              "transaction.name": "GET /ui/#",
             },
             Object {
               "service.name": "opbeans-node",
-              "transaction.name": "GET /api/products/:id",
+              "transaction.name": "GET /api/orders/:id",
             },
           ]
         `);
diff --git a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/breakdown.snap b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/breakdown.snap
index cfdd27b594956..f49aed8361446 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/breakdown.snap
+++ b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/breakdown.snap
@@ -7,252 +7,252 @@ Object {
       "color": "#54b399",
       "data": Array [
         Object {
-          "x": 1607435850000,
+          "x": 1627373280000,
           "y": null,
         },
         Object {
-          "x": 1607435880000,
-          "y": null,
+          "x": 1627373310000,
+          "y": 0.0714285714285714,
         },
         Object {
-          "x": 1607435910000,
-          "y": 0.365384615384615,
+          "x": 1627373340000,
+          "y": 0.651162790697674,
         },
         Object {
-          "x": 1607435940000,
-          "y": 0.514705882352941,
+          "x": 1627373370000,
+          "y": 0.176470588235294,
         },
         Object {
-          "x": 1607435970000,
-          "y": null,
+          "x": 1627373400000,
+          "y": 0.4375,
         },
         Object {
-          "x": 1607436000000,
+          "x": 1627373430000,
+          "y": 0.117224880382775,
+        },
+        Object {
+          "x": 1627373460000,
           "y": null,
         },
         Object {
-          "x": 1607436030000,
-          "y": 0.826086956521739,
+          "x": 1627373490000,
+          "y": 0.211267605633803,
         },
         Object {
-          "x": 1607436060000,
-          "y": null,
+          "x": 1627373520000,
+          "y": 0.172413793103448,
         },
         Object {
-          "x": 1607436090000,
-          "y": null,
+          "x": 1627373550000,
+          "y": 0.0731707317073171,
         },
         Object {
-          "x": 1607436120000,
-          "y": null,
+          "x": 1627373580000,
+          "y": 0.357142857142857,
         },
         Object {
-          "x": 1607436150000,
-          "y": 0.0967741935483871,
+          "x": 1627373610000,
+          "y": 0.426470588235294,
         },
         Object {
-          "x": 1607436180000,
-          "y": 0.321428571428571,
+          "x": 1627373640000,
+          "y": 0.567164179104478,
         },
         Object {
-          "x": 1607436210000,
-          "y": null,
+          "x": 1627373670000,
+          "y": 0.253731343283582,
         },
         Object {
-          "x": 1607436240000,
-          "y": null,
+          "x": 1627373700000,
+          "y": 0.45,
         },
         Object {
-          "x": 1607436270000,
-          "y": 0.44047619047619,
+          "x": 1627373730000,
+          "y": 0.272727272727273,
         },
         Object {
-          "x": 1607436300000,
-          "y": 0.75,
+          "x": 1627373760000,
+          "y": 0.508771929824561,
         },
         Object {
-          "x": 1607436330000,
-          "y": null,
+          "x": 1627373790000,
+          "y": 0.0909090909090909,
         },
         Object {
-          "x": 1607436360000,
-          "y": 0.25531914893617,
+          "x": 1627373820000,
+          "y": 0.30952380952381,
         },
         Object {
-          "x": 1607436390000,
-          "y": 0.229508196721311,
+          "x": 1627373850000,
+          "y": 0.53448275862069,
         },
         Object {
-          "x": 1607436420000,
-          "y": null,
+          "x": 1627373880000,
+          "y": 0.16017316017316,
         },
         Object {
-          "x": 1607436450000,
-          "y": null,
+          "x": 1627373910000,
+          "y": 0.355371900826446,
         },
         Object {
-          "x": 1607436480000,
-          "y": null,
+          "x": 1627373940000,
+          "y": 0.25,
         },
         Object {
-          "x": 1607436510000,
-          "y": 0.417721518987342,
+          "x": 1627373970000,
+          "y": 0.733333333333333,
         },
         Object {
-          "x": 1607436540000,
-          "y": 0.80952380952381,
+          "x": 1627374000000,
+          "y": 0.125,
         },
         Object {
-          "x": 1607436570000,
-          "y": null,
+          "x": 1627374030000,
+          "y": 0.428571428571429,
         },
         Object {
-          "x": 1607436600000,
-          "y": null,
+          "x": 1627374060000,
+          "y": 0.333333333333333,
         },
         Object {
-          "x": 1607436630000,
-          "y": 0.220238095238095,
+          "x": 1627374090000,
+          "y": 0.8,
         },
         Object {
-          "x": 1607436660000,
-          "y": 0.0790513833992095,
+          "x": 1627374120000,
+          "y": 0.678571428571429,
         },
         Object {
-          "x": 1607436690000,
-          "y": null,
+          "x": 1627374150000,
+          "y": 0.565217391304348,
         },
         Object {
-          "x": 1607436720000,
-          "y": null,
+          "x": 1627374180000,
+          "y": 0.7,
         },
         Object {
-          "x": 1607436750000,
-          "y": 0.232283464566929,
+          "x": 1627374210000,
+          "y": 0.245614035087719,
         },
         Object {
-          "x": 1607436780000,
-          "y": 0.0571428571428571,
+          "x": 1627374240000,
+          "y": 0.195652173913043,
         },
         Object {
-          "x": 1607436810000,
+          "x": 1627374270000,
           "y": null,
         },
         Object {
-          "x": 1607436840000,
-          "y": 0.027027027027027,
+          "x": 1627374300000,
+          "y": 0.0327868852459016,
         },
         Object {
-          "x": 1607436870000,
-          "y": 0.0666666666666667,
+          "x": 1627374330000,
+          "y": 0.235294117647059,
         },
         Object {
-          "x": 1607436900000,
-          "y": null,
+          "x": 1627374360000,
+          "y": 0.5,
         },
         Object {
-          "x": 1607436930000,
-          "y": null,
+          "x": 1627374390000,
+          "y": 0.357142857142857,
         },
         Object {
-          "x": 1607436960000,
-          "y": null,
+          "x": 1627374420000,
+          "y": 0.0909090909090909,
         },
         Object {
-          "x": 1607436990000,
-          "y": 0.16504854368932,
+          "x": 1627374450000,
+          "y": 0.411214953271028,
         },
         Object {
-          "x": 1607437020000,
-          "y": null,
+          "x": 1627374480000,
+          "y": 0.163461538461538,
         },
         Object {
-          "x": 1607437050000,
+          "x": 1627374510000,
           "y": null,
         },
         Object {
-          "x": 1607437080000,
-          "y": null,
+          "x": 1627374540000,
+          "y": 0.769230769230769,
         },
         Object {
-          "x": 1607437110000,
-          "y": 0.477611940298507,
+          "x": 1627374570000,
+          "y": 0.0666666666666667,
         },
         Object {
-          "x": 1607437140000,
-          "y": 0.549019607843137,
+          "x": 1627374600000,
+          "y": 0.333333333333333,
         },
         Object {
-          "x": 1607437170000,
-          "y": null,
+          "x": 1627374630000,
+          "y": 0.0413223140495868,
         },
         Object {
-          "x": 1607437200000,
-          "y": null,
+          "x": 1627374660000,
+          "y": 0.109090909090909,
         },
         Object {
-          "x": 1607437230000,
-          "y": 0.318840579710145,
+          "x": 1627374690000,
+          "y": 0.223404255319149,
         },
         Object {
-          "x": 1607437260000,
-          "y": 0.555555555555556,
+          "x": 1627374720000,
+          "y": 0.0136054421768707,
         },
         Object {
-          "x": 1607437290000,
-          "y": null,
+          "x": 1627374750000,
+          "y": 0.266304347826087,
         },
         Object {
-          "x": 1607437320000,
-          "y": null,
+          "x": 1627374780000,
+          "y": 0.15,
         },
         Object {
-          "x": 1607437350000,
-          "y": 0.506329113924051,
+          "x": 1627374810000,
+          "y": 0.111111111111111,
         },
         Object {
-          "x": 1607437380000,
+          "x": 1627374840000,
           "y": null,
         },
         Object {
-          "x": 1607437410000,
-          "y": null,
+          "x": 1627374870000,
+          "y": 0.117647058823529,
         },
         Object {
-          "x": 1607437440000,
-          "y": null,
+          "x": 1627374900000,
+          "y": 0.489130434782609,
         },
         Object {
-          "x": 1607437470000,
-          "y": 0.728813559322034,
+          "x": 1627374930000,
+          "y": 0.128813559322034,
         },
         Object {
-          "x": 1607437500000,
-          "y": 0.38,
+          "x": 1627374960000,
+          "y": 0.272727272727273,
         },
         Object {
-          "x": 1607437530000,
-          "y": null,
+          "x": 1627374990000,
+          "y": 0.217391304347826,
         },
         Object {
-          "x": 1607437560000,
-          "y": null,
+          "x": 1627375020000,
+          "y": 0.424657534246575,
         },
         Object {
-          "x": 1607437590000,
-          "y": 0.371428571428571,
+          "x": 1627375050000,
+          "y": 0.666666666666667,
         },
         Object {
-          "x": 1607437620000,
-          "y": null,
-        },
-        Object {
-          "x": 1607437650000,
-          "y": null,
+          "x": 1627375080000,
+          "y": 0.2,
         },
       ],
       "hideLegend": false,
-      "legendValue": "31%",
+      "legendValue": "23%",
       "title": "app",
       "type": "areaStacked",
     },
@@ -260,252 +260,252 @@ Object {
       "color": "#6092c0",
       "data": Array [
         Object {
-          "x": 1607435850000,
+          "x": 1627373280000,
           "y": null,
         },
         Object {
-          "x": 1607435880000,
-          "y": null,
+          "x": 1627373310000,
+          "y": 0.928571428571429,
         },
         Object {
-          "x": 1607435910000,
-          "y": 0.317307692307692,
+          "x": 1627373340000,
+          "y": 0.13953488372093,
         },
         Object {
-          "x": 1607435940000,
-          "y": 0.382352941176471,
+          "x": 1627373370000,
+          "y": 0.623529411764706,
         },
         Object {
-          "x": 1607435970000,
-          "y": null,
+          "x": 1627373400000,
+          "y": 0.2625,
         },
         Object {
-          "x": 1607436000000,
-          "y": null,
+          "x": 1627373430000,
+          "y": 0.815789473684211,
         },
         Object {
-          "x": 1607436030000,
-          "y": 0,
-        },
-        Object {
-          "x": 1607436060000,
+          "x": 1627373460000,
           "y": null,
         },
         Object {
-          "x": 1607436090000,
-          "y": null,
+          "x": 1627373490000,
+          "y": 0.704225352112676,
         },
         Object {
-          "x": 1607436120000,
-          "y": null,
+          "x": 1627373520000,
+          "y": 0.827586206896552,
         },
         Object {
-          "x": 1607436150000,
-          "y": 0.903225806451613,
+          "x": 1627373550000,
+          "y": 0.926829268292683,
         },
         Object {
-          "x": 1607436180000,
-          "y": 0.491071428571429,
+          "x": 1627373580000,
+          "y": 0.535714285714286,
         },
         Object {
-          "x": 1607436210000,
-          "y": null,
+          "x": 1627373610000,
+          "y": 0.382352941176471,
         },
         Object {
-          "x": 1607436240000,
-          "y": null,
+          "x": 1627373640000,
+          "y": 0.17910447761194,
         },
         Object {
-          "x": 1607436270000,
-          "y": 0.30952380952381,
+          "x": 1627373670000,
+          "y": 0.686567164179104,
         },
         Object {
-          "x": 1607436300000,
+          "x": 1627373700000,
           "y": 0,
         },
         Object {
-          "x": 1607436330000,
-          "y": null,
+          "x": 1627373730000,
+          "y": 0.666666666666667,
         },
         Object {
-          "x": 1607436360000,
-          "y": 0.617021276595745,
+          "x": 1627373760000,
+          "y": 0.0701754385964912,
         },
         Object {
-          "x": 1607436390000,
-          "y": 0.721311475409836,
+          "x": 1627373790000,
+          "y": 0.909090909090909,
         },
         Object {
-          "x": 1607436420000,
-          "y": null,
+          "x": 1627373820000,
+          "y": 0.285714285714286,
         },
         Object {
-          "x": 1607436450000,
-          "y": null,
+          "x": 1627373850000,
+          "y": 0.293103448275862,
         },
         Object {
-          "x": 1607436480000,
-          "y": null,
+          "x": 1627373880000,
+          "y": 0.770562770562771,
+        },
+        Object {
+          "x": 1627373910000,
+          "y": 0.363636363636364,
         },
         Object {
-          "x": 1607436510000,
-          "y": 0.455696202531646,
+          "x": 1627373940000,
+          "y": 0.642857142857143,
         },
         Object {
-          "x": 1607436540000,
+          "x": 1627373970000,
           "y": 0,
         },
         Object {
-          "x": 1607436570000,
-          "y": null,
+          "x": 1627374000000,
+          "y": 0.875,
         },
         Object {
-          "x": 1607436600000,
-          "y": null,
+          "x": 1627374030000,
+          "y": 0,
         },
         Object {
-          "x": 1607436630000,
-          "y": 0.68452380952381,
+          "x": 1627374060000,
+          "y": 0.53030303030303,
         },
         Object {
-          "x": 1607436660000,
-          "y": 0.897233201581028,
+          "x": 1627374090000,
+          "y": 0,
         },
         Object {
-          "x": 1607436690000,
-          "y": null,
+          "x": 1627374120000,
+          "y": 0,
         },
         Object {
-          "x": 1607436720000,
-          "y": null,
+          "x": 1627374150000,
+          "y": 0.130434782608696,
         },
         Object {
-          "x": 1607436750000,
-          "y": 0.700787401574803,
+          "x": 1627374180000,
+          "y": 0,
         },
         Object {
-          "x": 1607436780000,
-          "y": 0.942857142857143,
+          "x": 1627374210000,
+          "y": 0.666666666666667,
         },
         Object {
-          "x": 1607436810000,
-          "y": null,
+          "x": 1627374240000,
+          "y": 0.804347826086957,
         },
         Object {
-          "x": 1607436840000,
-          "y": 0.972972972972973,
+          "x": 1627374270000,
+          "y": null,
         },
         Object {
-          "x": 1607436870000,
-          "y": 0.933333333333333,
+          "x": 1627374300000,
+          "y": 0.967213114754098,
         },
         Object {
-          "x": 1607436900000,
-          "y": null,
+          "x": 1627374330000,
+          "y": 0.764705882352941,
         },
         Object {
-          "x": 1607436930000,
-          "y": null,
+          "x": 1627374360000,
+          "y": 0,
         },
         Object {
-          "x": 1607436960000,
-          "y": null,
+          "x": 1627374390000,
+          "y": 0.5,
         },
         Object {
-          "x": 1607436990000,
-          "y": 0.762135922330097,
+          "x": 1627374420000,
+          "y": 0.909090909090909,
         },
         Object {
-          "x": 1607437020000,
-          "y": null,
+          "x": 1627374450000,
+          "y": 0.233644859813084,
         },
         Object {
-          "x": 1607437050000,
-          "y": null,
+          "x": 1627374480000,
+          "y": 0.778846153846154,
         },
         Object {
-          "x": 1607437080000,
+          "x": 1627374510000,
           "y": null,
         },
         Object {
-          "x": 1607437110000,
-          "y": 0.41044776119403,
+          "x": 1627374540000,
+          "y": 0,
         },
         Object {
-          "x": 1607437140000,
-          "y": 0,
+          "x": 1627374570000,
+          "y": 0.933333333333333,
         },
         Object {
-          "x": 1607437170000,
-          "y": null,
+          "x": 1627374600000,
+          "y": 0.566666666666667,
         },
         Object {
-          "x": 1607437200000,
-          "y": null,
+          "x": 1627374630000,
+          "y": 0.958677685950413,
         },
         Object {
-          "x": 1607437230000,
-          "y": 0.442028985507246,
+          "x": 1627374660000,
+          "y": 0.831818181818182,
         },
         Object {
-          "x": 1607437260000,
-          "y": 0.185185185185185,
+          "x": 1627374690000,
+          "y": 0.712765957446808,
         },
         Object {
-          "x": 1607437290000,
-          "y": null,
+          "x": 1627374720000,
+          "y": 0.986394557823129,
         },
         Object {
-          "x": 1607437320000,
-          "y": null,
+          "x": 1627374750000,
+          "y": 0.679347826086957,
         },
         Object {
-          "x": 1607437350000,
-          "y": 0.265822784810127,
+          "x": 1627374780000,
+          "y": 0.683333333333333,
         },
         Object {
-          "x": 1607437380000,
-          "y": null,
+          "x": 1627374810000,
+          "y": 0.888888888888889,
         },
         Object {
-          "x": 1607437410000,
+          "x": 1627374840000,
           "y": null,
         },
         Object {
-          "x": 1607437440000,
-          "y": null,
+          "x": 1627374870000,
+          "y": 0.882352941176471,
         },
         Object {
-          "x": 1607437470000,
-          "y": 0,
+          "x": 1627374900000,
+          "y": 0.293478260869565,
         },
         Object {
-          "x": 1607437500000,
-          "y": 0.31,
+          "x": 1627374930000,
+          "y": 0.857627118644068,
         },
         Object {
-          "x": 1607437530000,
-          "y": null,
+          "x": 1627374960000,
+          "y": 0.659090909090909,
         },
         Object {
-          "x": 1607437560000,
-          "y": null,
+          "x": 1627374990000,
+          "y": 0.717391304347826,
         },
         Object {
-          "x": 1607437590000,
-          "y": 0.495238095238095,
+          "x": 1627375020000,
+          "y": 0.342465753424658,
         },
         Object {
-          "x": 1607437620000,
-          "y": null,
+          "x": 1627375050000,
+          "y": 0,
         },
         Object {
-          "x": 1607437650000,
-          "y": null,
+          "x": 1627375080000,
+          "y": 0.8,
         },
       ],
       "hideLegend": false,
-      "legendValue": "55%",
+      "legendValue": "67%",
       "title": "http",
       "type": "areaStacked",
     },
@@ -513,252 +513,252 @@ Object {
       "color": "#d36086",
       "data": Array [
         Object {
-          "x": 1607435850000,
+          "x": 1627373280000,
           "y": null,
         },
         Object {
-          "x": 1607435880000,
-          "y": null,
+          "x": 1627373310000,
+          "y": 0,
         },
         Object {
-          "x": 1607435910000,
-          "y": 0.317307692307692,
+          "x": 1627373340000,
+          "y": 0.209302325581395,
         },
         Object {
-          "x": 1607435940000,
-          "y": 0.0882352941176471,
+          "x": 1627373370000,
+          "y": 0.2,
         },
         Object {
-          "x": 1607435970000,
-          "y": null,
+          "x": 1627373400000,
+          "y": 0.275,
+        },
+        Object {
+          "x": 1627373430000,
+          "y": 0.0598086124401914,
         },
         Object {
-          "x": 1607436000000,
+          "x": 1627373460000,
           "y": null,
         },
         Object {
-          "x": 1607436030000,
-          "y": 0.130434782608696,
+          "x": 1627373490000,
+          "y": 0.0633802816901408,
         },
         Object {
-          "x": 1607436060000,
-          "y": null,
+          "x": 1627373520000,
+          "y": 0,
         },
         Object {
-          "x": 1607436090000,
-          "y": null,
+          "x": 1627373550000,
+          "y": 0,
         },
         Object {
-          "x": 1607436120000,
-          "y": null,
+          "x": 1627373580000,
+          "y": 0.107142857142857,
         },
         Object {
-          "x": 1607436150000,
-          "y": 0,
+          "x": 1627373610000,
+          "y": 0.161764705882353,
         },
         Object {
-          "x": 1607436180000,
-          "y": 0.178571428571429,
+          "x": 1627373640000,
+          "y": 0.253731343283582,
         },
         Object {
-          "x": 1607436210000,
-          "y": null,
+          "x": 1627373670000,
+          "y": 0.0298507462686567,
         },
         Object {
-          "x": 1607436240000,
-          "y": null,
+          "x": 1627373700000,
+          "y": 0.55,
         },
         Object {
-          "x": 1607436270000,
-          "y": 0.25,
+          "x": 1627373730000,
+          "y": 0.0303030303030303,
         },
         Object {
-          "x": 1607436300000,
-          "y": 0.25,
+          "x": 1627373760000,
+          "y": 0.333333333333333,
         },
         Object {
-          "x": 1607436330000,
-          "y": null,
+          "x": 1627373790000,
+          "y": 0,
         },
         Object {
-          "x": 1607436360000,
-          "y": 0.127659574468085,
+          "x": 1627373820000,
+          "y": 0.404761904761905,
         },
         Object {
-          "x": 1607436390000,
-          "y": 0.0491803278688525,
+          "x": 1627373850000,
+          "y": 0.137931034482759,
         },
         Object {
-          "x": 1607436420000,
-          "y": null,
+          "x": 1627373880000,
+          "y": 0.0562770562770563,
         },
         Object {
-          "x": 1607436450000,
-          "y": null,
+          "x": 1627373910000,
+          "y": 0.256198347107438,
         },
         Object {
-          "x": 1607436480000,
-          "y": null,
+          "x": 1627373940000,
+          "y": 0.0357142857142857,
         },
         Object {
-          "x": 1607436510000,
-          "y": 0.113924050632911,
+          "x": 1627373970000,
+          "y": 0.2,
         },
         Object {
-          "x": 1607436540000,
-          "y": 0.142857142857143,
+          "x": 1627374000000,
+          "y": 0,
         },
         Object {
-          "x": 1607436570000,
-          "y": null,
+          "x": 1627374030000,
+          "y": 0.571428571428571,
         },
         Object {
-          "x": 1607436600000,
-          "y": null,
+          "x": 1627374060000,
+          "y": 0.121212121212121,
         },
         Object {
-          "x": 1607436630000,
-          "y": 0.0833333333333333,
+          "x": 1627374090000,
+          "y": 0.2,
         },
         Object {
-          "x": 1607436660000,
-          "y": 0.0237154150197628,
+          "x": 1627374120000,
+          "y": 0.25,
         },
         Object {
-          "x": 1607436690000,
-          "y": null,
+          "x": 1627374150000,
+          "y": 0.217391304347826,
         },
         Object {
-          "x": 1607436720000,
-          "y": null,
+          "x": 1627374180000,
+          "y": 0.3,
         },
         Object {
-          "x": 1607436750000,
-          "y": 0.062992125984252,
+          "x": 1627374210000,
+          "y": 0.087719298245614,
         },
         Object {
-          "x": 1607436780000,
+          "x": 1627374240000,
           "y": 0,
         },
         Object {
-          "x": 1607436810000,
+          "x": 1627374270000,
           "y": null,
         },
         Object {
-          "x": 1607436840000,
+          "x": 1627374300000,
           "y": 0,
         },
         Object {
-          "x": 1607436870000,
+          "x": 1627374330000,
           "y": 0,
         },
         Object {
-          "x": 1607436900000,
-          "y": null,
-        },
-        Object {
-          "x": 1607436930000,
-          "y": null,
+          "x": 1627374360000,
+          "y": 0.5,
         },
         Object {
-          "x": 1607436960000,
-          "y": null,
+          "x": 1627374390000,
+          "y": 0.142857142857143,
         },
         Object {
-          "x": 1607436990000,
-          "y": 0.0728155339805825,
+          "x": 1627374420000,
+          "y": 0,
         },
         Object {
-          "x": 1607437020000,
-          "y": null,
+          "x": 1627374450000,
+          "y": 0.280373831775701,
         },
         Object {
-          "x": 1607437050000,
-          "y": null,
+          "x": 1627374480000,
+          "y": 0.0576923076923077,
         },
         Object {
-          "x": 1607437080000,
+          "x": 1627374510000,
           "y": null,
         },
         Object {
-          "x": 1607437110000,
-          "y": 0.0970149253731343,
+          "x": 1627374540000,
+          "y": 0.230769230769231,
         },
         Object {
-          "x": 1607437140000,
-          "y": 0.431372549019608,
+          "x": 1627374570000,
+          "y": 0,
         },
         Object {
-          "x": 1607437170000,
-          "y": null,
+          "x": 1627374600000,
+          "y": 0.1,
         },
         Object {
-          "x": 1607437200000,
-          "y": null,
+          "x": 1627374630000,
+          "y": 0,
         },
         Object {
-          "x": 1607437230000,
-          "y": 0.239130434782609,
+          "x": 1627374660000,
+          "y": 0.0590909090909091,
         },
         Object {
-          "x": 1607437260000,
-          "y": 0.246913580246914,
+          "x": 1627374690000,
+          "y": 0.0638297872340425,
         },
         Object {
-          "x": 1607437290000,
-          "y": null,
+          "x": 1627374720000,
+          "y": 0,
         },
         Object {
-          "x": 1607437320000,
-          "y": null,
+          "x": 1627374750000,
+          "y": 0.0543478260869565,
         },
         Object {
-          "x": 1607437350000,
-          "y": 0.20253164556962,
+          "x": 1627374780000,
+          "y": 0.166666666666667,
         },
         Object {
-          "x": 1607437380000,
-          "y": null,
+          "x": 1627374810000,
+          "y": 0,
         },
         Object {
-          "x": 1607437410000,
+          "x": 1627374840000,
           "y": null,
         },
         Object {
-          "x": 1607437440000,
-          "y": null,
+          "x": 1627374870000,
+          "y": 0,
         },
         Object {
-          "x": 1607437470000,
-          "y": 0.23728813559322,
+          "x": 1627374900000,
+          "y": 0.206521739130435,
         },
         Object {
-          "x": 1607437500000,
-          "y": 0.25,
+          "x": 1627374930000,
+          "y": 0.0135593220338983,
         },
         Object {
-          "x": 1607437530000,
-          "y": null,
+          "x": 1627374960000,
+          "y": 0.0681818181818182,
         },
         Object {
-          "x": 1607437560000,
-          "y": null,
+          "x": 1627374990000,
+          "y": 0.0652173913043478,
         },
         Object {
-          "x": 1607437590000,
-          "y": 0.133333333333333,
+          "x": 1627375020000,
+          "y": 0.219178082191781,
         },
         Object {
-          "x": 1607437620000,
-          "y": null,
+          "x": 1627375050000,
+          "y": 0.30952380952381,
         },
         Object {
-          "x": 1607437650000,
-          "y": null,
+          "x": 1627375080000,
+          "y": 0,
         },
       ],
       "hideLegend": false,
-      "legendValue": "13%",
+      "legendValue": "9.8%",
       "title": "postgresql",
       "type": "areaStacked",
     },
@@ -766,252 +766,252 @@ Object {
       "color": "#9170b8",
       "data": Array [
         Object {
-          "x": 1607435850000,
+          "x": 1627373280000,
           "y": null,
         },
         Object {
-          "x": 1607435880000,
-          "y": null,
+          "x": 1627373310000,
+          "y": 0,
         },
         Object {
-          "x": 1607435910000,
+          "x": 1627373340000,
           "y": 0,
         },
         Object {
-          "x": 1607435940000,
-          "y": 0.0147058823529412,
+          "x": 1627373370000,
+          "y": 0,
         },
         Object {
-          "x": 1607435970000,
-          "y": null,
+          "x": 1627373400000,
+          "y": 0.025,
         },
         Object {
-          "x": 1607436000000,
-          "y": null,
+          "x": 1627373430000,
+          "y": 0.00717703349282297,
         },
         Object {
-          "x": 1607436030000,
-          "y": 0.0434782608695652,
+          "x": 1627373460000,
+          "y": null,
         },
         Object {
-          "x": 1607436060000,
-          "y": null,
+          "x": 1627373490000,
+          "y": 0.0211267605633803,
         },
         Object {
-          "x": 1607436090000,
-          "y": null,
+          "x": 1627373520000,
+          "y": 0,
         },
         Object {
-          "x": 1607436120000,
-          "y": null,
+          "x": 1627373550000,
+          "y": 0,
         },
         Object {
-          "x": 1607436150000,
+          "x": 1627373580000,
           "y": 0,
         },
         Object {
-          "x": 1607436180000,
-          "y": 0.00892857142857143,
+          "x": 1627373610000,
+          "y": 0.0294117647058824,
         },
         Object {
-          "x": 1607436210000,
-          "y": null,
+          "x": 1627373640000,
+          "y": 0,
         },
         Object {
-          "x": 1607436240000,
-          "y": null,
+          "x": 1627373670000,
+          "y": 0.0298507462686567,
         },
         Object {
-          "x": 1607436270000,
+          "x": 1627373700000,
           "y": 0,
         },
         Object {
-          "x": 1607436300000,
-          "y": 0,
+          "x": 1627373730000,
+          "y": 0.0303030303030303,
         },
         Object {
-          "x": 1607436330000,
-          "y": null,
+          "x": 1627373760000,
+          "y": 0.087719298245614,
         },
         Object {
-          "x": 1607436360000,
+          "x": 1627373790000,
           "y": 0,
         },
         Object {
-          "x": 1607436390000,
+          "x": 1627373820000,
           "y": 0,
         },
         Object {
-          "x": 1607436420000,
-          "y": null,
+          "x": 1627373850000,
+          "y": 0.0344827586206897,
         },
         Object {
-          "x": 1607436450000,
-          "y": null,
+          "x": 1627373880000,
+          "y": 0.012987012987013,
         },
         Object {
-          "x": 1607436480000,
-          "y": null,
+          "x": 1627373910000,
+          "y": 0.0247933884297521,
         },
         Object {
-          "x": 1607436510000,
-          "y": 0.0126582278481013,
+          "x": 1627373940000,
+          "y": 0.0714285714285714,
         },
         Object {
-          "x": 1607436540000,
-          "y": 0.0476190476190476,
+          "x": 1627373970000,
+          "y": 0.0666666666666667,
         },
         Object {
-          "x": 1607436570000,
-          "y": null,
+          "x": 1627374000000,
+          "y": 0,
         },
         Object {
-          "x": 1607436600000,
-          "y": null,
+          "x": 1627374030000,
+          "y": 0,
         },
         Object {
-          "x": 1607436630000,
-          "y": 0.0119047619047619,
+          "x": 1627374060000,
+          "y": 0.0151515151515152,
         },
         Object {
-          "x": 1607436660000,
+          "x": 1627374090000,
           "y": 0,
         },
         Object {
-          "x": 1607436690000,
-          "y": null,
+          "x": 1627374120000,
+          "y": 0.0714285714285714,
         },
         Object {
-          "x": 1607436720000,
-          "y": null,
+          "x": 1627374150000,
+          "y": 0.0869565217391304,
         },
         Object {
-          "x": 1607436750000,
-          "y": 0.00393700787401575,
+          "x": 1627374180000,
+          "y": 0,
         },
         Object {
-          "x": 1607436780000,
+          "x": 1627374210000,
           "y": 0,
         },
         Object {
-          "x": 1607436810000,
-          "y": null,
+          "x": 1627374240000,
+          "y": 0,
         },
         Object {
-          "x": 1607436840000,
-          "y": 0,
+          "x": 1627374270000,
+          "y": null,
         },
         Object {
-          "x": 1607436870000,
+          "x": 1627374300000,
           "y": 0,
         },
         Object {
-          "x": 1607436900000,
-          "y": null,
+          "x": 1627374330000,
+          "y": 0,
         },
         Object {
-          "x": 1607436930000,
-          "y": null,
+          "x": 1627374360000,
+          "y": 0,
         },
         Object {
-          "x": 1607436960000,
-          "y": null,
+          "x": 1627374390000,
+          "y": 0,
         },
         Object {
-          "x": 1607436990000,
+          "x": 1627374420000,
           "y": 0,
         },
         Object {
-          "x": 1607437020000,
-          "y": null,
+          "x": 1627374450000,
+          "y": 0.0747663551401869,
         },
         Object {
-          "x": 1607437050000,
-          "y": null,
+          "x": 1627374480000,
+          "y": 0,
         },
         Object {
-          "x": 1607437080000,
+          "x": 1627374510000,
           "y": null,
         },
         Object {
-          "x": 1607437110000,
-          "y": 0.0149253731343284,
+          "x": 1627374540000,
+          "y": 0,
         },
         Object {
-          "x": 1607437140000,
-          "y": 0.0196078431372549,
+          "x": 1627374570000,
+          "y": 0,
         },
         Object {
-          "x": 1607437170000,
-          "y": null,
+          "x": 1627374600000,
+          "y": 0,
         },
         Object {
-          "x": 1607437200000,
-          "y": null,
+          "x": 1627374630000,
+          "y": 0,
         },
         Object {
-          "x": 1607437230000,
+          "x": 1627374660000,
           "y": 0,
         },
         Object {
-          "x": 1607437260000,
-          "y": 0.0123456790123457,
+          "x": 1627374690000,
+          "y": 0,
         },
         Object {
-          "x": 1607437290000,
-          "y": null,
+          "x": 1627374720000,
+          "y": 0,
         },
         Object {
-          "x": 1607437320000,
-          "y": null,
+          "x": 1627374750000,
+          "y": 0,
         },
         Object {
-          "x": 1607437350000,
-          "y": 0.0253164556962025,
+          "x": 1627374780000,
+          "y": 0,
         },
         Object {
-          "x": 1607437380000,
-          "y": null,
+          "x": 1627374810000,
+          "y": 0,
         },
         Object {
-          "x": 1607437410000,
+          "x": 1627374840000,
           "y": null,
         },
         Object {
-          "x": 1607437440000,
-          "y": null,
+          "x": 1627374870000,
+          "y": 0,
         },
         Object {
-          "x": 1607437470000,
-          "y": 0.0338983050847458,
+          "x": 1627374900000,
+          "y": 0.0108695652173913,
         },
         Object {
-          "x": 1607437500000,
-          "y": 0.06,
+          "x": 1627374930000,
+          "y": 0,
         },
         Object {
-          "x": 1607437530000,
-          "y": null,
+          "x": 1627374960000,
+          "y": 0,
         },
         Object {
-          "x": 1607437560000,
-          "y": null,
+          "x": 1627374990000,
+          "y": 0,
         },
         Object {
-          "x": 1607437590000,
-          "y": 0,
+          "x": 1627375020000,
+          "y": 0.0136986301369863,
         },
         Object {
-          "x": 1607437620000,
-          "y": null,
+          "x": 1627375050000,
+          "y": 0.0238095238095238,
         },
         Object {
-          "x": 1607437650000,
-          "y": null,
+          "x": 1627375080000,
+          "y": 0,
         },
       ],
       "hideLegend": false,
-      "legendValue": "0.9%",
+      "legendValue": "1.0%",
       "title": "redis",
       "type": "areaStacked",
     },
@@ -1022,248 +1022,248 @@ Object {
 exports[`APM API tests basic apm_8.0.0 when data is loaded returns the transaction breakdown for a transaction group 9`] = `
 Array [
   Object {
-    "x": 1607435850000,
+    "x": 1627373280000,
     "y": null,
   },
   Object {
-    "x": 1607435880000,
-    "y": null,
-  },
-  Object {
-    "x": 1607435910000,
+    "x": 1627373310000,
     "y": 1,
   },
   Object {
-    "x": 1607435940000,
+    "x": 1627373340000,
     "y": 1,
   },
   Object {
-    "x": 1607435970000,
-    "y": null,
+    "x": 1627373370000,
+    "y": 1,
   },
   Object {
-    "x": 1607436000000,
-    "y": null,
+    "x": 1627373400000,
+    "y": 1,
   },
   Object {
-    "x": 1607436030000,
-    "y": null,
+    "x": 1627373430000,
+    "y": 1,
   },
   Object {
-    "x": 1607436060000,
+    "x": 1627373460000,
     "y": null,
   },
   Object {
-    "x": 1607436090000,
-    "y": null,
+    "x": 1627373490000,
+    "y": 1,
   },
   Object {
-    "x": 1607436120000,
-    "y": null,
+    "x": 1627373520000,
+    "y": 1,
   },
   Object {
-    "x": 1607436150000,
+    "x": 1627373550000,
     "y": 1,
   },
   Object {
-    "x": 1607436180000,
+    "x": 1627373580000,
     "y": 1,
   },
   Object {
-    "x": 1607436210000,
-    "y": null,
+    "x": 1627373610000,
+    "y": 1,
   },
   Object {
-    "x": 1607436240000,
-    "y": null,
+    "x": 1627373640000,
+    "y": 1,
   },
   Object {
-    "x": 1607436270000,
+    "x": 1627373670000,
     "y": 1,
   },
   Object {
-    "x": 1607436300000,
+    "x": 1627373700000,
     "y": null,
   },
   Object {
-    "x": 1607436330000,
-    "y": null,
+    "x": 1627373730000,
+    "y": 1,
   },
   Object {
-    "x": 1607436360000,
+    "x": 1627373760000,
     "y": 1,
   },
   Object {
-    "x": 1607436390000,
+    "x": 1627373790000,
     "y": 1,
   },
   Object {
-    "x": 1607436420000,
-    "y": null,
+    "x": 1627373820000,
+    "y": 1,
   },
   Object {
-    "x": 1607436450000,
-    "y": null,
+    "x": 1627373850000,
+    "y": 1,
   },
   Object {
-    "x": 1607436480000,
-    "y": null,
+    "x": 1627373880000,
+    "y": 1,
   },
   Object {
-    "x": 1607436510000,
+    "x": 1627373910000,
     "y": 1,
   },
   Object {
-    "x": 1607436540000,
-    "y": null,
+    "x": 1627373940000,
+    "y": 1,
   },
   Object {
-    "x": 1607436570000,
+    "x": 1627373970000,
     "y": null,
   },
   Object {
-    "x": 1607436600000,
+    "x": 1627374000000,
+    "y": 1,
+  },
+  Object {
+    "x": 1627374030000,
     "y": null,
   },
   Object {
-    "x": 1607436630000,
+    "x": 1627374060000,
     "y": 1,
   },
   Object {
-    "x": 1607436660000,
-    "y": 1,
+    "x": 1627374090000,
+    "y": null,
   },
   Object {
-    "x": 1607436690000,
+    "x": 1627374120000,
     "y": null,
   },
   Object {
-    "x": 1607436720000,
+    "x": 1627374150000,
+    "y": 1,
+  },
+  Object {
+    "x": 1627374180000,
     "y": null,
   },
   Object {
-    "x": 1607436750000,
+    "x": 1627374210000,
     "y": 1,
   },
   Object {
-    "x": 1607436780000,
+    "x": 1627374240000,
     "y": 1,
   },
   Object {
-    "x": 1607436810000,
+    "x": 1627374270000,
     "y": null,
   },
   Object {
-    "x": 1607436840000,
+    "x": 1627374300000,
     "y": 1,
   },
   Object {
-    "x": 1607436870000,
+    "x": 1627374330000,
     "y": 1,
   },
   Object {
-    "x": 1607436900000,
+    "x": 1627374360000,
     "y": null,
   },
   Object {
-    "x": 1607436930000,
-    "y": null,
+    "x": 1627374390000,
+    "y": 1,
   },
   Object {
-    "x": 1607436960000,
-    "y": null,
+    "x": 1627374420000,
+    "y": 1,
   },
   Object {
-    "x": 1607436990000,
+    "x": 1627374450000,
     "y": 1,
   },
   Object {
-    "x": 1607437020000,
-    "y": null,
+    "x": 1627374480000,
+    "y": 1,
   },
   Object {
-    "x": 1607437050000,
+    "x": 1627374510000,
     "y": null,
   },
   Object {
-    "x": 1607437080000,
+    "x": 1627374540000,
     "y": null,
   },
   Object {
-    "x": 1607437110000,
+    "x": 1627374570000,
     "y": 1,
   },
   Object {
-    "x": 1607437140000,
-    "y": null,
-  },
-  Object {
-    "x": 1607437170000,
-    "y": null,
+    "x": 1627374600000,
+    "y": 1,
   },
   Object {
-    "x": 1607437200000,
-    "y": null,
+    "x": 1627374630000,
+    "y": 1,
   },
   Object {
-    "x": 1607437230000,
+    "x": 1627374660000,
     "y": 1,
   },
   Object {
-    "x": 1607437260000,
+    "x": 1627374690000,
     "y": 1,
   },
   Object {
-    "x": 1607437290000,
-    "y": null,
+    "x": 1627374720000,
+    "y": 1,
   },
   Object {
-    "x": 1607437320000,
-    "y": null,
+    "x": 1627374750000,
+    "y": 1,
   },
   Object {
-    "x": 1607437350000,
+    "x": 1627374780000,
     "y": 1,
   },
   Object {
-    "x": 1607437380000,
-    "y": null,
+    "x": 1627374810000,
+    "y": 1,
   },
   Object {
-    "x": 1607437410000,
+    "x": 1627374840000,
     "y": null,
   },
   Object {
-    "x": 1607437440000,
-    "y": null,
+    "x": 1627374870000,
+    "y": 1,
   },
   Object {
-    "x": 1607437470000,
-    "y": null,
+    "x": 1627374900000,
+    "y": 1,
   },
   Object {
-    "x": 1607437500000,
+    "x": 1627374930000,
     "y": 1,
   },
   Object {
-    "x": 1607437530000,
-    "y": null,
+    "x": 1627374960000,
+    "y": 1,
   },
   Object {
-    "x": 1607437560000,
-    "y": null,
+    "x": 1627374990000,
+    "y": 1,
   },
   Object {
-    "x": 1607437590000,
+    "x": 1627375020000,
     "y": 1,
   },
   Object {
-    "x": 1607437620000,
+    "x": 1627375050000,
     "y": null,
   },
   Object {
-    "x": 1607437650000,
-    "y": null,
+    "x": 1627375080000,
+    "y": 1,
   },
 ]
 `;
diff --git a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/error_rate.snap b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/error_rate.snap
index 3db729f5905e3..11c53edd5c83e 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/error_rate.snap
+++ b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/error_rate.snap
@@ -3,127 +3,127 @@
 exports[`APM API tests basic apm_8.0.0 Error rate when data is loaded returns the transaction error rate has the correct error rate 1`] = `
 Array [
   Object {
-    "x": 1607435820000,
-    "y": null,
+    "x": 1627373280000,
+    "y": 0.4,
   },
   Object {
-    "x": 1607435880000,
-    "y": 0,
+    "x": 1627373340000,
+    "y": 0.25,
   },
   Object {
-    "x": 1607435940000,
+    "x": 1627373400000,
     "y": 0,
   },
   Object {
-    "x": 1607436000000,
+    "x": 1627373460000,
     "y": 0,
   },
   Object {
-    "x": 1607436060000,
-    "y": null,
-  },
-  Object {
-    "x": 1607436120000,
+    "x": 1627373520000,
     "y": 0,
   },
   Object {
-    "x": 1607436180000,
-    "y": null,
+    "x": 1627373580000,
+    "y": 0,
   },
   Object {
-    "x": 1607436240000,
+    "x": 1627373640000,
     "y": 0,
   },
   Object {
-    "x": 1607436300000,
-    "y": 1,
+    "x": 1627373700000,
+    "y": 0,
   },
   Object {
-    "x": 1607436360000,
-    "y": 0,
+    "x": 1627373760000,
+    "y": 0.0833333333333333,
   },
   Object {
-    "x": 1607436420000,
+    "x": 1627373820000,
     "y": null,
   },
   Object {
-    "x": 1607436480000,
-    "y": 0.142857142857143,
+    "x": 1627373880000,
+    "y": 0,
   },
   Object {
-    "x": 1607436540000,
-    "y": null,
+    "x": 1627373940000,
+    "y": 0.333333333333333,
   },
   Object {
-    "x": 1607436600000,
-    "y": 0.222222222222222,
+    "x": 1627374000000,
+    "y": 0.2,
   },
   Object {
-    "x": 1607436660000,
-    "y": null,
+    "x": 1627374060000,
+    "y": 0,
   },
   Object {
-    "x": 1607436720000,
-    "y": 1,
+    "x": 1627374120000,
+    "y": 0,
   },
   Object {
-    "x": 1607436780000,
+    "x": 1627374180000,
     "y": 0,
   },
   Object {
-    "x": 1607436840000,
-    "y": 0.333333333333333,
+    "x": 1627374240000,
+    "y": 0,
   },
   Object {
-    "x": 1607436900000,
-    "y": null,
+    "x": 1627374300000,
+    "y": 0.285714285714286,
   },
   Object {
-    "x": 1607436960000,
+    "x": 1627374360000,
     "y": 0,
   },
   Object {
-    "x": 1607437020000,
-    "y": null,
+    "x": 1627374420000,
+    "y": 0.0769230769230769,
   },
   Object {
-    "x": 1607437080000,
+    "x": 1627374480000,
+    "y": 0.142857142857143,
+  },
+  Object {
+    "x": 1627374540000,
     "y": 0,
   },
   Object {
-    "x": 1607437140000,
-    "y": null,
+    "x": 1627374600000,
+    "y": 0.133333333333333,
   },
   Object {
-    "x": 1607437200000,
-    "y": 0.285714285714286,
+    "x": 1627374660000,
+    "y": 0,
   },
   Object {
-    "x": 1607437260000,
+    "x": 1627374720000,
     "y": 0,
   },
   Object {
-    "x": 1607437320000,
-    "y": 0.333333333333333,
+    "x": 1627374780000,
+    "y": 0.5,
   },
   Object {
-    "x": 1607437380000,
-    "y": null,
+    "x": 1627374840000,
+    "y": 0,
   },
   Object {
-    "x": 1607437440000,
-    "y": 0.5,
+    "x": 1627374900000,
+    "y": 0,
   },
   Object {
-    "x": 1607437500000,
-    "y": null,
+    "x": 1627374960000,
+    "y": 0,
   },
   Object {
-    "x": 1607437560000,
+    "x": 1627375020000,
     "y": 0,
   },
   Object {
-    "x": 1607437620000,
+    "x": 1627375080000,
     "y": null,
   },
 ]
@@ -132,67 +132,67 @@ Array [
 exports[`APM API tests basic apm_8.0.0 Error rate when data is loaded returns the transaction error rate with comparison data has the correct error rate 1`] = `
 Array [
   Object {
-    "x": 1607436720000,
-    "y": null,
+    "x": 1627374180000,
+    "y": 0,
   },
   Object {
-    "x": 1607436780000,
+    "x": 1627374240000,
     "y": 0,
   },
   Object {
-    "x": 1607436840000,
-    "y": 0.333333333333333,
+    "x": 1627374300000,
+    "y": 0.285714285714286,
   },
   Object {
-    "x": 1607436900000,
-    "y": null,
+    "x": 1627374360000,
+    "y": 0,
   },
   Object {
-    "x": 1607436960000,
-    "y": 0,
+    "x": 1627374420000,
+    "y": 0.0769230769230769,
   },
   Object {
-    "x": 1607437020000,
-    "y": null,
+    "x": 1627374480000,
+    "y": 0.142857142857143,
   },
   Object {
-    "x": 1607437080000,
+    "x": 1627374540000,
     "y": 0,
   },
   Object {
-    "x": 1607437140000,
-    "y": null,
+    "x": 1627374600000,
+    "y": 0.133333333333333,
   },
   Object {
-    "x": 1607437200000,
-    "y": 0.285714285714286,
+    "x": 1627374660000,
+    "y": 0,
   },
   Object {
-    "x": 1607437260000,
+    "x": 1627374720000,
     "y": 0,
   },
   Object {
-    "x": 1607437320000,
-    "y": 0.333333333333333,
+    "x": 1627374780000,
+    "y": 0.5,
   },
   Object {
-    "x": 1607437380000,
-    "y": null,
+    "x": 1627374840000,
+    "y": 0,
   },
   Object {
-    "x": 1607437440000,
-    "y": 0.5,
+    "x": 1627374900000,
+    "y": 0,
   },
   Object {
-    "x": 1607437500000,
-    "y": null,
+    "x": 1627374960000,
+    "y": 0,
   },
   Object {
-    "x": 1607437560000,
+    "x": 1627375020000,
     "y": 0,
   },
   Object {
-    "x": 1607437620000,
+    "x": 1627375080000,
     "y": null,
   },
 ]
@@ -201,68 +201,68 @@ Array [
 exports[`APM API tests basic apm_8.0.0 Error rate when data is loaded returns the transaction error rate with comparison data has the correct error rate 2`] = `
 Array [
   Object {
-    "x": 1607436720000,
-    "y": null,
+    "x": 1627374180000,
+    "y": 0.4,
   },
   Object {
-    "x": 1607436780000,
-    "y": 0,
+    "x": 1627374240000,
+    "y": 0.25,
   },
   Object {
-    "x": 1607436840000,
+    "x": 1627374300000,
     "y": 0,
   },
   Object {
-    "x": 1607436900000,
+    "x": 1627374360000,
     "y": 0,
   },
   Object {
-    "x": 1607436960000,
-    "y": null,
+    "x": 1627374420000,
+    "y": 0,
   },
   Object {
-    "x": 1607437020000,
+    "x": 1627374480000,
     "y": 0,
   },
   Object {
-    "x": 1607437080000,
-    "y": null,
+    "x": 1627374540000,
+    "y": 0,
   },
   Object {
-    "x": 1607437140000,
+    "x": 1627374600000,
     "y": 0,
   },
   Object {
-    "x": 1607437200000,
-    "y": 1,
+    "x": 1627374660000,
+    "y": 0.0833333333333333,
   },
   Object {
-    "x": 1607437260000,
-    "y": 0,
+    "x": 1627374720000,
+    "y": null,
   },
   Object {
-    "x": 1607437320000,
-    "y": null,
+    "x": 1627374780000,
+    "y": 0,
   },
   Object {
-    "x": 1607437380000,
-    "y": 0.142857142857143,
+    "x": 1627374840000,
+    "y": 0.333333333333333,
   },
   Object {
-    "x": 1607437440000,
-    "y": null,
+    "x": 1627374900000,
+    "y": 0.2,
   },
   Object {
-    "x": 1607437500000,
-    "y": 0.222222222222222,
+    "x": 1627374960000,
+    "y": 0,
   },
   Object {
-    "x": 1607437560000,
-    "y": null,
+    "x": 1627375020000,
+    "y": 0,
   },
   Object {
-    "x": 1607437620000,
-    "y": 1,
+    "x": 1627375080000,
+    "y": null,
   },
 ]
 `;
diff --git a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/latency.snap b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/latency.snap
index 0a4a788b421c9..6b03e300db340 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/latency.snap
+++ b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/latency.snap
@@ -3,44 +3,64 @@
 exports[`APM API tests basic apm_8.0.0 Latency with a basic license when data is loaded time comparison returns some data 1`] = `
 Array [
   Object {
-    "x": 1607436780000,
-    "y": 36479,
+    "x": 1627374180000,
+    "y": 17647,
   },
   Object {
-    "x": 1607436840000,
-    "y": 16383,
+    "x": 1627374240000,
+    "y": 15743,
   },
   Object {
-    "x": 1607436960000,
-    "y": 35081.6666666667,
+    "x": 1627374300000,
+    "y": 81311,
   },
   Object {
-    "x": 1607437080000,
-    "y": 31019,
+    "x": 1627374360000,
+    "y": 12303,
   },
   Object {
-    "x": 1607437140000,
-    "y": 22271,
+    "x": 1627374420000,
+    "y": 11344.4545454545,
   },
   Object {
-    "x": 1607437200000,
-    "y": 21972.3333333333,
+    "x": 1627374480000,
+    "y": 17843,
   },
   Object {
-    "x": 1607437260000,
-    "y": 21033.6666666667,
+    "x": 1627374540000,
+    "y": 35049.6666666667,
   },
   Object {
-    "x": 1607437320000,
-    "y": 22559,
+    "x": 1627374600000,
+    "y": 19551,
   },
   Object {
-    "x": 1607437440000,
-    "y": 12704.4545454545,
+    "x": 1627374660000,
+    "y": 34125.5454545455,
   },
   Object {
-    "x": 1607437560000,
-    "y": 13687,
+    "x": 1627374720000,
+    "y": 34247,
+  },
+  Object {
+    "x": 1627374780000,
+    "y": 9727,
+  },
+  Object {
+    "x": 1627374840000,
+    "y": 19711,
+  },
+  Object {
+    "x": 1627374900000,
+    "y": 33738.6363636364,
+  },
+  Object {
+    "x": 1627374960000,
+    "y": 17160.1428571429,
+  },
+  Object {
+    "x": 1627375020000,
+    "y": 14847,
   },
 ]
 `;
@@ -48,59 +68,64 @@ Array [
 exports[`APM API tests basic apm_8.0.0 Latency with a basic license when data is loaded time comparison returns some data 2`] = `
 Array [
   Object {
-    "x": 1607436780000,
-    "y": 24047,
+    "x": 1627374180000,
+    "y": 11951,
   },
   Object {
-    "x": 1607436840000,
-    "y": 16895,
+    "x": 1627374240000,
+    "y": 13195.8,
   },
   Object {
-    "x": 1607436900000,
-    "y": 21631,
+    "x": 1627374300000,
+    "y": 33892,
   },
   Object {
-    "x": 1607437020000,
-    "y": 22980.3333333333,
+    "x": 1627374360000,
+    "y": 18893.2222222222,
   },
   Object {
-    "x": 1607437140000,
-    "y": 17145.6666666667,
+    "x": 1627374420000,
+    "y": 24063,
   },
   Object {
-    "x": 1607437200000,
-    "y": 24383,
+    "x": 1627374480000,
+    "y": 22984.1428571429,
   },
   Object {
-    "x": 1607437260000,
-    "y": 24271,
+    "x": 1627374540000,
+    "y": 22100.3333333333,
   },
   Object {
-    "x": 1607437380000,
-    "y": 22711,
+    "x": 1627374600000,
+    "y": 11497.6666666667,
   },
   Object {
-    "x": 1607437500000,
-    "y": 32234.0769230769,
+    "x": 1627374660000,
+    "y": 16639,
   },
   Object {
-    "x": 1607437620000,
-    "y": 63407,
+    "x": 1627374720000,
+    "y": 16719,
   },
-]
-`;
-
-exports[`APM API tests trial apm_8.0.0 Transaction latency with a trial license when data is loaded when not defined environments is seleted should return the correct anomaly boundaries 1`] = `
-Array [
   Object {
-    "x": 1607436000000,
-    "y": 0,
-    "y0": 0,
+    "x": 1627374780000,
+    "y": 18352.7777777778,
   },
   Object {
-    "x": 1607436900000,
-    "y": 0,
-    "y0": 0,
+    "x": 1627374840000,
+    "y": 7635.57142857143,
+  },
+  Object {
+    "x": 1627374900000,
+    "y": 14345.6666666667,
+  },
+  Object {
+    "x": 1627374960000,
+    "y": 10291.5714285714,
+  },
+  Object {
+    "x": 1627375020000,
+    "y": 11847,
   },
 ]
 `;
@@ -108,14 +133,14 @@ Array [
 exports[`APM API tests trial apm_8.0.0 Transaction latency with a trial license when data is loaded with environment selected should return a non-empty anomaly series 1`] = `
 Array [
   Object {
-    "x": 1607436000000,
-    "y": 136610.507897203,
-    "y0": 22581.5157631454,
+    "x": 1627373700000,
+    "y": 430148.522515332,
+    "y0": 0,
   },
   Object {
-    "x": 1607436900000,
-    "y": 136610.507897203,
-    "y0": 22581.5157631454,
+    "x": 1627374600000,
+    "y": 431362.606025631,
+    "y0": 0,
   },
 ]
 `;
diff --git a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/top_transaction_groups.snap b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/top_transaction_groups.snap
index d1a1bf56c504c..5a075ce3eda46 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/top_transaction_groups.snap
+++ b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/top_transaction_groups.snap
@@ -3,134 +3,154 @@
 exports[`APM API tests basic apm_8.0.0 Top transaction groups when data is loaded returns the correct buckets (when ignoring samples) 1`] = `
 Array [
   Object {
-    "averageResponseTime": 2731,
+    "averageResponseTime": 1841.66666666667,
     "impact": 0,
-    "key": "GET /*",
-    "p95": 3504,
+    "key": "POST /api/orders",
+    "p95": 2600,
     "serviceName": "opbeans-node",
-    "transactionName": "GET /*",
+    "transactionName": "POST /api/orders",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.1,
   },
   Object {
-    "averageResponseTime": 11151,
-    "impact": 0.796826141612071,
-    "key": "GET /api/products/:id",
-    "p95": 17632,
+    "averageResponseTime": 3015,
+    "impact": 0.016184662836617,
+    "key": "GET /*",
+    "p95": 3952,
     "serviceName": "opbeans-node",
-    "transactionName": "GET /api/products/:id",
+    "transactionName": "GET /*",
     "transactionType": "request",
     "transactionsPerMinute": 0.0666666666666667,
   },
   Object {
-    "averageResponseTime": 12887,
-    "impact": 1.03997786983119,
-    "key": "GET /api/orders/:id",
-    "p95": 22128,
+    "averageResponseTime": 15807,
+    "impact": 0.329526145120981,
+    "key": "POST /api",
+    "p95": 15744,
     "serviceName": "opbeans-node",
-    "transactionName": "GET /api/orders/:id",
+    "transactionName": "POST /api",
     "transactionType": "request",
     "transactionsPerMinute": 0.0333333333333333,
   },
   Object {
-    "averageResponseTime": 11655,
-    "impact": 2.4998686896629,
+    "averageResponseTime": 7135,
+    "impact": 0.508935536327678,
     "key": "GET /api/products",
-    "p95": 21728,
+    "p95": 9760,
     "serviceName": "opbeans-node",
     "transactionName": "GET /api/products",
     "transactionType": "request",
     "transactionsPerMinute": 0.1,
   },
   Object {
-    "averageResponseTime": 15817.6666666667,
-    "impact": 2.55820549542515,
-    "key": "GET /api/types",
-    "p95": 21600,
-    "serviceName": "opbeans-node",
-    "transactionName": "GET /api/types",
-    "transactionType": "request",
-    "transactionsPerMinute": 0.1,
-  },
-  Object {
-    "averageResponseTime": 12559,
-    "impact": 2.75310505177129,
-    "key": "GET /api/products/:id/customers",
-    "p95": 28384,
+    "averageResponseTime": 11167,
+    "impact": 0.538708906179593,
+    "key": "GET /api/orders/:id",
+    "p95": 11264,
     "serviceName": "opbeans-node",
-    "transactionName": "GET /api/products/:id/customers",
+    "transactionName": "GET /api/orders/:id",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.0666666666666667,
   },
   Object {
-    "averageResponseTime": 17391,
-    "impact": 4.10668702268692,
-    "key": "GET /api/orders",
-    "p95": 21600,
+    "averageResponseTime": 8097.66666666667,
+    "impact": 1.38005498298527,
+    "key": "GET /api/products/:id",
+    "p95": 14640,
     "serviceName": "opbeans-node",
-    "transactionName": "GET /api/orders",
+    "transactionName": "GET /api/products/:id",
     "transactionType": "request",
-    "transactionsPerMinute": 0.133333333333333,
+    "transactionsPerMinute": 0.2,
   },
   Object {
-    "averageResponseTime": 12739.5714285714,
-    "impact": 5.48022816484175,
+    "averageResponseTime": 8836.33333333333,
+    "impact": 1.5220954298999,
     "key": "GET /api/products/top",
-    "p95": 23024,
+    "p95": 12144,
     "serviceName": "opbeans-node",
     "transactionName": "GET /api/products/top",
     "transactionType": "request",
     "transactionsPerMinute": 0.2,
   },
   Object {
-    "averageResponseTime": 20984.6,
-    "impact": 6.58295486776174,
+    "averageResponseTime": 7675,
+    "impact": 1.79072878415044,
     "key": "GET /api/customers/:id",
-    "p95": 58592,
+    "p95": 25200,
     "serviceName": "opbeans-node",
     "transactionName": "GET /api/customers/:id",
     "transactionType": "request",
-    "transactionsPerMinute": 0.166666666666667,
+    "transactionsPerMinute": 0.266666666666667,
+  },
+  Object {
+    "averageResponseTime": 7919,
+    "impact": 1.85328811456049,
+    "key": "GET /api/orders",
+    "p95": 13216,
+    "serviceName": "opbeans-node",
+    "transactionName": "GET /api/orders",
+    "transactionType": "request",
+    "transactionsPerMinute": 0.266666666666667,
+  },
+  Object {
+    "averageResponseTime": 9546.42857142857,
+    "impact": 1.9645937265042,
+    "key": "GET /api/types",
+    "p95": 15408,
+    "serviceName": "opbeans-node",
+    "transactionName": "GET /api/types",
+    "transactionType": "request",
+    "transactionsPerMinute": 0.233333333333333,
   },
   Object {
-    "averageResponseTime": 17301.8571428571,
-    "impact": 7.71677585850698,
+    "averageResponseTime": 12204.7142857143,
+    "impact": 2.56095849098691,
     "key": "GET /api/types/:id",
-    "p95": 35040,
+    "p95": 29024,
     "serviceName": "opbeans-node",
     "transactionName": "GET /api/types/:id",
     "transactionType": "request",
     "transactionsPerMinute": 0.233333333333333,
   },
   Object {
-    "averageResponseTime": 22900.3333333333,
-    "impact": 8.85753003505111,
+    "averageResponseTime": 8292.64705882353,
+    "impact": 4.34101501231637,
+    "key": "GET /api/products/:id/customers",
+    "p95": 13360,
+    "serviceName": "opbeans-node",
+    "transactionName": "GET /api/products/:id/customers",
+    "transactionType": "request",
+    "transactionsPerMinute": 0.566666666666667,
+  },
+  Object {
+    "averageResponseTime": 14449,
+    "impact": 7.23210857633296,
     "key": "GET /api/stats",
-    "p95": 44768,
+    "p95": 20704,
     "serviceName": "opbeans-node",
     "transactionName": "GET /api/stats",
     "transactionType": "request",
-    "transactionsPerMinute": 0.166666666666667,
+    "transactionsPerMinute": 0.533333333333333,
   },
   Object {
-    "averageResponseTime": 34943,
-    "impact": 13.9177752177125,
+    "averageResponseTime": 26807.8888888889,
+    "impact": 7.5553851981804,
     "key": "GET /api/customers",
-    "p95": 42880,
+    "p95": 43136,
     "serviceName": "opbeans-node",
     "transactionName": "GET /api/customers",
     "transactionType": "request",
-    "transactionsPerMinute": 0.166666666666667,
+    "transactionsPerMinute": 0.3,
   },
   Object {
-    "averageResponseTime": 35093.6341463415,
+    "averageResponseTime": 33610.3548387097,
     "impact": 100,
     "key": "GET /api",
-    "p95": 103392,
+    "p95": 98272,
     "serviceName": "opbeans-node",
     "transactionName": "GET /api",
     "transactionType": "request",
-    "transactionsPerMinute": 0.9,
+    "transactionsPerMinute": 3.1,
   },
 ]
 `;
diff --git a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/transactions_groups_detailed_statistics.snap b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/transactions_groups_detailed_statistics.snap
index c3160aa50f71d..c59c6bf285f2a 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/transactions_groups_detailed_statistics.snap
+++ b/x-pack/test/apm_api_integration/tests/transactions/__snapshots__/transactions_groups_detailed_statistics.snap
@@ -3,67 +3,67 @@
 exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns data with previous period returns correct error rate data 1`] = `
 Array [
   Object {
-    "x": 1607436720000,
+    "x": 1627374180000,
     "y": null,
   },
   Object {
-    "x": 1607436780000,
-    "y": null,
+    "x": 1627374240000,
+    "y": 0,
   },
   Object {
-    "x": 1607436840000,
-    "y": null,
+    "x": 1627374300000,
+    "y": 0,
   },
   Object {
-    "x": 1607436900000,
-    "y": null,
+    "x": 1627374360000,
+    "y": 0,
   },
   Object {
-    "x": 1607436960000,
+    "x": 1627374420000,
     "y": 0,
   },
   Object {
-    "x": 1607437020000,
-    "y": null,
+    "x": 1627374480000,
+    "y": 0,
   },
   Object {
-    "x": 1607437080000,
-    "y": null,
+    "x": 1627374540000,
+    "y": 0,
   },
   Object {
-    "x": 1607437140000,
-    "y": null,
+    "x": 1627374600000,
+    "y": 0,
   },
   Object {
-    "x": 1607437200000,
-    "y": 0.5,
+    "x": 1627374660000,
+    "y": null,
   },
   Object {
-    "x": 1607437260000,
+    "x": 1627374720000,
     "y": null,
   },
   Object {
-    "x": 1607437320000,
+    "x": 1627374780000,
     "y": null,
   },
   Object {
-    "x": 1607437380000,
-    "y": null,
+    "x": 1627374840000,
+    "y": 0,
   },
   Object {
-    "x": 1607437440000,
-    "y": null,
+    "x": 1627374900000,
+    "y": 0,
   },
   Object {
-    "x": 1607437500000,
-    "y": null,
+    "x": 1627374960000,
+    "y": 0,
   },
   Object {
-    "x": 1607437560000,
-    "y": null,
+    "x": 1627375020000,
+    "y": 0,
   },
   Object {
-    "x": 1607437620000,
+    "x": 1627375080000,
     "y": null,
   },
 ]
@@ -72,67 +72,67 @@ Array [
 exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns data with previous period returns correct error rate data 2`] = `
 Array [
   Object {
-    "x": 1607436720000,
+    "x": 1627374180000,
+    "y": 0.5,
+  },
+  Object {
+    "x": 1627374240000,
     "y": null,
   },
   Object {
-    "x": 1607436780000,
+    "x": 1627374300000,
     "y": 0,
   },
   Object {
-    "x": 1607436840000,
+    "x": 1627374360000,
     "y": 0,
   },
   Object {
-    "x": 1607436900000,
+    "x": 1627374420000,
     "y": 0,
   },
   Object {
-    "x": 1607436960000,
+    "x": 1627374480000,
     "y": null,
   },
   Object {
-    "x": 1607437020000,
+    "x": 1627374540000,
     "y": 0,
   },
   Object {
-    "x": 1607437080000,
-    "y": null,
+    "x": 1627374600000,
+    "y": 0,
   },
   Object {
-    "x": 1607437140000,
+    "x": 1627374660000,
     "y": 0,
   },
   Object {
-    "x": 1607437200000,
+    "x": 1627374720000,
     "y": null,
   },
   Object {
-    "x": 1607437260000,
-    "y": null,
+    "x": 1627374780000,
+    "y": 0,
   },
   Object {
-    "x": 1607437320000,
+    "x": 1627374840000,
     "y": null,
   },
   Object {
-    "x": 1607437380000,
+    "x": 1627374900000,
     "y": 0,
   },
   Object {
-    "x": 1607437440000,
-    "y": null,
-  },
-  Object {
-    "x": 1607437500000,
+    "x": 1627374960000,
     "y": 0,
   },
   Object {
-    "x": 1607437560000,
-    "y": null,
+    "x": 1627375020000,
+    "y": 0,
   },
   Object {
-    "x": 1607437620000,
+    "x": 1627375080000,
     "y": null,
   },
 ]
@@ -141,67 +141,67 @@ Array [
 exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns data with previous period returns correct latency data 1`] = `
 Array [
   Object {
-    "x": 1607436720000,
+    "x": 1627374180000,
     "y": null,
   },
   Object {
-    "x": 1607436780000,
-    "y": null,
+    "x": 1627374240000,
+    "y": 28457.6666666667,
   },
   Object {
-    "x": 1607436840000,
-    "y": null,
+    "x": 1627374300000,
+    "y": 6847,
   },
   Object {
-    "x": 1607436900000,
-    "y": null,
+    "x": 1627374360000,
+    "y": 10367,
   },
   Object {
-    "x": 1607436960000,
-    "y": 30527,
+    "x": 1627374420000,
+    "y": 17769.6666666667,
   },
   Object {
-    "x": 1607437020000,
-    "y": null,
+    "x": 1627374480000,
+    "y": 30591,
   },
   Object {
-    "x": 1607437080000,
-    "y": null,
+    "x": 1627374540000,
+    "y": 68479,
   },
   Object {
-    "x": 1607437140000,
-    "y": null,
+    "x": 1627374600000,
+    "y": 56788.3333333333,
   },
   Object {
-    "x": 1607437200000,
-    "y": 47167,
+    "x": 1627374660000,
+    "y": null,
   },
   Object {
-    "x": 1607437260000,
+    "x": 1627374720000,
     "y": null,
   },
   Object {
-    "x": 1607437320000,
+    "x": 1627374780000,
     "y": null,
   },
   Object {
-    "x": 1607437380000,
-    "y": null,
+    "x": 1627374840000,
+    "y": 8959,
   },
   Object {
-    "x": 1607437440000,
-    "y": null,
+    "x": 1627374900000,
+    "y": 55999,
   },
   Object {
-    "x": 1607437500000,
-    "y": null,
+    "x": 1627374960000,
+    "y": 37055,
   },
   Object {
-    "x": 1607437560000,
-    "y": null,
+    "x": 1627375020000,
+    "y": 23935,
   },
   Object {
-    "x": 1607437620000,
+    "x": 1627375080000,
     "y": null,
   },
 ]
@@ -210,67 +210,67 @@ Array [
 exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns data with previous period returns correct latency data 2`] = `
 Array [
   Object {
-    "x": 1607436720000,
+    "x": 1627374180000,
+    "y": 16543,
+  },
+  Object {
+    "x": 1627374240000,
     "y": null,
   },
   Object {
-    "x": 1607436780000,
-    "y": 69631,
+    "x": 1627374300000,
+    "y": 33855,
   },
   Object {
-    "x": 1607436840000,
-    "y": 8093695,
+    "x": 1627374360000,
+    "y": 25167,
   },
   Object {
-    "x": 1607436900000,
-    "y": 31999,
+    "x": 1627374420000,
+    "y": 13247,
   },
   Object {
-    "x": 1607436960000,
+    "x": 1627374480000,
     "y": null,
   },
   Object {
-    "x": 1607437020000,
-    "y": 47871,
+    "x": 1627374540000,
+    "y": 50687,
   },
   Object {
-    "x": 1607437080000,
-    "y": null,
+    "x": 1627374600000,
+    "y": 19007,
   },
   Object {
-    "x": 1607437140000,
-    "y": 35519,
+    "x": 1627374660000,
+    "y": 31615,
   },
   Object {
-    "x": 1607437200000,
+    "x": 1627374720000,
     "y": null,
   },
   Object {
-    "x": 1607437260000,
-    "y": null,
+    "x": 1627374780000,
+    "y": 10879,
   },
   Object {
-    "x": 1607437320000,
+    "x": 1627374840000,
     "y": null,
   },
   Object {
-    "x": 1607437380000,
-    "y": 48255,
-  },
-  Object {
-    "x": 1607437440000,
-    "y": null,
+    "x": 1627374900000,
+    "y": 16607,
   },
   Object {
-    "x": 1607437500000,
-    "y": 35583,
+    "x": 1627374960000,
+    "y": 6687,
   },
   Object {
-    "x": 1607437560000,
-    "y": null,
+    "x": 1627375020000,
+    "y": 45976.6,
   },
   Object {
-    "x": 1607437620000,
+    "x": 1627375080000,
     "y": null,
   },
 ]
@@ -279,67 +279,67 @@ Array [
 exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns data with previous period returns correct throughput data 1`] = `
 Array [
   Object {
-    "x": 1607436720000,
+    "x": 1627374180000,
     "y": 0,
   },
   Object {
-    "x": 1607436780000,
-    "y": 0,
+    "x": 1627374240000,
+    "y": 2,
   },
   Object {
-    "x": 1607436840000,
-    "y": 0,
+    "x": 1627374300000,
+    "y": 1,
   },
   Object {
-    "x": 1607436900000,
-    "y": 0,
+    "x": 1627374360000,
+    "y": 1,
   },
   Object {
-    "x": 1607436960000,
+    "x": 1627374420000,
     "y": 2,
   },
   Object {
-    "x": 1607437020000,
-    "y": 0,
-  },
-  Object {
-    "x": 1607437080000,
-    "y": 0,
+    "x": 1627374480000,
+    "y": 1,
   },
   Object {
-    "x": 1607437140000,
-    "y": 0,
+    "x": 1627374540000,
+    "y": 2,
   },
   Object {
-    "x": 1607437200000,
+    "x": 1627374600000,
     "y": 2,
   },
   Object {
-    "x": 1607437260000,
+    "x": 1627374660000,
     "y": 0,
   },
   Object {
-    "x": 1607437320000,
+    "x": 1627374720000,
     "y": 0,
   },
   Object {
-    "x": 1607437380000,
+    "x": 1627374780000,
     "y": 0,
   },
   Object {
-    "x": 1607437440000,
-    "y": 0,
+    "x": 1627374840000,
+    "y": 1,
   },
   Object {
-    "x": 1607437500000,
-    "y": 0,
+    "x": 1627374900000,
+    "y": 1,
   },
   Object {
-    "x": 1607437560000,
-    "y": 0,
+    "x": 1627374960000,
+    "y": 2,
+  },
+  Object {
+    "x": 1627375020000,
+    "y": 1,
   },
   Object {
-    "x": 1607437620000,
+    "x": 1627375080000,
     "y": 0,
   },
 ]
@@ -348,67 +348,67 @@ Array [
 exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns data with previous period returns correct throughput data 2`] = `
 Array [
   Object {
-    "x": 1607436720000,
+    "x": 1627374180000,
+    "y": 2,
+  },
+  Object {
+    "x": 1627374240000,
     "y": 0,
   },
   Object {
-    "x": 1607436780000,
-    "y": 1,
+    "x": 1627374300000,
+    "y": 4,
   },
   Object {
-    "x": 1607436840000,
-    "y": 1,
+    "x": 1627374360000,
+    "y": 4,
   },
   Object {
-    "x": 1607436900000,
+    "x": 1627374420000,
     "y": 1,
   },
   Object {
-    "x": 1607436960000,
+    "x": 1627374480000,
     "y": 0,
   },
   Object {
-    "x": 1607437020000,
+    "x": 1627374540000,
     "y": 1,
   },
   Object {
-    "x": 1607437080000,
-    "y": 0,
+    "x": 1627374600000,
+    "y": 3,
   },
   Object {
-    "x": 1607437140000,
-    "y": 1,
+    "x": 1627374660000,
+    "y": 2,
   },
   Object {
-    "x": 1607437200000,
+    "x": 1627374720000,
     "y": 0,
   },
   Object {
-    "x": 1607437260000,
-    "y": 0,
+    "x": 1627374780000,
+    "y": 1,
   },
   Object {
-    "x": 1607437320000,
+    "x": 1627374840000,
     "y": 0,
   },
   Object {
-    "x": 1607437380000,
-    "y": 2,
-  },
-  Object {
-    "x": 1607437440000,
-    "y": 0,
+    "x": 1627374900000,
+    "y": 1,
   },
   Object {
-    "x": 1607437500000,
+    "x": 1627374960000,
     "y": 1,
   },
   Object {
-    "x": 1607437560000,
-    "y": 0,
+    "x": 1627375020000,
+    "y": 3,
   },
   Object {
-    "x": 1607437620000,
+    "x": 1627375080000,
     "y": 0,
   },
 ]
@@ -417,127 +417,127 @@ Array [
 exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns the correct data 1`] = `
 Array [
   Object {
-    "x": 1607435820000,
+    "x": 1627373280000,
+    "y": 16543,
+  },
+  Object {
+    "x": 1627373340000,
     "y": null,
   },
   Object {
-    "x": 1607435880000,
-    "y": 69631,
+    "x": 1627373400000,
+    "y": 33855,
   },
   Object {
-    "x": 1607435940000,
-    "y": 8093695,
+    "x": 1627373460000,
+    "y": 25167,
   },
   Object {
-    "x": 1607436000000,
-    "y": 31999,
+    "x": 1627373520000,
+    "y": 13247,
   },
   Object {
-    "x": 1607436060000,
+    "x": 1627373580000,
     "y": null,
   },
   Object {
-    "x": 1607436120000,
-    "y": 47871,
+    "x": 1627373640000,
+    "y": 50687,
   },
   Object {
-    "x": 1607436180000,
-    "y": null,
+    "x": 1627373700000,
+    "y": 19007,
   },
   Object {
-    "x": 1607436240000,
-    "y": 35519,
+    "x": 1627373760000,
+    "y": 31615,
   },
   Object {
-    "x": 1607436300000,
+    "x": 1627373820000,
     "y": null,
   },
   Object {
-    "x": 1607436360000,
-    "y": null,
+    "x": 1627373880000,
+    "y": 10879,
   },
   Object {
-    "x": 1607436420000,
+    "x": 1627373940000,
     "y": null,
   },
   Object {
-    "x": 1607436480000,
-    "y": 48255,
+    "x": 1627374000000,
+    "y": 16607,
   },
   Object {
-    "x": 1607436540000,
-    "y": null,
+    "x": 1627374060000,
+    "y": 6687,
   },
   Object {
-    "x": 1607436600000,
-    "y": 35583,
+    "x": 1627374120000,
+    "y": 45976.6,
   },
   Object {
-    "x": 1607436660000,
+    "x": 1627374180000,
     "y": null,
   },
   Object {
-    "x": 1607436720000,
-    "y": null,
+    "x": 1627374240000,
+    "y": 28457.6666666667,
   },
   Object {
-    "x": 1607436780000,
-    "y": null,
+    "x": 1627374300000,
+    "y": 6847,
   },
   Object {
-    "x": 1607436840000,
-    "y": null,
+    "x": 1627374360000,
+    "y": 10367,
   },
   Object {
-    "x": 1607436900000,
-    "y": null,
+    "x": 1627374420000,
+    "y": 17769.6666666667,
   },
   Object {
-    "x": 1607436960000,
-    "y": 30527,
+    "x": 1627374480000,
+    "y": 30591,
   },
   Object {
-    "x": 1607437020000,
-    "y": null,
+    "x": 1627374540000,
+    "y": 68479,
   },
   Object {
-    "x": 1607437080000,
-    "y": null,
+    "x": 1627374600000,
+    "y": 56788.3333333333,
   },
   Object {
-    "x": 1607437140000,
+    "x": 1627374660000,
     "y": null,
   },
   Object {
-    "x": 1607437200000,
-    "y": 47167,
-  },
-  Object {
-    "x": 1607437260000,
+    "x": 1627374720000,
     "y": null,
   },
   Object {
-    "x": 1607437320000,
+    "x": 1627374780000,
     "y": null,
   },
   Object {
-    "x": 1607437380000,
-    "y": null,
+    "x": 1627374840000,
+    "y": 8959,
   },
   Object {
-    "x": 1607437440000,
-    "y": null,
+    "x": 1627374900000,
+    "y": 55999,
   },
   Object {
-    "x": 1607437500000,
-    "y": null,
+    "x": 1627374960000,
+    "y": 37055,
   },
   Object {
-    "x": 1607437560000,
-    "y": null,
+    "x": 1627375020000,
+    "y": 23935,
   },
   Object {
-    "x": 1607437620000,
+    "x": 1627375080000,
     "y": null,
   },
 ]
@@ -546,127 +546,127 @@ Array [
 exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns the correct data 2`] = `
 Array [
   Object {
-    "x": 1607435820000,
-    "y": 0,
-  },
-  Object {
-    "x": 1607435880000,
-    "y": 1,
+    "x": 1627373280000,
+    "y": 2,
   },
   Object {
-    "x": 1607435940000,
-    "y": 1,
+    "x": 1627373340000,
+    "y": 0,
   },
   Object {
-    "x": 1607436000000,
-    "y": 1,
+    "x": 1627373400000,
+    "y": 4,
   },
   Object {
-    "x": 1607436060000,
-    "y": 0,
+    "x": 1627373460000,
+    "y": 4,
   },
   Object {
-    "x": 1607436120000,
+    "x": 1627373520000,
     "y": 1,
   },
   Object {
-    "x": 1607436180000,
+    "x": 1627373580000,
     "y": 0,
   },
   Object {
-    "x": 1607436240000,
+    "x": 1627373640000,
     "y": 1,
   },
   Object {
-    "x": 1607436300000,
-    "y": 0,
+    "x": 1627373700000,
+    "y": 3,
   },
   Object {
-    "x": 1607436360000,
-    "y": 0,
+    "x": 1627373760000,
+    "y": 2,
   },
   Object {
-    "x": 1607436420000,
+    "x": 1627373820000,
     "y": 0,
   },
   Object {
-    "x": 1607436480000,
-    "y": 2,
+    "x": 1627373880000,
+    "y": 1,
   },
   Object {
-    "x": 1607436540000,
+    "x": 1627373940000,
     "y": 0,
   },
   Object {
-    "x": 1607436600000,
+    "x": 1627374000000,
     "y": 1,
   },
   Object {
-    "x": 1607436660000,
-    "y": 0,
+    "x": 1627374060000,
+    "y": 1,
   },
   Object {
-    "x": 1607436720000,
-    "y": 0,
+    "x": 1627374120000,
+    "y": 3,
   },
   Object {
-    "x": 1607436780000,
+    "x": 1627374180000,
     "y": 0,
   },
   Object {
-    "x": 1607436840000,
-    "y": 0,
+    "x": 1627374240000,
+    "y": 2,
   },
   Object {
-    "x": 1607436900000,
-    "y": 0,
+    "x": 1627374300000,
+    "y": 1,
   },
   Object {
-    "x": 1607436960000,
-    "y": 2,
+    "x": 1627374360000,
+    "y": 1,
   },
   Object {
-    "x": 1607437020000,
-    "y": 0,
+    "x": 1627374420000,
+    "y": 2,
   },
   Object {
-    "x": 1607437080000,
-    "y": 0,
+    "x": 1627374480000,
+    "y": 1,
   },
   Object {
-    "x": 1607437140000,
-    "y": 0,
+    "x": 1627374540000,
+    "y": 2,
   },
   Object {
-    "x": 1607437200000,
+    "x": 1627374600000,
     "y": 2,
   },
   Object {
-    "x": 1607437260000,
+    "x": 1627374660000,
     "y": 0,
   },
   Object {
-    "x": 1607437320000,
+    "x": 1627374720000,
     "y": 0,
   },
   Object {
-    "x": 1607437380000,
+    "x": 1627374780000,
     "y": 0,
   },
   Object {
-    "x": 1607437440000,
-    "y": 0,
+    "x": 1627374840000,
+    "y": 1,
   },
   Object {
-    "x": 1607437500000,
-    "y": 0,
+    "x": 1627374900000,
+    "y": 1,
   },
   Object {
-    "x": 1607437560000,
-    "y": 0,
+    "x": 1627374960000,
+    "y": 2,
   },
   Object {
-    "x": 1607437620000,
+    "x": 1627375020000,
+    "y": 1,
+  },
+  Object {
+    "x": 1627375080000,
     "y": 0,
   },
 ]
@@ -675,127 +675,127 @@ Array [
 exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns the correct data 3`] = `
 Array [
   Object {
-    "x": 1607435820000,
+    "x": 1627373280000,
+    "y": 0.5,
+  },
+  Object {
+    "x": 1627373340000,
     "y": null,
   },
   Object {
-    "x": 1607435880000,
+    "x": 1627373400000,
     "y": 0,
   },
   Object {
-    "x": 1607435940000,
+    "x": 1627373460000,
     "y": 0,
   },
   Object {
-    "x": 1607436000000,
+    "x": 1627373520000,
     "y": 0,
   },
   Object {
-    "x": 1607436060000,
+    "x": 1627373580000,
     "y": null,
   },
   Object {
-    "x": 1607436120000,
+    "x": 1627373640000,
     "y": 0,
   },
   Object {
-    "x": 1607436180000,
-    "y": null,
+    "x": 1627373700000,
+    "y": 0,
   },
   Object {
-    "x": 1607436240000,
+    "x": 1627373760000,
     "y": 0,
   },
   Object {
-    "x": 1607436300000,
+    "x": 1627373820000,
     "y": null,
   },
   Object {
-    "x": 1607436360000,
-    "y": null,
+    "x": 1627373880000,
+    "y": 0,
   },
   Object {
-    "x": 1607436420000,
+    "x": 1627373940000,
     "y": null,
   },
   Object {
-    "x": 1607436480000,
+    "x": 1627374000000,
     "y": 0,
   },
   Object {
-    "x": 1607436540000,
-    "y": null,
+    "x": 1627374060000,
+    "y": 0,
   },
   Object {
-    "x": 1607436600000,
+    "x": 1627374120000,
     "y": 0,
   },
   Object {
-    "x": 1607436660000,
+    "x": 1627374180000,
     "y": null,
   },
   Object {
-    "x": 1607436720000,
-    "y": null,
+    "x": 1627374240000,
+    "y": 0,
   },
   Object {
-    "x": 1607436780000,
-    "y": null,
+    "x": 1627374300000,
+    "y": 0,
   },
   Object {
-    "x": 1607436840000,
-    "y": null,
+    "x": 1627374360000,
+    "y": 0,
   },
   Object {
-    "x": 1607436900000,
-    "y": null,
+    "x": 1627374420000,
+    "y": 0,
   },
   Object {
-    "x": 1607436960000,
+    "x": 1627374480000,
     "y": 0,
   },
   Object {
-    "x": 1607437020000,
-    "y": null,
+    "x": 1627374540000,
+    "y": 0,
   },
   Object {
-    "x": 1607437080000,
-    "y": null,
+    "x": 1627374600000,
+    "y": 0,
   },
   Object {
-    "x": 1607437140000,
+    "x": 1627374660000,
     "y": null,
   },
   Object {
-    "x": 1607437200000,
-    "y": 0.5,
-  },
-  Object {
-    "x": 1607437260000,
+    "x": 1627374720000,
     "y": null,
   },
   Object {
-    "x": 1607437320000,
+    "x": 1627374780000,
     "y": null,
   },
   Object {
-    "x": 1607437380000,
-    "y": null,
+    "x": 1627374840000,
+    "y": 0,
   },
   Object {
-    "x": 1607437440000,
-    "y": null,
+    "x": 1627374900000,
+    "y": 0,
   },
   Object {
-    "x": 1607437500000,
-    "y": null,
+    "x": 1627374960000,
+    "y": 0,
   },
   Object {
-    "x": 1607437560000,
-    "y": null,
+    "x": 1627375020000,
+    "y": 0,
   },
   Object {
-    "x": 1607437620000,
+    "x": 1627375080000,
     "y": null,
   },
 ]
@@ -804,127 +804,127 @@ Array [
 exports[`APM API tests basic apm_8.0.0 Transaction groups detailed statistics when data is loaded returns the correct data for latency aggregation 99th percentile 1`] = `
 Array [
   Object {
-    "x": 1607435820000,
+    "x": 1627373280000,
+    "y": 20351,
+  },
+  Object {
+    "x": 1627373340000,
     "y": null,
   },
   Object {
-    "x": 1607435880000,
-    "y": 69631,
+    "x": 1627373400000,
+    "y": 54271,
   },
   Object {
-    "x": 1607435940000,
-    "y": 8224767,
+    "x": 1627373460000,
+    "y": 51455,
   },
   Object {
-    "x": 1607436000000,
-    "y": 31999,
+    "x": 1627373520000,
+    "y": 13247,
   },
   Object {
-    "x": 1607436060000,
+    "x": 1627373580000,
     "y": null,
   },
   Object {
-    "x": 1607436120000,
-    "y": 47871,
+    "x": 1627373640000,
+    "y": 50687,
   },
   Object {
-    "x": 1607436180000,
-    "y": null,
+    "x": 1627373700000,
+    "y": 24063,
   },
   Object {
-    "x": 1607436240000,
-    "y": 73727,
+    "x": 1627373760000,
+    "y": 35583,
   },
   Object {
-    "x": 1607436300000,
+    "x": 1627373820000,
     "y": null,
   },
   Object {
-    "x": 1607436360000,
-    "y": null,
+    "x": 1627373880000,
+    "y": 10879,
   },
   Object {
-    "x": 1607436420000,
+    "x": 1627373940000,
     "y": null,
   },
   Object {
-    "x": 1607436480000,
-    "y": 55295,
+    "x": 1627374000000,
+    "y": 19199,
   },
   Object {
-    "x": 1607436540000,
-    "y": null,
+    "x": 1627374060000,
+    "y": 6687,
   },
   Object {
-    "x": 1607436600000,
-    "y": 35583,
+    "x": 1627374120000,
+    "y": 54783,
   },
   Object {
-    "x": 1607436660000,
+    "x": 1627374180000,
     "y": null,
   },
   Object {
-    "x": 1607436720000,
-    "y": null,
+    "x": 1627374240000,
+    "y": 32767,
   },
   Object {
-    "x": 1607436780000,
-    "y": null,
+    "x": 1627374300000,
+    "y": 6847,
   },
   Object {
-    "x": 1607436840000,
-    "y": null,
+    "x": 1627374360000,
+    "y": 10367,
   },
   Object {
-    "x": 1607436900000,
-    "y": null,
+    "x": 1627374420000,
+    "y": 31999,
   },
   Object {
-    "x": 1607436960000,
-    "y": 46079,
+    "x": 1627374480000,
+    "y": 34303,
   },
   Object {
-    "x": 1607437020000,
-    "y": null,
+    "x": 1627374540000,
+    "y": 194559,
   },
   Object {
-    "x": 1607437080000,
-    "y": null,
+    "x": 1627374600000,
+    "y": 91135,
   },
   Object {
-    "x": 1607437140000,
+    "x": 1627374660000,
     "y": null,
   },
   Object {
-    "x": 1607437200000,
-    "y": 82943,
-  },
-  Object {
-    "x": 1607437260000,
+    "x": 1627374720000,
     "y": null,
   },
   Object {
-    "x": 1607437320000,
+    "x": 1627374780000,
     "y": null,
   },
   Object {
-    "x": 1607437380000,
-    "y": null,
+    "x": 1627374840000,
+    "y": 8959,
   },
   Object {
-    "x": 1607437440000,
-    "y": null,
+    "x": 1627374900000,
+    "y": 182271,
   },
   Object {
-    "x": 1607437500000,
-    "y": null,
+    "x": 1627374960000,
+    "y": 51455,
   },
   Object {
-    "x": 1607437560000,
-    "y": null,
+    "x": 1627375020000,
+    "y": 23935,
   },
   Object {
-    "x": 1607437620000,
+    "x": 1627375080000,
     "y": null,
   },
 ]
diff --git a/x-pack/test/apm_api_integration/tests/transactions/breakdown.ts b/x-pack/test/apm_api_integration/tests/transactions/breakdown.ts
index 8e29004deb4f3..1de8c0c331b89 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/breakdown.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/breakdown.ts
@@ -67,29 +67,29 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           };
         })
       ).toMatchInline(`
-          Array [
-            Object {
-              "x": "2020-12-08T13:57:30.000Z",
-              "y": null,
-            },
-            Object {
-              "x": "2020-12-08T13:58:00.000Z",
-              "y": null,
-            },
-            Object {
-              "x": "2020-12-08T13:58:30.000Z",
-              "y": 1,
-            },
-            Object {
-              "x": "2020-12-08T13:59:00.000Z",
-              "y": 1,
-            },
-            Object {
-              "x": "2020-12-08T13:59:30.000Z",
-              "y": null,
-            },
-          ]
-        `);
+        Array [
+          Object {
+            "x": "2021-07-27T08:08:00.000Z",
+            "y": null,
+          },
+          Object {
+            "x": "2021-07-27T08:08:30.000Z",
+            "y": 1,
+          },
+          Object {
+            "x": "2021-07-27T08:09:00.000Z",
+            "y": 1,
+          },
+          Object {
+            "x": "2021-07-27T08:09:30.000Z",
+            "y": 1,
+          },
+          Object {
+            "x": "2021-07-27T08:10:00.000Z",
+            "y": 1,
+          },
+        ]
+      `);
 
       expectSnapshot(title).toMatchInline(`"app"`);
       expectSnapshot(color).toMatchInline(`"#54b399"`);
diff --git a/x-pack/test/apm_api_integration/tests/transactions/distribution.ts b/x-pack/test/apm_api_integration/tests/transactions/distribution.ts
index cfedcc9ac2232..2c1a79889fad5 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/distribution.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/distribution.ts
@@ -64,7 +64,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       });
 
       it('returns the correct number of buckets', () => {
-        expectSnapshot(response.body.buckets.length).toMatchInline(`16`);
+        expectSnapshot(response.body.buckets.length).toMatchInline(`12`);
       });
 
       it('returns the correct bucket size', () => {
@@ -82,16 +82,16 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           .toMatchInline(`
           Array [
             Object {
-              "traceId": "af0f18dc0841cfc1f567e7e1d55cfda7",
-              "transactionId": "925f02e5ac122897",
+              "traceId": "e48afea3046e0e8c17c72bf8bfac1607",
+              "transactionId": "ed4e7a5c044aff66",
             },
             Object {
-              "traceId": "ccd327537120e857bdfa407434dfb9a4",
-              "transactionId": "c5f923159cc1b8a6",
+              "traceId": "0733f58b70d8a3fd983a15459e4a5fcf",
+              "transactionId": "564511c803125e00",
             },
             Object {
-              "traceId": "a4eb3781a21dc11d289293076fd1a1b3",
-              "transactionId": "21892bde4ff1364d",
+              "traceId": "c1bc7fcf4e999c03107c129c131fb55c",
+              "transactionId": "82c81c2c6c483da3",
             },
           ]
         `);
diff --git a/x-pack/test/apm_api_integration/tests/transactions/error_rate.ts b/x-pack/test/apm_api_integration/tests/transactions/error_rate.ts
index 7a54d616e0316..6d7abeeb1a996 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/error_rate.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/error_rate.ts
@@ -101,7 +101,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             new Date(
               first(errorRateResponse.currentPeriod.transactionErrorRate)?.x ?? NaN
             ).toISOString()
-          ).toMatchInline(`"2020-12-08T13:57:00.000Z"`);
+          ).toMatchInline(`"2021-07-27T08:08:00.000Z"`);
         });
 
         it('has the correct end date', () => {
@@ -109,7 +109,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             new Date(
               last(errorRateResponse.currentPeriod.transactionErrorRate)?.x ?? NaN
             ).toISOString()
-          ).toMatchInline(`"2020-12-08T14:27:00.000Z"`);
+          ).toMatchInline(`"2021-07-27T08:38:00.000Z"`);
         });
 
         it('has the correct number of buckets', () => {
@@ -120,7 +120,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
         it('has the correct calculation for average', () => {
           expectSnapshot(errorRateResponse.currentPeriod.average).toMatchInline(
-            `0.159420289855072`
+            `0.0646551724137931`
           );
         });
 
@@ -172,12 +172,12 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             new Date(
               first(errorRateResponse.currentPeriod.transactionErrorRate)?.x ?? NaN
             ).toISOString()
-          ).toMatchInline(`"2020-12-08T14:12:00.000Z"`);
+          ).toMatchInline(`"2021-07-27T08:23:00.000Z"`);
           expectSnapshot(
             new Date(
               first(errorRateResponse.previousPeriod.transactionErrorRate)?.x ?? NaN
             ).toISOString()
-          ).toMatchInline(`"2020-12-08T14:12:00.000Z"`);
+          ).toMatchInline(`"2021-07-27T08:23:00.000Z"`);
         });
 
         it('has the correct end date', () => {
@@ -185,12 +185,12 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             new Date(
               last(errorRateResponse.currentPeriod.transactionErrorRate)?.x ?? NaN
             ).toISOString()
-          ).toMatchInline(`"2020-12-08T14:27:00.000Z"`);
+          ).toMatchInline(`"2021-07-27T08:38:00.000Z"`);
           expectSnapshot(
             new Date(
               last(errorRateResponse.previousPeriod.transactionErrorRate)?.x ?? NaN
             ).toISOString()
-          ).toMatchInline(`"2020-12-08T14:27:00.000Z"`);
+          ).toMatchInline(`"2021-07-27T08:38:00.000Z"`);
         });
 
         it('has the correct number of buckets', () => {
@@ -204,9 +204,11 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
         it('has the correct calculation for average', () => {
           expectSnapshot(errorRateResponse.currentPeriod.average).toMatchInline(
-            `0.206896551724138`
+            `0.0514705882352941`
+          );
+          expectSnapshot(errorRateResponse.previousPeriod.average).toMatchInline(
+            `0.0833333333333333`
           );
-          expectSnapshot(errorRateResponse.previousPeriod.average).toMatchInline(`0.125`);
         });
 
         it('has the correct error rate', () => {
diff --git a/x-pack/test/apm_api_integration/tests/transactions/latency.ts b/x-pack/test/apm_api_integration/tests/transactions/latency.ts
index 1dc521e388b0b..12a84ef711ea9 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/latency.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/latency.ts
@@ -160,7 +160,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
           expect(latencyChartReturn.currentPeriod.overallAvgDuration).not.to.be(null);
           expectSnapshot(latencyChartReturn.currentPeriod.overallAvgDuration).toMatchInline(
-            `24989.3157894737`
+            `22281.4255319149`
           );
 
           expect(latencyChartReturn.currentPeriod.latencyTimeseries.length).to.be.eql(31);
@@ -293,7 +293,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           expect(latencyChartReturn).to.have.property('anomalyTimeseries');
           expect(latencyChartReturn.anomalyTimeseries).to.have.property('jobId');
           expectSnapshot(latencyChartReturn.anomalyTimeseries?.jobId).toMatchInline(
-            `"apm-production-1369-high_mean_transaction_duration"`
+            `"apm-production-802c-high_mean_transaction_duration"`
           );
         });
 
@@ -307,42 +307,6 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         });
       });
 
-      describe('when not defined environments is seleted', () => {
-        before(async () => {
-          response = await supertest.get(
-            url.format({
-              pathname: `/api/apm/services/opbeans-python/transactions/charts/latency`,
-              query: {
-                start,
-                end,
-                latencyAggregationType: 'avg',
-                transactionType,
-                environment: 'ENVIRONMENT_NOT_DEFINED',
-              },
-            })
-          );
-        });
-
-        it('should have a successful response', () => {
-          expect(response.status).to.eql(200);
-        });
-
-        it('should return the ML job id for anomalies with no defined environment', () => {
-          const latencyChartReturn = response.body as LatencyChartReturnType;
-          expect(latencyChartReturn).to.have.property('anomalyTimeseries');
-          expect(latencyChartReturn.anomalyTimeseries).to.have.property('jobId');
-          expectSnapshot(latencyChartReturn.anomalyTimeseries?.jobId).toMatchInline(
-            `"apm-environment_not_defined-5626-high_mean_transaction_duration"`
-          );
-        });
-
-        it('should return the correct anomaly boundaries', () => {
-          const latencyChartReturn = response.body as LatencyChartReturnType;
-          expect(latencyChartReturn).to.have.property('anomalyTimeseries');
-          expectSnapshot(latencyChartReturn.anomalyTimeseries?.anomalyBoundaries).toMatch();
-        });
-      });
-
       describe('with all environments selected', () => {
         before(async () => {
           response = await supertest.get(
diff --git a/x-pack/test/apm_api_integration/tests/transactions/top_transaction_groups.ts b/x-pack/test/apm_api_integration/tests/transactions/top_transaction_groups.ts
index 32effa64e60db..2125a61ac4ba2 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/top_transaction_groups.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/top_transaction_groups.ts
@@ -61,7 +61,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       });
 
       it('returns the correct number of buckets', () => {
-        expectSnapshot(response.body.items.length).toMatchInline(`13`);
+        expectSnapshot(response.body.items.length).toMatchInline(`15`);
       });
 
       it('returns the correct buckets (when ignoring samples)', async () => {
diff --git a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.ts b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.ts
index 5417a5a811db8..24bee86b3a4b4 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_detailed_statistics.ts
@@ -104,7 +104,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         expect(removeEmptyCoordinates(errorRate).length).to.be.greaterThan(0);
         expectSnapshot(errorRate).toMatch();
 
-        expectSnapshot(roundNumber(impact)).toMatchInline(`"93.93"`);
+        expectSnapshot(roundNumber(impact)).toMatchInline(`"45.25"`);
       });
 
       it('returns the correct data for latency aggregation 99th percentile', async () => {
@@ -280,8 +280,8 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           const currentPeriodFirstItem = currentPeriodItems[0];
           const previousPeriodFirstItem = previousPeriodItems[0];
 
-          expectSnapshot(roundNumber(currentPeriodFirstItem.impact)).toMatchInline(`"21.29"`);
-          expectSnapshot(roundNumber(previousPeriodFirstItem.impact)).toMatchInline(`"97.03"`);
+          expectSnapshot(roundNumber(currentPeriodFirstItem.impact)).toMatchInline(`"41.24"`);
+          expectSnapshot(roundNumber(previousPeriodFirstItem.impact)).toMatchInline(`"51.40"`);
         });
       });
     }
diff --git a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.ts b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.ts
index 63281d405efdd..c52c7efc14f62 100644
--- a/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.ts
+++ b/x-pack/test/apm_api_integration/tests/transactions/transactions_groups_main_statistics.ts
@@ -72,16 +72,16 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         ).toMatchInline(`
           Array [
             "DispatcherServlet#doGet",
+            "APIRestController#topProducts",
             "APIRestController#customerWhoBought",
-            "APIRestController#order",
-            "APIRestController#customer",
             "ResourceHttpRequestHandler",
-            "APIRestController#customers",
-            "APIRestController#topProducts",
             "APIRestController#orders",
-            "APIRestController#stats",
-            "APIRestController#product",
+            "APIRestController#customer",
             "APIRestController#products",
+            "APIRestController#product",
+            "APIRestController#order",
+            "APIRestController#stats",
+            "APIRestController#customers",
             "DispatcherServlet#doPost",
           ]
         `);
@@ -91,18 +91,18 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         );
         expectSnapshot(impacts).toMatchInline(`
           Array [
-            93.9315487787012,
-            0.850246601543056,
-            0.904925560144193,
-            0.69948730072783,
-            0.144008466274819,
-            1.35206610551638,
-            0.476127116253573,
-            0.446552298379043,
-            0.860493303928453,
-            0.262800744776717,
-            0.0620236424870074,
-            0.00972008126772269,
+            45.2518944682114,
+            7.66727553895448,
+            6.67159361826343,
+            6.77808118340561,
+            4.02770970947908,
+            5.4534910738867,
+            4.13361150758861,
+            4.84592862623963,
+            2.34043217891668,
+            7.66153990342654,
+            5.09839421730785,
+            0.0700479743199733,
           ]
         `);
 
@@ -113,11 +113,11 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         expectSnapshot(pick(firstItem, 'name', 'latency', 'throughput', 'errorRate', 'impact'))
           .toMatchInline(`
           Object {
-            "errorRate": 0.0833333333333333,
-            "impact": 93.9315487787012,
-            "latency": 1047903,
+            "errorRate": 0.0181818181818182,
+            "impact": 45.2518944682114,
+            "latency": 33710.1272727273,
             "name": "DispatcherServlet#doGet",
-            "throughput": 0.4,
+            "throughput": 1.83333333333333,
           }
         `);
       });
@@ -140,7 +140,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         const transctionsGroupsPrimaryStatistics = response.body as TransactionsGroupsPrimaryStatistics;
 
         const firstItem = transctionsGroupsPrimaryStatistics.transactionGroups[0];
-        expectSnapshot(firstItem.latency).toMatchInline(`8224767`);
+        expectSnapshot(firstItem.latency).toMatchInline(`193944.6`);
       });
     }
   );