Skip to content
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

Remove invalid Evaka references #23

Merged
merged 1 commit into from
Nov 22, 2023
Merged

Remove invalid Evaka references #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions frontend/nginx/etc/nginx/conf.d/default.conf.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ limit_req_zone $binary_remote_addr zone=req_zone_wl:1m rate=100r/s;
#
# This is less performant than the alternative of having an external tool like
# Functionbeat or Logstash ingest the timestamps in another format but
# shouldn't matter in eVaka's context + has the benefit of being human-readable
# shouldn't matter in this context + has the benefit of being human-readable
# in its raw format.
#
# Source: https://thatsamguy.com/nginx-iso8601-time-format/
Expand All @@ -98,14 +98,14 @@ map $msec $millisec {
~\.([0-9]+)$ $1;
}

# Output logs in accordance to eVaka's log schema (type app-requests-received).
# Output logs in accordance to voltti's log schema (type app-requests-received).
# NOTE: userIdHash cannot easily be computed here, so left empty.
log_format json_access escape=json
'{'
'"@timestamp":"$time_iso8601_p1.$millisec+$time_iso8601_p2",'
'"appBuild":"<%= ENV["APP_BUILD"] %>",'
'"appCommit":"<%= ENV["APP_COMMIT"] %>",'
'"appName":"evaka-proxy",'
'"appName":"oppivelvollisuus-proxy",'
'"clientIp":"$remote_addr",'
'"contentLength":$bytes_sent,'
'"env":"<%= ENV["NGINX_ENV"] %>",'
Expand Down