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.

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

Prometheus GA #4315

Merged
merged 8 commits into from
Sep 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions packages/prometheus/_dev/build/docs/README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# Prometheus Integration

This integration periodically fetches metrics from [Prometheus](https://prometheus.io/) metrics endpoints.
This integration can collect metrics from Prometheus Exporters, receive metrics from Prometheus server using Remote Write
or execute specific Prometheus queries against Promethes Query API.
This integration can collect metrics from:
- Prometheus Exporters (Collectors)
- Prometheus Server Remote-Write
- Prometheus Queries (PromQL)

## Metrics

### Collector Metrics

The Prometheus `collector` dataset scrapes data from [prometheus exporters](https://prometheus.io/docs/instrumenting/exporters/).
The Prometheus integration `collector` dataset connects to the Prometheus server and pulls metrics using either the `/metrics` endpoint or the [Prometheus Federation API](https://prometheus.io/docs/prometheus/latest/federation/).

#### Scraping from a Prometheus exporter

Expand Down Expand Up @@ -138,7 +139,6 @@ The fields reported are:
The Prometheus `remote_write` can receive metrics from a Prometheus server that
has configured [remote_write](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_write)
setting accordingly, for instance:

```yml
remote_write:
- url: "http://localhost:9201/write"
Expand Down Expand Up @@ -276,7 +276,7 @@ will be handled as a histogram, even if it has the suffix `_total` which is a de

### Query Metrics

The Prometheus `query` dataset to query from [querying API of Prometheus](https://prometheus.io/docs/prometheus/latest/querying/api/#expression-queries).
The Prometheus `query` dataset executes specific Prometheus queries against [Promethes Query API](https://prometheus.io/docs/prometheus/latest/querying/api/#expression-queries).

#### Instant queries

Expand Down
6 changes: 6 additions & 0 deletions packages/prometheus/_dev/deploy/docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: '3.2'
services:
prometheus:
image: prom/prometheus:${PROMETHEUS_VERSION:-prometheus_2}
ports:
- 9090:9090
4 changes: 4 additions & 0 deletions packages/prometheus/_dev/deploy/variants.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
variants:
prometheus_2:
PROMETHEUS_VERSION: v2.36.2
default: prometheus_2
5 changes: 5 additions & 0 deletions packages/prometheus/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "1.0.0"
changes:
- description: Promote integration to GA
type: enhancement
link: https://github.com/elastic/integrations/pull/4315
- version: "0.14.0"
changes:
- description: Update default dashboard
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
vars: ~
data_stream:
vars:
hosts:
- "{{Hostname}}:9090"
1 change: 0 additions & 1 deletion packages/prometheus/data_stream/collector/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
title: Prometheus collector metrics
release: experimental
type: metrics
streams:
- input: prometheus/metrics
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
vars: ~
data_stream:
vars:
hosts:
- "{{Hostname}}:9090"
1 change: 0 additions & 1 deletion packages/prometheus/data_stream/query/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
title: Prometheus query metrics
release: experimental
type: metrics
streams:
- input: prometheus/metrics
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
title: Prometheus remote_write metrics
release: experimental
type: metrics
streams:
- input: prometheus/metrics
Expand Down
12 changes: 6 additions & 6 deletions packages/prometheus/docs/README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# Prometheus Integration

This integration periodically fetches metrics from [Prometheus](https://prometheus.io/) metrics endpoints.
This integration can collect metrics from Prometheus Exporters, receive metrics from Prometheus server using Remote Write
or execute specific Prometheus queries against Promethes Query API.
This integration can collect metrics from:
- Prometheus Exporters (Collectors)
- Prometheus Server Remote-Write
- Prometheus Queries (PromQL)

## Metrics

### Collector Metrics

The Prometheus `collector` dataset scrapes data from [prometheus exporters](https://prometheus.io/docs/instrumenting/exporters/).
The Prometheus integration `collector` dataset connects to the Prometheus server and pulls metrics using either the `/metrics` endpoint or the [Prometheus Federation API](https://prometheus.io/docs/prometheus/latest/federation/).

#### Scraping from a Prometheus exporter

Expand Down Expand Up @@ -233,7 +234,6 @@ The fields reported are:
The Prometheus `remote_write` can receive metrics from a Prometheus server that
has configured [remote_write](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_write)
setting accordingly, for instance:

```yml
remote_write:
- url: "http://localhost:9201/write"
Expand Down Expand Up @@ -484,7 +484,7 @@ will be handled as a histogram, even if it has the suffix `_total` which is a de

### Query Metrics

The Prometheus `query` dataset to query from [querying API of Prometheus](https://prometheus.io/docs/prometheus/latest/querying/api/#expression-queries).
The Prometheus `query` dataset executes specific Prometheus queries against [Promethes Query API](https://prometheus.io/docs/prometheus/latest/querying/api/#expression-queries).

#### Instant queries

Expand Down
4 changes: 2 additions & 2 deletions packages/prometheus/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
format_version: 1.0.0
name: prometheus
title: Prometheus Integration
version: 0.14.0
version: 1.0.0
license: basic
description: Collect metrics from Prometheus servers with Elastic Agent.
type: integration
categories:
- monitoring
- datastore
- kubernetes
release: experimental
release: ga
conditions:
kibana.version: "^8.4.0"
screenshots:
Expand Down