From 5bd89bf52f4468e06d24b713bb0a6f939890c06f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Wed, 15 Jun 2022 10:47:42 +0200 Subject: [PATCH 01/36] Upgrade to OpenSearch 1.3.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8c8d987..3e8c5b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ #group = org.opensearch.plugin.prometheus -version = 1.3.2.0 +version = 1.3.3.0 pluginName = prometheus-exporter pluginClassname = org.opensearch.plugin.prometheus.PrometheusExporterPlugin From 91bc668f084f1fd482818e867c1b3a336311a6fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Wed, 15 Jun 2022 11:28:27 +0200 Subject: [PATCH 02/36] Release 1.3.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5aaab3b..38c9e37 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ This plugin was started as a fork of [Prometheus exporter for Elasticsearch®](h | OpenSearch | Plugin | Release date | |-----------:|--------:|-------------:| +| 1.3.3 | 1.3.3.0 | Jun 15, 2022 | | 1.3.2 | 1.3.2.0 | May 10, 2022 | | 1.3.1 | 1.3.1.0 | Apr 08, 2022 | | 1.3.0 | 1.3.0.0 | Mar 22, 2022 | @@ -54,7 +55,7 @@ You need to install the plugin on every OpenSearch node that will be scraped by To **install** the plugin: -`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.2.0/prometheus-exporter-1.3.2.0.zip` +`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.3.0/prometheus-exporter-1.3.3.0.zip` To **remove** the plugin. From ce76f21a33ecf707026da8c336bf6910f52e96f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Tue, 28 Jun 2022 15:40:55 +0200 Subject: [PATCH 03/36] Add link to OpenSearch Node filters docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 38c9e37..c54aeb6 100644 --- a/README.md +++ b/README.md @@ -106,6 +106,7 @@ Metrics include statistics about individual OpenSearch nodes. By default, only statistics from the node that received the request are included. Prometheus exporter can be configured to include statistics from other nodes as well. +This filter is directly utilizing OpenSearch [Node filters](https://opensearch.org/docs/latest/opensearch/rest-api/nodes-apis/index/#node-filters) feature. Default value: `"_local"`. For example to get stats for all cluster nodes from any node use settings: From 302889ff52249d9de52c905999184f8b64c86f8c Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Fri, 15 Jul 2022 09:14:17 +0200 Subject: [PATCH 04/36] chore: bump OpenSearch from 1.3.3 to 1.3.4 Signed-off-by: Yoan Blanc --- README.md | 3 ++- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c54aeb6..b1a87d4 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ This plugin was started as a fork of [Prometheus exporter for Elasticsearch®](h | OpenSearch | Plugin | Release date | |-----------:|--------:|-------------:| +| 1.3.4 | 1.3.4.0 | Jul 15, 2022 | | 1.3.3 | 1.3.3.0 | Jun 15, 2022 | | 1.3.2 | 1.3.2.0 | May 10, 2022 | | 1.3.1 | 1.3.1.0 | Apr 08, 2022 | @@ -55,7 +56,7 @@ You need to install the plugin on every OpenSearch node that will be scraped by To **install** the plugin: -`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.3.0/prometheus-exporter-1.3.3.0.zip` +`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.4.0/prometheus-exporter-1.3.4.0.zip` To **remove** the plugin. diff --git a/gradle.properties b/gradle.properties index 3e8c5b1..7a0b654 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ #group = org.opensearch.plugin.prometheus -version = 1.3.3.0 +version = 1.3.4.0 pluginName = prometheus-exporter pluginClassname = org.opensearch.plugin.prometheus.PrometheusExporterPlugin From d2a0aee3183955176d5f738dcbb575a8939eec49 Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Fri, 2 Sep 2022 07:03:16 +0200 Subject: [PATCH 05/36] chore: bump OpenSearch from 1.3.4 to 1.3.5 Signed-off-by: Yoan Blanc --- README.md | 3 ++- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b1a87d4..87df1dc 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ This plugin was started as a fork of [Prometheus exporter for Elasticsearch®](h | OpenSearch | Plugin | Release date | |-----------:|--------:|-------------:| +| 1.3.5 | 1.3.5.0 | Sep 2, 2022 | | 1.3.4 | 1.3.4.0 | Jul 15, 2022 | | 1.3.3 | 1.3.3.0 | Jun 15, 2022 | | 1.3.2 | 1.3.2.0 | May 10, 2022 | @@ -56,7 +57,7 @@ You need to install the plugin on every OpenSearch node that will be scraped by To **install** the plugin: -`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.4.0/prometheus-exporter-1.3.4.0.zip` +`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.5.0/prometheus-exporter-1.3.5.0.zip` To **remove** the plugin. diff --git a/gradle.properties b/gradle.properties index 7a0b654..b51cc54 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ #group = org.opensearch.plugin.prometheus -version = 1.3.4.0 +version = 1.3.5.0 pluginName = prometheus-exporter pluginClassname = org.opensearch.plugin.prometheus.PrometheusExporterPlugin From 183d7001c6a4c83d34face3422d72241009abba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Mon, 5 Sep 2022 18:09:05 +0200 Subject: [PATCH 06/36] Release 1.3.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 87df1dc..bc43937 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ This plugin was started as a fork of [Prometheus exporter for Elasticsearch®](h | OpenSearch | Plugin | Release date | |-----------:|--------:|-------------:| -| 1.3.5 | 1.3.5.0 | Sep 2, 2022 | +| 1.3.5 | 1.3.5.0 | Sep 5, 2022 | | 1.3.4 | 1.3.4.0 | Jul 15, 2022 | | 1.3.3 | 1.3.3.0 | Jun 15, 2022 | | 1.3.2 | 1.3.2.0 | May 10, 2022 | From fb6e47f32eca9a52cb2cf8b3e89d6bdf6efbf23f Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Fri, 7 Oct 2022 09:13:06 +0200 Subject: [PATCH 07/36] chore: bump OpenSearch from 1.3.5 to 1.3.6 Signed-off-by: Yoan Blanc --- README.md | 3 ++- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bc43937..cdf510a 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ This plugin was started as a fork of [Prometheus exporter for Elasticsearch®](h | OpenSearch | Plugin | Release date | |-----------:|--------:|-------------:| +| 1.3.6 | 1.3.6.0 | Oct 7, 2022 | | 1.3.5 | 1.3.5.0 | Sep 5, 2022 | | 1.3.4 | 1.3.4.0 | Jul 15, 2022 | | 1.3.3 | 1.3.3.0 | Jun 15, 2022 | @@ -57,7 +58,7 @@ You need to install the plugin on every OpenSearch node that will be scraped by To **install** the plugin: -`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.5.0/prometheus-exporter-1.3.5.0.zip` +`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.6.0/prometheus-exporter-1.3.6.0.zip` To **remove** the plugin. diff --git a/gradle.properties b/gradle.properties index b51cc54..f4e03da 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ #group = org.opensearch.plugin.prometheus -version = 1.3.5.0 +version = 1.3.6.0 pluginName = prometheus-exporter pluginClassname = org.opensearch.plugin.prometheus.PrometheusExporterPlugin From 9125b1ebf61788739095353d52919501917f18aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Mon, 10 Oct 2022 14:39:27 +0200 Subject: [PATCH 08/36] Release 1.3.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cdf510a..5b29135 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ This plugin was started as a fork of [Prometheus exporter for Elasticsearch®](h | OpenSearch | Plugin | Release date | |-----------:|--------:|-------------:| -| 1.3.6 | 1.3.6.0 | Oct 7, 2022 | +| 1.3.6 | 1.3.6.0 | Oct 10, 2022 | | 1.3.5 | 1.3.5.0 | Sep 5, 2022 | | 1.3.4 | 1.3.4.0 | Jul 15, 2022 | | 1.3.3 | 1.3.3.0 | Jun 15, 2022 | From b28a47103434694cef0ab8ae9db8f862a6416d5f Mon Sep 17 00:00:00 2001 From: Stein Arne Storslett Date: Wed, 14 Dec 2022 11:33:44 +0100 Subject: [PATCH 09/36] Release 1.3.7.0 Signed-off-by: Stein Arne Storslett --- README.md | 3 ++- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5b29135..2881c10 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ This plugin was started as a fork of [Prometheus exporter for Elasticsearch®](h | OpenSearch | Plugin | Release date | |-----------:|--------:|-------------:| +| 1.3.7 | 1.3.7.0 | Dec 13, 2022 | | 1.3.6 | 1.3.6.0 | Oct 10, 2022 | | 1.3.5 | 1.3.5.0 | Sep 5, 2022 | | 1.3.4 | 1.3.4.0 | Jul 15, 2022 | @@ -58,7 +59,7 @@ You need to install the plugin on every OpenSearch node that will be scraped by To **install** the plugin: -`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.6.0/prometheus-exporter-1.3.6.0.zip` +`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.7.0/prometheus-exporter-1.3.7.0.zip` To **remove** the plugin. diff --git a/gradle.properties b/gradle.properties index f4e03da..c418dce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ #group = org.opensearch.plugin.prometheus -version = 1.3.6.0 +version = 1.3.7.0 pluginName = prometheus-exporter pluginClassname = org.opensearch.plugin.prometheus.PrometheusExporterPlugin From 67c244974179e44f3b90d5a051c4bbe48388b2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Mon, 19 Dec 2022 14:57:12 +0100 Subject: [PATCH 10/36] Release 1.3.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2881c10..7257e63 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ This plugin was started as a fork of [Prometheus exporter for Elasticsearch®](h | OpenSearch | Plugin | Release date | |-----------:|--------:|-------------:| -| 1.3.7 | 1.3.7.0 | Dec 13, 2022 | +| 1.3.7 | 1.3.7.0 | Dec 19, 2022 | | 1.3.6 | 1.3.6.0 | Oct 10, 2022 | | 1.3.5 | 1.3.5.0 | Sep 5, 2022 | | 1.3.4 | 1.3.4.0 | Jul 15, 2022 | From 7e2072c59ca9f24be59b36c43938576ff0f00f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Fri, 3 Mar 2023 14:40:58 +0100 Subject: [PATCH 11/36] Upgrade to OpenSearch 1.3.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c418dce..49d4216 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ #group = org.opensearch.plugin.prometheus -version = 1.3.7.0 +version = 1.3.8.0 pluginName = prometheus-exporter pluginClassname = org.opensearch.plugin.prometheus.PrometheusExporterPlugin From f529f149d743cbcb8c8d3fa23e0a6e9bf7be7c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Fri, 3 Mar 2023 14:53:46 +0100 Subject: [PATCH 12/36] Release 1.3.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7257e63..af73782 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ This plugin was started as a fork of [Prometheus exporter for Elasticsearch®](h | OpenSearch | Plugin | Release date | |-----------:|--------:|-------------:| +| 1.3.8 | 1.3.8.0 | Mar 03, 2023 | | 1.3.7 | 1.3.7.0 | Dec 19, 2022 | | 1.3.6 | 1.3.6.0 | Oct 10, 2022 | | 1.3.5 | 1.3.5.0 | Sep 5, 2022 | @@ -59,7 +60,7 @@ You need to install the plugin on every OpenSearch node that will be scraped by To **install** the plugin: -`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.7.0/prometheus-exporter-1.3.7.0.zip` +`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.8.0/prometheus-exporter-1.3.8.0.zip` To **remove** the plugin. From 5119c453ca0fb44a930ce2a744eb82fa96aea628 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Mar 2023 10:18:36 +0000 Subject: [PATCH 13/36] Bump tim-actions/get-pr-commits from 1.1.0 to 1.2.0 Bumps [tim-actions/get-pr-commits](https://github.com/tim-actions/get-pr-commits) from 1.1.0 to 1.2.0. - [Release notes](https://github.com/tim-actions/get-pr-commits/releases) - [Commits](https://github.com/tim-actions/get-pr-commits/compare/v1.1.0...v1.2.0) --- updated-dependencies: - dependency-name: tim-actions/get-pr-commits dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dco.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml index 3100de7..725f2e4 100644 --- a/.github/workflows/dco.yml +++ b/.github/workflows/dco.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Get PR Commits id: 'get-pr-commits' - uses: tim-actions/get-pr-commits@v1.1.0 + uses: tim-actions/get-pr-commits@v1.2.0 with: token: ${{ secrets.GITHUB_TOKEN }} - name: DCO Check From 34f421428c3793ebbd8ce5e03e6448d751a6e038 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Mar 2023 10:18:43 +0000 Subject: [PATCH 14/36] Bump actions/checkout from 2 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 052db28..14a8658 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -19,7 +19,7 @@ jobs: contents: read steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v1 with: From 2b944b2eb036494c158f723a4905823ac8889155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Tue, 7 Mar 2023 15:48:04 +0100 Subject: [PATCH 15/36] Bump prometheus.simpleclient to 0.16.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #154 Closes: #158 Signed-off-by: Lukáš Vlček --- build.gradle | 8 ++++---- licenses/simpleclient-0.15.0.jar.sha1 | 1 - licenses/simpleclient-0.16.0.jar.sha1 | 1 + licenses/simpleclient_common-0.15.0.jar.sha1 | 1 - licenses/simpleclient_common-0.16.0.jar.sha1 | 1 + 5 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 licenses/simpleclient-0.15.0.jar.sha1 create mode 100644 licenses/simpleclient-0.16.0.jar.sha1 delete mode 100644 licenses/simpleclient_common-0.15.0.jar.sha1 create mode 100644 licenses/simpleclient_common-0.16.0.jar.sha1 diff --git a/build.gradle b/build.gradle index dda94f0..25eac94 100644 --- a/build.gradle +++ b/build.gradle @@ -75,7 +75,7 @@ buildscript { versions = [ "opensearch": opensearch_version, - "prometheus": "0.15.0" + "prometheus": "0.16.0" ] } @@ -105,8 +105,8 @@ dependencies { // See https://docs.gradle.org/6.8.1/userguide/java_plugin.html#sec:java_plugin_and_dependency_management // compile "io.prometheus:simpleclient:${versions.prometheus}" // compile "io.prometheus:simpleclient_common:${versions.prometheus}" - implementation group: 'io.prometheus', name: 'simpleclient', version: '0.15.0' - implementation group: 'io.prometheus', name: 'simpleclient_common', version: '0.15.0' + implementation group: 'io.prometheus', name: 'simpleclient', version: '0.16.0' + implementation group: 'io.prometheus', name: 'simpleclient_common', version: '0.16.0' } test { @@ -152,4 +152,4 @@ testClusters.integTest { run { useCluster testClusters.integTest -} \ No newline at end of file +} diff --git a/licenses/simpleclient-0.15.0.jar.sha1 b/licenses/simpleclient-0.15.0.jar.sha1 deleted file mode 100644 index 80582d1..0000000 --- a/licenses/simpleclient-0.15.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -144aaf1ac9361a497d98079e0db8757a95e22fc4 \ No newline at end of file diff --git a/licenses/simpleclient-0.16.0.jar.sha1 b/licenses/simpleclient-0.16.0.jar.sha1 new file mode 100644 index 0000000..36a11e4 --- /dev/null +++ b/licenses/simpleclient-0.16.0.jar.sha1 @@ -0,0 +1 @@ +28b0eaf7c500c506976da8d0fc9cad6c278e8d87 \ No newline at end of file diff --git a/licenses/simpleclient_common-0.15.0.jar.sha1 b/licenses/simpleclient_common-0.15.0.jar.sha1 deleted file mode 100644 index f10a8d9..0000000 --- a/licenses/simpleclient_common-0.15.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -57bd1d8be9f4d965a38c6b1b35ee60358cc679fc \ No newline at end of file diff --git a/licenses/simpleclient_common-0.16.0.jar.sha1 b/licenses/simpleclient_common-0.16.0.jar.sha1 new file mode 100644 index 0000000..6359603 --- /dev/null +++ b/licenses/simpleclient_common-0.16.0.jar.sha1 @@ -0,0 +1 @@ +a09a8c790a20309b942a9fdbfe77da22407096e6 \ No newline at end of file From f8bc56e0f04aa563859ae37e8323046ed69b2d88 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Mar 2023 17:13:08 +0100 Subject: [PATCH 16/36] Bump actions/setup-java from 1 to 3 (#155) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Bump actions/setup-java from 1 to 3 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 1 to 3. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v1...v3) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * GHA java-setup@v3 requires distribution name Signed-off-by: Lukáš Vlček --------- Signed-off-by: dependabot[bot] Signed-off-by: Lukáš Vlček Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lukáš Vlček --- .github/workflows/CI.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 14a8658..67a8b64 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -21,8 +21,9 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: "adopt" java-version: ${{ matrix.java }} - name: Build and Run Tests From cd0ec32615c25ee5c9a63842fb16c55bf715eb0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Mon, 20 Mar 2023 15:11:54 +0100 Subject: [PATCH 17/36] Upgrade to OpenSearch 1.3.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 49d4216..11e502f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ #group = org.opensearch.plugin.prometheus -version = 1.3.8.0 +version = 1.3.9.0 pluginName = prometheus-exporter pluginClassname = org.opensearch.plugin.prometheus.PrometheusExporterPlugin From ed5d4c0ba7012f81c7bc8a94c8257659d9d9d984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Mon, 20 Mar 2023 15:55:36 +0100 Subject: [PATCH 18/36] Release 1.3.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index af73782..ddb98a8 100644 --- a/README.md +++ b/README.md @@ -40,10 +40,11 @@ This plugin was started as a fork of [Prometheus exporter for Elasticsearch®](h | OpenSearch | Plugin | Release date | |-----------:|--------:|-------------:| +| 1.3.9 | 1.3.9.0 | Mar 20, 2023 | | 1.3.8 | 1.3.8.0 | Mar 03, 2023 | | 1.3.7 | 1.3.7.0 | Dec 19, 2022 | | 1.3.6 | 1.3.6.0 | Oct 10, 2022 | -| 1.3.5 | 1.3.5.0 | Sep 5, 2022 | +| 1.3.5 | 1.3.5.0 | Sep 05, 2022 | | 1.3.4 | 1.3.4.0 | Jul 15, 2022 | | 1.3.3 | 1.3.3.0 | Jun 15, 2022 | | 1.3.2 | 1.3.2.0 | May 10, 2022 | @@ -60,7 +61,7 @@ You need to install the plugin on every OpenSearch node that will be scraped by To **install** the plugin: -`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.8.0/prometheus-exporter-1.3.8.0.zip` +`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.9.0/prometheus-exporter-1.3.9.0.zip` To **remove** the plugin. From d2401661a401bec5b4c3a240bcc58d8efe703822 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 May 2023 07:02:32 +0000 Subject: [PATCH 19/36] Bump tim-actions/get-pr-commits from 1.2.0 to 1.3.0 Bumps [tim-actions/get-pr-commits](https://github.com/tim-actions/get-pr-commits) from 1.2.0 to 1.3.0. - [Release notes](https://github.com/tim-actions/get-pr-commits/releases) - [Commits](https://github.com/tim-actions/get-pr-commits/compare/v1.2.0...v1.3.0) --- updated-dependencies: - dependency-name: tim-actions/get-pr-commits dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dco.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml index 725f2e4..6ea5b67 100644 --- a/.github/workflows/dco.yml +++ b/.github/workflows/dco.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Get PR Commits id: 'get-pr-commits' - uses: tim-actions/get-pr-commits@v1.2.0 + uses: tim-actions/get-pr-commits@v1.3.0 with: token: ${{ secrets.GITHUB_TOKEN }} - name: DCO Check From 379c9056ae8ffc963ad5f8dfd6216bb7cc62a951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Tue, 23 May 2023 14:25:36 +0200 Subject: [PATCH 20/36] Upgrade to OpenSearch 1.3.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 11e502f..207649c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ #group = org.opensearch.plugin.prometheus -version = 1.3.9.0 +version = 1.3.10.0 pluginName = prometheus-exporter pluginClassname = org.opensearch.plugin.prometheus.PrometheusExporterPlugin From f3ce8116d1150a24f780522c6b95261e58a580f0 Mon Sep 17 00:00:00 2001 From: nhuttran Date: Fri, 7 Apr 2023 08:39:40 +0530 Subject: [PATCH 21/36] Introduce indices filter This is backport of #167 Signed-off-by: nhuttran --- README.md | 34 ++ build.gradle | 82 +++-- config/checkstyle/checkstyle.xml | 298 ++++++++++++++++++ .../prometheus/PrometheusSettings.java | 146 ++++++++- .../TransportNodePrometheusMetricsAction.java | 9 +- .../prometheus/PrometheusExporterPlugin.java | 2 + .../test/60_10_indices_filter.yml | 259 +++++++++++++++ 7 files changed, 783 insertions(+), 47 deletions(-) create mode 100644 config/checkstyle/checkstyle.xml create mode 100644 src/yamlRestTest/resources/rest-api-spec/test/60_10_indices_filter.yml diff --git a/README.md b/README.md index ddb98a8..5db5ae0 100644 --- a/README.md +++ b/README.md @@ -120,6 +120,40 @@ For example to get stats for all cluster nodes from any node use settings: prometheus.nodes.filter: "_all" ``` +#### Indices filter + +Prometheus exporter can be configured to filter indices statistics from selected indices. +To target all indices, use "" or * or _all or null. +Default value: `""`. + +For example to filter indices statistics: +``` +prometheus.indices_filter.selected_indices: "log-*,*log,*log*,log*-test" +``` + +Users can select which option for filtering indices statistics. +Default value: `"STRICT_EXPAND_OPEN_FORBID_CLOSED"`. + +For example to select an option: +``` +prometheus.indices_filter.selected_option: "LENIENT_EXPAND_OPEN" +``` +Here is a list of indices options available for selection +``` +STRICT_EXPAND_OPEN: indices options that requires every specified index to exist, expands wildcards only to open indices and allows that no indices are resolved from wildcard expressions (not returning an error). +STRICT_EXPAND_OPEN_HIDDEN: indices options that requires every specified index to exist, expands wildcards only to open indices, includes hidden indices, and allows that no indices are resolved from wildcard expressions (not returning an error). +STRICT_EXPAND_OPEN_FORBID_CLOSED: indices options that requires every specified index to exist, expands wildcards only to open indices, allows that no indices are resolved from wildcard expressions (not returning an error) and forbids the use of closed indices by throwing an error. +STRICT_EXPAND_OPEN_HIDDEN_FORBID_CLOSED: indices options that requires every specified index to exist, expands wildcards only to open indices, includes hidden indices, and allows that no indices are resolved from wildcard expressions (not returning an error) and forbids the use of closed indices by throwing an error. +STRICT_EXPAND_OPEN_FORBID_CLOSED_IGNORE_THROTTLED: indices options that requires every specified index to exist, expands wildcards only to open indices, allows that no indices are resolved from wildcard expressions (not returning an error), forbids the use of closed indices by throwing an error and ignores indices that are throttled. +STRICT_EXPAND_OPEN_CLOSED: indices option that requires every specified index to exist, expands wildcards to both open and closed indices and allows that no indices are resolved from wildcard expressions (not returning an error). +STRICT_EXPAND_OPEN_CLOSED_HIDDEN: indices option that requires every specified index to exist, expands wildcards to both open and closed indices, includes hidden indices, and allows that no indices are resolved from wildcard expressions (not returning an error). +STRICT_SINGLE_INDEX_NO_EXPAND_FORBID_CLOSED: indices option that requires each specified index or alias to exist, doesn't expand wildcards and throws error if any of the aliases resolves to multiple indices. +LENIENT_EXPAND_OPEN: indices options that ignores unavailable indices, expands wildcards only to open indices and allows that no indices are resolved from wildcard expressions (not returning an error). +LENIENT_EXPAND_OPEN_HIDDEN: indices options that ignores unavailable indices, expands wildcards to open and hidden indices, and allows that no indices are resolved from wildcard expressions (not returning an error). +LENIENT_EXPAND_OPEN_CLOSED: indices options that ignores unavailable indices, expands wildcards to both open and closed indices and allows that no indices are resolved from wildcard expressions (not returning an error). +LENIENT_EXPAND_OPEN_CLOSED_HIDDEN: indices options that ignores unavailable indices, expands wildcards to all open and closed indices and allows that no indices are resolved from wildcard expressions (not returning an error). +``` + ## Usage Metrics are directly available at: diff --git a/build.gradle b/build.gradle index 25eac94..481cca0 100644 --- a/build.gradle +++ b/build.gradle @@ -3,49 +3,8 @@ import org.opensearch.gradle.test.RestIntegTestTask import java.util.regex.Matcher import java.util.regex.Pattern -apply plugin: 'java' -apply plugin: 'idea' -apply plugin: 'opensearch.opensearchplugin' -apply plugin: 'opensearch.yaml-rest-test' - -def pluginName = pluginName -def pluginDescription = pluginDescription -//def projectPath = 'org.opensearch' -//def pathToPlugin = 'path.to.plugin' -def pluginClassName = pluginClassname - -//tasks.register("preparePluginPathDirs") { -// mustRunAfter clean -// doLast { -// def newPath = pathToPlugin.replace(".", "/") -// mkdir "src/main/java/org/opensearch/$newPath" -// mkdir "src/test/java/org/opensearch/$newPath" -// mkdir "src/yamlRestTest/java/org/opensearch/$newPath" -// } -//} - -opensearchplugin { - name pluginName - description pluginDescription -// classname "${projectPath}.${pathToPlugin}.${pluginClassName}" - classname pluginClassName - licenseFile rootProject.file('LICENSE.txt') - noticeFile rootProject.file('NOTICE.txt') -} - -// thirdparty audit needs can be enabled -thirdPartyAudit.enabled = false - -// This requires an additional Jar not published as part of build-tools -loggerUsageCheck.enabled = false - -// No need to validate pom, as we do not upload to maven/sonatype -validateNebulaPom.enabled = false - buildscript { - ext { - // Four {digit(s)} concatenated with a "." followed by -rc{digit(s)} // Examples: 1.0.0.1-rc2, 2.10.4.0-rc5 // Group (3) refers to the last .{digit{(s)} pattern (this is what we want to remove for OpS version) @@ -81,10 +40,10 @@ buildscript { repositories { mavenLocal() + maven { url "https://aws.oss.sonatype.org/content/repositories/releases" } maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } mavenCentral() maven { url "https://plugins.gradle.org/m2/" } - jcenter() } dependencies { @@ -92,8 +51,39 @@ buildscript { } } +apply plugin: 'java' +apply plugin: 'idea' +apply plugin: 'opensearch.opensearchplugin' +apply plugin: 'opensearch.yaml-rest-test' +//apply plugin: 'checkstyle' + +def pluginName = pluginName +def pluginDescription = pluginDescription +//def projectPath = 'org.opensearch' +//def pathToPlugin = 'path.to.plugin' +def pluginClassName = pluginClassname + +opensearchplugin { + name pluginName + description pluginDescription +// classname "${projectPath}.${pathToPlugin}.${pluginClassName}" + classname pluginClassName + licenseFile rootProject.file('LICENSE.txt') + noticeFile rootProject.file('NOTICE.txt') +} + +// thirdparty audit needs can be enabled +thirdPartyAudit.enabled = false + +// This requires an additional Jar not published as part of build-tools +loggerUsageCheck.enabled = false + +// No need to validate pom, as we do not upload to maven/sonatype +validateNebulaPom.enabled = false + repositories { mavenLocal() + maven { url "https://aws.oss.sonatype.org/content/repositories/releases" } maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } mavenCentral() maven { url "https://plugins.gradle.org/m2/" } @@ -109,6 +99,12 @@ dependencies { implementation group: 'io.prometheus', name: 'simpleclient_common', version: '0.16.0' } +restResources { + restApi { + includeCore '_common', 'cat', 'cluster', 'nodes', 'indices', 'index' + } +} + test { include '**/*Tests.class' } @@ -152,4 +148,4 @@ testClusters.integTest { run { useCluster testClusters.integTest -} +} \ No newline at end of file diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml new file mode 100644 index 0000000..188c119 --- /dev/null +++ b/config/checkstyle/checkstyle.xml @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/org/compuscene/metrics/prometheus/PrometheusSettings.java b/src/main/java/org/compuscene/metrics/prometheus/PrometheusSettings.java index 9505e5b..bd1d820 100644 --- a/src/main/java/org/compuscene/metrics/prometheus/PrometheusSettings.java +++ b/src/main/java/org/compuscene/metrics/prometheus/PrometheusSettings.java @@ -17,6 +17,8 @@ package org.compuscene.metrics.prometheus; +import org.opensearch.action.support.IndicesOptions; +import org.opensearch.common.Strings; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; @@ -30,28 +32,91 @@ * } */ public class PrometheusSettings { + public enum INDEX_FILTER_OPTIONS { + STRICT_EXPAND_OPEN, + STRICT_EXPAND_OPEN_HIDDEN, + STRICT_EXPAND_OPEN_FORBID_CLOSED, + STRICT_EXPAND_OPEN_HIDDEN_FORBID_CLOSED, + STRICT_EXPAND_OPEN_FORBID_CLOSED_IGNORE_THROTTLED, + STRICT_EXPAND_OPEN_CLOSED, + STRICT_EXPAND_OPEN_CLOSED_HIDDEN, + STRICT_SINGLE_INDEX_NO_EXPAND_FORBID_CLOSED, + LENIENT_EXPAND_OPEN, + LENIENT_EXPAND_OPEN_HIDDEN, + LENIENT_EXPAND_OPEN_CLOSED, + LENIENT_EXPAND_OPEN_CLOSED_HIDDEN + } + + static String PROMETHEUS_CLUSTER_SETTINGS_KEY = "prometheus.cluster.settings"; + static String PROMETHEUS_INDICES_KEY = "prometheus.indices"; + static String PROMETHEUS_NODES_FILTER_KEY = "prometheus.nodes.filter"; + static String PROMETHEUS_SELECTED_INDICES_KEY = "prometheus.indices_filter.selected_indices"; + static String PROMETHEUS_SELECTED_OPTION_KEY = "prometheus.indices_filter.selected_option"; + /** + * This setting is used configure weather to expose cluster settings metrics or not. The default value is true. + * Can be configured in opensearch.yml file or update dynamically under key {@link #PROMETHEUS_CLUSTER_SETTINGS_KEY}. + */ public static final Setting PROMETHEUS_CLUSTER_SETTINGS = - Setting.boolSetting("prometheus.cluster.settings", true, + Setting.boolSetting(PROMETHEUS_CLUSTER_SETTINGS_KEY, true, Setting.Property.Dynamic, Setting.Property.NodeScope); + + /** + * This setting is used configure weather to expose low level index metrics or not. The default value is true. + * Can be configured in opensearch.yml file or update dynamically under key {@link #PROMETHEUS_INDICES_KEY}. + */ public static final Setting PROMETHEUS_INDICES = - Setting.boolSetting("prometheus.indices", true, + Setting.boolSetting(PROMETHEUS_INDICES_KEY, true, Setting.Property.Dynamic, Setting.Property.NodeScope); + + /** + * This setting is used configure which cluster nodes to gather metrics from. The default value is _local. + * Can be configured in opensearch.yml file or update dynamically under key {@link #PROMETHEUS_NODES_FILTER_KEY}. + */ public static final Setting PROMETHEUS_NODES_FILTER = - Setting.simpleString("prometheus.nodes.filter", "_local", + Setting.simpleString(PROMETHEUS_NODES_FILTER_KEY, "_local", Setting.Property.Dynamic, Setting.Property.NodeScope); + /** + * This setting is used configure to filter indices statistics from selected indices. The default value is "". + * Can be configured in opensearch.yml file or update dynamically under key {@link #PROMETHEUS_SELECTED_INDICES_KEY}. + */ + public static final Setting PROMETHEUS_SELECTED_INDICES = + Setting.simpleString(PROMETHEUS_SELECTED_INDICES_KEY, "", + Setting.Property.Dynamic, Setting.Property.NodeScope); + + /** + * This setting is used configure which option for filtering indices statistics. + * The default value is STRICT_EXPAND_OPEN_FORBID_CLOSED. + * Can be configured in opensearch.yml file or update dynamically under key {@link #PROMETHEUS_SELECTED_OPTION_KEY}. + */ + public static final Setting PROMETHEUS_SELECTED_OPTION = + new Setting<>(PROMETHEUS_SELECTED_OPTION_KEY, + String.valueOf(INDEX_FILTER_OPTIONS.STRICT_EXPAND_OPEN_FORBID_CLOSED), + INDEX_FILTER_OPTIONS::valueOf, Setting.Property.Dynamic, Setting.Property.NodeScope); + private volatile boolean clusterSettings; private volatile boolean indices; private volatile String nodesFilter; + private volatile String selectedIndices; + private volatile INDEX_FILTER_OPTIONS selectedOption; + /** + * A constructor. + * @param settings Settings + * @param clusterSettings Cluster settings + */ public PrometheusSettings(Settings settings, ClusterSettings clusterSettings) { setPrometheusClusterSettings(PROMETHEUS_CLUSTER_SETTINGS.get(settings)); setPrometheusIndices(PROMETHEUS_INDICES.get(settings)); setPrometheusNodesFilter(PROMETHEUS_NODES_FILTER.get(settings)); + setPrometheusSelectedIndices(PROMETHEUS_SELECTED_INDICES.get(settings)); + setPrometheusSelectedOption(PROMETHEUS_SELECTED_OPTION.get(settings)); clusterSettings.addSettingsUpdateConsumer(PROMETHEUS_CLUSTER_SETTINGS, this::setPrometheusClusterSettings); clusterSettings.addSettingsUpdateConsumer(PROMETHEUS_INDICES, this::setPrometheusIndices); clusterSettings.addSettingsUpdateConsumer(PROMETHEUS_NODES_FILTER, this::setPrometheusNodesFilter); + clusterSettings.addSettingsUpdateConsumer(PROMETHEUS_SELECTED_INDICES, this::setPrometheusSelectedIndices); + clusterSettings.addSettingsUpdateConsumer(PROMETHEUS_SELECTED_OPTION, this::setPrometheusSelectedOption); } private void setPrometheusClusterSettings(boolean flag) { @@ -64,13 +129,88 @@ private void setPrometheusIndices(boolean flag) { private void setPrometheusNodesFilter(String filter) { this.nodesFilter = filter; } + private void setPrometheusSelectedIndices(String selectedIndices) { + this.selectedIndices = selectedIndices; + } + + private void setPrometheusSelectedOption(INDEX_FILTER_OPTIONS selectedOption) { + this.selectedOption = selectedOption; + } + + /** + * Get value of settings key {@link #PROMETHEUS_CLUSTER_SETTINGS_KEY}. + * @return boolean value of the key + */ public boolean getPrometheusClusterSettings() { return this.clusterSettings; } + /** + * Get value of settings key {@link #PROMETHEUS_INDICES_KEY}. + * @return boolean value of the key + */ public boolean getPrometheusIndices() { return this.indices; } + /** + * Get value of settings key {@link #PROMETHEUS_NODES_FILTER_KEY}. + * @return boolean value of the key + */ public String getNodesFilter() { return this.nodesFilter; } + + /** + * Get value of settings key {@link #PROMETHEUS_SELECTED_INDICES_KEY}. + * @return string value of the key + */ + public String[] getPrometheusSelectedIndices() { + return Strings.splitStringByCommaToArray(this.selectedIndices); + } + + /** + * Get IndicesOptions of settings key {@link #PROMETHEUS_SELECTED_OPTION_KEY}. + * @return IndicesOptions of the key + */ + public IndicesOptions getIndicesOptions() { + IndicesOptions indicesOptions = null; + switch (this.selectedOption) { + case STRICT_EXPAND_OPEN: + indicesOptions = IndicesOptions.strictExpandOpen(); + break; + case STRICT_EXPAND_OPEN_HIDDEN: + indicesOptions = IndicesOptions.strictExpandOpenHidden(); + break; + case STRICT_EXPAND_OPEN_FORBID_CLOSED: + indicesOptions = IndicesOptions.strictExpandOpenAndForbidClosed(); + break; + case STRICT_EXPAND_OPEN_HIDDEN_FORBID_CLOSED: + indicesOptions = IndicesOptions.STRICT_EXPAND_OPEN_HIDDEN_FORBID_CLOSED; + break; + case STRICT_EXPAND_OPEN_FORBID_CLOSED_IGNORE_THROTTLED: + indicesOptions = IndicesOptions.strictExpandOpenAndForbidClosedIgnoreThrottled(); + break; + case STRICT_EXPAND_OPEN_CLOSED: + indicesOptions = IndicesOptions.strictExpand(); + break; + case STRICT_EXPAND_OPEN_CLOSED_HIDDEN: + indicesOptions = IndicesOptions.strictExpandHidden(); + break; + case STRICT_SINGLE_INDEX_NO_EXPAND_FORBID_CLOSED: + indicesOptions = IndicesOptions.strictSingleIndexNoExpandForbidClosed(); + break; + case LENIENT_EXPAND_OPEN: + indicesOptions = IndicesOptions.lenientExpandOpen(); + break; + case LENIENT_EXPAND_OPEN_HIDDEN: + indicesOptions = IndicesOptions.lenientExpandOpenHidden(); + break; + case LENIENT_EXPAND_OPEN_CLOSED: + indicesOptions = IndicesOptions.lenientExpand(); + break; + case LENIENT_EXPAND_OPEN_CLOSED_HIDDEN: + indicesOptions = IndicesOptions.lenientExpandHidden(); + break; + } + return indicesOptions; + } } diff --git a/src/main/java/org/opensearch/action/TransportNodePrometheusMetricsAction.java b/src/main/java/org/opensearch/action/TransportNodePrometheusMetricsAction.java index 531112d..d9fc7c7 100644 --- a/src/main/java/org/opensearch/action/TransportNodePrometheusMetricsAction.java +++ b/src/main/java/org/opensearch/action/TransportNodePrometheusMetricsAction.java @@ -124,7 +124,14 @@ private AsyncAction(ActionListener listener) { // Indices stats request is not "node-specific", it does not support any "_local" notion // it is broad-casted to all cluster nodes. - this.indicesStatsRequest = isPrometheusIndices ? new IndicesStatsRequest() : null; + if (isPrometheusIndices) { + IndicesStatsRequest indicesStatsRequest = new IndicesStatsRequest(); + indicesStatsRequest.indices(prometheusSettings.getPrometheusSelectedIndices()); + indicesStatsRequest.indicesOptions(prometheusSettings.getIndicesOptions()); + this.indicesStatsRequest = indicesStatsRequest; + } else { + this.indicesStatsRequest = null; + } // Cluster settings are get via ClusterStateRequest (see elasticsearch RestClusterGetSettingsAction for details) // We prefer to send it to master node (hence local=false; it should be set by default but we want to be sure). diff --git a/src/main/java/org/opensearch/plugin/prometheus/PrometheusExporterPlugin.java b/src/main/java/org/opensearch/plugin/prometheus/PrometheusExporterPlugin.java index e3f1c74..ea804a1 100644 --- a/src/main/java/org/opensearch/plugin/prometheus/PrometheusExporterPlugin.java +++ b/src/main/java/org/opensearch/plugin/prometheus/PrometheusExporterPlugin.java @@ -73,6 +73,8 @@ public List> getSettings() { PrometheusSettings.PROMETHEUS_CLUSTER_SETTINGS, PrometheusSettings.PROMETHEUS_INDICES, PrometheusSettings.PROMETHEUS_NODES_FILTER, + PrometheusSettings.PROMETHEUS_SELECTED_INDICES, + PrometheusSettings.PROMETHEUS_SELECTED_OPTION, RestPrometheusMetricsAction.METRIC_PREFIX ); return Collections.unmodifiableList(settings); diff --git a/src/yamlRestTest/resources/rest-api-spec/test/60_10_indices_filter.yml b/src/yamlRestTest/resources/rest-api-spec/test/60_10_indices_filter.yml new file mode 100644 index 0000000..097f6aa --- /dev/null +++ b/src/yamlRestTest/resources/rest-api-spec/test/60_10_indices_filter.yml @@ -0,0 +1,259 @@ +--- +"Indices filter": + + # Make sure indices filter setting is in the default state + - do: + cluster.get_settings: + include_defaults: false + + - match: {persistent: {}} + - match: {transient: {}} + + - do: + cluster.get_settings: + include_defaults: true + filter_path: defaults.prometheus + + - match: {defaults.prometheus.indices_filter.selected_indices: ""} + - match: {defaults.prometheus.indices_filter.selected_option: "STRICT_EXPAND_OPEN_FORBID_CLOSED"} + + # Create 3 indices + - do: + index: + index: log-a-test + id: 1 + body: { foo: bar } + + - do: + index: + index: log-b-test + id: 2 + body: { foo: bar } + + - do: + index: + index: log-c-test + id: 3 + body: { foo: bar } + + # Should have metrics for all indices + - do: + prometheus.metrics: {} + + - match: + $body: | + /.* + (opensearch_index_status\{ + cluster="yamlRestTest", + index="(log-a-test|log-b-test|log-c-test)", + \} \s+ \d+\.\d+ \n?){3} + .*/ + + # Change selected_indices to "log-a-*" + - do: + cluster.put_settings: + body: + persistent: + prometheus.indices_filter.selected_indices: "log-a-*" + flat_settings: true + + - match: {persistent: {prometheus.indices_filter.selected_indices: "log-a-*"}} + + # Should have metrics for index log-a-test only, no metrics for others + - do: + prometheus.metrics: {} + + - match: + $body: | + /.* + opensearch_index_status\{ + cluster="yamlRestTest", + index="(?=log-a-test)(?!(log-b-test|log-c-test))(.*)", + \} \s+ \d+\.\d+ \n? + .*/ + + # Change selected_indices to "*b-*,log*c-test" + - do: + cluster.put_settings: + body: + persistent: + prometheus.indices_filter.selected_indices: "*b-*,log*c-test" + flat_settings: true + + - match: {persistent: {prometheus.indices_filter.selected_indices: "*b-*,log*c-test"}} + + # Should have metrics for indices log-b-test and log-c-test, no metrics for index log-a-test + - do: + prometheus.metrics: {} + + - match: + $body: | + /.* + (opensearch_index_status\{ + cluster="yamlRestTest", + index="(?=(log-b-test|log-c-test))(?!log-a-test)(.*)", + \} \s+ \d+\.\d+ \n?){2} + .*/ + + # Change selected_indices to "*" + - do: + cluster.put_settings: + body: + persistent: + prometheus.indices_filter.selected_indices: "*" + flat_settings: true + + - match: {persistent: {prometheus.indices_filter.selected_indices: "*"}} + + # Should have metrics for all indices + - do: + prometheus.metrics: {} + + - match: + $body: | + /.* + (opensearch_index_status\{ + cluster="yamlRestTest", + index="(log-a-test|log-b-test|log-c-test)", + \} \s+ \d+\.\d+ \n?){3} + .*/ + + # Change selected_indices to "_all" + - do: + cluster.put_settings: + body: + persistent: + prometheus.indices_filter.selected_indices: "_all" + flat_settings: true + + - match: {persistent: {prometheus.indices_filter.selected_indices: "_all"}} + + # Should have metrics for all indices + - do: + prometheus.metrics: {} + + - match: + $body: | + /.* + (opensearch_index_status\{ + cluster="yamlRestTest", + index="(log-a-test|log-b-test|log-c-test)", + \} \s+ \d+\.\d+ \n?){3} + .*/ + + # Change selected_indices to null + - do: + cluster.put_settings: + body: + persistent: + prometheus.indices_filter.selected_indices: null + flat_settings: true + + - match: {persistent: {}} + + # Should have metrics for all indices + - do: + prometheus.metrics: {} + + - match: + $body: | + /.* + (opensearch_index_status\{ + cluster="yamlRestTest", + index="(log-a-test|log-b-test|log-c-test)", + \} \s+ \d+\.\d+ \n?){3} + .*/ + + # Change selected_indices to "log*,test" + - do: + cluster.put_settings: + body: + persistent: + prometheus.indices_filter.selected_indices: "log*,test" + flat_settings: true + + - match: {persistent: {prometheus.indices_filter.selected_indices: "log*,test"}} + + # Should have errors + - do: + catch: request + prometheus.metrics: {} + + - match: {status: 500} + - match: {error.type: "exception"} + - match: {error.reason: "Indices stats request failed"} + - match: {error.caused_by.type: "index_not_found_exception"} + - match: {error.caused_by.reason: "no such index [test]"} + + # Change selected_option to "LENIENT_EXPAND_OPEN" + - do: + cluster.put_settings: + body: + persistent: + prometheus.indices_filter.selected_option: "LENIENT_EXPAND_OPEN" + flat_settings: true + + - match: {persistent: {prometheus.indices_filter.selected_option: "LENIENT_EXPAND_OPEN"}} + + # Should have metrics for indices log* + - do: + prometheus.metrics: {} + + - match: + $body: | + /.* + (opensearch_index_status\{ + cluster="yamlRestTest", + index="(log-a-test|log-b-test|log-c-test)", + \} \s+ \d+\.\d+ \n?){3} + .*/ + + # Change selected_indices to "test" + - do: + cluster.put_settings: + body: + persistent: + prometheus.indices_filter.selected_indices: "test" + flat_settings: true + + - match: {persistent: {prometheus.indices_filter.selected_indices: "test"}} + + # Should no metrics for index test + - do: + prometheus.metrics: {} + + - match: + $body: | + /.* + \# \s HELP \s opensearch_index_status (\s|\w|\d)+ \n + \# \s TYPE \s opensearch_index_status \s gauge \n + (?!opensearch_index_status) + .*/ + + # Change selected_option to "TEST" + - do: + catch: bad_request + cluster.put_settings: + body: + persistent: + prometheus.indices_filter.selected_option: "TEST" + flat_settings: true + + - match: {status: 400} + - match: {error.type: "illegal_argument_exception"} + - match: {error.reason: "No enum constant org.compuscene.metrics.prometheus.PrometheusSettings.INDEX_FILTER_OPTIONS.TEST"} + + # Unexpected input values + - do: + catch: request + cluster.put_settings: + body: + persistent: + prometheus.indices_filter.selected_indices: [ "", null, 10 ] + flat_settings: true + + - match: {status: 500} + - match: {error.type: "settings_exception"} + - match: {error.reason: "Failed to load settings from [{\"prometheus.indices_filter.selected_indices\":[\"\",null,10]}]"} + - match: {error.caused_by.type: "illegal_state_exception"} + - match: {error.caused_by.reason: "only value lists are allowed in serialized settings"} From cbe7d6700040933e147d26dd36065338686afb07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Tue, 23 May 2023 16:11:24 +0200 Subject: [PATCH 22/36] Release 1.3.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- README.md | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 5db5ae0..a0adc05 100644 --- a/README.md +++ b/README.md @@ -38,19 +38,20 @@ This plugin was started as a fork of [Prometheus exporter for Elasticsearch®](h ## Compatibility Matrix -| OpenSearch | Plugin | Release date | -|-----------:|--------:|-------------:| -| 1.3.9 | 1.3.9.0 | Mar 20, 2023 | -| 1.3.8 | 1.3.8.0 | Mar 03, 2023 | -| 1.3.7 | 1.3.7.0 | Dec 19, 2022 | -| 1.3.6 | 1.3.6.0 | Oct 10, 2022 | -| 1.3.5 | 1.3.5.0 | Sep 05, 2022 | -| 1.3.4 | 1.3.4.0 | Jul 15, 2022 | -| 1.3.3 | 1.3.3.0 | Jun 15, 2022 | -| 1.3.2 | 1.3.2.0 | May 10, 2022 | -| 1.3.1 | 1.3.1.0 | Apr 08, 2022 | -| 1.3.0 | 1.3.0.0 | Mar 22, 2022 | -| <= 1.2.4 | (*) | (*) | +| OpenSearch | Plugin | Release date | +|-----------:|---------:|-------------:| +| 1.3.10 | 1.3.10.0 | May 23, 2023 | +| 1.3.9 | 1.3.9.0 | Mar 20, 2023 | +| 1.3.8 | 1.3.8.0 | Mar 03, 2023 | +| 1.3.7 | 1.3.7.0 | Dec 19, 2022 | +| 1.3.6 | 1.3.6.0 | Oct 10, 2022 | +| 1.3.5 | 1.3.5.0 | Sep 05, 2022 | +| 1.3.4 | 1.3.4.0 | Jul 15, 2022 | +| 1.3.3 | 1.3.3.0 | Jun 15, 2022 | +| 1.3.2 | 1.3.2.0 | May 10, 2022 | +| 1.3.1 | 1.3.1.0 | Apr 08, 2022 | +| 1.3.0 | 1.3.0.0 | Mar 22, 2022 | +| <= 1.2.4 | (*) | (*) | _(*) If you are looking for plugin releases supporting earlier (`<= 1.2.4`) OpenSearch versions please visit ._ @@ -61,7 +62,7 @@ You need to install the plugin on every OpenSearch node that will be scraped by To **install** the plugin: -`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.9.0/prometheus-exporter-1.3.9.0.zip` +`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.10.0/prometheus-exporter-1.3.10.0.zip` To **remove** the plugin. From 743dce48df18d6ae134a64ac80ac76435a00774a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Thu, 6 Jul 2023 11:21:59 +0200 Subject: [PATCH 23/36] Upgrade to OpenSearch 1.3.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #193 Signed-off-by: Lukáš Vlček --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 207649c..570f838 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ #group = org.opensearch.plugin.prometheus -version = 1.3.10.0 +version = 1.3.11.0 pluginName = prometheus-exporter pluginClassname = org.opensearch.plugin.prometheus.PrometheusExporterPlugin From 6000136e0612698fa7f3b5fb71f71ebf67aa837c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Thu, 6 Jul 2023 11:52:45 +0200 Subject: [PATCH 24/36] Release 1.3.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a0adc05..8a98ceb 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ This plugin was started as a fork of [Prometheus exporter for Elasticsearch®](h | OpenSearch | Plugin | Release date | |-----------:|---------:|-------------:| +| 1.3.11 | 1.3.11.0 | Jul 06, 2023 | | 1.3.10 | 1.3.10.0 | May 23, 2023 | | 1.3.9 | 1.3.9.0 | Mar 20, 2023 | | 1.3.8 | 1.3.8.0 | Mar 03, 2023 | @@ -62,7 +63,7 @@ You need to install the plugin on every OpenSearch node that will be scraped by To **install** the plugin: -`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.10.0/prometheus-exporter-1.3.10.0.zip` +`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.11.0/prometheus-exporter-1.3.11.0.zip` To **remove** the plugin. From 432bdefce7a46253535247e8fc324de64f00c9c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Wed, 19 Jul 2023 16:57:18 +0200 Subject: [PATCH 25/36] Fix a long form DCO commit example MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport of #200 Signed-off-by: Lukáš Vlček --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4f92835..ab5ebf6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -84,7 +84,7 @@ Each commit must include a DCO which looks like this Signed-off-by: Jane Smith ``` -You may type this line on your own when writing your commit messages. However, if your user.name and user.email are set in your git configs, you can use `-s` or `– – signoff` to add the `Signed-off-by` line to the end of the commit message. +You may type this line on your own when writing your commit messages. However, if your user.name and user.email are set in your git configs, you can use `-s` or `--signoff` to add the `Signed-off-by` line to the end of the commit message. ## Finding contributions to work on Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any 'help wanted' issues is a great place to start. From c1b00be9dc587bc59178f0353de7b040ad0569eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Wed, 30 Aug 2023 16:43:26 +0200 Subject: [PATCH 26/36] Upgrade to OpenSearch 1.3.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #214 Signed-off-by: Lukáš Vlček --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 570f838..dd024c2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ #group = org.opensearch.plugin.prometheus -version = 1.3.11.0 +version = 1.3.12.0 pluginName = prometheus-exporter pluginClassname = org.opensearch.plugin.prometheus.PrometheusExporterPlugin From 6eea0236ebcb0a78a77e03ce060f65261b8bbaa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Thu, 31 Aug 2023 15:51:11 +0200 Subject: [PATCH 27/36] Release 1.3.12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8a98ceb..777f34e 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ This plugin was started as a fork of [Prometheus exporter for Elasticsearch®](h | OpenSearch | Plugin | Release date | |-----------:|---------:|-------------:| +| 1.3.12 | 1.3.12.0 | Aug 31, 2023 | | 1.3.11 | 1.3.11.0 | Jul 06, 2023 | | 1.3.10 | 1.3.10.0 | May 23, 2023 | | 1.3.9 | 1.3.9.0 | Mar 20, 2023 | @@ -63,7 +64,7 @@ You need to install the plugin on every OpenSearch node that will be scraped by To **install** the plugin: -`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.11.0/prometheus-exporter-1.3.11.0.zip` +`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.12.0/prometheus-exporter-1.3.12.0.zip` To **remove** the plugin. From 0d542409d7617223982270e48b146bc8c9ee3895 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 06:55:48 +0000 Subject: [PATCH 28/36] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 67a8b64..dc2d055 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -19,7 +19,7 @@ jobs: contents: read steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v3 with: From 13558b246f0859821810b36f097502b4395a0f1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Wed, 27 Sep 2023 14:32:22 +0200 Subject: [PATCH 29/36] Upgrade to OpenSearch 1.3.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #225 Signed-off-by: Lukáš Vlček --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index dd024c2..b9629d2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ #group = org.opensearch.plugin.prometheus -version = 1.3.12.0 +version = 1.3.13.0 pluginName = prometheus-exporter pluginClassname = org.opensearch.plugin.prometheus.PrometheusExporterPlugin From 526c4eb3e1055b30d8b85fbd2ed492ca6206baff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Wed, 27 Sep 2023 14:46:40 +0200 Subject: [PATCH 30/36] Release 1.3.13.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 777f34e..3b592e8 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ This plugin was started as a fork of [Prometheus exporter for Elasticsearch®](h | OpenSearch | Plugin | Release date | |-----------:|---------:|-------------:| +| 1.3.13 | 1.3.13.0 | Sep 27, 2023 | | 1.3.12 | 1.3.12.0 | Aug 31, 2023 | | 1.3.11 | 1.3.11.0 | Jul 06, 2023 | | 1.3.10 | 1.3.10.0 | May 23, 2023 | @@ -64,7 +65,7 @@ You need to install the plugin on every OpenSearch node that will be scraped by To **install** the plugin: -`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.12.0/prometheus-exporter-1.3.12.0.zip` +`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.13.0/prometheus-exporter-1.3.13.0.zip` To **remove** the plugin. From 300216850eaaf08a77ea0a31509c130c0748cb38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 06:22:21 +0000 Subject: [PATCH 31/36] Bump actions/setup-java from 3 to 4 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index dc2d055..887b209 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: "adopt" java-version: ${{ matrix.java }} From d544f53bea96ed154525346d31ec4b90d485af62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Wed, 20 Dec 2023 22:23:39 +0100 Subject: [PATCH 32/36] Upgrade to OpenSearch 1.3.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b9629d2..d731037 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ #group = org.opensearch.plugin.prometheus -version = 1.3.13.0 +version = 1.3.14.0 pluginName = prometheus-exporter pluginClassname = org.opensearch.plugin.prometheus.PrometheusExporterPlugin From 4700520bf5e9049b2f494e3e23bc3895b9535d71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Wed, 20 Dec 2023 22:40:44 +0100 Subject: [PATCH 33/36] Release 1.3.14.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3b592e8..d663658 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ This plugin was started as a fork of [Prometheus exporter for Elasticsearch®](h | OpenSearch | Plugin | Release date | |-----------:|---------:|-------------:| +| 1.3.14 | 1.3.14.0 | Dec 20, 2023 | | 1.3.13 | 1.3.13.0 | Sep 27, 2023 | | 1.3.12 | 1.3.12.0 | Aug 31, 2023 | | 1.3.11 | 1.3.11.0 | Jul 06, 2023 | @@ -65,7 +66,7 @@ You need to install the plugin on every OpenSearch node that will be scraped by To **install** the plugin: -`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.13.0/prometheus-exporter-1.3.13.0.zip` +`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.14.0/prometheus-exporter-1.3.14.0.zip` To **remove** the plugin. From 92844a1dacc51c7f5f374e4980ab8a55644791d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 07:00:13 +0000 Subject: [PATCH 34/36] Bump tim-actions/get-pr-commits from 1.3.0 to 1.3.1 Bumps [tim-actions/get-pr-commits](https://github.com/tim-actions/get-pr-commits) from 1.3.0 to 1.3.1. - [Release notes](https://github.com/tim-actions/get-pr-commits/releases) - [Commits](https://github.com/tim-actions/get-pr-commits/compare/v1.3.0...v1.3.1) --- updated-dependencies: - dependency-name: tim-actions/get-pr-commits dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dco.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml index 6ea5b67..fc2044e 100644 --- a/.github/workflows/dco.yml +++ b/.github/workflows/dco.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Get PR Commits id: 'get-pr-commits' - uses: tim-actions/get-pr-commits@v1.3.0 + uses: tim-actions/get-pr-commits@v1.3.1 with: token: ${{ secrets.GITHUB_TOKEN }} - name: DCO Check From 9825612954a5943d00bcbf83e91c345f8524b966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Fri, 5 Apr 2024 14:46:00 +0200 Subject: [PATCH 35/36] Upgrade to OpenSearch 1.3.15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d731037..4d52188 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ #group = org.opensearch.plugin.prometheus -version = 1.3.14.0 +version = 1.3.15.0 pluginName = prometheus-exporter pluginClassname = org.opensearch.plugin.prometheus.PrometheusExporterPlugin From b2394eb041475a816a02798a58d527caf0b15959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Vl=C4=8Dek?= Date: Fri, 5 Apr 2024 15:02:25 +0200 Subject: [PATCH 36/36] Release 1.3.15.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukáš Vlček --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d663658..3187c75 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ This plugin was started as a fork of [Prometheus exporter for Elasticsearch®](h | OpenSearch | Plugin | Release date | |-----------:|---------:|-------------:| +| 1.3.15 | 1.3.15.0 | Apr 05, 2024 | | 1.3.14 | 1.3.14.0 | Dec 20, 2023 | | 1.3.13 | 1.3.13.0 | Sep 27, 2023 | | 1.3.12 | 1.3.12.0 | Aug 31, 2023 | @@ -66,7 +67,7 @@ You need to install the plugin on every OpenSearch node that will be scraped by To **install** the plugin: -`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.14.0/prometheus-exporter-1.3.14.0.zip` +`./bin/opensearch-plugin install https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/1.3.15.0/prometheus-exporter-1.3.15.0.zip` To **remove** the plugin.