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 #17879 to 7.x: Metricbeat: Move windows/perfmon metricset to GA #17932

Merged
merged 2 commits into from
Apr 24, 2020
Merged

Cherry-pick #17879 to 7.x: Metricbeat: Move windows/perfmon metricset to GA #17932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78b94d4
Metricbeat: Move windows/perfmon metricset to GA (#17879)
narph Apr 23, 2020
155ac9f
update changelog
narph Apr 23, 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 CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Refactor windows/perfmon metricset configuration options and event output. {pull}17596[17596]
- Reference kubernetes manifests mount data directory from the host when running metricbeat as daemonset, so data persist between executions in the same node. {pull}17429[17429]
- Add more detailed error messages, system tests and small refactoring to the service metricset in windows. {pull}17725[17725]
- Move the perfmon metricset to GA. {issue}16608[16608] {pull}17879[17879]

*Packetbeat*

Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/windows/perfmon.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go
[[metricbeat-metricset-windows-perfmon]]
=== Windows perfmon metricset

beta[]

include::../../../module/windows/perfmon/_meta/docs.asciidoc[]


Expand Down
2 changes: 1 addition & 1 deletion metricbeat/docs/modules_list.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ This file is generated! See scripts/mage/docs_collector.go
|<<metricbeat-metricset-vsphere-host,host>>
|<<metricbeat-metricset-vsphere-virtualmachine,virtualmachine>>
|<<metricbeat-module-windows,Windows>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.2+| .2+| |<<metricbeat-metricset-windows-perfmon,perfmon>> beta[]
.2+| .2+| |<<metricbeat-metricset-windows-perfmon,perfmon>>
|<<metricbeat-metricset-windows-service,service>>
|<<metricbeat-module-zookeeper,ZooKeeper>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.3+| .3+| |<<metricbeat-metricset-zookeeper-connection,connection>>
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/windows/fields.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion metricbeat/module/windows/perfmon/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- name: perfmon
type: group
release: beta
release: ga
description: >
perfmon
fields:
Expand Down
3 changes: 0 additions & 3 deletions metricbeat/module/windows/perfmon/perfmon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (

"github.com/pkg/errors"

"github.com/elastic/beats/v7/libbeat/common/cfgwarn"
"github.com/elastic/beats/v7/libbeat/logp"
"github.com/elastic/beats/v7/metricbeat/mb"
)
Expand All @@ -43,8 +42,6 @@ type MetricSet struct {

// New create a new instance of the MetricSet.
func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
cfgwarn.Beta("The perfmon metricset is beta")

var config Config
if err := base.Module().UnpackConfig(&config); err != nil {
return nil, err
Expand Down