reviews:templating

spotinst · Apr 2, 2024 · 4245a4d · 4245a4d
1 parent 5b7f3b2
commit 4245a4d
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/charts/bigdata-notebook-service/templates/telemetry_configmap.yaml b/charts/bigdata-notebook-service/templates/telemetry_configmap.yaml
@@ -10,7 +10,7 @@ data:
     [FILTER]
         Name    grep
         Match   kube.*
-        Regex   $kubernetes['labels']['bigdata.spot.io/component'] {{ include "bigdata-notebook-service.fullname" . }}
+        Regex   $kubernetes['labels']['bigdata.spot.io/component'] {{ index .Values.podLabels "bigdata.spot.io/component" | quote }}
 
   metrics-collection.conf: |
     # Configuration for collecting metrics from the notebook service

diff --git a/charts/bigdata-notebook-workspace/templates/telemetry_configmap.yaml b/charts/bigdata-notebook-workspace/templates/telemetry_configmap.yaml
@@ -10,7 +10,7 @@ data:
     [FILTER]
         Name    grep
         Match   kube.*
-        Regex   $kubernetes['labels']['bigdata.spot.io/component'] {{ include "bigdata-notebook-workspace.fullname" . }}
+        Regex   $kubernetes['labels']['bigdata.spot.io/component'] {{ index .Values.podLabels "bigdata.spot.io/component" | quote }}
 
   metrics-collection.conf: |
     # Configuration for collecting metrics from the notebook workspace

diff --git a/charts/bigdata-operator/templates/telemetry_configmap.yaml b/charts/bigdata-operator/templates/telemetry_configmap.yaml
@@ -10,7 +10,7 @@ data:
     [FILTER]
         Name    grep
         Match   kube.*
-        Regex   $kubernetes['labels']['bigdata.spot.io/component'] {{ include "bigdata-operator.fullname" . }}
+        Regex   $kubernetes['labels']['bigdata.spot.io/component'] {{ index .Values.podLabels "bigdata.spot.io/component" | quote }}
 
   metrics-collection.conf: |
     [INPUT]

diff --git a/charts/bigdata-operator/values.yaml b/charts/bigdata-operator/values.yaml
@@ -45,7 +45,7 @@ securityContext:
 # runAsUser: 1000
 
 telemetry:
-  enabled: false
+  enabled: true
   fluentbit:
     image:
       repository: public.ecr.aws/ocean-spark/fluent-bit

diff --git a/charts/bigdata-proxy/templates/telemetry_configmap.yaml b/charts/bigdata-proxy/templates/telemetry_configmap.yaml
@@ -10,7 +10,7 @@ data:
     [FILTER]
         Name    grep
         Match   kube.*
-        Regex   $kubernetes['labels']['bigdata.spot.io/component'] {{ include "bigdata-proxy.fullname" . }}
+        Regex   $kubernetes['labels']['bigdata.spot.io/component'] {{ index .Values.podLabels "bigdata.spot.io/component" | quote }}
 
   metrics-collection.conf: |
     # Configuration for collecting metrics from the bigdata proxy

diff --git a/charts/bigdata-spark-watcher/templates/telemetry_configmap.yaml b/charts/bigdata-spark-watcher/templates/telemetry_configmap.yaml
@@ -10,7 +10,7 @@ data:
     [FILTER]
         Name    grep
         Match   kube.*
-        Regex   $kubernetes['labels']['bigdata.spot.io/component'] {{ include "bigdata-spark-watcher.fullname" . }}
+        Regex   $kubernetes['labels']['bigdata.spot.io/component'] {{ index .Values.podLabels "bigdata.spot.io/component" | quote }}
 
   metrics-collection.conf: |
     [INPUT]

diff --git a/charts/spark-operator/charts/spark-operator/templates/telemetry_configmap.yaml b/charts/spark-operator/charts/spark-operator/templates/telemetry_configmap.yaml
@@ -10,7 +10,7 @@ data:
     [FILTER]
         Name    grep
         Match   kube.*
-        Regex   $kubernetes['labels']['bigdata.spot.io/component'] {{ include "spark-operator.fullname" . }}
+        Regex   $kubernetes['labels']['bigdata.spot.io/component'] {{ index .Values.podLabels "bigdata.spot.io/component" | quote }}
 
   metrics-collection.conf: |
     [INPUT]