diff --git a/beater/integration_test.go b/beater/integration_test.go
index d6d41807bbf..a3d0ccd4457 100644
--- a/beater/integration_test.go
+++ b/beater/integration_test.go
@@ -107,6 +107,7 @@ func TestPublishIntegration(t *testing.T) {
 		{payload: "metricsets.ndjson", name: "Metricsets"},
 		{payload: "spans.ndjson", name: "Spans"},
 		{payload: "transactions.ndjson", name: "Transactions"},
+		{payload: "minimal.ndjson", name: "MinimalEvents"},
 	} {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
diff --git a/beater/test_approved_es_documents/TestPublishIntegrationMinimalEvents.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationMinimalEvents.approved.json
new file mode 100644
index 00000000000..6ecbb856e9f
--- /dev/null
+++ b/beater/test_approved_es_documents/TestPublishIntegrationMinimalEvents.approved.json
@@ -0,0 +1,302 @@
+{
+    "events": [
+        {
+            "@metadata": {
+                "beat": "apm-test",
+                "type": "_doc",
+                "version": "7.0.0"
+            },
+            "@timestamp": "2019-01-09T21:40:53.000Z",
+            "agent": {
+                "name": "elastic-node",
+                "version": "3.14.0"
+            },
+            "error": {
+                "grouping_key": "0b9cba09845a097a271c6beb4c6207f3",
+                "id": "abcdef0123456789",
+                "log": {
+                    "message": "error log message"
+                }
+            },
+            "host": {
+                "ip": "127.0.0.1"
+            },
+            "observer": {
+                "ephemeral_id": "00000000-0000-0000-0000-000000000000",
+                "hostname": "",
+                "id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
+                "type": "test-apm-server",
+                "version": "7.0.0",
+                "version_major": 7
+            },
+            "processor": {
+                "event": "error",
+                "name": "error"
+            },
+            "service": {
+                "name": "1234_service-12a3"
+            },
+            "timestamp": {
+                "us": 1547070053000000
+            }
+        },
+        {
+            "@metadata": {
+                "beat": "apm-test",
+                "type": "_doc",
+                "version": "7.0.0"
+            },
+            "@timestamp": "2019-01-09T21:40:53.000Z",
+            "agent": {
+                "name": "elastic-node",
+                "version": "3.14.0"
+            },
+            "error": {
+                "exception": [
+                    {
+                        "message": "error exception message"
+                    }
+                ],
+                "grouping_key": "3a1fb5609458fbb132b44d8fc7cde104",
+                "id": "abcdef0123456790"
+            },
+            "host": {
+                "ip": "127.0.0.1"
+            },
+            "observer": {
+                "ephemeral_id": "00000000-0000-0000-0000-000000000000",
+                "hostname": "",
+                "id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
+                "type": "test-apm-server",
+                "version": "7.0.0",
+                "version_major": 7
+            },
+            "processor": {
+                "event": "error",
+                "name": "error"
+            },
+            "service": {
+                "name": "1234_service-12a3"
+            },
+            "timestamp": {
+                "us": 1547070053000000
+            }
+        },
+        {
+            "@metadata": {
+                "beat": "apm-test",
+                "type": "_doc",
+                "version": "7.0.0"
+            },
+            "@timestamp": "2019-01-09T21:40:53.000Z",
+            "agent": {
+                "name": "elastic-node",
+                "version": "3.14.0"
+            },
+            "error": {
+                "exception": [
+                    {
+                        "type": "error exception type"
+                    }
+                ],
+                "grouping_key": "fa405fa2bd848dab17207e7b544d9ad4",
+                "id": "abcdef0123456791"
+            },
+            "host": {
+                "ip": "127.0.0.1"
+            },
+            "observer": {
+                "ephemeral_id": "00000000-0000-0000-0000-000000000000",
+                "hostname": "",
+                "id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
+                "type": "test-apm-server",
+                "version": "7.0.0",
+                "version_major": 7
+            },
+            "processor": {
+                "event": "error",
+                "name": "error"
+            },
+            "service": {
+                "name": "1234_service-12a3"
+            },
+            "timestamp": {
+                "us": 1547070053000000
+            }
+        },
+        {
+            "@metadata": {
+                "beat": "apm-test",
+                "type": "_doc",
+                "version": "7.0.0"
+            },
+            "@timestamp": "2019-01-09T21:40:53.000Z",
+            "agent": {
+                "name": "elastic-node",
+                "version": "3.14.0"
+            },
+            "observer": {
+                "ephemeral_id": "00000000-0000-0000-0000-000000000000",
+                "hostname": "",
+                "id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
+                "type": "test-apm-server",
+                "version": "7.0.0",
+                "version_major": 7
+            },
+            "parent": {
+                "id": "ab23456a89012345"
+            },
+            "processor": {
+                "event": "span",
+                "name": "transaction"
+            },
+            "service": {
+                "name": "1234_service-12a3"
+            },
+            "span": {
+                "duration": {
+                    "us": 3564
+                },
+                "id": "0123456a89012345",
+                "name": "GET /api/types",
+                "start": {
+                    "us": 1845
+                },
+                "type": "request"
+            },
+            "timestamp": {
+                "us": 1547070053000000
+            },
+            "trace": {
+                "id": "0123456789abcdef0123456789abcdef"
+            },
+            "transaction": {
+                "id": "ab23456a89012345"
+            }
+        },
+        {
+            "@metadata": {
+                "beat": "apm-test",
+                "type": "_doc",
+                "version": "7.0.0"
+            },
+            "@timestamp": "2018-08-30T18:53:27.154Z",
+            "agent": {
+                "name": "elastic-node",
+                "version": "3.14.0"
+            },
+            "observer": {
+                "ephemeral_id": "00000000-0000-0000-0000-000000000000",
+                "hostname": "",
+                "id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
+                "type": "test-apm-server",
+                "version": "7.0.0",
+                "version_major": 7
+            },
+            "parent": {
+                "id": "ab23456a89012345"
+            },
+            "processor": {
+                "event": "span",
+                "name": "transaction"
+            },
+            "service": {
+                "name": "1234_service-12a3"
+            },
+            "span": {
+                "duration": {
+                    "us": 3564
+                },
+                "id": "0123456a89012345",
+                "name": "GET /api/types",
+                "type": "request"
+            },
+            "timestamp": {
+                "us": 1535655207154000
+            },
+            "trace": {
+                "id": "0123456789abcdef0123456789abcdef"
+            },
+            "transaction": {
+                "id": "ab23456a89012345"
+            }
+        },
+        {
+            "@metadata": {
+                "beat": "apm-test",
+                "type": "_doc",
+                "version": "7.0.0"
+            },
+            "@timestamp": "2019-01-09T21:40:53.000Z",
+            "agent": {
+                "name": "elastic-node",
+                "version": "3.14.0"
+            },
+            "host": {
+                "ip": "127.0.0.1"
+            },
+            "observer": {
+                "ephemeral_id": "00000000-0000-0000-0000-000000000000",
+                "hostname": "",
+                "id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
+                "type": "test-apm-server",
+                "version": "7.0.0",
+                "version_major": 7
+            },
+            "processor": {
+                "event": "transaction",
+                "name": "transaction"
+            },
+            "service": {
+                "name": "1234_service-12a3"
+            },
+            "timestamp": {
+                "us": 1547070053000000
+            },
+            "trace": {
+                "id": "01234567890123456789abcdefabcdef"
+            },
+            "transaction": {
+                "duration": {
+                    "us": 32592
+                },
+                "id": "abcdef1478523690",
+                "sampled": true,
+                "span_count": {
+                    "started": 0
+                },
+                "type": "request"
+            }
+        },
+        {
+            "@metadata": {
+                "beat": "apm-test",
+                "type": "_doc",
+                "version": "7.0.0"
+            },
+            "@timestamp": "2017-05-30T18:53:42.281Z",
+            "agent": {
+                "name": "elastic-node",
+                "version": "3.14.0"
+            },
+            "host": {
+                "ip": "127.0.0.1"
+            },
+            "observer": {
+                "ephemeral_id": "00000000-0000-0000-0000-000000000000",
+                "hostname": "",
+                "id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
+                "type": "test-apm-server",
+                "version": "7.0.0",
+                "version_major": 7
+            },
+            "processor": {
+                "event": "metric",
+                "name": "metric"
+            },
+            "service": {
+                "name": "1234_service-12a3"
+            }
+        }
+    ]
+}
diff --git a/docs/spec/metadata.json b/docs/spec/metadata.json
index 14af0706799..57903db2b1e 100644
--- a/docs/spec/metadata.json
+++ b/docs/spec/metadata.json
@@ -7,6 +7,9 @@
         "service": {
             "$ref": "service.json",
             "type": "object",
+            "required": ["name", "agent"],
+            "properties.name.type": "string",
+            "properties.agent.type": "string",
             "properties.agent.required": ["name", "version"],
             "properties.agent.properties.name.type": "string",
             "properties.agent.properties.version.type": "string",
diff --git a/model/metadata/generated/schema/metadata.go b/model/metadata/generated/schema/metadata.go
index 0c4a4d1c141..2d266d086a3 100644
--- a/model/metadata/generated/schema/metadata.go
+++ b/model/metadata/generated/schema/metadata.go
@@ -104,6 +104,9 @@ const ModelSchema = `{
         }
     },
             "type": "object",
+            "required": ["name", "agent"],
+            "properties.name.type": "string",
+            "properties.agent.type": "string",
             "properties.agent.required": ["name", "version"],
             "properties.agent.properties.name.type": "string",
             "properties.agent.properties.version.type": "string",
diff --git a/testdata/intake-v2/minimal.ndjson b/testdata/intake-v2/minimal.ndjson
new file mode 100644
index 00000000000..bda8ecdfbb4
--- /dev/null
+++ b/testdata/intake-v2/minimal.ndjson
@@ -0,0 +1,8 @@
+{"metadata": { "service": {"name": "1234_service-12a3", "agent": {"version": "3.14.0", "name": "elastic-node"}}}}
+{"error": {"id": "abcdef0123456789", "log": {"message": "error log message"}}}
+{"error": {"id": "abcdef0123456790", "exception": {"message": "error exception message"}}}
+{"error": {"id": "abcdef0123456791", "exception": {"type": "error exception type"}}}
+{"span": {"id": "0123456a89012345", "trace_id": "0123456789abcdef0123456789abcdef", "parent_id": "ab23456a89012345", "transaction_id": "ab23456a89012345", "name": "GET /api/types", "type": "request", "start": 1.845, "duration": 3.5642981}}
+{"span": {"id": "0123456a89012345", "trace_id": "0123456789abcdef0123456789abcdef", "parent_id": "ab23456a89012345", "transaction_id": "ab23456a89012345", "name": "GET /api/types", "type": "request", "timestamp": 1535655207154000, "duration": 3.5642981}}
+{"transaction": {"trace_id": "01234567890123456789abcdefabcdef", "id": "abcdef1478523690", "type": "request", "duration": 32.592981, "span_count": {"started": 0}}}
+{"metricset": {"samples": {}, "timestamp": 1496170422281000}}