Skip to content

BC-8821 changed logformat of mail-drop and hydra to json #1096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

BC-8821 changed logformat of mail-drop and hydra to json #1096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
455ff1e
BC-8821 changed logformat of mail-drop and hydra to json
Loki-Afro Jan 23, 2025
58fba8a
added nuxt log format
Loki-Afro Jan 24, 2025
3e358dc
enable server json logging
Loki-Afro Jan 24, 2025
687842e
Merge branch 'main' into bc-8821
Loki-Afro Jan 24, 2025
9681fbd
Merge branch 'main' into bc-8821
Loki-Afro Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ansible/group_vars/all/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,3 +1093,13 @@ configuration_all:
server: true
client: false
nuxtclient: false
NGINX_LOG_FORMAT:
value: "json"
server: false
client: false
nuxtclient: true
JSON_LOG_FORMAT:
value: "true"
server: true
client: false
nuxtclient: false
3 changes: 2 additions & 1 deletion ansible/roles/hydra/templates/configmap.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ data:
OIDC_SUBJECT_IDENTIFIERS_SUPPORTED_TYPES: "public,pairwise"
SQA_OPT_OUT: "true"
LOG_LEVEL: "info"
LOG_FORMAT: "json"
{% if WITH_BRANCH_POSTGRES_DB_MANAGEMENT|bool %}
POSTGRES_HOST: "{{ POSTGRES_MANAGEMENT_HOST }}"
POSTGRES_PORT: "{{ POSTGRES_MANAGEMENT_PORT }}"
{% endif %}
{% endif %}
3 changes: 3 additions & 0 deletions ansible/roles/maildrop/templates/deployment.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ spec:
value: "retry-mail-drop-v2"
- name: MAILDROP_RETRY_QUEUE
value: "retry-mail-drop-v2"
# json logging
- name: LOGGING_STRUCTURED_FORMAT_CONSOLE
value: ecs
resources:
limits:
cpu: {{ MAILDROP_CPU_LIMITS|default("1000m", true) }}
Expand Down
Loading