From ce4f968ec821707ea128318143395df12cb610c5 Mon Sep 17 00:00:00 2001 From: Mahsa Soleimani Date: Wed, 28 Feb 2024 14:54:58 +0330 Subject: [PATCH] Servicemonitor (#12) * fix templating issue --------- Co-authored-by: Mahsa --- .../charts/templates/servicemonitor.yaml | 19 ------------------- .../charts/templates/servicemonitor.yaml | 19 ------------------- 2 files changed, 38 deletions(-) diff --git a/clients/harbor-client/charts/templates/servicemonitor.yaml b/clients/harbor-client/charts/templates/servicemonitor.yaml index 21c3aa2..db11845 100644 --- a/clients/harbor-client/charts/templates/servicemonitor.yaml +++ b/clients/harbor-client/charts/templates/servicemonitor.yaml @@ -1,33 +1,14 @@ -{{- if .Values.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: {{ include "snappcloud-harbor-client.fullname" . }} labels: {{- include "snappcloud-harbor-client.labels" . | nindent 4 }} - {{- if .Values.commonLabels }} - {{- include "snappcloud-harbor-client.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} - {{- end }} spec: endpoints: - port: http interval: 30s - {{- if .Values.serviceMonitor.scrapeTimeout }} - scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }} - {{- end }} path: /metrics - honorLabels: {{ .Values.serviceMonitor.honorLabels }} - {{- if .Values.serviceMonitor.metricRelabelings }} - metricRelabelings: - {{- tpl (toYaml .Values.serviceMonitor.metricRelabelings | nindent 4) . }} - {{- end }} - {{- if .Values.serviceMonitor.relabelings }} - relabelings: - {{ toYaml .Values.serviceMonitor.relabelings | nindent 4 }} - {{- end }} selector: matchLabels: {{- include "snappcloud-harbor-client.selectorLabels" . | nindent 6 }} -{{- end -}} - - diff --git a/clients/proxy-client/charts/templates/servicemonitor.yaml b/clients/proxy-client/charts/templates/servicemonitor.yaml index a6dbd95..b3786bd 100644 --- a/clients/proxy-client/charts/templates/servicemonitor.yaml +++ b/clients/proxy-client/charts/templates/servicemonitor.yaml @@ -1,33 +1,14 @@ -{{- if .Values.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: {{ include "snappcloud-proxy-client.fullname" . }} labels: {{- include "snappcloud-proxy-client.labels" . | nindent 4 }} - {{- if .Values.commonLabels }} - {{- include "snappcloud-proxy-client.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} - {{- end }} spec: endpoints: - port: http interval: 30s - {{- if .Values.serviceMonitor.scrapeTimeout }} - scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }} - {{- end }} path: /metrics - honorLabels: {{ .Values.serviceMonitor.honorLabels }} - {{- if .Values.serviceMonitor.metricRelabelings }} - metricRelabelings: - {{- tpl (toYaml .Values.serviceMonitor.metricRelabelings | nindent 4) . }} - {{- end }} - {{- if .Values.serviceMonitor.relabelings }} - relabelings: - {{ toYaml .Values.serviceMonitor.relabelings | nindent 4 }} - {{- end }} selector: matchLabels: {{- include "snappcloud-proxy-client.selectorLabels" . | nindent 6 }} -{{- end -}} - -