Merge pull request #9 from doitintl/feat/balazs/add-resource-controll…

…-to-collector add resource controll to collector
doitintl · Sep 23, 2024 · 4fcbdd6 · 4fcbdd6
2 parents 44058c6 + e500f83
commit 4fcbdd6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/charts/doit-eks-lens/Chart.yaml b/charts/doit-eks-lens/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: doit-eks-lens
 description: A Helm chart for DoiT EKS lens
 type: application
-version: 1.0.2
+version: 1.0.3
 appVersion: "0.0.1"
diff --git a/charts/doit-eks-lens/templates/doit-otelcol.yaml b/charts/doit-eks-lens/templates/doit-otelcol.yaml
@@ -164,9 +164,7 @@ data:
         timeout: 30s
         send_batch_size : 800
       memory_limiter:
-         check_interval: 1s
-         limit_percentage: 70
-         spike_limit_percentage: 30
+{{ toYaml .Values.collector.otelcol.memory_limiter | nindent 8 }}
       resource/1:
           attributes:
             - key: service.name
@@ -408,7 +406,8 @@ spec:
           successThreshold: 1
           timeoutSeconds: 1
         name: otelcol
-        resources: {}
+        resources:
+{{ toYaml .Values.collector.otelcol.resources | nindent 10 }}
         volumeMounts:
         - mountPath: /conf
           name: doit-collector-config

diff --git a/charts/doit-eks-lens/values.yaml b/charts/doit-eks-lens/values.yaml
@@ -19,9 +19,16 @@ collector:
       endpoint: "kube-state-metrics:8080"
   ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
   tolerations: []
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+  resources: {}
+  ## Ref: https://github.com/open-telemetry/opentelemetry-collector/blob/main/processor/memorylimiterprocessor/README.md
+  memory_limiter:
+    check_interval: 1s
+    limit_percentage: 70
+    spike_limit_percentage: 30
 
 metricsDeploymentId: xxxxxxxxx
-s3_bucket: 'doitintl-eks-metrics-xxxxxxxx-us-east-1'
-s3_prefix: 'eks-metrics/xxxxxxxx/us-east-1/public'
+s3_bucket: "doitintl-eks-metrics-xxxxxxxx-us-east-1"
+s3_prefix: "eks-metrics/xxxxxxxx/us-east-1/public"
 role_arn: arn:aws:iam::xxxxxxxx:role/doit_eks_us-east-1_public
-region: us-east-1
+region: us-east-1