Merge pull request #5705 from lsst-sqre/tickets/DM-53377

[DM-53377] Workaround for the int to float64 Helm bug in the InlfuxDB Enterprise chart

Author: afausti

applications/sasquatch/charts/influxdb-enterprise/templates/_helpers.tpl

@@ -61,3 +61,20 @@ Create the name of the service account
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Render config map, cast to int to fix Helm converting integers to float64
+*/}}
+{{- define "renderConfigMap" -}}
+  {{- $map := . -}}
+  {{- range $key, $value := $map }}
+    {{- $tp := typeOf $value -}}
+    {{- if eq $tp "string" }}
+      {{ $key }} = {{ $value | quote }}
+    {{- else if or (eq $tp "int") (eq $tp "float64") }}
+      {{ $key }} = {{ int $value }}
+    {{- else }}
+      {{ $key }} = {{ $value }}
+    {{- end }}
+  {{- end }}
+{{- end -}}

applications/sasquatch/charts/influxdb-enterprise/templates/data-configmap.yaml

@@ -11,14 +11,7 @@ data:
     reporting-disabled = false
 
     [http]
-      {{- range $key, $value := index .Values.data.config.http }}
-      {{- $tp := typeOf $value }}
-      {{- if eq $tp "string" }}
-      {{ $key }} = {{ $value | quote }}
-      {{- else }}
-      {{ $key }} = {{ $value }}
-      {{- end }}
-      {{- end }}
+      {{- include "renderConfigMap" .Values.data.config.http }}
 
     [enterprise]
       {{ if .Values.license.key }}
@@ -34,67 +27,24 @@ data:
 
     [hinted-handoff]
       dir = "/var/lib/influxdb/hh"
-      {{- range $key, $value := index .Values.data.config.hintedHandoff }}
-      {{- $tp := typeOf $value }}
-      {{- if eq $tp "string" }}
-      {{ $key }} = {{ $value | quote }}
-      {{- else }}
-      {{ $key }} = {{ $value | int }}
-      {{- end }}
-      {{- end }}
+      {{- include "renderConfigMap" .Values.data.config.hintedHandoff }}
 
     [data]
       dir = "/var/lib/influxdb/data"
       wal-dir = "/var/lib/influxdb/wal"
-      {{- range $key, $value := index .Values.data.config.data }}
-      {{- $tp := typeOf $value }}
-      {{- if eq $tp "string" }}
-      {{ $key }} = {{ $value | quote }}
-      {{- else }}
-      {{ $key }} = {{ $value }}
-      {{- end }}
-      {{- end }}
+      {{- include "renderConfigMap" .Values.data.config.data }}
 
     [anti-entropy]
-      {{- range $key, $value := index .Values.data.config.antiEntropy }}
-      {{- $tp := typeOf $value }}
-      {{- if eq $tp "string" }}
-      {{ $key }} = {{ $value | quote }}
-      {{- else }}
-      {{ $key }} = {{ $value }}
-      {{- end }}
-      {{- end }}
+      {{- include "renderConfigMap" .Values.data.config.antiEntropy }}
 
     [cluster]
-      {{- range $key, $value := index .Values.data.config.cluster }}
-      {{- $tp := typeOf $value }}
-      {{- if eq $tp "string" }}
-      {{ $key }} = {{ $value | quote }}
-      {{- else }}
-      {{ $key }} = {{ $value }}
-      {{- end  }}
-      {{- end }}
+      {{- include "renderConfigMap" .Values.data.config.cluster }}
 
     [continuous_queries]
-      {{- range $key, $value := index .Values.data.config.continuousQueries }}
-      {{- $tp := typeOf $value }}
-      {{- if eq $tp "string" }}
-      {{ $key }} = {{ $value | quote }}
-      {{- else }}
-      {{ $key }} = {{ $value }}
-      {{- end  }}
-      {{- end }}
+      {{- include "renderConfigMap" .Values.data.config.continuousQueries }}
 
     [logging]
-      {{- range $key, $value := index .Values.data.config.logging }}
-      {{- $tp := typeOf $value }}
-      {{- if eq $tp "string" }}
-      {{ $key }} = {{ $value | quote }}
-      {{- else }}
-      {{ $key }} = {{ $value }}
-      {{- end  }}
-      {{- end }}
-
+      {{- include "renderConfigMap" .Values.data.config.logging }}
 
   entrypoint.pl: |+
     #!/usr/bin/env perl

applications/sasquatch/values-idfdev.yaml

@@ -81,6 +81,15 @@ influxdb-enterprise:
     config:
       antiEntropy:
         enabled: true
+      cluster:
+        max-concurrent-queries: 100
+        query-timeout: "180s"
+        log-queries-after: "10s"
+        log-timedout-queries: true
+        termination-query-log: true
+        max-select-point: 50000000
+        max-select-series: 200000
+        max-select-buckets: 20000
     ingress:
       enabled: true
       hostname: data-dev.lsst.cloud

applications/sasquatch/values-usdfprod.yaml

@@ -199,6 +199,7 @@ influxdb-enterprise-active:
         log-queries-after: "10s"
         log-timedout-queries: true
         termination-query-log: true
+        max-select-point: 50000000
         max-select-series: 200000
         max-select-buckets: 20000
     affinity: