diff --git a/docs/user/parameters.md b/docs/user/parameters.md index b106abe32..160264992 100644 --- a/docs/user/parameters.md +++ b/docs/user/parameters.md @@ -72,6 +72,21 @@ There are multiple use cases from the users perspective that dictate what parame | foreman-installer Parameter | Description | Reason | | --------------------------- | ----------- | ------ | +#### Logging + +##### New + +| Parameter | Description | +| ----------| ----------- | +| `--log-level` | Default log level for all services. Accepted values: `debug`, `info`, `warn`, `error`, `fatal`. Defaults to `info`. | + +##### Mapped + +| Parameter | Description | foreman-installer Parameters | +| ----------| ----------- | ---------------------------- | +| `--foreman-log-level` | Log level for Foreman. Overrides `--log-level` for Foreman only. | `--foreman-logging-level` | +| `--foreman-proxy-log-level` | Log level for Foreman Proxy. Overrides `--log-level` for Foreman Proxy only. | `--foreman-proxy-log-level` | + #### Undetermined | foreman-installer Parameter | Description | Module | Puppet Parameter | Keep | @@ -95,7 +110,6 @@ There are multiple use cases from the users perspective that dictate what parame | `--foreman-keycloak-app-name` | | | | `--foreman-keycloak-realm` | | | | `--foreman-logging-layout` | | | -| `--foreman-logging-level` | | | | `--foreman-logging-type` | | | | `--foreman-oauth-map-users` | | | | `--foreman-plugin-remote-execution-cockpit-ensure` | | | @@ -165,7 +179,6 @@ There are multiple use cases from the users perspective that dictate what parame | `--foreman-proxy-content-enable-ostree` | | | | | `--foreman-proxy-http` | | | | | `--foreman-proxy-log` | | | | -| `--foreman-proxy-log-level` | | | | | `--foreman-proxy-plugin-ansible-working-dir` | | | | | `--foreman-proxy-plugin-dhcp-infoblox-dns-view` | | | | | `--foreman-proxy-plugin-dhcp-infoblox-network-view` | | | | diff --git a/src/playbooks/_flavors/foreman-proxy-content/metadata.obsah.yaml b/src/playbooks/_flavors/foreman-proxy-content/metadata.obsah.yaml index 073e70a34..b4b2e5995 100644 --- a/src/playbooks/_flavors/foreman-proxy-content/metadata.obsah.yaml +++ b/src/playbooks/_flavors/foreman-proxy-content/metadata.obsah.yaml @@ -1,4 +1,5 @@ --- include: + - _logging - _pulp - _foreman_proxy diff --git a/src/playbooks/_flavors/katello/metadata.obsah.yaml b/src/playbooks/_flavors/katello/metadata.obsah.yaml index e96ba2d79..b9e42ac32 100644 --- a/src/playbooks/_flavors/katello/metadata.obsah.yaml +++ b/src/playbooks/_flavors/katello/metadata.obsah.yaml @@ -26,5 +26,6 @@ include: - _database_connection - _foreman - _foreman_proxy + - _logging - _pulp - _tuning diff --git a/src/playbooks/_logging/metadata.obsah.yaml b/src/playbooks/_logging/metadata.obsah.yaml new file mode 100644 index 000000000..860907623 --- /dev/null +++ b/src/playbooks/_logging/metadata.obsah.yaml @@ -0,0 +1,19 @@ +--- +variables: + log_level: + help: Default log level for all services. + parameter: --log-level + choices: + - debug + - info + - warn + - error + - fatal + foreman_proxy_log_level: + help: Log level for Foreman Proxy. Defaults to the global log level. + choices: + - debug + - info + - warn + - error + - fatal diff --git a/src/playbooks/deploy-proxy/deploy-proxy.yaml b/src/playbooks/deploy-proxy/deploy-proxy.yaml index 889b321f3..e49835080 100644 --- a/src/playbooks/deploy-proxy/deploy-proxy.yaml +++ b/src/playbooks/deploy-proxy/deploy-proxy.yaml @@ -11,6 +11,7 @@ - "../../vars/tuning/{{ tuning }}.yml" - "../../vars/database.yml" - "../../vars/foreman.yml" + - "../../vars/logging.yml" - "../../vars/base.yaml" roles: - role: pre_install diff --git a/src/playbooks/deploy/deploy.yaml b/src/playbooks/deploy/deploy.yaml index e246117ea..9b71c5a70 100644 --- a/src/playbooks/deploy/deploy.yaml +++ b/src/playbooks/deploy/deploy.yaml @@ -11,6 +11,7 @@ - "../../vars/tuning/{{ tuning }}.yml" - "../../vars/database.yml" - "../../vars/foreman.yml" + - "../../vars/logging.yml" - "../../vars/base.yaml" roles: - role: pre_install diff --git a/src/playbooks/deploy/metadata.obsah.yaml b/src/playbooks/deploy/metadata.obsah.yaml index 81744b368..0fdf1a242 100644 --- a/src/playbooks/deploy/metadata.obsah.yaml +++ b/src/playbooks/deploy/metadata.obsah.yaml @@ -14,6 +14,14 @@ variables: - ipa_with_api external_authentication_pam_service: help: Name of the PAM service to use for IPA authentication + foreman_log_level: + help: Log level for Foreman. Defaults to the global log level. + choices: + - debug + - info + - warn + - error + - fatal include: - _flavor_features diff --git a/src/roles/foreman/tasks/main.yaml b/src/roles/foreman/tasks/main.yaml index 00eab74a7..c84698fe7 100644 --- a/src/roles/foreman/tasks/main.yaml +++ b/src/roles/foreman/tasks/main.yaml @@ -128,6 +128,7 @@ FOREMAN_PUMA_THREADS_MAX: "{{ foreman_puma_threads_max }}" FOREMAN_PUMA_WORKERS: "{{ foreman_puma_workers }}" FOREMAN_ENABLED_PLUGINS: "{{ foreman_plugins | join(' ') }}" + FOREMAN_LOGGING_LEVEL: "{{ foreman_log_level }}" quadlet_options: - | [Install] @@ -165,6 +166,7 @@ DYNFLOW_REDIS_URL: "redis://localhost:6379/6" REDIS_PROVIDER: "DYNFLOW_REDIS_URL" FOREMAN_ENABLED_PLUGINS: "{{ foreman_plugins | join(' ') }}" + FOREMAN_LOGGING_LEVEL: "{{ foreman_log_level }}" command: "/usr/libexec/foreman/sidekiq-selinux -e production -r ./extras/dynflow-sidekiq.rb -C /etc/foreman/dynflow/%i.yml" quadlet_options: - | @@ -222,6 +224,7 @@ env: SEED_ORGANIZATION: "{{ foreman_initial_organization }}" SEED_LOCATION: "{{ foreman_initial_location }}" + FOREMAN_LOGGING_LEVEL: "{{ foreman_log_level }}" quadlet_options: - | [Unit] diff --git a/src/roles/foreman_proxy/templates/settings.yml.j2 b/src/roles/foreman_proxy/templates/settings.yml.j2 index e8dbd421f..7bd93075a 100644 --- a/src/roles/foreman_proxy/templates/settings.yml.j2 +++ b/src/roles/foreman_proxy/templates/settings.yml.j2 @@ -17,7 +17,7 @@ :bind_host: '*' -:log_level: INFO +:log_level: {{ foreman_proxy_log_level | upper }} :log_file: JOURNAL :log_buffer: 2000 :log_buffer_errors: 1000 diff --git a/src/vars/logging.yml b/src/vars/logging.yml new file mode 100644 index 000000000..05f1cab35 --- /dev/null +++ b/src/vars/logging.yml @@ -0,0 +1,5 @@ +--- +log_level: info + +foreman_log_level: "{{ log_level }}" +foreman_proxy_log_level: "{{ log_level }}"