diff --git a/data/subnets/sesi_rocquencourt.yaml b/data/subnets/sesi_rocquencourt.yaml --- a/data/subnets/sesi_rocquencourt.yaml +++ b/data/subnets/sesi_rocquencourt.yaml @@ -9,6 +9,10 @@ dns::forwarder_insecure: true ntp::servers: + - 0.debian.pool.ntp.org + - 1.debian.pool.ntp.org + - 2.debian.pool.ntp.org + - 3.debian.pool.ntp.org - sesi-ntp1.inria.fr - sesi-ntp2.inria.fr diff --git a/data/subnets/sesi_rocquencourt_admin.yaml b/data/subnets/sesi_rocquencourt_admin.yaml --- a/data/subnets/sesi_rocquencourt_admin.yaml +++ b/data/subnets/sesi_rocquencourt_admin.yaml @@ -14,10 +14,6 @@ - 193.51.196.131 dns::forwarder_insecure: true -ntp::servers: - - sesi-ntp1.inria.fr - - sesi-ntp2.inria.fr - internal_network: 192.168.50.0/24 smtp::relay_hostname: 'smtp.inria.fr' diff --git a/data/subnets/sesi_rocquencourt_staging.yaml b/data/subnets/sesi_rocquencourt_staging.yaml --- a/data/subnets/sesi_rocquencourt_staging.yaml +++ b/data/subnets/sesi_rocquencourt_staging.yaml @@ -14,10 +14,6 @@ - 193.51.196.131 dns::forwarder_insecure: true -ntp::servers: - - sesi-ntp1.inria.fr - - sesi-ntp2.inria.fr - internal_network: 192.168.130.0/24 smtp::relay_hostname: 'smtp.inria.fr' diff --git a/site-modules/profile/manifests/icinga2/objects/common_checks.pp b/site-modules/profile/manifests/icinga2/objects/common_checks.pp --- a/site-modules/profile/manifests/icinga2/objects/common_checks.pp +++ b/site-modules/profile/manifests/icinga2/objects/common_checks.pp @@ -70,6 +70,19 @@ target => '/etc/icinga2/zones.d/global-templates/services.conf', } + ::icinga2::object::service {'ntp': + import => ['generic-service'], + apply => true, + check_command => 'ntp_peer', + command_endpoint => 'host.name', + vars => { + ntp_address => 'localhost', + }, + assign => ['host.vars.os == Linux'], + ignore => ['host.vars.noagent'], + target => '/etc/icinga2/zones.d/global-templates/services.conf', + } + ::icinga2::object::service {'journalbeat': import => ['generic-service'], apply => true,