Revert migration of haproxy frontend to process.name (#10581)

elastic · Feb 5, 2019 · afc24ce · afc24ce
1 parent 2b63496
commit afc24ce
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 18 deletions.
diff --git a/dev-tools/ecs-migration.yml b/dev-tools/ecs-migration.yml
@@ -1661,11 +1661,6 @@
   alias: true
   beat: metricbeat
 
-- from: haproxy.stat.service_name
-  to: process.name
-  alias: true
-  beat: metricbeat
-
 - from: haproxy.info.pid
   to: process.pid
   alias: true

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -9916,9 +9916,7 @@ Process ID (0 for first instance, 1 for second, and so on).
 *`haproxy.stat.service_name`*::
 +
 --
-type: alias
-
-alias to: process.name
+type: keyword
 
 Service name (FRONTEND for frontend, BACKEND for backend, or any name for server/listener).
 

diff --git a/metricbeat/module/haproxy/fields.go b/metricbeat/module/haproxy/fields.go
diff --git a/metricbeat/module/haproxy/stat/_meta/data.json b/metricbeat/module/haproxy/stat/_meta/data.json
@@ -56,6 +56,7 @@
             "server": {
                 "id": 0
             },
+            "service_name": "FRONTEND",
             "session": {
                 "current": 0,
                 "limit": 25000,
@@ -73,7 +74,6 @@
         "name": "stat"
     },
     "process": {
-        "name": "FRONTEND",
         "pid": 1
     },
     "service": {

diff --git a/metricbeat/module/haproxy/stat/_meta/fields.yml b/metricbeat/module/haproxy/stat/_meta/fields.yml
@@ -34,9 +34,7 @@
         Process ID (0 for first instance, 1 for second, and so on).
 
     - name: service_name
-      type: alias
-      path: process.name
-      migration: true
+      type: keyword
       description: >
         Service name (FRONTEND for frontend, BACKEND for backend, or any name for server/listener).
 

diff --git a/metricbeat/module/haproxy/stat/data.go b/metricbeat/module/haproxy/stat/data.go
@@ -148,11 +148,6 @@ func eventMapping(info []*haproxy.Stat, r mb.ReporterV2) {
 			fields.Delete("process_id")
 		}
 
-		if processName, err := fields.GetValue("service_name"); err == nil {
-			event.RootFields.Put("process.name", processName)
-			fields.Delete("service_name")
-		}
-
 		event.MetricSetFields = fields
 		r.Event(event)
 	}