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.

Sign up for GitHub

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

Jump to bottom

[Ingest Manager] New structure of agent configuration #19128

Merged
merged 10 commits into from
Jun 17, 2020
Merged

[Ingest Manager] New structure of agent configuration #19128

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4e79b49
phase 1
michalpristas Jun 11, 2020
a044e9c
phase 2
michalpristas Jun 11, 2020
3f2e35e
phase 4
michalpristas Jun 11, 2020
94741ed
updated configuration
michalpristas Jun 11, 2020
bd8f87c
fixed compact form (depends on aprser)
michalpristas Jun 11, 2020
e8b58ba
configuration update
michalpristas Jun 11, 2020
c57a694
fixed tests
michalpristas Jun 11, 2020
85ad9c5
conflicts
michalpristas Jun 16, 2020
299bf28
Merge branch 'master' of github.com:elastic/beats into agent-ds-config
michalpristas Jun 17, 2020
903bc2e
mod
michalpristas Jun 17, 2020
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
1 change: 1 addition & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2 h1:DW6WrARxK5J+o8uAKCiACi5wy9EK1UzrsCpGBPsKHAA=
github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts=
github.com/elastic/beats v7.6.2+incompatible h1:jHdLv83KURaqWUC6f55iMyVP6LYZrgElfeqxKWcskVE=
github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3 h1:lnDkqiRFKm0rxdljqrj3lotWinO9+jFmeDXIC4gvIQs=
github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3/go.mod h1:aPqzac6AYkipvp4hufTyMj5PDIphF3+At8zr7r51xjY=
github.com/elastic/ecs v1.5.0 h1:/VEIBsRU4ecq2+U3RPfKNc6bFyomP6qnthYEcQZu8GU=
Expand Down
25 changes: 12 additions & 13 deletions x-pack/elastic-agent/_meta/config/common.p2.yml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,19 @@ outputs:
username: elastic
password: changeme

datasources:
- namespace: default
inputs:
- type: system/metrics
dataset.namespace: default
use_output: default
inputs:
- type: system/metrics
streams:
- metricset: cpu
dataset: system.cpu
- metricset: memory
dataset: system.memory
- metricset: network
dataset: system.network
- metricset: filesystem
dataset: system.filesystem
streams:
- metricset: cpu
dataset.name: system.cpu
- metricset: memory
dataset.name: system.memory
- metricset: network
dataset.name: system.network
- metricset: filesystem
dataset.name: system.filesystem

# settings.monitoring:
# # enabled turns on monitoring of running processes
Expand Down
25 changes: 12 additions & 13 deletions x-pack/elastic-agent/_meta/config/common.reference.p2.yml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,19 @@ outputs:
username: elastic
password: changeme

datasources:
- namespace: default
inputs:
- type: system/metrics
dataset.namespace: default
use_output: default
inputs:
- type: system/metrics
streams:
- metricset: cpu
dataset: system.cpu
- metricset: memory
dataset: system.memory
- metricset: network
dataset: system.network
- metricset: filesystem
dataset: system.filesystem
streams:
- metricset: cpu
dataset.name: system.cpu
- metricset: memory
dataset.name: system.memory
- metricset: network
dataset.name: system.network
- metricset: filesystem
dataset.name: system.filesystem

# management:
# # Mode of management, the Elastic Agent support two modes of operation:
Expand Down
25 changes: 12 additions & 13 deletions x-pack/elastic-agent/_meta/config/elastic-agent.docker.yml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,19 @@ outputs:
username: '${ELASTICSEARCH_USERNAME:elastic}'
password: '${ELASTICSEARCH_PASSWORD:changeme}'

datasources:
- namespace: default
inputs:
- type: system/metrics
dataset.namespace: default
use_output: default
inputs:
- type: system/metrics
streams:
- metricset: cpu
dataset: system.cpu
- metricset: memory
dataset: system.memory
- metricset: network
dataset: system.network
- metricset: filesystem
dataset: system.filesystem
streams:
- metricset: cpu
dataset.name: system.cpu
- metricset: memory
dataset.name: system.memory
- metricset: network
dataset.name: system.network
- metricset: filesystem
dataset.name: system.filesystem

# management:
# # Mode of management, the Elastic Agent support two modes of operation:
Expand Down
25 changes: 12 additions & 13 deletions x-pack/elastic-agent/_meta/elastic-agent.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,19 @@ outputs:
username: elastic
password: changeme

datasources:
- namespace: default
inputs:
- type: system/metrics
dataset.namespace: default
use_output: default
inputs:
- type: system/metrics
streams:
- metricset: cpu
dataset: system.cpu
- metricset: memory
dataset: system.memory
- metricset: network
dataset: system.network
- metricset: filesystem
dataset: system.filesystem
streams:
- metricset: cpu
dataset.name: system.cpu
- metricset: memory
dataset.name: system.memory
- metricset: network
dataset.name: system.network
- metricset: filesystem
dataset.name: system.filesystem

# management:
# # Mode of management, the Elastic Agent support two modes of operation:
Expand Down
29 changes: 14 additions & 15 deletions x-pack/elastic-agent/docs/elastic-agent-configuration.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ To alter this behavior, configure the output and other configuration settings:
== Output settings

Specify one or more outputs. Specifying multiple outputs allows you to pair
each data source with a different output.
each data source with a different output.

IMPORTANT: {agent} currently works with the {es} output only.

Expand Down Expand Up @@ -54,7 +54,7 @@ A default output configuration is required.
[[elastic-agent-monitoring-configuration]]
== {beats} monitoring settings

{agent} monitors {beats} by default. To disable or change monitoring
{agent} monitors {beats} by default. To disable or change monitoring
settings, set options under `settings.monitoring`:

[source,yaml]
Expand Down Expand Up @@ -89,20 +89,19 @@ filesystem metrics, and sends them to the default output. For example:

[source,yaml]
-------------------------------------------------------------------------------------
datasources:
- namespace: default
inputs:
- type: system/metrics
dataset.namespace: default
use_output: default
inputs:
- type: system/metrics
streams:
- metricset: cpu
dataset: system.cpu
- metricset: memory
dataset: system.memory
- metricset: network
dataset: system.network
- metricset: filesystem
dataset: system.filesystem
streams:
- metricset: cpu
dataset.name: system.cpu
- metricset: memory
dataset.name: system.memory
- metricset: network
dataset.name: system.network
- metricset: filesystem
dataset.name: system.filesystem
-------------------------------------------------------------------------------------

If `use_output` is not specified, the `default` output is used.
Expand Down
Loading