reviews

spotinst · Mar 29, 2024 · 5b7f3b2 · 5b7f3b2
1 parent 04a542b
commit 5b7f3b2
Show file tree

Hide file tree

Showing 18 changed files with 63 additions and 67 deletions.
diff --git a/...igdata-notebook-service-storage-server/templates/notebook-service-storage-deployment.yaml b/...igdata-notebook-service-storage-server/templates/notebook-service-storage-deployment.yaml
@@ -68,13 +68,13 @@ spec:
                 key: accountId
         resources: {}
         volumeMounts:
-          - name: config
+          - name: telementry-global-config
             mountPath: /fluent-bit/etc/fluent-bit.conf
             subPath: fluent-bit.conf
-          - name: custom-config
+          - name: telementry-custom-config
             mountPath: /fluent-bit/etc/custom-filters.conf
             subPath: custom-filters.conf
-          - name: custom-config
+          - name: telementry-custom-config
             mountPath: /fluent-bit/etc/metrics-collection.conf
             subPath: metrics-collection.conf
           - name: varlog
@@ -86,12 +86,12 @@ spec:
           - name: telemetry-aws-credentials
             mountPath: /root/.aws
       volumes:
-        - name: config
+        - name: telementry-global-config
           configMap:
-            name: bigdata-telemetry-fluentbit-cm
-        - name: custom-config
+            name: bigdata-common-telemetry-fluentbit-cm
+        - name: telementry-custom-config
           configMap:
-            name:  {{ include "bigdata-notebook-service-storage-server.fullname" . }}-custom-fluentbit-cm
+            name:  {{ include "bigdata-notebook-service-storage-server.fullname" . }}-telemetry-cm
         - name: varlog
           hostPath:
             path: /var/log/

diff --git a/...templates/custom_telemetry_configmap.yaml → ...server/templates/telemetry_configmap.yaml b/...templates/custom_telemetry_configmap.yaml → ...server/templates/telemetry_configmap.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "bigdata-notebook-service-storage-server.fullname" . }}-custom-fluentbit-cm
+  name: {{ include "bigdata-notebook-service-storage-server.fullname" . }}-telemetry-cm
   labels:
   {{- include "bigdata-notebook-service-storage-server.labels" . | nindent 4 }}
 data:

diff --git a/charts/bigdata-notebook-service/templates/deployment.yaml b/charts/bigdata-notebook-service/templates/deployment.yaml
@@ -168,13 +168,13 @@ spec:
                   optional: true
           resources: {}
           volumeMounts:
-            - name: config
+            - name: telementry-global-config
               mountPath: /fluent-bit/etc/fluent-bit.conf
               subPath: fluent-bit.conf
-            - name: custom-config
+            - name: telementry-custom-config
               mountPath: /fluent-bit/etc/custom-filters.conf
               subPath: custom-filters.conf
-            - name: custom-config
+            - name: telementry-custom-config
               mountPath: /fluent-bit/etc/metrics-collection.conf
               subPath: metrics-collection.conf
             - name: varlog
@@ -186,12 +186,12 @@ spec:
             - name: telemetry-aws-credentials
               mountPath: /root/.aws
       volumes:
-        - name: config
+        - name: telementry-global-config
           configMap:
-            name: bigdata-telemetry-fluentbit-cm
-        - name: custom-config
+            name: bigdata-common-telemetry-fluentbit-cm
+        - name: telementry-custom-config
           configMap:
-            name: {{ include "bigdata-notebook-service.fullname" . }}-custom-fluentbit-cm
+            name: {{ include "bigdata-notebook-service.fullname" . }}-telemetry-cm
         - name: varlog
           hostPath:
             path: /var/log/

diff --git a/...templates/custom_telemetry_configmap.yaml → ...ervice/templates/telemetry_configmap.yaml b/...templates/custom_telemetry_configmap.yaml → ...ervice/templates/telemetry_configmap.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "bigdata-notebook-service.fullname" . }}-custom-fluentbit-cm
+  name: {{ include "bigdata-notebook-service.fullname" . }}-telemetry-cm
   labels:
   {{- include "bigdata-notebook-service.labels" . | nindent 4 }}
 data:

diff --git a/charts/bigdata-notebook-workspace/templates/deployment.yaml b/charts/bigdata-notebook-workspace/templates/deployment.yaml
@@ -117,13 +117,13 @@ spec:
                   name: spot-ofas-cluster-info
                   key: accountId
           volumeMounts:
-            - name: config
+            - name: telementry-global-config
               mountPath: /fluent-bit/etc/fluent-bit.conf
               subPath: fluent-bit.conf
-            - name: custom-config
+            - name: telementry-custom-config
               mountPath: /fluent-bit/etc/custom-filters.conf
               subPath: custom-filters.conf
-            - name: custom-config
+            - name: telementry-custom-config
               mountPath: /fluent-bit/etc/metrics-collection.conf
               subPath: metrics-collection.conf
             - name: varlog
@@ -144,12 +144,12 @@ spec:
             claimName: {{ .Release.Name }}
         {{- end }}
         {{- if .Values.telemetry.enabled }}
-        - name: config
+        - name: telementry-global-config
           configMap:
-            name: bigdata-telemetry-fluentbit-cm
-        - name: custom-config
+            name: bigdata-common-telemetry-fluentbit-cm
+        - name: telementry-custom-config
           configMap:
-            name: {{ include "bigdata-notebook-workspace.fullname" . }}-custom-fluentbit-cm
+            name: {{ include "bigdata-notebook-workspace.fullname" . }}-telemetry-cm
         - name: varlog
           hostPath:
             path: /var/log/

diff --git a/...templates/custom_telemetry_configmap.yaml → ...kspace/templates/telemetry_configmap.yaml b/...templates/custom_telemetry_configmap.yaml → ...kspace/templates/telemetry_configmap.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "bigdata-notebook-workspace.fullname" . }}-custom-fluentbit-cm
+  name: {{ include "bigdata-notebook-workspace.fullname" . }}-telemetry-cm
   labels:
   {{- include "bigdata-notebook-workspace.labels" . | nindent 4 }}
 data:

diff --git a/charts/bigdata-operator/templates/common_telemetry_configmap.yaml b/charts/bigdata-operator/templates/common_telemetry_configmap.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: bigdata-telemetry-fluentbit-cm
+  name: bigdata-common-telemetry-fluentbit-cm
   labels:
   {{- include "bigdata-operator.labels" . | nindent 4 }}
 data:

diff --git a/charts/bigdata-operator/templates/deployment.yaml b/charts/bigdata-operator/templates/deployment.yaml
@@ -118,13 +118,13 @@ spec:
                   optional: true
           resources: {}
           volumeMounts:
-            - name: config
+            - name: telementry-global-config
               mountPath: /fluent-bit/etc/fluent-bit.conf
               subPath: fluent-bit.conf
-            - name: custom-config
+            - name: telementry-custom-config
               mountPath: /fluent-bit/etc/custom-filters.conf
               subPath: custom-filters.conf
-            - name: custom-config
+            - name: telementry-custom-config
               mountPath: /fluent-bit/etc/metrics-collection.conf
               subPath: metrics-collection.conf
             - name: varlog
@@ -136,12 +136,12 @@ spec:
             - name: telemetry-aws-credentials
               mountPath: /root/.aws
       volumes:
-        - name: config
+        - name: telementry-global-config
           configMap:
-            name: bigdata-telemetry-fluentbit-cm
-        - name: custom-config
+            name: bigdata-common-telemetry-fluentbit-cm
+        - name: telementry-custom-config
           configMap:
-            name: {{ include "bigdata-operator.fullname" . }}-custom-fluentbit-cm
+            name: {{ include "bigdata-operator.fullname" . }}-telemetry-cm
         - name: varlog
           hostPath:
             path: /var/log/

diff --git a/...templates/custom_telemetry_configmap.yaml → ...erator/templates/telemetry_configmap.yaml b/...templates/custom_telemetry_configmap.yaml → ...erator/templates/telemetry_configmap.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "bigdata-operator.fullname" . }}-custom-fluentbit-cm
+  name: {{ include "bigdata-operator.fullname" . }}-telemetry-cm
   labels:
   {{- include "bigdata-operator.labels" . | nindent 4 }}
 data:
@@ -24,7 +24,7 @@ data:
     [OUTPUT]
       Name                 prometheus_remote_write
       Match                {{ include "bigdata-operator.fullname" . }}
-      Host                 bigdata-telemetry-thanos-receiver-svc.spot-system.svc.cluster.local
+      Host                 bigdata-telemetry-thanos-receiver-svc.{{ .Release.Namespace }}.svc.cluster.local
       Port                 19291
       uri                  /api/v1/receive
       tls                  off

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.6
+version: 0.4.7
 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
@@ -83,13 +83,13 @@ spec:
                   key: accountId
           resources: {}
           volumeMounts:
-            - name: config
+            - name: telementry-global-config
               mountPath: /fluent-bit/etc/fluent-bit.conf
               subPath: fluent-bit.conf
-            - name: custom-config
+            - name: telementry-custom-config
               mountPath: /fluent-bit/etc/custom-filters.conf
               subPath: custom-filters.conf
-            - name: custom-config
+            - name: telementry-custom-config
               mountPath: /fluent-bit/etc/metrics-collection.conf
               subPath: metrics-collection.conf
             - name: varlog
@@ -101,12 +101,12 @@ spec:
             - name: telemetry-aws-credentials
               mountPath: /root/.aws
       volumes:
-        - name: config
+        - name: telementry-global-config
           configMap:
-            name: bigdata-telemetry-fluentbit-cm
-        - name: custom-config
+            name: bigdata-common-telemetry-fluentbit-cm
+        - name: telementry-custom-config
           configMap:
-            name: {{ include "bigdata-proxy.fullname" . }}-custom-fluentbit-cm
+            name: {{ include "bigdata-proxy.fullname" . }}-telemetry-cm
         - name: varlog
           hostPath:
             path: /var/log/

diff --git a/...templates/custom_telemetry_configmap.yaml → ...-proxy/templates/telemetry_configmap.yaml b/...templates/custom_telemetry_configmap.yaml → ...-proxy/templates/telemetry_configmap.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "bigdata-proxy.fullname" . }}-custom-fluentbit-cm
+  name: {{ include "bigdata-proxy.fullname" . }}-telemetry-cm
   labels:
   {{- include "bigdata-proxy.labels" . | nindent 4 }}
 data:

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.10
+version: 0.5.11
 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-spark-watcher/templates/deployment.yaml b/charts/bigdata-spark-watcher/templates/deployment.yaml
@@ -126,13 +126,13 @@ spec:
                   optional: true
           resources: {}
           volumeMounts:
-            - name: config
+            - name: telementry-global-config
               mountPath: /fluent-bit/etc/fluent-bit.conf
               subPath: fluent-bit.conf
-            - name: custom-config
+            - name: telementry-custom-config
               mountPath: /fluent-bit/etc/custom-filters.conf
               subPath: custom-filters.conf
-            - name: custom-config
+            - name: telementry-custom-config
               mountPath: /fluent-bit/etc/metrics-collection.conf
               subPath: metrics-collection.conf
             - name: varlog
@@ -152,12 +152,12 @@ spec:
             secretName: spot-bigdata-log-collector-creds
       {{- end }}
       {{- if .Values.telemetry.enabled }}
-        - name: config
+        - name: telementry-global-config
           configMap:
-            name: bigdata-telemetry-fluentbit-cm
-        - name: custom-config
+            name: bigdata-common-telemetry-fluentbit-cm
+        - name: telementry-custom-config
           configMap:
-            name: {{ include "bigdata-spark-watcher.fullname" . }}-custom-fluentbit-cm
+            name: {{ include "bigdata-spark-watcher.fullname" . }}-telemetry-cm
         - name: varlog
           hostPath:
             path: /var/log/

diff --git a/...templates/custom_telemetry_configmap.yaml → ...atcher/templates/telemetry_configmap.yaml b/...templates/custom_telemetry_configmap.yaml → ...atcher/templates/telemetry_configmap.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "bigdata-spark-watcher.fullname" . }}-custom-fluentbit-cm
+  name: {{ include "bigdata-spark-watcher.fullname" . }}-telemetry-cm
   labels:
   {{- include "bigdata-spark-watcher.labels" . | nindent 4 }}
 data:

diff --git a/charts/bigdata-telemetry/templates/thanos-receiver-statefulset.yaml b/charts/bigdata-telemetry/templates/thanos-receiver-statefulset.yaml
@@ -93,10 +93,6 @@ spec:
               name: hashring-config
             - name: telemetry-aws-credentials
               mountPath: /var/lib/creds
-          # resources:
-          #   requests:
-          #     cpu: 8
-          #     memory: 8Gi
       terminationGracePeriodSeconds: 900
       volumes:
         - emptyDir: {}

diff --git a/charts/spark-operator/charts/spark-operator/templates/deployment.yaml b/charts/spark-operator/charts/spark-operator/templates/deployment.yaml
@@ -164,13 +164,13 @@ spec:
                   key: accountId
           resources: {}
           volumeMounts:
-            - name: config
+            - name: telementry-global-config
               mountPath: /fluent-bit/etc/fluent-bit.conf
               subPath: fluent-bit.conf
-            - name: custom-config
+            - name: telementry-custom-config
               mountPath: /fluent-bit/etc/custom-filters.conf
               subPath: custom-filters.conf
-            - name: custom-config
+            - name: telementry-custom-config
               mountPath: /fluent-bit/etc/metrics-collection.conf
               subPath: metrics-collection.conf
             - name: varlog
@@ -194,12 +194,12 @@ spec:
         {{- toYaml . | nindent 8 }}
         {{- end }}
         {{- if .Values.telemetry.enabled }}
-        - name: config
+        - name: telementry-global-config
           configMap:
-            name: bigdata-telemetry-fluentbit-cm
-        - name: custom-config
+            name: bigdata-common-telemetry-fluentbit-cm
+        - name: telementry-custom-config
           configMap:
-            name: {{ include "spark-operator.fullname" . }}-custom-fluentbit-cm
+            name: {{ include "spark-operator.fullname" . }}-telemetry-cm
         - name: telemetry-aws-credentials
           secret:
             secretName: spot-bigdata-telemetry-creds

diff --git a/...templates/custom_telemetry_configmap.yaml → ...erator/templates/telemetry_configmap.yaml b/...templates/custom_telemetry_configmap.yaml → ...erator/templates/telemetry_configmap.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "spark-operator.fullname" . }}-custom-fluentbit-cm
+  name: {{ include "spark-operator.fullname" . }}-telemetry-cm
   labels:
   {{- include "spark-operator.labels" . | nindent 4 }}
 data:
@@ -16,15 +16,15 @@ data:
     [INPUT]
       name                    prometheus_scrape
       host                    0.0.0.0
-      port                    10254
+      port                    {{ .Values.metrics.portName }}
       tag                     {{ include "spark-operator.fullname" . }}
-      metrics_path            /metrics
+      metrics_path            {{ .Values.metrics.endpoint }}
       scrape_interval         5s
 
     [OUTPUT]
       Name                 prometheus_remote_write
       Match                {{ include "spark-operator.fullname" . }}
-      Host                 bigdata-telemetry-thanos-receiver-svc.spot-system.svc.cluster.local
+      Host                 bigdata-telemetry-thanos-receiver-svc.{{ .Release.Namespace }}.svc.cluster.local
       Port                 19291
       uri                  /api/v1/receive
       tls                  off