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.

Sign up for GitHub

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

Jump to bottom

Add charset and collate parameters for zabbix::proxy #842

Merged
merged 1 commit into from
Sep 21, 2022
Merged

Add charset and collate parameters for zabbix::proxy #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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']]`
Expand Down
6 changes: 6 additions & 0 deletions manifests/proxy.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down