From aaa685a0602cd7de5d1c94903f1be601d7d40d09 Mon Sep 17 00:00:00 2001 From: Marco Ebert Date: Tue, 29 Oct 2024 22:18:36 +0100 Subject: [PATCH 1/7] Service Monitor: Indent metadata. --- .../templates/controller-servicemonitor.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/ingress-nginx/templates/controller-servicemonitor.yaml b/charts/ingress-nginx/templates/controller-servicemonitor.yaml index 62301da454..b00ffcf3dc 100644 --- a/charts/ingress-nginx/templates/controller-servicemonitor.yaml +++ b/charts/ingress-nginx/templates/controller-servicemonitor.yaml @@ -3,17 +3,17 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: {{ include "ingress-nginx.controller.fullname" . }} -{{- if .Values.controller.metrics.serviceMonitor.namespace }} + {{- if .Values.controller.metrics.serviceMonitor.namespace }} namespace: {{ .Values.controller.metrics.serviceMonitor.namespace }} -{{- else }} + {{- else }} namespace: {{ include "ingress-nginx.namespace" . }} -{{- end }} + {{- end }} labels: {{- include "ingress-nginx.labels" . | nindent 4 }} app.kubernetes.io/component: controller - {{- if .Values.controller.metrics.serviceMonitor.additionalLabels }} + {{- if .Values.controller.metrics.serviceMonitor.additionalLabels }} {{- toYaml .Values.controller.metrics.serviceMonitor.additionalLabels | nindent 4 }} - {{- end }} + {{- end }} {{- if .Values.controller.metrics.serviceMonitor.annotations }} annotations: {{ toYaml .Values.controller.metrics.serviceMonitor.annotations | nindent 4 }} {{- end }} From c357f1bce3cad150881b1472be8f013b01116b1f Mon Sep 17 00:00:00 2001 From: Marco Ebert Date: Tue, 29 Oct 2024 22:19:15 +0100 Subject: [PATCH 2/7] Service Monitor: Indent endpoints. --- .../templates/controller-servicemonitor.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/ingress-nginx/templates/controller-servicemonitor.yaml b/charts/ingress-nginx/templates/controller-servicemonitor.yaml index b00ffcf3dc..7106d42228 100644 --- a/charts/ingress-nginx/templates/controller-servicemonitor.yaml +++ b/charts/ingress-nginx/templates/controller-servicemonitor.yaml @@ -19,16 +19,16 @@ metadata: {{- end }} spec: endpoints: - - port: {{ .Values.controller.metrics.portName }} - interval: {{ .Values.controller.metrics.serviceMonitor.scrapeInterval }} + - port: {{ .Values.controller.metrics.portName }} + interval: {{ .Values.controller.metrics.serviceMonitor.scrapeInterval }} {{- if .Values.controller.metrics.serviceMonitor.honorLabels }} - honorLabels: true + honorLabels: true {{- end }} {{- if .Values.controller.metrics.serviceMonitor.relabelings }} - relabelings: {{ toYaml .Values.controller.metrics.serviceMonitor.relabelings | nindent 8 }} + relabelings: {{ toYaml .Values.controller.metrics.serviceMonitor.relabelings | nindent 4 }} {{- end }} {{- if .Values.controller.metrics.serviceMonitor.metricRelabelings }} - metricRelabelings: {{ toYaml .Values.controller.metrics.serviceMonitor.metricRelabelings | nindent 8 }} + metricRelabelings: {{ toYaml .Values.controller.metrics.serviceMonitor.metricRelabelings | nindent 4 }} {{- end }} {{- if .Values.controller.metrics.serviceMonitor.jobLabel }} jobLabel: {{ .Values.controller.metrics.serviceMonitor.jobLabel | quote }} From ae2c8268d8b957991f95b46bfb4a4fcf58ed1bb6 Mon Sep 17 00:00:00 2001 From: Marco Ebert Date: Tue, 29 Oct 2024 22:19:31 +0100 Subject: [PATCH 3/7] Service Monitor: Indent job label. --- charts/ingress-nginx/templates/controller-servicemonitor.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/ingress-nginx/templates/controller-servicemonitor.yaml b/charts/ingress-nginx/templates/controller-servicemonitor.yaml index 7106d42228..2314c65fe3 100644 --- a/charts/ingress-nginx/templates/controller-servicemonitor.yaml +++ b/charts/ingress-nginx/templates/controller-servicemonitor.yaml @@ -30,9 +30,9 @@ spec: {{- if .Values.controller.metrics.serviceMonitor.metricRelabelings }} metricRelabelings: {{ toYaml .Values.controller.metrics.serviceMonitor.metricRelabelings | nindent 4 }} {{- end }} -{{- if .Values.controller.metrics.serviceMonitor.jobLabel }} + {{- if .Values.controller.metrics.serviceMonitor.jobLabel }} jobLabel: {{ .Values.controller.metrics.serviceMonitor.jobLabel | quote }} -{{- end }} + {{- end }} {{- if .Values.controller.metrics.serviceMonitor.namespaceSelector }} namespaceSelector: {{ toYaml .Values.controller.metrics.serviceMonitor.namespaceSelector | nindent 4 }} {{- else }} From 842255289432db512882445a888f65f5dd762b91 Mon Sep 17 00:00:00 2001 From: Marco Ebert Date: Tue, 29 Oct 2024 22:19:59 +0100 Subject: [PATCH 4/7] Service Monitor: Indent namespace selector. --- .../templates/controller-servicemonitor.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/ingress-nginx/templates/controller-servicemonitor.yaml b/charts/ingress-nginx/templates/controller-servicemonitor.yaml index 2314c65fe3..ff2abc5158 100644 --- a/charts/ingress-nginx/templates/controller-servicemonitor.yaml +++ b/charts/ingress-nginx/templates/controller-servicemonitor.yaml @@ -33,13 +33,13 @@ spec: {{- if .Values.controller.metrics.serviceMonitor.jobLabel }} jobLabel: {{ .Values.controller.metrics.serviceMonitor.jobLabel | quote }} {{- end }} -{{- if .Values.controller.metrics.serviceMonitor.namespaceSelector }} + {{- if .Values.controller.metrics.serviceMonitor.namespaceSelector }} namespaceSelector: {{ toYaml .Values.controller.metrics.serviceMonitor.namespaceSelector | nindent 4 }} -{{- else }} + {{- else }} namespaceSelector: matchNames: - - {{ include "ingress-nginx.namespace" . }} -{{- end }} + - {{ include "ingress-nginx.namespace" . }} + {{- end }} {{- if .Values.controller.metrics.serviceMonitor.targetLabels }} targetLabels: {{- range .Values.controller.metrics.serviceMonitor.targetLabels }} From cc678b80a76152fe345a1953f653bd8f309ab485 Mon Sep 17 00:00:00 2001 From: Marco Ebert Date: Tue, 29 Oct 2024 22:20:56 +0100 Subject: [PATCH 5/7] Service Monitor: Improve target labels. --- .../ingress-nginx/templates/controller-servicemonitor.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/charts/ingress-nginx/templates/controller-servicemonitor.yaml b/charts/ingress-nginx/templates/controller-servicemonitor.yaml index ff2abc5158..142b6b7030 100644 --- a/charts/ingress-nginx/templates/controller-servicemonitor.yaml +++ b/charts/ingress-nginx/templates/controller-servicemonitor.yaml @@ -40,12 +40,9 @@ spec: matchNames: - {{ include "ingress-nginx.namespace" . }} {{- end }} -{{- if .Values.controller.metrics.serviceMonitor.targetLabels }} - targetLabels: - {{- range .Values.controller.metrics.serviceMonitor.targetLabels }} - - {{ . }} + {{- if .Values.controller.metrics.serviceMonitor.targetLabels }} + targetLabels: {{ toYaml .Values.controller.metrics.serviceMonitor.targetLabels | nindent 2 }} {{- end }} -{{- end }} selector: matchLabels: {{- include "ingress-nginx.selectorLabels" . | nindent 6 }} From 746911441017f73aba4e1c04a39f9d78a4f15145 Mon Sep 17 00:00:00 2001 From: Marco Ebert Date: Tue, 29 Oct 2024 22:21:43 +0100 Subject: [PATCH 6/7] Service Monitor: Reorder selector. --- .../templates/controller-servicemonitor.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/ingress-nginx/templates/controller-servicemonitor.yaml b/charts/ingress-nginx/templates/controller-servicemonitor.yaml index 142b6b7030..499bf93719 100644 --- a/charts/ingress-nginx/templates/controller-servicemonitor.yaml +++ b/charts/ingress-nginx/templates/controller-servicemonitor.yaml @@ -18,6 +18,10 @@ metadata: annotations: {{ toYaml .Values.controller.metrics.serviceMonitor.annotations | nindent 4 }} {{- end }} spec: + selector: + matchLabels: + {{- include "ingress-nginx.selectorLabels" . | nindent 6 }} + app.kubernetes.io/component: controller endpoints: - port: {{ .Values.controller.metrics.portName }} interval: {{ .Values.controller.metrics.serviceMonitor.scrapeInterval }} @@ -43,8 +47,4 @@ spec: {{- if .Values.controller.metrics.serviceMonitor.targetLabels }} targetLabels: {{ toYaml .Values.controller.metrics.serviceMonitor.targetLabels | nindent 2 }} {{- end }} - selector: - matchLabels: - {{- include "ingress-nginx.selectorLabels" . | nindent 6 }} - app.kubernetes.io/component: controller {{- end }} From 112ab103f1c9dfa35d1e7c3187f95aff631c6cea Mon Sep 17 00:00:00 2001 From: Marco Ebert Date: Tue, 29 Oct 2024 22:22:11 +0100 Subject: [PATCH 7/7] Service Monitor: Reorder namespace selector. --- .../templates/controller-servicemonitor.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/ingress-nginx/templates/controller-servicemonitor.yaml b/charts/ingress-nginx/templates/controller-servicemonitor.yaml index 499bf93719..93ab4d242d 100644 --- a/charts/ingress-nginx/templates/controller-servicemonitor.yaml +++ b/charts/ingress-nginx/templates/controller-servicemonitor.yaml @@ -18,6 +18,13 @@ metadata: annotations: {{ toYaml .Values.controller.metrics.serviceMonitor.annotations | nindent 4 }} {{- end }} spec: + {{- if .Values.controller.metrics.serviceMonitor.namespaceSelector }} + namespaceSelector: {{ toYaml .Values.controller.metrics.serviceMonitor.namespaceSelector | nindent 4 }} + {{- else }} + namespaceSelector: + matchNames: + - {{ include "ingress-nginx.namespace" . }} + {{- end }} selector: matchLabels: {{- include "ingress-nginx.selectorLabels" . | nindent 6 }} @@ -37,13 +44,6 @@ spec: {{- if .Values.controller.metrics.serviceMonitor.jobLabel }} jobLabel: {{ .Values.controller.metrics.serviceMonitor.jobLabel | quote }} {{- end }} - {{- if .Values.controller.metrics.serviceMonitor.namespaceSelector }} - namespaceSelector: {{ toYaml .Values.controller.metrics.serviceMonitor.namespaceSelector | nindent 4 }} - {{- else }} - namespaceSelector: - matchNames: - - {{ include "ingress-nginx.namespace" . }} - {{- end }} {{- if .Values.controller.metrics.serviceMonitor.targetLabels }} targetLabels: {{ toYaml .Values.controller.metrics.serviceMonitor.targetLabels | nindent 2 }} {{- end }}