Add new env vars

frain-dev · Sep 15, 2024 · 4125b13 · 4125b13
1 parent 0631991
commit 4125b13
Show file tree

Hide file tree

Showing 5 changed files with 309 additions and 72 deletions.
diff --git a/charts/agent/templates/deployment.yaml b/charts/agent/templates/deployment.yaml
@@ -66,7 +66,6 @@ spec:
               containerPort: {{ .Values.app.port }}
               protocol: TCP
           env:
-
             - name: SERVICE_NAME
               value: {{ .Chart.Name }}
             - name: PORT
@@ -178,20 +177,28 @@ spec:
               value: {{ .Values.env.smtp.from | quote }}
             - name: CONVOY_SMTP_PROVIDER
               value: {{ .Values.env.smtp.provider | quote }}
+            - name: CONVOY_SMTP_SSL
+              value: {{ .Values.env.smtp.ssl }}
+            - name: CONVOY_SMTP_REPLY_TO
+              value: {{ .Values.env.smtp.reply_to | quote }}
             {{- end }}
 
 
             {{- if .Values.env.tracer.enabled }}
-            - name: CONVOY_NEWRELIC_APP_NAME
-              value: {{ .Values.env.tracer.app_name | quote }}
-            - name: CONVOY_NEWRELIC_LICENSE_KEY
-              value: {{ .Values.env.tracer.license_key | quote }}
-            - name: CONVOY_NEWRELIC_CONFIG_ENABLED
-              value: {{ .Values.env.tracer.config_enabled | quote }}
-            - name: CONVOY_NEWRELIC_DISTRIBUTED_TRACER_ENABLED
-              value: {{ .Values.env.tracer.distributed_tracer_enabled | quote }}
             - name: CONVOY_TRACER_PROVIDER
               value: {{ .Values.env.tracer.type | quote }}
+            - name: CONVOY_OTEL_SAMPLE_RATE
+              value: {{ .Values.env.tracer.otel.sample_rate | quote }}
+            - name: CONVOY_OTEL_COLLECTOR_URL
+              value: {{ .Values.env.tracer.otel.collector_url | quote }}
+            - name: CONVOY_OTEL_AUTH_HEADER_NAME
+              value: {{ .Values.env.tracer.otel.otel_auth.header_name | quote }}
+            - name: CONVOY_OTEL_AUTH_HEADER_VALUE
+              value: {{ .Values.env.tracer.otel.otel_auth.header_value | quote }}
+            - name: CONVOY_OTEL_INSECURE_SKIP_VERIFY
+              value: {{ .Values.env.tracer.otel.insecure_skip_verify | quote }}
+            - name: CONVOY_SENTRY_DSN
+              value: {{ .Values.env.tracer.sentry.dsn | quote }}
             {{- end }}
 
             {{- if .Values.env.storage.enabled }}
@@ -224,9 +231,57 @@ spec:
               value: {{ .Values.env.storage.s3.session_token | quote }}
             - name: CONVOY_STORAGE_AWS_ENDPOINT
               value: {{ .Values.env.storage.s3.endpoint | quote }}
+            - name: CONVOY_STORAGE_AWS_PREFIX
+              value: {{ .Values.env.storage.s3.prefix | quote }}
+            {{- end }}
+            {{- end }}
+
+            - name: CONVOY_INSTANCE_INGEST_RATE
+              value: {{ .Values.env.instance_ingest_rate | quote }}
+            - name: CONVOY_ANALYTICS_ENABLED
+              value: {{ .Values.env.analytics_enabled | quote }}
+            - name: CONVOY_ENABLE_PROFILING
+              value: {{ .Values.env.enable_profiling | quote }}
+
+            {{- if .Values.env.metrics.enabled }}
+            - name: CONVOY_METRICS_ENABLED
+              value: {{ .Values.env.metrics.enabled | quote }}
+            - name: CONVOY_METRICS_BACKEND
+              value: {{ .Values.env.metrics.metrics_backend | quote }}
+            - name: CONVOY_METRICS_SAMPLE_TIME
+              value: {{ .Values.env.metrics.prometheus_metrics.sample_time | quote  }}
             {{- end }}
 
+            {{- if .Values.env.pyroscope.enabled }}
+            - name: CONVOY_ENABLE_PYROSCOPE_PROFILING
+              value: {{ .Values.env.pyroscope.enabled | quote }}
+            - name: CONVOY_PYROSCOPE_URL
+              value: {{ .Values.env.pyroscope.url | quote }}
+            - name: CONVOY_PYROSCOPE_USERNAME
+              value: {{ .Values.env.pyroscope.username | quote }}
+            - name: CONVOY_PYROSCOPE_PASSWORD
+              value: {{ .Values.env.pyroscope.password | quote }}
+            - name: CONVOY_PYROSCOPE_PROFILE_ID
+              value: {{ .Values.env.pyroscope.profile_id | quote }}
             {{- end }}
+
+            {{- if .Values.env.retention_policy.enabled }}
+            - name: CONVOY_RETENTION_POLICY
+              value: {{ .Values.env.retention_policy.policy | quote }}
+            - name: CONVOY_RETENTION_POLICY_ENABLED
+              value: {{ .Values.env.retention_policy.enabled | quote }}
+            {{- end}}
+
+            - name: CONVOY_LICENSE_KEY
+              value: {{ .Values.env.license_key | quote }}
+            - name: CONVOY_ENABLE_FEATURE_FLAG
+              value: {{ .Values.env.enable_feature_flag | quote }}
+            - name: CONVOY_CONSUMER_POOL_SIZE
+              value: {{ .Values.env.consumer_pool_size | quote }}
+            - name: CONVOY_WORKER_EXECUTION_MODE
+              value: {{ .Values.env.worker_execution_mode | quote }}
+            - name: CONVOY_MAX_RETRY_SECONDS
+              value: {{ .Values.env.max_retry_seconds | quote }}
           livenessProbe:
             httpGet:
               path: /health

diff --git a/charts/agent/values.yaml b/charts/agent/values.yaml
@@ -5,12 +5,13 @@
 app:
   replicaCount: 1
   port: 5008
-  resources:
-    limits:
-      memory: 2000Mi
-    requests:
-      cpu: 1000m
-      memory: 1000Mi
+  resources: {}
+  # limits:
+  #   cpu: 1000m
+  #   memory: 2000Mi
+  # requests:
+  #   cpu: 1000m
+  #   memory: 1000Mi
   podAnnotations:
     prometheus.io/scrape: "true"
     prometheus.io/path: /metrics
@@ -29,25 +30,55 @@ env:
     provider: ""
     url: ""
     username: ""
+    ssl: false
+    reply_to: ""
   tracer:
     enabled: false
-    app_name: ""
-    config_enabled: true
-    distributed_tracer_enabled: true
-    license_key: ""
     type: ""
+    otel:
+      otel_auth:
+        header_name: ""
+        header_value: ""
+      sample_rate: 1
+      collector_url: ""
+      insecure_skip_verify: true
+    sentry:
+      dsn: ""
+  pyroscope:
+    enabled: false
+    url: ""
+    username: ""
+    password: ""
+    profile_id: ""
+  enable_feature_flag: []
+  retention_policy:
+    enabled: false
+    policy: 720h
+  analytics_enabled: true
   storage:
     enabled: false
     type: ""
     on_prem:
       path: ""
     s3:
       bucket: ""
+      prefix: ""
       accessKey: ""
       secretKey: ""
       region: ""
       session_token: ""
       endpoint: ""
+  consumer_pool_size: 100
+  enable_profiling: false
+  metrics:
+    enabled: false
+    metrics_backend: prometheus
+    prometheus_metrics:
+      sample_time: 5
+  instance_ingest_rate: 100
+  worker_execution_mode: default
+  max_retry_seconds: 7200
+  license_key: ""
 
 image:
   repository: getconvoy/convoy

diff --git a/charts/server/templates/deployment.yaml b/charts/server/templates/deployment.yaml
@@ -79,6 +79,8 @@ spec:
               value: {{ .Values.env.log_level | quote }}
             - name: CONVOY_SIGNUP_ENABLED
               value: {{ .Values.env.sign_up_enabled | quote }}
+            - name: CONVOY_MAX_RESPONSE_SIZE
+              value: {{ .Values.env.max_response_size | quote }}
 
             {{- if .Values.global.externalDatabase.enabled }}
             - name: CONVOY_DB_SCHEME
@@ -155,18 +157,33 @@ spec:
             {{- end }}
 
             {{- if .Values.env.tracer.enabled }}
-            - name: CONVOY_NEWRELIC_APP_NAME
-              value: {{ .Values.env.tracer.app_name | quote }}
-            - name: CONVOY_NEWRELIC_LICENSE_KEY
-              value: {{ .Values.env.tracer.license_key | quote }}
-            - name: CONVOY_NEWRELIC_CONFIG_ENABLED
-              value: {{ .Values.env.tracer.config_enabled | quote }}
-            - name: CONVOY_NEWRELIC_DISTRIBUTED_TRACER_ENABLED
-              value: {{ .Values.env.tracer.distributed_tracer_enabled | quote }}
             - name: CONVOY_TRACER_PROVIDER
               value: {{ .Values.env.tracer.type | quote }}
+            - name: CONVOY_OTEL_SAMPLE_RATE
+              value: {{ .Values.env.tracer.otel.sample_rate | quote }}
+            - name: CONVOY_OTEL_AUTH_HEADER_NAME
+              value: {{ .Values.env.tracer.otel.otel_auth.header_name | quote }}
+            - name: CONVOY_OTEL_AUTH_HEADER_VALUE
+              value: {{ .Values.env.tracer.otel.otel_auth.header_value | quote }}
+            - name: CONVOY_OTEL_COLLECTOR_URL
+              value: {{ .Values.env.tracer.otel.collector_url | quote }}
+            - name: CONVOY_OTEL_INSECURE_SKIP_VERIFY
+              value: {{ .Values.env.tracer.otel.insecure_skip_verify | quote }}
+            - name: CONVOY_SENTRY_DSN
+              value: {{ .Values.env.tracer.sentry.dsn | quote }}
             {{- end }}
 
+            - name: CONVOY_INSTANCE_INGEST_RATE
+              value: {{ .Values.env.instance_ingest_rate | quote }}
+            - name: CONVOY_ENABLE_FEATURE_FLAG
+              value: {{ .Values.env.enable_feature_flag | quote }}
+            - name: CONVOY_ANALYTICS_ENABLED
+              value: {{ .Values.env.analytics_enabled | quote }}
+            - name: CONVOY_ENABLE_PROFILING
+              value: {{ .Values.env.enable_profiling | quote }}
+            - name: CONVOY_API_VERSION
+              value: {{ .Values.env.api_version | quote }}
+
             {{- if .Values.env.storage.enabled }}
             - name: CONVOY_STORAGE_POLICY_TYPE
               value: {{ .Values.env.storage.type | quote }}
@@ -198,9 +215,40 @@ spec:
             - name: CONVOY_STORAGE_AWS_ENDPOINT
               value: {{ .Values.env.storage.s3.endpoint | quote }}
             {{- end }}
+            {{- end }}
+
+            {{- if .Values.env.metrics.enabled }}
+            - name: CONVOY_METRICS_ENABLED
+              value: {{ .Values.env.metrics.enabled | quote }}
+            - name: CONVOY_METRICS_BACKEND
+              value: {{ .Values.env.metrics.metrics_backend | quote }}
+            - name: CONVOY_METRICS_SAMPLE_TIME
+              value: {{ .Values.env.metrics.prometheus_metrics.sample_time }}
+                  {{- end }}
 
+                  {{- if .Values.env.pyroscope.enabled | quote }}
+            - name: CONVOY_ENABLE_PYROSCOPE_PROFILING
+              value: {{ .Values.env.pyroscope.enabled | quote }}
+            - name: CONVOY_PYROSCOPE_URL
+              value: {{ .Values.env.pyroscope.url | quote }}
+            - name: CONVOY_PYROSCOPE_USERNAME
+              value: {{ .Values.env.pyroscope.username | quote }}
+            - name: CONVOY_PYROSCOPE_PASSWORD
+              value: {{ .Values.env.pyroscope.password | quote }}
+            - name: CONVOY_PYROSCOPE_PROFILE_ID
+              value: {{ .Values.env.pyroscope.profile_id | quote }}
             {{- end }}
+            {{- if .Values.env.retention_policy.enabled }}
+            - name: CONVOY_RETENTION_POLICY
+              value: {{ .Values.env.retention_policy.policy | quote }}
+            - name: CONVOY_RETENTION_POLICY_ENABLED
+              value: {{ .Values.env.retention_policy.enabled | quote }}
+            {{- end}}
 
+            - name: CONVOY_LICENSE_KEY
+              value: {{ .Values.env.license_key | quote }}
+            - name: CONVOY_MAX_RETRY_SECONDS
+              value: {{ .Values.env.max_retry_seconds | quote }}
           livenessProbe:
             httpGet:
               path: /health

diff --git a/charts/server/values.yaml b/charts/server/values.yaml
@@ -5,12 +5,13 @@
 app:
   replicaCount: 1
   port: 5005
-  resources:
-    limits:
-      memory: 2000Mi
-    requests:
-      cpu: 1000m
-      memory: 1000Mi
+  resources: {}
+  # limits:
+  #   cpu: 1000m
+  #   memory: 2000Mi
+  # requests:
+  #   cpu: 1000m
+  #   memory: 1000Mi
   podAnnotations:
     prometheus.io/scrape: "true"
     prometheus.io/path: /metrics
@@ -29,24 +30,52 @@ env:
   host: ""
   tracer:
     enabled: false
-    app_name: ""
-    config_enabled: false
-    distributed_tracer_enabled: false
-    license_key: ""
     type: ""
+    otel:
+      otel_auth:
+        header_name: ""
+        header_value: ""
+      sample_rate: 1
+      collector_url: ""
+      insecure_skip_verify: true
+    sentry:
+      dsn: ""
   storage:
     enabled: false
     type: ""
     on_prem:
       path: ""
     s3:
       bucket: ""
+      prefix: ""
       accessKey: ""
       secretKey: ""
       region: ""
       session_token: ""
       endpoint: ""
-
+  api_version: ""
+  pyroscope:
+    enabled: false
+    url: ""
+    username: ""
+    password: ""
+    profile_id: ""
+  enable_feature_flag: []
+  retention_policy:
+    policy: 720h
+    enabled: false
+  analytics:
+    enabled: true
+  enable_profiling: false
+  metrics:
+    enabled: false
+    metrics_backend: prometheus
+    prometheus_metrics:
+      sample_time: 5
+  instance_ingest_rate: 100
+  analytics_enabled: true
+  max_retry_seconds: 7200
+  license_key: ""
 
 image:
   repository: getconvoy/convoy