Fix nagios support on RHEL

manifests/nagios/client.pp

@@ -4,6 +4,7 @@
   $public_ip                 = ipaddress_eth0,
   $atomia_account            = '100001',
   $apache_agent_class        = 'atomia::nagios::client::apache_agent',
+  $apache_agent_cl_class     = 'atomia::nagios::client::apache_agent_cl',
   $atomiadns_master_class    = 'atomia::nagios::client::atomiadns_master',
   $nameserver_class          = 'atomia::nagios::client::nameserver',
   $fsagent_class             = 'atomia::nagios::client::fsagent',
@@ -37,7 +38,6 @@
     }
   }
 
-
   # Deploy on Windows.
   if $::operatingsystem == 'windows' {
     class { 'nsclient':
@@ -78,22 +78,42 @@
       }
     }
 
+  # Deploy on other OS (Linux) perl-DateTime-Format-ISO8601
   } else {
-    # Deploy on other OS (Linux)
-    package { [
-      'nagios-nrpe-server',
-      'libconfig-json-perl',
-      'libdatetime-format-iso8601-perl'
-    ]:
-      ensure => installed,
-    }
-
-    if ! defined(Package['libwww-mechanize-perl']) {
-      package { 'libwww-mechanize-perl':
+    # Check the distro first if redhat (centos, cloudlinux) then we need to change some libs
+    if $::osfamily.downcase == 'redhat' {
+      package { [
+        'nrpe', # we need to install the basic plugins to have the folder needed for our atomia plugins
+        'nagios-plugins-users',
+        'nagios-plugins-load',
+        'nagios-plugins-swap',
+        'nagios-plugins-disk',
+        'nagios-plugins-procs',
+        'perl-JSON',
+        'perl-DateTime-Format-ISO8601'
+      ]:
+        ensure => installed,
+      }
+      if ! defined(Package['perl-WWW-Mechanize']) {
+        package { 'perl-WWW-Mechanize':
+          ensure => installed,
+        }
+      }
+    } else {
+      package { [
+        'nagios-nrpe-server',
+        'libconfig-json-perl',
+        'libdatetime-format-iso8601-perl'
+      ]:
         ensure => installed,
       }
+      if ! defined(Package['libwww-mechanize-perl']) {
+        package { 'libwww-mechanize-perl':
+          ensure => installed,
+        }
+      }
     }
-
+    
     # Define hostgroups based on custom fact
     case $::atomia_role_1 {
       'domainreg':            {
@@ -111,6 +131,11 @@
         class { $apache_agent_class: }
       }
 
+      'apache_agent_cl': {
+        $hostgroup = 'linux-customer-webservers,linux-all'
+        class { $apache_agent_cl_class: }
+      }
+
       'atomiadns': {
         $hostgroup = 'linux-dns,linux-all'
         class { $atomiadns_master_class: }
@@ -185,29 +210,12 @@
       default: {
         warning('Unsupported config')
       }
-
-    }
-    if ! defined(Service['nagios-nrpe-server']) {
-      service { 'nagios-nrpe-server':
-        ensure  => running,
-        require => Package['nagios-nrpe-server'],
-      }
     }
 
     $daggre_ip = hiera('atomia::daggre::ip_addr','')
     $daggre_token = hiera('atomia::daggre::global_auth_token','')
     $daggre_check_ftp_url = "http://${daggre_ip}:999/g?a=${daggre_token}&o=100000&latest=ftp_storage"
     $daggre_check_traffic_url = "http://${daggre_ip}:999/g?a=${daggre_token}&o=100000&latest=web_traffic_bytes"
-    # Configuration files
-    file { '/etc/nagios/nrpe.cfg':
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0644',
-      content => template('atomia/nagios/nrpe.cfg.erb'),
-      require => Package['nagios-nrpe-server'],
-      notify  => Service['nagios-nrpe-server']
-    }
-
 
     @@nagios_host { "${::fqdn}-host" :
       use                => 'generic-host',
@@ -219,14 +227,72 @@
       max_check_attempts => '5'
     }
 
+    if $::osfamily.downcase == 'redhat' {
+      if ! defined(Service['nrpe']) {
+        service { 'nrpe':
+          ensure  => running,
+          enable  => true,
+          require => Package['nrpe'],
+        }
+      }
+      # Configuration files
+      # We need to be sure these dirs and files are present or nagios client wont run
+      # We need to allow access to nrpe user to run sudo without password for it to be able to run checks
+      file { '/etc/nagios/nrpe_local.cfg':
+        ensure  => 'present',
+        replace => 'no',
+        content => '',
+        mode    => '0644'
+      } ->
+      exec { 'add nrpe to sudoers general' :
+        command => "/usr/bin/echo '%nrpe ALL=(ALL) NOPASSWD: /usr/lib64/nagios/plugins/' >> /etc/sudoers",
+        unless  => "/usr/bin/grep -c '%nrpe ALL=(ALL) NOPASSWD: /usr/lib64/nagios/plugins/' /etc/sudoers",
+        require => Package['nrpe']
+      } ->
+      exec { 'add nrpe to sudoers atomia' :
+        command => "/usr/bin/echo '%nrpe ALL=(ALL) NOPASSWD: /usr/lib64/nagios/plugins/atomia/' >> /etc/sudoers",
+        unless  => "/usr/bin/grep -c '%nrpe ALL=(ALL) NOPASSWD: /usr/lib64/nagios/plugins/atomia/' /etc/sudoers",
+        require => Package['nrpe']
+      } ->
+      file { '/etc/nagios/nrpe.cfg':
+        owner   => 'root',
+        group   => 'root',
+        mode    => '0644',
+        content => template('atomia/nagios/nrpe.cfg.erb'),
+        require => Package['nrpe'],
+        notify  => Service['nrpe']
+      }
 
-    if !defined(File['/usr/lib/nagios/plugins/atomia']){
-      file { '/usr/lib/nagios/plugins/atomia':
-        source  => 'puppet:///modules/atomia/nagios/plugins',
-        recurse => true,
-        require => Package['nagios-nrpe-server']
+      if !defined(File['/usr/lib64/nagios/plugins/atomia']){
+        file { '/usr/lib64/nagios/plugins/atomia':
+          source  => 'puppet:///modules/atomia/nagios/plugins',
+          recurse => true,
+          require => Package['nrpe']
+        }
+      }
+    } else { #Debian based distros
+      if ! defined(Service['nagios-nrpe-server']) {
+        service { 'nagios-nrpe-server':
+          ensure  => running,
+          require => Package['nagios-nrpe-server'],
+        }
+      }
+      # Configuration files
+      file { '/etc/nagios/nrpe.cfg':
+        owner   => 'root',
+        group   => 'root',
+        mode    => '0644',
+        content => template('atomia/nagios/nrpe.cfg.erb'),
+        require => Package['nagios-nrpe-server'],
+        notify  => Service['nagios-nrpe-server']
+      }
+      if !defined(File['/usr/lib/nagios/plugins/atomia']){
+        file { '/usr/lib/nagios/plugins/atomia':
+          source  => 'puppet:///modules/atomia/nagios/plugins',
+          recurse => true,
+          require => Package['nagios-nrpe-server']
+        }
       }
     }
-
   }
 }

manifests/nagios/client/apache_agent_cl.pp

@@ -0,0 +1,65 @@
+class atomia::nagios::client::apache_agent_cl (
+
+) {
+
+  @@nagios_service { "${::fqdn}-apache_agent-mountpoints":
+    host_name           => $::fqdn,
+    service_description => 'NFS mounts',
+    check_command       => 'check_nrpe!check_all_mountpoints',
+    use                 => 'generic-service',
+    target              => "/usr/local/nagios/etc/servers/${::hostname}_service.cfg",
+  }
+
+  @@nagios_service { "${::fqdn}-apache_agent-process-count":
+    host_name           => $::fqdn,
+    service_description => 'Total processes',
+    check_command       => 'check_nrpe!check_total_procs',
+    use                 => 'generic-service',
+    target              => "/usr/local/nagios/etc/servers/${::hostname}_service.cfg",
+  }
+
+  @@nagios_service { "${::fqdn}-apache_agent-process-apache":
+    host_name           => $::fqdn,
+    service_description => 'Apache processes',
+    check_command       => 'check_nrpe!check_apache_procs',
+    use                 => 'generic-service',
+    target              => "/usr/local/nagios/etc/servers/${::hostname}_service.cfg",
+  }
+
+  @@nagios_service { "${::fqdn}-apache_agent-process-php":
+    host_name           => $::fqdn,
+    service_description => 'PHP processes',
+    check_command       => 'check_nrpe!check_php_procs',
+    use                 => 'generic-service',
+    target              => "/usr/local/nagios/etc/servers/${::hostname}_service.cfg",
+  }
+
+  @@nagios_service { "${::fqdn}-apache_agent-process-lvestats":
+    host_name           => $::fqdn,
+    service_description => 'LVEStats processes',
+    check_command       => 'check_nrpe!check_lvestats_procs',
+    use                 => 'generic-service',
+    target              => "/usr/local/nagios/etc/servers/${::hostname}_service.cfg",
+  }
+  @@nagios_service { "${::fqdn}-apache_agent-process-cagefs":
+    host_name           => $::fqdn,
+    service_description => 'CageFS processes',
+    check_command       => 'check_nrpe!check_cagefs_procs',
+    use                 => 'generic-service',
+    target              => "/usr/local/nagios/etc/servers/${::hostname}_service.cfg",
+  }
+  @@nagios_service { "${::fqdn}-apache_agent-process-clagent":
+    host_name           => $::fqdn,
+    service_description => 'CloudLinux Agent processes',
+    check_command       => 'check_nrpe!check_cloudlinux_agent_procs',
+    use                 => 'generic-service',
+    target              => "/usr/local/nagios/etc/servers/${::hostname}_service.cfg",
+  }
+  @@nagios_service { "${::fqdn}-apache_agent-process-apacheagent":
+    host_name           => $::fqdn,
+    service_description => 'Apache Agent processes',
+    check_command       => 'check_nrpe!check_apache_agent_procs',
+    use                 => 'generic-service',
+    target              => "/usr/local/nagios/etc/servers/${::hostname}_service.cfg",
+  }
+}