Merge pull request #842 from TalentSoft/add_charset_param

voxpupuli · Sep 21, 2022 · a122643 · a122643
2 parents 9156c62 + 19a495b
commit a122643
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -2505,6 +2505,8 @@ The following parameters are available in the `zabbix::proxy` class:
 * [`database_password`](#database_password)
 * [`database_socket`](#database_socket)
 * [`database_port`](#database_port)
+* [`database_charset`](#database_collate)
+* [`database_collate`](#database_collate)
 * [`database_tlsconnect`](#database_tlsconnect)
 * [`database_tlscafile`](#database_tlscafile)
 * [`database_tlscertfile`](#database_tlscertfile)
@@ -2874,6 +2876,22 @@ Database port when not using local socket. Ignored for sqlite.
 
 Default value: `$zabbix::params::proxy_database_port`
 
+##### <a name="database_charset"></a>`database_charset`
+
+Data type: `Any`
+
+The default charset of the database.
+
+Default value: `$zabbix::params::server_database_charset`
+
+##### <a name="database_collate"></a>`database_collate`
+
+Data type: `Any`
+
+The default collation of the database.
+
+Default value: `$zabbix::params::server_database_collate`
+
 ##### <a name="database_tlsconnect"></a>`database_tlsconnect`
 
 Data type: `Optional[Enum['required', 'verify_ca', 'verify_full']]`

diff --git a/manifests/proxy.pp b/manifests/proxy.pp
@@ -43,6 +43,8 @@
 # @param database_password Database password. ignored for sqlite.
 # @param database_socket Path to mysql socket.
 # @param database_port Database port when not using local socket. Ignored for sqlite.
+# @param database_charset The default charset of the database.
+# @param database_collate The default collation of the database.
 # @param database_tlsconnect
 #   Available options:
 #   * required - connect using TLS
@@ -220,6 +222,8 @@
   $database_password                                                          = $zabbix::params::proxy_database_password,
   $database_socket                                                            = $zabbix::params::proxy_database_socket,
   $database_port                                                              = $zabbix::params::proxy_database_port,
+  $database_charset                                                           = $zabbix::params::server_database_charset,
+  $database_collate                                                           = $zabbix::params::server_database_collate,
   Optional[Enum['required', 'verify_ca', 'verify_full']] $database_tlsconnect = $zabbix::params::proxy_database_tlsconnect,
   Optional[Stdlib::Absolutepath] $database_tlscafile                          = $zabbix::params::proxy_database_tlscafile,
   Optional[Stdlib::Absolutepath] $database_tlscertfile                        = $zabbix::params::proxy_database_tlscertfile,
@@ -487,6 +491,8 @@
       database_user     => $database_user,
       database_password => $database_password,
       database_host     => $database_host,
+      database_charset  => $database_charset,
+      database_collate  => $database_collate,
       zabbix_proxy      => $zabbix_proxy,
       zabbix_proxy_ip   => $zabbix_proxy_ip,
       before            => $before_database,