Skip to content

Add ability to template ServiceMonitor labels and add metrics port to Service (#192 & #121) #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jfcmartins wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Add ability to template ServiceMonitor labels and add metrics port to Service (#192 & #121) #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6f323b
Add ability to template ServiceMonitor labels and add metrics port to…
jfcmartins Dec 13, 2023
74eedd3
Merge branch 'main' into 192-121-metrics-support
jfcmartins Nov 1, 2025
e5b2da1
Update Statefulset containerport with prom monitor port env var
jfcmartins Nov 1, 2025
e1bc492
Fix Helm indentation
jfcmartins Nov 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion weaviate/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,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: 17.6.1
version: 17.7.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
Expand Down
7 changes: 6 additions & 1 deletion weaviate/templates/weaviateService.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,13 @@ spec:
ports:
{{- range .Values.service.ports }}
- {{ toYaml . | indent 6 | trim }}
targetPort: 8080
{{- end }}
{{- if .Values.serviceMonitor.enabled }}
- name: metrics
protocol: TCP
port: {{ .Values.env.PROMETHEUS_MONITORING_PORT }}
targetPort: {{ .Values.env.PROMETHEUS_MONITORING_PORT }}
Comment thread
jfcmartins marked this conversation as resolved.
{{ end }}
{{ if eq .Values.service.type "ClusterIP" -}}
{{ if .Values.service.clusterIP }}
clusterIP: {{ .Values.service.clusterIP }}
Expand Down
3 changes: 3 additions & 0 deletions weaviate/templates/weaviateServiceMonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ metadata:
app: weaviate
app.kubernetes.io/name: weaviate
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.serviceMonitor.additionalLabels }}
{{- toYaml .Values.serviceMonitor.additionalLabels | nindent 4 }}
{{- end }}
spec:
jobLabel: weaviate
selector:
Expand Down
2 changes: 1 addition & 1 deletion weaviate/templates/weaviateStatefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ spec:
- containerPort: 8080
{{- if .Values.env.PROMETHEUS_MONITORING_ENABLED }}
- name: metrics
containerPort: 2112
containerPort: {{ .Values.env.PROMETHEUS_MONITORING_PORT }}
protocol: TCP
{{- end }}
{{ if .Values.grpcService.enabled }}
Expand Down
4 changes: 3 additions & 1 deletion weaviate/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ service:
- name: http
protocol: TCP
port: 80
# Target port is going to be the same for every port
targetPort: 8080
type: LoadBalancer
loadBalancerSourceRanges: []
# optionally set cluster IP if you want to set a static IP
Expand Down Expand Up @@ -168,6 +168,7 @@ serviceMonitor:
enabled: false
interval: 30s
scrapeTimeout: 10s
additionalLabels: {}

# Adjust liveness, readiness and startup probes configuration
# below is an example that can be used to switch the probeType to exec command
Expand Down Expand Up @@ -320,6 +321,7 @@ env:
# Expose metrics on port 2112 for Prometheus to scrape
PROMETHEUS_MONITORING_ENABLED: false
PROMETHEUS_MONITORING_GROUP: false
PROMETHEUS_MONITORING_PORT: 2112

# Set a MEM limit for the Weaviate Pod so it can help you both increase GC-related
# performance as well as avoid GC-related out-of-memory (“OOM”) situations
Expand Down