add confs for otel (#33)

featbit · Mar 25, 2024 · 1e6ef6e · 1e6ef6e
1 parent 1d32097
commit 1e6ef6e
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 9 deletions.
diff --git a/charts/featbit/Chart.yaml b/charts/featbit/Chart.yaml
@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.0
+version: 0.4.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "3.1.0"
+appVersion: "3.2.1"
 
 kubeVersion: ">=1.23-0"
 

diff --git a/charts/featbit/templates/_otel-env.tpl b/charts/featbit/templates/_otel-env.tpl
@@ -0,0 +1,33 @@
+{{- define "otel-common-env" }}
+- name: ENABLE_OPENTELEMETRY
+  value: {{ .Values.openTelemetry.enabled | quote }}
+- name: OTEL_TRACES_EXPORTER
+  value: oltp
+- name: OTEL_METRICS_EXPORTER
+  value: oltp
+- name: OTEL_LOGS_EXPORTER
+  value: oltp
+- name: OTEL_EXPORTER_OTLP_ENDPOINT
+  value: {{ .Values.openTelemetry.endpoint }}
+- name: OTEL_EXPORTER_OTLP_PROTOCOL
+  value: {{ .Values.openTelemetry.protocol }}
+- name: OTEL_EXPORTER_OTLP_TIMEOUT
+  value: {{ .Values.openTelemetry.timeoutInMilliseconds | quote }}
+- name: OTEL_EXPORTER_OTLP_INSECURE
+  value: {{ .Values.openTelemetry.insecure | quote }}
+{{- end }}
+
+{{- define "api-otel-env" }}
+- name: OTEL_SERVICE_NAME
+  value: {{ include "featbit.fullname" . }}-api
+{{- end }}
+
+{{- define "els-otel-env" }}
+- name: OTEL_SERVICE_NAME
+  value: {{ include "featbit.fullname" . }}-els
+{{- end }}
+
+{{- define "das-otel-env" }}
+- name: OTEL_SERVICE_NAME
+  value: {{ include "featbit.fullname" . }}-das
+{{- end }}
diff --git a/charts/featbit/templates/api-deployment.yaml b/charts/featbit/templates/api-deployment.yaml
@@ -73,7 +73,9 @@ spec:
               value: {{ .Values.api.ssoEnabled | quote }}
             {{- include "redis-env" . | indent 12 }}
             {{- include "mongodb-env" . | indent 12 }}
-            {{- include "kafka-bootstrapservers" . | indent 12 -}}
+            {{- include "otel-common-env" . | indent 12 }}
+            {{- include "api-otel-env" . | indent 12 }}
+            {{- include "kafka-bootstrapservers" . | indent 12 }}
             {{- with .Values.api.env }}
             {{ toYaml . | nindent 12 }}
             {{- end }}

diff --git a/charts/featbit/templates/da-server-deployment.yaml b/charts/featbit/templates/da-server-deployment.yaml
@@ -71,6 +71,8 @@ spec:
               value: "false"
             {{- include "redis-env" . | indent 12 }}
             {{- include "mongodb-env" . | indent 12 }}
+            {{- include "otel-common-env" . | indent 12 }}
+            {{- include "das-otel-env" . | indent 12 }}
             {{- include "das-pro-env" . | indent 12 }}
             {{- with .Values.das.env }}
             {{ toYaml . | nindent 12 }}

diff --git a/charts/featbit/templates/eval-server-deployment.yaml b/charts/featbit/templates/eval-server-deployment.yaml
@@ -69,7 +69,9 @@ spec:
           env:
             {{- include "redis-env" . | indent 12 }}
             {{- include "mongodb-env" . | indent 12 }}
-            {{- include "kafka-bootstrapservers" . | indent 12 -}}
+            {{- include "otel-common-env" . | indent 12 }}
+            {{- include "els-otel-env" . | indent 12 }}
+            {{- include "kafka-bootstrapservers" . | indent 12 }}
             {{- with .Values.els.env }}
             {{ toYaml . | nindent 12 }}
             {{- end }}

diff --git a/charts/featbit/values.yaml b/charts/featbit/values.yaml
@@ -38,7 +38,7 @@ ui:
     repository: featbit/featbit-ui
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: 3.1.0
+    tag: 3.2.1
 
   imagePullSecrets: [ ]
 
@@ -118,7 +118,7 @@ api:
     repository: featbit/featbit-api-server
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: 3.1.0
+    tag: 3.2.1
 
   imagePullSecrets: [ ]
 
@@ -196,7 +196,7 @@ els:
     repository: featbit/featbit-evaluation-server
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: 3.1.0
+    tag: 3.2.1
 
   imagePullSecrets: [ ]
 
@@ -275,7 +275,7 @@ das:
     repository: featbit/featbit-data-analytics-server
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: 3.1.0
+    tag: 3.2.1
 
   imagePullSecrets: [ ]
 
@@ -696,4 +696,11 @@ externalClickhouse:
   # -- Whether to use TLS connection connecting to ClickHouse
   secure: false
   # -- Whether to verify TLS connection connecting to ClickHouse
-  verify: false
+  verify: false
+
+openTelemetry:
+  enabled: false
+  endpoint: ""
+  protocol: "grpc"
+  insecure: true
+  timeoutInMilliseconds: 10000