Merge branch 'master' into simonhoenscheid_correct_fixtures_and_metadata

.fixtures.puppet4.yml

@@ -1,5 +1,7 @@
 fixtures:
   forge_modules:
+    stdlib:
+      repo: icinga/icinga
     stdlib:
       repo: puppetlabs/stdlib
       ref: 5.2.0

.fixtures.yml

@@ -1,5 +1,5 @@
 fixtures:
-forge_modules:
+  forge_modules:
     icinga:
       repo: icinga/icinga
     stdlib:

data/Debian-family.yaml

@@ -2,10 +2,3 @@
 icinga2::globals::user: nagios
 icinga2::globals::group: nagios
 icinga2::globals::icinga2_bin: /usr/sbin/icinga2
-icinga2::repo:
-  location: http://packages.icinga.com/debian
-  release: 'icinga-%{facts.os.distro.codename}'
-  repos: main
-  key: 
-    id: F51A91A5EE001AA5D77D53C4C6E319C334410682
-    source: http://packages.icinga.com/icinga.key

data/RedHat-family.yaml

@@ -3,9 +3,3 @@ icinga2::globals::user: icinga
 icinga2::globals::group: icinga
 icinga2::globals::icinga2_bin: /sbin/icinga2
 icinga2::globals::selinux_package_name: icinga2-selinux
-icinga2::repo:
-  baseurl: 'http://packages.icinga.com/epel/%{facts.os.release.major}/release/'
-  descr: ICINGA (stable release for epel)
-  enabled: 1
-  gpgcheck: 1
-  gpgkey: http://packages.icinga.com/icinga.key

data/Suse-family.yaml

@@ -2,8 +2,3 @@
 icinga2::globals::user: icinga
 icinga2::globals::group: icinga
 icinga2::globals::icinga2_bin: /usr/sbin/icinga2
-icinga2::repo:
-  baseurl: 'http://packages.icinga.com/SUSE/%{facts.os.release.full}/release/'
-  enabled: 1
-  gpgcheck: 1
-  gpgkey: http://packages.icinga.com/icinga.key

examples/example_config.pp

@@ -4,8 +4,10 @@
 }
 
 file { '/etc/icinga2/example.d':
-  ensure => directory,
-  tag    => 'icinga2::config::file',
+  ensure  => directory,
+  tag     => 'icinga2::config::file',
+  purge   => true,
+  recurse => true,
 }
 
 
@@ -104,9 +106,9 @@
 
 ::icinga2::object::service { 'disk':
   target        => '/etc/icinga2/example.d/services.conf',
-  apply         => 'fs => config in host.vars.disks',
+  apply         => 'disk => config in host.vars.disks',
   import        => [ 'generic-service' ],
-  check_command => 'disk',
+  check_command => '-:"disk"',
   vars          => '+ config',
 }
 

examples/example_service_mysql.pp

@@ -28,8 +28,10 @@
 }
 
 file { '/etc/icinga2/example.d':
-  ensure => directory,
-  tag    => 'icinga2::config::file',
+  ensure  => directory,
+  tag     => 'icinga2::config::file',
+  purge   => true,
+  recurse => true,
 }
 
 /*
@@ -40,7 +42,7 @@
   remove_default_accounts => true,
 }
 
-mysq::db { 'icinga2':
+mysql::db { 'icinga2':
   user     => 'icinga2',
   password => 'icinga2',
   host     => 'localhost',
@@ -92,11 +94,19 @@
 /*
  * Services
  */
+::icinga2::object::service { 'generic-service':
+  template           => true,
+  target             => '/etc/icinga2/example.d/templates.conf',
+  check_interval     => '1m',
+  retry_interval     => '30s',
+  max_check_attempts => 5,
+}
+
 ::icinga2::object::service { 'mysql':
   target        => '/etc/icinga2/example.d/services.conf',
   apply         => 'mysql => config in host.vars.mysql',
   import        => ['generic-service'],
-  check_command => 'mysql',
+  check_command => '-:"mysql"',
   assign        => ['host.vars.mysql'],
   vars          => 'vars + config',
 }
@@ -105,8 +115,8 @@
   target           => '/etc/icinga2/example.d/services.conf',
   apply            => 'mysql_health => config in host.vars.mysql_health',
   import           => ['generic-service'],
-  check_command    => 'mysql_health',
-  command_endpoint => 'host.vars.client_endpoint',
+  check_command    => '-:"mysql_health"',
+#  command_endpoint => 'host.vars.client_endpoint',
   assign           => ['host.vars.mysql_health'],
   vars             => 'vars + config',
 }

examples/init_api.pp

@@ -1,12 +1,4 @@
-case $::osfamily {
-  'redhat': {
-    package { 'epel-release': }
-  } # RedHat
-}
-
-class { 'icinga2':
-  manage_repo => true,
-}
+class { 'icinga2': }
 
 class { '::icinga2::feature::api':
   pki => none,

examples/init_confd.pp

@@ -1,11 +1,4 @@
-case $::osfamily {
-  'redhat': {
-    package { 'epel-release': }
-  } # RedHat
-}
-
 class { 'icinga2':
-  manage_repo => true,
   confd       => '/etc/icinga2/local.d',
 }
 

examples/init_icingadb.pp

@@ -3,6 +3,9 @@
     if Integer($::facts['os']['release']['major']) < 8 {
       $epel      = true
       $backports = false
+    } else {
+      $epel      = false
+      $backports = false
     }
   } # RedHat
   'debian', 'ubuntu': {

examples/init_idomysql.pp

@@ -1,16 +1,8 @@
-case $::osfamily {
-  'redhat': {
-    package { 'epel-release': }
-  } # RedHat
-}
-
-$dbpass = 'super)secret'
-
 include ::mysql::server
 
 mysql::db { 'icinga2':
   user     => 'icinga2',
-  password => $dbpass,
+  password => 'supersecret',
   host     => 'localhost',
   grant    => ['SELECT', 'INSERT', 'UPDATE', 'DELETE', 'DROP', 'CREATE VIEW', 'CREATE', 'INDEX', 'EXECUTE', 'ALTER'],
 }
@@ -21,7 +13,7 @@
 
 class{ '::icinga2::feature::idomysql':
   user          => 'icinga2',
-  password      => $dbpass,
+  password      => 'supersecret',
   database      => 'icinga2',
   import_schema => true,
   require       => Mysql::Db['icinga2'],

examples/init_idomysql_ssl.pp

@@ -1,9 +1,3 @@
-case $::osfamily {
-  'redhat': {
-    package { 'epel-release': }
-  } # RedHat
-}
-
 file { '/etc/mysql':
   ensure => directory,
 }

examples/init_idopgsql.pp

@@ -1,9 +1,3 @@
-case $::osfamily {
-  'redhat': {
-    package { 'epel-release': }
-  } # RedHat
-}
-
 include ::postgresql::server
 
 postgresql::server::db { 'icinga2':
@@ -16,9 +10,9 @@
 }
 
 class{ 'icinga2::feature::idopgsql':
-  user          => "icinga2",
-  password      => "supersecret",
-  database      => "icinga2",
+  user          => 'icinga2',
+  password      => 'supersecret',
+  database      => 'icinga2',
   import_schema => true,
   require       => Postgresql::Server::Db['icinga2'],
 }

examples/init_influxdb.pp

@@ -1,9 +1,3 @@
-case $::osfamily {
-  'redhat': {
-    package { 'epel-release': }
-  } # RedHat
-}
-
 class { 'icinga2':
   manage_repo => true,
 }

examples/init_master.pp

@@ -1,9 +1,3 @@
-case $::osfamily {
-  'redhat': {
-    package { 'epel-release': }
-  } # RedHat
-}
-
 class { '::icinga2':
   manage_repo => true,
   constants   => {

examples/init_plugins.pp

@@ -1,10 +1,3 @@
-case $::osfamily {
-  'redhat': {
-    package { 'epel-release': }
-  } # RedHat
-}
-
 class { 'icinga2':
-  manage_repo => true,
   plugins     => [ 'plugins', 'plugins-contrib', 'windows-plugins', 'nscp' ]
 }

examples/init_repo.pp

@@ -1,23 +1,3 @@
-case $::facts['os']['name'] {
-  'redhat', 'centos': {
-    if Integer($::facts['os']['release']['major']) < 8 {
-      $epel      = true
-      $backports = false
-    }
-  } # RedHat
-  'debian', 'ubuntu': {
-    if $::facts['os']['distro']['codename'] in [ 'stretch', 'trusty' ] {
-      $epel      = false
-      $backports = true
-    }
-  } # Debian
-}
-
-class { '::icinga::repos':
-  manage_epel         => $epel,
-  configure_backports => $backports,
-}
-
 class { 'icinga2':
   manage_repo => true,
 }

examples/init_slave.pp

@@ -1,9 +1,3 @@
-case $::osfamily {
-  'redhat': {
-    package { 'epel-release': }
-  } # RedHat
-}
-
 $master_cert = 'master.localdomain'
 $master_ip   = '192.168.5.16'
 

examples/init_slave_validate.pp

@@ -1,9 +1,3 @@
-case $::osfamily {
-  'redhat': {
-    package { 'epel-release': }
-  } # RedHat
-}
-
 $master_cert = 'master.localdomain'
 $master_ip   = '192.168.5.12'
 

examples/init_syslog.pp

@@ -1,12 +1,4 @@
-case $::osfamily {
-  'redhat': {
-    package { 'epel-release': }
-  } # RedHat
-}
-
-class { 'icinga2':
-  manage_repo => true,
-}
+include icinga2
 
 class { '::icinga2::feature::syslog':
   severity => 'critical',

examples/objects_from_hiera.pp

@@ -27,15 +27,7 @@
 #      - generic-service
 #    target: /etc/icinga2/conf.d/services.conf
 
-case $::osfamily {
-  'redhat': {
-    package { 'epel-release': }
-  } # RedHat
-}
-
-class { 'icinga2':
-  manage_repo => true,
-}
+include icinga2
 
 $defaults = lookup('monitoring::defaults')
 

manifests/feature/elasticsearch.pp

@@ -182,7 +182,7 @@
   # The password parameter isn't parsed anymore.
   # lint:ignore:variables_not_enclosed
   if $password {
-    $_password = "-:\"$password\""
+    $_password = "-:\"${password}\""
   } else {
     $_password = undef
   }

manifests/feature/icingadb.pp

@@ -36,7 +36,7 @@
   # lint:ignore:variables_not_enclosed
   # The password parameter isn't parsed anymore.
   if $password {
-    $_password = "-:\"$password\""
+    $_password = "-:\"${password}\""
   } else {
     $_password = undef
   }

manifests/feature/idomysql.pp

@@ -263,7 +263,7 @@
     port                  => $port,
     socket_path           => $socket_path,
     user                  => $user,
-    password              => "-:\"$password\"",   # The password parameter isn't parsed anymore.
+    password              => "-:\"${password}\"",   # The password parameter isn't parsed anymore.
     database              => $database,
     table_prefix          => $table_prefix,
     instance_name         => $instance_name,

manifests/feature/idopgsql.pp

@@ -94,7 +94,7 @@
     host                  => $host,
     port                  => $port,
     user                  => $user,
-    password              => "-:\"$password\"",   # The password parameter isn't parsed anymore.
+    password              => "-:\"${password}\"",   # The password parameter isn't parsed anymore.
     database              => $database,
     table_prefix          => $table_prefix,
     instance_name         => $instance_name,

manifests/feature/influxdb.pp

@@ -206,7 +206,7 @@
   # lint:ignore:variables_not_enclosed
   # The password parameter isn't parsed anymore.
   if $password {
-    $_password = "-:\"$password\""
+    $_password = "-:\"${password}\""
   } else {
     $_password = undef
   }

manifests/init.pp

@@ -144,8 +144,6 @@
   -> Concat <| tag == 'icinga2::config::file' |>
   ~> Class['::icinga2::service']
 
-  # Put ::icinga2::repo outside to work around dependency cycle issues with the apt module
-  # and to use this class independently.
   if $::icinga2::manage_repo {
     require ::icinga::repos
   }