From 0836da66fb0746546eb13bdb8e6cda3a2c8cb976 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Mon, 11 Aug 2025 14:58:09 +0200 Subject: [PATCH] Globally align tracing settings - introduce .global.tracing.collector.port.* keys to make ports separately configurable - remove port from .global.tracing.collector.baseUrl setting - align all charts to use these settings - [portal-ng] make sure to remove COLLECTOR_HOST and _PORT value overrides you may have in .global.env Issue-ID: OOM-3350 Change-Id: Ic294dd277b38b1a8cc2f3c02df3da703e030b6eb Signed-off-by: Fiete Ostkamp --- argo/onap/values/values-global.yaml | 8 ++++-- .../resources/config/application.yaml | 14 ++++----- .../a1policymanagement/templates/statefulset.yaml | 26 ++++++++--------- kubernetes/a1policymanagement/values.yaml | 33 +++++++++++++--------- .../resources/config/application.properties | 2 +- kubernetes/aai/components/aai-babel/values.yaml | 8 ++++-- .../resources/application.properties | 2 +- .../aai/components/aai-modelloader/values.yaml | 6 +++- .../resources/config/application.properties | 2 +- .../aai/components/aai-resources/values.yaml | 9 ++++-- .../config/application.properties | 2 +- .../aai/components/aai-schema-service/values.yaml | 7 ++++- .../resources/config/application.properties | 2 +- .../aai/components/aai-traversal/values.yaml | 6 +++- kubernetes/aai/values.yaml | 6 +++- .../resources/config/application.properties | 2 +- .../cds-blueprints-processor/values.yaml | 6 +++- kubernetes/cds/values.yaml | 6 +++- kubernetes/cps/Chart.yaml | 2 +- kubernetes/cps/components/cps-core/Chart.yaml | 4 +-- .../cps-core/resources/config/application-helm.yml | 20 +++++++++---- kubernetes/cps/components/cps-core/values.yaml | 31 ++++++++++---------- kubernetes/cps/values.yaml | 9 ++++++ kubernetes/onap/values.yaml | 7 ++++- .../portal-ng-bff/templates/configmap.yaml | 3 ++ .../templates/tests/test-connection.yaml | 19 ------------- .../portal-ng/components/portal-ng-bff/values.yaml | 13 +++++++-- .../portal-ng-history/templates/configmap.yaml | 6 ++-- .../components/portal-ng-history/values.yaml | 15 ++++++---- .../portal-ng-preferences/templates/configmap.yaml | 6 ++-- .../templates/tests/test-connection.yaml | 19 ------------- .../components/portal-ng-preferences/values.yaml | 15 ++++++---- .../sdc-helm-validator/templates/deployment.yaml | 2 +- .../sdc/components/sdc-helm-validator/values.yaml | 6 +++- .../sdc-wfd-be/templates/deployment.yaml | 2 +- kubernetes/sdc/components/sdc-wfd-be/values.yaml | 8 +++++- kubernetes/sdc/values.yaml | 6 +++- .../resources/config/overrides/override.yaml | 2 +- kubernetes/so/components/so-bpmn-infra/values.yaml | 6 +++- .../resources/config/overrides/override.yaml | 2 +- .../components/so-catalog-db-adapter/values.yaml | 6 +++- .../resources/config/overrides/override.yaml | 2 +- .../so/components/so-cnf-adapter/values.yaml | 6 +++- .../resources/config/overrides/override.yaml | 2 +- .../so/components/so-openstack-adapter/values.yaml | 6 +++- .../resources/config/overrides/override.yaml | 2 +- .../components/so-request-db-adapter/values.yaml | 6 +++- .../resources/config/overrides/override.yaml | 2 +- .../so/components/so-sdc-controller/values.yaml | 6 +++- .../resources/config/overrides/override.yaml | 2 +- .../so/components/so-sdnc-adapter/values.yaml | 6 +++- .../so/resources/config/overrides/override.yaml | 2 +- kubernetes/so/values.yaml | 6 +++- .../resources/config/application.properties | 4 +-- kubernetes/uui/components/uui-server/values.yaml | 8 ++++-- 55 files changed, 256 insertions(+), 160 deletions(-) delete mode 100644 kubernetes/portal-ng/components/portal-ng-bff/templates/tests/test-connection.yaml delete mode 100644 kubernetes/portal-ng/components/portal-ng-preferences/templates/tests/test-connection.yaml diff --git a/argo/onap/values/values-global.yaml b/argo/onap/values/values-global.yaml index 23adee3dc6..a1b6b71864 100644 --- a/argo/onap/values/values-global.yaml +++ b/argo/onap/values/values-global.yaml @@ -76,9 +76,13 @@ global: # enable this if you have deployed Jaeger alongside ONAP tracing: - enabled: true + enabled: false collector: - baseUrl: http://jaeger-collector.istio-system:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) diff --git a/kubernetes/a1policymanagement/resources/config/application.yaml b/kubernetes/a1policymanagement/resources/config/application.yaml index e9e54799ac..78b5328d69 100644 --- a/kubernetes/a1policymanagement/resources/config/application.yaml +++ b/kubernetes/a1policymanagement/resources/config/application.yaml @@ -95,15 +95,15 @@ management: tracing: enabled: {{ .Values.global.tracing.enabled | default true }} propagation: - produce: [{{ .Values.global.tracing.propagator.produce.type }}] + produce: [{{ .Values.tracing.propagator.produce.type }}] sampling: probability: {{ .Values.global.tracing.sampling.probability | default "1.0" }} otel: exporter: otlp: traces: - endpoint: {{ .Values.global.tracing.collector.baseUrl | default "http://jaeger:4317" }} - protocol: {{ .Values.global.tracing.collector.protocol | default "grpc" }} + endpoint: {{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.otlpGrpc }} + protocol: {{ .Values.tracing.collector.protocol | default "grpc" }} logs: exporter: none metrics: @@ -116,16 +116,16 @@ otel: spring-webflux: enabled: false {{- else }} - disabled: {{ .Values.global.tracing.sdk.disabled | default false }} - south: {{ .Values.global.tracing.sdk.south | default true }} + disabled: {{ .Values.tracing.sdk.disabled | default false }} + south: {{ .Values.tracing.sdk.south | default true }} instrumentation: spring-webflux: - enabled: {{ .Values.global.tracing.north.enabled | default true }} + enabled: {{ .Values.tracing.north.enabled | default true }} {{- end }} tracing: sampler: jaeger_remote: - endpoint: {{ .Values.global.tracing.sampling.baseUrl | default "http://jaeger:14250" }} + endpoint: {{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.grpc }} server: # Configuration of the HTTP/REST server. The parameters are defined and handeled by the springboot framework. # See springboot documentation. diff --git a/kubernetes/a1policymanagement/templates/statefulset.yaml b/kubernetes/a1policymanagement/templates/statefulset.yaml index 3191087723..6b03063034 100644 --- a/kubernetes/a1policymanagement/templates/statefulset.yaml +++ b/kubernetes/a1policymanagement/templates/statefulset.yaml @@ -54,19 +54,19 @@ spec: value: {{ .Values.app.logging.config | quote }} {{- if .Values.global.tracing.enabled }} - name: ONAP_PROPAGATOR_PRODUCE - value: "[{{ .Values.global.tracing.propagator.produce.type }}]" + value: "[{{ .Values.tracing.propagator.produce.type }}]" - name: ONAP_OTEL_EXPORTER_ENDPOINT - value: {{ .Values.global.tracing.collector.baseUrl | quote }} + value: "{{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.otlpGrpc }}" - name: ONAP_OTEL_EXPORTER_PROTOCOL - value: {{ .Values.global.tracing.collector.protocol | quote }} + value: {{ .Values.tracing.collector.protocol | quote }} - name: ONAP_SDK_DISABLED - value: {{ .Values.global.tracing.sdk.disabled | quote }} + value: {{ .Values.tracing.sdk.disabled | quote }} - name: ONAP_TRACING_SOUTHBOUND - value: {{ .Values.global.tracing.sdk.south | quote }} + value: {{ .Values.tracing.sdk.south | quote }} - name: ONAP_TRACING_NORTHBOUND - value: {{ .Values.global.tracing.north.enabled | quote }} + value: {{ .Values.tracing.north.enabled | quote }} - name: ONAP_OTEL_SAMPLER_JAEGER_REMOTE_ENDPOINT - value: {{ .Values.global.tracing.sampling.baseUrl | quote }} + value: "{{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.grpc }}" {{- end }} volumeMounts: - mountPath: /config-input @@ -94,17 +94,17 @@ spec: value: {{ .Values.app.logging.config | quote }} {{- if .Values.global.tracing.enabled }} - name: ONAP_PROPAGATOR_PRODUCE - value: "[{{ .Values.global.tracing.propagator.produce.type }}]" + value: "[{{ .Values.tracing.propagator.produce.type }}]" - name: ONAP_OTEL_EXPORTER_ENDPOINT - value: {{ .Values.global.tracing.collector.baseUrl | quote }} + value: {{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.otlpGrpc }} - name: ONAP_OTEL_EXPORTER_PROTOCOL - value: {{ .Values.global.tracing.collector.protocol | quote }} + value: {{ .Values.tracing.collector.protocol | quote }} - name: ONAP_SDK_DISABLED - value: {{ .Values.global.tracing.sdk.disabled | quote }} + value: {{ .Values.tracing.sdk.disabled | quote }} - name: ONAP_TRACING_SOUTHBOUND - value: {{ .Values.global.tracing.sdk.south | quote }} + value: {{ .Values.tracing.sdk.south | quote }} - name: ONAP_TRACING_NORTHBOUND - value: {{ .Values.global.tracing.north.enabled | quote }} + value: {{ .Values.tracing.north.enabled | quote }} - name: ONAP_OTEL_SAMPLER_JAEGER_REMOTE_ENDPOINT value: {{ .Values.global.tracing.sampling.baseUrl | quote }} {{- end }} diff --git a/kubernetes/a1policymanagement/values.yaml b/kubernetes/a1policymanagement/values.yaml index 5253af0a0e..b2d24e9e27 100644 --- a/kubernetes/a1policymanagement/values.yaml +++ b/kubernetes/a1policymanagement/values.yaml @@ -23,21 +23,15 @@ global: persistence: {} tracing: enabled: false - propagator: - produce: - # This can have several options included in a comma separated list W3C,B3,B3_MULTI - type: W3C collector: - baseUrl: "http://jaeger:4317" - protocol: "grpc" + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: - baseUrl: "http://jaeger:14250" - probability: "1.0" - sdk: - south: true - disabled: false - north: - enabled: true + probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) + secrets: - uid: controller-secret @@ -179,4 +173,15 @@ app: reactiveEntryExitFilterEnabled: true reactiveEntryExitFilterExcludePaths: "" - +tracing: + propagator: + produce: + # This can have several options included in a comma separated list W3C,B3,B3_MULTI + type: W3C + collector: + protocol: "grpc" + sdk: + south: true + disabled: false + north: + enabled: true diff --git a/kubernetes/aai/components/aai-babel/resources/config/application.properties b/kubernetes/aai/components/aai-babel/resources/config/application.properties index 8f47bf084b..1be5718273 100644 --- a/kubernetes/aai/components/aai-babel/resources/config/application.properties +++ b/kubernetes/aai/components/aai-babel/resources/config/application.properties @@ -26,7 +26,7 @@ tosca.mappings.config=${CONFIG_HOME}/tosca-mappings.json spring.application.name=aai-babel spring.sleuth.enabled={{ .Values.global.tracing.enabled }} -spring.zipkin.baseUrl={{ .Values.global.tracing.collector.baseUrl }} +spring.zipkin.baseUrl={{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }} spring.sleuth.messaging.jms.enabled = false spring.sleuth.trace-id128=true spring.sleuth.sampler.probability={{ .Values.global.tracing.sampling.probability }} diff --git a/kubernetes/aai/components/aai-babel/values.yaml b/kubernetes/aai/components/aai-babel/values.yaml index 1af40c9d79..3dd736927a 100644 --- a/kubernetes/aai/components/aai-babel/values.yaml +++ b/kubernetes/aai/components/aai-babel/values.yaml @@ -22,9 +22,13 @@ global: tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: - probability: 1.0 + probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) ################################################################# # Application configuration defaults. diff --git a/kubernetes/aai/components/aai-modelloader/resources/application.properties b/kubernetes/aai/components/aai-modelloader/resources/application.properties index 8180e96cb5..ceb231184b 100644 --- a/kubernetes/aai/components/aai-modelloader/resources/application.properties +++ b/kubernetes/aai/components/aai-modelloader/resources/application.properties @@ -11,7 +11,7 @@ server.port=9500 spring.application.name=aai-model-loader spring.sleuth.enabled={{ .Values.global.tracing.enabled }} -spring.zipkin.baseUrl={{ .Values.global.tracing.collector.baseUrl }} +spring.zipkin.baseUrl={{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }} spring.sleuth.messaging.jms.enabled=false spring.sleuth.trace-id128=true spring.sleuth.sampler.probability={{ .Values.global.tracing.sampling.probability }} diff --git a/kubernetes/aai/components/aai-modelloader/values.yaml b/kubernetes/aai/components/aai-modelloader/values.yaml index 6d43771660..57c3d83138 100644 --- a/kubernetes/aai/components/aai-modelloader/values.yaml +++ b/kubernetes/aai/components/aai-modelloader/values.yaml @@ -22,7 +22,11 @@ global: # global defaults tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) auth: diff --git a/kubernetes/aai/components/aai-resources/resources/config/application.properties b/kubernetes/aai/components/aai-resources/resources/config/application.properties index 7676475e73..d1cdf530bb 100644 --- a/kubernetes/aai/components/aai-resources/resources/config/application.properties +++ b/kubernetes/aai/components/aai-resources/resources/config/application.properties @@ -31,7 +31,7 @@ server.servlet.context-path=/ management.tracing.enabled={{ .Values.global.tracing.enabled }} management.tracing.sampling.probability={{ .Values.global.tracing.sampling.probability }} management.tracing.propagation.type=w3c, b3 -management.zipkin.tracing.endpoint={{ .Values.global.tracing.collector.baseUrl }} +management.zipkin.tracing.endpoint={{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }} spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,org.keycloak.adapters.springboot.KeycloakAutoConfiguration,org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration,org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml index f97ca9829b..50bb0ee031 100644 --- a/kubernetes/aai/components/aai-resources/values.yaml +++ b/kubernetes/aai/components/aai-resources/values.yaml @@ -29,9 +29,14 @@ global: # global defaults tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: - probability: 1.0 + probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) + # Specifies a list of jobs to be run jobs: diff --git a/kubernetes/aai/components/aai-schema-service/config/application.properties b/kubernetes/aai/components/aai-schema-service/config/application.properties index ff37210f43..f491f4dd95 100644 --- a/kubernetes/aai/components/aai-schema-service/config/application.properties +++ b/kubernetes/aai/components/aai-schema-service/config/application.properties @@ -27,7 +27,7 @@ spring.jersey.application-path=${schema.uri.base.path} spring.main.allow-bean-definition-overriding=true spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration spring.sleuth.enabled={{ .Values.global.tracing.enabled }} -spring.zipkin.baseUrl={{ .Values.global.tracing.collector.baseUrl }} +spring.zipkin.baseUrl={{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }} spring.sleuth.trace-id128=true spring.sleuth.sampler.probability={{ .Values.global.tracing.sampling.probability }} spring.sleuth.propagation.type=w3c, b3 diff --git a/kubernetes/aai/components/aai-schema-service/values.yaml b/kubernetes/aai/components/aai-schema-service/values.yaml index 4333129177..f88d73fd10 100644 --- a/kubernetes/aai/components/aai-schema-service/values.yaml +++ b/kubernetes/aai/components/aai-schema-service/values.yaml @@ -22,10 +22,15 @@ global: # global defaults tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) + # Specifies if basic authorization is enabled auth: enabled: true diff --git a/kubernetes/aai/components/aai-traversal/resources/config/application.properties b/kubernetes/aai/components/aai-traversal/resources/config/application.properties index b3e869d504..acecd40466 100644 --- a/kubernetes/aai/components/aai-traversal/resources/config/application.properties +++ b/kubernetes/aai/components/aai-traversal/resources/config/application.properties @@ -35,7 +35,7 @@ spring.jersey.application-path=/ management.tracing.enabled={{ .Values.global.tracing.enabled }} management.tracing.sampling.probability={{ .Values.global.tracing.sampling.probability }} management.tracing.propagation.type=w3c, b3 -management.zipkin.tracing.endpoint={{ .Values.global.tracing.collector.baseUrl }} +management.zipkin.tracing.endpoint={{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }} #The max number of active threads in this pool server.tomcat.max-threads=200 diff --git a/kubernetes/aai/components/aai-traversal/values.yaml b/kubernetes/aai/components/aai-traversal/values.yaml index 34d07c1b1b..98442a9ca5 100644 --- a/kubernetes/aai/components/aai-traversal/values.yaml +++ b/kubernetes/aai/components/aai-traversal/values.yaml @@ -31,7 +31,11 @@ global: # global defaults tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml index 6c8157b84d..b5796790ce 100644 --- a/kubernetes/aai/values.yaml +++ b/kubernetes/aai/values.yaml @@ -37,7 +37,11 @@ global: # global defaults tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) diff --git a/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties b/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties index 248e5bf4ec..94e487c2bf 100755 --- a/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties +++ b/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties @@ -198,7 +198,7 @@ blueprintsprocessor.workflow.self-service-api.audit.storeEnable={{ .Values.workf #Tracing spring.sleuth.enabled={{ .Values.global.tracing.enabled }} -spring.zipkin.baseUrl={{ .Values.global.tracing.collector.baseUrl }} +spring.zipkin.baseUrl={{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }} spring.zipkin.checkTimeout=5000 spring.zipkin.service.name={{ include "common.name" . }} spring.sleuth.messaging.jms.enabled=false diff --git a/kubernetes/cds/components/cds-blueprints-processor/values.yaml b/kubernetes/cds/components/cds-blueprints-processor/values.yaml index 3a0b320f5c..3ec10098a2 100755 --- a/kubernetes/cds/components/cds-blueprints-processor/values.yaml +++ b/kubernetes/cds/components/cds-blueprints-processor/values.yaml @@ -39,7 +39,11 @@ global: tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) # This concerns CDS/AAI communication through HTTP when TLS is not being needed diff --git a/kubernetes/cds/values.yaml b/kubernetes/cds/values.yaml index ac17183331..7068162495 100644 --- a/kubernetes/cds/values.yaml +++ b/kubernetes/cds/values.yaml @@ -39,7 +39,11 @@ global: tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) diff --git a/kubernetes/cps/Chart.yaml b/kubernetes/cps/Chart.yaml index 06fdcf0305..3702ae40d4 100644 --- a/kubernetes/cps/Chart.yaml +++ b/kubernetes/cps/Chart.yaml @@ -17,7 +17,7 @@ apiVersion: v2 description: ONAP Configuration Persistance Service (CPS) name: cps -version: 13.0.1 +version: 13.0.2 dependencies: - name: common diff --git a/kubernetes/cps/components/cps-core/Chart.yaml b/kubernetes/cps/components/cps-core/Chart.yaml index b1aa1046dd..c30971f2aa 100644 --- a/kubernetes/cps/components/cps-core/Chart.yaml +++ b/kubernetes/cps/components/cps-core/Chart.yaml @@ -18,7 +18,7 @@ apiVersion: v2 description: ONAP Configuration Persistance Service (CPS) - Core name: cps-core -version: 13.0.1 +version: 13.0.2 dependencies: - name: common @@ -40,4 +40,4 @@ dependencies: repository: '@local' - name: serviceAccount version: ~13.x-0 - repository: '@local' \ No newline at end of file + repository: '@local' diff --git a/kubernetes/cps/components/cps-core/resources/config/application-helm.yml b/kubernetes/cps/components/cps-core/resources/config/application-helm.yml index 45e78b64e3..f86cdbe666 100644 --- a/kubernetes/cps/components/cps-core/resources/config/application-helm.yml +++ b/kubernetes/cps/components/cps-core/resources/config/application-helm.yml @@ -19,6 +19,8 @@ */}} spring: + application: + name: cps-core datasource: {{- if .Values.global.postgres.localCluster }} url: jdbc:postgresql://{{ .Values.postgres.service.name2 }}:{{ .Values.postgres.service.externalPort2 }}/{{ .Values.postgres.config.pgDatabase }} @@ -61,6 +63,8 @@ management: tracing: propagation: produce: {{ .Values.management.tracing.propagation.produce }} + sampling: + probability: {{ .Values.global.tracing.sampling.probability }} logging: level: @@ -83,10 +87,16 @@ ncmp: {{ toYaml .Values.config.additional | nindent 2 }} {{- end }} -# cps tracing -{{- if .Values.tracing }} - {{ toYaml .Values.tracing | nindent 2 }} -{{- end }} +cps: + tracing: + enabled: {{ .Values.global.tracing.enabled }} + sampler: + jaeger_remote: + endpoint: {{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.grpc }} + exporter: + endpoint: {{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.otlpGrpc }} + protocol: {{ .Values.tracing.exporter.protocol }} + excluded-observation-names: {{ .Values.tracing.excludedObservationNames }} # Custom Hazelcast config. hazelcast: @@ -100,6 +110,6 @@ otel: exporter: otlp: traces: - protocol: {{ .Values.otel.config.otlp.traces.protocol }} + protocol: {{ .Values.tracing.otlp.traces.protocol }} # Last empty line is required otherwise the last property will be missing from application.yml file in the pod. diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml index 81fb82cd67..7ef5c711bb 100644 --- a/kubernetes/cps/components/cps-core/values.yaml +++ b/kubernetes/cps/components/cps-core/values.yaml @@ -68,6 +68,15 @@ global: externalPort3: 5432 container: name: postgres + tracing: + collector: + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 + sampling: + probability: 1.0 image: onap/cps-and-ncmp:3.5.4 @@ -274,16 +283,12 @@ management: produce: [W3C] tracing: - cps: - tracing: - sampler: - jaeger_remote: - endpoint: http://onap-otel-collector:14250 - exporter: - endpoint: http://onap-otel-collector:4317 - protocol: grpc - enabled: false - excluded-observation-names: tasks.scheduled.execution + exporter: + protocol: grpc + excludedObservationNames: tasks.scheduled.execution + otlp: + traces: + protocol: grpc ################################################################# # Postgres overriding defaults in the postgres @@ -342,9 +347,3 @@ hazelcast: kubernetesDiscovery: true kubernetesServiceName: cps-core-headless clusterName: cps-and-ncmp-common-cache-cluster - -otel: - config: - otlp: - traces: - protocol: grpc diff --git a/kubernetes/cps/values.yaml b/kubernetes/cps/values.yaml index a08690ed53..47e9a88e0d 100755 --- a/kubernetes/cps/values.yaml +++ b/kubernetes/cps/values.yaml @@ -43,6 +43,15 @@ global: kafkaBootstrap: strimzi-kafka-bootstrap cpsKafkaUser: cps-kafka-user + tracing: + collector: + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 + sampling: + probability: 1.0 config: coreUserName: cpsuser diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index 089e65a2c5..0d9fa21c98 100755 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -123,7 +123,12 @@ global: tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + # ports that are exposed by the jaeger-collector service + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) diff --git a/kubernetes/portal-ng/components/portal-ng-bff/templates/configmap.yaml b/kubernetes/portal-ng/components/portal-ng-bff/templates/configmap.yaml index f41d630f02..8570a3ae86 100644 --- a/kubernetes/portal-ng/components/portal-ng-bff/templates/configmap.yaml +++ b/kubernetes/portal-ng/components/portal-ng-bff/templates/configmap.yaml @@ -4,6 +4,9 @@ metadata: name: {{ include "common.fullname" . }}-configmap namespace: {{ include "common.namespace" . }} data: + TRACING_ENABLED: {{ .Values.global.tracing.enabled | quote }} + COLLECTOR_HOST: {{ .Values.global.tracing.collector.baseUrl }} + COLLECTOR_PORT: {{ .Values.global.tracing.collector.port.zipkin | quote }} {{- range $key, $val := .Values.env }} {{ $key }}: {{ $val | quote }} {{- end -}} diff --git a/kubernetes/portal-ng/components/portal-ng-bff/templates/tests/test-connection.yaml b/kubernetes/portal-ng/components/portal-ng-bff/templates/tests/test-connection.yaml deleted file mode 100644 index 327df40ef6..0000000000 --- a/kubernetes/portal-ng/components/portal-ng-bff/templates/tests/test-connection.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: {{ include "common.fullname" . }}-test-connection - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ include "common.release" . }} - heritage: {{ .Release.Service }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "common.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/kubernetes/portal-ng/components/portal-ng-bff/values.yaml b/kubernetes/portal-ng/components/portal-ng-bff/values.yaml index 439592c72c..6a9c66f18a 100644 --- a/kubernetes/portal-ng/components/portal-ng-bff/values.yaml +++ b/kubernetes/portal-ng/components/portal-ng-bff/values.yaml @@ -2,8 +2,16 @@ global: env: KEYCLOAK_URL: http://keycloak-http.keycloak KEYCLOAK_REALM: onap - COLLECTOR_HOST: http://jaeger-collector.istio-config - COLLECTOR_PORT: 9411 + tracing: + enabled: false + collector: + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 + sampling: + probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) ## Default values for portal-ng-bff. ## This is a YAML-formatted file. @@ -97,7 +105,6 @@ probes: env: HISTORY_URL: http://portal-ng-history:9002 PREFERENCES_URL: http://portal-ng-preferences:9001 - TRACING_ENABLED: true RBAC_EXCLUDED_ENDPOINTS: '' secretEnv: diff --git a/kubernetes/portal-ng/components/portal-ng-history/templates/configmap.yaml b/kubernetes/portal-ng/components/portal-ng-history/templates/configmap.yaml index b81e796c75..e650a84f10 100644 --- a/kubernetes/portal-ng/components/portal-ng-history/templates/configmap.yaml +++ b/kubernetes/portal-ng/components/portal-ng-history/templates/configmap.yaml @@ -19,9 +19,9 @@ metadata: name: {{ include "common.fullname" . }}-configmap namespace: {{ include "common.namespace" . }} data: - {{- range $key, $val := .Values.env }} - {{ $key }}: {{ $val | quote }} - {{- end -}} + TRACING_ENABLED: {{ .Values.global.tracing.enabled | quote }} + COLLECTOR_HOST: {{ .Values.global.tracing.collector.baseUrl }} + COLLECTOR_PORT: {{ .Values.global.tracing.collector.port.zipkin | quote }} {{- range $key, $val := .Values.global.env }} {{ $key }}: {{ $val | quote }} {{- end -}} diff --git a/kubernetes/portal-ng/components/portal-ng-history/values.yaml b/kubernetes/portal-ng/components/portal-ng-history/values.yaml index 1169cf68b0..dc5cccf7be 100644 --- a/kubernetes/portal-ng/components/portal-ng-history/values.yaml +++ b/kubernetes/portal-ng/components/portal-ng-history/values.yaml @@ -2,8 +2,16 @@ global: env: KEYCLOAK_URL: http://keycloak-http.keycloak KEYCLOAK_REALM: onap - COLLECTOR_HOST: http://jaeger-collector.istio-config - COLLECTOR_PORT: 9411 + tracing: + enabled: false + collector: + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 + sampling: + probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) #Service Names of the postgres db to connect to. postgres: localCluster: false @@ -99,9 +107,6 @@ probes: ## Number of consecutive failures allowed before marking probe as failed. failureThreshold: 4 -env: - TRACING_ENABLED: true - ################################################################# # Postgres overriding defaults in the postgres ################################################################# diff --git a/kubernetes/portal-ng/components/portal-ng-preferences/templates/configmap.yaml b/kubernetes/portal-ng/components/portal-ng-preferences/templates/configmap.yaml index b81e796c75..e650a84f10 100644 --- a/kubernetes/portal-ng/components/portal-ng-preferences/templates/configmap.yaml +++ b/kubernetes/portal-ng/components/portal-ng-preferences/templates/configmap.yaml @@ -19,9 +19,9 @@ metadata: name: {{ include "common.fullname" . }}-configmap namespace: {{ include "common.namespace" . }} data: - {{- range $key, $val := .Values.env }} - {{ $key }}: {{ $val | quote }} - {{- end -}} + TRACING_ENABLED: {{ .Values.global.tracing.enabled | quote }} + COLLECTOR_HOST: {{ .Values.global.tracing.collector.baseUrl }} + COLLECTOR_PORT: {{ .Values.global.tracing.collector.port.zipkin | quote }} {{- range $key, $val := .Values.global.env }} {{ $key }}: {{ $val | quote }} {{- end -}} diff --git a/kubernetes/portal-ng/components/portal-ng-preferences/templates/tests/test-connection.yaml b/kubernetes/portal-ng/components/portal-ng-preferences/templates/tests/test-connection.yaml deleted file mode 100644 index 327df40ef6..0000000000 --- a/kubernetes/portal-ng/components/portal-ng-preferences/templates/tests/test-connection.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: {{ include "common.fullname" . }}-test-connection - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ include "common.release" . }} - heritage: {{ .Release.Service }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "common.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/kubernetes/portal-ng/components/portal-ng-preferences/values.yaml b/kubernetes/portal-ng/components/portal-ng-preferences/values.yaml index 3d7cbb7dd1..d961cb8721 100644 --- a/kubernetes/portal-ng/components/portal-ng-preferences/values.yaml +++ b/kubernetes/portal-ng/components/portal-ng-preferences/values.yaml @@ -2,8 +2,16 @@ global: env: KEYCLOAK_URL: http://keycloak-http.keycloak KEYCLOAK_REALM: onap - COLLECTOR_HOST: http://jaeger-collector.istio-config - COLLECTOR_PORT: 9411 + tracing: + enabled: false + collector: + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 + sampling: + probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) #Service Names of the postgres db to connect to. postgres: localCluster: false @@ -100,9 +108,6 @@ probes: ## Number of consecutive failures allowed before marking probe as failed. failureThreshold: 4 -env: - TRACING_ENABLED: true - ################################################################# # Postgres overriding defaults in the postgres ################################################################# diff --git a/kubernetes/sdc/components/sdc-helm-validator/templates/deployment.yaml b/kubernetes/sdc/components/sdc-helm-validator/templates/deployment.yaml index 894bfd60f7..5b33355f51 100644 --- a/kubernetes/sdc/components/sdc-helm-validator/templates/deployment.yaml +++ b/kubernetes/sdc/components/sdc-helm-validator/templates/deployment.yaml @@ -40,7 +40,7 @@ spec: - name: TRACING_ENABLED value: {{ .Values.global.tracing.enabled | quote }} - name: COLLECTOR_URL - value: {{ .Values.global.tracing.collector.baseUrl }} + value: {{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }} - name: TRACING_SAMPLING_PROBABILITY value: {{ .Values.global.tracing.sampling.probability | quote }} livenessProbe: diff --git a/kubernetes/sdc/components/sdc-helm-validator/values.yaml b/kubernetes/sdc/components/sdc-helm-validator/values.yaml index b96e3c1544..9e9aa105a6 100644 --- a/kubernetes/sdc/components/sdc-helm-validator/values.yaml +++ b/kubernetes/sdc/components/sdc-helm-validator/values.yaml @@ -21,7 +21,11 @@ global: tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) diff --git a/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml index 25288e530f..a9d3cc2c95 100644 --- a/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml +++ b/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml @@ -106,7 +106,7 @@ spec: - name: TRACING_ENABLED value: "{{ .Values.global.tracing.enabled }}" - name: TRACING_COLLECTOR_BASEURL - value: "{{ .Values.global.tracing.collector.baseUrl }}" + value: "{{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }}" - name: TRACING_SAMPLING_PROBABILITY value: "{{ .Values.config.tracing.samplingProbability }}" - name: TRACING_SKIP_PATTERN diff --git a/kubernetes/sdc/components/sdc-wfd-be/values.yaml b/kubernetes/sdc/components/sdc-wfd-be/values.yaml index 0e5cc81d9a..2fc67cbedb 100644 --- a/kubernetes/sdc/components/sdc-wfd-be/values.yaml +++ b/kubernetes/sdc/components/sdc-wfd-be/values.yaml @@ -34,7 +34,13 @@ global: tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 + sampling: + probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) ################################################################# # Application configuration defaults. diff --git a/kubernetes/sdc/values.yaml b/kubernetes/sdc/values.yaml index 23324186a1..9f0e2d05ab 100644 --- a/kubernetes/sdc/values.yaml +++ b/kubernetes/sdc/values.yaml @@ -68,7 +68,11 @@ global: tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) diff --git a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml index 01b3259479..70f72c5a27 100755 --- a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml @@ -404,7 +404,7 @@ spring: web: skip-pattern: /actuator/health/* zipkin: - base-url: {{ .Values.global.tracing.collector.baseUrl }} + base-url: {{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }} so: vnfm: adapter: diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml index 2739929eaf..84405ddccb 100755 --- a/kubernetes/so/components/so-bpmn-infra/values.yaml +++ b/kubernetes/so/components/so-bpmn-infra/values.yaml @@ -31,7 +31,11 @@ global: tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) so: diff --git a/kubernetes/so/components/so-catalog-db-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-catalog-db-adapter/resources/config/overrides/override.yaml index b13fbeb3c7..a1f0ebc149 100755 --- a/kubernetes/so/components/so-catalog-db-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-catalog-db-adapter/resources/config/overrides/override.yaml @@ -66,7 +66,7 @@ spring: scheduled: skip-pattern: .*({{ join "|" .Values.tracing.scheduled.skipClasses }}) zipkin: - base-url: {{ .Values.global.tracing.collector.baseUrl }} + base-url: {{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }} #Actuator management: context-path: /manage diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml index 30accc8ffd..a061bb9c9c 100755 --- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml +++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml @@ -27,7 +27,11 @@ global: tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) so: diff --git a/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml index 7065b4511a..8054f86b41 100755 --- a/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml @@ -39,7 +39,7 @@ spring: web: skip-pattern: {{ join "," .Values.tracing.ignorePatterns }} zipkin: - base-url: {{ .Values.global.tracing.collector.baseUrl }} + base-url: {{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }} server: {{- if include "common.onServiceMesh" . }} forward-headers-strategy: none diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml index 1f58de056c..2ecde68c75 100755 --- a/kubernetes/so/components/so-cnf-adapter/values.yaml +++ b/kubernetes/so/components/so-cnf-adapter/values.yaml @@ -25,7 +25,11 @@ global: tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) diff --git a/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml index 30b429de85..ca6cb82458 100755 --- a/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml @@ -73,7 +73,7 @@ spring: scheduled: skip-pattern: .*({{ join "|" .Values.tracing.scheduled.skipClasses }}) zipkin: - base-url: {{ .Values.global.tracing.collector.baseUrl }} + base-url: {{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }} org: onap: so: diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml index 648ac1faff..0b34cc0e6c 100755 --- a/kubernetes/so/components/so-openstack-adapter/values.yaml +++ b/kubernetes/so/components/so-openstack-adapter/values.yaml @@ -27,7 +27,11 @@ global: tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) diff --git a/kubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml index 844db44004..a898d390dd 100755 --- a/kubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml @@ -65,7 +65,7 @@ spring: scheduled: skip-pattern: .*({{ join "|" .Values.tracing.scheduled.skipClasses }}) zipkin: - base-url: {{ .Values.global.tracing.collector.baseUrl }} + base-url: {{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }} #Actuator management: context-path: /manage diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml index 174e857ec3..290a3b6caa 100755 --- a/kubernetes/so/components/so-request-db-adapter/values.yaml +++ b/kubernetes/so/components/so-request-db-adapter/values.yaml @@ -27,7 +27,11 @@ global: tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) so: diff --git a/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml b/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml index b349c8911f..2b7b5c8f4e 100755 --- a/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml @@ -55,7 +55,7 @@ spring: scheduled: skip-pattern: .*({{ join "|" .Values.tracing.scheduled.skipClasses }}) zipkin: - base-url: {{ .Values.global.tracing.collector.baseUrl }} + base-url: {{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }} request: datasource: hikari: diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml index 77bd6ab713..2a9114d935 100755 --- a/kubernetes/so/components/so-sdc-controller/values.yaml +++ b/kubernetes/so/components/so-sdc-controller/values.yaml @@ -28,7 +28,11 @@ global: tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) diff --git a/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml index 6e1771fa4d..ea50e5339b 100755 --- a/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml @@ -227,4 +227,4 @@ spring: web: skip-pattern: /actuator/health/* zipkin: - base-url: {{ .Values.global.tracing.collector.baseUrl }} + base-url: {{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }} diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml index eb6f0b8e9d..280797a495 100755 --- a/kubernetes/so/components/so-sdnc-adapter/values.yaml +++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml @@ -30,7 +30,11 @@ global: tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) diff --git a/kubernetes/so/resources/config/overrides/override.yaml b/kubernetes/so/resources/config/overrides/override.yaml index 819557fbcc..0979c59b08 100755 --- a/kubernetes/so/resources/config/overrides/override.yaml +++ b/kubernetes/so/resources/config/overrides/override.yaml @@ -125,7 +125,7 @@ spring: scheduled: skip-pattern: .*({{ join "|" .Values.tracing.scheduled.skipClasses }}) zipkin: - base-url: {{ .Values.global.tracing.collector.baseUrl }} + base-url: {{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }} request: datasource: hikari: diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml index 2c5fa36fd5..1b5f577f53 100755 --- a/kubernetes/so/values.yaml +++ b/kubernetes/so/values.yaml @@ -54,7 +54,11 @@ global: tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) so: diff --git a/kubernetes/uui/components/uui-server/resources/config/application.properties b/kubernetes/uui/components/uui-server/resources/config/application.properties index a86cea7ff3..1befe22603 100644 --- a/kubernetes/uui/components/uui-server/resources/config/application.properties +++ b/kubernetes/uui/components/uui-server/resources/config/application.properties @@ -52,8 +52,8 @@ intents.scheduledTask.enabled=false management.endpoints.web.exposure.include=* management.tracing.enabled={{ default .Values.global.tracing.enabled .Values.tracing.enabled }} -management.tracing.sampling.probability={{ default .Values.global.tracing.sampling.probability .Values.tracing.collector.baseUrl }} -management.zipkin.tracing.endpoint={{ default .Values.global.tracing.collector.baseUrl .Values.tracing.collector.baseUrl }}/api/v2/spans +management.tracing.sampling.probability={{ default .Values.global.tracing.sampling.probability .Values.tracing.sampling.probability }} +management.zipkin.tracing.endpoint={{ .Values.global.tracing.collector.baseUrl }}:{{ .Values.global.tracing.collector.port.zipkin }}/api/v2/spans uui-server.client.aai.baseUrl={{ .Values.uuiServer.client.aai.baseUrl }} uui-server.client.aai.apiVersion={{ .Values.uuiServer.client.aai.apiVersion }} diff --git a/kubernetes/uui/components/uui-server/values.yaml b/kubernetes/uui/components/uui-server/values.yaml index b2934d88ab..1e8ccfe232 100644 --- a/kubernetes/uui/components/uui-server/values.yaml +++ b/kubernetes/uui/components/uui-server/values.yaml @@ -22,7 +22,11 @@ global: tracing: collector: - baseUrl: http://jaeger-collector.istio-config:9411 + baseUrl: http://jaeger-collector.istio-config + port: + zipkin: 9411 + otlpGrpc: 4317 + grpc: 14250 sampling: probability: 1.0 @@ -129,8 +133,6 @@ ingress: ## Use this to override the global defaults tracing: # enabled: false - collector: {} -# baseUrl: http://jaeger-collector.istio-config:9411 sampling: {} # probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) -- 2.16.6