Refine basic Linux monitoring

* Add ragent
* Use servicegroups/hostgroups

3 files changed, 50 insertions, 9 deletions

diff --git a/personal_infra/puppet/modules/nagios/manifests/init.pp b/personal_infra/puppet/modules/nagios/manifests/init.pp
index 48aaf0a8..5568fbf9 100644
--- a/personal_infra/puppet/modules/nagios/manifests/init.pp
+++ b/personal_infra/puppet/modules/nagios/manifests/init.pp
@@ -41,6 +41,50 @@ class nagios {
     owner => 'nagios',
   }
 
+  nagios_command {'check_ragent':
+    command_name => 'check_ragent',
+    command_line => '/usr/bin/check_ragent http://$HOSTADDRESS$:21488/ --warning-units dnf-makecache.service --warning-units dnf-automatic-install.service',
+    require => Package['nagios'],
+    notify => Service['nagios'],
+    owner => 'nagios',
+  }
+
+  nagios_hostgroup {'linux':
+    hostgroup_name => 'linux',
+    require => Package['nagios'],
+    notify => Service['nagios'],
+    owner => 'nagios',
+    ensure => present,
+  }
+
+  nagios_servicegroup {'ragent':
+    require => Package['nagios'],
+    notify => Service['nagios'],
+    owner => 'nagios',
+    ensure => present,
+  }
+
+  nagios_service {'check_ragent':
+    use => 'generic-service',
+    hostgroup_name => 'linux',
+    service_description => 'check_ragent',
+    servicegroups => 'ragent',
+    check_command => 'check_ragent',
+    require => Package['nagios'],
+    notify => Service['nagios'],
+    owner => 'nagios',
+  }
+
+  nagios_service {'check_ssh':
+    use => 'generic-service',
+    hostgroup_name => 'linux',
+    service_description => 'ssh',
+    check_command => 'check_ssh',
+    require => Package['nagios'],
+    notify => Service['nagios'],
+    owner => 'nagios',
+  }
+
   package {'httpd':}
   ->
   service {'httpd':
diff --git a/personal_infra/puppet/modules/nagios/templates/nagios.cfg.epp b/personal_infra/puppet/modules/nagios/templates/nagios.cfg.epp
index 8ed499b8..8e28ceb8 100644
--- a/personal_infra/puppet/modules/nagios/templates/nagios.cfg.epp
+++ b/personal_infra/puppet/modules/nagios/templates/nagios.cfg.epp
@@ -33,6 +33,9 @@ cfg_file=/etc/nagios/objects/templates.cfg
 # puppet generated
 cfg_file=/etc/nagios/nagios_contactgroup.cfg
 cfg_file=/etc/nagios/nagios_contact.cfg
+cfg_file=/etc/nagios/nagios_command.cfg
+cfg_file=/etc/nagios/nagios_hostgroup.cfg
+cfg_file=/etc/nagios/nagios_servicegroup.cfg
 cfg_file=/etc/nagios/nagios_host.cfg
 cfg_file=/etc/nagios/nagios_service.cfg
 
diff --git a/personal_infra/puppet/site/00-common.pp b/personal_infra/puppet/site/00-common.pp
index cb0126bb..b9f2a6f7 100644
--- a/personal_infra/puppet/site/00-common.pp
+++ b/personal_infra/puppet/site/00-common.pp
@@ -12,15 +12,9 @@ nagios_host {$nagios_host:
   use => 'generic-host',
   address => lookup({name => 'nagios.address', default_value => $facts['networking']['fqdn']}),
   max_check_attempts => 5,
-  contact_groups => "admins",
-  check_command => "check-host-alive",
-}
-
-nagios_service {"${nagios_host}-ssh":
-  use => 'generic-service',
-  host_name => $facts['networking']['fqdn'],
-  service_description => "ssh",
-  check_command => "check_ssh",
+  contact_groups => 'admins',
+  hostgroups => 'linux',
+  check_command => 'check-host-alive',
 }
 
 # https://github.com/alexpdp7/ragent/issues/352