From 57f1074a84aa4eaa9ebbdab14275b7a962482a01 Mon Sep 17 00:00:00 2001 From: Zakaria EL BAZI <35115877+Z4ck404@users.noreply.github.com> Date: Mon, 22 Apr 2024 16:25:55 +0200 Subject: [PATCH] Bgd 4867 Add custom telemetry parsers to all components (#201) * [charts] add custom parser to all telemetry sidecars * [charts/bigdata-telemetry] update failurethreshold to fail fast and restart --- charts/bigdata-notebook-service-storage-server/Chart.yaml | 2 +- .../templates/notebook-service-storage-deployment.yaml | 3 +++ charts/bigdata-notebook-service/Chart.yaml | 2 +- charts/bigdata-notebook-service/templates/deployment.yaml | 3 +++ charts/bigdata-notebook-workspace/Chart.yaml | 2 +- charts/bigdata-notebook-workspace/templates/deployment.yaml | 3 +++ charts/bigdata-proxy/Chart.yaml | 2 +- charts/bigdata-proxy/templates/deployment.yaml | 3 +++ charts/bigdata-spark-watcher/Chart.yaml | 2 +- charts/bigdata-spark-watcher/templates/deployment.yaml | 3 +++ charts/bigdata-telemetry/Chart.yaml | 2 +- .../templates/thanos-receiver-statefulset.yaml | 1 + charts/spark-operator/Chart.yaml | 2 +- .../charts/spark-operator/templates/deployment.yaml | 3 +++ 14 files changed, 26 insertions(+), 7 deletions(-) diff --git a/charts/bigdata-notebook-service-storage-server/Chart.yaml b/charts/bigdata-notebook-service-storage-server/Chart.yaml index b7ba2c18..d0541203 100644 --- a/charts/bigdata-notebook-service-storage-server/Chart.yaml +++ b/charts/bigdata-notebook-service-storage-server/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: bigdata-notebook-service-storage-server description: A Helm chart for the Spot Big Data Notebook Service Storage Server type: application -version: 0.1.12 +version: 0.1.13 appVersion: "1.2.0-ofas" home: https://github.com/spotinst/charts icon: https://docs.spot.io/_media/images/spot_mark.png diff --git a/charts/bigdata-notebook-service-storage-server/templates/notebook-service-storage-deployment.yaml b/charts/bigdata-notebook-service-storage-server/templates/notebook-service-storage-deployment.yaml index 2f21a3b1..8b24c48e 100644 --- a/charts/bigdata-notebook-service-storage-server/templates/notebook-service-storage-deployment.yaml +++ b/charts/bigdata-notebook-service-storage-server/templates/notebook-service-storage-deployment.yaml @@ -74,6 +74,9 @@ spec: - name: telementry-custom-config mountPath: /fluent-bit/etc/custom-filters.conf subPath: custom-filters.conf + - name: telementry-global-config + mountPath: /fluent-bit/etc/parsers.conf + subPath: parsers.conf - name: telementry-custom-config mountPath: /fluent-bit/etc/metrics-collection.conf subPath: metrics-collection.conf diff --git a/charts/bigdata-notebook-service/Chart.yaml b/charts/bigdata-notebook-service/Chart.yaml index 42e2db2c..9d685cab 100644 --- 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.7 +version: 0.2.8 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/deployment.yaml b/charts/bigdata-notebook-service/templates/deployment.yaml index c06e086c..3431feb7 100644 --- a/charts/bigdata-notebook-service/templates/deployment.yaml +++ b/charts/bigdata-notebook-service/templates/deployment.yaml @@ -191,6 +191,9 @@ spec: - name: telementry-custom-config mountPath: /fluent-bit/etc/custom-filters.conf subPath: custom-filters.conf + - name: telementry-global-config + mountPath: /fluent-bit/etc/parsers.conf + subPath: parsers.conf - name: telementry-custom-config mountPath: /fluent-bit/etc/metrics-collection.conf subPath: metrics-collection.conf diff --git a/charts/bigdata-notebook-workspace/Chart.yaml b/charts/bigdata-notebook-workspace/Chart.yaml index 292e6bcd..41b0148d 100644 --- 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.10 +version: 0.0.11 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/deployment.yaml b/charts/bigdata-notebook-workspace/templates/deployment.yaml index fad7bcca..2a8c4f81 100644 --- a/charts/bigdata-notebook-workspace/templates/deployment.yaml +++ b/charts/bigdata-notebook-workspace/templates/deployment.yaml @@ -123,6 +123,9 @@ spec: - name: telementry-custom-config mountPath: /fluent-bit/etc/custom-filters.conf subPath: custom-filters.conf + - name: telementry-global-config + mountPath: /fluent-bit/etc/parsers.conf + subPath: parsers.conf - name: telementry-custom-config mountPath: /fluent-bit/etc/metrics-collection.conf subPath: metrics-collection.conf diff --git a/charts/bigdata-proxy/Chart.yaml b/charts/bigdata-proxy/Chart.yaml index 64f0469c..27a4f6d9 100644 --- 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.9 +version: 0.4.10 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/deployment.yaml b/charts/bigdata-proxy/templates/deployment.yaml index 2460475d..fe81c5ff 100644 --- a/charts/bigdata-proxy/templates/deployment.yaml +++ b/charts/bigdata-proxy/templates/deployment.yaml @@ -86,6 +86,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-spark-watcher/Chart.yaml b/charts/bigdata-spark-watcher/Chart.yaml index 348c2466..e370cf41 100644 --- 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.13 +version: 0.5.14 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/deployment.yaml b/charts/bigdata-spark-watcher/templates/deployment.yaml index 996b1762..f15ac736 100644 --- a/charts/bigdata-spark-watcher/templates/deployment.yaml +++ b/charts/bigdata-spark-watcher/templates/deployment.yaml @@ -132,6 +132,9 @@ spec: - name: telementry-custom-config mountPath: /fluent-bit/etc/custom-filters.conf subPath: custom-filters.conf + - name: telementry-global-config + mountPath: /fluent-bit/etc/parsers.conf + subPath: parsers.conf - name: telementry-custom-config mountPath: /fluent-bit/etc/metrics-collection.conf subPath: metrics-collection.conf diff --git a/charts/bigdata-telemetry/Chart.yaml b/charts/bigdata-telemetry/Chart.yaml index c31fdf07..80572c90 100644 --- 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.4 +version: 0.2.5 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 index b077ed75..6024be02 100644 --- a/charts/bigdata-telemetry/templates/thanos-receiver-statefulset.yaml +++ b/charts/bigdata-telemetry/templates/thanos-receiver-statefulset.yaml @@ -66,6 +66,7 @@ spec: - /bin/sh - -c - 'exit 1' + failureThreshold: 2 initialDelaySeconds: 900 periodSeconds: 920 name: thanos-receive diff --git a/charts/spark-operator/Chart.yaml b/charts/spark-operator/Chart.yaml index 60ae29f9..6bf06cd1 100644 --- 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.29 +version: 0.1.30 appVersion: v1beta2-1.3.4-3.1.1 dependencies: - name: spark-operator diff --git a/charts/spark-operator/charts/spark-operator/templates/deployment.yaml b/charts/spark-operator/charts/spark-operator/templates/deployment.yaml index a2fe79d9..6ae0912b 100644 --- a/charts/spark-operator/charts/spark-operator/templates/deployment.yaml +++ b/charts/spark-operator/charts/spark-operator/templates/deployment.yaml @@ -170,6 +170,9 @@ spec: - name: telementry-custom-config mountPath: /fluent-bit/etc/custom-filters.conf subPath: custom-filters.conf + - name: telementry-global-config + mountPath: /fluent-bit/etc/parsers.conf + subPath: parsers.conf - name: telementry-custom-config mountPath: /fluent-bit/etc/metrics-collection.conf subPath: metrics-collection.conf