update ecs-migratoin, fields yml, changelog

CHANGELOG.next.asciidoc

@@ -76,6 +76,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Removed Prometheus stats metricset in favor of just using Prometheus collector {pull}9948[9948]
 - Adjust Redis.info metricset fields to ECS. {pull}10319[10319]
 - Rename http.request.body field to http.request.body.content. {pull}10315[10315]
+- Adjust php_fpm.process metricset fields to ECS. {pull}10366[10366]
 
 *Packetbeat*
 

dev-tools/ecs-migration.yml

@@ -1208,6 +1208,43 @@
 
 ### Redis
 
+- from: php_fpm.status.pid
+  to: process.pid
+  alias: true
+  beat: metricbeat
+
+- from: php_fpm.status.request_duration
+  to: event.duration
+  alias: true
+  beat: metricbeat
+
+- from: php_fpm.status.request_duration
+  to: event.duration
+  alias: true
+  beat: metricbeat
+
+- from: php_fpm.status.request_method
+  to: http.request.method
+  alias: true
+  beat: metricbeat
+
+- from: php_fpm.status.request_uri
+  to: url.original
+  alias: true
+  beat: metricbeat
+
+- from: php_fpm.status.content_length
+  to: http.response.body.bytes
+  alias: true
+  beat: metricbeat
+
+- from: php_fpm.status.user
+  to: http.response.user.name
+  alias: true
+  beat: metricbeat
+
+### Redis
+
 - from: redis.info.server.version
   to: service.version
   alias: true

metricbeat/docs/fields.asciidoc

@@ -18851,7 +18851,9 @@ process contains the metrics that were obtained from the PHP-FPM process.
 *`php_fpm.process.pid`*::
 +
 --
-type: integer
+type: alias
+
+alias to: process.pid
 
 The PID of the process
 
@@ -18903,7 +18905,9 @@ The number of requests the process has served
 *`php_fpm.process.request_duration`*::
 +
 --
-type: integer
+type: alias
+
+alias to: event.duration
 
 The duration in microseconds (1 million in a second) of the current request (my own definition)
 
@@ -18913,7 +18917,9 @@ The duration in microseconds (1 million in a second) of the current request (my
 *`php_fpm.process.request_method`*::
 +
 --
-type: keyword
+type: alias
+
+alias to: http.request.method
 
 The request method (GET, POST, etc) (of the current request)
 
@@ -18923,7 +18929,9 @@ The request method (GET, POST, etc) (of the current request)
 *`php_fpm.process.request_uri`*::
 +
 --
-type: text
+type: alias
+
+alias to: url.original
 
 The request URI with the query string (of the current request)
 
@@ -18933,7 +18941,9 @@ The request URI with the query string (of the current request)
 *`php_fpm.process.content_length`*::
 +
 --
-type: integer
+type: alias
+
+alias to: http.response.body.bytes
 
 The content length of the request (only with POST) (of the current request)
 
@@ -18943,7 +18953,9 @@ The content length of the request (only with POST) (of the current request)
 *`php_fpm.process.user`*::
 +
 --
-type: keyword
+type: alias
+
+alias to: user.name
 
 The user (PHP_AUTH_USER) (or - if not set) (for the current request)
 

metricbeat/module/php_fpm/pool/_meta/data.json

@@ -30,8 +30,8 @@
                 "total": 2
             },
             "slow_requests": 0,
-            "start_since": 491,
-            "start_time": 1548678234
+            "start_since": 600,
+            "start_time": 1548749474
         }
     },
     "service": {

metricbeat/module/php_fpm/process/_meta/data.json

@@ -11,7 +11,7 @@
     },
     "http": {
         "request": {
-            "method": "GET"
+            "method": "get"
         },
         "response": {
             "body": {
@@ -29,11 +29,10 @@
         "process": {
             "last_request_cpu": 0,
             "last_request_memory": 0,
-            "request_duration": 231,
             "requests": 6,
             "script": "-",
-            "start_since": 492,
-            "start_time": 1548678234,
+            "start_since": 600,
+            "start_time": 1548749474,
             "state": "Running"
         }
     },

metricbeat/module/php_fpm/process/_meta/fields.yml

@@ -5,7 +5,9 @@
   release: ga
   fields:
   - name: pid
-    type: integer
+    type: alias
+    path: process.pid
+    migration: true
     description: >
       The PID of the process
   - name: state
@@ -26,23 +28,33 @@
     description: >
       The number of requests the process has served
   - name: request_duration
-    type: integer
+    type: alias
+    path: event.duration
+    migration: true
     description: >
       The duration in microseconds (1 million in a second) of the current request (my own definition)
   - name: request_method
-    type: keyword
+    type: alias
+    path: http.request.method
+    migration: true
     description: >
       The request method (GET, POST, etc) (of the current request)
   - name: request_uri
-    type: text
+    type: alias
+    path: url.original
+    migration: true
     description: >
       The request URI with the query string (of the current request)
   - name: content_length
-    type: integer
+    type: alias
+    path: http.response.body.bytes
+    migration: true
     description: >
       The content length of the request (only with POST) (of the current request)
   - name: user
-    type: keyword
+    type: alias
+    path: user.name
+    migration: true
     description: >
       The user (PHP_AUTH_USER) (or - if not set) (for the current request)
   - name: script

metricbeat/module/php_fpm/process/data.go

@@ -19,6 +19,7 @@ package process
 
 import (
 	"encoding/json"
+	"strings"
 
 	"github.com/elastic/beats/metricbeat/mb"
 
@@ -59,7 +60,7 @@ func eventsMapping(r mb.ReporterV2, content []byte) {
 			RootFields: common.MapStr{
 				"http": common.MapStr{
 					"request": common.MapStr{
-						"method": process.RequestMethod,
+						"method": strings.ToLower(process.RequestMethod),
 					},
 					"response": common.MapStr{
 						"body": common.MapStr{
@@ -76,13 +77,15 @@ func eventsMapping(r mb.ReporterV2, content []byte) {
 				"url": common.MapStr{
 					"original": process.RequestURI,
 				},
+				"event": common.MapStr{
+					"duration": process.RequestDuration * 1000,
+				},
 			},
 			MetricSetFields: common.MapStr{
 				"state":               process.State,
 				"start_time":          process.StartTime,
 				"start_since":         process.StartSince,
 				"requests":            process.Requests,
-				"request_duration":    process.RequestDuration,
 				"script":              process.Script,
 				"last_request_cpu":    process.LastRequestCPU,
 				"last_request_memory": process.LastRequestMemory,

metricbeat/module/php_fpm/process/process_integration_test.go

@@ -41,7 +41,7 @@ func TestFetch(t *testing.T) {
 	}
 
 	t.Logf("%s/%s event: %+v", f.Module().Name(), f.Name(),
-		events[0].BeatEvent("haproxy", "info").Fields.StringToPrint())
+		events[0].BeatEvent("php_fpm", "process").Fields.StringToPrint())
 
 }