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

Mark http.server metricset as beta #6712

Merged
merged 2 commits into from
Apr 3, 2018
Merged

Mark http.server metricset as beta #6712

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
b57eb09
Mark http.server metricset as beta
ruflin Mar 30, 2018
7a990fe
Merge branch 'master' into http-server-beta
jsoriano Apr 3, 2018
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.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
- Set all metricsets as default metricsets in uwsgi module. {pull}6688[6688]
- Mark kubernetes.event metricset as beta. {pull}6715[6715]
- Set all metricsets as default metricsets in couchbase module. {pull}6683[6683]
- Mark http.server metricset as beta. {pull}6712[6712]
- Mark metricbeat logstash module and metricsets as beta. {pull}6713[6713]

*Packetbeat*
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/docs/modules/http/server.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py
[[metricbeat-metricset-http-server]]
=== HTTP server metricset

experimental[]
beta[]

include::../../../module/http/server/_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 @@ -49,7 +49,7 @@ This file is generated! See scripts/docs_collector.py
|<<metricbeat-metricset-haproxy-stat,stat>>
|<<metricbeat-module-http,HTTP>> |
.2+| |<<metricbeat-metricset-http-json,json>>
|<<metricbeat-metricset-http-server,server>> experimental[]
|<<metricbeat-metricset-http-server,server>> beta[]
|<<metricbeat-module-jolokia,Jolokia>> |
.1+| |<<metricbeat-metricset-jolokia-jmx,jmx>>
|<<metricbeat-module-kafka,Kafka>> beta[] |
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/http/server/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
type: group
description: >
server
release: experimental
release: beta
fields:
2 changes: 1 addition & 1 deletion metricbeat/module/http/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ type MetricSet struct {
// Part of new is also setting up the configuration by processing additional
// configuration entries if needed.
func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
cfgwarn.Experimental("EXPERIMENTAL: The http server metricset is experimental")
cfgwarn.Beta("The http server metricset is beta")

config := defaultHttpServerConfig()
if err := base.Module().UnpackConfig(&config); err != nil {
Expand Down