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.

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

feat(RHIDP-5123): Make RHDH log level configurable #134

Merged
merged 1 commit into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ export DURATION ?= 1m
# Used to set --spawn-rate option of locust CLI (Rate to spawn users at (users per second)). See https://docs.locust.io/en/stable/configuration.html#command-line-options for details
export SPAWN_RATE ?= 20

# Used to set logging level of RHDH
export RHDH_LOG_LEVEL ?= warn

# RHDH image to deploy. Uncomment and set to override RHDH image to deploy and test.
export RHDH_IMAGE_REGISTRY ?=
export RHDH_IMAGE_REPO ?=
Expand Down
2 changes: 2 additions & 0 deletions ci-scripts/rhdh-setup/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ export AUTH_PROVIDER="${AUTH_PROVIDER:-''}"
export ENABLE_RBAC="${ENABLE_RBAC:-false}"
export ENABLE_PROFILING="${ENABLE_PROFILING:-false}"
export RBAC_POLICY="${RBAC_POLICY:-all_groups_admin}"
export RHDH_LOG_LEVEL="${RHDH_LOG_LEVEL:-warn}"

export PSQL_LOG="${PSQL_LOG:-true}"
export RHDH_METRIC="${RHDH_METRIC:-true}"
Expand Down Expand Up @@ -362,6 +363,7 @@ install_rhdh_with_helm() {
${RHDH_IMAGE_TAG} \
${RHDH_NAMESPACE} \
${RHDH_METRIC} \
${RHDH_LOG_LEVEL} \
${COOKIE_SECRET} \
' <"$TMP_DIR/chart-values.temp.yaml" >"$TMP_DIR/chart-values.yaml"
if [ -n "${RHDH_RESOURCES_CPU_REQUESTS}" ]; then yq -i '.upstream.backstage.resources.requests.cpu = "'"${RHDH_RESOURCES_CPU_REQUESTS}"'"' "$TMP_DIR/chart-values.yaml"; fi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ upstream:
key: CLIENT_SECRET
name: keycloak-client-secret-backstage
- name: LOG_LEVEL
value: "warn"
value: "${RHDH_LOG_LEVEL}"
- name: NODE_TLS_REJECT_UNAUTHORIZED
value: "0"
image:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ upstream:
key: CLIENT_SECRET
name: keycloak-client-secret-backstage
- name: LOG_LEVEL
value: "warn"
value: "${RHDH_LOG_LEVEL}"
- name: NODE_TLS_REJECT_UNAUTHORIZED
value: "0"
installDir: /app
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
- name: KEYCLOAK_REALM
value: "backstage"
- name: LOG_LEVEL
value: "warn"
value: "${RHDH_LOG_LEVEL}"
- name: NODE_TLS_REJECT_UNAUTHORIZED
value: "0"
secrets:
Expand Down
1 change: 1 addition & 0 deletions test.env
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
# export RBAC_POLICY=all_groups_admin
# export RBAC_POLICY_SIZE=10000
# export ENABLE_PROFILING=false
# export RHDH_LOG_LEVEL=warn

## Scalability testing
# export SCALE_WORKERS="1 2"
Expand Down