Globally align tracing settings 74/141674/8
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>
Mon, 11 Aug 2025 12:58:09 +0000 (14:58 +0200)
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>
Fri, 15 Aug 2025 08:39:44 +0000 (10:39 +0200)
- 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 <Fiete.Ostkamp@telekom.de>
55 files changed:
argo/onap/values/values-global.yaml
kubernetes/a1policymanagement/resources/config/application.yaml
kubernetes/a1policymanagement/templates/statefulset.yaml
kubernetes/a1policymanagement/values.yaml
kubernetes/aai/components/aai-babel/resources/config/application.properties
kubernetes/aai/components/aai-babel/values.yaml
kubernetes/aai/components/aai-modelloader/resources/application.properties
kubernetes/aai/components/aai-modelloader/values.yaml
kubernetes/aai/components/aai-resources/resources/config/application.properties
kubernetes/aai/components/aai-resources/values.yaml
kubernetes/aai/components/aai-schema-service/config/application.properties
kubernetes/aai/components/aai-schema-service/values.yaml
kubernetes/aai/components/aai-traversal/resources/config/application.properties
kubernetes/aai/components/aai-traversal/values.yaml
kubernetes/aai/values.yaml
kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties
kubernetes/cds/components/cds-blueprints-processor/values.yaml
kubernetes/cds/values.yaml
kubernetes/cps/Chart.yaml
kubernetes/cps/components/cps-core/Chart.yaml
kubernetes/cps/components/cps-core/resources/config/application-helm.yml
kubernetes/cps/components/cps-core/values.yaml
kubernetes/cps/values.yaml
kubernetes/onap/values.yaml
kubernetes/portal-ng/components/portal-ng-bff/templates/configmap.yaml
kubernetes/portal-ng/components/portal-ng-bff/templates/tests/test-connection.yaml [deleted file]
kubernetes/portal-ng/components/portal-ng-bff/values.yaml
kubernetes/portal-ng/components/portal-ng-history/templates/configmap.yaml
kubernetes/portal-ng/components/portal-ng-history/values.yaml
kubernetes/portal-ng/components/portal-ng-preferences/templates/configmap.yaml
kubernetes/portal-ng/components/portal-ng-preferences/templates/tests/test-connection.yaml [deleted file]
kubernetes/portal-ng/components/portal-ng-preferences/values.yaml
kubernetes/sdc/components/sdc-helm-validator/templates/deployment.yaml
kubernetes/sdc/components/sdc-helm-validator/values.yaml
kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
kubernetes/sdc/components/sdc-wfd-be/values.yaml
kubernetes/sdc/values.yaml
kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
kubernetes/so/components/so-bpmn-infra/values.yaml
kubernetes/so/components/so-catalog-db-adapter/resources/config/overrides/override.yaml
kubernetes/so/components/so-catalog-db-adapter/values.yaml
kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
kubernetes/so/components/so-cnf-adapter/values.yaml
kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
kubernetes/so/components/so-openstack-adapter/values.yaml
kubernetes/so/components/so-request-db-adapter/resources/config/overrides/override.yaml
kubernetes/so/components/so-request-db-adapter/values.yaml
kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
kubernetes/so/components/so-sdc-controller/values.yaml
kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml
kubernetes/so/components/so-sdnc-adapter/values.yaml
kubernetes/so/resources/config/overrides/override.yaml
kubernetes/so/values.yaml
kubernetes/uui/components/uui-server/resources/config/application.properties
kubernetes/uui/components/uui-server/values.yaml

index 23adee3..a1b6b71 100644 (file)
@@ -76,9 +76,13 @@ global:
 \r
   # enable this if you have deployed Jaeger alongside ONAP\r
   tracing:\r
-    enabled: true\r
+    enabled: false\r
     collector:\r
-      baseUrl: http://jaeger-collector.istio-system:9411\r
+      baseUrl: http://jaeger-collector.istio-config\r
+      port:\r
+        zipkin: 9411\r
+        otlpGrpc: 4317\r
+        grpc: 14250\r
     sampling:\r
       probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%)\r
 \r
index e9e5479..78b5328 100644 (file)
@@ -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.
index 3191087..6b03063 100644 (file)
@@ -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 }}
index 5253af0..b2d24e9 100644 (file)
@@ -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
index 8f47bf0..1be5718 100644 (file)
@@ -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 }}
index 1af40c9..3dd7369 100644 (file)
@@ -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.
index 8180e96..ceb2311 100644 (file)
@@ -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 }}
index 6d43771..57c3d83 100644 (file)
@@ -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:
index 7676475..d1cdf53 100644 (file)
@@ -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
 
index f97ca98..50bb0ee 100644 (file)
@@ -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:
index ff37210..f491f4d 100644 (file)
@@ -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
index 4333129..f88d73f 100644 (file)
@@ -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
index b3e869d..acecd40 100644 (file)
@@ -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
index 34d07c1..98442a9 100644 (file)
@@ -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%)
 
index 6c8157b..b579679 100644 (file)
@@ -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%)
 
index 248e5bf..94e487c 100755 (executable)
@@ -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
index 3a0b320..3ec1009 100755 (executable)
@@ -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
index ac17183..7068162 100644 (file)
@@ -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%)
 
index 06fdcf0..3702ae4 100644 (file)
@@ -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
index b1aa104..c30971f 100644 (file)
@@ -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'
index 45e78b6..f86cdbe 100644 (file)
@@ -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.
index 81fb82c..7ef5c71 100644 (file)
@@ -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
index a08690e..47e9a88 100755 (executable)
@@ -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
index 089e65a..0d9fa21 100755 (executable)
@@ -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%)
 
index f41d630..8570a3a 100644 (file)
@@ -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 (file)
index 327df40..0000000
+++ /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
index 439592c..6a9c66f 100644 (file)
@@ -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:
index b81e796..e650a84 100644 (file)
@@ -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 -}}
index 1169cf6..dc5cccf 100644 (file)
@@ -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
 #################################################################
index b81e796..e650a84 100644 (file)
@@ -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 (file)
index 327df40..0000000
+++ /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
index 3d7cbb7..d961cb8 100644 (file)
@@ -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
 #################################################################
index 894bfd6..5b33355 100644 (file)
@@ -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:
index b96e3c1..9e9aa10 100644 (file)
@@ -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%)
 
index 25288e5..a9d3cc2 100644 (file)
@@ -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
index 0e5cc81..2fc67cb 100644 (file)
@@ -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.
index 2332418..9f0e2d0 100644 (file)
@@ -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%)
 
index 01b3259..70f72c5 100755 (executable)
@@ -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:
index 2739929..84405dd 100755 (executable)
@@ -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:
index b13fbeb..a1f0ebc 100755 (executable)
@@ -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
index 30accc8..a061bb9 100755 (executable)
@@ -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:
index 7065b45..8054f86 100755 (executable)
@@ -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
index 1f58de0..2ecde68 100755 (executable)
@@ -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%)
 
index 30b429d..ca6cb82 100755 (executable)
@@ -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:
index 648ac1f..0b34cc0 100755 (executable)
@@ -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%)
 
index 844db44..a898d39 100755 (executable)
@@ -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
index 174e857..290a3b6 100755 (executable)
@@ -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:
index b349c89..2b7b5c8 100755 (executable)
@@ -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:
index 77bd6ab..2a9114d 100755 (executable)
@@ -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%)
 
index 6e1771f..ea50e53 100755 (executable)
@@ -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 }}
index eb6f0b8..280797a 100755 (executable)
@@ -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%)
 
index 819557f..0979c59 100755 (executable)
@@ -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:
index 2c5fa36..1b5f577 100755 (executable)
@@ -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:
index a86cea7..1befe22 100644 (file)
@@ -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 }}
index b2934d8..1e8ccfe 100644 (file)
 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%)