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

Add missing monitoring module settings #390

Merged
merged 1 commit into from
Nov 21, 2023
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
8 changes: 8 additions & 0 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2171,6 +2171,7 @@ The following parameters are available in the `icingaweb2::module::monitoring` c
* [`tls_capath`](#-icingaweb2--module--monitoring--tls_capath)
* [`tls_noverify`](#-icingaweb2--module--monitoring--tls_noverify)
* [`tls_cipher`](#-icingaweb2--module--monitoring--tls_cipher)
* [`settings`](#-icingaweb2--module--monitoring--settings)
* [`commandtransports`](#-icingaweb2--module--monitoring--commandtransports)

##### <a name="-icingaweb2--module--monitoring--ensure"></a>`ensure`
Expand Down Expand Up @@ -2322,6 +2323,13 @@ Cipher to use for the encrypted database connection.

Default value: `undef`

##### <a name="-icingaweb2--module--monitoring--settings"></a>`settings`

Data type: `Hash[String,Any]`

General configuration of module monitoring.
See official Icinga [documentation](https://icinga.com/docs/icinga-web/latest/modules/monitoring/doc/03-Configuration)

##### <a name="-icingaweb2--module--monitoring--commandtransports"></a>`commandtransports`

Data type: `Hash`
Expand Down
1 change: 1 addition & 0 deletions data/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ icingaweb2::module::monitoring::ido_host: localhost
icingaweb2::module::monitoring::ido_resource_name: icinga2
icingaweb2::module::monitoring::ido_db_name: icinga2
icingaweb2::module::monitoring::ido_db_username: icinga2
icingaweb2::module::monitoring::settings: {}
icingaweb2::module::monitoring::commandtransports: {}

icingaweb2::module::icingadb::ensure: present
Expand Down
12 changes: 11 additions & 1 deletion manifests/module/monitoring.pp
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@
# @param tls_cipher
# Cipher to use for the encrypted database connection.
#
# @param settings
# General configuration of module monitoring.
# See official Icinga [documentation](https://icinga.com/docs/icinga-web/latest/modules/monitoring/doc/03-Configuration)
#
# @param commandtransports
# A hash of command transports.
#
Expand Down Expand Up @@ -94,6 +98,7 @@
Enum['absent', 'present'] $ensure,
Variant[String, Array[String]] $protected_customvars,
Hash $commandtransports,
Hash[String,Any] $settings,
Enum['mysql', 'pgsql'] $ido_type,
Stdlib::Host $ido_host,
String $ido_resource_name,
Expand Down Expand Up @@ -150,7 +155,7 @@
},
}

$settings = {
$_settings = {
'module-monitoring-backends' => {
'section_name' => 'backends',
'target' => "${module_conf_dir}/backends.ini",
Expand All @@ -161,6 +166,11 @@
'target' => "${module_conf_dir}/config.ini",
'settings' => delete_undef_values($security_settings),
},
'module-monitoring-general' => {
'section_name' => 'settings',
'target' => "${module_conf_dir}/config.ini",
'settings' => delete_undef_values($settings),
},
}

class { 'icingaweb2::module::monitoring::install': }
Expand Down
2 changes: 1 addition & 1 deletion manifests/module/monitoring/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class icingaweb2::module::monitoring::config {
assert_private()

$settings = $icingaweb2::module::monitoring::settings
$settings = $icingaweb2::module::monitoring::_settings
$db = $icingaweb2::module::monitoring::db
$db_charset = $icingaweb2::module::monitoring::ido_db_charset
$db_resource = $icingaweb2::module::monitoring::ido_resource_name
Expand Down
19 changes: 18 additions & 1 deletion spec/classes/modules/monitoring_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@
.with_settings({ 'protected_customvars' => '*pw*,*pass*,community', })
}

it {
is_expected.to contain_icingaweb2__inisection('module-monitoring-general')
.with_section_name('settings')
.with_target('/etc/icingaweb2/modules/monitoring/config.ini')
.with_settings({})
}

it {
is_expected.to contain_icingaweb2__resource__database('icinga2')
.with_type('mysql')
Expand Down Expand Up @@ -167,7 +174,7 @@
}
end

context "#{os} with use_tls 'true'" do
context "#{os} with use_tls 'true' and some settings" do
let(:pre_condition) do
[
"class { 'icingaweb2': db_type => 'mysql', tls_cacert_file => '/foo/bar', tls_capath => '/foo/bar', tls_noverify => true, tls_cipher => 'cipher' }",
Expand All @@ -177,10 +184,20 @@
let(:params) do
{
ido_type: 'mysql',
settings: {
'foo' => 'bar',
},
use_tls: true,
}
end

it {
is_expected.to contain_icingaweb2__inisection('module-monitoring-general')
.with_section_name('settings')
.with_target('/etc/icingaweb2/modules/monitoring/config.ini')
.with_settings({ 'foo' => 'bar' })
}

it {
is_expected.to contain_icingaweb2__resource__database('icinga2').with(
{
Expand Down
Loading