From 25896e6218e426751c1c463cec7639f654d58062 Mon Sep 17 00:00:00 2001 From: Toni Tauro Date: Tue, 10 Sep 2024 15:20:33 +0200 Subject: [PATCH 1/4] fix(chart/opensearch): metricsPort and plugins usage info in values.yaml Signed-off-by: Toni Tauro --- charts/opensearch/Chart.yaml | 2 +- charts/opensearch/values.yaml | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml index a5bce599..7014841b 100644 --- a/charts/opensearch/Chart.yaml +++ b/charts/opensearch/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.27.1 +version: 2.28.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/opensearch/values.yaml b/charts/opensearch/values.yaml index 8e5c6eaf..127d8b16 100644 --- a/charts/opensearch/values.yaml +++ b/charts/opensearch/values.yaml @@ -281,7 +281,7 @@ enableServiceLinks: true protocol: https httpPort: 9200 transportPort: 9300 -metricsPort: 9600 +metricsPort: 9200 httpHostPort: "" transportHostPort: "" @@ -534,6 +534,12 @@ extraObjects: [] # ServiceMonitor Configuration for Prometheus # Enabling this option will create a ServiceMonitor resource that allows Prometheus to scrape metrics from the OpenSearch service. +# This only creates the serviceMonitor, to actually have metrics Make sure to install the prometheus-exporter plugin needed for +# serving metrics over the `.Values.plugins` value: +# plugins: +# enabled: true +# installList: +# - https://github.com/aiven/prometheus-exporter-plugin-for-opensearch/releases/download/x.x.x.x/prometheus-exporter-x.x.x.x.zip serviceMonitor: # Set to true to enable the ServiceMonitor resource enabled: false From f3409a48ebc69e87913f687b9dcff1f7564215c8 Mon Sep 17 00:00:00 2001 From: Toni Tauro Date: Fri, 13 Dec 2024 16:12:00 +0100 Subject: [PATCH 2/4] fix(metricsPort): use httpPort for metrics, as they are reachable over 9200 if prom-exporter is used Signed-off-by: Toni Tauro --- charts/opensearch/templates/serviceMonitor.yaml | 2 +- charts/opensearch/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/opensearch/templates/serviceMonitor.yaml b/charts/opensearch/templates/serviceMonitor.yaml index 79837932..f4bd8418 100644 --- a/charts/opensearch/templates/serviceMonitor.yaml +++ b/charts/opensearch/templates/serviceMonitor.yaml @@ -14,7 +14,7 @@ spec: matchLabels: {{- include "opensearch.selectorLabels" . | nindent 6 }} endpoints: - - port: {{ .Values.service.metricsPortName | default "metrics" }} + - port: {{ .Values.service.httpPortName | default "http" }} interval: {{ .Values.serviceMonitor.interval }} path: {{ .Values.serviceMonitor.path }} {{- end }} diff --git a/charts/opensearch/values.yaml b/charts/opensearch/values.yaml index 127d8b16..dc2fb393 100644 --- a/charts/opensearch/values.yaml +++ b/charts/opensearch/values.yaml @@ -281,7 +281,7 @@ enableServiceLinks: true protocol: https httpPort: 9200 transportPort: 9300 -metricsPort: 9200 +metricsPort: 9600 httpHostPort: "" transportHostPort: "" From 1d4eef52e7edf840b853d7f3990961801c46d37e Mon Sep 17 00:00:00 2001 From: Toni Tauro Date: Fri, 13 Dec 2024 16:15:45 +0100 Subject: [PATCH 3/4] fix(values): trailing spaces Signed-off-by: Toni Tauro --- charts/opensearch/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/opensearch/values.yaml b/charts/opensearch/values.yaml index dc2fb393..e305c4e4 100644 --- a/charts/opensearch/values.yaml +++ b/charts/opensearch/values.yaml @@ -534,7 +534,7 @@ extraObjects: [] # ServiceMonitor Configuration for Prometheus # Enabling this option will create a ServiceMonitor resource that allows Prometheus to scrape metrics from the OpenSearch service. -# This only creates the serviceMonitor, to actually have metrics Make sure to install the prometheus-exporter plugin needed for +# This only creates the serviceMonitor, to actually have metrics Make sure to install the prometheus-exporter plugin needed for # serving metrics over the `.Values.plugins` value: # plugins: # enabled: true From baea0a76fd5a0bd99b9080f5485bc02f4a52628e Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Mon, 16 Dec 2024 14:08:32 -0500 Subject: [PATCH 4/4] Update version changelog Signed-off-by: Peter Zhu --- charts/opensearch/CHANGELOG.md | 12 +++++++++++- charts/opensearch/Chart.yaml | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/charts/opensearch/CHANGELOG.md b/charts/opensearch/CHANGELOG.md index 5234649b..cb6b3c5b 100644 --- a/charts/opensearch/CHANGELOG.md +++ b/charts/opensearch/CHANGELOG.md @@ -14,6 +14,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### Security --- +## [2.28.0] +### Added +### Changed +### Deprecated +### Removed +### Fixed +- Fix metricsPort and plugins usage info in values.yaml +### Security +--- ## [2.27.1] ### Added ### Changed @@ -530,7 +539,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### Security -[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.27.1...HEAD +[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.28.0...HEAD +[2.28.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.27.1...opensearch-2.28.0 [2.27.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.27.0...opensearch-2.27.1 [2.27.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.26.1...opensearch-2.27.0 [2.26.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.26.0...opensearch-2.26.1 diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml index 7014841b..8df4f194 100644 --- a/charts/opensearch/Chart.yaml +++ b/charts/opensearch/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.28.1 +version: 2.28.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to