Merge pull request #472 from wazuh/feature/451-add-format-api-parameter

Add new API logs `format` configuration parameter to Puppet deployment
wazuh · Apr 20, 2022 · 9ded37e · 9ded37e
2 parents 327d991 + b3bff14
commit 9ded37e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/manifests/manager.pp b/manifests/manager.pp
@@ -283,6 +283,7 @@
       $wazuh_api_https_use_ca                   = $wazuh::params_manager::wazuh_api_https_use_ca,
       $wazuh_api_https_ca                       = $wazuh::params_manager::wazuh_api_https_ca,
       $wazuh_api_logs_level                     = $wazuh::params_manager::wazuh_api_logs_level,
+      $wazuh_api_logs_format                    = $wazuh::params_manager::wazuh_api_logs_format,
       $wazuh_api_ssl_ciphers                    = $wazuh::params_manager::wazuh_api_ssl_ciphers,
       $wazuh_api_ssl_protocol                   = $wazuh::params_manager::wazuh_api_ssl_protocol,
 

diff --git a/manifests/params_manager.pp b/manifests/params_manager.pp
@@ -348,6 +348,8 @@
       # Logging configuration
       # Values for API log level: disabled, info, warning, error, debug, debug2 (each level includes the previous level).
       $wazuh_api_logs_level = 'info'
+      # Values for API log format: 'plain', 'json', 'plain,json', 'json,plain'
+      $wazuh_api_logs_format = 'plain'
 
       # Cross-origin resource sharing: https://github.com/aio-libs/aiohttp-cors#usage
       $wazuh_api_cors_enabled = 'no'

diff --git a/templates/wazuh_api_yml.erb b/templates/wazuh_api_yml.erb
@@ -17,6 +17,7 @@ https:
 # Values for API log level: disabled, info, warning, error, debug, debug2 (each level includes the previous level).
 logs:
   level: <%= @wazuh_api_logs_level %>
+  format: <%= @wazuh_api_logs_format %>
 # Cross-origin resource sharing: https://github.com/aio-libs/aiohttp-cors#usage
 cors:
   enabled: <%= @wazuh_api_cors_enabled %>