diff options
Diffstat (limited to 'kubernetes/aai/components/aai-schema-service')
| -rw-r--r-- | kubernetes/aai/components/aai-schema-service/config/application.properties | 11 | ||||
| -rw-r--r-- | kubernetes/aai/components/aai-schema-service/values.yaml | 8 |
2 files changed, 15 insertions, 4 deletions
diff --git a/kubernetes/aai/components/aai-schema-service/config/application.properties b/kubernetes/aai/components/aai-schema-service/config/application.properties index fc7bd40892..098be2fc59 100644 --- a/kubernetes/aai/components/aai-schema-service/config/application.properties +++ b/kubernetes/aai/components/aai-schema-service/config/application.properties @@ -24,12 +24,17 @@ info.build.version=1.1.0 spring.application.name=aai-schema-service spring.jersey.type=filter spring.main.allow-bean-definition-overriding=true -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.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 +{{- if and .Values.tracing .Values.tracing.ignorePatterns }} +spring.sleuth.web.skip-pattern={{ join "," .Values.tracing.ignorePatterns }} +{{- end }} + server.servlet.context-path=/ spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration diff --git a/kubernetes/aai/components/aai-schema-service/values.yaml b/kubernetes/aai/components/aai-schema-service/values.yaml index f1227835b6..f47c9a5e8e 100644 --- a/kubernetes/aai/components/aai-schema-service/values.yaml +++ b/kubernetes/aai/components/aai-schema-service/values.yaml @@ -19,6 +19,12 @@ # 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%) # Common configuration for resources traversal and graphadmin config: @@ -188,6 +194,6 @@ podAnnotations: tracing: enabled: false collector: - baseUrl: http://jaeger-collector.istio-system:9411 + baseUrl: http://jaeger-collector.istio-config:9411 sampling: probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%) |