diff --git a/_meta/fields.generated.yml b/_meta/fields.generated.yml
deleted file mode 100644
index d99274af..00000000
--- a/_meta/fields.generated.yml
+++ /dev/null
@@ -1,667 +0,0 @@
-- key: icingabeat
- title: icingabeat
- description: Data received from the Icinga 2 API
- fields:
- - name: timestamp
- type: date
- description: >
- Timestamp of event occurrence
-
- - name: type
- type: keyword
- description: >
- Type of the document
-
- - name: host
- type: keyword
- description: >
- Host that triggered the event
-
- - name: service
- type: keyword
- description: >
- Service that triggered the event
-
- - name: state
- type: integer
- description: >
- State of the check
-
- - name: state_type
- type: integer
- description: >
- State type of the check
-
- - name: author
- type: keyword
- description: >
- Author of a message
-
- - name: notification_type
- type: keyword
- description: >
- Type of notification
-
- - name: text
- type: text
- description: >
- Text of a message
-
- - name: users
- type: keyword
- description: >
- Affected users of a notification
-
- - name: acknowledgement_type
- type: integer
- description: >
- Type of an acknowledgement
-
- - name: expiry
- type: date
- description: >
- Expiry of an acknowledgement
-
- - name: notify
- type: keyword
- description: >
- If has been sent out
-
- - name: check_result.active
- type: boolean
- description: >
- If check was active or passive
-
- - name: check_result.check_source
- type: keyword
- description: >
- Icinga instance that scheduled the check
-
- - name: check_result.command
- type: text
- description: >
- Command that was executed
-
- - name: check_result.execution_end
- type: date
- description: >
- Time when execution of check ended
-
- - name: check_result.execution_start
- type: date
- description: >
- Time when execution of check started
-
- - name: check_result.exit_status
- type: integer
- description: >
- Exit status
-
- - name: check_result.output
- type: text
- description: >
- Output of check
-
- - name: check_result.performance_data
- type: text
- description: >
- Performance data in text format
-
- - name: check_result.schedule_end
- type: date
- description: >
- Time when scheduling of the check ended
-
- - name: check_result.schedule_start
- type: date
- description: >
- Time when check was scheduled
-
- - name: check_result.state
- type: integer
- description: >
- State of the check
-
- - name: check_result.type
- type: keyword
- description: >
- Type of this event
-
- - name: check_result.vars_after.attempt
- type: integer
- description: >
- Check attempt after check execution
-
- - name: check_result.vars_after.reachable
- type: boolean
- description: >
- Reachable state after check execution
-
- - name: check_result.vars_after.state
- type: integer
- description: >
- State of the check after execution
-
- - name: check_result.vars_after.state_type
- type: integer
- description: >
- State type after execution
-
- - name: check_result.vars_before.attempt
- type: integer
- description: >
- Check attempt before check execution
-
- - name: check_result.vars_before.reachable
- type: boolean
- description: >
- Reachable state before check execution
-
- - name: check_result.vars_before.state
- type: integer
- description: >
- Check state before check execution
-
- - name: check_result.vars_before.state_type
- type: integer
- description: >
- State type before check execution
-
- - name: comment.__name
- type: text
- description: >
- Unique identifier of a comment
-
- - name: comment.author
- type: keyword
- description: >
- Author of a comment
-
- - name: comment.entry_time
- type: date
- description: >
- Entry time of a comment
-
- - name: comment.entry_type
- type: integer
- description: >
- Entry type of a comment
-
- - name: comment.expire_time
- type: date
- description: >
- Expire time of a comment
-
- - name: comment.host_name
- type: keyword
- description: >
- Host name of a comment
-
- - name: comment.legacy_id
- type: integer
- description: >
- Legacy ID of a comment
-
- - name: comment.name
- type: keyword
- description: >
- Identifier of a comment
-
- - name: comment.package
- type: keyword
- description: >
- Config package of a comment
-
- - name: comment.service_name
- type: keyword
- description: >
- Service name of a comment
-
- - name: comment.templates
- type: text
- description: >
- Templates used by a comment
-
- - name: comment.text
- type: text
- description: >
- Text of a comment
-
- - name: comment.type
- type: keyword
- description: >
- Comment type
-
- - name: comment.version
- type: keyword
- description: >
- Config version of comment object
-
- - name: comment.zone
- type: keyword
- description: >
- Zone where comment was generated
-
- - name: downtime.__name
- type: text
- description: >
- Unique identifier of a downtime
-
- - name: downtime.author
- type: keyword
- description: >
- Author of a downtime
-
- - name: downtime.comment
- type: text
- description: >
- Text of a downtime
-
- - name: downtime.config_owner
- type: text
- description: >
- Config owner
-
- - name: downtime.duration
- type: integer
- description: >
- Duration of a downtime
-
- - name: downtime.end_time
- type: date
- description: >
- Timestamp of downtime end
-
- - name: downtime.entry_time
- type: date
- description: >
- Timestamp when downtime was created
-
- - name: downtime.fixed
- type: boolean
- description: >
- If downtime is fixed or flexible
-
- - name: downtime.host_name
- type: keyword
- description: >
- Hostname of a downtime
-
- - name: downtime.legacy_id
- type: integer
- description: >
- The integer ID of a downtime
-
- - name: downtime.name
- type: keyword
- description: >
- Downtime config identifier
-
- - name: downtime.package
- type: keyword
- description: >
- Configuration package of downtime
-
- - name: downtime.scheduled_by
- type: text
- description: >
- By whom downtime was scheduled
-
- - name: downtime.service_name
- type: keyword
- description: >
- Service name of a downtime
-
- - name: downtime.start_time
- type: date
- description: >
- Timestamp when downtime starts
-
- - name: downtime.templates
- type: text
- description: >
- Templates used by this downtime
-
- - name: downtime.trigger_time
- type: date
- description: >
- Timestamp when downtime was triggered
-
- - name: downtime.triggered_by
- type: text
- description: >
- By whom downtime was triggered
-
- - name: downtime.triggers
- type: text
- description: >
- Downtime triggers
-
- - name: downtime.type
- type: keyword
- description: >
- Downtime type
-
- - name: downtime.version
- type: keyword
- description: >
- Config version of downtime
-
- - name: downtime.was_cancelled
- type: boolean
- description: >
- If downtime was cancelled
-
- - name: downtime.zone
- type: keyword
- description: >
- Zone of downtime
-
- - name: status.active_host_checks
- type: integer
- description: >
- Active host checks
-
-
- - name: status.active_host_checks_15min
- type: integer
- description: >
- Active host checks in the last 15 minutes
-
-
- - name: status.active_host_checks_1min
- type: integer
- description: >
- Acitve host checks in the last minute
-
-
- - name: status.active_host_checks_5min
- type: integer
- description: >
- Active host checks in the last 5 minutes
-
-
- - name: status.active_service_checks
- type: integer
- description: >
- Active service checks
-
- - name: status.active_service_checks_15min
- type: integer
- description: >
- Active service checks in the last 15 minutes
-
- - name: status.active_service_checks_1min
- type: integer
- description: >
- Active service checks in the last minute
-
- - name: status.active_service_checks_5min
- type: integer
- description: >
- Active service checks in the last 5 minutes
-
- - name: status.api.identity
- type: keyword
- description: >
- API identity
-
- - name: status.api.num_conn_endpoints
- type: integer
- description: >
- Number of connected endpoints
-
- - name: status.api.num_endpoints
- type: integer
- description: >
- Total number of endpoints
-
- - name: status.api.num_not_conn_endpoints
- type: integer
- description: >
- Number of not connected endpoints
-
- - name: status.avg_execution_time
- type: integer
- description: >
- Average execution time of checks
-
- - name: status.avg_latency
- type: integer
- description: >
- Average latency time
-
- - name: status.checkercomponent.checker.idle
- type: integer
- description: >
- Idle checks
-
- - name: status.checkercomponent.checker.pending
- type: integer
- description: >
- Pending checks
-
- - name: status.filelogger.main-log
- type: integer
- description: >
- Mainlog enabled
-
- - name: status.icingaapplication.app.enable_event_handlers
- type: boolean
- description: >
- Event handlers enabled
-
- - name: status.icingaapplication.app.enable_flapping
- type: boolean
- description: >
- Flapping detection enabled
-
- - name: status.icingaapplication.app.enable_host_checks
- type: boolean
- description: >
- Host checks enabled
-
- - name: status.icingaapplication.app.enable_notifications
- type: boolean
- description: >
- Notifications enabled
-
- - name: status.icingaapplication.app.enable_perfdata
- type: boolean
- description: >
- Perfdata enabled
-
- - name: status.icingaapplication.app.enable_service_checks
- type: boolean
- description: >
- Service checks enabled
-
- - name: status.icingaapplication.app.node_name
- type: keyword
- description: >
- Node name
-
- - name: status.icingaapplication.app.pid
- type: integer
- description: >
- PID
-
- - name: status.icingaapplication.app.program_start
- type: integer
- description: >
- Time when Icinga started
-
- - name: status.icingaapplication.app.version
- type: keyword
- description: >
- Version
-
- - name: status.idomysqlconnection.ido-mysql.connected
- type: boolean
- description: >
- IDO connected
-
- - name: status.idomysqlconnection.ido-mysql.instance_name
- type: keyword
- description: >
- IDO Instance name
-
- - name: status.idomysqlconnection.ido-mysql.query_queue_items
- type: integer
- description: >
- IDO query items in the queue
-
- - name: status.idomysqlconnection.ido-mysql.version
- type: keyword
- description: >
- IDO schema version
-
- - name: status.max_execution_time
- type: integer
- description: >
- Max execution time
-
- - name: status.max_latency
- type: integer
- description: >
- Max latency
-
- - name: status.min_execution_time
- type: integer
- description: >
- Min execution time
-
- - name: status.min_latency
- type: integer
- description: >
- Min latency
-
- - name: status.notificationcomponent.notification
- type: integer
- description: >
- Notification
-
- - name: status.num_hosts_acknowledged
- type: integer
- description: >
- Amount of acknowledged hosts
-
- - name: status.num_hosts_down
- type: integer
- description: >
- Amount of down hosts
-
- - name: status.num_hosts_flapping
- type: integer
- description: >
- Amount of flapping hosts
-
- - name: status.num_hosts_in_downtime
- type: integer
- description: >
- Amount of hosts in downtime
-
- - name: status.num_hosts_pending
- type: integer
- description: >
- Amount of pending hosts
-
- - name: status.num_hosts_unreachable
- type: integer
- description: >
- Amount of unreachable hosts
-
- - name: status.num_hosts_up
- type: integer
- description: >
- Amount of hosts in up state
-
- - name: status.num_services_acknowledged
- type: integer
- description: >
- Amount of acknowledged services
-
- - name: status.num_services_critical
- type: integer
- description: >
- Amount of critical services
-
- - name: status.num_services_flapping
- type: integer
- description: >
- Amount of flapping services
-
- - name: status.num_services_in_downtime
- type: integer
- description: >
- Amount of services in downtime
-
- - name: status.num_services_ok
- type: integer
- description: >
- Amount of services in ok state
-
- - name: status.num_services_pending
- type: integer
- description: >
- Amount of pending services
-
- - name: status.num_services_unknown
- type: integer
- description: >
- Amount of unknown services
-
- - name: status.num_services_unreachable
- type: integer
- description: >
- Amount of unreachable services
-
- - name: status.num_services_warning
- type: integer
- description: >
- Amount of services in warning state
-
- - name: status.passive_host_checks
- type: integer
- description: >
- Amount of passive host checks
-
- - name: status.passive_host_checks_15min
- type: integer
- description: >
- Amount of passive host checks in the last 15 minutes
-
- - name: status.passive_host_checks_1min
- type: integer
- description: >
- Amount of passive host checks in the last minute
-
- - name: status.passive_host_checks_5min
- type: integer
- description: >
- Amount of passive host checks in the last 5 minutes
-
- - name: status.passive_service_checks
- type: integer
- description: >
- Amount of passive service checks
-
- - name: status.passive_service_checks_15min
- type: integer
- description: >
- Amount of passive service checks in the last 15 minutes
-
- - name: status.passive_service_checks_1min
- type: integer
- description: >
- Amount of passive service checks in the last minute
-
- - name: status.passive_service_checks_5min
- type: integer
- description: >
- Amount of passive service checks in the last 5 minutes
-
- - name: status.uptime
- type: integer
- description: >
- Uptime
diff --git a/docs/fields.asciidoc b/docs/fields.asciidoc
index baf513d5..6517af19 100644
--- a/docs/fields.asciidoc
+++ b/docs/fields.asciidoc
@@ -169,7 +169,6 @@ Region in which this host is running.
[[exported-fields-docker-processor]]
== Docker fields
-beta[]
Docker stats collected from Docker.
@@ -1272,7 +1271,6 @@ Uptime
[[exported-fields-kubernetes-processor]]
== Kubernetes fields
-beta[]
Kubernetes metadata added by the kubernetes processor
@@ -1294,6 +1292,14 @@ type: keyword
Kubernetes namespace
+[float]
+=== `kubernetes.node.name`
+
+type: keyword
+
+Kubernetes node name
+
+
[float]
=== `kubernetes.labels`
diff --git a/fields.yml b/fields.yml
deleted file mode 100644
index 9289fe8f..00000000
--- a/fields.yml
+++ /dev/null
@@ -1,835 +0,0 @@
-
-- key: beat
- title: Beat
- description: >
- Contains common beat fields available in all event types.
- fields:
-
- - name: beat.name
- description: >
- The name of the Beat sending the log messages. If the Beat name is
- set in the configuration file, then that value is used. If it is not
- set, the hostname is used. To set the Beat name, use the `name`
- option in the configuration file.
- - name: beat.hostname
- description: >
- The hostname as returned by the operating system on which the Beat is
- running.
- - name: beat.timezone
- description: >
- The timezone as returned by the operating system on which the Beat is
- running.
- - name: beat.version
- description: >
- The version of the beat that generated this event.
-
- - name: "@timestamp"
- type: date
- required: true
- format: date
- example: August 26th 2016, 12:35:53.332
- description: >
- The timestamp when the event log record was generated.
-
- - name: tags
- description: >
- Arbitrary tags that can be set per Beat and per transaction
- type.
-
- - name: fields
- type: object
- object_type: keyword
- description: >
- Contains user configurable fields.
-
- - name: error
- type: group
- description: >
- Error fields containing additional info in case of errors.
- fields:
- - name: message
- type: text
- description: >
- Error message.
- - name: code
- type: long
- description: >
- Error code.
- - name: type
- type: keyword
- description: >
- Error type.
-- key: cloud
- title: Cloud provider metadata
- description: >
- Metadata from cloud providers added by the add_cloud_metadata processor.
- fields:
-
- - name: meta.cloud.provider
- example: ec2
- description: >
- Name of the cloud provider. Possible values are ec2, gce, or digitalocean.
-
- - name: meta.cloud.instance_id
- description: >
- Instance ID of the host machine.
-
- - name: meta.cloud.instance_name
- description: >
- Instance name of the host machine.
-
- - name: meta.cloud.machine_type
- example: t2.medium
- description: >
- Machine type of the host machine.
-
- - name: meta.cloud.availability_zone
- example: us-east-1c
- description: >
- Availability zone in which this host is running.
-
- - name: meta.cloud.project_id
- example: project-x
- description: >
- Name of the project in Google Cloud.
-
- - name: meta.cloud.region
- description: >
- Region in which this host is running.
-- key: docker
- title: Docker
- description: >
- beta[]
-
- Docker stats collected from Docker.
- short_config: false
- anchor: docker-processor
- fields:
- - name: docker
- type: group
- fields:
- - name: container.id
- type: keyword
- description: >
- Unique container id.
- - name: container.image
- type: keyword
- description: >
- Name of the image the container was built on.
- - name: container.name
- type: keyword
- description: >
- Container name.
- - name: container.labels
- type: object
- object_type: keyword
- description: >
- Image labels.
-- key: kubernetes
- title: Kubernetes
- description: >
- beta[]
-
- Kubernetes metadata added by the kubernetes processor
- short_config: false
- anchor: kubernetes-processor
- fields:
- - name: kubernetes
- type: group
- fields:
- - name: pod.name
- type: keyword
- description: >
- Kubernetes pod name
-
- - name: namespace
- type: keyword
- description: >
- Kubernetes namespace
-
- - name: labels
- type: object
- description: >
- Kubernetes labels map
-
- - name: annotations
- type: object
- description: >
- Kubernetes annotations map
-
- - name: container.name
- type: keyword
- description: >
- Kubernetes container name
-
- - name: container.image
- type: keyword
- description: >
- Kubernetes container image
-- key: icingabeat
- title: icingabeat
- description: Data received from the Icinga 2 API
- fields:
- - name: timestamp
- type: date
- description: >
- Timestamp of event occurrence
-
- - name: type
- type: keyword
- description: >
- Type of the document
-
- - name: host
- type: keyword
- description: >
- Host that triggered the event
-
- - name: service
- type: keyword
- description: >
- Service that triggered the event
-
- - name: state
- type: integer
- description: >
- State of the check
-
- - name: state_type
- type: integer
- description: >
- State type of the check
-
- - name: author
- type: keyword
- description: >
- Author of a message
-
- - name: notification_type
- type: keyword
- description: >
- Type of notification
-
- - name: text
- type: text
- description: >
- Text of a message
-
- - name: users
- type: keyword
- description: >
- Affected users of a notification
-
- - name: acknowledgement_type
- type: integer
- description: >
- Type of an acknowledgement
-
- - name: expiry
- type: date
- description: >
- Expiry of an acknowledgement
-
- - name: notify
- type: keyword
- description: >
- If has been sent out
-
- - name: check_result.active
- type: boolean
- description: >
- If check was active or passive
-
- - name: check_result.check_source
- type: keyword
- description: >
- Icinga instance that scheduled the check
-
- - name: check_result.command
- type: text
- description: >
- Command that was executed
-
- - name: check_result.execution_end
- type: date
- description: >
- Time when execution of check ended
-
- - name: check_result.execution_start
- type: date
- description: >
- Time when execution of check started
-
- - name: check_result.exit_status
- type: integer
- description: >
- Exit status
-
- - name: check_result.output
- type: text
- description: >
- Output of check
-
- - name: check_result.performance_data
- type: text
- description: >
- Performance data in text format
-
- - name: check_result.schedule_end
- type: date
- description: >
- Time when scheduling of the check ended
-
- - name: check_result.schedule_start
- type: date
- description: >
- Time when check was scheduled
-
- - name: check_result.state
- type: integer
- description: >
- State of the check
-
- - name: check_result.type
- type: keyword
- description: >
- Type of this event
-
- - name: check_result.vars_after.attempt
- type: integer
- description: >
- Check attempt after check execution
-
- - name: check_result.vars_after.reachable
- type: boolean
- description: >
- Reachable state after check execution
-
- - name: check_result.vars_after.state
- type: integer
- description: >
- State of the check after execution
-
- - name: check_result.vars_after.state_type
- type: integer
- description: >
- State type after execution
-
- - name: check_result.vars_before.attempt
- type: integer
- description: >
- Check attempt before check execution
-
- - name: check_result.vars_before.reachable
- type: boolean
- description: >
- Reachable state before check execution
-
- - name: check_result.vars_before.state
- type: integer
- description: >
- Check state before check execution
-
- - name: check_result.vars_before.state_type
- type: integer
- description: >
- State type before check execution
-
- - name: comment.__name
- type: text
- description: >
- Unique identifier of a comment
-
- - name: comment.author
- type: keyword
- description: >
- Author of a comment
-
- - name: comment.entry_time
- type: date
- description: >
- Entry time of a comment
-
- - name: comment.entry_type
- type: integer
- description: >
- Entry type of a comment
-
- - name: comment.expire_time
- type: date
- description: >
- Expire time of a comment
-
- - name: comment.host_name
- type: keyword
- description: >
- Host name of a comment
-
- - name: comment.legacy_id
- type: integer
- description: >
- Legacy ID of a comment
-
- - name: comment.name
- type: keyword
- description: >
- Identifier of a comment
-
- - name: comment.package
- type: keyword
- description: >
- Config package of a comment
-
- - name: comment.service_name
- type: keyword
- description: >
- Service name of a comment
-
- - name: comment.templates
- type: text
- description: >
- Templates used by a comment
-
- - name: comment.text
- type: text
- description: >
- Text of a comment
-
- - name: comment.type
- type: keyword
- description: >
- Comment type
-
- - name: comment.version
- type: keyword
- description: >
- Config version of comment object
-
- - name: comment.zone
- type: keyword
- description: >
- Zone where comment was generated
-
- - name: downtime.__name
- type: text
- description: >
- Unique identifier of a downtime
-
- - name: downtime.author
- type: keyword
- description: >
- Author of a downtime
-
- - name: downtime.comment
- type: text
- description: >
- Text of a downtime
-
- - name: downtime.config_owner
- type: text
- description: >
- Config owner
-
- - name: downtime.duration
- type: integer
- description: >
- Duration of a downtime
-
- - name: downtime.end_time
- type: date
- description: >
- Timestamp of downtime end
-
- - name: downtime.entry_time
- type: date
- description: >
- Timestamp when downtime was created
-
- - name: downtime.fixed
- type: boolean
- description: >
- If downtime is fixed or flexible
-
- - name: downtime.host_name
- type: keyword
- description: >
- Hostname of a downtime
-
- - name: downtime.legacy_id
- type: integer
- description: >
- The integer ID of a downtime
-
- - name: downtime.name
- type: keyword
- description: >
- Downtime config identifier
-
- - name: downtime.package
- type: keyword
- description: >
- Configuration package of downtime
-
- - name: downtime.scheduled_by
- type: text
- description: >
- By whom downtime was scheduled
-
- - name: downtime.service_name
- type: keyword
- description: >
- Service name of a downtime
-
- - name: downtime.start_time
- type: date
- description: >
- Timestamp when downtime starts
-
- - name: downtime.templates
- type: text
- description: >
- Templates used by this downtime
-
- - name: downtime.trigger_time
- type: date
- description: >
- Timestamp when downtime was triggered
-
- - name: downtime.triggered_by
- type: text
- description: >
- By whom downtime was triggered
-
- - name: downtime.triggers
- type: text
- description: >
- Downtime triggers
-
- - name: downtime.type
- type: keyword
- description: >
- Downtime type
-
- - name: downtime.version
- type: keyword
- description: >
- Config version of downtime
-
- - name: downtime.was_cancelled
- type: boolean
- description: >
- If downtime was cancelled
-
- - name: downtime.zone
- type: keyword
- description: >
- Zone of downtime
-
- - name: status.active_host_checks
- type: integer
- description: >
- Active host checks
-
-
- - name: status.active_host_checks_15min
- type: integer
- description: >
- Active host checks in the last 15 minutes
-
-
- - name: status.active_host_checks_1min
- type: integer
- description: >
- Acitve host checks in the last minute
-
-
- - name: status.active_host_checks_5min
- type: integer
- description: >
- Active host checks in the last 5 minutes
-
-
- - name: status.active_service_checks
- type: integer
- description: >
- Active service checks
-
- - name: status.active_service_checks_15min
- type: integer
- description: >
- Active service checks in the last 15 minutes
-
- - name: status.active_service_checks_1min
- type: integer
- description: >
- Active service checks in the last minute
-
- - name: status.active_service_checks_5min
- type: integer
- description: >
- Active service checks in the last 5 minutes
-
- - name: status.api.identity
- type: keyword
- description: >
- API identity
-
- - name: status.api.num_conn_endpoints
- type: integer
- description: >
- Number of connected endpoints
-
- - name: status.api.num_endpoints
- type: integer
- description: >
- Total number of endpoints
-
- - name: status.api.num_not_conn_endpoints
- type: integer
- description: >
- Number of not connected endpoints
-
- - name: status.avg_execution_time
- type: integer
- description: >
- Average execution time of checks
-
- - name: status.avg_latency
- type: integer
- description: >
- Average latency time
-
- - name: status.checkercomponent.checker.idle
- type: integer
- description: >
- Idle checks
-
- - name: status.checkercomponent.checker.pending
- type: integer
- description: >
- Pending checks
-
- - name: status.filelogger.main-log
- type: integer
- description: >
- Mainlog enabled
-
- - name: status.icingaapplication.app.enable_event_handlers
- type: boolean
- description: >
- Event handlers enabled
-
- - name: status.icingaapplication.app.enable_flapping
- type: boolean
- description: >
- Flapping detection enabled
-
- - name: status.icingaapplication.app.enable_host_checks
- type: boolean
- description: >
- Host checks enabled
-
- - name: status.icingaapplication.app.enable_notifications
- type: boolean
- description: >
- Notifications enabled
-
- - name: status.icingaapplication.app.enable_perfdata
- type: boolean
- description: >
- Perfdata enabled
-
- - name: status.icingaapplication.app.enable_service_checks
- type: boolean
- description: >
- Service checks enabled
-
- - name: status.icingaapplication.app.node_name
- type: keyword
- description: >
- Node name
-
- - name: status.icingaapplication.app.pid
- type: integer
- description: >
- PID
-
- - name: status.icingaapplication.app.program_start
- type: integer
- description: >
- Time when Icinga started
-
- - name: status.icingaapplication.app.version
- type: keyword
- description: >
- Version
-
- - name: status.idomysqlconnection.ido-mysql.connected
- type: boolean
- description: >
- IDO connected
-
- - name: status.idomysqlconnection.ido-mysql.instance_name
- type: keyword
- description: >
- IDO Instance name
-
- - name: status.idomysqlconnection.ido-mysql.query_queue_items
- type: integer
- description: >
- IDO query items in the queue
-
- - name: status.idomysqlconnection.ido-mysql.version
- type: keyword
- description: >
- IDO schema version
-
- - name: status.max_execution_time
- type: integer
- description: >
- Max execution time
-
- - name: status.max_latency
- type: integer
- description: >
- Max latency
-
- - name: status.min_execution_time
- type: integer
- description: >
- Min execution time
-
- - name: status.min_latency
- type: integer
- description: >
- Min latency
-
- - name: status.notificationcomponent.notification
- type: integer
- description: >
- Notification
-
- - name: status.num_hosts_acknowledged
- type: integer
- description: >
- Amount of acknowledged hosts
-
- - name: status.num_hosts_down
- type: integer
- description: >
- Amount of down hosts
-
- - name: status.num_hosts_flapping
- type: integer
- description: >
- Amount of flapping hosts
-
- - name: status.num_hosts_in_downtime
- type: integer
- description: >
- Amount of hosts in downtime
-
- - name: status.num_hosts_pending
- type: integer
- description: >
- Amount of pending hosts
-
- - name: status.num_hosts_unreachable
- type: integer
- description: >
- Amount of unreachable hosts
-
- - name: status.num_hosts_up
- type: integer
- description: >
- Amount of hosts in up state
-
- - name: status.num_services_acknowledged
- type: integer
- description: >
- Amount of acknowledged services
-
- - name: status.num_services_critical
- type: integer
- description: >
- Amount of critical services
-
- - name: status.num_services_flapping
- type: integer
- description: >
- Amount of flapping services
-
- - name: status.num_services_in_downtime
- type: integer
- description: >
- Amount of services in downtime
-
- - name: status.num_services_ok
- type: integer
- description: >
- Amount of services in ok state
-
- - name: status.num_services_pending
- type: integer
- description: >
- Amount of pending services
-
- - name: status.num_services_unknown
- type: integer
- description: >
- Amount of unknown services
-
- - name: status.num_services_unreachable
- type: integer
- description: >
- Amount of unreachable services
-
- - name: status.num_services_warning
- type: integer
- description: >
- Amount of services in warning state
-
- - name: status.passive_host_checks
- type: integer
- description: >
- Amount of passive host checks
-
- - name: status.passive_host_checks_15min
- type: integer
- description: >
- Amount of passive host checks in the last 15 minutes
-
- - name: status.passive_host_checks_1min
- type: integer
- description: >
- Amount of passive host checks in the last minute
-
- - name: status.passive_host_checks_5min
- type: integer
- description: >
- Amount of passive host checks in the last 5 minutes
-
- - name: status.passive_service_checks
- type: integer
- description: >
- Amount of passive service checks
-
- - name: status.passive_service_checks_15min
- type: integer
- description: >
- Amount of passive service checks in the last 15 minutes
-
- - name: status.passive_service_checks_1min
- type: integer
- description: >
- Amount of passive service checks in the last minute
-
- - name: status.passive_service_checks_5min
- type: integer
- description: >
- Amount of passive service checks in the last 5 minutes
-
- - name: status.uptime
- type: integer
- description: >
- Uptime
diff --git a/icingabeat.reference.yml b/icingabeat.reference.yml
index 9c4883c6..29980660 100644
--- a/icingabeat.reference.yml
+++ b/icingabeat.reference.yml
@@ -170,6 +170,10 @@ icingabeat:
#- add_docker_metadata:
# host: "unix:///var/run/docker.sock"
# match_fields: ["system.process.cgroup.id"]
+# match_pids: ["process.pid", "process.ppid"]
+# match_source: true
+# match_source_index: 4
+# cleanup_timeout: 60
# # To connect to Docker over TLS you must specify a client and CA certificate.
# #ssl:
# # certificate_authority: "/etc/pki/root/ca.pem"
@@ -257,7 +261,7 @@ output.elasticsearch:
# Configure http request timeout before failing an request to Elasticsearch.
#timeout: 90
- # Use SSL settings for HTTPS. Default is true.
+ # Use SSL settings for HTTPS.
#ssl.enabled: true
# Configure SSL verification mode. If `none` is configured, all server hosts
@@ -320,7 +324,7 @@ output.elasticsearch:
# Number of batches to be sent asynchronously to logstash while processing
# new batches.
- #pipelining: 5
+ #pipelining: 2
# If enabled only a subset of events in a batch of events is transferred per
# transaction. The number of events to be sent increases up to `bulk_max_size`
@@ -800,12 +804,11 @@ setup.kibana:
#================================ Logging ======================================
-# There are three options for the log output: syslog, file, stderr.
-# Under Windows systems, the log files are per default sent to the file output,
-# under all other system per default to syslog.
+# There are four options for the log output: file, stderr, syslog, eventlog
+# The file output is the default.
# Sets log level. The default log level is info.
-# Available log levels are: critical, error, warning, info, debug
+# Available log levels are: error, warning, info, debug
#logging.level: info
# Enable debug output for selected components. To enable all selectors use ["*"]
@@ -814,7 +817,10 @@ setup.kibana:
#logging.selectors: [ ]
# Send all logging output to syslog. The default is false.
-#logging.to_syslog: true
+#logging.to_syslog: false
+
+# Send all logging output to Windows Event Logs. The default is false.
+#logging.to_eventlog: false
# If enabled, icingabeat periodically logs its internal metrics that have changed
# in the last period. For each metric that changed, the delta from the value at
@@ -849,3 +855,108 @@ logging.files:
# Set to true to log messages in json format.
#logging.json: false
+
+
+#============================== Xpack Monitoring =====================================
+# icingabeat can export internal metrics to a central Elasticsearch monitoring cluster.
+# This requires xpack monitoring to be enabled in Elasticsearch.
+# The reporting is disabled by default.
+
+# Set to true to enable the monitoring reporter.
+#xpack.monitoring.enabled: false
+
+# Uncomment to send the metrics to Elasticsearch. Most settings from the
+# Elasticsearch output are accepted here as well. Any setting that is not set is
+# automatically inherited from the Elasticsearch output configuration, so if you
+# have the Elasticsearch output configured, you can simply uncomment the
+# following line, and leave the rest commented out.
+#xpack.monitoring.elasticsearch:
+
+ # Array of hosts to connect to.
+ # Scheme and port can be left out and will be set to the default (http and 9200)
+ # In case you specify and additional path, the scheme is required: http://localhost:9200/path
+ # IPv6 addresses should always be defined as: https://[2001:db8::1]:9200
+ #hosts: ["localhost:9200"]
+
+ # Set gzip compression level.
+ #compression_level: 0
+
+ # Optional protocol and basic auth credentials.
+ #protocol: "https"
+ #username: "beats_system"
+ #password: "changeme"
+
+ # Dictionary of HTTP parameters to pass within the url with index operations.
+ #parameters:
+ #param1: value1
+ #param2: value2
+
+ # Custom HTTP headers to add to each request
+ #headers:
+ # X-My-Header: Contents of the header
+
+ # Proxy server url
+ #proxy_url: http://proxy:3128
+
+ # The number of times a particular Elasticsearch index operation is attempted. If
+ # the indexing operation doesn't succeed after this many retries, the events are
+ # dropped. The default is 3.
+ #max_retries: 3
+
+ # The maximum number of events to bulk in a single Elasticsearch bulk API index request.
+ # The default is 50.
+ #bulk_max_size: 50
+
+ # Configure http request timeout before failing an request to Elasticsearch.
+ #timeout: 90
+
+ # Use SSL settings for HTTPS.
+ #ssl.enabled: true
+
+ # Configure SSL verification mode. If `none` is configured, all server hosts
+ # and certificates will be accepted. In this mode, SSL based connections are
+ # susceptible to man-in-the-middle attacks. Use only for testing. Default is
+ # `full`.
+ #ssl.verification_mode: full
+
+ # List of supported/valid TLS versions. By default all TLS versions 1.0 up to
+ # 1.2 are enabled.
+ #ssl.supported_protocols: [TLSv1.0, TLSv1.1, TLSv1.2]
+
+ # SSL configuration. By default is off.
+ # List of root certificates for HTTPS server verifications
+ #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
+
+ # Certificate for SSL client authentication
+ #ssl.certificate: "/etc/pki/client/cert.pem"
+
+ # Client Certificate Key
+ #ssl.key: "/etc/pki/client/cert.key"
+
+ # Optional passphrase for decrypting the Certificate Key.
+ #ssl.key_passphrase: ''
+
+ # Configure cipher suites to be used for SSL connections
+ #ssl.cipher_suites: []
+
+ # Configure curve types for ECDHE based cipher suites
+ #ssl.curve_types: []
+
+ # Configure what types of renegotiation are supported. Valid options are
+ # never, once, and freely. Default is never.
+ #ssl.renegotiation: never
+
+#================================ HTTP Endpoint ======================================
+# Each beat can expose internal metrics through a HTTP endpoint. For security
+# reasons the endpoint is disabled by default. This feature is currently experimental.
+# Stats can be access through http://localhost:5066/stats . For pretty JSON output
+# append ?pretty to the URL.
+
+# Defines if the HTTP endpoint is enabled.
+#http.enabled: false
+
+# The HTTP endpoint will bind to this hostname or IP address. It is recommended to use only localhost.
+#http.host: localhost
+
+# Port on which the HTTP endpoint will bind. Default is 5066.
+#http.port: 5066
diff --git a/icingabeat.yml b/icingabeat.yml
index d85d68ec..dba0c879 100644
--- a/icingabeat.yml
+++ b/icingabeat.yml
@@ -157,10 +157,25 @@ output.elasticsearch:
#================================ Logging =====================================
# Sets log level. The default log level is info.
-# Available log levels are: critical, error, warning, info, debug
+# Available log levels are: error, warning, info, debug
#logging.level: debug
# At debug level, you can selectively enable logging only for some components.
# To enable all selectors use ["*"]. Examples of other selectors are "beat",
# "publish", "service".
#logging.selectors: ["*"]
+
+#============================== Xpack Monitoring ===============================
+# icingabeat can export internal metrics to a central Elasticsearch monitoring
+# cluster. This requires xpack monitoring to be enabled in Elasticsearch. The
+# reporting is disabled by default.
+
+# Set to true to enable the monitoring reporter.
+#xpack.monitoring.enabled: false
+
+# Uncomment to send the metrics to Elasticsearch. Most settings from the
+# Elasticsearch output are accepted here as well. Any setting that is not set is
+# automatically inherited from the Elasticsearch output configuration, so if you
+# have the Elasticsearch output configured, you can simply uncomment the
+# following line.
+#xpack.monitoring.elasticsearch:
diff --git a/vendor/github.com/elastic/beats/.gitignore b/vendor/github.com/elastic/beats/.gitignore
index fc1a79ff..fa69db58 100644
--- a/vendor/github.com/elastic/beats/.gitignore
+++ b/vendor/github.com/elastic/beats/.gitignore
@@ -16,6 +16,7 @@
coverage.out
.python-version
beat.db
+*.keystore
# Editor swap files
*.swp
diff --git a/vendor/github.com/elastic/beats/.travis.yml b/vendor/github.com/elastic/beats/.travis.yml
index 710fb908..d79cd3f4 100644
--- a/vendor/github.com/elastic/beats/.travis.yml
+++ b/vendor/github.com/elastic/beats/.travis.yml
@@ -49,6 +49,14 @@ jobs:
env: TARGETS="-C auditbeat testsuite"
go: $GO_VERSION
stage: test
+ - os: osx
+ env: TARGETS="-C auditbeat testsuite"
+ go: $GO_VERSION
+ stage: test
+ - os: linux
+ env: TARGETS="-C auditbeat crosscompile"
+ go: $GO_VERSION
+ stage: test
# Libbeat
- os: linux
@@ -59,6 +67,10 @@ jobs:
env: TARGETS="-C libbeat crosscompile"
go: $GO_VERSION
stage: test
+ - os: linux
+ env: TARGETS="-C libbeat stress-tests"
+ go: $GO_VERSION
+ stage: test
# Metricbeat
- os: linux
diff --git a/vendor/github.com/elastic/beats/CHANGELOG.asciidoc b/vendor/github.com/elastic/beats/CHANGELOG.asciidoc
index 553395e5..1a217be3 100644
--- a/vendor/github.com/elastic/beats/CHANGELOG.asciidoc
+++ b/vendor/github.com/elastic/beats/CHANGELOG.asciidoc
@@ -8,7 +8,7 @@
// Template, add newest changes here
=== Beats version HEAD
-https://github.com/elastic/beats/compare/v6.1.1...6.1[Check the HEAD diff]
+https://github.com/elastic/beats/compare/v6.2.2...6.2[Check the HEAD diff]
==== Breaking changes
@@ -32,6 +32,8 @@ https://github.com/elastic/beats/compare/v6.1.1...6.1[Check the HEAD diff]
*Auditbeat*
+- Add hex decoding for the name field in audit path records. {pull}6687[6687]
+
*Filebeat*
*Heartbeat*
@@ -40,6 +42,8 @@ https://github.com/elastic/beats/compare/v6.1.1...6.1[Check the HEAD diff]
*Packetbeat*
+- HTTP parses successfully on empty status phrase. {issue}6176[6176]
+
*Winlogbeat*
==== Added
@@ -77,6 +81,175 @@ https://github.com/elastic/beats/compare/v6.1.1...6.1[Check the HEAD diff]
////////////////////////////////////////////////////////////
+
+[[release-notes-6.2.3]]
+=== Beats version 6.2.3
+https://github.com/elastic/beats/compare/v6.2.2...v6.2.3[View commits]
+
+==== Breaking changes
+
+*Affecting all Beats*
+
+- Fix conditions checking on autodiscover Docker labels. {pull}6412[6412]
+
+==== Bugfixes
+
+*Affecting all Beats*
+
+- Avoid panic errors when processing nil Pod events in add_kubernetes_metadata. {issue}6372[6372]
+- Fix infinite failure on Kubernetes watch {pull}6504[6504]
+
+*Metricbeat*
+
+- Fix Kubernetes overview dashboard views for non default time ranges. {issue}6395{6395}
+
+
+[[release-notes-6.2.2]]
+=== Beats version 6.2.2
+https://github.com/elastic/beats/compare/v6.2.1...v6.2.2[View commits]
+
+==== Bugfixes
+
+*Affecting all Beats*
+
+- Add logging when monitoring cannot connect to Elasticsearch. {pull}6365[6365]
+- Fix infinite loop when event unmarshal fails in Kubernetes pod watcher. {pull}6353[6353]
+
+*Filebeat*
+
+- Fix a conversion issue for time related fields in the Logstash module for the slowlog
+ fileset. {issue}6317[6317]
+
+[[release-notes-6.2.1]]
+=== Beats version 6.2.1
+https://github.com/elastic/beats/compare/v6.2.0...v6.2.1[View commits]
+
+No changes in this release.
+
+[[release-notes-6.2.0]]
+=== Beats version 6.2.0
+https://github.com/elastic/beats/compare/v6.1.3...v6.2.0[View commits]
+
+==== Breaking changes
+
+*Affecting all Beats*
+
+- The log format may differ due to logging library changes. {pull}5901[5901]
+- The default value for pipelining is reduced to 2 to avoid high memory in the Logstash beats input. {pull}6250[6250]
+
+*Auditbeat*
+
+- Split the audit.kernel and audit.file metricsets into their own modules
+ named auditd and file_integrity, respectively. This change requires
+ existing users to update their config. {issue}5422[5422]
+- Renamed file_integrity module fields. {issue}5423[5423] {pull}5995[5995]
+- Renamed auditd module fields. {issue}5423[5423] {pull}6080[6080]
+
+*Metricbeat*
+
+- Rename `golang.heap.system.optained` field to `golang.heap.system.obtained`. {issue}5703[5703]
+- De dot keys in jolokia/jmx metricset to prevent collisions. {pull}5957[5957]
+
+==== Bugfixes
+
+*Auditbeat*
+
+- Fixed an issue where the proctitle value was being truncated. {pull}6080[6080]
+- Fixed an issue where values were incorrectly interpretted as hex data. {pull}6080[6080]
+- Fixed parsing of the `key` value when multiple keys are present. {pull}6080[6080]
+- Fix possible resource leak if file_integrity module is used with config
+ reloading on Windows or Linux. {pull}6198[6198]
+
+*Filebeat*
+
+- Fix variable name for `convert_timezone` in the system module. {pull}5936[5936]
+
+*Metricbeat*
+
+- Fix error `datastore '*' not found` in Vsphere module. {issue}4879[4879]
+- Fix error `NotAuthenticated` in Vsphere module. {issue}4673[4673]
+- Fix mongodb session consistency mode to allow command execution on secondary nodes. {issue}4689[4689]
+- Fix kubernetes `state_pod` `status.phase` so that the active phase is returned instead of `unknown`. {pull}5980[5980]
+- Fix error collecting network_names in Vsphere module. {pull}5962[5962]
+- Fix process cgroup memory metrics for memsw, kmem, and kmem_tcp. {issue}6033[6033]
+- Fix kafka OffsetFetch request missing topic and partition parameters. {pull}5880[5880]
+
+*Packetbeat*
+
+- Fix mysql SQL parser to trim `\r` from Windows Server `SELECT\r\n\t1`. {pull}5572[5572]
+
+
+==== Added
+
+*Affecting all Beats*
+
+- Adding a local keystore to allow user to obfuscate password {pull}5687[5687]
+- Add autodiscover for kubernetes. {pull}6055[6055]
+- Add Beats metrics reporting to Xpack. {issue}3422[3422]
+- Update the command line library cobra and add support for zsh completion {pull}5761[5761]
+- Update to Golang 1.9.2
+- Moved `ip_port` indexer for `add_kubernetes_metadata` to all beats. {pull}5707[5707]
+- `ip_port` indexer now index both IP and IP:port pairs. {pull}5721[5721]
+- Add the ability to write structured logs. {pull}5901[5901]
+- Use structured logging for the metrics that are periodically logged via the
+ `logging.metrics` feature. {pull}5915[5915]
+- Improve Elasticsearch output metrics to count number of dropped and duplicate (if event ID is given) events. {pull}5811[5811]
+- Add the abilility for the add_docker_metadata process to enrich based on process ID. {pull}6100[6100]
+- The `add_docker_metadata` and `add_kubernetes_metadata` processors are now GA, instead of Beta. {pull}6105[6105]
+- Update go-ucfg library to support top level key reference and cyclic key reference for the
+ keystore {pull}6098[6098]
+
+*Auditbeat*
+
+- Auditbeat is marked as GA, no longer Beta. {issue}5432[5432]
+- Add support for BLAKE2b hash algorithms to the file integrity module. {pull}5926[5926]
+- Add support for recursive file watches. {pull}5575[5575] {pull}5833[5833]
+
+*Filebeat*
+
+- Add Osquery module. {pull}5971[5971]
+- Add stream filtering when using `docker` prospector. {pull}6057[6057]
+
+*Metricbeat*
+
+- Add ceph osd_df to metricbeat {pull}5606[5606]
+- Add field network_names of hosts and virtual machines. {issue}5646[5646]
+- Add experimental system/raid metricset. {pull}5642[5642]
+- Add a dashboard for the Nginx module. {pull}5991[5991]
+- Add experimental mongodb/collstats metricset. {pull}5852[5852]
+- Update the MySQL dashboard to use the Time Series Visual Builder. {pull}5996[5996]
+- Add experimental uwsgi module. {pull}6006[6006]
+- Docker and Kubernetes modules are now GA, instead of Beta. {pull}6105[6105]
+- Support haproxy stats gathering using http (additionaly to tcp socket). {pull}5819[5819]
+- Support to optionally 'de dot' keys in http/json metricset to prevent collisions. {pull}5957[5957]
+
+*Packetbeat*
+
+- Configure good defaults for `add_kubernetes_metadata`. {pull}5707[5707]
+
+[[release-notes-6.1.3]]
+=== Beats version 6.1.3
+https://github.com/elastic/beats/compare/v6.1.2...v6.1.3[View commits]
+
+No changes in this release.
+
+[[release-notes-6.1.2]]
+=== Beats version 6.1.2
+https://github.com/elastic/beats/compare/v6.1.1...v6.1.2[View commits]
+
+==== Bugfixes
+
+*Auditbeat*
+
+- Add an error check to the file integrity scanner to prevent a panic when
+ there is an error reading file info via lstat. {issue}6005[6005]
+
+==== Added
+
+*Filebeat*
+
+- Switch to docker prospector in sample manifests for Kubernetes deployment {pull}5963[5963]
+
[[release-notes-6.1.1]]
=== Beats version 6.1.1
https://github.com/elastic/beats/compare/v6.1.0...v6.1.1[View commits]
@@ -109,6 +282,7 @@ https://github.com/elastic/beats/compare/v6.0.1...v6.1.0[View commits]
- Fix console color output for Windows. {issue}5611[5611]
- Fix logstash output debug message. {pull}5799{5799]
- Fix isolation of modules when merging local and global field settings. {issue}5795[5795]
+- Report ephemeral ID and uptime in monitoring events on all platforms {pull}6501[6501]
*Filebeat*
@@ -124,16 +298,22 @@ https://github.com/elastic/beats/compare/v6.0.1...v6.1.0[View commits]
- Change `MySQL active connections` visualization title to `MySQL total connections`. {issue}4812[4812]
- Fix `ProcState` on Linux and FreeBSD when process names contain parentheses. {pull}5775[5775]
- Fix incorrect `Mem.Used` calculation under linux. {pull}5775[5775]
+- Fix `open_file_descriptor_count` and `max_file_descriptor_count` lost in zookeeper module {pull}5902[5902]
+- Fix system process metricset for kernel processes. {issue}5700[5700]
+- Change kubernetes.node.cpu.allocatable.cores to float. {pull}6130[6130]
*Packetbeat*
- Fix http status phrase parsing not allow spaces. {pull}5312[5312]
- Fix http parse to allow to parse get request with space in the URI. {pull}5495[5495]
+- Fix mysql SQL parser to trim `\r` from Windows Server `SELECT\r\n\t1`. {pull}5572[5572]
+- Fix corruption when parsing repeated headers in an HTTP request or response. {pull}6325[6325]
*Winlogbeat*
- Fix the registry file. It was not correctly storing event log names, and
upon restart it would begin reading at the start of each event log. {issue}5813[5813]
+- Fix config validation to allow `event_logs.processors`. [pull]6217[6217]
==== Added
@@ -189,6 +369,8 @@ https://github.com/elastic/beats/compare/v6.0.1...v6.1.0[View commits]
*Packetbeat*
- Add support for decoding the TLS envelopes. {pull}5476[5476]
+- HTTP parses successfully on empty status phrase. {issue}6176[6176]
+- HTTP parser supports broken status line. {pull}6631[6631]
[[release-notes-6.0.1]]
=== Beats version 6.0.1
@@ -212,6 +394,7 @@ https://github.com/elastic/beats/compare/v6.0.0...v6.0.1[View commits]
- Fix the include top N processes feature for cases where there are fewer
processes than N. {pull}5729[5729]
+
include::libbeat/docs/release-notes/6.0.0.asciidoc[]
[[release-notes-6.0.0-ga]]
@@ -740,6 +923,63 @@ https://github.com/elastic/beats/compare/v5.4.0...v6.0.0-alpha1[View commits]
- Prospector reloading only works properly with new files. {pull}3546[3546]
+[[release-notes-5.6.7]]
+=== Beats version 5.6.7
+https://github.com/elastic/beats/compare/v5.6.6...v5.6.7[View commits]
+
+No changes in this release.
+
+
+[[release-notes-5.6.6]]
+=== Beats version 5.6.6
+https://github.com/elastic/beats/compare/v5.6.5...v5.6.6[View commits]
+
+No changes in this release.
+
+
+[[release-notes-5.6.5]]
+=== Beats version 5.6.5
+https://github.com/elastic/beats/compare/v5.6.4...v5.6.5[View commits]
+
+==== Bugfixes
+
+*Affecting all Beats*
+
+- Fix duplicate batches of events in retry queue. {pull}5520[5520]
+
+*Metricbeat*
+
+- Clarify meaning of percentages reported by system core metricset. {pull}5565[5565]
+- Fix map overwrite in docker diskio module. {issue}5582[5582]
+
+[[release-notes-5.6.4]]
+=== Beats version 5.6.4
+https://github.com/elastic/beats/compare/v5.6.3...v5.6.4[View commits]
+
+==== Bugfixes
+
+*Affecting all Beats*
+
+- Fix race condition in internal logging rotator. {pull}4519[4519]
+
+*Packetbeat*
+
+- Fix missing length check in the PostgreSQL module. {pull}5457[5457]
+
+==== Added
+
+*Affecting all Beats*
+
+- Add support for enabling TLS renegotiation. {issue}4386[4386]
+- Add setting to enable/disable the slow start in logstash output. {pull}5400[5400]
+
+[[release-notes-5.6.3]]
+=== Beats version 5.6.3
+https://github.com/elastic/beats/compare/v5.6.2...v5.6.3[View commits]
+
+No changes in this release.
+
+
[[release-notes-5.6.2]]
=== Beats version 5.6.2
https://github.com/elastic/beats/compare/v5.6.1...v5.6.2[View commits]
diff --git a/vendor/github.com/elastic/beats/Makefile b/vendor/github.com/elastic/beats/Makefile
index 46b3d489..cf5d9b53 100644
--- a/vendor/github.com/elastic/beats/Makefile
+++ b/vendor/github.com/elastic/beats/Makefile
@@ -38,6 +38,11 @@ test:
unit:
@$(foreach var,$(PROJECTS),$(MAKE) -C $(var) unit || exit 1;)
+# Crosscompile all beats.
+.PHONY: crosscompile
+crosscompile:
+ @$(foreach var,filebeat winlogbeat metricbeat heartbeat auditbeat,$(MAKE) -C $(var) crosscompile || exit 1;)
+
.PHONY: coverage-report
coverage-report:
@mkdir -p $(COVERAGE_DIR)
diff --git a/vendor/github.com/elastic/beats/NOTICE.txt b/vendor/github.com/elastic/beats/NOTICE.txt
index bc1c2506..6b80ef2b 100644
--- a/vendor/github.com/elastic/beats/NOTICE.txt
+++ b/vendor/github.com/elastic/beats/NOTICE.txt
@@ -1,5 +1,5 @@
Elastic Beats
-Copyright 2014-2017 Elasticsearch BV
+Copyright 2014-2018 Elasticsearch BV
This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).
@@ -342,8 +342,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
--------------------------------------------------------------------
Dependency: github.com/elastic/go-libaudit
-Version: v0.0.6
-Revision: df0d4981f3fce65ffd3d7411dfec3e03231b491c
+Version: v0.1.0
+Revision: 4a806edf821706e315ef7d4f3b5d0cac6d638b34
License type (autodetected): Apache-2.0
./vendor/github.com/elastic/go-libaudit/LICENSE:
--------------------------------------------------------------------
@@ -361,7 +361,8 @@ Apache License 2.0
--------------------------------------------------------------------
Dependency: github.com/elastic/go-ucfg
-Revision: ec8488a52542c0c51e42e8ea204dcaff400bc644
+Version: v0.5.1
+Revision: 0ba28e36add27704e6b49a7ed8557989a8f4a635
License type (autodetected): Apache-2.0
./vendor/github.com/elastic/go-ucfg/LICENSE:
--------------------------------------------------------------------
@@ -370,8 +371,8 @@ Apache License 2.0
--------------------------------------------------------------------
Dependency: github.com/elastic/gosigar
-Version: v0.6.0
-Revision: 5cb8fed1ceb7f0fd69e4ad61c715a80601dddfd2
+Version: v0.8.0
+Revision: 16df19fe5efee4ea2938bde5f56c02d9929dc054
License type (autodetected): Apache-2.0
./vendor/github.com/elastic/gosigar/LICENSE:
--------------------------------------------------------------------
@@ -443,7 +444,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--------------------------------------------------------------------
Dependency: github.com/fsnotify/fsevents
-Revision: 3ceee05210c3babaa38cdc9181dabdcc83076a44
+Revision: 690cb784149d5facd7fe613c52757445c43afcde
License type (autodetected): BSD-3-Clause
./vendor/github.com/fsnotify/fsevents/LICENSE:
--------------------------------------------------------------------
@@ -1134,7 +1135,7 @@ Apache License 2.0
--------------------------------------------------------------------
Dependency: github.com/google/uuid
-Revision: 6a5e28554805e78ea6141142aba763936c4761c0
+Revision: 281f560d28af7174109514e936f94c2ab2cb2823
License type (autodetected): BSD-3-Clause
./metricbeat/module/vsphere/vendor/github.com/google/uuid/LICENSE:
--------------------------------------------------------------------
@@ -1573,204 +1574,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
---------------------------------------------------------------------
-Dependency: github.com/juju/ratelimit
-Revision: 5b9ff866471762aa2ab2dced63c9fb6f53921342
-License type (autodetected): LGPL-3.0
-./vendor/github.com/juju/ratelimit/LICENSE:
---------------------------------------------------------------------
-All files in this repository are licensed as follows. If you contribute
-to this repository, it is assumed that you license your contribution
-under the same license unless you state otherwise.
-
-All files Copyright (C) 2015 Canonical Ltd. unless otherwise specified in the file.
-
-This software is licensed under the LGPLv3, included below.
-
-As a special exception to the GNU Lesser General Public License version 3
-("LGPL3"), the copyright holders of this Library give you permission to
-convey to a third party a Combined Work that links statically or dynamically
-to this Library without providing any Minimal Corresponding Source or
-Minimal Application Code as set out in 4d or providing the installation
-information set out in section 4e, provided that you comply with the other
-provisions of LGPL3 and provided that you meet, for the Application the
-terms and conditions of the license(s) which apply to the Application.
-
-Except as stated in this special exception, the provisions of LGPL3 will
-continue to comply in full to this Library. If you modify this Library, you
-may apply this exception to your version of this Library, but you are not
-obliged to do so. If you do not wish to do so, delete this exception
-statement from your version. This exception does not (and cannot) modify any
-license terms which apply to the Application, with which you must still
-comply.
-
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-
--------------------------------------------------------------------
Dependency: github.com/klauspost/compress
Revision: 14c9a76e3c95e47f8ccce949bba2c1101a8b85e6
@@ -3327,7 +3130,7 @@ THE SOFTWARE.
--------------------------------------------------------------------
Dependency: github.com/spf13/cobra
-Revision: e606913c4ee45fec232e67e70105fb6c866b95d9
+Revision: 1be1d2841c773c01bee8289f55f7463b6e2c2539
License type (autodetected): Apache-2.0
./vendor/github.com/spf13/cobra/LICENSE.txt:
--------------------------------------------------------------------
@@ -3491,8 +3294,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------
Dependency: github.com/urso/go-structform
-Version: v0.0.1
-Revision: a59a4e97c96431f4ad25ed3bd027981f2e0ff5c2
+Version: v0.0.2
+Revision: 844d7d44009e9e8c0f08016fc4dab64e136ca040
License type (autodetected): Apache-2.0
./vendor/github.com/urso/go-structform/LICENSE:
--------------------------------------------------------------------
@@ -3501,7 +3304,7 @@ Apache License 2.0
--------------------------------------------------------------------
Dependency: github.com/vmware/govmomi
-Revision: 9bfdc5ce62c0585b48b154cc460f8664dcd124c3
+Revision: 2cad15190b417804d82edb4981e7b3e62907c4ee
License type (autodetected): Apache-2.0
./metricbeat/module/vsphere/vendor/github.com/vmware/govmomi/LICENSE.txt:
--------------------------------------------------------------------
@@ -3510,7 +3313,7 @@ Apache License 2.0
--------------------------------------------------------------------
Dependency: github.com/vmware/govmomi/vim25/xml
-Revision: 5072cda664c79ada30834d171d2ed1f76317d3b2
+Revision: 2cad15190b417804d82edb4981e7b3e62907c4ee
License type (autodetected): BSD-3-Clause
./metricbeat/module/vsphere/vendor/github.com/vmware/govmomi/vim25/xml/LICENSE:
--------------------------------------------------------------------
@@ -3542,15 +3345,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------
-Dependency: github.com/vmware/vic
-Revision: a2b2afb419d70009cd4d0b58f37b1a095c58b526
-License type (autodetected): Apache-2.0
-./metricbeat/module/vsphere/vendor/github.com/vmware/vic/LICENSE:
---------------------------------------------------------------------
-Apache License 2.0
-
-
--------------------------------------------------------------------
Dependency: github.com/yuin/gopher-lua
Revision: b402f3114ec730d8bddb074a6c137309f561aa78
@@ -3579,9 +3373,88 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+--------------------------------------------------------------------
+Dependency: go.uber.org/atomic
+Revision: 8474b86a5a6f79c443ce4b2992817ff32cf208b8
+License type (autodetected): MIT
+./vendor/go.uber.org/atomic/LICENSE.txt:
+--------------------------------------------------------------------
+Copyright (c) 2016 Uber Technologies, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+--------------------------------------------------------------------
+Dependency: go.uber.org/multierr
+Revision: fb7d312c2c04c34f0ad621048bbb953b168f9ff6
+License type (autodetected): MIT
+./vendor/go.uber.org/multierr/LICENSE.txt:
+--------------------------------------------------------------------
+Copyright (c) 2017 Uber Technologies, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+--------------------------------------------------------------------
+Dependency: go.uber.org/zap
+Version: v1.7.1
+Revision: 35aad584952c3e7020db7b839f6b102de6271f89
+License type (autodetected): MIT
+./vendor/go.uber.org/zap/LICENSE.txt:
+--------------------------------------------------------------------
+Copyright (c) 2016-2017 Uber Technologies, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
--------------------------------------------------------------------
Dependency: golang.org/x/crypto
-Revision: 9419663f5a44be8b34ca85f08abc5fe1be11f8a3
+Revision: d585fd2cc9195196078f516b69daff6744ef5e84
License type (autodetected): BSD-3-Clause
./vendor/golang.org/x/crypto/LICENSE:
--------------------------------------------------------------------
@@ -3649,7 +3522,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------
Dependency: golang.org/x/sys
-Revision: a55a76086885b80f79961eacb876ebd8caf3868d
+Revision: b76f9891dc1d975623261def70f9b89661f5baab
License type (autodetected): BSD-3-Clause
./vendor/golang.org/x/sys/LICENSE:
--------------------------------------------------------------------
@@ -3715,6 +3588,40 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--------------------------------------------------------------------
+Dependency: golang.org/x/time
+Revision: 26559e0f760e39c24d730d3224364aef164ee23f
+License type (autodetected): BSD-3-Clause
+./vendor/golang.org/x/time/LICENSE:
+--------------------------------------------------------------------
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
--------------------------------------------------------------------
Dependency: golang.org/x/tools
Revision: 9be3b7cbc7ccd19baaa3b7704c22f57db5ebbdf2
@@ -3957,3 +3864,68 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+
+--------------------------------------------------------------------
+Dependency: howett.net/plist
+Revision: 233df3c4f07b0c562da0e8a6fb850681ac49bb90
+License type (autodetected): BSD-2-Clause
+./vendor/howett.net/plist/LICENSE:
+--------------------------------------------------------------------
+Copyright (c) 2013, Dustin L. Howett. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies,
+either expressed or implied, of the FreeBSD Project.
+
+--------------------------------------------------------------------------------
+Parts of this package were made available under the license covering
+the Go language and all attended core libraries. That license follows.
+--------------------------------------------------------------------------------
+
+Copyright (c) 2012 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/elastic/beats/Vagrantfile b/vendor/github.com/elastic/beats/Vagrantfile
index 5a6950ff..404172a5 100644
--- a/vendor/github.com/elastic/beats/Vagrantfile
+++ b/vendor/github.com/elastic/beats/Vagrantfile
@@ -52,16 +52,19 @@ echo 'Creating github.com/elastic in the GOPATH'
mkdir -p ~/go/src/github.com/elastic
echo 'Symlinking /vagrant to ~/go/src/github.com/elastic'
cd ~/go/src/github.com/elastic
-if [ -d "/vagrant" ]; then ln -s /vagrant beats; fi
+if [ -d "/vagrant" ] && [ ! -e "beats" ]; then ln -s /vagrant beats; fi
SCRIPT
# Linux GVM
$linuxGvmProvision = <