From afc24ceb410fa4a1e34493bb7b46f365040670d2 Mon Sep 17 00:00:00 2001 From: Mathieu Martin Date: Tue, 5 Feb 2019 13:34:09 -0500 Subject: [PATCH] Revert migration of haproxy frontend to process.name (#10581) --- dev-tools/ecs-migration.yml | 5 ----- metricbeat/docs/fields.asciidoc | 4 +--- metricbeat/module/haproxy/fields.go | 2 +- metricbeat/module/haproxy/stat/_meta/data.json | 2 +- metricbeat/module/haproxy/stat/_meta/fields.yml | 4 +--- metricbeat/module/haproxy/stat/data.go | 5 ----- 6 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dev-tools/ecs-migration.yml b/dev-tools/ecs-migration.yml index 39c08d640918..ea0685a6eab0 100644 --- 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 index 59024912a927..cd8e05ab12ad 100644 --- 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 index 314c1ef52c73..e529a4fa2a74 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 "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" } diff --git a/metricbeat/module/haproxy/stat/_meta/data.json b/metricbeat/module/haproxy/stat/_meta/data.json index 853edbb47ea8..d76116d86bd0 100644 --- 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 index 1cf0a3323f0c..e9e8a0d9a541 100644 --- 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 index 91071ed6c393..7a92d9ceb34b 100644 --- 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) }