otel-demo: using the latest Coroot version

coroot · May 24, 2024 · 7373d24 · 7373d24
1 parent fdacbb6
commit 7373d24
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 24 deletions.
diff --git a/charts/otel-demo/Chart.yaml b/charts/otel-demo/Chart.yaml
@@ -2,14 +2,14 @@ apiVersion: v2
 name: otel-demo
 description: otel-demo
 type: application
-version: 0.1.0
+version: 0.1.1
 appVersion: "0.1.0"
 dependencies:
   - name: opentelemetry-demo
     version: 0.28.3
     repository: https://open-telemetry.github.io/opentelemetry-helm-charts
   - name: coroot
-    version: 0.8.14
+    version: 0.10.17
     repository: https://coroot.github.io/helm-charts
   - name: chaos-mesh
     version: 2.6.3

diff --git a/charts/otel-demo/values.yaml b/charts/otel-demo/values.yaml
@@ -6,25 +6,64 @@ opentelemetry-demo:
   jaeger:
     enabled: false
   opentelemetry-collector:
-    enabled: false
+    enabled: true
+    resources:
+      requests:
+        memory: 1G
+      limits:
+        memory: 2G
+    config:
+      exporters:
+        otlphttp:
+          endpoint: 'http://coroot:8080'
+      service:
+        pipelines:
+          traces:
+            receivers: [ otlp ]
+            processors: [ memory_limiter, resource, batch ]
+            exporters: [ otlphttp ]
+          metrics:
+            receivers: [ otlp ]
+            processors: [ memory_limiter, resource, batch ]
+            exporters: [ debug ]
+          logs:
+            receivers: [ otlp ]
+            processors: [ memory_limiter, resource, batch ]
+            exporters: [ otlphttp ]
   components:
     frontend:
       resources:
         limits:
           cpu: 500m
           memory: 500M
-      replicas: 2
+      replicas: 1
+    cartService:
+      replicas: 1
+      resources:
+        limits:
+          memory: 200M
+          cpu: 500m
+    checkoutService:
+      replicas: 1
+      resources:
+        limits:
+          memory: 100M
+          cpu: 500m
     quoteService:
       replicas: 1
     emailService:
       resources:
         limits:
           memory: 300M
     productCatalogService:
+      replicas: 1
       resources:
+        requests:
+          memory: 10M
+          cpu: 100m
         limits:
           memory: 20M
-          cpu: 100m
+          cpu: 500m
     frontendProxy:
       service:
         type: NodePort
@@ -51,20 +90,6 @@ opentelemetry-demo:
         - name: OTEL_EXPORTER_OTLP_ENDPOINT
           value: http://$(OTEL_COLLECTOR_NAME):4317
 
-  default:
-    env:
-      - name: OTEL_SERVICE_NAME
-        valueFrom:
-          fieldRef:
-            apiVersion: v1
-            fieldPath: "metadata.labels['app.kubernetes.io/component']"
-      - name: OTEL_COLLECTOR_NAME
-        value: 'coroot-opentelemetry-collector'
-      - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
-        value: cumulative
-      - name: OTEL_RESOURCE_ATTRIBUTES
-        value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo
-
 redis:
   fullnameOverride: "redis"
   architecture: standalone
@@ -86,20 +111,18 @@ coroot:
     fullnameOverride: coroot-cluster-agent
   node-agent:
     fullnameOverride: coroot-node-agent
+    env:
+      - name: EPHEMERAL_PORT_RANGE
+        value: "50054-60999"
   clickhouse:
     fullnameOverride: coroot-clickhouse
     auth:
       password: "clickhouse_password"
   prometheus:
     server:
-      service:
-        type: NodePort
-        nodePort: 30002
       fullnameOverride: coroot-prometheus-server
     kube-state-metrics:
       fullnameOverride: coroot-kube-state-metrics
-  opentelemetry-collector:
-    fullnameOverride: coroot-opentelemetry-collector
 
 chaos-mesh:
   rbac: