diff --git a/charts/chainlink-cluster/devspace.yaml b/charts/chainlink-cluster/devspace.yaml index 90073c91a87..d46e28572bb 100644 --- a/charts/chainlink-cluster/devspace.yaml +++ b/charts/chainlink-cluster/devspace.yaml @@ -117,6 +117,8 @@ deployments: runAsGroup: 999 web_port: 6688 p2p_port: 6690 + # extraEnvVars: + # "CL_MEDIAN_CMD": "chainlink-feeds" nodes: - name: node-1 image: ${runtime.images.app} @@ -161,7 +163,14 @@ deployments: # [WebServer.TLS] # HTTPSPort = 0 # or use overridesToml to override some part of configuration - # overridesToml: | + # overridesToml: | + # Enable Tracing + # [Tracing] + # Enabled = true + # SamplingRatio = 1.0 + # CollectorTarget = 'app-opentelemetry-collector:4317' + # TLSCertPath = '' + # Mode = 'unencrypted' - name: node-2 image: ${runtime.images.app} - name: node-3 diff --git a/charts/chainlink-cluster/templates/chainlink-node-deployment.yaml b/charts/chainlink-cluster/templates/chainlink-node-deployment.yaml index 910d9bac7ce..38676716f90 100644 --- a/charts/chainlink-cluster/templates/chainlink-node-deployment.yaml +++ b/charts/chainlink-cluster/templates/chainlink-node-deployment.yaml @@ -74,6 +74,10 @@ spec: value: postgresql://postgres:verylongdatabasepassword@{{ $.Release.Name }}-db-{{ $cfg.name }}/chainlink?sslmode=disable - name: CL_DEV value: "false" + {{- range $name, $value := $.Values.chainlink.extraEnvVars }} + - name: "{{ $name }}" + value: "{{ $value }}" + {{- end }} volumeMounts: - name: {{ $.Release.Name }}-{{ $cfg.name }}-cm mountPath: /etc/node-secrets-volume/ diff --git a/charts/chainlink-cluster/values.yaml b/charts/chainlink-cluster/values.yaml index adc81ee4729..d3c1c384a2b 100644 --- a/charts/chainlink-cluster/values.yaml +++ b/charts/chainlink-cluster/values.yaml @@ -185,14 +185,12 @@ opentelemetry-collector: otlp: protocols: grpc: - endpoint: "0.0.0.0:4317" + endpoint: ${env:MY_POD_IP}:4317 http: - endpoint: "0.0.0.0:3100" + endpoint: ${env:MY_POD_IP}:4318 exporters: - file: - path: /tracing/trace-data.json otlp: - endpoint: tempo:4317 + endpoint: app-tempo:4317 tls: insecure: true service: @@ -202,27 +200,13 @@ opentelemetry-collector: pipelines: traces: receivers: [otlp] - exporters: [file, otlp] + exporters: [otlp] tempo: enabled: true image: tag: "1.7.2" - server: - http_listen_port: 3200 # default storage path: /var/tempo/ - readinessProbe: - httpGet: - path: /ready - port: 3200 - initialDelaySeconds: 10 - periodSeconds: 5 - livenessProbe: - httpGet: - path: /ready - port: 3200 - initialDelaySeconds: 20 - periodSeconds: 10 securityContext: runAsNonRoot: true runAsUser: 10001 @@ -239,7 +223,7 @@ tempo: grafana: enabled: true image: - tag: 7.3.2 + tag: 10.4.1 rbac: namespaced: true datasources: @@ -250,7 +234,7 @@ grafana: type: tempo access: proxy orgId: 1 - url: http://tempo:3200 + url: http://app-tempo:3100 basicAuth: false isDefault: true version: 1 @@ -264,7 +248,7 @@ grafana: GF_AUTH_ANONYMOUS_ENABLED: "true" GF_AUTH_ANONYMOUS_ORG_ROLE: "Admin" GF_AUTH_DISABLE_LOGIN_FORM: "true" - GF_FEATURE_TOGGLES_ENABLE: "traceqlEditor" + GF_FEATURE_TOGGLES_ENABLE: "traceqlEditor tempoSearch tempoServiceGraph" ingress: enabled: false @@ -430,7 +414,7 @@ networkPolicies: app: tempo ports: - protocol: TCP - port: 3100 + port: 4317 # Configure the default network policy. networkPolicyDefault: