consul: Disable logging of timestamps if JSON log enabled
What does this MR do?
Consul has a log_json
parameter that will log the timestamp.
Previously runit would supply the -tt
option, which would always
preface the log line with its own timestamp. This would make it harder
to ingest the logs since the generated logs are not in
newline-delimited JSON format, so we now omit this extra timestamp.
Before
root@fips-test-consul-1:/var/log/gitlab/consul# tail -f current
2022-04-13_07:10:52.90068 {"@level":"info","@message":"Synced node info","@module":"agent","@timestamp":"2022-04-13T07:10:52.900644Z"}
2022-04-13_07:11:46.93363 {"@level":"info","@message":"serf: EventMemberJoin: fips-test-praefect-1 172.31.1.243","@module":"agent.server.serf.lan","@timestamp":"2022-04-13T07:11:46.933592Z"}
2022-04-13_07:12:08.72462 {"@level":"info","@message":"serf: EventMemberLeave: fips-test-praefect-1 172.31.1.243","@module":"agent.server.serf.lan","@timestamp":"2022-04-13T07:12:08.724554Z"}
2022-04-13_07:12:12.09290 {"@level":"info","@message":"serf: EventMemberJoin: fips-test-praefect-1 172.31.1.243","@module":"agent.server.serf.lan","@timestamp":"2022-04-13T07:12:12.092856Z"}
2022-04-13_07:13:06.57518 {"@level":"info","@message":"serf: EventMemberJoin: fips-test-gitaly-1 172.31.0.96","@module":"agent.server.serf.lan","@timestamp":"2022-04-13T07:13:06.575135Z"}
2022-04-13_07:13:13.17977 {"@level":"info","@message":"serf: EventMemberLeave: fips-test-gitaly-1 172.31.0.96","@module":"agent.server.serf.lan","@timestamp":"2022-04-13T07:13:13.179688Z"}
2022-04-13_07:13:16.49264 {"@level":"info","@message":"serf: EventMemberJoin: fips-test-gitaly-1 172.31.0.96","@module":"agent.server.serf.lan","@timestamp":"2022-04-13T07:13:16.492595Z"}
2022-04-13_07:16:15.43084 {"@level":"info","@message":"serf: EventMemberJoin: fips-test-monitor-1 172.31.5.188","@module":"agent.server.serf.lan","@timestamp":"2022-04-13T07:16:15.430805Z"}
After
root@fips-test-consul-1:/var/log/gitlab/consul# tail -f current
{"@level":"info","@message":"Handled event for server in area","@module":"agent.server","@timestamp":"2022-04-13T16:54:31.081547Z","area":"wan","event":"member-join","server":"fips-test-consul-3.gitlab_consul"}
{"@level":"info","@message":"Handled event for server in area","@module":"agent.server","@timestamp":"2022-04-13T16:54:31.082210Z","area":"wan","event":"member-join","server":"fips-test-consul-2.gitlab_consul"}
{"@level":"info","@message":"serf: EventMemberJoin: fips-test-gitaly-1 172.31.0.96","@module":"agent.server.serf.lan","@timestamp":"2022-04-13T16:54:31.082433Z"}
{"@level":"info","@message":"serf: EventMemberJoin: fips-test-consul-2 172.31.26.139","@module":"agent.server.serf.lan","@timestamp":"2022-04-13T16:54:31.082516Z"}
{"@level":"info","@message":"serf: Re-joined to previously known node: fips-test-monitor-1: 172.31.5.188:8301","@module":"agent.server.serf.lan","@timestamp":"2022-04-13T16:54:31.082566Z"}
{"@level":"info","@message":"Adding LAN server","@module":"agent.server","@timestamp":"2022-04-13T16:54:31.082596Z","server":"fips-test-consul-2 (Addr: tcp/172.31.26.139:8300) (DC: gitlab_consul)"}
{"@level":"info","@message":"(LAN) joined","@module":"agent","@timestamp":"2022-04-13T16:54:31.086125Z","number_of_nodes":3}
{"@level":"info","@message":"Join cluster completed. Synced with initial agents","@module":"agent","@timestamp":"2022-04-13T16:54:31.086144Z","cluster":"LAN","num_agents":3}
{"@level":"info","@message":"Synced node info","@module":"agent","@timestamp":"2022-04-13T16:54:31.460602Z"}
Related issues
Checklist
See Definition of done.
For anything in this list which will not be completed, please provide a reason in the MR discussion
Required
-
Merge Request Title, and Description are up to date, accurate, and descriptive -
MR targeting the appropriate branch -
MR has a green pipeline on GitLab.com -
Pipeline is green on dev.gitlab.org if the change is touching anything besides documentation or internal cookbooks -
trigger-package
has a green pipeline running against latest commit
Expected (please provide an explanation if not completing)
-
Test plan indicating conditions for success has been posted and passes -
Documentation created/updated -
Tests added -
Integration tests added to GitLab QA -
Equivalent MR/issue for the GitLab Chart opened
Edited by Stan Hu