Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add source path matching to add_docker_metadata processor #4495

Merged
merged 4 commits into from
Jun 15, 2017
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move common docker fields to libbeat
  • Loading branch information
exekias committed Jun 13, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 164a83ccf9995f9b8d74686d8a8ddc5ba7fffb0f
42 changes: 42 additions & 0 deletions filebeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ grouped in the following categories:
* <<exported-fields-auditd>>
* <<exported-fields-beat>>
* <<exported-fields-cloud>>
* <<exported-fields-docker-processor>>
* <<exported-fields-icinga>>
* <<exported-fields-kubernetes-processor>>
* <<exported-fields-log>>
@@ -600,6 +601,47 @@ Name of the project in Google Cloud.
Region in which this host is running.


[[exported-fields-docker-processor]]
== docker Fields

beta[]
Docker stats collected from Docker.




[float]
=== docker.container.id

type: keyword

Unique container id.


[float]
=== docker.container.image

type: keyword

Name of the image the container was built on.


[float]
=== docker.container.name

type: keyword

Container name.


[float]
=== docker.container.labels

type: object

Image labels.


[[exported-fields-icinga]]
== Icinga Fields

42 changes: 42 additions & 0 deletions heartbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ grouped in the following categories:
* <<exported-fields-beat>>
* <<exported-fields-cloud>>
* <<exported-fields-common>>
* <<exported-fields-docker-processor>>
* <<exported-fields-http>>
* <<exported-fields-icmp>>
* <<exported-fields-kubernetes-processor>>
@@ -255,6 +256,47 @@ required: True
Indicator if monitor could validate the service to be available.


[[exported-fields-docker-processor]]
== docker Fields

beta[]
Docker stats collected from Docker.




[float]
=== docker.container.id

type: keyword

Unique container id.


[float]
=== docker.container.image

type: keyword

Name of the image the container was built on.


[float]
=== docker.container.name

type: keyword

Container name.


[float]
=== docker.container.labels

type: object

Image labels.


[[exported-fields-http]]
== HTTP Monitor Fields

29 changes: 29 additions & 0 deletions libbeat/processors/add_docker_metadata/_meta/fields.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
- 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.
64 changes: 37 additions & 27 deletions metricbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ grouped in the following categories:
* <<exported-fields-cloud>>
* <<exported-fields-common>>
* <<exported-fields-couchbase>>
* <<exported-fields-docker-processor>>
* <<exported-fields-docker>>
* <<exported-fields-dropwizard>>
* <<exported-fields-elasticsearch>>
@@ -3213,66 +3214,83 @@ type: long
Number of items/documents that are replicas.


[[exported-fields-docker]]
== Docker Fields
[[exported-fields-docker-processor]]
== docker Fields

beta[]
Docker stats collected from Docker.




[float]
== docker Fields
=== docker.container.id

Information and statistics about docker's running containers.
type: keyword

Unique container id.


[float]
== container Fields
=== docker.container.image

Docker container metrics.
type: keyword

Name of the image the container was built on.


[float]
=== docker.container.command
=== docker.container.name

type: keyword

Command that was executed in the Docker container.
Container name.


[float]
=== docker.container.created
=== docker.container.labels

type: date
type: object

Image labels.


[[exported-fields-docker]]
== Docker Fields

beta[]
Docker stats collected from Docker.

Date when the container was created.


[float]
=== docker.container.id
== docker Fields

type: keyword
Information and statistics about docker's running containers.

Unique container id.


[float]
=== docker.container.image
== container Fields

type: keyword
Docker container metrics.

Name of the image the container was built on.


[float]
=== docker.container.name
=== docker.container.command

type: keyword

Container name.
Command that was executed in the Docker container.


[float]
=== docker.container.created

type: date

Date when the container was created.


[float]
@@ -3306,14 +3324,6 @@ type: long
Size of the files that have been created or changed since creation.


[float]
=== docker.container.labels

type: object

Image labels.


[float]
=== docker.container.tags

17 changes: 0 additions & 17 deletions metricbeat/module/docker/container/_meta/fields.yml
Original file line number Diff line number Diff line change
@@ -11,18 +11,6 @@
type: date
description: >
Date when the container was created.
- name: id
type: keyword
description: >
Unique container id.
- name: image
type: keyword
description: >
Name of the image the container was built on.
- name: name
type: keyword
description: >
Container name.
- name: status
type: keyword
description: >
@@ -40,11 +28,6 @@
type: long
description: >
Size of the files that have been created or changed since creation.
- name: labels
type: object
object_type: keyword
description: >
Image labels.
- name: tags
type: array
description: >
42 changes: 42 additions & 0 deletions packetbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ grouped in the following categories:
* <<exported-fields-cloud>>
* <<exported-fields-common>>
* <<exported-fields-dns>>
* <<exported-fields-docker-processor>>
* <<exported-fields-flows_event>>
* <<exported-fields-http>>
* <<exported-fields-icmp>>
@@ -1498,6 +1499,47 @@ type: long

Requestor's UDP payload size (in bytes).

[[exported-fields-docker-processor]]
== docker Fields

beta[]
Docker stats collected from Docker.




[float]
=== docker.container.id

type: keyword

Unique container id.


[float]
=== docker.container.image

type: keyword

Name of the image the container was built on.


[float]
=== docker.container.name

type: keyword

Container name.


[float]
=== docker.container.labels

type: object

Image labels.


[[exported-fields-flows_event]]
== Flow Event Fields

Loading