Bgd 5066 fix telemetry component (#198)

* [charts/notebook-service] update the custom telemetry config map * [charts/notebook-service-workspace] update the custom telemetry config map * [charts/bigdata-operator] update the common and custom telemetry config map * [charts/bigdata-proxy] update the custom telemetry config map * [charts/bigdata-spark-watcher] update the custom telemetry config map * [charts/bigdata-telemetry] fix telemetry secret mounting and add a liveness probe to refress expiring token * [charts/spark-operator] update the custom telemetry config map * [charts] bump versions * [charts/bigdata-operator] don't enable telemetry by default * [charts/bigdata-telemetry] remove sleep and use initialDelaySeconds in telemetry liveness probe
spotinst · Apr 17, 2024 · 5dabbf4 · 5dabbf4
1 parent e8e3257
commit 5dabbf4
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 20 deletions.
diff --git a/charts/bigdata-notebook-service/Chart.yaml b/charts/bigdata-notebook-service/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-notebook-service
 description: A Helm chart for the Spot Big Data Notebook Service
 type: application
-version: 0.2.6
+version: 0.2.7
 appVersion: 0.1.16
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png

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'] {{ index .Values.podLabels "bigdata.spot.io/component" | quote }}
+        Regex   $kubernetes['labels']['bigdata.spot.io/component'] {{ index .Values.podLabels "bigdata.spot.io/component" }}
 
   metrics-collection.conf: |
     # Configuration for collecting metrics from the notebook service

diff --git a/charts/bigdata-notebook-workspace/Chart.yaml b/charts/bigdata-notebook-workspace/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-notebook-workspace
 description: A Helm chart for the Spot Big Data Notebook Workspace
 type: application
-version: 0.0.9
+version: 0.0.10
 appVersion: 4.0.10-ofas-d35201c
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png

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'] {{ index .Values.podLabels "bigdata.spot.io/component" | quote }}
+        Regex   $kubernetes['labels']['bigdata.spot.io/component'] {{ index .Values.podLabels "bigdata.spot.io/component" }}
 
   metrics-collection.conf: |
     # Configuration for collecting metrics from the notebook workspace

diff --git a/charts/bigdata-operator/Chart.yaml b/charts/bigdata-operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-operator
 description: Spot Ocean BigData Operator
 type: application
-version: 0.4.12
+version: 0.4.13
 appVersion: 0.4.10
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png

diff --git a/charts/bigdata-operator/templates/common_telemetry_configmap.yaml b/charts/bigdata-operator/templates/common_telemetry_configmap.yaml
@@ -18,7 +18,7 @@ data:
 
   fluent-bit.conf: |
     [SERVICE]
-        Flush        1
+        Flush        10
         Log_Level    info
         Parsers_File parsers.conf
         HTTP_Server   On

diff --git a/charts/bigdata-operator/templates/deployment.yaml b/charts/bigdata-operator/templates/deployment.yaml
@@ -121,6 +121,9 @@ spec:
             - name: telementry-global-config
               mountPath: /fluent-bit/etc/fluent-bit.conf
               subPath: fluent-bit.conf
+            - name: telementry-global-config
+              mountPath: /fluent-bit/etc/parsers.conf
+              subPath: parsers.conf
             - name: telementry-custom-config
               mountPath: /fluent-bit/etc/custom-filters.conf
               subPath: custom-filters.conf

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'] {{ index .Values.podLabels "bigdata.spot.io/component" | quote }}
+        Regex   $kubernetes['labels']['bigdata.spot.io/component'] {{ index .Values.podLabels "bigdata.spot.io/component" }}
 
   metrics-collection.conf: |
     [INPUT]

diff --git a/charts/bigdata-proxy/Chart.yaml b/charts/bigdata-proxy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-proxy
 description: A Helm chart for the Spot Big Data Proxy
 type: application
-version: 0.4.8
+version: 0.4.9
 appVersion: 0.5.3
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png

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'] {{ index .Values.podLabels "bigdata.spot.io/component" | quote }}
+        Regex   $kubernetes['labels']['bigdata.spot.io/component'] {{ index .Values.podLabels "bigdata.spot.io/component" }}
 
   metrics-collection.conf: |
     # Configuration for collecting metrics from the bigdata proxy

diff --git a/charts/bigdata-spark-watcher/Chart.yaml b/charts/bigdata-spark-watcher/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-spark-watcher
 description: A Helm chart for the Spot Big Data Spark Watcher
 type: application
-version: 0.5.12
+version: 0.5.13
 appVersion: 0.5.0
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png

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'] {{ index .Values.podLabels "bigdata.spot.io/component" | quote }}
+        Regex   $kubernetes['labels']['bigdata.spot.io/component'] {{ index .Values.podLabels "bigdata.spot.io/component" }}
 
   metrics-collection.conf: |
     [INPUT]

diff --git a/charts/bigdata-telemetry/Chart.yaml b/charts/bigdata-telemetry/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-telemetry
 description: A Helm chart for the Spot Big Data Telemetry components
 type: application
-version: 0.2.3
+version: 0.2.4
 appVersion: "1.16.0"
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png

diff --git a/charts/bigdata-telemetry/templates/thanos-receiver-statefulset.yaml b/charts/bigdata-telemetry/templates/thanos-receiver-statefulset.yaml
@@ -61,12 +61,13 @@ spec:
                   optional: true
           image: "{{ .Values.thanos.image.repository }}:{{ .Values.thanos.image.tag }}"
           livenessProbe:
-            failureThreshold: 8
-            httpGet:
-              path: /-/healthy
-              port: 10902
-              scheme: HTTP
-            periodSeconds: 30
+            exec:
+              command:
+              - /bin/sh
+              - -c
+              - 'exit 1'
+            initialDelaySeconds: 900
+            periodSeconds: 920
           name: thanos-receive
           ports:
             - containerPort: 10901
@@ -93,6 +94,8 @@ spec:
               name: hashring-config
             - name: telemetry-aws-credentials
               mountPath: /var/lib/creds
+            - name: telemetry-aws-credentials
+              mountPath: /home/thanos/.aws
       terminationGracePeriodSeconds: 900
       volumes:
         - emptyDir: {}

diff --git a/charts/spark-operator/Chart.yaml b/charts/spark-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Spark Operator (b/g part)
 name: spark-operator
-version: 0.1.28
+version: 0.1.29
 appVersion: v1beta2-1.3.4-3.1.1
 dependencies:
   - name: spark-operator

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'] {{ index .Values.podLabels "bigdata.spot.io/component" | quote }}
+        Regex   $kubernetes['labels']['bigdata.spot.io/component'] {{ index .Values.podLabels "bigdata.spot.io/component" }}
 
   metrics-collection.conf: |
     ## Configuration for collecting metrics from the spark operator