diff --git a/charts/uptrace/templates/otelcol-deployment.yaml b/charts/uptrace/templates/otelcol-deployment.yaml index 624dafc..f55e50f 100644 --- a/charts/uptrace/templates/otelcol-deployment.yaml +++ b/charts/uptrace/templates/otelcol-deployment.yaml @@ -26,6 +26,9 @@ spec: volumeMounts: - name: config mountPath: /etc/config + - name: varlogpods + mountPath: /var/log/pods + readOnly: true imagePullPolicy: IfNotPresent env: {{- toYaml .Values.uptrace.env | nindent 12 }} @@ -33,4 +36,7 @@ spec: - name: config configMap: name: otelcol + - name: varlogpods + hostPath: + path: /var/log/pods {{ end }} diff --git a/charts/uptrace/values.yaml b/charts/uptrace/values.yaml index 66a401a..0c20089 100644 --- a/charts/uptrace/values.yaml +++ b/charts/uptrace/values.yaml @@ -9,13 +9,11 @@ fullnameOverride: '' podAnnotations: {} # Security context for pod templates. -podSecurityContext: - {} +podSecurityContext: {} # fsGroup: 2000 # Security context for containers. -containerSecurityContext: - {} +containerSecurityContext: {} # capabilities: # drop: # - ALL @@ -52,8 +50,7 @@ clickhouse: http_port: 8123 tcp_port: 9000 - resources: - {} + resources: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following @@ -81,8 +78,7 @@ postgresql: size: 4Gi storageClass: '' - resources: - {} + resources: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following @@ -111,6 +107,72 @@ otelcol: k8s_cluster: auth_type: serviceAccount collection_interval: 15s + kubeletstats: + collection_interval: 15s + auth_type: 'serviceAccount' + endpoint: 'https://${env:K8S_NODE_NAME}:10250' + insecure_skip_verify: true + filelog: + include: [/var/log/pods/*/*/*.log] + include_file_name: false + include_file_path: true + start_at: end # Recommended: use "end" for production + operators: + - type: router + id: get-format + routes: + - expr: body matches "^\\{" + output: parser-docker + - expr: body matches "^[^ Z]+ " + output: parser-crio + - expr: body matches "^[^ Z]+Z" + output: parser-containerd + - type: regex_parser + id: parser-crio + output: extract_metadata_from_filepath + regex: ^(?P