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

Cherry-pick #19539 to 7.x: Fix configuration values in the perfmon metricset #19665

Merged
merged 5 commits into from
Jul 13, 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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ field. You can revert this change by configuring tags for the module and omittin
- Remove dedot for tag values in aws module. {issue}19112[19112] {pull}19221[19221]
- Set tags correctly if the dimension value is ARN {issue}19111[19111] {pull}19433[19433]
- Fix bug incorrect parsing of float numbers as integers in Couchbase module {issue}18949[18949] {pull}19055[19055]
- Fix config example in the perfmon configuration files. {pull}19539[19539]
- Add missing info about the rest of the azure metricsets in the documentation. {pull}19601[19601]
- Fix k8s scheduler compatibility issue. {pull}19699[19699]

Expand Down
6 changes: 3 additions & 3 deletions metricbeat/docs/modules/windows.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ metricbeat.modules:
# - object: 'Process'
# instance: ["*"]
# counters:
# - name: 'Disk Writes/sec'
# field: physical_disk.write.per_sec
# - name: '% Processor Time'
# field: cpu_usage
# format: "float"
# - name: "% Disk Write Time"
# - name: "Thread Count"

- module: windows
metricsets: ["service"]
Expand Down
6 changes: 3 additions & 3 deletions metricbeat/metricbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -865,10 +865,10 @@ metricbeat.modules:
# - object: 'Process'
# instance: ["*"]
# counters:
# - name: 'Disk Writes/sec'
# field: physical_disk.write.per_sec
# - name: '% Processor Time'
# field: cpu_usage
# format: "float"
# - name: "% Disk Write Time"
# - name: "Thread Count"

- module: windows
metricsets: ["service"]
Expand Down
6 changes: 3 additions & 3 deletions metricbeat/module/windows/_meta/config.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
# - object: 'Process'
# instance: ["*"]
# counters:
# - name: 'Disk Writes/sec'
# field: physical_disk.write.per_sec
# - name: '% Processor Time'
# field: cpu_usage
# format: "float"
# - name: "% Disk Write Time"
# - name: "Thread Count"

- module: windows
metricsets: ["service"]
Expand Down
6 changes: 3 additions & 3 deletions x-pack/metricbeat/metricbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1298,10 +1298,10 @@ metricbeat.modules:
# - object: 'Process'
# instance: ["*"]
# counters:
# - name: 'Disk Writes/sec'
# field: physical_disk.write.per_sec
# - name: '% Processor Time'
# field: cpu_usage
# format: "float"
# - name: "% Disk Write Time"
# - name: "Thread Count"

- module: windows
metricsets: ["service"]
Expand Down