changes in service scraper and helpers tpl

Author: kamal-devtron

scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/_helpers.tpl

@@ -193,12 +193,15 @@ Create chart name and version as used by the chart label.
   {{- $VmServiceScrapeEnabled := include "vmserviceScrapeEnabled" . -}}
   {{- $val1 := "vmservicescrape"}}
    {{- $val2 := "servicemonitor"}}
+   {{- $val3 := "" }}
   {{- if and (eq $VmServiceScrapeEnabled "true") (eq $ServiceMonitorEnabled "true")}}
     {{- $val1 }}
   {{- else if eq $ServiceMonitorEnabled "true" }}
     {{- $val2 }}  
   {{- else if eq $VmServiceScrapeEnabled "true" }}
-    {{- $val1 }}      
+    {{- $val1 }}  
+  {{- else }}
+    {{- $val3 }}      
   {{- end }}
 
 {{- end }}

scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/metrics-service-monitor.yaml

@@ -1,16 +1,21 @@
 {{ $scrapetype := include "scrapeType" . }}
-{{- if and ($scrapetype) (eq .Values.MetricsScraper "Victoria") -}}
 {{ $scraper := get (dict "servicemonitor" .Values.servicemonitor "vmservicescrape" .Values.vmservicescrape) $scrapetype }}  
+{{- if ($scrapetype) }}
+{{- if and ($scrapetype) (eq .Values.MetricsScraper "Victoria") -}}
 apiVersion: operator.victoriametrics.com/v1beta1
 kind: VMServiceScrape
+{{- else }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+{{- end }}
 metadata:
-  {{- if .Values.vmservicescrape.name }}
-  name: {{ .Values.vmservicescrape.name }}
+  {{- if $scraper.name }}
+  name: {{ $scraper.name }}
   {{- else }}
   name: {{ template ".Chart.Name .fullname" . }}-vm
   {{- end }}
   labels:
-    kind: Victoria
+    kind: {{ $scrapetype }}
     app: {{ template ".Chart.Name .name" . }}
     appId: {{ $.Values.app | quote }}
     envId: {{ $.Values.env | quote }}
@@ -119,9 +124,8 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- if $scraper.matchLabels }}
+      {{- if .Values.servicemonitor.matchLabels }}
       {{- toYaml $scraper.matchLabels | nindent 6 }}
       {{- end }}
       app: {{ template ".Chart.Name .name" $ }}
 {{- end }}
-