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

[Ingest Manager] New structure of agent configuration #19128

Merged
merged 10 commits into from
Jun 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
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
25 changes: 12 additions & 13 deletions x-pack/elastic-agent/_meta/config/common.p2.yml.tmpl
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
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
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
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
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