Skip to content

Commit 68ebfe1

Browse files
DrFaust92DrFaust92
authored
feat: add support for structure logs (#2342)
* add support for structure logs Signed-off-by: drfaust92 <[email protected]> * add support for structure logs Signed-off-by: drfaust92 <[email protected]> --------- Signed-off-by: drfaust92 <[email protected]>
1 parent 547f97e commit 68ebfe1

12 files changed

+53
-0
lines changed

Diff for: ‎Distributor/start-selenium-grid-distributor.sh

+5
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ if [ ! -z "$SE_LOG_LEVEL" ]; then
5959
SE_OPTS="$SE_OPTS --log-level ${SE_LOG_LEVEL}"
6060
fi
6161

62+
if [ ! -z "$SE_STRUCTURED_LOGS" ]; then
63+
echo "Appending Selenium options: --structured-logs ${SE_STRUCTURED_LOGS}"
64+
SE_OPTS="$SE_OPTS --structured-logs ${SE_STRUCTURED_LOGS}"
65+
fi
66+
6267
if [ ! -z "$SE_EXTERNAL_URL" ]; then
6368
echo "Appending Selenium options: --external-url ${SE_EXTERNAL_URL}"
6469
SE_OPTS="$SE_OPTS --external-url ${SE_EXTERNAL_URL}"

Diff for: ‎EventBus/start-selenium-grid-eventbus.sh

+5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ if [ ! -z "$SE_LOG_LEVEL" ]; then
2424
SE_OPTS="$SE_OPTS --log-level ${SE_LOG_LEVEL}"
2525
fi
2626

27+
if [ ! -z "$SE_STRUCTURED_LOGS" ]; then
28+
echo "Appending Selenium options: --structured-logs ${SE_STRUCTURED_LOGS}"
29+
SE_OPTS="$SE_OPTS --structured-logs ${SE_STRUCTURED_LOGS}"
30+
fi
31+
2732
if [ ! -z "$SE_EXTERNAL_URL" ]; then
2833
echo "Appending Selenium options: --external-url ${SE_EXTERNAL_URL}"
2934
SE_OPTS="$SE_OPTS --external-url ${SE_EXTERNAL_URL}"

Diff for: ‎Hub/start-selenium-grid-hub.sh

+5
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ if [ ! -z "$SE_LOG_LEVEL" ]; then
2727
SE_OPTS="$SE_OPTS --log-level ${SE_LOG_LEVEL}"
2828
fi
2929

30+
if [ ! -z "$SE_STRUCTURED_LOGS" ]; then
31+
echo "Appending Selenium options: --structured-logs ${SE_STRUCTURED_LOGS}"
32+
SE_OPTS="$SE_OPTS --structured-logs ${SE_STRUCTURED_LOGS}"
33+
fi
34+
3035
if [ ! -z "$SE_EXTERNAL_URL" ]; then
3136
echo "Appending Selenium options: --external-url ${SE_EXTERNAL_URL}"
3237
SE_OPTS="$SE_OPTS --external-url ${SE_EXTERNAL_URL}"

Diff for: ‎NodeBase/start-selenium-node.sh

+5
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@ if [ ! -z "$SE_LOG_LEVEL" ]; then
6666
SE_OPTS="$SE_OPTS --log-level ${SE_LOG_LEVEL}"
6767
fi
6868

69+
if [ ! -z "$SE_STRUCTURED_LOGS" ]; then
70+
echo "Appending Selenium options: --structured-logs ${SE_STRUCTURED_LOGS}"
71+
SE_OPTS="$SE_OPTS --structured-logs ${SE_STRUCTURED_LOGS}"
72+
fi
73+
6974
if [ ! -z "$SE_EXTERNAL_URL" ]; then
7075
echo "Appending Selenium options: --external-url ${SE_EXTERNAL_URL}"
7176
SE_OPTS="$SE_OPTS --external-url ${SE_EXTERNAL_URL}"

Diff for: ‎NodeDocker/start-selenium-grid-docker.sh

+5
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ if [ ! -z "$SE_LOG_LEVEL" ]; then
3434
SE_OPTS="$SE_OPTS --log-level ${SE_LOG_LEVEL}"
3535
fi
3636

37+
if [ ! -z "$SE_STRUCTURED_LOGS" ]; then
38+
echo "Appending Selenium options: --structured-logs ${SE_STRUCTURED_LOGS}"
39+
SE_OPTS="$SE_OPTS --structured-logs ${SE_STRUCTURED_LOGS}"
40+
fi
41+
3742
if [ ! -z "$SE_EXTERNAL_URL" ]; then
3843
echo "Appending Selenium options: --external-url ${SE_EXTERNAL_URL}"
3944
SE_OPTS="$SE_OPTS --external-url ${SE_EXTERNAL_URL}"

Diff for: ‎Router/start-selenium-grid-router.sh

+5
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ if [ ! -z "$SE_LOG_LEVEL" ]; then
5959
SE_OPTS="$SE_OPTS --log-level ${SE_LOG_LEVEL}"
6060
fi
6161

62+
if [ ! -z "$SE_STRUCTURED_LOGS" ]; then
63+
echo "Appending Selenium options: --structured-logs ${SE_STRUCTURED_LOGS}"
64+
SE_OPTS="$SE_OPTS --structured-logs ${SE_STRUCTURED_LOGS}"
65+
fi
66+
6267
if [ ! -z "$SE_EXTERNAL_URL" ]; then
6368
echo "Appending Selenium options: --external-url ${SE_EXTERNAL_URL}"
6469
SE_OPTS="$SE_OPTS --external-url ${SE_EXTERNAL_URL}"

Diff for: ‎SessionQueue/start-selenium-grid-session-queue.sh

+5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ if [ ! -z "$SE_LOG_LEVEL" ]; then
2424
SE_OPTS="$SE_OPTS --log-level ${SE_LOG_LEVEL}"
2525
fi
2626

27+
if [ ! -z "$SE_STRUCTURED_LOGS" ]; then
28+
echo "Appending Selenium options: --structured-logs ${SE_STRUCTURED_LOGS}"
29+
SE_OPTS="$SE_OPTS --structured-logs ${SE_STRUCTURED_LOGS}"
30+
fi
31+
2732
if [ ! -z "$SE_EXTERNAL_URL" ]; then
2833
echo "Appending Selenium options: --external-url ${SE_EXTERNAL_URL}"
2934
SE_OPTS="$SE_OPTS --external-url ${SE_EXTERNAL_URL}"

Diff for: ‎Sessions/start-selenium-grid-sessions.sh

+5
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ if [ ! -z "$SE_LOG_LEVEL" ]; then
3939
SE_OPTS="$SE_OPTS --log-level ${SE_LOG_LEVEL}"
4040
fi
4141

42+
if [ ! -z "$SE_STRUCTURED_LOGS" ]; then
43+
echo "Appending Selenium options: --structured-logs ${SE_STRUCTURED_LOGS}"
44+
SE_OPTS="$SE_OPTS --structured-logs ${SE_STRUCTURED_LOGS}"
45+
fi
46+
4247
if [ ! -z "$SE_EXTERNAL_URL" ]; then
4348
echo "Appending Selenium options: --external-url ${SE_EXTERNAL_URL}"
4449
SE_OPTS="$SE_OPTS --external-url ${SE_EXTERNAL_URL}"

Diff for: ‎Standalone/start-selenium-standalone.sh

+5
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@ if [ ! -z "$SE_LOG_LEVEL" ]; then
6666
SE_OPTS="$SE_OPTS --log-level ${SE_LOG_LEVEL}"
6767
fi
6868

69+
if [ ! -z "$SE_STRUCTURED_LOGS" ]; then
70+
echo "Appending Selenium options: --structured-logs ${SE_STRUCTURED_LOGS}"
71+
SE_OPTS="$SE_OPTS --structured-logs ${SE_STRUCTURED_LOGS}"
72+
fi
73+
6974
if [ ! -z "$SE_EXTERNAL_URL" ]; then
7075
echo "Appending Selenium options: --external-url ${SE_EXTERNAL_URL}"
7176
SE_OPTS="$SE_OPTS --external-url ${SE_EXTERNAL_URL}"

Diff for: ‎StandaloneDocker/start-selenium-grid-docker.sh

+5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ if [ ! -z "$SE_LOG_LEVEL" ]; then
1919
SE_OPTS="$SE_OPTS --log-level ${SE_LOG_LEVEL}"
2020
fi
2121

22+
if [ ! -z "$SE_STRUCTURED_LOGS" ]; then
23+
echo "Appending Selenium options: --structured-logs ${SE_STRUCTURED_LOGS}"
24+
SE_OPTS="$SE_OPTS --structured-logs ${SE_STRUCTURED_LOGS}"
25+
fi
26+
2227
if [ ! -z "$SE_EXTERNAL_URL" ]; then
2328
echo "Appending Selenium options: --external-url ${SE_EXTERNAL_URL}"
2429
SE_OPTS="$SE_OPTS --external-url ${SE_EXTERNAL_URL}"

Diff for: ‎charts/selenium-grid/templates/logging-configmap.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ metadata:
1313
{{- end }}
1414
data:
1515
SE_LOG_LEVEL: "{{ default "INFO" .Values.global.seleniumGrid.logLevel }}"
16+
SE_STRUCTURED_LOGS: "{{ default false .Values.global.seleniumGrid.structuredLogs }}"
1617
{{- if (eq (include "seleniumGrid.enableTracing" .) "true") }}
1718
SE_ENABLE_TRACING: "true"
1819
SE_OTEL_TRACES_EXPORTER: {{ .Values.tracing.exporter | quote }}

Diff for: ‎charts/selenium-grid/values.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ global:
2929
stdoutProbeLog: false
3030
# specify how many old ReplicaSets for this Deployment you want to retain. The rest will be garbage-collected in the background.
3131
revisionHistoryLimit: 10
32+
# Whether to enable structured logging
33+
structuredLogs: false
3234

3335
tls:
3436
# Name of external secret containing the TLS certificate and key

0 commit comments

Comments
 (0)