Make winlogbeat accept the new top-level settings

The list has grown quite long, switching to ucfg validation for this would be nice.
Also added explicit key names to config.

libbeat/beat/beat.go

@@ -111,11 +111,11 @@ type Beat struct {
 
 // BeatConfig struct contains the basic configuration of every beat
 type BeatConfig struct {
-	Output  map[string]*common.Config
-	Logging logp.Logging
-	Shipper publisher.ShipperConfig `config:",inline"`
-	Filters []filter.FilterConfig
-	Path    paths.Path
+	Shipper publisher.ShipperConfig   `config:",inline"`
+	Output  map[string]*common.Config `config:"output"`
+	Logging logp.Logging              `config:"logging"`
+	Filters []filter.FilterConfig     `config:"filters"`
+	Path    paths.Path                `config:"path"`
 }
 
 // Run initializes and runs a Beater implementation. name is the name of the

libbeat/publisher/publish.go

@@ -81,11 +81,11 @@ type Publisher struct {
 
 type ShipperConfig struct {
 	common.EventMetadata `config:",inline"` // Fields and tags to add to each event.
-	Name                 string
-	RefreshTopologyFreq  time.Duration `config:"refresh_topology_freq"`
-	Ignore_outgoing      bool          `config:"ignore_outgoing"`
-	Topology_expire      int           `config:"topology_expire"`
-	Geoip                common.Geoip  `config:"geoip"`
+	Name                 string             `config:"name"`
+	RefreshTopologyFreq  time.Duration      `config:"refresh_topology_freq"`
+	Ignore_outgoing      bool               `config:"ignore_outgoing"`
+	Topology_expire      int                `config:"topology_expire"`
+	Geoip                common.Geoip       `config:"geoip"`
 
 	// internal publisher queue sizes
 	QueueSize     *int `config:"queue_size"`

winlogbeat/config/config.go

@@ -34,7 +34,12 @@ type Settings struct {
 // Validate validates the Settings data and returns an error describing
 // all problems or nil if there are none.
 func (s Settings) Validate() error {
-	validKeys := []string{"filters", "logging", "output", "shipper", "winlogbeat"}
+	validKeys := []string{
+		"fields", "fields_under_root", "tags",
+		"name", "refresh_topology_freq", "ignore_outgoing", "topology_expire", "geoip",
+		"queue_size", "bulk_queue_size", "max_procs",
+		"filters", "logging", "output", "path", "winlogbeat",
+	}
 	sort.Strings(validKeys)
 
 	// Check for invalid top-level keys.

winlogbeat/config/config_test.go

@@ -44,8 +44,9 @@ func TestConfigValidate(t *testing.T) {
 				},
 				map[string]interface{}{"other": "value"},
 			},
-			"1 error: Invalid top-level key 'other' found. Valid keys are " +
-				"filters, logging, output, shipper, winlogbeat",
+			"1 error: Invalid top-level key 'other' found. Valid keys are bulk_queue_size, " +
+				"fields, fields_under_root, filters, geoip, ignore_outgoing, logging, max_procs, " +
+				"name, output, path, queue_size, refresh_topology_freq, tags, topology_expire, winlogbeat",
 		},
 		{
 			WinlogbeatConfig{},