From 74e41748265e6c3697e9a9521ac7d9a100c4d072 Mon Sep 17 00:00:00 2001 From: "Ketelsen, Sven" Date: Wed, 2 Mar 2022 08:56:46 +0000 Subject: [PATCH] SMAR-21: feat: added jaeger tracing --- group_vars/management/plain.yml | 2 +- group_vars/stage_qa/plain.yml | 7 +++++++ roles/connect/vars/main.yml | 5 +++++ roles/iam/vars/main.yml | 10 ++++++++++ roles/webdav/vars/main.yml | 5 +++++ 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/group_vars/management/plain.yml b/group_vars/management/plain.yml index c96a69d..fdfd78b 100644 --- a/group_vars/management/plain.yml +++ b/group_vars/management/plain.yml @@ -2,7 +2,7 @@ hetzner_server_type: cx21 -connect_image_version: "8.6.9" +connect_image_version: "latest" connect_admin_username: "{{ management_admin_username }}" connect_admin_password: "{{ management_admin_password }}" diff --git a/group_vars/stage_qa/plain.yml b/group_vars/stage_qa/plain.yml index 8365ed5..4544f0e 100644 --- a/group_vars/stage_qa/plain.yml +++ b/group_vars/stage_qa/plain.yml @@ -369,3 +369,10 @@ management_oidc_client_secret: "{{ management_oidc_client_secret_vault }}" gpg_key_smardigo_automation__private: '{{ gpg_key_smardigo_automation__private__vault }}' hetzner_server_type_kube_node: cpx31 + +iam_opentracing_jaeger_enabled: true +iam_opentracing_jaeger_http_sender_url: "http://{{ shared_service_kube_jaeger_collector_hostname }}/api/traces" +webdav_opentracing_jaeger_enabled: true +webdav_opentracing_jaeger_http_sender_url: "http://{{ shared_service_kube_jaeger_collector_hostname }}/api/traces" +connect_opentracing_jaeger_enabled: true +connect_opentracing_jaeger_http_sender_url: "http://{{ shared_service_kube_jaeger_collector_hostname }}/api/traces" diff --git a/roles/connect/vars/main.yml b/roles/connect/vars/main.yml index 7cfc353..7488720 100644 --- a/roles/connect/vars/main.yml +++ b/roles/connect/vars/main.yml @@ -94,6 +94,11 @@ connect_environment: [ "LOG_LEVEL_WORKFLOW_ANALYSIS: \"{{ connect_loglevel_workflow_analysis | default('INFO') }}\"", "WORKFLOW_ENV: \"{{ connect_workflow_env | default('') }}\"", + + "OPENTRACING_JAEGER_ENABLED: \"{{ connect_opentracing_jaeger_enabled | default(false) }}\"", + "OPENTRACING_JAEGER_LOG_SPANS: \"{{ connect_opentracing_jaeger_log_spans | default(false) }}\"", + "OPENTRACING_JAEGER_SERVICE_NAME: \"{{ connect_opentracing_jaeger_service_name | default(connect_id) }}\"", + "OPENTRACING_JAEGER_HTTP_SENDER_URL: \"{{ connect_opentracing_jaeger_http_sender_url | default() }}\"", ] connect_docker: { diff --git a/roles/iam/vars/main.yml b/roles/iam/vars/main.yml index 2a19ee8..09689fe 100644 --- a/roles/iam/vars/main.yml +++ b/roles/iam/vars/main.yml @@ -58,6 +58,16 @@ iam_docker: { "SMA_CORS_ALLOWED_METHODS: \"*\"", "SMA_CORS_ALLOWED_HEADERS: \"*\"", "SMA_CORS_PATH_PATTERN: \"/**\"", + + "IAM_CACHE_TENANTS_TTL: \"3600\"", + "IAM_CACHE_ROLES_TTL: \"60\"", + "IAM_CACHE_USERS_TTL: \"60\"", + "IAM_CACHE_JWKS_TTL: \"3600\"", + + "OPENTRACING_JAEGER_ENABLED: \"{{ iam_opentracing_jaeger_enabled | default(false) }}\"", + "OPENTRACING_JAEGER_LOG_SPANS: \"{{ iam_opentracing_jaeger_log_spans | default(false) }}\"", + "OPENTRACING_JAEGER_SERVICE_NAME: \"{{ iam_opentracing_jaeger_service_name | default(iam_id) }}\"", + "OPENTRACING_JAEGER_HTTP_SENDER_URL: \"{{ iam_opentracing_jaeger_http_sender_url | default() }}\"", ], networks: [ '"back-tier"', diff --git a/roles/webdav/vars/main.yml b/roles/webdav/vars/main.yml index 83518c5..7568230 100644 --- a/roles/webdav/vars/main.yml +++ b/roles/webdav/vars/main.yml @@ -41,6 +41,11 @@ webdav_docker: { "DATASOURCE_PASSWORD: \"{{ webdav_postgres_password }}\"", "SMA_JWT_SECRET: \"{{ webdav_jwt_secret }}\"", + + "OPENTRACING_JAEGER_ENABLED: \"{{ webdav_opentracing_jaeger_enabled | default(false) }}\"", + "OPENTRACING_JAEGER_LOG_SPANS: \"{{ webdav_opentracing_jaeger_log_spans | default(false) }}\"", + "OPENTRACING_JAEGER_SERVICE_NAME: \"{{ webdav_opentracing_jaeger_service_name | default(webdav_id) }}\"", + "OPENTRACING_JAEGER_HTTP_SENDER_URL: \"{{ webdav_opentracing_jaeger_http_sender_url | default() }}\"", ], networks: [ '"front-tier"',