Commit 9848f9cf authored by Walter Heck's avatar Walter Heck

Merge branch '6-elastic-stack-upgrade' of...

Merge branch '6-elastic-stack-upgrade' of https://gitlab.olindata.com/opstheater/opstheater into HEAD
parents 1dea5e4b ce510740
Pipeline #339 failed with stages
in 2 minutes and 22 seconds
......@@ -151,9 +151,9 @@
'opstheater::icingaweb::ldap::auth_user_class': 'user'
'opstheater::icingaweb::ldap::auth_user_attribute': 'sAccountName'
'opstheater::icingaweb::ldap::enabled': %{hiera('opstheater::ldap::enabled')}
'opstheater::icingaweb::ldap::enabled': "%{hiera('opstheater::ldap::enabled')}"
'opstheater::icingaweb::ldap::server': "%{hiera('opstheater::ldap::server')}"
'opstheater::icingaweb::ldap::port': %{hiera('opstheater::ldap::port')}
'opstheater::icingaweb::ldap::port': "%{hiera('opstheater::ldap::port')}"
'opstheater::icingaweb::ldap::ssl': "%{hiera('opstheater::ldap::ssl')}"
'opstheater::icingaweb::ldap::username': "%{hiera('opstheater::ldap::username')}"
'opstheater::icingaweb::ldap::password': "%{hiera('opstheater::ldap::password')}"
......
......@@ -13,7 +13,7 @@ class opstheater::profile::icinga::client (
class { '::icinga2':
manage_repo => true,
confd => false,
features => ['checker','mainlog'],
features => ['checker','mainlog'],
}
class { '::icinga2::feature::api':
......@@ -45,6 +45,14 @@ class opstheater::profile::icinga::client (
target => "/etc/icinga2/zones.d/${parent_zone}/${::hostname}.conf",
}
@@file { "/etc/icinga2/zones.d/${::fqdn}":
ensure => directory,
owner => 'icinga',
group => 'icinga',
mode => '0750',
tag => 'icinga2::zone',
}
@@::icinga2::object::host { $::fqdn:
* => merge({
display_name => $::hostname,
......
......@@ -43,6 +43,14 @@ class opstheater::profile::icinga::server (
tag => 'icinga2::config::file',
}
file { '/etc/icinga2/zones.d/master':
ensure => directory,
owner => 'icinga',
group => 'icinga',
mode => '0750',
tag => 'icinga2::config::file',
}
$lowercase_fqdn = downcase($::fqdn)
class { '::icinga2::feature::api':
accept_commands => true,
......@@ -61,6 +69,8 @@ class opstheater::profile::icinga::server (
}
}
File <<| tag == "icinga2::zone" |>>
::Icinga2::Object::Host <<| |>>
::Icinga2::Object::Service <<| |>>
::Icinga2::Object::Zone <<| |>>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment