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

Add Prometheus Dashboard #13126

Merged
merged 6 commits into from
Aug 8, 2019
Merged

Add Prometheus Dashboard #13126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87a393c
Add Prometheus Dashboard
sorantis Jul 31, 2019
48cd11f
Switch to http request rates. Update changelog
sorantis Aug 1, 2019
1f9af98
Update changelog
sorantis Aug 1, 2019
e58eeb4
Update docs
sorantis Aug 1, 2019
738d04e
Update dashboard title
sorantis Aug 2, 2019
fb22813
Merge remote-tracking branch 'origin/master' into prometheus-dashboard
sorantis Aug 6, 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 @@ -37,6 +37,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d

*Metricbeat*

- Add new dashboard for Prometheus server stats {pull}13126[13126]
- Add new option `OpMultiplyBuckets` to scale histogram buckets to avoid decimal points in final events {pull}10994[10994]
- system/raid metricset now uses /sys/block instead of /proc/mdstat for data. {pull}11613[11613]
- kubernetes.container.cpu.limit.cores and kubernetes.container.cpu.requests.cores are now floats. {issue}11975[11975]
Expand Down
Binary file added metricbeat/docs/images/metricbeat-prometheus-overview.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions metricbeat/docs/modules/prometheus.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ This file is generated! See scripts/mage/docs_collector.go
This module periodically scrapes metrics from
https://prometheus.io/docs/instrumenting/exporters/[Prometheus exporters].

[float]
=== Dashboard

The Prometheus module comes with a predefined dashboard for Prometheus specific stats. For example:

image::./images/metricbeat-prometheus-overview.png[]




[float]
=== Example configuration
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 @@ -144,7 +144,7 @@ This file is generated! See scripts/mage/docs_collector.go
|<<metricbeat-metricset-postgresql-bgwriter,bgwriter>>
|<<metricbeat-metricset-postgresql-database,database>>
|<<metricbeat-metricset-postgresql-statement,statement>>
|<<metricbeat-module-prometheus,Prometheus>> |image:./images/icon-no.png[No prebuilt dashboards] |
|<<metricbeat-module-prometheus,Prometheus>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.1+| .1+| |<<metricbeat-metricset-prometheus-collector,collector>>
|<<metricbeat-module-rabbitmq,RabbitMQ>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.4+| .4+| |<<metricbeat-metricset-rabbitmq-connection,connection>>
Expand Down
9 changes: 9 additions & 0 deletions metricbeat/module/prometheus/_meta/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
This module periodically scrapes metrics from
https://prometheus.io/docs/instrumenting/exporters/[Prometheus exporters].

[float]
=== Dashboard

The Prometheus module comes with a predefined dashboard for Prometheus specific stats. For example:

image::./images/metricbeat-prometheus-overview.png[]


Loading