Commit 5f881e13 authored by Walter Heck's avatar Walter Heck

More fixes to icinga

parent dac79795
Pipeline #344 passed with stages
in 2 minutes and 16 seconds
......@@ -53,6 +53,7 @@ opstheater::profile::mysql::override_options:
log_slow_admin_statements: 1
log_slow_rate_limit: 1000
log_slow_verbosity: query_plan,innodb
log_warnings: 2
long_query_time: 10
max_allowed_packet: 32M
max_connect_errors: 999999
......
......@@ -4,18 +4,18 @@ class opstheater::profile::icinga::db (
$mysql_whitelist_range = hiera('opstheater::mysql::whitelist_range'),
) inherits opstheater::profile::params {
mysql::db { 'icinga2_web':
mysql::db { 'icinga2':
user => 'icinga2_web',
password => $icinga2_webdb_password,
host => $mysql_whitelist_range,
grant => ['ALL'],
}
mysql::db { 'icinga2_data':
user => 'icinga2',
password => $icinga2_ido_password,
host => $mysql_whitelist_range,
grant => ['ALL'],
mysql_grant { "icinga2@${mysql_whitelist_range}/icinga2.*":
ensure => 'present',
privileges => ['ALL'],
table => 'icinga2.*',
user => "icinga2@${mysql_whitelist_range}",
}
}
......@@ -7,7 +7,7 @@ class opstheater::profile::icinga::server (
class { 'icinga2':
confd => false,
manage_repo => true,
features => ['checker','mainlog','notification','statusdata','compatlog','command'],
features => ['checker','mainlog','notification','statusdata','compatlog','command','perfdata'],
constants => {
'ZoneName' => 'master',
},
......@@ -16,9 +16,9 @@ class opstheater::profile::icinga::server (
class { 'icinga2::feature::idomysql':
host => $icinga2_db_ipaddress,
port => '3306',
database => 'icinga2_data',
database => 'icinga2',
user => 'icinga2',
password => "$icinga2_ido_password",
password => $icinga2_ido_password,
import_schema => true,
}
......@@ -29,7 +29,6 @@ class opstheater::profile::icinga::server (
assign => [ 'host.name == NodeName' ],
}
icinga2::object::zone { 'global-templates':
global => true,
}
......
......@@ -190,12 +190,12 @@ class opstheater::profile::icinga::web (
manage_apache_vhost => true,
ido_db => 'mysql',
ido_db_host => $icinga2_db_ipaddress,
ido_db_name => 'icinga2_data',
ido_db_name => 'icinga2',
ido_db_user => 'icinga2',
ido_db_pass => $icinga2_ido_password,
ido_db_port => '3306',
web_db => 'mysql',
web_db_name => 'icinga2_web',
web_db_name => 'icinga2',
web_db_host => $icinga2_db_ipaddress,
web_db_user => 'icinga2_web',
web_db_pass => $icinga2_webdb_password,
......@@ -221,12 +221,12 @@ class opstheater::profile::icinga::web (
manage_apache_vhost => true,
ido_db => 'mysql',
ido_db_host => $icinga2_db_ipaddress,
ido_db_name => 'icinga2_data',
ido_db_name => 'icinga2',
ido_db_user => 'icinga2',
ido_db_pass => $icinga2_ido_password,
ido_db_port => '3306',
web_db => 'mysql',
web_db_name => 'icinga2_web',
web_db_name => 'icinga2',
web_db_host => $icinga2_db_ipaddress,
web_db_user => 'icinga2_web',
web_db_pass => $icinga2_webdb_password,
......
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