[sophora-ugc] [sophora-ugc-proxy] add ServiceMonitors - #304
Conversation
There was a problem hiding this comment.
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
serviceMonitorvalues and newServiceMonitortemplates for UGC, UGC multimedia, and UGC proxy. - Name Service ports
httpsoServiceMonitor.spec.endpoints[].port: httpresolves 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. |
…djustable per service
|
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: 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. |
# Conflicts: # charts/sophora-ugc-proxy/Chart.yaml
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>
Co-authored-by: Jonas Pruditsch <6641029+kunstkomputer@users.noreply.github.com>
No description provided.