From 4d5d4eb3965a2179c755f578ac20a6c1b3fce69a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Mon, 29 Jan 2024 20:13:15 +0100
Subject: [PATCH] fix Helm config for operatorMetrics not having defined a
 "scrapeInterval"

---
 deployment/helm/ditto/Chart.yaml                             | 2 +-
 deployment/helm/ditto/templates/thingssearch-deployment.yaml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index 59d4966f81..f4abf753ee 100644
--- 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
index 5e87d74393..4c9b18f582 100644
--- 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 }}