remove the top level metatada attribute

Author: jalvz

agentcfg/fetch.go

@@ -38,7 +38,7 @@ var (
 
 func Fetch(kb *kibana.Client, q Query, err error) (map[string]interface{}, string, error) {
 	var doc Doc
-	resultBytes, err := request(kb, convert.ToReader(q.Metadata), err)
+	resultBytes, err := request(kb, convert.ToReader(q), err)
 	err = convert.FromBytes(resultBytes, &doc, err)
 	return doc.Source.Settings, doc.Id, err
 }

agentcfg/model.go

@@ -31,15 +31,11 @@ type Source struct {
 	Settings map[string]interface{} `json:"settings"`
 }
 
-type Query struct {
-	Metadata Metadata `json:"metadata"`
-}
-
 func NewQuery(name, env string) Query {
-	return Query{Metadata: Metadata{Service{name, env}}}
+	return Query{Service{name, env}}
 }
 
-type Metadata struct {
+type Query struct {
 	Service Service `json:"service"`
 }
 

beater/agent_config_handler.go

@@ -88,7 +88,7 @@ func buildQuery(r *http.Request) (query agentcfg.Query, err error) {
 		return
 	}
 
-	if err == nil && query.Metadata.Service.Name == "" {
+	if err == nil && query.Service.Name == "" {
 		err = errors.New(agentcfg.ServiceName + " is required")
 	}