Make name field hierarchy configurable (#14)

_meta/beat.yml

@@ -3,5 +3,10 @@
 ############################# Prometheusbeat ######################################
 
 prometheusbeat:
+  # Listen port of the server. Defaults to :8080
   listen: ":8080"
+  # Context path. Defaults to /prometheus
   context: "/prometheus"
+
+  # If this setting is set to true the metric name field is stored as a top-level field. Defaults to false
+  # name_under_root: false

fields.yml → _meta/fields.yml

@@ -2,9 +2,6 @@
   title: prometheusbeat
   description:
   fields:
-    - name: name
-      type: keyword
-      required: false
     - name: value
       type: double
       required: false

config/config.go

@@ -4,11 +4,13 @@
 package config
 
 type Config struct {
-	Listen  string `config:"listen"`
-	Context string `config:"context"`
+	Listen        string `config:"listen"`
+	Context       string `config:"context"`
+	NameUnderRoot bool   `config:"name_under_root"`
 }
 
 var DefaultConfig = Config{
-	Listen:  ":8080",
-	Context: "/prometheus",
+	Listen:        ":8080",
+	Context:       "/prometheus",
+	NameUnderRoot: false,
 }

prometheus/prometheus.go

@@ -84,8 +84,12 @@ func (promSrv *PrometheusServer) handlePrometheus(w http.ResponseWriter, r *http
 		event := map[string]interface{}{}
 		labels := map[string]interface{}{}
 		for _, l := range ts.Labels {
-			fieldName := strings.Replace(l.Name, "_", "", -1)
-			labels[fieldName] = l.Value
+			fieldName := strings.Trim(l.Name, "_")
+			if fieldName == "name" && promSrv.config.NameUnderRoot {
+				event[fieldName] = l.Value
+			} else {
+				labels[fieldName] = l.Value
+			}
 		}
 		event["labels"] = labels
 

prometheusbeat.yml

@@ -3,9 +3,14 @@
 ############################# Prometheusbeat ######################################
 
 prometheusbeat:
+  # Listen port of the server. Defaults to :8080
   listen: ":8080"
+  # Context path. Defaults to /prometheus
   context: "/prometheus"
 
+  # If this setting is set to true the metric name field is stored as a top-level field. Defaults to false
+  name_under_root: true
+
 #================================ General =====================================
 
 # The name of the shipper that publishes the network data. It can be used to group