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

Make Traefik metricbeat module GA. #10166

Merged
merged 3 commits into from
Jan 21, 2019
Merged

Make Traefik metricbeat module GA. #10166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b481d38
Make Traefik metricbeat module GA.
ruflin Jan 18, 2019
cc92fc2
Update CHANGELOG.next.asciidoc
jsoriano Jan 18, 2019
3334aad
Merge branch 'master' into traefik-ga
ruflin Jan 21, 2019
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 @@ -166,6 +166,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add more meaningful metrics to 'performance' Metricset on 'MSSQL' module {pull}10011[10011]
- Rename some fields in `performance` Metricset on MSSQL module to match the updated documentation from Microsoft {pull}10074[10074]
- Add AWS EC2 module. {pull}9257[9257] {issue}9300[9300]
- Release traefik Metricbeat module as GA. {pull}10166[10166]
- Release Elastic stack modules (Elasticsearch, Logstash, and Kibana) as GA. {pull}10094[10094]

*Packetbeat*
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/traefik.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/docs_collector.py
[[metricbeat-module-traefik]]
== traefik module

beta[]

This module periodically fetches metrics from a https://traefik.io/[Traefik]
instance. The Traefik instance must be configured to expose it's HTTP API.

Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/traefik/health.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/docs_collector.py
[[metricbeat-metricset-traefik-health]]
=== traefik health metricset

beta[]

include::../../../module/traefik/health/_meta/docs.asciidoc[]


Expand Down
4 changes: 2 additions & 2 deletions metricbeat/docs/modules_list.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ This file is generated! See scripts/docs_collector.py
|<<metricbeat-metricset-system-socket,socket>>
|<<metricbeat-metricset-system-socket_summary,socket_summary>>
|<<metricbeat-metricset-system-uptime,uptime>>
|<<metricbeat-module-traefik,traefik>> beta[] |image:./images/icon-no.png[No prebuilt dashboards] |
.1+| .1+| |<<metricbeat-metricset-traefik-health,health>> beta[]
|<<metricbeat-module-traefik,traefik>> |image:./images/icon-no.png[No prebuilt dashboards] |
.1+| .1+| |<<metricbeat-metricset-traefik-health,health>>
|<<metricbeat-module-uwsgi,uwsgi>> beta[] |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.1+| .1+| |<<metricbeat-metricset-uwsgi-status,status>> beta[]
|<<metricbeat-module-vsphere,vSphere>> beta[] |image:./images/icon-no.png[No prebuilt dashboards] |
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/traefik/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "traefik"
description: >
Traefik reverse proxy / load balancer metrics
release: beta
release: ga
fields:
- name: traefik
type: group
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/traefik/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/traefik/health/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
type: group
description: >
Metrics obtained from Traefik's health API endpoint
release: beta
release: ga
fields:
- name: uptime.sec
type: long
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/traefik/health/health.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"github.com/pkg/errors"

"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/metricbeat/helper"
"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/metricbeat/mb/parse"
Expand Down Expand Up @@ -51,7 +50,6 @@ type MetricSet struct {

// New creates a new instance of the MetricSet.
func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
cfgwarn.Beta("The traefik health metricset is beta.")
http, err := helper.NewHTTP(base)
if err != nil {
return nil, err
Expand Down