Skip to content

[sophora-ugc] [sophora-ugc-proxy] add ServiceMonitors - #304

Merged
js-sub merged 21 commits into
mainfrom
SUCI-615-add-prometheus-to-UGC
Aug 20, 2026
Merged

[sophora-ugc] [sophora-ugc-proxy] add ServiceMonitors#304
js-sub merged 21 commits into
mainfrom
SUCI-615-add-prometheus-to-UGC

Conversation

@mlautzas

@mlautzas mlautzas commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

No description provided.

DanielRaapDev
DanielRaapDev previously approved these changes Aug 7, 2026

@DanielRaapDev DanielRaapDev left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Adds optional Prometheus Operator ServiceMonitor resources to the sophora-ugc and sophora-ugc-proxy Helm charts, including wiring Service port names so the monitors can target the correct port.

Changes:

  • Add configurable serviceMonitor values and new ServiceMonitor templates for UGC, UGC multimedia, and UGC proxy.
  • Name Service ports http so ServiceMonitor.spec.endpoints[].port: http resolves correctly.
  • Bump chart versions and update Artifact Hub change annotations.

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
charts/sophora-ugc/values.yaml Adds ugc.serviceMonitor and ugcMultimedia.serviceMonitor configuration defaults.
charts/sophora-ugc/templates/webapp-service.yaml Names the Service port http for ServiceMonitor compatibility.
charts/sophora-ugc/templates/servicemonitor.yaml New ServiceMonitor for UGC webapp metrics scraping.
charts/sophora-ugc/templates/ugc-multimedia/multimedia-service.yaml Names the multimedia Service port http for ServiceMonitor compatibility.
charts/sophora-ugc/templates/ugc-multimedia/servicemonitor.yaml New ServiceMonitor for UGC multimedia metrics scraping.
charts/sophora-ugc/templates/deployment.yaml Renames container port 1694 from jolokia to management.
charts/sophora-ugc/Chart.yaml Bumps chart version and updates Artifact Hub changelog.
charts/sophora-ugc-proxy/values.yaml Adds top-level serviceMonitor configuration defaults.
charts/sophora-ugc-proxy/templates/service.yaml Names the Service port http for ServiceMonitor compatibility.
charts/sophora-ugc-proxy/templates/servicemonitor.yaml New ServiceMonitor for UGC proxy metrics scraping.
charts/sophora-ugc-proxy/Chart.yaml Bumps chart version and updates Artifact Hub changelog.

Comment thread charts/sophora-ugc/templates/deployment.yaml
Comment thread charts/sophora-ugc/templates/servicemonitor.yaml
Comment thread charts/sophora-ugc/templates/ugc-multimedia/servicemonitor.yaml Outdated
@kunstkomputer

Copy link
Copy Markdown
Contributor

as this is outside this PR's scope I mention it separately:

Before the next release, please refactor the Helm chart templates as in: prefix template filenames with their Kubernetes resource type instead of suffixing them.

Examples:

.../templates/management-service.yaml ‭»    .../templates/service-management.yaml
.../templates/webapp-service.yaml ‭»        .../templates/service-webapp.yaml
.../templates/ugc-multimedia-config.yaml » .../templates/configmap-ugc-multimedia.yaml

This also applies to all template files (including webapp-service, multimedia-service, logback-configmap, and logback-multimedia-configmap).

Goal: Keeps templates naturally grouped and sorted by Kubernetes resource type when browsing the directory on ArtifactHub or here.

@kunstkomputer
kunstkomputer marked this pull request as ready for review August 14, 2026 13:42
# Conflicts:
#	charts/sophora-ugc-proxy/Chart.yaml
Comment thread charts/sophora-ugc/values.yaml
Comment thread charts/sophora-ugc/values.yaml
DanielRaapDev
DanielRaapDev previously approved these changes Aug 19, 2026
Comment thread charts/sophora-ugc/values.yaml Outdated
Comment thread charts/sophora-ugc/values.yaml Outdated
Comment thread charts/sophora-ugc/values.yaml Outdated
Comment thread charts/sophora-ugc/values.yaml Outdated
Co-authored-by: Jonas Pruditsch <6641029+kunstkomputer@users.noreply.github.com>
js-sub and others added 3 commits August 20, 2026 10:51
Co-authored-by: Jonas Pruditsch <6641029+kunstkomputer@users.noreply.github.com>
Co-authored-by: Jonas Pruditsch <6641029+kunstkomputer@users.noreply.github.com>
Co-authored-by: Jonas Pruditsch <6641029+kunstkomputer@users.noreply.github.com>
@js-sub
js-sub merged commit 83dec36 into main Aug 20, 2026
2 checks passed
@js-sub
js-sub deleted the SUCI-615-add-prometheus-to-UGC branch August 20, 2026 08:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

5 participants