Add missing namespace field in http server metricset (elastic#7890) (e…

…lastic#9071)

This PR adds back the missing `metricset.namespace` field in to payloads generated by http server.

(cherry picked from commit 21e1600)

Co-authored-by: Vijay Samuel <[email protected]>

CHANGELOG.asciidoc

@@ -163,6 +163,7 @@ https://github.com/elastic/beats/compare/v6.4.0...v6.5.0[View commits]
 - Fix range colors in multiple visualizations. {issue}8633[8633] {pull}8634[8634]
 - Fix incorrect header parsing on http metricbeat module {issue}8564[8564] {pull}8585[8585]
 - Fixed a panic when the kvm module cannot establish a connection to libvirtd. {issue}7792[7792].
+- Add missing namespace field in http server metricset {pull}7890[7890]
 
 *Packetbeat*
 

metricbeat/module/http/server/server.go

@@ -18,7 +18,8 @@
 package server
 
 import (
-	"github.com/elastic/beats/libbeat/common"
+	"fmt"
+
 	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	serverhelper "github.com/elastic/beats/metricbeat/helper/server"
 	"github.com/elastic/beats/metricbeat/helper/server/http"
@@ -83,10 +84,13 @@ func (m *MetricSet) Run(reporter mb.PushReporterV2) {
 				reporter.Error(err)
 			} else {
 				event := mb.Event{}
-				event.ModuleFields = common.MapStr{}
-				metricSetName := fields[mb.NamespaceKey].(string)
-				delete(fields, mb.NamespaceKey)
-				event.ModuleFields.Put(metricSetName, fields)
+				ns, ok := fields[mb.NamespaceKey].(string)
+				if ok {
+					ns = fmt.Sprintf("http.%s", ns)
+					delete(fields, mb.NamespaceKey)
+				}
+				event.MetricSetFields = fields
+				event.Namespace = ns
 				reporter.Event(event)
 			}