feat(base-cluster/ingress): enable tracing for nginx (#578)

teutonet · Sep 14, 2023 · b7aabcb · b7aabcb
1 parent abcce53
commit b7aabcb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 45 deletions.
diff --git a/charts/base-cluster/templates/ingress/nginx.yaml b/charts/base-cluster/templates/ingress/nginx.yaml
@@ -23,11 +23,20 @@ spec:
         serviceMonitor:
           enabled: {{ .Values.monitoring.prometheus.enabled }}
           additionalLabels: {{- .Values.monitoring.labels | toYaml | nindent 12 }}
+      {{- if .Values.monitoring.tracing.enabled }}
+      opentelemetry:
+        enabled: true
+      {{- end }}
       config:
-        use-proxy-protocol: "true"
-        use-gzip: "true"
-        enable-brotli: "true"
+        use-proxy-protocol: true
+        use-gzip: true
+        enable-brotli: true
         enable-underscores-in-headers: true
+        {{- if .Values.monitoring.tracing.enabled }}
+        enable-opentelemetry: true
+        opentelemetry-operation-name: ingress
+        otlp-collector-host: open-telemetry-collector-opentelemetry-collector.monitoring
+        {{- end }}
       service:
         annotations:
           loadbalancer.openstack.org/proxy-protocol: "true"

diff --git a/charts/base-cluster/templates/monitoring/tracing/opentelemetry-collector.yaml b/charts/base-cluster/templates/monitoring/tracing/opentelemetry-collector.yaml
@@ -14,50 +14,22 @@ spec:
   dependsOn:
     - name: kube-prometheus-stack
       namespace: monitoring
+  upgrade:
+    timeout: 5m
   values:
     image:
       repository: {{ printf "%s/otel/opentelemetry-collector-contrib" ($.Values.global.imageRegistry | default (include "base-cluster.defaultRegistry" (dict))) }}
     mode: daemonset
-    hostNetwork: true
     service:
       enabled: true
-    dnsPolicy: ClusterFirstWithHostNet
-    extraEnvs:
-      - name: HOST_IP
-        valueFrom:
-          fieldRef:
-            fieldPath: status.hostIP
     config:
-      extensions:
-        health_check:
-          endpoint: ${env:HOST_IP}:13133
       receivers:
-        jaeger:
-          protocols:
-            grpc:
-              endpoint: ${env:HOST_IP}:14250
-            thrift_http:
-              endpoint: ${env:HOST_IP}:14268
-            thrift_compact:
-              endpoint: ${env:HOST_IP}:6831
-        otlp:
-          protocols:
-            grpc:
-              endpoint: ${env:HOST_IP}:4317
-            http:
-              endpoint: ${env:HOST_IP}:4318
         prometheus: null
-        zipkin:
-          endpoint: ${env:HOST_IP}:9411
       service:
         pipelines:
           logs: null
           metrics: null
           traces:
-            receivers:
-              - otlp
-              - jaeger
-              - zipkin
             processors:
               - batch
             exporters:
@@ -72,18 +44,6 @@ spec:
       kubernetesAttributes:
         enabled: true
     ports:
-      jaeger-compact:
-        enabled: true
-      jaeger-thrift:
-        enabled: true
-      jaeger-grpc:
-        enabled: true
-      otlp:
-        enabled: true
-      otlp-http:
-        enabled: true
-      zipkin:
-        enabled: true
       metrics:
         enabled: true
     podMonitor: