feat(metrics): allow for service ports for global prometheus (dapr#7929)

* feat(metrics): add service port for metrics Signed-off-by: Samantha Coyle <sam@diagrid.io> * fix: use correct key Signed-off-by: Samantha Coyle <sam@diagrid.io> * fix: add target port too Signed-off-by: Samantha Coyle <sam@diagrid.io> * fix: add file i missed Signed-off-by: Samantha Coyle <sam@diagrid.io> --------- Signed-off-by: Samantha Coyle <sam@diagrid.io>
QaColony · Jul 22, 2024 · 4aad51c · 4aad51c
1 parent 7257b2f
commit 4aad51c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/charts/dapr/charts/dapr_operator/templates/dapr_operator_service.yaml b/charts/dapr/charts/dapr_operator/templates/dapr_operator_service.yaml
@@ -38,6 +38,12 @@ spec:
     targetPort: {{ .Values.ports.targetPort }}
     name: legacy
 {{ end }}
+{{- if eq .Values.global.prometheus.enabled true }}
+  - name: metrics
+    port: {{ .Values.global.prometheus.port }}
+    targetPort: {{ .Values.global.prometheus.port }}
+    protocol: TCP
+{{- end}}
 ---
 apiVersion: v1
 kind: Service

diff --git a/charts/dapr/charts/dapr_placement/templates/dapr_placement_service.yaml b/charts/dapr/charts/dapr_placement/templates/dapr_placement_service.yaml
@@ -33,5 +33,11 @@ spec:
     port: {{ .Values.ports.apiPort }}
   - name: raft-node
     port: {{ .Values.ports.raftRPCPort }}
+{{- if eq .Values.global.prometheus.enabled true }}
+  - name: metrics
+    port: {{ .Values.global.prometheus.port }}
+    targetPort: {{ .Values.global.prometheus.port }}
+    protocol: TCP
+{{- end}}
   clusterIP: None
 {{- end }}
diff --git a/charts/dapr/charts/dapr_scheduler/templates/dapr_scheduler_service.yaml b/charts/dapr/charts/dapr_scheduler/templates/dapr_scheduler_service.yaml
@@ -37,5 +37,11 @@ spec:
     port: {{ .Values.ports.etcdHTTPClientPort }}
   - name: etcd-peer
     port: {{ .Values.ports.etcdGRPCPeerPort }}
+  {{- if eq .Values.global.prometheus.enabled true }}
+  - name: metrics
+    port: {{ .Values.global.prometheus.port }}
+    targetPort: {{ .Values.global.prometheus.port }}
+    protocol: TCP
+  {{- end}}
   clusterIP: None # make the service headless
 {{- end }}
diff --git a/charts/dapr/charts/dapr_sentry/templates/dapr_sentry_service.yaml b/charts/dapr/charts/dapr_sentry/templates/dapr_sentry_service.yaml
@@ -29,3 +29,9 @@ spec:
     port: {{ .Values.ports.port }}
     targetPort: {{ .Values.ports.targetPort }}
     name: grpc
+{{- if eq .Values.global.prometheus.enabled true }}
+  - name: metrics
+    port: {{ .Values.global.prometheus.port }}
+    targetPort: {{ .Values.global.prometheus.port }}
+    protocol: TCP
+{{- end}}
diff --git a/charts/dapr/charts/dapr_sidecar_injector/templates/dapr_sidecar_injector_service.yaml b/charts/dapr/charts/dapr_sidecar_injector/templates/dapr_sidecar_injector_service.yaml
@@ -30,4 +30,10 @@ spec:
     targetPort: https
     protocol: TCP
     name: https
+  {{- if eq .Values.global.prometheus.enabled true }}
+  - name: metrics
+    port: {{ .Values.global.prometheus.port }}
+    targetPort: {{ .Values.global.prometheus.port }}
+    protocol: TCP
+  {{- end}}
 {{- end }}