Skip to content
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

Jump to bottom

fix(CSI-241): conflict in metrics between node and controller #325

Merged
merged 1 commit into from
Sep 12, 2024
Merged

fix(CSI-241): conflict in metrics between node and controller #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions charts/csi-wekafsplugin/templates/controllerserver-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
annotations:
prometheus.io/scrape: 'true'
prometheus.io/path: '/metrics'
prometheus.io/port: '{{ .Values.metrics.port | default 9090 }}'
prometheus.io/port: '{{ .Values.metrics.controllerPort | default 9090 }},{{ .Values.metrics.provisionerPort | default 9091 }},{{ .Values.metrics.resizerPort | default 9092 }},{{ .Values.metrics.snapshotterPort | default 9093 }}'
{{- end }}
spec:
{{- if .Values.nodeSelector }}
Expand Down Expand Up @@ -192,7 +192,7 @@ spec:
{{- end }}
{{- if .Values.metrics.enabled }}
- "--enablemetrics"
- "--metricsport={{ .Values.metrics.port | default 9090 }}"
- "--metricsport={{ .Values.metrics.controllerPort | default 9090 }}"
{{- end }}
{{- if .Values.pluginConfig.allowInsecureHttps }}
- "--allowinsecurehttps"
Expand Down Expand Up @@ -229,7 +229,7 @@ spec:
name: healthz
protocol: TCP
{{- if .Values.metrics.enabled }}
- containerPort: {{ .Values.metrics.port }}
- containerPort: {{ .Values.metrics.controllerPort | default 9090 }}
name: metrics
protocol: TCP
{{- end }}
Expand Down
6 changes: 3 additions & 3 deletions charts/csi-wekafsplugin/templates/nodeserver-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
annotations:
prometheus.io/scrape: 'true'
prometheus.io/path: '/metrics'
prometheus.io/port: '{{ .Values.metrics.port | default 9090 }}'
prometheus.io/port: '{{ .Values.metrics.nodePort | default 9090 }}'
{{- end }}
spec:
{{- if (eq .Values.selinuxSupport "mixed")}}
Expand Down Expand Up @@ -86,7 +86,7 @@ spec:
{{- end }}
{{- if .Values.metrics.enabled }}
- "--enablemetrics"
- "--metricsport={{ .Values.metrics.port | default 9090 }}"
- "--metricsport={{ .Values.metrics.nodePort | default 9090 }}"
{{- end }}
{{- if .Values.pluginConfig.allowInsecureHttps }}
- "--allowinsecurehttps"
Expand Down Expand Up @@ -120,7 +120,7 @@ spec:
name: healthz
protocol: TCP
{{- if .Values.metrics.enabled }}
- containerPort: {{ .Values.metrics.port }}
- containerPort: {{ .Values.metrics.nodePort }}
name: metrics
protocol: TCP
{{- end }}
Expand Down
6 changes: 4 additions & 2 deletions charts/csi-wekafsplugin/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,16 @@ kubeletPath: "/var/lib/kubelet"
metrics:
# -- Enable Prometheus Metrics
enabled: true
# -- Metrics port
port: 9090
# -- Metrics port for Controller Server
controllerPort: 9090
# -- Provisioner metrics port
provisionerPort: 9091
# -- Resizer metrics port
resizerPort: 9092
# -- Snapshotter metrics port
snapshotterPort: 9093
# -- Metrics port for Node Serer
nodePort: 9094
# -- Tracing URL (For Jaeger tracing engine / OpenTelemetry), optional
# @ignore
tracingUrl: ""
Expand Down
Loading