Add location fields to root of config

auditbeat/docs/fields.asciidoc

@@ -2551,6 +2551,18 @@ type: keyword
 Error type.
 
 
+--
+
+*`location`*::
++
+--
+type: keyword
+
+required: False
+
+Unique string representing the vantage point of this monitor.
+
+
 --
 
 [[exported-fields-cloud]]

filebeat/docs/fields.asciidoc

@@ -680,6 +680,18 @@ type: keyword
 Error type.
 
 
+--
+
+*`location`*::
++
+--
+type: keyword
+
+required: False
+
+Unique string representing the vantage point of this monitor.
+
+
 --
 
 [[exported-fields-cloud]]

heartbeat/docs/fields.asciidoc

@@ -115,6 +115,18 @@ type: keyword
 Error type.
 
 
+--
+
+*`location`*::
++
+--
+type: keyword
+
+required: False
+
+Unique string representing the vantage point of this monitor.
+
+
 --
 
 [[exported-fields-cloud]]

heartbeat/docs/heartbeat-options.asciidoc

@@ -343,6 +343,7 @@ Example configuration:
 
 Also see <<configuration-ssl>> for a full description of the `ssl` options.
 
+
 [float]
 [[monitor-http-options]]
 === HTTP options

heartbeat/heartbeat.yml

@@ -22,6 +22,9 @@ heartbeat.monitors:
   # Total test connection and data exchange timeout
   #timeout: 16s
 
+location: minneapolis
+geo.location: "44.8897,-93.3500"
+
 #==================== Elasticsearch template setting ==========================
 
 setup.template.settings:

libbeat/_meta/fields.common.yml

@@ -51,3 +51,9 @@
           type: keyword
           description: >
             Error type.
+
+    - name: location
+      required: false
+      type: keyword
+      description: >
+        Unique string representing the vantage point of this monitor.

libbeat/common/mapstr.go

@@ -46,6 +46,8 @@ type EventMetadata struct {
 	Fields          MapStr
 	FieldsUnderRoot bool `config:"fields_under_root"`
 	Tags            []string
+	Location        string
+	GeoLocation     string `config:"geo.location"`
 }
 
 // MapStr is a map[string]interface{} wrapper with utility methods for common

libbeat/publisher/pipeline/pipeline.go

@@ -84,6 +84,8 @@ type pipelineProcessors struct {
 	builtinMeta common.MapStr
 	fields      common.MapStr
 	tags        []string
+	location    string
+	geoLocation string
 
 	processors beat.Processor
 
@@ -435,6 +437,14 @@ func makePipelineProcessors(
 		p.tags = t
 	}
 
+	if annotations.Event.Location != "" {
+		p.location = annotations.Event.Location
+	}
+
+	if annotations.Event.GeoLocation != "" {
+		p.geoLocation = annotations.Event.GeoLocation
+	}
+
 	return p
 }
 

libbeat/publisher/pipeline/processor.go

@@ -90,6 +90,18 @@ func newProcessorPipeline(
 		processors.add(makeAddTagsProcessor("tags", tags))
 	}
 
+	location := global.location
+	if config.EventMetadata.Location != "" {
+		location = config.EventMetadata.Location
+	}
+	processors.add(makeAddFieldsProcessor("location", common.MapStr{"location": location}, false))
+
+	geoLocation := global.geoLocation
+	if config.EventMetadata.GeoLocation != "" {
+		geoLocation = config.EventMetadata.GeoLocation
+	}
+	processors.add(makeAddFieldsProcessor("geo.location", common.MapStr{"geo": common.MapStr{"location": geoLocation}}, false))
+
 	// setup 3, 4, 5: client config fields + pipeline fields + client fields + dyn metadata
 	fields := config.Fields.Clone()
 	fields.DeepUpdate(global.fields.Clone())

metricbeat/docs/fields.asciidoc

@@ -897,6 +897,18 @@ type: keyword
 Error type.
 
 
+--
+
+*`location`*::
++
+--
+type: keyword
+
+required: False
+
+Unique string representing the vantage point of this monitor.
+
+
 --
 
 [[exported-fields-ceph]]

packetbeat/docs/fields.asciidoc

@@ -528,6 +528,18 @@ type: keyword
 Error type.
 
 
+--
+
+*`location`*::
++
+--
+type: keyword
+
+required: False
+
+Unique string representing the vantage point of this monitor.
+
+
 --
 
 [[exported-fields-cassandra]]

winlogbeat/docs/fields.asciidoc

@@ -110,6 +110,18 @@ type: keyword
 Error type.
 
 
+--
+
+*`location`*::
++
+--
+type: keyword
+
+required: False
+
+Unique string representing the vantage point of this monitor.
+
+
 --
 
 [[exported-fields-cloud]]