diff options
| author |   Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2023-11-08 08:48:49 +0100 |
|---|---|---|
| committer | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2023-11-10 13:28:00 +0100 |
| commit | 75e74076f1c6ccc45b8dd9a9073ed0b0452a9d0a (patch) | |
| tree | 902e78e68ef60b9457bcd779b6c23e679f728ca5 | |
| parent | 09ed93b87cb27864b0f1211799af3aaea8b63db7 (diff) | |
[AAI] Add tracing-related config to application.properties in OOM chart
- make baseUrl[0] and sampling probability[1] configurable
[0] url of trace collector (like the central Jaeger)
[1] percentage of traces that are sampled
Issue-ID: AAI-3676
Change-Id: I84a538311cfb3442f587b7064a461990b82cd18f
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
| -rw-r--r-- | kubernetes/aai/components/aai-resources/resources/config/application.properties | 10 | ||||
| -rw-r--r-- | kubernetes/aai/components/aai-resources/values.yaml | 8 |
2 files changed, 17 insertions, 1 deletions
diff --git a/kubernetes/aai/components/aai-resources/resources/config/application.properties b/kubernetes/aai/components/aai-resources/resources/config/application.properties index 40b89eabb4..805f3cd505 100644 --- a/kubernetes/aai/components/aai-resources/resources/config/application.properties +++ b/kubernetes/aai/components/aai-resources/resources/config/application.properties @@ -1,7 +1,7 @@ {{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # Modifications Copyright © 2020 Orange -# Modifications Copyright © 2023 Nordix Foundation +# Modifications Copyright © 2023 Nordix Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -28,6 +28,14 @@ spring.jersey.type=filter spring.main.allow-bean-definition-overriding=true server.servlet.context-path=/ +spring.zipkin.baseUrl={{ .Values.tracing.collector.baseUrl }} +spring.sleuth.messaging.jms.enabled = false +spring.sleuth.trace-id128=true +spring.sleuth.sampler.probability={{ .Values.tracing.sampling.probability }} +spring.sleuth.propagation.type=w3c, b3 +spring.sleuth.supports-join=false +spring.sleuth.web.skip-pattern={{ join "," .Values.tracing.ignorePatterns }} + 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 spring.profiles.active={{ .Values.global.config.profiles.active }} diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml index e5cc716f3f..68a6a716cc 100644 --- a/kubernetes/aai/components/aai-resources/values.yaml +++ b/kubernetes/aai/components/aai-resources/values.yaml @@ -245,6 +245,14 @@ resources: memory: 6Gi unlimited: {} +tracing: + 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.* + metrics: serviceMonitor: enabled: false |