aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/aai/components/aai-modelloader
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/aai/components/aai-modelloader')
-rw-r--r--kubernetes/aai/components/aai-modelloader/resources/application.properties6
-rw-r--r--kubernetes/aai/components/aai-modelloader/values.yaml14
2 files changed, 12 insertions, 8 deletions
diff --git a/kubernetes/aai/components/aai-modelloader/resources/application.properties b/kubernetes/aai/components/aai-modelloader/resources/application.properties
index f910af1cae..e2dc186c82 100644
--- a/kubernetes/aai/components/aai-modelloader/resources/application.properties
+++ b/kubernetes/aai/components/aai-modelloader/resources/application.properties
@@ -14,11 +14,11 @@ server.port=9500
spring.application.name=aai-model-loader
-spring.sleuth.enabled={{ .Values.tracing.enabled }}
-spring.zipkin.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={{ .Values.tracing.sampling.probability }}
+spring.sleuth.sampler.probability={{ .Values.global.tracing.sampling.probability }}
spring.sleuth.propagation.type=w3c,b3
spring.sleuth.supports-join=false
spring.sleuth.web.skip-pattern={{ join "," .Values.tracing.ignorePatterns }}
diff --git a/kubernetes/aai/components/aai-modelloader/values.yaml b/kubernetes/aai/components/aai-modelloader/values.yaml
index eae505458e..08d635107b 100644
--- a/kubernetes/aai/components/aai-modelloader/values.yaml
+++ b/kubernetes/aai/components/aai-modelloader/values.yaml
@@ -19,6 +19,13 @@
# Declare variables to be passed into your templates.
global: # global defaults
nodePortPrefix: 302
+ 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%)
+
# application image
image: onap/model-loader:1.14.2
@@ -108,12 +115,9 @@ resources:
memory: "2Gi"
unlimited: {}
+# use this to define service specific overrides
+# for the global.tracing.* config keys
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%)
ignorePatterns:
- /aai/util.*