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

Cherry-pick #20420 to 7.x: Move to datastream instead of dataset #20481

Merged
merged 1 commit into from
Aug 6, 2020
Merged

Cherry-pick #20420 to 7.x: Move to datastream instead of dataset #20481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 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 @@ -17,7 +17,7 @@ inputs:
# Cannot include \, /, *, ?, ", <, >, |, ` ` (space character), ,, #
# Cannot start with -, _, +
# Cannot be . or ..
dataset.namespace: default
data_stream.namespace: default
use_output: default
streams:
- metricset: cpu
Expand All @@ -27,13 +27,13 @@ inputs:
# Cannot include \, /, *, ?, ", <, >, |, ` ` (space character), ,, #
# Cannot start with -, _, +
# Cannot be . or ..
dataset.name: system.cpu
data_stream.dataset: system.cpu
- metricset: memory
dataset.name: system.memory
data_stream.dataset: system.memory
- metricset: network
dataset.name: system.network
data_stream.dataset: system.network
- metricset: filesystem
dataset.name: system.filesystem
data_stream.dataset: system.filesystem

# agent.monitoring:
# # enabled turns on monitoring of running processes
Expand Down
10 changes: 5 additions & 5 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 @@ -17,7 +17,7 @@ inputs:
# Cannot include \, /, *, ?, ", <, >, |, ` ` (space character), ,, #
# Cannot start with -, _, +
# Cannot be . or ..
dataset.namespace: default
data_stream.namespace: default
use_output: default
streams:
- metricset: cpu
Expand All @@ -27,13 +27,13 @@ inputs:
# Cannot include \, /, *, ?, ", <, >, |, ` ` (space character), ,, #
# Cannot start with -, _, +
# Cannot be . or ..
dataset.name: system.cpu
data_stream.dataset: system.cpu
- metricset: memory
dataset.name: system.memory
data_stream.dataset: system.memory
- metricset: network
dataset.name: system.network
data_stream.dataset: system.network
- metricset: filesystem
dataset.name: system.filesystem
data_stream.dataset: system.filesystem

# management:
# # Mode of management, the Elastic Agent support two modes of operation:
Expand Down
10 changes: 5 additions & 5 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 @@ -17,7 +17,7 @@ inputs:
# Cannot include \, /, *, ?, ", <, >, |, ` ` (space character), ,, #
# Cannot start with -, _, +
# Cannot be . or ..
dataset.namespace: default
data_stream.namespace: default
use_output: default
streams:
- metricset: cpu
Expand All @@ -27,13 +27,13 @@ inputs:
# Cannot include \, /, *, ?, ", <, >, |, ` ` (space character), ,, #
# Cannot start with -, _, +
# Cannot be . or ..
dataset.name: system.cpu
data_stream.dataset: system.cpu
- metricset: memory
dataset.name: system.memory
data_stream.dataset: system.memory
- metricset: network
dataset.name: system.network
data_stream.dataset: system.network
- metricset: filesystem
dataset.name: system.filesystem
data_stream.dataset: system.filesystem

# management:
# # Mode of management, the Elastic Agent support two modes of operation:
Expand Down
10 changes: 5 additions & 5 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 @@ -17,7 +17,7 @@ inputs:
# Cannot include \, /, *, ?, ", <, >, |, ` ` (space character), ,, #
# Cannot start with -, _, +
# Cannot be . or ..
dataset.namespace: default
data_stream.namespace: default
use_output: default
streams:
- metricset: cpu
Expand All @@ -27,13 +27,13 @@ inputs:
# Cannot include \, /, *, ?, ", <, >, |, ` ` (space character), ,, #
# Cannot start with -, _, +
# Cannot be . or ..
dataset.name: system.cpu
data_stream.dataset: system.cpu
- metricset: memory
dataset.name: system.memory
data_stream.dataset: system.memory
- metricset: network
dataset.name: system.network
data_stream.dataset: system.network
- metricset: filesystem
dataset.name: system.filesystem
data_stream.dataset: system.filesystem

# management:
# # Mode of management, the Elastic Agent support two modes of operation:
Expand Down
10 changes: 5 additions & 5 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 @@ -93,17 +93,17 @@ filesystem metrics, and sends them to the default output. For example:
-------------------------------------------------------------------------------------
inputs:
- type: system/metrics
dataset.namespace: default
data_stream.namespace: default
use_output: default
streams:
- metricset: cpu
dataset.name: system.cpu
data_stream.dataset: system.cpu
- metricset: memory
dataset.name: system.memory
data_stream.dataset: system.memory
- metricset: network
dataset.name: system.network
data_stream.dataset: system.network
- metricset: filesystem
dataset.name: system.filesystem
data_stream.dataset: system.filesystem
-------------------------------------------------------------------------------------

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