From 157cc08dac5cb933ffcd5f12d1cc970a423b6bd1 Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Wed, 14 Sep 2022 18:15:51 +0200 Subject: [PATCH 1/7] promote prometheus to GA Signed-off-by: Tetiana Kravchenko --- packages/prometheus/changelog.yml | 5 +++++ packages/prometheus/data_stream/collector/manifest.yml | 1 - packages/prometheus/data_stream/query/manifest.yml | 1 - packages/prometheus/data_stream/remote_write/manifest.yml | 1 - packages/prometheus/manifest.yml | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/prometheus/changelog.yml b/packages/prometheus/changelog.yml index cc9e3c029eb4..841f9e545755 100644 --- a/packages/prometheus/changelog.yml +++ b/packages/prometheus/changelog.yml @@ -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/4060 - version: "0.13.0" changes: - description: Revert index mapping changes for histogram type diff --git a/packages/prometheus/data_stream/collector/manifest.yml b/packages/prometheus/data_stream/collector/manifest.yml index 467156322a24..d7644d88c2a2 100644 --- a/packages/prometheus/data_stream/collector/manifest.yml +++ b/packages/prometheus/data_stream/collector/manifest.yml @@ -1,5 +1,4 @@ title: Prometheus collector metrics -release: experimental type: metrics streams: - input: prometheus/metrics diff --git a/packages/prometheus/data_stream/query/manifest.yml b/packages/prometheus/data_stream/query/manifest.yml index ec9ca987f19c..85e4fd506920 100644 --- a/packages/prometheus/data_stream/query/manifest.yml +++ b/packages/prometheus/data_stream/query/manifest.yml @@ -1,5 +1,4 @@ title: Prometheus query metrics -release: experimental type: metrics streams: - input: prometheus/metrics diff --git a/packages/prometheus/data_stream/remote_write/manifest.yml b/packages/prometheus/data_stream/remote_write/manifest.yml index 92d6a79d00b5..1ba1b23ebb65 100644 --- a/packages/prometheus/data_stream/remote_write/manifest.yml +++ b/packages/prometheus/data_stream/remote_write/manifest.yml @@ -1,5 +1,4 @@ title: Prometheus remote_write metrics -release: experimental type: metrics streams: - input: prometheus/metrics diff --git a/packages/prometheus/manifest.yml b/packages/prometheus/manifest.yml index bc2dd9820942..f14f96dfe473 100644 --- a/packages/prometheus/manifest.yml +++ b/packages/prometheus/manifest.yml @@ -1,14 +1,14 @@ format_version: 1.0.0 name: prometheus title: Prometheus Metrics -version: 0.13.0 +version: 1.0.0 license: basic description: Collect metrics from Prometheus servers with Elastic Agent. type: integration categories: - monitoring - datastore -release: experimental +release: ga conditions: kibana.version: "^8.4.0" screenshots: From 3c59766054b796e0a4dce849d3c43333f4af9ea2 Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Mon, 26 Sep 2022 19:11:06 +0200 Subject: [PATCH 2/7] use prometheus integration name Signed-off-by: Tetiana Kravchenko --- packages/prometheus/manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/prometheus/manifest.yml b/packages/prometheus/manifest.yml index d4ab934be019..292893967c32 100644 --- a/packages/prometheus/manifest.yml +++ b/packages/prometheus/manifest.yml @@ -1,6 +1,6 @@ format_version: 1.0.0 name: prometheus -title: Prometheus Metrics +title: Prometheus Integration version: 1.0.0 license: basic description: Collect metrics from Prometheus servers with Elastic Agent. From c51cb6e3c0decf7ad6bb230cc9d6fea1675b4897 Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Mon, 26 Sep 2022 19:12:20 +0200 Subject: [PATCH 3/7] readd k8s category Signed-off-by: Tetiana Kravchenko --- packages/prometheus/manifest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/prometheus/manifest.yml b/packages/prometheus/manifest.yml index 292893967c32..178322803994 100644 --- a/packages/prometheus/manifest.yml +++ b/packages/prometheus/manifest.yml @@ -8,6 +8,7 @@ type: integration categories: - monitoring - datastore + - kubernetes release: ga conditions: kibana.version: "^8.4.0" From 05085d1b690511f1099b9e76fe91f1d5caa7761c Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Tue, 27 Sep 2022 11:34:03 +0200 Subject: [PATCH 4/7] add system test Signed-off-by: Tetiana Kravchenko --- packages/prometheus/_dev/deploy/docker/docker-compose.yml | 6 ++++++ packages/prometheus/_dev/deploy/variants.yml | 4 ++++ .../collector/_dev/test/system/ test-default-config.yml | 5 +++++ 3 files changed, 15 insertions(+) create mode 100644 packages/prometheus/_dev/deploy/docker/docker-compose.yml create mode 100644 packages/prometheus/_dev/deploy/variants.yml create mode 100644 packages/prometheus/data_stream/collector/_dev/test/system/ test-default-config.yml diff --git a/packages/prometheus/_dev/deploy/docker/docker-compose.yml b/packages/prometheus/_dev/deploy/docker/docker-compose.yml new file mode 100644 index 000000000000..502a54245cda --- /dev/null +++ b/packages/prometheus/_dev/deploy/docker/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.2' +services: + prometheus: + image: prom/prometheus:${PROMETHEUS_VERSION:-prometheus_2} + ports: + - 9090:9090 diff --git a/packages/prometheus/_dev/deploy/variants.yml b/packages/prometheus/_dev/deploy/variants.yml new file mode 100644 index 000000000000..1058c81e28f7 --- /dev/null +++ b/packages/prometheus/_dev/deploy/variants.yml @@ -0,0 +1,4 @@ +variants: + prometheus_2: + PROMETHEUS_VERSION: v2.36.2 +default: prometheus_2 diff --git a/packages/prometheus/data_stream/collector/_dev/test/system/ test-default-config.yml b/packages/prometheus/data_stream/collector/_dev/test/system/ test-default-config.yml new file mode 100644 index 000000000000..10731d5946f2 --- /dev/null +++ b/packages/prometheus/data_stream/collector/_dev/test/system/ test-default-config.yml @@ -0,0 +1,5 @@ +vars: ~ +data_stream: + vars: + hosts: + - "{{Hostname}}:9090" From 7705a95b1d15165f21674adde6a2c6e9f710c767 Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Tue, 27 Sep 2022 11:52:32 +0200 Subject: [PATCH 5/7] fix test file name Signed-off-by: Tetiana Kravchenko --- .../{ test-default-config.yml => test-default-config.yml} | 0 .../query/_dev/test/system/test-default-config.yml | 5 +++++ 2 files changed, 5 insertions(+) rename packages/prometheus/data_stream/collector/_dev/test/system/{ test-default-config.yml => test-default-config.yml} (100%) create mode 100644 packages/prometheus/data_stream/query/_dev/test/system/test-default-config.yml diff --git a/packages/prometheus/data_stream/collector/_dev/test/system/ test-default-config.yml b/packages/prometheus/data_stream/collector/_dev/test/system/test-default-config.yml similarity index 100% rename from packages/prometheus/data_stream/collector/_dev/test/system/ test-default-config.yml rename to packages/prometheus/data_stream/collector/_dev/test/system/test-default-config.yml diff --git a/packages/prometheus/data_stream/query/_dev/test/system/test-default-config.yml b/packages/prometheus/data_stream/query/_dev/test/system/test-default-config.yml new file mode 100644 index 000000000000..10731d5946f2 --- /dev/null +++ b/packages/prometheus/data_stream/query/_dev/test/system/test-default-config.yml @@ -0,0 +1,5 @@ +vars: ~ +data_stream: + vars: + hosts: + - "{{Hostname}}:9090" From 6ac61c8b90f16fb92bc3e171129d63e79e327e63 Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Tue, 27 Sep 2022 12:25:18 +0200 Subject: [PATCH 6/7] update PR number Signed-off-by: Tetiana Kravchenko --- packages/prometheus/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/prometheus/changelog.yml b/packages/prometheus/changelog.yml index e3b270cb03a3..4cd8cacf4cb9 100644 --- a/packages/prometheus/changelog.yml +++ b/packages/prometheus/changelog.yml @@ -3,7 +3,7 @@ changes: - description: Promote integration to GA type: enhancement - link: https://github.com/elastic/integrations/pull/4060 + link: https://github.com/elastic/integrations/pull/4315 - version: "0.14.0" changes: - description: Update default dashboard From bb4cde32a9133ab5cc5c0d57f9bf3e2562574cbb Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Thu, 29 Sep 2022 14:28:40 +0200 Subject: [PATCH 7/7] clarify documentation Signed-off-by: Tetiana Kravchenko --- packages/prometheus/_dev/build/docs/README.md | 12 ++++++------ packages/prometheus/docs/README.md | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/prometheus/_dev/build/docs/README.md b/packages/prometheus/_dev/build/docs/README.md index 897d687f3fd1..f1da215c595b 100644 --- a/packages/prometheus/_dev/build/docs/README.md +++ b/packages/prometheus/_dev/build/docs/README.md @@ -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 @@ -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" @@ -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 diff --git a/packages/prometheus/docs/README.md b/packages/prometheus/docs/README.md index 1e5f05a5fb43..6b04273177e9 100644 --- a/packages/prometheus/docs/README.md +++ b/packages/prometheus/docs/README.md @@ -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 @@ -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" @@ -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