diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 07fb55ab346..577445a460a 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -123,7 +123,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Update a few elasticsearch.* fields to map to ECS. {pull}10350[10350]
 - Update a few logstash.* fields to map to ECS. {pull}10350[10350]
 - Update a few kibana.* fields to map to ECS. {pull}10350[10350]
-- Update haproxy.* fields to map to ECS. {pull}10558[10558]
+- Update haproxy.* fields to map to ECS. {pull}10558[10558] {pull}10568[10568]
 
 *Packetbeat*
 
diff --git a/dev-tools/ecs-migration.yml b/dev-tools/ecs-migration.yml
index c704e61c82f..40bf3bed69f 100644
--- a/dev-tools/ecs-migration.yml
+++ b/dev-tools/ecs-migration.yml
@@ -1666,6 +1666,11 @@
   alias: true
   beat: metricbeat
 
+- from: haproxy.info.pid
+  to: process.pid
+  alias: true
+  beat: metricbeat
+
 ### Mongodb
 
 - from: mongodb.status.version
diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
index 9925b80e304..59024912a92 100644
--- a/metricbeat/docs/fields.asciidoc
+++ b/metricbeat/docs/fields.asciidoc
@@ -9410,7 +9410,9 @@ Process number.
 *`haproxy.info.pid`*::
 +
 --
-type: long
+type: alias
+
+alias to: process.pid
 
 Process ID.
 
diff --git a/metricbeat/module/haproxy/fields.go b/metricbeat/module/haproxy/fields.go
index e37c9e38a2c..314c1ef52c7 100644
--- a/metricbeat/module/haproxy/fields.go
+++ b/metricbeat/module/haproxy/fields.go
@@ -32,5 +32,5 @@ func init() {
 // AssetHaproxy returns asset data.
 // This is the base64 encoded gzipped contents of ../metricbeat/module/haproxy.
 func AssetHaproxy() string {
-	return "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"
+	return "eJzsXNtu27jTv+9TDHKzzsJxD5ttgQAt0Ka73xZNkyBxsJcGLY0jIhSpklQc79N/IKmTZerg2HJ68ddNG0ua+XE4nLN9Ag+4OoOIJFI8rV4BaKoZnsHRP5+vzSdHrwBCVIGkiaaCn8GnVwAA2V34IcKU4SsAFQmpZ4HgC3p/BgvClPlUIkOi8AzuySuABUUWqjNL4AQ4ibHK2Fx6lZiHpUiT7BMP7yr/GLWkgZpkN6ocqlwoX4jiQx+bFlbm+j/kKAmzdGRMzCNA5iLVBZBEigCVwgKKudaXn191kFWgBZm1uzliJvh97UYLaHNdpvEcJYiFD2AbghlP4z1huHYUgVssXexp6GVLGCV1oSRERwXgyeabMb2XxKHSMsXnof72tQOxTPnsZ4ob9LcVl5e4JuphV13wEk4TTWOcKAz2tMvnqZTIdUYYKAeFgeBhl77FGAu5msTkaTJf6f6K7w7iGfhe6oD6gzzROI2BxCLl2hwOBwJSRe4tdEsURjpC+O0HxjF5mv348hs8EpYiBII/otQYghbuyeOONaaMxlTP+J5EnePnxeEWCXJYUIbKyAUM7vxYtCMLRJxIVH6p1w1kC7T65nhMXJXtPKlzbOfan3Mbd1jzCN7bLZuyPY6Sm0j1IdlJonFmdW5IrqUOcY6BefTAWmSW+cJqZC3CIbd28F2tM4zJ09DsCkVyLqRxSxtYdVhLqDinUlWbDGMVjxaasAHQTA3dLbEoxSbDy+f29uIZuIaV0/Mw+dV2V0S5590e07B4tsMSERnO9gfIHxXjzxSVVl7l2EsEq0TwgFp5dnov5IsFDEQ/oUlDsLuFw3RXl59MFdZTo5Ib5RrvUe7gKXM2C4nN7nh/bNoUdzcuhWahUs+NZp4Rwkyagoh9S84yawogBmE2zF75N035rcyvumEH3K6DbVYfGyG4Rt5sjvqE7c+M1R9wNWvdvj7L7b9kL+uuaHrfjDNTNpOYKpwkQXvqoALCMJwtmCBND+ZllwRl4I9F+wMtqgEkePifTuyBsYkHzwXnN77EuMiySBBhOGNCPKQtZZgeMWA7i1lMPYXs5zFoN/3/MTqfxRjPbP1u15hqS4dwKOc9fNhDQ+YzEZ2mod0kNCAoDJReo7d1Z+ZWE60gEIxhoDE0DibeR1PGH2NoolN/0P6Aq6WQdRvWkcLdWnowursew9erfy/HcHl18WUMPz5/u5yOQUj3v9EjJceTyaSrzLxEeh/5t2/7IrNLvh1JGC2EzM20OrbIFMpHlGsPuI86q+GhWHJN4137JetAc6IwKjsPxxP4u4J7DDqiKiviU2Wr5A1YoCijLyPBMCcxBi60/VilMYjFGonilUwMPSrvgiPXM7Nwryz8x7qrD5PTtURg9OZjHnON4e3HYiHvPjqYdi//+OiS6deMKo0cZdcW5k3CX69ZB6M3diMWVCoNlCtNeIBjeAtOQ41ijIHwEJQAwbsWaoREA5yZv565VM+rO6311kGyAGH0983V5fSvy69u0cVOf/l8/j3/tNhzIYHwlXuxPK+9N53yg3Xovtj+G+UdiESqDwzJcGzHxIjSsyAivCESedahLtv4mWkDRXmA1twYhnB3ffLJeBCzx+bfk09316Al4Yoamh2YdSSF1nvx/psBWM++cY6hQqhmUWEZIQfFxFJpIjdTD6qABJo+otV0LnJLvyjfMc9Q7p7qPPkuothLATO/nK8q+7bGbyggxQKJKviOAamOUFohcFxu0MpSO2VXa0Uj8SSkKiE6iCi/d84vc0aZ77NRDkhMhNTWAW5QNeKu46tuQQVhl1JJY3fCSYOP2F54377mLteODL3OINGFY0X5vdle5GTOOsE9o2fZGiHCAdpG52mcMmJUt7JD21X+JWpJW4rBzwd3uaHTJTLQYl3HMxh9WnA0xgl59IHaFfHnR5TGyGQ4IR9biRUIA7SwrW/fvDst2wHtepU9tn+lCpEPs3E32cIyDjDHgKQKM1+TSqpXRkQBylYNc9fv1uZMz6+duaGqSo5AbEwThqCD5CSTlKGtjf2XKcNJK9l/ptMOupHWJWHjO4hMaJ10o4jtEFd4gC6rY1SqlC9L2bDU2Zn3EhaLglhOfEl1JFJdnjuiFL3nvQ5dJohhW5bOOYtFTew94KGUQu5UV2o/ChmDCdyKGAuXI5Sic4Zg1U4BkdhR5zNqi0SyFWiUMeVuatTWJwzBgFHkegxzXAjpIrlccyNi9NvEOs0V1t9BIgkd1DrRxlfcbWvpmieSiscCJhSGza6yfOGRSCpSBXNSanUdVPPZzpdtPIM7sc3BBazZ2jzaOZBHqwKtMrf+jQsbrbnTZo+0l2pHPNYRe/lJLqmDQZZkZcXeQ3jlrk4GO0+lBAul0BHRgDwQKdcoDWae6bCWKxPBaeElVTjpMpLoaTZdpcZL1N7WRNsQmzCWEys3KWGpsjlzJZhx4gIu/AeIKCUCSnRmg4FAQqSmQcpIUTQbqTSIgDiAOdOIPBoBcL8AXM7SVWKDgabjyuulhuLqV6lbNiwoFCzBvMpTi+KQkcSYM3fTb42Gm3mrX5sjvE3LePE5tSaIEgOkj15L3RAaq0Rw1b8/0zs2PogBc+CL2GBaKSXzgKUh1u13SDTxmx1JuFqgVEDmws6Rz1dVOz/KvhMzMbZpkhm77NFjv+K6SMU6oMw8dccnv8NSUp2vCEyaVjjrbLgKRkvBf9MwN1mSsdhhvSRjIB43kF8QylKJQJKEWdu+oEybZWuRhTs1hfgl0sFip/vlg3m9eXp+3ccod6RxWzfyqtdNhrxfKreRUnlpdqdZJrmyJagjYdFBEGHwYDvAR31mEbX2+aFDznC/fRra2meGM98eGxe8fXqCQIRtiWkV5LsXAfluO5B/vAjIP7YDefoiIE+3A/nni4D8czuQ1uG8AEzn6AxQBaNECi0CwZwf89lgbzSy7Yxn72BkuPJRGY1kPIoWwIvPn/NKf6o3pPbRxh3KbPZLyKm0wb5F41gNlTPtJyXaYsqrT1aU78P2CVHrOrq/frSXdVS20HI00SnHpW9VPYHvcchum6yuP2ivlbKxVG8btZ+BNu+QE3QMOvUUUjbwlNVUrRpGSJiO3EoncMVNrNlZWb27/O4wf4KUP3CxbKpNfrv8lj9IOdWUMPofbfRJt1fn3/+6uTFPZwmQdSoNT1+cXn3PaFv0kBBlDpSxN2SFEk7HwAWkidl3+4kCjUqbVCjrUjZSnl7dTS1lR+ntyWlH1fbi9PzqEmqvVKpWiRRzhvHYJiv4ROKENdmj8jo6LwlIXKQKwyMY6SABqfSxDfovBUiRajRJXSSUPoIRDeLEnxMCXLzvkNn7xhdrInkPo9vbi+Musby/ub2GtdcofySMhmWidwLrMUQTqQ8d0D+0vHhefdFYADuWQRhbbZJZ2yM4fXNqo57OzQqpMjp1IvjJ6ZvTRiw1MX6AkQmxXt/+mF53CvNDTZgfdhDm7fR2ndR6iWVdCDYKrMbEzeGXCJs9+PNjigsL8s+TD5bBGOgCyCOhzEi8T9qfunmvAZBNyzKFLa5TDVqIB3MeF5RTFTWY2h6puX18Yl4dxhtMXREoZbrZI/SGuSB0iBpoGVEZBhg6WH3CW3KPXLdLb4/fvbPghk067MKdkmWyWEaUYX08KE36HAi/y94f2mIgrhyC8zfaq+PAXpqVjlxJKq9hro0HwxyNbzdrG5tUIrLhNvHHJrUp4ipta/lIEOWNro4Y0bVXswKxN1jcceYwJJo0V63r7d2uvNssadeQ1l29c/KNEbQu0fQQD2SjuCjt1HHK6U/bC1A0RCBuRK1PRdi/b3sC2HcP845qtavhLwhnzY7QuJy1PkXuvrN2cp+V25bm0Auv9XSd/SISi1nRGAm3nWdzQ0e4Mne9RJ2nWdnp8YDwvAPmGXlggoQwJ4zwoPH8Qu0bcN7awmFE4di3fHHBb3iy3w7aCPKGzlAbBtGhy4G0TX+3oKteG23nLGZ1Pxi1cLMg1ioWwumx/U1z7NBDAwZfFMZ2IKcw99ssbL5y2c0vsF9uMVblc1R2PXbJ5aJgdH599/rLv67u1GvOIjd8L7/GWrHcLnaJsty0zrno6o8xruMf8DgP5PzunEu2S2r+Gb8qEs9XdWA/qY77PqKh39e6Nv+k4HA7seffhqhelYquXVlW1x3F5Mn+fVybLMi+w6EjO9a/aIzOizHSnJAJ5d/AKPfqXPQ/yZ3TBTtJwGS7JBsycEifPXHu+c//BwAA//88Xa9f"
 }
diff --git a/metricbeat/module/haproxy/info/_meta/data.json b/metricbeat/module/haproxy/info/_meta/data.json
index 8cbaae98bc1..552202e0fff 100644
--- a/metricbeat/module/haproxy/info/_meta/data.json
+++ b/metricbeat/module/haproxy/info/_meta/data.json
@@ -32,7 +32,7 @@
                     "max": 0,
                     "total": 0
                 },
-                "total": 223
+                "total": 30
             },
             "idle": {
                 "pct": 1
@@ -42,7 +42,6 @@
                     "bytes": 0
                 }
             },
-            "pid": 8,
             "pipes": {
                 "free": 0,
                 "max": 0,
@@ -51,7 +50,7 @@
             "process_num": 1,
             "processes": 1,
             "requests": {
-                "total": 223
+                "total": 30
             },
             "run_queue": 0,
             "session": {
@@ -91,7 +90,7 @@
             "tasks": 7,
             "ulimit_n": 8034,
             "uptime": {
-                "sec": 236
+                "sec": 30
             },
             "zlib_mem_usage": {
                 "max": 0,
@@ -102,6 +101,9 @@
     "metricset": {
         "name": "info"
     },
+    "process": {
+        "pid": 7
+    },
     "service": {
         "address": "127.0.0.1:14567",
         "type": "haproxy"
diff --git a/metricbeat/module/haproxy/info/_meta/fields.yml b/metricbeat/module/haproxy/info/_meta/fields.yml
index 5363469753f..f023cdd3efc 100644
--- a/metricbeat/module/haproxy/info/_meta/fields.yml
+++ b/metricbeat/module/haproxy/info/_meta/fields.yml
@@ -15,7 +15,9 @@
         Process number.
 
     - name: pid
-      type: long
+      type: alias
+      path: process.pid
+      migration: true
       description: >
         Process ID.
 
diff --git a/metricbeat/module/haproxy/info/data.go b/metricbeat/module/haproxy/info/data.go
index 7325040338f..8ebd6378c74 100644
--- a/metricbeat/module/haproxy/info/data.go
+++ b/metricbeat/module/haproxy/info/data.go
@@ -18,6 +18,7 @@
 package info
 
 import (
+	"github.com/elastic/beats/libbeat/common"
 	s "github.com/elastic/beats/libbeat/common/schema"
 	c "github.com/elastic/beats/libbeat/common/schema/mapstrstr"
 	"github.com/elastic/beats/metricbeat/mb"
@@ -163,7 +164,16 @@ func eventMapping(info *haproxy.Info, r mb.ReporterV2) {
 
 	}
 
-	event := mb.Event{}
-	event.MetricSetFields, _ = schema.Apply(source)
+	event := mb.Event{
+		RootFields: common.MapStr{},
+	}
+
+	fields, _ := schema.Apply(source)
+	if processID, err := fields.GetValue("pid"); err == nil {
+		event.RootFields.Put("process.pid", processID)
+		fields.Delete("pid")
+	}
+
+	event.MetricSetFields = fields
 	r.Event(event)
 }