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

Move Prometheus query & remote_write to GA #21507

Merged
merged 4 commits into from
Oct 6, 2020
Merged

Move Prometheus query & remote_write to GA #21507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2758250
Move prometheus query & remote_write to GA
ChrsMark Oct 5, 2020
01f11d5
Add changelog entry
ChrsMark Oct 5, 2020
b20ab21
Merge remote-tracking branch 'upstream/master' into move_prom_to_ga
ChrsMark Oct 5, 2020
78c449d
Merge remote-tracking branch 'upstream/master' into move_prom_to_ga
ChrsMark Oct 5, 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 @@ -731,6 +731,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add overview and platform health dashboards to Cloud Foundry module. {pull}21124[21124]
- Release lambda metricset in aws module as GA. {issue}21251[21251] {pull}21255[21255]
- Add dashboard for pubsub metricset in googlecloud module. {pull}21326[21326] {issue}17137[17137]
- Move Prometheus query & remote_write to GA. {pull}21507[21507]
- Expand unsupported option from namespace to metrics in the azure module. {pull}21486[21486]
- Map cloud data filed `cloud.account.id` to azure subscription. {pull}21483[21483] {issue}21381[21381]

Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/prometheus/query.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-prometheus-query]]
=== Prometheus query metricset

beta[]

include::../../../module/prometheus/query/_meta/docs.asciidoc[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/prometheus/remote_write.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-prometheus-remote_write]]
=== Prometheus remote_write metricset

beta[]

include::../../../module/prometheus/remote_write/_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 @@ -222,8 +222,8 @@ This file is generated! See scripts/mage/docs_collector.go
|<<metricbeat-metricset-postgresql-statement,statement>>
|<<metricbeat-module-prometheus,Prometheus>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.3+| .3+| |<<metricbeat-metricset-prometheus-collector,collector>>
|<<metricbeat-metricset-prometheus-query,query>> beta[]
|<<metricbeat-metricset-prometheus-remote_write,remote_write>> beta[]
|<<metricbeat-metricset-prometheus-query,query>>
|<<metricbeat-metricset-prometheus-remote_write,remote_write>>
|<<metricbeat-module-rabbitmq,RabbitMQ>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.4+| .4+| |<<metricbeat-metricset-rabbitmq-connection,connection>>
|<<metricbeat-metricset-rabbitmq-exchange,exchange>>
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/prometheus/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/prometheus/query/_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: >
query metricset
release: beta
release: ga
fields:
2 changes: 1 addition & 1 deletion metricbeat/module/prometheus/remote_write/_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: >
remote write metrics from Prometheus server
release: beta
release: ga
fields: