Skip to content

Commit

Permalink
Rename config option
Browse files Browse the repository at this point in the history
  • Loading branch information
martinscholz83 committed Apr 5, 2017
1 parent 0d74941 commit 4b8d045
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ https://github.com/elastic/beats/compare/v5.1.1...master[Check the HEAD diff]
- Add the ability to collect the environment variables from system processes. {pull}3337[3337]
- Add experimental metricset `perfmon` to Windows module. {pull}3758[3758]
- Add memcached module with stats metricset. {pull}3693[3693]
- Add the `process.cmdline.cache` config option to the System Process Metricset. {pull}3891[3891]
- Add the `process.cmdline.cache.enabled` config option to the System Process Metricset. {pull}3891[3891]

*Packetbeat*
- Add `fields` and `fields_under_root` to packetbeat protocols configurations. {pull}3518[3518]
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/metricbeat.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ metricbeat.modules:
#cpu_ticks: false

# If false, cmdline of a process is not cached.
#process.cmdline.cache: true
#process.cmdline.cache.enabled: true

# Enable collection of cgroup metrics from processes on Linux.
#process.cgroups.enabled: true
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/system/_meta/config.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#cpu_ticks: false

# If false, cmdline of a process is not cached.
#process.cmdline.cache: true
#process.cmdline.cache.enabled: true

# Enable collection of cgroup metrics from processes on Linux.
#process.cgroups.enabled: true
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/system/process/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This metricset is available on:
This metricset caches the command line args for a running process. This means if you alter
the command line for a process while this metricset is running, these changes are not detected.
This feature can be disabled by adding
`process.cmdline.cache: false` to the system module configuration.
`process.cmdline.cache.enabled: false` to the system module configuration.

[float]
=== Control Group (cgroup) Metrics
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/system/process/process.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
Cgroups *bool `config:"process.cgroups.enabled"`
EnvWhitelist []string `config:"process.env.whitelist"`
CPUTicks bool `config:"cpu_ticks"`
CacheCmdLine bool `config:"process.cmdline.cache"`
CacheCmdLine bool `config:"process.cmdline.cache.enabled"`
}{
Procs: []string{".*"}, // collect all processes by default
CacheCmdLine: true,
Expand Down

0 comments on commit 4b8d045

Please sign in to comment.