nagios : Start a major low-level cleanup

Author: thias

ChangeLog

@@ -0,0 +1,5 @@
+2012-05-23 - 0.2.0
+* Clean up the module to match current puppetlabs guidelines.
+* Add new params.pp and use it from nagios::client for Gentoo specifics.
+* Renamed checks.pp to defaultchecks.pp to be more explicit.
+

LICENSE

@@ -0,0 +1,14 @@
+Copyright (C) 2011 Matthias Saou
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+

Modulefile

@@ -1,2 +1,8 @@
-name 'nagios'
-version '0.1.2'
+name 'thias-nagios'
+version '0.2.0'
+source 'git://github.com/thias/puppet-modules/modules/nagios'
+author 'Matthias Saou'
+license 'Apache 2.0'
+summary 'Nagios client and server module'
+description "Install and configure one or more nagios servers to monitor all of your puppet-managed nodes."
+project_page 'http://glee.thias.es/puppet'

README

@@ -1,19 +1,17 @@
-= Summary
-
-Summary::  Nagios server and client module
-Author::   Matthias Saou <[email protected]>
-License::  Apache License 2.0
-Updated::  February 2012
+nagios
 
 = Requirements
 
-This module requires the apache-httpd and php modules for the server part,
+This module requires the apache_httpd and php modules for the server part,
 though they can be disabled.
 
 The plugin packages used for RHEL with selinux enabled should have the
 libexecdir directory properly set to /usr/libexec in order to avoid selinux
 denials. Such packages can be found on http://dl.marmotte.net/rpms/
 
+When SELinux is enforcing, the selinux::audit2allow definition is required
+to allow some basic nagios/nrpe accesses, though it can also be disabled.
+
 = Sample Usage
 
 Nagios server instance (node specific) :
@@ -34,23 +32,25 @@ Nagios server instance (node specific) :
 
 Nagios client instances (from site.pp) :
 
-    if ( $operatingsystem == 'Gentoo' ) {
-        class { 'nagios::client':
-            nrpe_pid_file      => '/var/run/nrpe/nrpe.pid',
-            nrpe_user          => 'nagios',
-            nrpe_group         => 'nagios',
-            nrpe_allowed_hosts => '127.0.0.1,192.168.1.1',
-        }
-        Nagios::Client::Nrpe {
-            plugin_dir => '/usr/lib64/nagios/plugins',
-        }
+    class { 'nagios::client':
+        nrpe_allowed_hosts => '127.0.0.1,192.168.1.1',
     }
 
-Nagios client specific overrides :
+Nagios client specific overrides (see var.pp for the list) :
 
     nagios::client::config { 'host_address': value => $ipaddress_eth2 }
 
+Nagios client check configuration examples :
+
+    nagios::client::config { 'check_ram_ensure': value => 'absent' }
+    nagios::client::config { 'check_cpu_args': value => '-w 50 -c 20' }
+
+Global disabling of a default check :
+
+    Nagios::Check::Swap { ensure => absent }
+
 Debug any startup or configuration problems on the server with :
+
     nagios -v /etc/nagios/nagios.cfg
 
 To enable nagiosgraph on the server :
@@ -74,6 +74,14 @@ To enable nagiosgraph on the server :
 To enable nagiosgraph for the client's services in the server web interface :
 
     class { 'nagios::client':
-        nagios_service_use => 'generic-service,nagiosgraph-service',
+        service_use => 'generic-service,nagiosgraph-service',
     }
 
+
+Notes :
+ Client overrides should be done in this order :
+ * For all services on some nodes : Using nagios::client service_* parameters
+ * For all services on a node : Using the nagios::client host_* parameters
+ * For specific services on all nodes : Using Nagios::Check::Foo { paramname => 'value' }
+ * For specific services on a node : Using nagios::client::config { 'check_foo_ensure': value => 'absent' }
+

manifests/check/cpu.pp

@@ -1,46 +1,51 @@
-define nagios::check::cpu ( $args = '' ) {
+define nagios::check::cpu (
+    $args                = $::nagios_check_cpu_args,
+    $servicegroups       = $::nagios_check_cpu_servicegroups,
+    $check_period        = $::nagios_check_cpu_check_period,
+    $max_check_attempts  = $::nagios_check_cpu_max_check_attempts,
+    $notification_period = $::nagios_check_cpu_notification_period,
+    $use                 = $::nagios_check_cpu_use,
+    $ensure              = $::nagios_check_cpu_ensure
+) {
 
-    # Generic overrides
-    if $::nagios_check_cpu_check_period != '' {
-        Nagios_service { check_period => $::nagios_check_cpu_check_period }
-    }
-    if $::nagios_check_cpu_notification_period != '' {
-        Nagios_service { notification_period => $::nagios_check_cpu_notification_period }
-    }
-    if $::nagios_check_cpu_max_check_attempts != '' {
-        Nagios_service { max_check_attempts => $::nagios_check_cpu_max_check_attempts }
-    }
-
-    # Service specific overrides
-    if $::nagios_check_cpu_warning != '' {
-        $warning = $::nagios_check_cpu_warning
-    } else {
-        $warning = '10'
-    }
-    if $::nagios_check_cpu_critical != '' {
-        $critical = $::nagios_check_cpu_critical
-    } else {
-        $critical = '5'
-    }
-
-    file { "${nagios::client::plugin_dir}/check_cpu":
+    # Service specific script
+    file { "${nagios::params::plugin_dir}/check_cpu":
         owner   => 'root',
         group   => 'root',
         mode    => '0755',
         content => template('nagios/plugins/check_cpu'),
         ensure  => $ensure,
     }
-
     nagios::client::nrpe { 'check_cpu':
-        args => "-w ${warning} -c ${critical} ${args}",
+        args   => $args ? { '' => '-w 10 -c 5', default => $args },
+        ensure => $ensure,
     }
 
-    @@nagios_service { "check_cpu_${title}":
+    nagios::service { "check_cpu_${title}":
         check_command       => 'check_nrpe_cpu',
         service_description => 'cpu',
-        #servicegroups       => 'cpu',
-        tag                 => "nagios-${nagios::var::server}",
+        servicegroups       => $servicegroups,
+        check_period        => $check_period,
+        max_check_attempts  => $max_check_attempts,
+        notification_period => $notification_period,
+        use                 => $use,
+        ensure              => $ensure,
     }
 
+/*
+    @@nagios_service { "check_cpu_${title}":
+        host_name           => $title,
+        check_command       => 'check_nrpe_cpu',
+        service_description => 'cpu',
+        servicegroups       => $servicegroups,
+        # Support an arrays of tags for multiple nagios servers
+        tag                 => regsubst($nagios::var::server,'^(.+)$','nagios-\1'),
+        check_period        => $::nagios_check_cpu_check_period,
+        notification_period => $::nagios_check_cpu_notification_period,
+        max_check_attempts  => $::nagios_check_cpu_max_check_attempts,
+        ensure              => $ensure,
+    }
+*/
+
 }