[Metricbeat] HAProxy info fields adjust to ECS (#10568)

elastic · Feb 5, 2019 · 3b50cc4 · 3b50cc4
1 parent e97e9c7
commit 3b50cc4
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 11 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -124,7 +124,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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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)
 }
diff --git a/metricbeat/tests/system/test_haproxy.py b/metricbeat/tests/system/test_haproxy.py
@@ -20,7 +20,7 @@ def _test_info(self):
         self.assertEqual(len(output), 1)
         evt = output[0]
 
-        self.assertItemsEqual(self.de_dot(HAPROXY_FIELDS), evt.keys(), evt)
+        self.assertItemsEqual(self.de_dot(HAPROXY_FIELDS + ["process"]), evt.keys(), evt)
 
         self.assert_fields_are_documented(evt)