fix: lables optional

databendlabs · Nov 13, 2024 · b45e2dc · b45e2dc
1 parent 51e7916
commit b45e2dc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/charts/databend-query/templates/configmap.yaml b/charts/databend-query/templates/configmap.yaml
@@ -58,15 +58,23 @@ data:
         otlp_endpoint = {{ .Values.config.log.query.otlpEndpoint | quote }}
         otlp_protocol = {{ .Values.config.log.query.otlpProtocol | default "http" | quote }}
         [log.query.otlp_labels]
+          {{- if .Values.config.log.query.otlp_labels.tenant }}
           tenant = {{ .Values.config.log.query.otlp_labels.tenant | quote }}
+          {{- end }}
+          {{- if .Values.config.log.query.otlp_labels.warehouse }}
           warehouse = {{ .Values.config.log.query.otlp_labels.warehouse | quote }}
+          {{- end }}
       [log.profile]
         on = {{ .Values.config.log.profile.enabled }}
         otlp_endpoint = {{ .Values.config.log.profile.otlp_endpoint | quote }}
         otlp_protocol = {{ .Values.config.log.profile.otlp_protocol | default "http" | quote }}
         [log.profile.otlp_labels]
+          {{- if .Values.config.log.profile.otlp_labels.tenant }}
           tenant = {{ .Values.config.log.profile.otlp_labels.tenant | quote }}
+          {{- end }}
+          {{- if .Values.config.log.profile.otlp_labels.warehouse }}
           warehouse = {{ .Values.config.log.profile.otlp_labels.warehouse | quote }}
+          {{- end }}
 
     [meta]
       {{- if .Values.config.meta.generateEndpoints }}

diff --git a/charts/databend-query/values.yaml b/charts/databend-query/values.yaml
@@ -104,16 +104,10 @@ config:
       enabled: false
       otlp_endpoint: ""
       otlp_protocol: "http"
-      otlp_labels:
-        tenant: ""
-        warehouse: ""
     profile:
       enabled: false
       otlp_endpoint: ""
       otlp_protocol: "http"
-      otlp_labels:
-        tenant: ""
-        warehouse: ""
 
   # [meta]
   meta: