From f13ca857988efd87c189ff453bb365bde79a5d0d Mon Sep 17 00:00:00 2001 From: Jessica He Date: Thu, 14 Nov 2024 16:23:32 -0500 Subject: [PATCH 1/2] add support for exposing OpenTelemetry metrics Signed-off-by: Jessica He --- charts/backstage/Chart.yaml | 2 +- charts/backstage/README.md | 2 +- charts/backstage/values.schema.json | 10 ++++++++-- charts/backstage/values.yaml | 14 ++++++++++++-- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/charts/backstage/Chart.yaml b/charts/backstage/Chart.yaml index 3c125867..d1c3bb83 100644 --- a/charts/backstage/Chart.yaml +++ b/charts/backstage/Chart.yaml @@ -45,4 +45,4 @@ sources: # 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.21.0 +version: 2.22.0 diff --git a/charts/backstage/README.md b/charts/backstage/README.md index 8e4bd62c..826dcc30 100644 --- a/charts/backstage/README.md +++ b/charts/backstage/README.md @@ -2,7 +2,7 @@ # RHDH Backstage Helm Chart for OpenShift (Community Version) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/rhdh-chart&style=flat-square)](https://artifacthub.io/packages/search?repo=rhdh-chart) -![Version: 2.21.0](https://img.shields.io/badge/Version-2.21.0-informational?style=flat-square) +![Version: 2.22.0](https://img.shields.io/badge/Version-2.22.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) A Helm chart for deploying Red Hat Developer Hub. diff --git a/charts/backstage/values.schema.json b/charts/backstage/values.schema.json index 22f97a0c..60ca828e 100644 --- a/charts/backstage/values.schema.json +++ b/charts/backstage/values.schema.json @@ -6613,7 +6613,7 @@ "type": "integer" } ], - "default": "http-backend", + "default": "http-metrics", "description": "The port where the metrics are exposed. If using OpenTelemetry as [documented here](https://backstage.io/docs/tutorials/setup-opentelemetry/), then the port needs to be explicitely specificed. OpenTelemetry's default port is 9464.", "title": "ServiceMonitor endpoint port" } @@ -7221,7 +7221,13 @@ "type": "string" }, "extraPorts": { - "default": [], + "default": [ + { + "name": "http-metrics", + "port": 9464, + "targetPort": 9464 + } + ], "items": { "type": "object" }, diff --git a/charts/backstage/values.yaml b/charts/backstage/values.yaml index 62ef72ea..4e8420e9 100644 --- a/charts/backstage/values.yaml +++ b/charts/backstage/values.yaml @@ -206,6 +206,13 @@ upstream: checksum/dynamic-plugins: >- {{- include "common.tplvalues.render" ( dict "value" .Values.global.dynamic "context" $) | sha256sum }} + ingress: + host: "{{ .Values.global.host }}" + metrics: + serviceMonitor: + enabled: false + path: /metrics + port: http-metrics postgresql: enabled: true postgresqlDataDir: /var/lib/pgsql/data/userdata @@ -241,8 +248,11 @@ upstream: secretKeyRef: key: postgres-password name: '{{- include "postgresql.v1.secretName" . }}' - ingress: - host: "{{ .Values.global.host }}" + service: + extraPorts: + - name: http-metrics + port: 9464 + targetPort: 9464 # -- OpenShift Route parameters route: From 48c60a9e330150d79f2023b34ed626f9b4d0075a Mon Sep 17 00:00:00 2001 From: Corey Daley Date: Fri, 15 Nov 2024 19:53:06 -0500 Subject: [PATCH 2/2] Bump helm chart version --- charts/backstage/Chart.yaml | 2 +- charts/backstage/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/backstage/Chart.yaml b/charts/backstage/Chart.yaml index d1c3bb83..e9e9cb10 100644 --- a/charts/backstage/Chart.yaml +++ b/charts/backstage/Chart.yaml @@ -45,4 +45,4 @@ sources: # 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.22.0 +version: 2.23.0 diff --git a/charts/backstage/README.md b/charts/backstage/README.md index 826dcc30..2aadf713 100644 --- a/charts/backstage/README.md +++ b/charts/backstage/README.md @@ -2,7 +2,7 @@ # RHDH Backstage Helm Chart for OpenShift (Community Version) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/rhdh-chart&style=flat-square)](https://artifacthub.io/packages/search?repo=rhdh-chart) -![Version: 2.22.0](https://img.shields.io/badge/Version-2.22.0-informational?style=flat-square) +![Version: 2.23.0](https://img.shields.io/badge/Version-2.23.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) A Helm chart for deploying Red Hat Developer Hub.