fix Helm config for operatorMetrics not having defined a "scrapeInter…

…val"
eclipse-ditto · Jan 30, 2024 · 4d5d4eb · 4d5d4eb
1 parent 5453832
commit 4d5d4eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 3.5.1  # chart version is effectively set by release-job
+version: 3.5.2  # chart version is effectively set by release-job
 appVersion: 3.5.0
 keywords:
   - iot-chart

diff --git a/deployment/helm/ditto/templates/thingssearch-deployment.yaml b/deployment/helm/ditto/templates/thingssearch-deployment.yaml
@@ -147,7 +147,9 @@ spec:
                 {{- end }}
                 {{- range $key, $value := .Values.thingsSearch.config.operatorMetrics.customMetrics }}
                 "{{ printf "%s%s%s=%t" "-Dditto.search.operator-metrics.custom-metrics." $key ".enabled" $value.enabled }}"
+                {{- if $value.scrapeInterval }}
                 "{{ printf "%s%s%s=%s" "-Dditto.search.operator-metrics.custom-metrics." $key ".scrape-interval" $value.scrapeInterval }}"
+                {{- end }}
                 {{- range $index, $namespace := $value.namespaces }}
                 "{{ printf "%s%s%s%d=%s" "-Dditto.search.operator-metrics.custom-metrics." $key ".namespaces." $index $namespace }}"
                 {{- end }}