2 files changed, 4 insertions, 13 deletions
diff --git a/kubernetes/aai/components/aai-babel/resources/config/application.properties b/kubernetes/aai/components/aai-babel/resources/config/application.properties
index 8c7e91ab84..8f47bf084b 100644
--- a/kubernetes/aai/components/aai-babel/resources/config/application.properties
+++ b/kubernetes/aai/components/aai-babel/resources/config/application.properties
@@ -25,11 +25,11 @@ logging.config=${CONFIG_HOME}/logback.xml
 tosca.mappings.config=${CONFIG_HOME}/tosca-mappings.json
 
 spring.application.name=aai-babel
-spring.sleuth.enabled={{ default .Values.global.tracing.enabled .Values.tracing.enabled }}
-spring.zipkin.baseUrl={{ default .Values.global.tracing.collector.baseUrl .Values.tracing.collector.baseUrl }}
+spring.sleuth.enabled={{ .Values.global.tracing.enabled }}
+spring.zipkin.baseUrl={{ .Values.global.tracing.collector.baseUrl }}
 spring.sleuth.messaging.jms.enabled = false
 spring.sleuth.trace-id128=true
-spring.sleuth.sampler.probability={{ default .Values.global.tracing.sampling.probability .Values.tracing.collector.baseUrl }}
+spring.sleuth.sampler.probability={{ .Values.global.tracing.sampling.probability }}
 spring.sleuth.propagation.type=w3c, b3
 spring.sleuth.supports-join=false
 
diff --git a/kubernetes/aai/components/aai-babel/values.yaml b/kubernetes/aai/components/aai-babel/values.yaml
index cfe70ffc76..7bd28b02b8 100644
--- a/kubernetes/aai/components/aai-babel/values.yaml
+++ b/kubernetes/aai/components/aai-babel/values.yaml
@@ -22,7 +22,7 @@ global:
   tracing:
     enabled: false
     collector:
-      baseUrl: http://jaeger-collector.istio-system:9411
+      baseUrl: http://jaeger-collector.istio-config:9411
     sampling:
       probability: 1.0
 
@@ -103,15 +103,6 @@ resources:
       memory: "1Gi"
   unlimited: {}
 
-##
-## Use this to override the global defaults
-tracing:
-# enabled: false
-  collector: {}
-#   baseUrl: http://jaeger-collector.istio-system:9411
-  sampling: {}
-#   probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%)
-
 # adds jvm args for remote debugging the application
 debug:
   enabled: false